Olena-patches March 2007

olena-patches@lrde.epita.fr

7 participants
73 discussions

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add postconditions to morphology. * oln/value/builtin.hh: Move traits in... * oln/value/builtin_traits.hh: ...this new file. * tests/core/Makefile.am (check_PROGRAMS): Remove iter_point3d. * tests/algorithms/fill.cc: Update. * TODO: Extend. * oln/core/concept/function.hh: Remove stupid fwd decl. * oln/core/concept/operators.hh (operator>=): Rely now on <=. * oln/core/gen/pset_compare.hh (operator>, operator>=): Remove; obsolete. * oln/core/gen/literal.hh (operator T), (operator U): New conversions. * oln/core/gen/traits.hh (set_trait_): Add default relying on Any. * oln/core/internal/image_ops.hh: Add FIXME. * oln/core/internal/op_fp2v_over_pset.hh (fun): New method. * oln/morpho/reconstruction.hh (include): Fix missing. * oln/morpho/cc_tarjan.hh: Likewise. * oln/morpho/elementary_gradient.hh, * oln/morpho/elementary_closing.hh, * oln/morpho/elementary_gradient_external.hh, * oln/morpho/elementary_opening.hh, * oln/morpho/elementary_laplace.hh, * oln/morpho/elementary_dilation.hh, * oln/morpho/gradient_internal.hh, * oln/morpho/top_hat_black.hh, * oln/morpho/gradient.hh, * oln/morpho/top_hat_white.hh, * oln/morpho/closing.hh, * oln/morpho/opening.hh, * oln/morpho/gradient_external.hh, * oln/morpho/laplace.hh, * oln/morpho/dilation.hh, * oln/morpho/elementary_erosion.hh, * oln/morpho/erosion.hh, * oln/morpho/elementary_gradient_internal.hh: Add postconditions. Introduce explicit temporary variables. Various clean-ups. * oln/arith/minus.hh: Remove obsolete inactivated line. * oln/level/compare.hh (operator=, operator<, operator<=): New versions with a literal. * oln/core/gen/pw_value.hh (pw_value_, pw_value): Weaken sig and add static check. * oln/level/local.hh (local): Likewise. * oln/level/apply_local.hh (apply_local): Likewise. TODO | 4 + oln/arith/minus.hh | 1 oln/core/concept/function.hh | 3 oln/core/concept/operators.hh | 10 +- oln/core/gen/literal.hh | 13 +++ oln/core/gen/pset_compare.hh | 21 ----- oln/core/gen/pw_value.hh | 13 ++- oln/core/gen/traits.hh | 35 ++++++--- oln/core/internal/image_ops.hh | 2 oln/core/internal/op_fp2v_over_pset.hh | 10 ++ oln/level/apply_local.hh | 18 +--- oln/level/compare.hh | 112 ++++++++++++++++++++++++++++- oln/level/local.hh | 13 +-- oln/morpho/cc_tarjan.hh | 6 + oln/morpho/closing.hh | 8 +- oln/morpho/dilation.hh | 25 +++--- oln/morpho/elementary_closing.hh | 8 +- oln/morpho/elementary_dilation.hh | 18 ++-- oln/morpho/elementary_erosion.hh | 19 ++-- oln/morpho/elementary_gradient.hh | 9 +- oln/morpho/elementary_gradient_external.hh | 8 +- oln/morpho/elementary_gradient_internal.hh | 8 +- oln/morpho/elementary_laplace.hh | 6 + oln/morpho/elementary_opening.hh | 8 +- oln/morpho/erosion.hh | 25 +++--- oln/morpho/gradient.hh | 18 ++-- oln/morpho/gradient_external.hh | 17 ++-- oln/morpho/gradient_internal.hh | 17 ++-- oln/morpho/laplace.hh | 21 ++--- oln/morpho/opening.hh | 12 +-- oln/morpho/reconstruction.hh | 6 + oln/morpho/top_hat_black.hh | 17 ++-- oln/morpho/top_hat_white.hh | 18 ++-- oln/value/builtin.hh | 17 ---- oln/value/builtin_traits.hh | 57 ++++++++++++++ tests/algorithms/fill.cc | 13 +-- tests/core/Makefile.am | 2 37 files changed, 412 insertions(+), 206 deletions(-) Index: tests/core/Makefile.am --- tests/core/Makefile.am (revision 924) +++ tests/core/Makefile.am (working copy) @@ -27,7 +27,6 @@ image2d \ iter_point1d \ iter_point2d \ - iter_point3d \ neighb2d \ npoints \ point2d \ @@ -45,7 +44,6 @@ image2d_SOURCES = image2d.cc iter_point1d_SOURCES = iter_point1d.cc iter_point2d_SOURCES = iter_point2d.cc -iter_point3d_SOURCES = iter_point3d.cc neighb2d_SOURCES = neighb2d.cc npoints_SOURCES = npoints.cc point2d_SOURCES = point2d.cc Index: tests/algorithms/fill.cc --- tests/algorithms/fill.cc (revision 924) +++ tests/algorithms/fill.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2006 EPITA Research and Development Laboratory +// Copyright (C) 2006, 2007 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,19 +28,18 @@ /// Test oln::level::fill. #include <cassert> -// FIXME: We should not include oln/basics2d.hh, but -// just oln/core/2d/image2d.hh. -#include <oln/basics2d.hh> +#include <oln/core/2d/image2d.hh> #include <oln/level/fill.hh> int main() { - typedef oln::image2d<int> image_t; + using namespace oln; + typedef image2d<int> image_t; image_t ima(3, 3); - oln::level::fill(ima, 51); - oln_piter_(image_t) p(ima.topo()); + level::fill(ima, 51); + image_t::piter p(ima.points()); for_all(p) assert(ima(p) = 51); } Index: TODO --- TODO (revision 924) +++ TODO (working copy) @@ -35,6 +35,10 @@ in image_identity.hh use 'current' +provide arith::minus et al. with explicit output type + +use Generalized_Point when possible + * Tiny improvements Index: oln/core/concept/function.hh --- oln/core/concept/function.hh (revision 924) +++ oln/core/concept/function.hh (working copy) @@ -48,9 +48,6 @@ */ - template <typename Exact> - struct Function; - template <typename Exact> struct Function : public Any<Exact> Index: oln/core/concept/operators.hh --- oln/core/concept/operators.hh (revision 924) +++ oln/core/concept/operators.hh (working copy) @@ -100,19 +100,19 @@ template <typename L, typename R> bool operator> (const Any<L>& lhs, const Any<R>& rhs) { - return exact(rhs) < exact(lhs); + return exact(rhs) < exact(lhs); // use "operator <" } template <typename L, typename R> - bool operator>=(const Any<L>& lhs, const Any<R>& rhs) + bool operator<=(const Any<L>& lhs, const Any<R>& rhs) { - return not (exact(lhs) < exact(rhs)); + return not (exact(rhs) < exact(lhs)); // use "operator <" and "not" } template <typename L, typename R> - bool operator<=(const Any<L>& lhs, const Any<R>& rhs) + bool operator>=(const Any<L>& lhs, const Any<R>& rhs) { - return not (exact(rhs) < exact(lhs)); + return exact(rhs) <= exact(lhs); // use "operator <=" } template <typename L, typename R> Index: oln/core/gen/pset_compare.hh --- oln/core/gen/pset_compare.hh (revision 924) +++ oln/core/gen/pset_compare.hh (working copy) @@ -29,6 +29,7 @@ # define OLN_CORE_GEN_PSET_COMPARE_HH # include <oln/core/concept/point_set.hh> +# include <oln/core/concept/operators.hh> namespace oln @@ -45,12 +46,6 @@ template <typename L, typename R> bool operator <= (const Point_Set<L>& lhs, const Point_Set<R>& rhs); - template <typename L, typename R> - bool operator > (const Point_Set<L>& lhs, const Point_Set<R>& rhs); - - template <typename L, typename R> - bool operator >= (const Point_Set<L>& lhs, const Point_Set<R>& rhs); - template <typename B1, typename B2> bool intersects (const Box<B1>& box1, const Box<B2>& box2); @@ -252,20 +247,6 @@ return impl::op_strict_subset_(exact(lhs), exact(rhs)); } - template <typename L, typename R> - bool operator >= (const Point_Set<L>& lhs, const Point_Set<R>& rhs) - { - assert_same_grid_<L, R>::check(); - return impl::op_subset_(exact(rhs), exact(lhs)); - } - - template <typename L, typename R> - bool operator > (const Point_Set<L>& lhs, const Point_Set<R>& rhs) - { - assert_same_grid_<L, R>::check(); - return impl::op_strict_subset_(exact(rhs), exact(lhs)); - } - // Intersects. template <typename B1, typename B2> Index: oln/core/gen/pw_value.hh --- oln/core/gen/pw_value.hh (revision 924) +++ oln/core/gen/pw_value.hh (working copy) @@ -52,7 +52,7 @@ typedef oln_point(I) argument; // FIXME: psite? typedef oln_value(I) result; - pw_value_(const Point_Wise_Accessible_Image& ima); + pw_value_(const Image& ima); oln_value(I) operator()(const oln_point(I)& p) const; protected: @@ -61,16 +61,17 @@ template <typename I> - pw_value_ - pw_value(const Image& ima); + pw_value_ pw_value(const Image& ima); # ifndef OLN_INCLUDE_ONLY template <typename I> - pw_value_::pw_value_(const Point_Wise_Accessible_Image& ima) + pw_value_::pw_value_(const Image& ima) : ima_(exact(ima)) { + mlc::assert_< mlc_is_a(I, Point_Wise_Accessible_Image) >::check(); + // FIXME: Add err msg above. } template <typename I> @@ -83,8 +84,10 @@ template <typename I> pw_value_ - pw_value(const Point_Wise_Accessible_Image& ima) + pw_value(const Image& ima) { + mlc::assert_< mlc_is_a(I, Point_Wise_Accessible_Image) >::check(); + // FIXME: Add err msg above. pw_value_ tmp(ima); return tmp; } Index: oln/core/gen/literal.hh --- oln/core/gen/literal.hh (revision 924) +++ oln/core/gen/literal.hh (working copy) @@ -28,7 +28,6 @@ #ifndef OLN_CORE_GEN_LITERAL_HH # define OLN_CORE_GEN_LITERAL_HH -# include <oln/core/concept/function.hh> # include <oln/core/concept/generator.hh> # include <oln/core/concept/point.hh> # include <oln/core/concept/value.hh> @@ -56,6 +55,18 @@ return this->val_; } + operator T() const + { + return this->val_; + } + + template <typename U> + operator literal_() const + { + literal_ tmp(this->val_); + return tmp; + } + result value() const { return this->val_; Index: oln/core/gen/traits.hh --- oln/core/gen/traits.hh (revision 924) +++ oln/core/gen/traits.hh (working copy) @@ -90,9 +90,8 @@ # define oln_internal_specialize_bin_trait_bool_(Name) \ \ - template <template <class> class Cl, typename L, \ - template <class> class Cr, typename R> \ - struct set_trait_< Cl, L, Name##_id, Cr, R > \ + template <typename L, typename R> \ + struct set_trait_< Any, L, Name##_id, Any, R > \ { \ typedef bool ret; \ } @@ -100,9 +99,8 @@ # define oln_internal_specialize_bin_trait_T_(Name) \ \ - template <template <class> class Cl, typename T, \ - template <class> class Cr> \ - struct set_trait_< Cl, T, Name##_id, Cr, T > \ + template <typename T> \ + struct set_trait_< Any, T, Name##_id, Any, T > \ { \ typedef T ret; \ } @@ -115,12 +113,30 @@ // set_trait_ + template <template <class> class Cl, typename L, typename Op, template <class> class Cr, typename R> struct set_trait_; + template <typename L, typename Op, typename R> + struct set_trait_<Any, L, Op, Any, R> + { + // nothing => do not compile + }; + + + template <template <class> class Cl, typename L, + typename Op, + template <class> class Cr, typename R> + struct set_trait_ // default is + : public set_trait_<Any, L, Op, Any, R> + { + }; + + + // ids struct plus_id; @@ -145,7 +161,6 @@ // default (see oln/core/concept/operators.hh) - /* oln_internal_specialize_bin_trait_T_(plus); oln_internal_specialize_bin_trait_T_(minus); @@ -165,8 +180,6 @@ oln_internal_specialize_bin_trait_T_(or); oln_internal_specialize_bin_trait_T_(xor); - */ - namespace internal { @@ -196,4 +209,8 @@ } // end of namespace oln +// FIXME: Bad? +# include <oln/value/builtin.hh> + + #endif // ! OLN_CORE_GEN_TRAITS_HH Index: oln/core/internal/image_ops.hh --- oln/core/internal/image_ops.hh (revision 924) +++ oln/core/internal/image_ops.hh (working copy) @@ -70,6 +70,8 @@ return tmp; } + // FIXME: Add "literal / point set"... + // Specialization "Image such_as f : P -> B". Index: oln/core/internal/op_fp2v_over_pset.hh --- oln/core/internal/op_fp2v_over_pset.hh (revision 924) +++ oln/core/internal/op_fp2v_over_pset.hh (working copy) @@ -90,6 +90,8 @@ rvalue impl_read(const point& p) const; const S& impl_points() const; + const F& fun() const; + protected: special_op_(); special_op_(F& fun, S& pts); @@ -139,6 +141,14 @@ return this->data_->second; } + template <typename F, typename S> + const F& + current::fun() const + { + assert(this->has_data()); + return this->data_->first; + } + } // end of namespace oln::internal # endif // ! OLN_INCLUDE_ONLY Index: oln/morpho/reconstruction.hh --- oln/morpho/reconstruction.hh (revision 924) +++ oln/morpho/reconstruction.hh (working copy) @@ -28,8 +28,10 @@ #ifndef OLN_MORPHO_RECONSTRUCTION_HH # define OLN_MORPHO_RECONSTRUCTION_HH +# include <oln/core/concept/image.hh> #include <oln/accumulator/max.hh> + namespace oln { @@ -47,13 +49,13 @@ // first oln_fwd_piter(I) p(input.points()); for_all(p) - marker(p) = local(max, marker, p) && mask(p); // FIXME : local_sup. + marker(p) = local(max, marker, p) and mask(p); // FIXME : local_sup. // second oln_bkd_piter(I) p(input.points()); for_all(p) - marker(p) = local(max, marker, p) && mask(p); // FIXME : local_inf. + marker(p) = local(max, marker, p) and mask(p); // FIXME : local_inf. } } // end of namespace oln::morpho::impl Index: oln/morpho/elementary_gradient.hh --- oln/morpho/elementary_gradient.hh (revision 924) +++ oln/morpho/elementary_gradient.hh (working copy) @@ -32,6 +32,7 @@ #include <oln/morpho/elementary_dilation.hh> #include <oln/arith/minus.hh> + namespace oln { @@ -56,7 +57,9 @@ oln_plain(I) elementary_gradient_(const Image_with_Nbh& input) { - return elementary_dilation(input) - elementary_erosion(input); + oln_plain(I) dil = elementary_dilation(input); + oln_plain(I) ero = elementary_erosion(input); + return dil - ero; } @@ -71,7 +74,9 @@ oln_plain(I) elementary_gradient(const Image_with_Nbh& input) { - return impl::elementary_gradient_(exact(input)); + oln_plain(I) output = impl::elementary_gradient_(exact(input)); + postcondition(output >= literal(0)); + return output; } # endif // ! OLN_INCLUDE_ONLY Index: oln/morpho/elementary_closing.hh --- oln/morpho/elementary_closing.hh (revision 924) +++ oln/morpho/elementary_closing.hh (working copy) @@ -31,6 +31,7 @@ #include <oln/morpho/elementary_erosion.hh> #include <oln/morpho/elementary_dilation.hh> + namespace oln { @@ -54,7 +55,8 @@ oln_plain(I) elementary_closing_(const Image_with_Nbh& input) { - return elementary_erosion( elementary_dilation(input) ); + oln_plain(I) dil = elementary_dilation(input); + return elementary_erosion(dil); } // FIXME: Add a fast version. @@ -68,7 +70,9 @@ oln_plain(I) elementary_closing(const Image_with_Nbh& input) { - return impl::elementary_closing_(exact(input)); + oln_plain(I) output = impl::elementary_closing_(exact(input)); + postcondition(output >= input); + return output; } # endif // ! OLN_INCLUDE_ONLY Index: oln/morpho/cc_tarjan.hh --- oln/morpho/cc_tarjan.hh (revision 924) +++ oln/morpho/cc_tarjan.hh (working copy) @@ -28,8 +28,10 @@ #ifndef OLN_MORPHO_CC_TARJAN_HH # define OLN_MORPHO_CC_TARJAN_HH +# include <oln/core/concept/image.hh> #include <oln/debug/print.hh> + namespace oln { @@ -76,7 +78,7 @@ oln_niter(I) n(p, input); for_all(n) { - if ( input(n) && is_processed(n) ) + if ( input(n) = true and is_processed(n) ) do_union(input ,n, p, parent); } is_processed(p) = true; @@ -93,7 +95,7 @@ oln_fwd_piter(I) p(input.points()); for_all(p) { - if ( input(p) && parent(p) = p ) + if ( input(p) = true and parent(p) = p ) output(p) = ++current_label; else output(p) = output(parent(p)); Index: oln/morpho/elementary_gradient_external.hh --- oln/morpho/elementary_gradient_external.hh (revision 924) +++ oln/morpho/elementary_gradient_external.hh (working copy) @@ -31,6 +31,7 @@ #include <oln/morpho/elementary_dilation.hh> #include <oln/arith/minus.hh> + namespace oln { @@ -55,7 +56,8 @@ oln_plain(I) elementary_gradient_external_(const Image_with_Nbh& input) { - return elementary_dilation(input) - input; + oln_plain(I) dil = elementary_dilation(input); + return dil - input; } @@ -70,7 +72,9 @@ oln_plain(I) elementary_gradient_external(const Image_with_Nbh& input) { - return impl::elementary_gradient_external_(exact(input)); + oln_plain(I) output = impl::elementary_gradient_external_(exact(input)); + postcondition(output >= literal(0)); + return output; } # endif // ! OLN_INCLUDE_ONLY Index: oln/morpho/elementary_opening.hh --- oln/morpho/elementary_opening.hh (revision 924) +++ oln/morpho/elementary_opening.hh (working copy) @@ -31,6 +31,7 @@ #include <oln/morpho/elementary_erosion.hh> #include <oln/morpho/elementary_dilation.hh> + namespace oln { @@ -54,7 +55,8 @@ oln_plain(I) elementary_opening_(const Image_with_Nbh& input) { - return morpho::elementary_dilation( morpho::elementary_erosion(input) ); + oln_plain(I) ero = morpho::elementary_erosion(input); + return morpho::elementary_dilation(ero); } // FIXME: Add a fast version. @@ -68,7 +70,9 @@ oln_plain(I) elementary_opening(const Image_with_Nbh& input) { - return impl::elementary_opening_(exact(input)); + oln_plain(I) output = impl::elementary_opening_(exact(input)); + postcondition(output <= input); + return output; } # endif // ! OLN_INCLUDE_ONLY Index: oln/morpho/elementary_laplace.hh --- oln/morpho/elementary_laplace.hh (revision 924) +++ oln/morpho/elementary_laplace.hh (working copy) @@ -30,7 +30,7 @@ #include <oln/morpho/elementary_gradient_external.hh> #include <oln/morpho/elementary_gradient_internal.hh> -#include <oln/arith/minus.hh> + namespace oln { @@ -56,7 +56,9 @@ oln_plain(I) elementary_laplace_(const Image_with_Nbh& input) { - return elementary_gradient_external(input) - elementary_gradient_internal(input); + oln_plain(I) g_ext = elementary_gradient_external(input); + oln_plain(I) g_int = elementary_gradient_internal(input); + return g_ext - g_int; } Index: oln/morpho/elementary_dilation.hh --- oln/morpho/elementary_dilation.hh (revision 924) +++ oln/morpho/elementary_dilation.hh (working copy) @@ -29,10 +29,12 @@ # define OLN_MORPHO_ELEMENTARY_DILATION_HH #include <oln/level/apply_local.hh> +# include <oln/level/compare.hh> #include <oln/border/fill.hh> #include <oln/accumulator/max.hh> #include <oln/accumulator/or.hh> + namespace oln { @@ -55,8 +57,7 @@ template <typename I> oln_plain(I) - elementary_dilation_on_function_(const Image&, - const I& input) + elementary_dilation_on_function_(const Image& input) { border::fill(input, oln_min(oln_value(I))); accumulator::max_<oln_value(I)> max; @@ -65,10 +66,9 @@ template <typename I> oln_plain(I) - elementary_dilation_on_set_(const Image&, - const I& input) + elementary_dilation_on_set_(const Image& input) { - border::fill(input, oln_min(oln_value(I))); + border::fill(input, false); accumulator::or_<oln_value(I)> accu_or; return level::apply_local(accu_or, input); } @@ -81,13 +81,13 @@ template <typename I> oln_plain(I) elementary_dilation_(const Image& input) { - return elementary_dilation_on_function_(exact(input), exact(input)); + return elementary_dilation_on_function_(exact(input)); } template <typename I> oln_plain(I) elementary_dilation_(const Binary_Image& input) { - return elementary_dilation_on_set_(exact(input), exact(input)); + return elementary_dilation_on_set_(exact(input)); } } // end of namespace oln::morpho::impl @@ -99,7 +99,9 @@ oln_plain(I) elementary_dilation(const Image_with_Nbh& input) { - return impl::elementary_dilation_(exact(input)); + oln_plain(I) output = impl::elementary_dilation_(exact(input)); + postcondition(output >= input); + return output; } # endif // ! OLN_INCLUDE_ONLY Index: oln/morpho/gradient_internal.hh --- oln/morpho/gradient_internal.hh (revision 924) +++ oln/morpho/gradient_internal.hh (working copy) @@ -31,6 +31,7 @@ #include <oln/morpho/erosion.hh> #include <oln/arith/minus.hh> + namespace oln { @@ -41,8 +42,7 @@ template <typename I, typename W> oln_plain(I) - gradient_internal(const Image& input, - const Window<W>& win); + gradient_internal(const Image& input, const Window<W>& win); # ifndef OLN_INCLUDE_ONLY @@ -54,10 +54,10 @@ template <typename I, typename W> oln_plain(I) - gradient_internal_(const Image& input, - const Window<W>& win) + gradient_internal_(const Image& input, const Window<W>& win) { - return input - erosion(input, win); + oln_plain(I) ero = erosion(input, win); + return input - ero; } @@ -69,10 +69,11 @@ template <typename I, typename W> oln_plain(I) - gradient_internal(const Image& input, - const Window<W>& win) + gradient_internal(const Image& input, const Window<W>& win) { - return impl::gradient_internal_(exact(input), win); + oln_plain(I) output = impl::gradient_internal_(exact(input), exact(win)); + postcondition(output >= literal(0)); + return output; } # endif // ! OLN_INCLUDE_ONLY Index: oln/morpho/top_hat_black.hh --- oln/morpho/top_hat_black.hh (revision 924) +++ oln/morpho/top_hat_black.hh (working copy) @@ -32,6 +32,7 @@ #include <oln/morpho/closing.hh> #include <oln/arith/minus.hh> + namespace oln { @@ -42,8 +43,7 @@ template <typename I, typename W> oln_plain(I) - top_hat_black(const Image& input, - const Window<W>& win); + top_hat_black(const Image& input, const Window<W>& win); # ifndef OLN_INCLUDE_ONLY @@ -55,10 +55,10 @@ template <typename I, typename W> oln_plain(I) - top_hat_black_(const Image& input, - const Window<W>& win) + top_hat_black_(const Image& input, const Window<W>& win) { - return closing(input, win) - input; + oln_plain(I) clo = closing(input, win); + return clo - input; } @@ -71,10 +71,11 @@ template <typename I, typename W> oln_plain(I) - top_hat_black(const Image& input, - const Window<W>& win) + top_hat_black(const Image& input, const Window<W>& win) { - return impl::top_hat_black_(exact(input), win); + oln_plain(I) output = impl::top_hat_black_(exact(input), exact(win)); + postcondition(output >= literal(0)); + return output; } # endif // ! OLN_INCLUDE_ONLY Index: oln/morpho/gradient.hh --- oln/morpho/gradient.hh (revision 924) +++ oln/morpho/gradient.hh (working copy) @@ -32,6 +32,7 @@ #include <oln/morpho/dilation.hh> #include <oln/arith/minus.hh> + namespace oln { @@ -42,8 +43,7 @@ template <typename I, typename W> oln_plain(I) - gradient(const Image& input, - const Window<W>& win); + gradient(const Image& input, const Window<W>& win); # ifndef OLN_INCLUDE_ONLY @@ -55,10 +55,11 @@ template <typename I, typename W> oln_plain(I) - gradient_(const Image& input, - const Window<W>& win) + gradient_(const Image& input, const Window<W>& win) { - return dilation(input, win) - erosion(input, win); + oln_plain(I) dil = dilation(input, win); + oln_plain(I) ero = erosion(input, win); + return dil - ero; } @@ -69,10 +70,11 @@ template <typename I, typename W> oln_plain(I) - gradient(const Image& input, - const Window<W>& win) + gradient(const Image& input, const Window<W>& win) { - return impl::gradient_(exact(input), win); + oln_plain(I) output = impl::gradient_(exact(input), exact(win)); + postcondition(output >= literal(0)); + return output; } # endif // ! OLN_INCLUDE_ONLY Index: oln/morpho/top_hat_white.hh --- oln/morpho/top_hat_white.hh (revision 924) +++ oln/morpho/top_hat_white.hh (working copy) @@ -32,6 +32,7 @@ #include <oln/morpho/closing.hh> #include <oln/arith/minus.hh> + namespace oln { @@ -42,8 +43,8 @@ template <typename I, typename W> oln_plain(I) - top_hat_white(const Image& input, - const Window<W>& win); + top_hat_white(const Image& input, const Window<W>& win); + # ifndef OLN_INCLUDE_ONLY @@ -54,10 +55,10 @@ template <typename I, typename W> oln_plain(I) - top_hat_white_(const Image& input, - const Window<W>& win) + top_hat_white_(const Image& input, const Window<W>& win) { - return input - opening(input, win); + oln_plain(I) ope = opening(input, win) + return input - ope; } @@ -70,10 +71,11 @@ template <typename I, typename W> oln_plain(I) - top_hat_white(const Image& input, - const Window<W>& win) + top_hat_white(const Image& input, const Window<W>& win) { - return impl::top_hat_white_(exact(input), win); + oln_plain(I) output = impl::top_hat_white_(exact(input), exact(win)); + postcondition(output >= literal(0)); + return output; } # endif // ! OLN_INCLUDE_ONLY Index: oln/morpho/closing.hh --- oln/morpho/closing.hh (revision 924) +++ oln/morpho/closing.hh (working copy) @@ -31,6 +31,7 @@ #include <oln/morpho/erosion.hh> #include <oln/morpho/dilation.hh> + namespace oln { @@ -53,8 +54,7 @@ template <typename I, typename W> oln_plain(I) - closing_(const Image& input, - const Window<W>& win) + closing_(const Image& input, const Window<W>& win) { oln_plain(I) tmp = morpho::dilation(input, win); return morpho::erosion(tmp, win); // FIXME : inverse(win). @@ -72,7 +72,9 @@ oln_plain(I) closing(const Image& input, const Window<W>& win) { - return impl::closing_(exact(input), exact(win)); + oln_plain(I) output = impl::closing_(exact(input), exact(win)); + postcondition(output >= input); + return output; } # endif // ! OLN_INCLUDE_ONLY Index: oln/morpho/opening.hh --- oln/morpho/opening.hh (revision 924) +++ oln/morpho/opening.hh (working copy) @@ -31,6 +31,7 @@ #include <oln/morpho/erosion.hh> #include <oln/morpho/dilation.hh> + namespace oln { @@ -53,11 +54,10 @@ template <typename I, typename W> oln_plain(I) - opening_(const Image& input, - const Window<W>& win) + opening_(const Image& input, const Window<W>& win) { - oln_plain(I) tmp = morpho::erosion(input, win); - return morpho::dilation(tmp, win); // FIXME : inverse(win). + oln_plain(I) ero = morpho::erosion(input, win); + return morpho::dilation(ero, win); // FIXME : inverse(win). } // FIXME: Add a fast version. @@ -71,7 +71,9 @@ oln_plain(I) opening(const Image& input, const Window<W>& win) { - return impl::opening_(exact(input), win); + oln_plain(I) output = impl::opening_(exact(input), exact(win)); + postcondition(output <= input); + return output; } # endif // ! OLN_INCLUDE_ONLY Index: oln/morpho/gradient_external.hh --- oln/morpho/gradient_external.hh (revision 924) +++ oln/morpho/gradient_external.hh (working copy) @@ -31,6 +31,7 @@ #include <oln/morpho/dilation.hh> #include <oln/arith/minus.hh> + namespace oln { @@ -41,8 +42,7 @@ template <typename I, typename W> oln_plain(I) - gradient_external(const Image& input, - const Window<W>& win); + gradient_external(const Image& input, const Window<W>& win); # ifndef OLN_INCLUDE_ONLY @@ -54,10 +54,10 @@ template <typename I, typename W> oln_plain(I) - gradient_external_(const Image& input, - const Window<W>& win) + gradient_external_(const Image& input, const Window<W>& win) { - return dilation(input, win) - input; + oln_plain(I) dil = dilation(input, win); + return dil - input; } @@ -68,10 +68,11 @@ template <typename I, typename W> oln_plain(I) - gradient_external(const Image& input, - const Window<W>& win) + gradient_external(const Image& input, const Window<W>& win) { - return impl::gradient_external_(exact(input), win); + oln_plain(I) output = impl::gradient_external_(exact(input), exact(win)); + postcondition(output >= literal(0)); + return output; } # endif // ! OLN_INCLUDE_ONLY Index: oln/morpho/laplace.hh --- oln/morpho/laplace.hh (revision 924) +++ oln/morpho/laplace.hh (working copy) @@ -28,9 +28,9 @@ #ifndef OLN_MORPHO_LAPLACE_HH # define OLN_MORPHO_LAPLACE_HH -#include <oln/morpho/elementary_gradient_external.hh> -#include <oln/morpho/elementary_gradient_internal.hh> -#include <oln/arith/minus.hh> +# include <oln/morpho/gradient_external.hh> +# include <oln/morpho/gradient_internal.hh> + namespace oln { @@ -42,8 +42,7 @@ template <typename I, typename W> oln_plain(I) - laplace(const Image& input, - const Window<W>& win); + laplace(const Image& input, const Window<W>& win); # ifndef OLN_INCLUDE_ONLY @@ -55,10 +54,11 @@ template <typename I, typename W> oln_plain(I) - laplace_(const Image& input, - const Window<W>& win) + laplace_(const Image& input, const Window<W>& win) { - return gradient_external(input, win) - gradient_internal(input, win); + oln_plain(I) g_ext = gradient_external(input, win); + oln_plain(I) g_int = gradient_internal(input, win); + return g_ext - g_int; } @@ -71,10 +71,9 @@ template <typename I, typename W> oln_plain(I) - laplace(const Image& input, - const Window<W>& win) + laplace(const Image& input, const Window<W>& win) { - return impl::laplace_(exact(input), win); + return impl::laplace_(exact(input), exact(win)); } # endif // ! OLN_INCLUDE_ONLY Index: oln/morpho/dilation.hh --- oln/morpho/dilation.hh (revision 924) +++ oln/morpho/dilation.hh (working copy) @@ -29,8 +29,11 @@ # define OLN_MORPHO_DILATION_HH #include <oln/level/apply_local.hh> +# include <oln/level/compare.hh> #include <oln/border/fill.hh> #include <oln/accumulator/max.hh> +# include <oln/accumulator/or.hh> + namespace oln { @@ -54,9 +57,7 @@ template <typename I, typename W> oln_plain(I) - dilation_on_function_(const Image&, - const I& input, - const Window<W>& win) + dilation_on_function_(const Image& input, const Window<W>& win) { border::fill(input, oln_min(oln_value(I))); accumulator::max_<oln_value(I)> max; @@ -65,9 +66,7 @@ template <typename I, typename W> oln_plain(I) - dilation_on_set_(const Image&, - const I& input, - const Window<W>& win) + dilation_on_set_(const Image& input, const Window<W>& win) { border::fill(input, oln_min(oln_value(I))); accumulator::or_<oln_value(I)> accu_or; @@ -80,17 +79,15 @@ // Impl facade. template <typename I, typename W> - oln_plain(I) dilation_(const Image& input, - const Window<W>& win) + oln_plain(I) dilation_(const Image& input, const Window<W>& win) { - return dilation_on_function_(exact(input), exact(input), win); + return dilation_on_function_(exact(input), exact(win)); } template <typename I, typename W> - oln_plain(I) dilation_(const Binary_Image& input, - const Window<W>& win) + oln_plain(I) dilation_(const Binary_Image& input, const Window<W>& win) { - return dilation_on_set_(exact(input), exact(input), win); + return dilation_on_set_(exact(input), exact(win)); } } // end of namespace oln::morpho::impl @@ -102,7 +99,9 @@ oln_plain(I) dilation(const Image& input, const Window<W>& win) { - return impl::dilation_(exact(input), exact(win)); + oln_plain(I) output = impl::dilation_(exact(input), exact(win)); + postcondition(output >= input); + return output; } # endif // ! OLN_INCLUDE_ONLY Index: oln/morpho/elementary_erosion.hh --- oln/morpho/elementary_erosion.hh (revision 924) +++ oln/morpho/elementary_erosion.hh (working copy) @@ -29,8 +29,11 @@ # define OLN_MORPHO_ELEMENTARY_EROSION_HH #include <oln/level/apply_local.hh> +# include <oln/level/compare.hh> #include <oln/border/fill.hh> #include <oln/accumulator/min.hh> +# include <oln/accumulator/and.hh> + namespace oln { @@ -54,8 +57,7 @@ template <typename I> oln_plain(I) - elementary_erosion_on_function_(const Image&, - const I& input) + elementary_erosion_on_function_(const Image& input) { border::fill(input, oln_max(oln_value(I))); accumulator::min_<oln_value(I)> min; @@ -64,10 +66,9 @@ template <typename I> oln_plain(I) - elementary_erosion_on_set_(const Image&, - const I& input) + elementary_erosion_on_set_(const Image& input) { - border::fill(input, oln_max(oln_value(I))); + border::fill(input, true); accumulator::and_<oln_value(I)> accu_and; return level::apply_local(accu_and, input); } @@ -113,13 +114,13 @@ template <typename I> oln_plain(I) elementary_erosion_(const Image& input) { - return elementary_erosion_on_function_(exact(input), exact(input)); + return elementary_erosion_on_function_(exact(input)); } template <typename I> oln_plain(I) elementary_erosion_(const Binary_Image& input) { - return elementary_erosion_on_set_(exact(input), exact(input)); + return elementary_erosion_on_set_(exact(input)); } @@ -132,7 +133,9 @@ oln_plain(I) elementary_erosion(const Image_with_Nbh& input) { - return impl::elementary_erosion_(exact(input)); + oln_plain(I) output = impl::elementary_erosion_(exact(input)); + postcondition(output <= input); + return output; } # endif // ! OLN_INCLUDE_ONLY Index: oln/morpho/erosion.hh --- oln/morpho/erosion.hh (revision 924) +++ oln/morpho/erosion.hh (working copy) @@ -29,8 +29,11 @@ # define OLN_MORPHO_EROSION_HH #include <oln/level/apply_local.hh> +# include <oln/level/compare.hh> #include <oln/border/fill.hh> #include <oln/accumulator/min.hh> +# include <oln/accumulator/and.hh> + namespace oln { @@ -54,9 +57,7 @@ template <typename I, typename W> oln_plain(I) - erosion_on_function_(const Image&, - const I& input, - const Window<W>& win) + erosion_on_function_(const Image& input, const Window<W>& win) { border::fill(input, oln_max(oln_value(I))); accumulator::min_<oln_value(I)> min; @@ -65,9 +66,7 @@ template <typename I, typename W> oln_plain(I) - erosion_on_set_(const Image&, - const I& input, - const Window<W>& win) + erosion_on_set_(const Image& input, const Window<W>& win) { border::fill(input, true); accumulator::and_<oln_value(I)> accu_and; @@ -80,17 +79,15 @@ // Impl facade. template <typename I, typename W> - oln_plain(I) erosion_(const Image& input, - const Window<W>& win) + oln_plain(I) erosion_(const Image& input, const Window<W>& win) { - return erosion_on_function_(exact(input), exact(input), win); + return erosion_on_function_(exact(input), exact(win)); } template <typename I, typename W> - oln_plain(I) erosion_(const Binary_Image& input, - const Window<W>& win) + oln_plain(I) erosion_(const Binary_Image& input, const Window<W>& win) { - return erosion_on_set_(exact(input), exact(input), win); + return erosion_on_set_(exact(input), exact(win)); } } // end of namespace oln::morpho::impl @@ -102,7 +99,9 @@ oln_plain(I) erosion(const Image& input, const Window<W>& win) { - return impl::erosion_(exact(input), exact(win)); + oln_plain(I) output = impl::erosion_(exact(input), exact(win)); + postcondition(output <= input); + return output; } # endif // ! OLN_INCLUDE_ONLY Index: oln/morpho/elementary_gradient_internal.hh --- oln/morpho/elementary_gradient_internal.hh (revision 924) +++ oln/morpho/elementary_gradient_internal.hh (working copy) @@ -31,6 +31,7 @@ #include <oln/morpho/elementary_erosion.hh> #include <oln/arith/minus.hh> + namespace oln { @@ -55,7 +56,8 @@ oln_plain(I) elementary_gradient_internal_(const Image_with_Nbh& input) { - return input - elementary_erosion(input); + oln_plain(I) ero = elementary_erosion(input) + return input - ero; } @@ -70,7 +72,9 @@ oln_plain(I) elementary_gradient_internal(const Image_with_Nbh& input) { - return impl::elementary_gradient_internal_(exact(input)); + oln_plain(I) output = impl::elementary_gradient_internal_(exact(input)); + postcondition(output >= literal(0)); + return output; } # endif // ! OLN_INCLUDE_ONLY Index: oln/arith/minus.hh --- oln/arith/minus.hh (revision 924) +++ oln/arith/minus.hh (working copy) @@ -29,7 +29,6 @@ # define OLN_ARITH_MINUS_HH # include <oln/core/concept/image.hh> -// # include <oln/core/internal/f_ch_value.hh> # include <oln/core/gen/traits.hh> Index: oln/level/compare.hh --- oln/level/compare.hh (revision 924) +++ oln/level/compare.hh (working copy) @@ -30,6 +30,10 @@ # include <oln/core/concept/image.hh> # include <oln/core/gen/pset_compare.hh> +# include <oln/core/gen/literal.hh> + +// FIXME: Rename this file as "comparison.hh". + namespace oln @@ -40,9 +44,22 @@ template <typename L, typename R> bool operator = (const Image<L>& lhs, const Image<R>& rhs); + template <typename I> + bool operator = (const Image& lhs, const literal_<oln_value(I)>& val); + template <typename L, typename R> bool operator < (const Image<L>& lhs, const Image<R>& rhs); + template <typename I> + bool operator < (const Image& lhs, const literal_<oln_value(I)>& val); + + template <typename L, typename R> + bool operator <= (const Image<L>& lhs, const Image<R>& rhs); + + template <typename I> + bool operator <= (const Image& lhs, const literal_<oln_value(I)>& val); + + # ifndef OLN_LNCLUDE_ONLY @@ -55,7 +72,7 @@ // Generic version. template <typename L, typename R> - bool op_eq_(const Image<L>& lhs, const Image<R>& rhs); + bool op_eq_(const Image<L>& lhs, const Image<R>& rhs) { precondition(lhs.points() = rhs.points()); oln_piter(L) p(lhs.points()); @@ -66,13 +83,29 @@ } + // Image I = Value V + // ---------------------- + + // Generic version. + + template <typename I> + bool op_eq_(const Image& lhs, const literal_<oln_value(I)>& val) + { + oln_piter(I) p(lhs.points()); + for_all(p) + if (lhs(p) != val) + return false; + return true; + } + + // Image L < Image R // --------------------- // Generic version. template <typename L, typename R> - bool op_less_(const Image<L>& lhs, const Image<R>& rhs); + bool op_less_(const Image<L>& lhs, const Image<R>& rhs) { precondition(lhs.points() = rhs.points()); oln_piter(L) p(lhs.points()); @@ -82,6 +115,56 @@ return true; } + + // Image I < Value V + // --------------------- + + // Generic version. + + template <typename I> + bool op_less_(const Image& lhs, const literal_<oln_value(I)>& val) + { + oln_piter(I) p(lhs.points()); + for_all(p) + if (lhs(p) >= val) + return false; + return true; + } + + + // Image L <= Image R + // ---------------------- + + // Generic version. + + template <typename L, typename R> + bool op_leq_(const Image<L>& lhs, const Image<R>& rhs) + { + precondition(lhs.points() = rhs.points()); + oln_piter(L) p(lhs.points()); + for_all(p) + if (lhs(p) > rhs(p)) + return false; + return true; + } + + + // Image I <= Value V + // ---------------------- + + // Generic version. + + template <typename I> + bool op_leq_(const Image& lhs, const literal_<oln_value(I)>& val) + { + oln_piter(I) p(lhs.points()); + for_all(p) + if (lhs(p) > val) + return false; + return true; + } + + } // end of namespace oln::level::impl @@ -94,6 +177,12 @@ return impl::op_eq_(exact(lhs), exact(rhs)); } + template <typename I> + bool operator = (const Image& lhs, const literal_<oln_value(I)>& val) + { + return impl::op_eq_(exact(lhs), val); + } + template <typename L, typename R> bool operator < (const Image<L>& lhs, const Image<R>& rhs) { @@ -101,6 +190,25 @@ return impl::op_less_(exact(lhs), exact(rhs)); } + template <typename I> + bool operator < (const Image& lhs, const literal_<oln_value(I)>& val) + { + return impl::op_less_(exact(lhs), val); + } + + template <typename L, typename R> + bool operator <= (const Image<L>& lhs, const Image<R>& rhs) + { + assert_same_grid_<L, R>::check(); + return impl::op_leq_(exact(lhs), exact(rhs)); + } + + template <typename I> + bool operator <= (const Image& lhs, const literal_<oln_value(I)>& val) + { + return impl::op_leq_(exact(lhs), val); + } + # endif // ! OLN_INCLUDE_ONLY } // end of namespace oln Index: oln/level/local.hh --- oln/level/local.hh (revision 924) +++ oln/level/local.hh (working copy) @@ -42,9 +42,7 @@ template <typename A, typename I> typename A::result - local(const Accumulator<A>& f, - const Image_with_Nbh& input, - const oln_point(I)& p); + local(const Accumulator<A>& f, const Image& input, const oln_point(I)& p); template <typename A, typename I, typename W> typename A::result @@ -72,9 +70,7 @@ f.init_with(input(p)); oln_niter(I) n(p, input); for_all(n) - { f(input(n)); - } return f.value(); } @@ -192,10 +188,9 @@ template <typename A, typename I> typename A::result - local(const Accumulator<A>& f, - const Image_with_Nbh& input, - const oln_point(I)& p) + local(const Accumulator<A>& f, const Image& input, const oln_point(I)& p) { + mlc::assert_< mlc_is_a(I, Image_with_Nbh) >::check(); return impl::local_(exact(f), exact(input), p); } @@ -206,7 +201,7 @@ const oln_point(I)& p, const Window<W>& win) { - return impl::local_(exact(f), exact(input), p, win); + return impl::local_(exact(f), exact(input), p, exact(win)); } #endif // ! OLN_INCLUDE_ONLY Index: oln/level/apply_local.hh --- oln/level/apply_local.hh (revision 924) +++ oln/level/apply_local.hh (working copy) @@ -44,14 +44,12 @@ template <typename F, typename I> oln_plain_value(I, typename F::result) - apply_local(const Accumulator<F>& f, - const Image_with_Nbh& input); + apply_local(const Accumulator<F>& f, const Image& input); template <typename F, typename I, typename W> oln_plain_value(I, typename F::result) - apply_local(const Accumulator<F>& f, - const Image& input, - const Window<W>& win); + apply_local(const Accumulator<F>& f, const Image& input, const Window<W>& win); + # ifndef OLN_INCLUDE_ONLY @@ -94,19 +92,17 @@ template <typename F, typename I> oln_plain_value(I, typename F::result) - apply_local(const Accumulator<F>& f, - const Image_with_Nbh& input) + apply_local(const Accumulator<F>& f, const Image& input) { + mlc::assert_< mlc_is_a(I, Image_with_Nbh) >::check(); return impl::apply_local_(exact(f), exact(input)); } template <typename F, typename I, typename W> oln_plain_value(I, typename F::result) - apply_local(const Accumulator<F>& f, - const Image& input, - const Window<W>& win) + apply_local(const Accumulator<F>& f, const Image& input, const Window<W>& win) { - return impl::apply_local_(exact(f), exact(input), win); + return impl::apply_local_(exact(f), exact(input), exact(win)); } # endif Index: oln/value/builtin.hh --- oln/value/builtin.hh (revision 924) +++ oln/value/builtin.hh (working copy) @@ -29,7 +29,6 @@ # define OLN_VALUE_BUILTIN_HH # include <oln/core/concept/value.hh> -# include <oln/core/gen/traits.hh> namespace oln @@ -88,22 +87,12 @@ }; - template <typename Op> - struct set_trait_< Value, int, Op, Value, float > - { - typedef float ret; - }; - template <typename Op> - struct set_trait_< Value, float, Op, Value, int > - { - typedef float ret; - }; - - // FIXME: To be continued... +} // end of namespace oln -} // end of namespace oln +// FIXME: Bad? +# include <oln/value/builtin_traits.hh> #endif // ! OLN_VALUE_BUILTIN_HH Index: oln/value/builtin_traits.hh --- oln/value/builtin_traits.hh (revision 0) +++ oln/value/builtin_traits.hh (revision 0) @@ -0,0 +1,57 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_VALUE_BUILTIN_TRAITS_HH +# define OLN_VALUE_BUILTIN_TRAITS_HH + +# include <oln/value/builtin.hh> +# include <oln/core/gen/traits.hh> + + +namespace oln +{ + + template <typename Op> + struct set_trait_< Value, int, Op, Value, float > + { + typedef float ret; + }; + + template <typename Op> + struct set_trait_< Value, float, Op, Value, int > + { + typedef float ret; + }; + + // FIXME: To be continued... + + +} // end of namespace oln + + +#endif // ! OLN_VALUE_BUILTIN_TRAITS_HH +

17 years, 8 months

924: add point implementation for Iterator_On_Points.

by Nicolas Ballas

Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> add point implementation for Iterator_On_Points. * olena/tests/core/iter_point1d.cc, olena/tests/core/iter_point2d.cc: New. * olena/tests/core/iter_point3d.cc: New test file. * olena/tests/core/Makefile.am: Add new tests in make check. * olena/oln/core/internal/iterator_on_points_impl.hh: New, implementations for Iterator_On_Points. * olena/oln/core/internal/iterator_on_points_base.hh: Now derive from itertor_on_points_impl oln/core/internal/iterator_on_points_base.hh | 10 + oln/core/internal/iterator_on_points_impl.hh | 141 +++++++++++++++++++++++++++ tests/core/Makefile.am | 6 + tests/core/iter_point1d.cc | 48 +++++++++ tests/core/iter_point2d.cc | 50 +++++++++ tests/core/iter_point3d.cc | 52 +++++++++ 6 files changed, 305 insertions(+), 2 deletions(-) Index: olena/tests/core/iter_point1d.cc --- olena/tests/core/iter_point1d.cc (revision 0) +++ olena/tests/core/iter_point1d.cc (revision 0) @@ -0,0 +1,48 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#include <cassert> + +#include <oln/core/1d/image1d.hh> +#include <oln/core/internal/iterator_on_points_base.hh> + + + +int +main() +{ + + oln::image1d<int> ima1(40); + oln::image1d<int>::piter p (ima1.points()); + oln::point1d p1; + + for (p.start(); p.is_valid(); p.next()) + p1.ind() = p.ind(); + + assert(p1.ind() == 39); + return 0; +} Index: olena/tests/core/iter_point2d.cc --- olena/tests/core/iter_point2d.cc (revision 0) +++ olena/tests/core/iter_point2d.cc (revision 0) @@ -0,0 +1,50 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#include <cassert> + +#include <oln/core/2d/image2d.hh> + +int +main() +{ + + oln::image2d<int> ima1(40, 30); + oln::image2d<int>::piter p (ima1.points()); + oln::point2d p1; + + for (p.start(); p.is_valid(); p.next()) + { + p1.row() = p.row(); + p1.col() = p.col(); + } + + assert(p1.row() == 39); + assert(p1.col() == 29); + + return 0; +} Index: olena/tests/core/iter_point3d.cc --- olena/tests/core/iter_point3d.cc (revision 0) +++ olena/tests/core/iter_point3d.cc (revision 0) @@ -0,0 +1,52 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#include <cassert> + +#include <oln/core/3d/image3d.hh> + +int +main() +{ + + oln::image3d<int> ima1(40, 30, 20); + oln::image3d<int>::piter p (ima1.points()); + oln::point3d p1; + + for (p.start(); p.is_valid(); p.next()) + { + p1.row() = p.row(); + p1.col() = p.col(); + p1.slice() = p.slice(); + } + + assert(p1.row() == 39); + assert(p1.col() == 29); + assert(p1.slice() == 19); + + return 0; +} Index: olena/tests/core/Makefile.am --- olena/tests/core/Makefile.am (revision 923) +++ olena/tests/core/Makefile.am (working copy) @@ -25,6 +25,9 @@ grid \ image1d \ image2d \ + iter_point1d \ + iter_point2d \ + iter_point3d \ neighb2d \ npoints \ point2d \ @@ -40,6 +43,9 @@ grid_SOURCES = grid.cc image1d_SOURCES = image1d.cc image2d_SOURCES = image2d.cc +iter_point1d_SOURCES = iter_point1d.cc +iter_point2d_SOURCES = iter_point2d.cc +iter_point3d_SOURCES = iter_point3d.cc neighb2d_SOURCES = neighb2d.cc npoints_SOURCES = npoints.cc point2d_SOURCES = point2d.cc Index: olena/oln/core/internal/iterator_on_points_impl.hh --- olena/oln/core/internal/iterator_on_points_impl.hh (revision 0) +++ olena/oln/core/internal/iterator_on_points_impl.hh (revision 0) @@ -0,0 +1,141 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + + +#ifndef OLN_CORE_INTERNAL_ITERATOR_ON_POINTS_IMPL_HH +# define OLN_CORE_INTERNAL_ITERATOR_ON_POINTS_IMPL_HH + + +namespace oln +{ + + // Forward declarations + namespace impl + { + template <unsigned n, typename Exact, typename P> + struct iterator_on_points_impl; + } + + + template <unsigned n, typename Exact, typename P> + struct super_trait_< impl::iterator_on_points_impl<n, Exact, P> > + { + typedef Any ret; + }; + + template <unsigned n, typename Exact, typename P> + struct vtypes< impl::iterator_on_points_impl<n, Exact, P> > + { + }; + + + namespace impl + { + template <unsigned n, typename Exact, typename P> + struct iterator_on_points_impl : public virtual Any<Exact> + { + }; + + /// point1d interface + template <typename Exact, typename P> + struct iterator_on_points_impl<1, Exact, P> : public virtual Any< Exact > + { + typename P::coord ind() const; + }; + + /// point2d interface + template <typename Exact, typename P> + struct iterator_on_points_impl<2, Exact, P>: public virtual Any< Exact > + { + typename P::coord row() const; + typename P::coord col() const; + }; + + /// point3d interface + template <typename Exact, typename P> + struct iterator_on_points_impl<3, Exact, P>: public virtual Any< Exact > + { + typename P::coord row() const; + typename P::coord col() const; + typename P::coord slice() const; + }; + +# ifndef OLN_INCLUDE_ONLY + + // point1d + template <typename Exact, typename P> + typename P::coord + iterator_on_points_impl<1, Exact, P>::ind() const + { + return exact(this)->to_point().ind(); + } + + // point2d + template <typename Exact, typename P> + typename P::coord + iterator_on_points_impl<2, Exact, P>::row() const + { + return exact(this)->to_point().row(); + } + + + template <typename Exact, typename P> + typename P::coord + iterator_on_points_impl<2, Exact, P>::col() const + { + return exact(this)->to_point().col(); + } + + // point3d + template <typename Exact, typename P> + typename P::coord + iterator_on_points_impl<3, Exact, P>::row() const + { + return exact(this)->to_point().row(); + } + + template <typename Exact, typename P> + typename P::coord + iterator_on_points_impl<3, Exact, P>::col() const + { + return exact(this)->to_point().col(); + } + + template <typename Exact, typename P> + typename P::coord + iterator_on_points_impl<3, Exact, P>::slice() const + { + return exact(this)->to_point().slice(); + } + +# endif // ! OLN_INCLUDE_ONLY + + } // end of namespace oln + +} // end of namespace oln + +#endif // ! OLN_CORE_INTERNAL_ITERATOR_ON_POINTS_IMPL_HH Index: olena/oln/core/internal/iterator_on_points_base.hh --- olena/oln/core/internal/iterator_on_points_base.hh (revision 923) +++ olena/oln/core/internal/iterator_on_points_base.hh (working copy) @@ -29,6 +29,7 @@ # define OLN_CORE_INTERNAL_ITERATOR_ON_POINTS_BASE_HH # include <oln/core/concept/iterator_on_points.hh> +# include <oln/core/internal/iterator_on_points_impl.hh> namespace oln @@ -57,15 +58,20 @@ typedef stc::final< oln_coord(point__) > coord; typedef stc::final< oln_dim(point__) > dim; typedef stc::final< oln_dpoint(point__) > dpoint; - }; + // for getting point implementation + typedef stc_deferred(dim) dim__; + }; namespace internal { template <typename Exact> - class iterator_on_points_base_ : public Iterator_on_Points<Exact> + class iterator_on_points_base_ : public Iterator_on_Points<Exact>, + public impl::iterator_on_points_impl + <mlc_value(typename vtypes< internal::iterator_on_points_base_<Exact> >::dim__), + Exact, typename vtypes< internal::iterator_on_points_base_<Exact> >::point__> { protected: iterator_on_points_base_();

17 years, 8 months

923: Add the image type ''function: p -> v over a point set''.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add the image type ''function: p -> v over a point set''. * oln/core/gen/image_pset_piter.hh: Remove; obsolete. * oln/core/internal/image_base.hh: Move end of file to... * oln/core/internal/image_ops.hh: ...this new file. (operator/): New. * oln/core/internal/op_fp2v_over_pset.hh: New. * oln/core/gen/op.hh (oln_decl_op_over, over): New. * oln/core/gen/single_value_image.hh, * oln/core/internal/op_image_plus_nbh.hh: Cosmetic changes. * oln/core/internal/f_pset_to_plain_image.hh (pset_to_plain_image__): Fix version op_<S, such_as, F_p2b>. gen/op.hh | 2 gen/single_value_image.hh | 4 - internal/f_pset_to_plain_image.hh | 7 - internal/image_base.hh | 76 ------------------- internal/image_ops.hh | 129 ++++++++++++++++++++++++++++++++ internal/op_fp2v_over_pset.hh | 151 ++++++++++++++++++++++++++++++++++++++ internal/op_image_plus_nbh.hh | 8 +- 7 files changed, 293 insertions(+), 84 deletions(-) Index: oln/core/gen/op.hh --- oln/core/gen/op.hh (revision 922) +++ oln/core/gen/op.hh (working copy) @@ -77,6 +77,7 @@ # define oln_decl_op_plus(Lconcept, Rconcept) oln_decl_op_( plus, Lconcept, +, Rconcept) # define oln_decl_op_such_as(Lconcept, Rconcept) oln_decl_op_( such_as, Lconcept, |, Rconcept) # define oln_decl_op_restricted_to(Lconcept, Rconcept) oln_decl_op_( restricted_to, Lconcept, |, Rconcept) +# define oln_decl_op_over(Lconcept, Rconcept) oln_decl_op_( over, Lconcept, /, Rconcept) // ... @@ -91,6 +92,7 @@ struct plus; struct such_as; struct restricted_to; + struct over; /// \} Index: oln/core/gen/single_value_image.hh --- oln/core/gen/single_value_image.hh (revision 922) +++ oln/core/gen/single_value_image.hh (working copy) @@ -45,11 +45,11 @@ template <typename Ps, typename T> struct vtypes< single_value_image<Ps, T> > { - typedef typename Ps::point point; + typedef oln_point(Ps) point; typedef point psite; typedef Ps pset; - typedef typename point::coord coord; + typedef oln_coord(point) coord; typedef T value; typedef const T& rvalue; Index: oln/core/internal/image_ops.hh --- oln/core/internal/image_ops.hh (revision 0) +++ oln/core/internal/image_ops.hh (revision 0) @@ -0,0 +1,129 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_INTERNAL_IMAGE_OPS_HH +# define OLN_CORE_INTERNAL_IMAGE_OPS_HH + +# include <oln/core/internal/f_ch_value.hh> +# include <oln/core/internal/op_image_restricted_to_pset.hh> +# include <oln/core/internal/op_image_such_as_fp2b.hh> +# include <oln/core/internal/op_fp2v_over_pset.hh> + + + +namespace oln +{ + + // Image | Point_Set ( ima restricted_to pset ) + + oln_decl_op_restricted_to(Image, Point_Set); + + + + // Image | Function_p2b ( ima such_as "f : p -> b" + // is ima restricted_to (ima.points such_as f) ) + oln_decl_op_such_as(Image, Function_p2b); + + + + // Function_p2v / Point_Set ( ima defined by: "f : p -> v" over pset ) + + oln_decl_op_over(Function_p2v, Point_Set); + + + + + // Specialization "f : P -> V over Point_Set". + + template <typename V, typename P, typename S> + op_<const fun_p2v_<V (*)(P)>, over, const S> + operator / (V (*f)(P), const Point_Set<S>& pts) + { + typedef oln_strip_(P) P_; + mlc::assert_< mlc_is_a(P_, Point) >::check(); // FIXME: Add err msg. + mlc::assert_equal_< P_, oln_point(S) >::check(); + op_<const fun_p2v_<V (*)(P)>, over, const S> tmp(f, exact(pts)); + return tmp; + } + + + + // Specialization "Image such_as f : P -> B". + + template <typename I, typename B, typename P> + op_<const I, such_as, const fun_p2b_ > + operator | (const Image& ima, B (*f)(P)) + { + typedef oln_strip_(P) P_; + mlc::assert_< mlc_is_a(P_, Point) >::check(); // FIXME: Add err msg. + mlc::assert_equal_< P_, oln_point(I) >::check(); + op_<const I, such_as, const fun_p2b_ > tmp(exact(ima), f); + return tmp; + } + + template <typename I, typename B, typename P> + op_<I, such_as, const fun_p2b_ > + operator | (Image& ima, B (*f)(P)) + { + typedef oln_strip_(P) P_; + mlc::assert_< mlc_is_a(P_, Point) >::check(); // FIXME: Add err msg. + mlc::assert_equal_< P_, oln_point(I) >::check(); + op_<I, such_as, const fun_p2b_ > tmp(exact(ima), f); + return tmp; + } + + + // Specialization "Image such_as ima : P -> B". + + template <typename I, typename J> + op_<const I, such_as, const fun_p2b_< Binary_Image<J> > > + operator | (const Image& ima, const Binary_Image<J>& f_ima_b) + { + precondition(f_ima_b.points() >= ima.points()); + mlc::assert_equal_< oln_point(I), oln_point(J) >::check(); + op_<const I, such_as, const fun_p2b_< Binary_Image<J> > > tmp(exact(ima), f_ima_b); + return tmp; + } + + template <typename I, typename J> + op_<I, such_as, const fun_p2b_< Binary_Image<J> > > + operator | (Image& ima, const Binary_Image<J>& f_ima_b) + { + precondition(f_ima_b.points() >= ima.points()); + mlc::assert_equal_< oln_point(I), oln_point(J) >::check(); + op_<I, such_as, const fun_p2b_< Binary_Image<J> > > tmp(exact(ima), f_ima_b); + return tmp; + } + + + // FIXME: What about Mutable_Image so that "ima | something" can be left-value? + + +} // end of namespace oln + + +#endif // ! OLN_CORE_INTERNAL_IMAGE_OPS_HH Index: oln/core/internal/image_base.hh --- oln/core/internal/image_base.hh (revision 922) +++ oln/core/internal/image_base.hh (working copy) @@ -473,80 +473,8 @@ - -/// \{ -/// FIXME: Bad! - -# include <oln/core/internal/f_ch_value.hh> -# include <oln/core/internal/op_image_restricted_to_pset.hh> -# include <oln/core/internal/op_image_such_as_fp2b.hh> - -namespace oln -{ - // Image | Point_Set ( ima restricted_to pset ) - - oln_decl_op_restricted_to(Image, Point_Set); - - - // Image | Function_p2b ( ima such_as "f : p -> b" - // is ima restricted_to (ima.points such_as f) ) - oln_decl_op_such_as(Image, Function_p2b); - - - // Specialization "Image such_as f : P -> B". - - template <typename I, typename B, typename P> - op_<const I, such_as, const fun_p2b_ > - operator | (const Image& ima, B (*f)(P)) - { - typedef oln_strip_(P) P_; - mlc::assert_< mlc_is_a(P_, Point) >::check(); // FIXME: Add err msg. - mlc::assert_equal_< P_, oln_point(I) >::check(); - op_<const I, such_as, const fun_p2b_ > tmp(exact(ima), f); - return tmp; - } - - template <typename I, typename B, typename P> - op_<I, such_as, const fun_p2b_ > - operator | (Image& ima, B (*f)(P)) - { - typedef oln_strip_(P) P_; - mlc::assert_< mlc_is_a(P_, Point) >::check(); // FIXME: Add err msg. - mlc::assert_equal_< P_, oln_point(I) >::check(); - op_<I, such_as, const fun_p2b_ > tmp(exact(ima), f); - return tmp; - } - - - // Specialization "Image such_as ima : P -> B". - - template <typename I, typename J> - op_<const I, such_as, const fun_p2b_< Binary_Image<J> > > - operator | (const Image& ima, const Binary_Image<J>& f_ima_b) - { - precondition(f_ima_b.points() >= ima.points()); - mlc::assert_equal_< oln_point(I), oln_point(J) >::check(); - op_<const I, such_as, const fun_p2b_< Binary_Image<J> > > tmp(exact(ima), f_ima_b); - return tmp; - } - - template <typename I, typename J> - op_<I, such_as, const fun_p2b_< Binary_Image<J> > > - operator | (Image& ima, const Binary_Image<J>& f_ima_b) - { - precondition(f_ima_b.points() >= ima.points()); - mlc::assert_equal_< oln_point(I), oln_point(J) >::check(); - op_<I, such_as, const fun_p2b_< Binary_Image<J> > > tmp(exact(ima), f_ima_b); - return tmp; - } - - - // FIXME: What about Mutable_Image so that "ima | something" can be left-value? - - -} // end of namespace oln - -/// \} +// FIXME: Bad! +# include <oln/core/internal/image_ops.hh> Index: oln/core/internal/op_fp2v_over_pset.hh --- oln/core/internal/op_fp2v_over_pset.hh (revision 0) +++ oln/core/internal/op_fp2v_over_pset.hh (revision 0) @@ -0,0 +1,151 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_INTERNAL_OP_FP2V_OVER_PSET +# define OLN_CORE_INTERNAL_OP_FP2V_OVER_PSET + +# include <oln/core/concept/point_set.hh> +# include <oln/core/concept/function.hh> +# include <oln/core/internal/image_base.hh> +# include <oln/core/internal/f_pset_to_plain_image.hh> +# include <oln/core/gen/op.hh> + + +namespace oln +{ + +# define current \ + special_op_< stc::is<Function_p2v>, F, over, stc::is<Point_Set>, S > + + + // Super type. + template <typename F, typename S> + struct super_trait_< internal::current > + { + typedef internal::primitive_image_< op_<F, over, S> > ret; + }; + + + /// Virtual types. + template <typename F, typename S> + struct vtypes< internal::current > + { + typedef op_<F, over, S> Exact; + + typedef oln_point(S) point; + typedef point psite; + typedef S pset; + + typedef oln_coord(point) coord; + + typedef oln_result(F) value; // FIXME: Unconst, unref! + typedef oln_result(F) rvalue; + + typedef internal::pair<F, S> data; + + typedef oln_f_pset_to_plain_image(S, value) plain; + typedef void skeleton; // FIXME: check that this type is never accessed? + }; + + + namespace internal + { + + /// Implementation class for the result of "Function_p2v F / Point_Set S". + + template <typename F, typename S> + class current : public internal::primitive_image_< op_<F, over, S> > + { + typedef internal::primitive_image_< op_<F, over, S> > super; + public: + stc_using(data); + stc_using(point); + stc_using(rvalue); + + bool impl_owns_(const point& p) const; + rvalue impl_read(const point& p) const; + const S& impl_points() const; + + protected: + special_op_(); + special_op_(F& fun, S& pts); + }; + + } // end of namespace oln::internal + + + +# ifndef OLN_INCLUDE_ONLY + + namespace internal + { + + template <typename F, typename S> + current::special_op_() + { + } + + template <typename F, typename S> + current::special_op_(F& fun, S& pts) + { + this->data_ = new data(fun, pts); + } + + template <typename F, typename S> + bool + current::impl_owns_(const typename current::point& p) const + { + assert(this->has_data()); + return this->data_->second.has(p); + } + + template <typename F, typename S> + typename current::rvalue + current::impl_read(const typename current::point& p) const + { + assert(this->has_data()); + return this->data_->first(p); + } + + template <typename F, typename S> + const S& + current::impl_points() const + { + assert(this->has_data()); + return this->data_->second; + } + + } // end of namespace oln::internal + +# endif // ! OLN_INCLUDE_ONLY + +# undef current + +} // end of namespace oln + + +#endif // ! OLN_CORE_INTERNAL_OP_FP2V_OVER_PSET_HH Index: oln/core/internal/f_pset_to_plain_image.hh --- oln/core/internal/f_pset_to_plain_image.hh (revision 922) +++ oln/core/internal/f_pset_to_plain_image.hh (working copy) @@ -101,12 +101,11 @@ typedef oln_f_grid_to_plain_image(oln_grid(P), T) ret; }; - template <typename S, typename F, typename T> - struct pset_to_plain_image__< op_<S, such_as, F>, T > + template <typename S, typename F_p2b, typename T> + struct pset_to_plain_image__< op_<S, such_as, F_p2b>, T > { - typedef op_<S, such_as, F> Ps; typedef typename f_pset_to_plain_image_<S, T>::ret I; - typedef op_<I, restricted_to, Ps> ret; + typedef op_<I, such_as, F_p2b> ret; }; /// \} Index: oln/core/internal/op_image_plus_nbh.hh --- oln/core/internal/op_image_plus_nbh.hh (revision 922) +++ oln/core/internal/op_image_plus_nbh.hh (working copy) @@ -45,12 +45,12 @@ oln_decl_instant_value(nbh); - /// Fwd decls. + // Fwd decls. template <typename Exact> struct Image; template <typename Exact> struct Neighborhood; - /// Super type. + // Super type. template <typename I, typename N> struct super_trait_< internal::current > { @@ -58,7 +58,7 @@ }; - /// Virtual types. + // Virtual types. template <typename I, typename N> struct vtypes< internal::current > { @@ -224,7 +224,7 @@ return ima_ok and nbh_ok; } -# endif // OLN_INCLUDE_ONLY +# endif // ! OLN_INCLUDE_ONLY # undef current

17 years, 8 months

922: Add infinite point set type.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add infinite point set type. * oln/core/internal/f_pset_plain.hh: Rename as... * oln/core/internal/f_pset_to_plain_image.hh: ...this. (include): Add f_grid_to_plain_image.hh. (f_pset_plain_, oln_f_pset_plain): Rename as... (f_pset_to_plain_image_, oln_f_pset_to_plain_image): ...these. (pset_to_plain_image__): New versions to handle op_<S, such_as, F> and gen_box. * oln/core/gen/single_value_image.hh: Update. * oln/core/gen/infty_pset.hh, * oln/core/internal/f_grid_to_plain_image.hh, * oln/core/internal/f_grid_to_box.hh: New. * oln/core/internal/iterator_on_points_base.hh (iterator_on_points_base): Rename as... (iterator_on_points_base_): ...this. * oln/core/rle/rle_pset.hh, * oln/core/gen/dpoints_piter.hh, * oln/core/gen/image_pset_piter.hh, * oln/core/internal/box.hh, * oln/core/internal/point_set_std_based.hh, * oln/core/internal/piter_adaptor.hh: Update. * oln/draw/bresenham.hh (bresenham_): Rely on level::paste. (input): Rename as... (in_out): ...this. * oln/core/equipment.hh (oln_deduce): New. * oln/core/gen/pset_compare.hh (intersects): New. (op_leq_, op_less_): Rename as... (op_subset_, op_strict_subset_): ...these. (op_eq_, op_subset_, op_strict_subset_): New versions for infty_pset. (operator>=, operator>): Rely on op_subset_ and op_strict_subset_. * oln/core/gen/pset.hh: Cosmetic changes. * oln/core/gen/safe_image.hh (pset): Use infty_pset. (impl_points): New. * oln/core/internal/image_base.hh: Cosmetic change. * oln/core/internal/point_base.hh (set_all): New. core/equipment.hh | 3 core/gen/dpoints_piter.hh | 8 - core/gen/image_pset_piter.hh | 26 ++--- core/gen/infty_pset.hh | 130 ++++++++++++++++++++++++++++ core/gen/pset.hh | 6 - core/gen/pset_compare.hh | 139 +++++++++++++++++++++++-------- core/gen/safe_image.hh | 13 ++ core/gen/single_value_image.hh | 7 - core/internal/box.hh | 12 +- core/internal/f_grid_to_box.hh | 106 +++++++++++++++++++++++ core/internal/f_grid_to_plain_image.hh | 105 +++++++++++++++++++++++ core/internal/f_pset_to_plain_image.hh | 85 +++++++++++++++--- core/internal/image_base.hh | 2 core/internal/iterator_on_points_base.hh | 36 +++----- core/internal/piter_adaptor.hh | 6 - core/internal/point_base.hh | 61 ++----------- core/internal/point_set_std_based.hh | 14 +-- core/rle/rle_pset.hh | 18 ++-- draw/bresenham.hh | 23 ++--- 19 files changed, 615 insertions(+), 185 deletions(-) Index: oln/core/rle/rle_pset.hh --- oln/core/rle/rle_pset.hh (revision 921) +++ oln/core/rle/rle_pset.hh (working copy) @@ -100,7 +100,7 @@ /// number of point in the set unsigned npts; /// container of the set - std_container con_; + std_container con_; // FIXME: Add a &. /// pset box fbbox_<point> fb_; }; @@ -188,7 +188,7 @@ struct super_trait_< rle_pset_fwd_piter_ > { typedef rle_pset_fwd_piter_ current; - typedef internal::iterator_on_points_base<current> ret; + typedef internal::iterator_on_points_base_<current> ret; }; // Virtual types @@ -206,9 +206,9 @@ ** P must be a point type */ template <typename P> - class rle_pset_fwd_piter_ : public internal::iterator_on_points_base<rle_pset_fwd_piter_ > + class rle_pset_fwd_piter_ : public internal::iterator_on_points_base_<rle_pset_fwd_piter_ > { - typedef internal::iterator_on_points_base< rle_pset_fwd_piter_ > super; + typedef internal::iterator_on_points_base_< rle_pset_fwd_piter_ > super; typedef rle_pset_fwd_piter_ current; public: stc_using(point); @@ -251,7 +251,7 @@ void rle_pset_fwd_piter_::impl_start() { - this->it_ = this->con_.begin(); + this->it_ = this->con_.begin(); // FIXME: Test if (this->it_ != this->con_.end())... this->ps_.start_ = this->it_->first; this->ps_.index_ = 0; } @@ -326,7 +326,7 @@ struct super_trait_< rle_pset_bkd_piter_ > { typedef rle_pset_bkd_piter_ current; - typedef internal::iterator_on_points_base<current> ret; + typedef internal::iterator_on_points_base_<current> ret; }; // Virtual type @@ -343,9 +343,9 @@ ** P must be a point type */ template <typename P> - class rle_pset_bkd_piter_ : public internal::iterator_on_points_base<rle_pset_bkd_piter_ > + class rle_pset_bkd_piter_ : public internal::iterator_on_points_base_<rle_pset_bkd_piter_ > { - typedef internal::iterator_on_points_base< rle_pset_bkd_piter_ > super; + typedef internal::iterator_on_points_base_< rle_pset_bkd_piter_ > super; typedef rle_pset_bkd_piter_ current; public: stc_using(point); @@ -386,7 +386,7 @@ void rle_pset_bkd_piter_::impl_start() { - this->it_ = this->con_.rbegin(); + this->it_ = this->con_.rbegin(); // FIXME: Test if (this->it_ != this->con_.rend())... this->ps_.start_ = this->it_->first; this->ps_.index_ = this->it_->second - 1; } Index: oln/core/equipment.hh --- oln/core/equipment.hh (revision 921) +++ oln/core/equipment.hh (working copy) @@ -35,9 +35,12 @@ # include <stc/scoop-alt.hh> # endif + # define oln_typename_shortcut__(Type, Alias) typename Type::Alias +# define oln_deduce(Type, Alias_1, Alias_2) typename Type::Alias_1::Alias_2 + namespace oln { Index: oln/core/gen/pset_compare.hh --- oln/core/gen/pset_compare.hh (revision 921) +++ oln/core/gen/pset_compare.hh (working copy) @@ -51,6 +51,13 @@ template <typename L, typename R> bool operator >= (const Point_Set<L>& lhs, const Point_Set<R>& rhs); + template <typename B1, typename B2> + bool intersects (const Box<B1>& box1, const Box<B2>& box2); + + template <typename G> + class infty_pset; + + # ifndef OLN_INCLUDE_ONLY @@ -65,6 +72,13 @@ template <typename L, typename R> bool op_eq_(const Point_Set<L>& lhs, const Point_Set<R>& rhs) { + // first quick test + if (lhs.npoints() != rhs.npoints()) + return false; + // second quick test + if (not intersects(lhs.bbox(), rhs.bbox())) + return false; + // exhaustive test oln_piter(L) pl(lhs); oln_piter(R) pr(rhs); for (pl.start(), pr.start(); @@ -89,13 +103,40 @@ return lhs.pmin() = rhs.pmin() and lhs.pmax() = rhs.pmax(); } + // Versions with infinite set. + + template <typename S, typename G> + bool op_eq_(const Point_Set<S>&, const infty_pset<G>&) + { + return false; + } + + template <typename G, typename S> + bool op_eq_(const infty_pset<G>&, const Point_Set<S>&) + { + return false; + } + + template <typename G> + bool op_eq_(const infty_pset<G>&, const infty_pset<G>&) + { + return true; + } + // Point_Set L <= Point_Set R + // ------------------------------ + + // Generic version. template <typename L, typename R> - bool op_leq_(const Point_Set<L>& lhs, const Point_Set<R>& rhs) + bool op_subset_(const Point_Set<L>& lhs, const Point_Set<R>& rhs) { - if (lhs.npoints() > rhs.npoints()) // quick test + // first quick test + if (lhs.npoints() > rhs.npoints()) + return false; + // second quick test + if (not intersects(lhs.bbox(), rhs.bbox())) return false; // all points of lhs are IN rhs? oln_piter(R) p_rhs(rhs); @@ -111,63 +152,79 @@ return true; } - - // Point_Set L < Point_Set R + // Version for Boxes. template <typename L, typename R> - bool op_less_(const Point_Set<L>& lhs, const Point_Set<R>& rhs) + bool op_subset_(const Box<L>& lhs, const Box<R>& rhs) + { + for (unsigned i = 0; i < L::n; ++i) { - return op_leq_(lhs, rhs) and lhs.npoints() < rhs.npoints(); + if (lhs.pmin()[i] < rhs.pmin()[i] or lhs.pmax()[i] > rhs.pmax()[i]) + return false; + } + return true; } + // Versions with infinite set. + template <typename S, typename G> + bool op_subset_(const Point_Set<S>&, const infty_pset<G>&) + { + return true; + } + template <typename G> + bool op_subset_(const infty_pset<G>&, const infty_pset<G>&) + { + return true; + } + template <typename G, typename S> + bool op_subset_(const infty_pset<G>&, const Point_Set<S>&) + { + return false; + } - // Box L <= Box R. + // Point_Set L < Point_Set R + // ----------------------------- + + // Generic version. template <typename L, typename R> - bool op_leq_(const Box<L>& lhs, const Box<R>& rhs) + bool op_strict_subset_(const Point_Set<L>& lhs, const Point_Set<R>& rhs) { - for (unsigned i = 0; i < L::n; ++i) - { - if (lhs.pmin()[i] < rhs.pmin()[i] or lhs.pmax()[i] > rhs.pmax()[i]) - return false; - } - return true; + return op_subset_(lhs, rhs) and lhs.npoints() != rhs.npoints(); } - // Box L < Box R. + // Version for Boxes. template <typename L, typename R> - bool op_less_(const Box<L>& lhs, const Box<R>& rhs) + bool op_strict_subset_(const Box<L>& lhs, const Box<R>& rhs) { - return op_leq_(lhs, rhs) and lhs != rhs; + return op_subset_(lhs, rhs) and lhs != rhs; } - // Box L >= Box R. + // Versions with infinite set. - template <typename L, typename R> - bool op_geq_(const Box<L>& lhs, const Box<R>& rhs) - { - for (unsigned i = 0; i < L::n; ++i) + template <typename S, typename G> + bool op_strict_subset_(const Point_Set<S>&, const infty_pset<G>&) { - if (lhs.pmin()[i] > rhs.pmin()[i] or lhs.pmax()[i] < rhs.pmax()[i]) - return false; - } return true; } - // Box L > Box R. - - template <typename L, typename R> - bool op_greater_(const Box<L>& lhs, const Box<R>& rhs) + template <typename G> + bool op_strict_subset_(const infty_pset<G>&, const infty_pset<G>&) { - return op_geq_(lhs, rhs) and lhs != rhs; + return false; } + template <typename G, typename S> + bool op_strict_subset_(const infty_pset<G>&, const Point_Set<S>&) + { + return false; + } } // end of namespace oln::impl @@ -185,28 +242,42 @@ bool operator <= (const Point_Set<L>& lhs, const Point_Set<R>& rhs) { assert_same_grid_<L, R>::check(); - return impl::op_leq_(exact(lhs), exact(rhs)); + return impl::op_subset_(exact(lhs), exact(rhs)); } template <typename L, typename R> bool operator < (const Point_Set<L>& lhs, const Point_Set<R>& rhs) { assert_same_grid_<L, R>::check(); - return impl::op_less_(exact(lhs), exact(rhs)); + return impl::op_strict_subset_(exact(lhs), exact(rhs)); } template <typename L, typename R> bool operator >= (const Point_Set<L>& lhs, const Point_Set<R>& rhs) { assert_same_grid_<L, R>::check(); - return impl::op_geq_(exact(lhs), exact(rhs)); + return impl::op_subset_(exact(rhs), exact(lhs)); } template <typename L, typename R> bool operator > (const Point_Set<L>& lhs, const Point_Set<R>& rhs) { assert_same_grid_<L, R>::check(); - return impl::op_greater_(exact(lhs), exact(rhs)); + return impl::op_strict_subset_(exact(rhs), exact(lhs)); + } + + // Intersects. + + template <typename B1, typename B2> + bool intersects (const Box<B1>& box1, const Box<B2>& box2) + { + assert_same_grid_<B1, B2>::check(); + for (unsigned i = 0; i < B1::n; ++i) + { + if (box1.pmax()[i] < box2.pmin()[i] or box2.pmax()[i] < box1.pmin()[i]) + return false; + } + return true; } # endif // ! OLN_INCLUDE_ONLY Index: oln/core/gen/dpoints_piter.hh --- oln/core/gen/dpoints_piter.hh (revision 921) +++ oln/core/gen/dpoints_piter.hh (working copy) @@ -52,7 +52,7 @@ struct super_trait_< dpoints_fwd_piter_ > { typedef dpoints_fwd_piter_ current__; - typedef internal::iterator_on_points_base<current__> ret; + typedef internal::iterator_on_points_base_<current__> ret; }; @@ -66,7 +66,7 @@ // Forward point iterator class on a set of dpoints. template <typename P> - class dpoints_fwd_piter_ : public internal::iterator_on_points_base< dpoints_fwd_piter_ >, + class dpoints_fwd_piter_ : public internal::iterator_on_points_base_< dpoints_fwd_piter_ >, public internal::dpoints_fwd_piter_impl_ { public: @@ -99,7 +99,7 @@ struct super_trait_< dpoints_bkd_piter_ > { typedef dpoints_bkd_piter_ current__; - typedef internal::iterator_on_points_base<current__> ret; + typedef internal::iterator_on_points_base_<current__> ret; }; @@ -113,7 +113,7 @@ /// Backward point iterator class on a set of dpoints. template <typename P> - class dpoints_bkd_piter_ : public internal::iterator_on_points_base< dpoints_bkd_piter_ >, + class dpoints_bkd_piter_ : public internal::iterator_on_points_base_< dpoints_bkd_piter_ >, public internal::dpoints_bkd_piter_impl_ { public: Index: oln/core/gen/infty_pset.hh --- oln/core/gen/infty_pset.hh (revision 0) +++ oln/core/gen/infty_pset.hh (revision 0) @@ -0,0 +1,130 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_GEN_INFTY_PSET_HH +# define OLN_CORE_GEN_INFTY_PSET_HH + +# include <limits> +# include <oln/core/concept/grid.hh> +# include <oln/core/internal/f_grid_to_box.hh> +# include <oln/core/internal/point_set_base.hh> + + +namespace oln +{ + + // Fwd decl. + template <typename G> class infty_pset; + + + // Super type. + template <typename G> + struct super_trait_< infty_pset<G> > + { + typedef infty_pset<G> current__; + typedef internal::point_set_base_<current__> ret; + }; + + + // Virtual types. + template <typename G> + struct vtypes< infty_pset<G> > + { + typedef oln_f_grid_to_box(G) box; + typedef oln_point(box) point; + + // disabled! + typedef void fwd_piter; + typedef void bkd_piter; + }; + + + /// Infinite point set defined over a grid. + + template <typename G> + class infty_pset : public internal::point_set_base_< infty_pset<G> > + { + typedef infty_pset<G> current; + typedef internal::point_set_base_<current> super; + + public: + + stc_using(point); + stc_using(box); + + infty_pset(); + + unsigned impl_npoints() const; + bool impl_has(const point& p) const; + const box& impl_bbox() const; + + protected: + box b_; + + }; // end of class oln::infty_pset<G>. + + + +# ifndef OLN_INCLUDE_ONLY + + template <typename G> + infty_pset<G>::infty_pset() + { + typedef oln_coord(point) C; + point minus_infty, plus_infty; + minus_infty.set_all( std::numeric_limits<C>::min() ); + plus_infty. set_all( std::numeric_limits<C>::max() ); + this->b_ = init(from(minus_infty), to(plus_infty)); + } + + template <typename G> + unsigned + infty_pset<G>::impl_npoints() const + { + return std::numeric_limits<unsigned>::max(); + } + + template <typename G> + bool + infty_pset<G>::impl_has(const point&) const + { + return true; + } + + template <typename G> + const typename infty_pset<G>::box& + infty_pset<G>::impl_bbox() const + { + return this->b_; + } + +#endif // ! OLN_INCLUDE_ONLY + +} // end of namespace oln + + +#endif // ! OLN_CORE_GEN_INFTY_PSET_HH Index: oln/core/gen/pset.hh --- oln/core/gen/pset.hh (revision 921) +++ oln/core/gen/pset.hh (working copy) @@ -35,7 +35,7 @@ namespace oln { - /// Fwd decl. + // Fwd decl. template <typename P> class pset_; @@ -48,7 +48,7 @@ }; - /// Virtual types. + // Virtual types. template <typename P> struct vtypes< pset_ > { @@ -85,7 +85,7 @@ return *this; } -# endif +# endif // ! OLN_INCLUDE_ONLY } // end of namespace oln Index: oln/core/gen/single_value_image.hh --- oln/core/gen/single_value_image.hh (revision 921) +++ oln/core/gen/single_value_image.hh (working copy) @@ -30,7 +30,7 @@ # include <oln/core/internal/image_base.hh> # include <oln/core/internal/utils.hh> -# include <oln/core/internal/f_pset_plain.hh> +# include <oln/core/internal/f_pset_to_plain_image.hh> namespace oln @@ -56,7 +56,7 @@ typedef internal::pair<Ps, T> data; - typedef oln_f_pset_plain(Ps, T) plain; + typedef oln_f_pset_to_plain_image(Ps, T) plain; typedef single_value_image<Ps, pl::value> skeleton; }; @@ -79,7 +79,6 @@ typedef internal::image_base_<current> super; public: - stc_using(point); stc_using(rvalue); stc_using(data); @@ -119,7 +118,7 @@ single_value_image<Ps, T>::impl_owns_(const typename single_value_image<Ps, T>::point& p) const { assert(this->has_data()); - return this->data_->first.has(p); + return this->data_->first.has(p); // FIXME: or 'always true'? } template <typename Ps, typename T> Index: oln/core/gen/image_pset_piter.hh --- oln/core/gen/image_pset_piter.hh (revision 921) +++ oln/core/gen/image_pset_piter.hh (working copy) @@ -28,7 +28,7 @@ #ifndef OLN_CORE_GEN_IMAGE_PSET_PITER_HH # define OLN_CORE_GEN_IMAGE_PSET_PITER_HH -# include <oln/core/concept/iterator_on_points.hh> +# include <oln/core/internal/iterator_on_points_base.hh> # include <oln/core/concept/point_set.hh> # include <oln/core/concept/image.hh> @@ -36,52 +36,52 @@ namespace oln { - /// Fwd decls. + // Fwd decls. template <typename Ps> struct image_pset_fwd_piter_; template <typename Ps> struct image_pset_bkd_piter_; - /// Super types. + // Super types. template <typename Ps> struct super_trait_< image_pset_fwd_piter_<Ps> > { typedef image_pset_fwd_piter_<Ps> current__; - typedef Iterator_on_Points<current__> ret; + typedef internal::iterator_on_points_base_<current__> ret; }; template <typename Ps> struct super_trait_< image_pset_bkd_piter_<Ps> > { typedef image_pset_bkd_piter_<Ps> current__; - typedef Iterator_on_Points<current__> ret; + typedef internal::iterator_on_points_base_<current__> ret; }; - /// Virtual types. + // Virtual types. template <typename Ps> struct vtypes< image_pset_fwd_piter_<Ps> > { - typedef typename Ps::point point; + typedef oln_point(Ps) point; }; template <typename Ps> struct vtypes< image_pset_bkd_piter_<Ps> > { - typedef typename Ps::point point; + typedef oln_point(Ps) point; }; /// Class image_pset_fwd_piter_<Ps>. template <typename Ps> - class image_pset_fwd_piter_ : public Iterator_on_Points< image_pset_fwd_piter_<Ps> >, + class image_pset_fwd_piter_ : public internal::iterator_on_points_base_< image_pset_fwd_piter_<Ps> >, private mlc::assert_< mlc_is_a(Ps, Point_Set) > { typedef image_pset_fwd_piter_<Ps> current; - typedef Iterator_on_Points<current> super; + typedef internal::iterator_on_points_base_<current> super; public: stc_using(point); @@ -106,11 +106,11 @@ /// Class image_pset_bkd_piter_<Ps>. template <typename Ps> - class image_pset_bkd_piter_ : public Iterator_on_Points< image_pset_bkd_piter_<Ps> >, + class image_pset_bkd_piter_ : public internal::iterator_on_points_base_< image_pset_bkd_piter_<Ps> >, private mlc::assert_< mlc_is_a(Ps, Point_Set) > { typedef image_pset_fwd_piter_<Ps> current; - typedef Iterator_on_Points<current> super; + typedef internal::iterator_on_points_base_<current> super; public: stc_using(point); @@ -244,7 +244,7 @@ return i_.point_adr(); } -# endif +# endif // ! OLN_INCLUDE_ONLY } // end of namespace oln Index: oln/core/gen/safe_image.hh --- oln/core/gen/safe_image.hh (revision 921) +++ oln/core/gen/safe_image.hh (working copy) @@ -29,6 +29,7 @@ # define OLN_CORE_GEN_SAFE_IMAGE_HH # include <oln/core/internal/image_base.hh> +# include <oln/core/gen/infty_pset.hh> namespace oln @@ -47,6 +48,7 @@ typedef behavior::identity behavior; typedef internal::singleton data; + typedef infty_pset< oln_grid(I) > pset; typedef safe_image< oln_plain(I) > plain; typedef safe_image< pl::rec > skeleton; @@ -76,13 +78,16 @@ stc_using(lvalue); stc_using(value); stc_using(data); + stc_using(pset); stc_using(delegatee); safe_image(); safe_image(Mutable_Image& ima); bool impl_owns_(const point& p) const; + const pset& impl_points() const; + // FIXME: Force this type to be read-only? rvalue impl_read(const point& p) const; lvalue impl_read_write(const point& p); void impl_write(const point& p, const value& v); @@ -126,6 +131,14 @@ } template <typename I> + const typename safe_image::pset& + safe_image::impl_points() const + { + static infty_pset<oln_grid(I)> infty_; + return infty_; + } + + template <typename I> typename safe_image::rvalue safe_image::impl_read(const typename safe_image::point& p) const { Index: oln/core/internal/f_grid_to_plain_image.hh --- oln/core/internal/f_grid_to_plain_image.hh (revision 0) +++ oln/core/internal/f_grid_to_plain_image.hh (revision 0) @@ -0,0 +1,105 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_INTERNAL_F_GRID_TO_PLAIN_IMAGE_HH +# define OLN_CORE_INTERNAL_F_GRID_TO_PLAIN_IMAGE_HH + +# include <oln/core/concept/grid.hh> + + +#define oln_f_grid_to_plain_image(G, T) typename oln::internal::f_grid_to_plain_image_< G, T >::ret + + +namespace oln +{ + + /// \{ + /// Forward declarations. + + // Grid types. + + struct grid1d; + + struct grid2d; + struct grid2d_hex; + struct grid2d_tri; + + // FIXME: 3D... + + // Image types. + + template <typename T> class image1d; + template <typename T> class image2d; + + /// \} + + + + namespace internal + { + + // Fwd decl. + + template <typename G, typename T> struct f_grid_to_plain_image_; + + + /// \{ + /// Definitions. + + template <typename G, typename T> + struct grid_to_plain_image__; + + template <typename T> + struct grid_to_plain_image__< grid1d, T > + { + typedef image1d<T> ret; // FIXME: or image1d_b<T>? + }; + + template <typename T> + struct grid_to_plain_image__< grid2d, T > + { + typedef image2d<T> ret; // FIXME: or image2d_b<T>? + }; + + // FIXME: 2D hex/tri, 3D... + + /// \} + + + template <typename G, typename T> + struct f_grid_to_plain_image_ : private mlc::assert_< mlc_is_a(G, Grid) >, + public grid_to_plain_image__< G, T > + + { + }; + + } // end of namespace oln::internal + +} // end of namespace oln + + +#endif // ! OLN_CORE_INTERNAL_F_GRID_TO_PLAIN_IMAGE_HH Index: oln/core/internal/box.hh --- oln/core/internal/box.hh (revision 921) +++ oln/core/internal/box.hh (working copy) @@ -117,14 +117,14 @@ struct super_trait_< box_fwd_piter_ > { typedef box_fwd_piter_ current__; - typedef internal::iterator_on_points_base<current__> ret; + typedef internal::iterator_on_points_base_<current__> ret; }; template <typename B> struct super_trait_<box_bkd_piter_ > { typedef box_bkd_piter_ current__; - typedef internal::iterator_on_points_base<current__> ret; + typedef internal::iterator_on_points_base_<current__> ret; }; @@ -146,11 +146,11 @@ /// Class box_fwd_piter_. template <typename B> - class box_fwd_piter_ : public internal::iterator_on_points_base< box_fwd_piter_ >, + class box_fwd_piter_ : public internal::iterator_on_points_base_< box_fwd_piter_ >, private mlc::assert_< mlc_is_a(B, Point_Set) > { typedef box_fwd_piter_ current; - typedef Iterator_on_Points<current> super; + typedef internal::iterator_on_points_base_<current> super; public: stc_using(point); @@ -172,11 +172,11 @@ /// Class box_bkd_piter_. template <typename B> - class box_bkd_piter_ : public internal::iterator_on_points_base< box_bkd_piter_ >, + class box_bkd_piter_ : public internal::iterator_on_points_base_< box_bkd_piter_ >, private mlc::assert_< mlc_is_a(B, Point_Set) > { typedef box_bkd_piter_ current; - typedef Iterator_on_Points<current> super; + typedef internal::iterator_on_points_base_<current> super; public: stc_using(point); Index: oln/core/internal/f_grid_to_box.hh --- oln/core/internal/f_grid_to_box.hh (revision 0) +++ oln/core/internal/f_grid_to_box.hh (revision 0) @@ -0,0 +1,106 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_INTERNAL_F_GRID_TO_BOX_HH +# define OLN_CORE_INTERNAL_F_GRID_TO_BOX_HH + +# include <oln/core/concept/grid.hh> + + +#define oln_f_grid_to_box(G) typename oln::internal::f_grid_to_box_< G >::ret + + +namespace oln +{ + + /// \{ + /// Forward declarations. + + // Grid types. + + struct grid1d; + + struct grid2d; + struct grid2d_hex; + struct grid2d_tri; + + // FIXME: 3D... + + // Box types. + + struct box1d; + struct box2d; + template <typename P> class gen_box; + + /// \} + + + + namespace internal + { + + // Fwd decl. + + template <typename G> struct f_grid_to_; + + + /// \{ + /// Definitions. + + template <typename G> + struct grid_to_box__; + + template <> + struct grid_to_box__< grid1d > + { + typedef box1d ret; + }; + + template <> + struct grid_to_box__< grid2d > + { + typedef box2d ret; + }; + + // FIXME: 2D hex/tri, 3D... + + /// \} + + + template <typename G> + struct f_grid_to_box_ : private mlc::assert_< mlc_is_a(G, Grid) >, + public grid_to_box__< G > + + { + }; + + } // end of namespace oln::internal + +} // end of namespace oln + + +#endif // ! OLN_CORE_INTERNAL_F_GRID_TO_BOX_HH Index: oln/core/internal/point_set_std_based.hh --- oln/core/internal/point_set_std_based.hh (revision 921) +++ oln/core/internal/point_set_std_based.hh (working copy) @@ -176,14 +176,14 @@ struct super_trait_< pset_std_based_fwd_piter_<C> > { typedef pset_std_based_fwd_piter_<C> current__; - typedef internal::iterator_on_points_base<current__> ret; + typedef internal::iterator_on_points_base_<current__> ret; }; template <typename C> struct super_trait_< pset_std_based_bkd_piter_<C> > { typedef pset_std_based_bkd_piter_<C> current__; - typedef internal::iterator_on_points_base<current__> ret; + typedef internal::iterator_on_points_base_<current__> ret; }; @@ -206,10 +206,10 @@ // Class pset_std_based_fwd_piter_<C>. template <typename C> - class pset_std_based_fwd_piter_ : public internal::iterator_on_points_base< pset_std_based_fwd_piter_<C> > + class pset_std_based_fwd_piter_ : public internal::iterator_on_points_base_< pset_std_based_fwd_piter_<C> > { typedef pset_std_based_fwd_piter_<C> current; - typedef internal::iterator_on_points_base<current> super; + typedef internal::iterator_on_points_base_<current> super; public: stc_using(point); @@ -235,10 +235,10 @@ // Class pset_std_based_bkd_piter_<C>. template <typename C> - class pset_std_based_bkd_piter_ : public internal::iterator_on_points_base< pset_std_based_bkd_piter_<C> > + class pset_std_based_bkd_piter_ : public internal::iterator_on_points_base_< pset_std_based_bkd_piter_<C> > { typedef pset_std_based_bkd_piter_<C> current; - typedef internal::iterator_on_points_base<current> super; + typedef internal::iterator_on_points_base_<current> super; public: stc_using(point); @@ -374,7 +374,7 @@ } -# endif +# endif // ! OLN_INCLUDE_ONLY } // end of namespace oln Index: oln/core/internal/image_base.hh --- oln/core/internal/image_base.hh (revision 921) +++ oln/core/internal/image_base.hh (working copy) @@ -148,7 +148,7 @@ // Final. typedef stc::final< stc::is<Image> > category; - typedef stc::final <typename pset__::box> box; + typedef stc::final< oln_box(pset__) > box; typedef stc::final< oln_grid(point__) > grid; typedef stc::final< oln_dpoint(point__) > dpoint; typedef stc::final< oln_fwd_piter(pset__) > fwd_piter; Index: oln/core/internal/point_base.hh --- oln/core/internal/point_base.hh (revision 921) +++ oln/core/internal/point_base.hh (working copy) @@ -95,6 +95,7 @@ typedef xtd::vec<n, coord> vec_t; const vec_t& vec() const; vec_t& vec(); + void set_all(const coord& c); protected: point_base_(); @@ -148,15 +149,22 @@ } template <typename Exact> + void + point_base_<Exact>::set_all(const typename point_base_<Exact>::coord& c) + { + v_.set_all(c); + } + + template <typename Exact> point_base_<Exact>::point_base_() { } -# endif +# endif // ! OLN_INCLUDE_ONLY + } // end of namespace oln::internal - } // end of namespace oln::internal template <typename Exact> @@ -173,57 +181,10 @@ return ostr; } -# endif - - - -// /// internal::point_base_ + internal::dpoint_base_ -// template <typename P, typename D> -// struct case_ < xtd::op_plus, mlc::pair_<P,D>, -// oln::id::op_plus_pointnd_dpointnd > -// : where_< mlc::and_< mlc_is_a(P, internal::point_base_), -// mlc_is_a(D, internal::dpoint_base_) > > -// { -// typedef oln_vtype(P, coord) P_coord; -// typedef oln_vtype(D, coord) D_coord; -// typedef xtd_op_plus_trait(P_coord, D_coord) coord; -// typedef oln_vtype(P, dim) dim; -// typedef typename point_<mlc_value(dim), coord>::ret ret; -// }; - - -// /// internal::point_base_ - internal::dpoint_base_ -// template <typename P, typename D> -// struct case_ < xtd::op_minus, mlc::pair_<P,D>, -// oln::id::op_minus_pointnd_dpointnd > -// : where_< mlc::and_< mlc_is_a(P, internal::point_base_), -// mlc_is_a(D, internal::dpoint_base_) > > -// { -// typedef oln_vtype(P, coord) P_coord; -// typedef oln_vtype(D, coord) D_coord; -// typedef xtd_op_minus_trait(P_coord, D_coord) coord; -// typedef oln_vtype(P, dim) dim; -// typedef typename point_<mlc_value(dim), coord>::ret ret; -// }; - - -// /// internal::point_base_ - internal::point_base_ -// template <typename P1, typename P2> -// struct case_ < xtd::op_minus, mlc::pair_<P1,P2>, -// oln::id::op_minus_pointnd_pointnd > -// : where_< mlc::and_< mlc_is_a(P1, internal::point_base_), -// mlc_is_a(P2, internal::point_base_) > > -// { -// typedef oln_vtype(P1, coord) P1_coord; -// typedef oln_vtype(P2, coord) P2_coord; -// typedef xtd_op_minus_trait(P1_coord, P2_coord) coord; -// typedef oln_vtype(P1, dim) dim; -// typedef typename dpoint_<mlc_value(dim), coord>::ret ret; -// }; +# endif // ! OLN_INCLUDE_ONLY } // end of namespace oln - #endif // ! OLN_CORE_INTERNAL_POINT_BASE_HH Index: oln/core/internal/piter_adaptor.hh --- oln/core/internal/piter_adaptor.hh (revision 921) +++ oln/core/internal/piter_adaptor.hh (working copy) @@ -43,7 +43,7 @@ template <typename Exact> struct super_trait_< internal::piter_adaptor_<Exact> > { - typedef internal::iterator_on_points_base<Exact> ret; + typedef internal::iterator_on_points_base_<Exact> ret; }; @@ -65,9 +65,9 @@ // defined over other types of iterator on points. template <typename Exact> - class piter_adaptor_ : public internal::iterator_on_points_base<Exact> + class piter_adaptor_ : public internal::iterator_on_points_base_<Exact> { - typedef internal::iterator_on_points_base<Exact> super; + typedef internal::iterator_on_points_base_<Exact> super; public: stc_using(point); Index: oln/core/internal/f_pset_to_plain_image.hh --- oln/core/internal/f_pset_to_plain_image.hh (revision 921) +++ oln/core/internal/f_pset_to_plain_image.hh (working copy) @@ -25,41 +25,96 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_INTERNAL_F_PSET_PLAIN_HH -# define OLN_CORE_INTERNAL_F_PSET_PLAIN_HH +#ifndef OLN_CORE_INTERNAL_F_PSET_TO_PLAIN_IMAGE_HH +# define OLN_CORE_INTERNAL_F_PSET_TO_PLAIN_IMAGE_HH # include <oln/core/concept/point_set.hh> +# include <oln/core/internal/f_grid_to_plain_image.hh> -#define oln_f_pset_plain(Ps, T) typename oln::internal::f_pset_plain_< Ps, T >::ret +#define oln_f_pset_to_plain_image(Ps, T) typename oln::internal::f_pset_to_plain_image_< Ps, T >::ret namespace oln { - // Fwd decls. - struct grid2d; - template <typename P> class box_; + /// \{ + /// Forward declarations. + + // point set types + template <typename P> class gen_box; + class box1d; class box2d; - template <typename T> class image2d; - template <typename T> class image2d_b; + // FIXME: ... + + // gen + struct such_as; + struct restricted_to; + template <typename L, typename OpName, typename R> class op_; + + /// \} + namespace internal { - template <typename Gr, typename Ps, typename T> - struct f_pset_plain__; + // Fwd decl. + + template <typename Ps, typename T> struct f_pset_to_plain_image_; + + + /// \{ + /// Definitions. + + template <typename Ps, typename T> + struct pset_to_plain_image__ + { + typedef oln_f_grid_to_plain_image(oln_grid(Ps), T) I; + typedef op_< I, restricted_to, Ps > ret; + }; + + template <typename Ps, typename T> + struct pset_to_plain_image__< const Ps, T > + : + public pset_to_plain_image__< Ps, T > + { + }; + + template <typename T> + struct pset_to_plain_image__< box1d, T > + { + typedef oln_f_grid_to_plain_image(grid1d, T) ret; + }; template <typename T> - struct f_pset_plain__< grid2d, box2d, T > + struct pset_to_plain_image__< box2d, T > + { + typedef oln_f_grid_to_plain_image(grid2d, T) ret; + }; + + // ... + + template <typename P, typename T> + struct pset_to_plain_image__< gen_box, T > { - typedef image2d/*_b*/<T> ret; // FIXME: this type is not always known! + typedef oln_f_grid_to_plain_image(oln_grid(P), T) ret; }; + template <typename S, typename F, typename T> + struct pset_to_plain_image__< op_<S, such_as, F>, T > + { + typedef op_<S, such_as, F> Ps; + typedef typename f_pset_to_plain_image_<S, T>::ret I; + typedef op_<I, restricted_to, Ps> ret; + }; + + /// \} + + template <typename Ps, typename T> - struct f_pset_plain_ : private mlc::assert_< mlc_is_a(Ps, Point_Set) >, - public f_pset_plain__< stc_type(Ps, grid), Ps, T > + struct f_pset_to_plain_image_ : private mlc::assert_< mlc_is_a(Ps, Point_Set) >, + public pset_to_plain_image__< Ps, T > { }; @@ -69,4 +124,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_INTERNAL_F_PSET_PLAIN_HH +#endif // ! OLN_CORE_INTERNAL_F_PSET_TO_PLAIN_IMAGE_HH Index: oln/core/internal/iterator_on_points_base.hh --- oln/core/internal/iterator_on_points_base.hh (revision 921) +++ oln/core/internal/iterator_on_points_base.hh (working copy) @@ -30,60 +30,52 @@ # include <oln/core/concept/iterator_on_points.hh> + namespace oln { - // implementation - - - // Forward Declarations - - namespace internal { - template <typename Exact> - struct iterator_on_points_base; // FIXME: End with '_'! - } + // Fwd decl + namespace internal { template <typename Exact> struct iterator_on_points_base_; } // Super type - template <typename Exact> - struct super_trait_< internal::iterator_on_points_base<Exact> > + struct super_trait_< internal::iterator_on_points_base_<Exact> > { typedef Iterator_on_Points<Exact> ret; }; // Virtual types - template <typename Exact> - struct vtypes< internal::iterator_on_points_base<Exact> > + struct vtypes< internal::iterator_on_points_base_<Exact> > { + typedef stc::final< stc::is<Iterator_on_Points> > category; + typedef stc::abstract point; typedef stc_deferred(point) point__; - typedef stc::final<typename point__::grid> grid; - typedef stc::final<typename point__::coord> coord; - typedef stc::final<typename point__::dim> dim; - typedef stc::final<typename point__::dpoint> dpoint; + typedef stc::final< oln_grid(point__) > grid; + typedef stc::final< oln_coord(point__) > coord; + typedef stc::final< oln_dim(point__) > dim; + typedef stc::final< oln_dpoint(point__) > dpoint; }; namespace internal { - // iterator_on_points_base class template <typename Exact> - class iterator_on_points_base : public Iterator_on_Points<Exact> + class iterator_on_points_base_ : public Iterator_on_Points<Exact> { - protected: - iterator_on_points_base(); + iterator_on_points_base_(); }; # ifndef OLN_INCLUDE_ONLY template <typename Exact> - iterator_on_points_base<Exact>::iterator_on_points_base() + iterator_on_points_base_<Exact>::iterator_on_points_base_() { } Index: oln/draw/bresenham.hh --- oln/draw/bresenham.hh (revision 921) +++ oln/draw/bresenham.hh (working copy) @@ -29,10 +29,9 @@ # define OLN_DRAW_BRESENHAM_HH # include <oln/core/concept/image.hh> -# include <oln/core/gen/safe_image.hh> # include <oln/core/2d/line2d.hh> # include <oln/core/gen/single_value_image.hh> -// # include <oln/level/paste.hh> +# include <oln/level/paste.hh> @@ -45,7 +44,7 @@ // Fwd decl. template <typename I> - void bresenham(Mutable_Image& input, + void bresenham(Mutable_Image& in_out, const oln_point(I)& begin, const oln_point(I)& end, const oln_value(I)& value); @@ -56,18 +55,14 @@ { template <typename I> - void bresenham_(Mutable_Image& input, + void bresenham_(Mutable_Image& in_out, const oln_point(I)& begin, const oln_point(I)& end, const oln_value(I)& value) { - line2d l(begin, end); - safe_image input_(input); -// // FIXME: rec pb. -// single_value_image<typename I::pset, oln_value(I)> tmp(input.points(), value); -// level::paste((tmp | l), input); - typename line2d::piter p(l); // FIXME: Generalize with an 'assign' routine... - for_all(p) - input_(p) = value; + line2d line(begin, end); + single_value_image<line2d, oln_value(I)> line_image(line, value); + level::paste(line_image, in_out); + // FIXME: Make it as simple as level::paste(line2d(begin, end) + value, in_out); } } // end of namespace oln::draw::impl @@ -75,11 +70,11 @@ // Facade. template <typename I> - void bresenham(Mutable_Image& input, + void bresenham(Mutable_Image& in_out, const oln_point(I)& begin, const oln_point(I)& end, const oln_value(I)& value) { - impl::bresenham_(exact(input), begin, end, value); + impl::bresenham_(exact(in_out), begin, end, value); } # endif // ! OLN_INCLUDE_ONLY

17 years, 8 months

921: Enforce impl check in concepts.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Enforce impl check in concepts. * oln/core/rle/rle_pset.hh (box, impl_bbox): Fix. * oln/core/concept/iterator_on_points.hh, * oln/core/concept/generator.hh, * oln/core/concept/point.hh, * oln/core/concept/iterator.hh, * oln/core/concept/dpoint.hh, * oln/core/concept/point_set.hh (check__): New. * oln/core/gen/literal.hh (operator()): Use typedefs. * oln/core/internal/f_pset_plain.hh (box2d) : Fix. * oln/draw/bresenham.hh (fill): Move overload with values to... * oln/level/fill.hh: ...this new file. * oln/debug/fill.hh: New; extracted from oln/level/fill.hh. * oln/level/paste.hh; New. core/concept/dpoint.hh | 23 +++++++++- core/concept/generator.hh | 10 ++++ core/concept/iterator.hh | 19 ++++++++ core/concept/iterator_on_points.hh | 18 +++++++- core/concept/point.hh | 20 ++++++++ core/concept/point_set.hh | 15 ++++-- core/gen/literal.hh | 6 +- core/internal/f_pset_plain.hh | 9 ++-- core/rle/rle_pset.hh | 8 +-- debug/fill.hh | 61 +++++++++++++++++++++++++++ draw/bresenham.hh | 5 ++ level/fill.hh | 72 ++++++++++++-------------------- level/paste.hh | 83 +++++++++++++++++++++++++++++++++++++ 13 files changed, 284 insertions(+), 65 deletions(-) Index: oln/debug/fill.hh --- oln/debug/fill.hh (revision 0) +++ oln/debug/fill.hh (revision 0) @@ -0,0 +1,61 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_DEBUG_FILL_HH +# define OLN_DEBUG_FILL_HH + +# include <oln/core/concept/image.hh> + + +namespace oln +{ + + namespace debug + { + + template <typename I, typename V> + void fill(Mutable_Image& input, const V values[]); + + +# ifndef OLN_INCLUDE_ONLY + + template <typename I> + void fill(Mutable_Image& input, const oln_value(I)& value) + { + oln_piter(I) p(input.points()); + for_all(p) + input(p) = value; + } + +# endif // ! OLN_INCLUDE_ONLY + + } // end of namespace oln::debug + +} // end of namespace oln + + +#endif // ! OLN_DEBUG_FILL_HH Index: oln/core/rle/rle_pset.hh --- oln/core/rle/rle_pset.hh (revision 920) +++ oln/core/rle/rle_pset.hh (working copy) @@ -32,13 +32,11 @@ # include <utility> # include <oln/core/rle/rle_psite.hh> - # include <oln/core/internal/point_set_base.hh> - # include <oln/core/internal/iterator_on_points_base.hh> - # include <oln/core/gen/fbbox.hh> + namespace oln { @@ -61,7 +59,7 @@ { typedef P point; - typedef gen_box box; + typedef typename f_box_from_point_::ret box; typedef rle_pset_fwd_piter_ fwd_piter; typedef rle_pset_bkd_piter_ bkd_piter; }; @@ -145,7 +143,7 @@ const typename rle_pset::box& rle_pset::impl_bbox() const { - return fb_; + return fb_.box(); } template <typename P> Index: oln/core/concept/iterator_on_points.hh --- oln/core/concept/iterator_on_points.hh (revision 920) +++ oln/core/concept/iterator_on_points.hh (working copy) @@ -50,12 +50,15 @@ point to_point() const; const point* point_adr() const; - // Default. + // Final. operator point() const; protected: Iterator_on_Points(); + private: + void check__() const; + }; // end of class oln::Iterator_on_Points<Exact> @@ -91,6 +94,17 @@ Iterator_on_Points<Exact>::Iterator_on_Points() { mlc::assert_< mlc_is_a(typename Iterator_on_Points<Exact>::point, Point) >::check(); + this->check__(); + } + + template <typename Exact> + void Iterator_on_Points<Exact>::check__() const + { + point (Exact::*impl_to_point_adr)() const = & Exact::impl_to_point; + impl_to_point_adr = 0; + const point* (Exact::*impl_point_adr_adr)() const = & Exact::impl_point_adr; + impl_point_adr_adr = 0; + // FIXME: & Exact::operator point... } template <typename Exact> @@ -99,7 +113,7 @@ return ostr << pit.to_point(); } -# endif +# endif // ! OLN_INCLUDE_ONLY } // end of namespace oln Index: oln/core/concept/generator.hh --- oln/core/concept/generator.hh (revision 920) +++ oln/core/concept/generator.hh (working copy) @@ -41,6 +41,9 @@ { protected: Generator(); + + private: + void check__() const; }; @@ -50,6 +53,13 @@ template <typename Exact> Generator<Exact>::Generator() { + this->check__(); + } + + template <typename Exact> + void Generator<Exact>::check__() const + { + // FIXME: Is it possible to check Exact's body? } # endif // ! OLN_INCLUDE_ONLY Index: oln/core/concept/iterator.hh --- oln/core/concept/iterator.hh (revision 920) +++ oln/core/concept/iterator.hh (working copy) @@ -54,6 +54,9 @@ protected: Iterator(); + private: + void check__() const; + }; // end of class oln::Iterator<Exact> @@ -88,9 +91,23 @@ template <typename Exact> Iterator<Exact>::Iterator() { + this->check__(); + } + + template <typename Exact> + void Iterator<Exact>::check__() const + { + void (Exact::*impl_start_adr)() = & Exact::impl_start; + impl_start_adr = 0; + void (Exact::*impl_next_adr)() = & Exact::impl_next; + impl_next_adr = 0; + void (Exact::*impl_invalidate_adr)() = & Exact::impl_invalidate; + impl_invalidate_adr = 0; + bool (Exact::*impl_is_valid_adr)() const = & Exact::impl_is_valid; + impl_is_valid_adr = 0; } -# endif +# endif // ! OLN_INCLUDE_ONLY } // end of namespace oln Index: oln/core/concept/point.hh --- oln/core/concept/point.hh (revision 920) +++ oln/core/concept/point.hh (working copy) @@ -69,6 +69,9 @@ protected: Point(); + private: + void check__() const; + }; // end of oln::Point<Exact> @@ -158,12 +161,29 @@ template <typename Exact> Point<Exact>::Point() { + this->check__(); + // FIXME: Uncomment! // mlc::assert_defined_< oln_vtype(Exact, grid) >::check(); // mlc::assert_defined_< oln_vtype(Exact, dPoint) >::check(); // mlc::assert_defined_< oln_vtype(Exact, coord) >::check(); // mlc::assert_defined_< oln_vtype(Exact, dim) >::check(); } + template <typename Exact> + void Point<Exact>::check__() const + { + bool (Exact::*impl_op_equal_adr)(const Exact& rhs) const = & Exact::impl_op_equal_; + impl_op_equal_adr = 0; + bool (Exact::*impl_op_less_adr)(const Exact& rhs) const = & Exact::impl_op_less_; + impl_op_less_adr = 0; + Exact& (Exact::*impl_op_plus_equal_adr)(const dpoint& rhs) = & Exact::impl_op_plus_equal_; + impl_op_plus_equal_adr = 0; + Exact& (Exact::*impl_op_minus_equal_adr)(const dpoint& rhs) = & Exact::impl_op_minus_equal_; + impl_op_minus_equal_adr = 0; + dpoint (Exact::*impl_op_minus_adr)(const Exact& rhs) const = & Exact::impl_op_minus_; + impl_op_minus_adr = 0; + } + template <typename P> typename P::dpoint operator-(const Point& lhs, const Point& rhs) Index: oln/core/concept/dpoint.hh --- oln/core/concept/dpoint.hh (revision 920) +++ oln/core/concept/dpoint.hh (working copy) @@ -77,6 +77,9 @@ protected: Dpoint(); + private: + void check__() const; + }; // end of oln::Dpoint<Exact> @@ -158,6 +161,8 @@ template <typename Exact> Dpoint<Exact>::Dpoint() { + this->check__(); + // FIXME: Uncomment! // mlc::assert_defined_< oln_vtype(Exact, grid) >::check(); // mlc::assert_defined_< oln_vtype(Exact, point) >::check(); // mlc::assert_defined_< oln_vtype(Exact, coord) >::check(); @@ -165,6 +170,22 @@ } + template <typename Exact> + void Dpoint<Exact>::check__() const + { + bool (Exact::*impl_op_equal_adr)(const Exact& rhs) const = & Exact::impl_op_equal_; + impl_op_equal_adr = 0; + bool (Exact::*impl_op_less_adr)(const Exact& rhs) const = & Exact::impl_op_less_; + impl_op_less_adr = 0; + Exact& (Exact::*impl_op_plus_equal_adr)(const Exact& rhs) = & Exact::impl_op_plus_equal_; + impl_op_plus_equal_adr = 0; + Exact& (Exact::*impl_op_minus_equal_adr)(const Exact& rhs) = & Exact::impl_op_minus_equal_; + impl_op_minus_equal_adr = 0; + Exact (Exact::*impl_op_unary_minus_adr)() const = & Exact::impl_op_unary_minus_; + impl_op_unary_minus_adr = 0; + } + + /// \{ /// Operators. @@ -184,7 +205,7 @@ /// \} -# endif +# endif // ! OLN_INCLUDE_ONLY } // end of namespace oln Index: oln/core/concept/point_set.hh --- oln/core/concept/point_set.hh (revision 920) +++ oln/core/concept/point_set.hh (working copy) @@ -59,7 +59,9 @@ protected: Point_Set(); - ~Point_Set(); + + private: + void check__() const; }; // end of oln::Point_Set<Exact> @@ -115,13 +117,18 @@ template <typename Exact> Point_Set<Exact>::Point_Set() { + this->check__(); } template <typename Exact> - Point_Set<Exact>::~Point_Set() + void Point_Set<Exact>::check__() const { - // FIXME: check method impls. - // unsigned (Exact::*m)() const = & Exact::impl_npoints; + unsigned (Exact::*impl_npoints_adr)() const = & Exact::impl_npoints; + impl_npoints_adr = 0; + bool (Exact::*impl_has_adr)(const point& p) const = & Exact::impl_has; + impl_has_adr = 0; + const box& (Exact::*impl_bbox_adr)() const = & Exact::impl_bbox; + impl_bbox_adr = 0; } template <typename Exact> Index: oln/core/gen/literal.hh --- oln/core/gen/literal.hh (revision 920) +++ oln/core/gen/literal.hh (working copy) @@ -47,16 +47,16 @@ template <typename T> struct literal_ : public Generator< literal_<T> > { - typedef T result; + typedef const T& result; literal_(const T& val) : val_(val) {} - const result& operator()() const + result operator()() const { return this->val_; } - const result& value() const + result value() const { return this->val_; } Index: oln/core/internal/f_pset_plain.hh --- oln/core/internal/f_pset_plain.hh (revision 920) +++ oln/core/internal/f_pset_plain.hh (working copy) @@ -38,9 +38,10 @@ { // Fwd decls. - struct grid2d_rec; + struct grid2d; template <typename P> class box_; - typedef box_<point2d> box2d; + class box2d; + template <typename T> class image2d; template <typename T> class image2d_b; @@ -51,9 +52,9 @@ struct f_pset_plain__; template <typename T> - struct f_pset_plain__< grid2d_rec, box2d, T > + struct f_pset_plain__< grid2d, box2d, T > { - typedef image2d_b<T> ret; + typedef image2d/*_b*/<T> ret; // FIXME: this type is not always known! }; template <typename Ps, typename T> Index: oln/draw/bresenham.hh --- oln/draw/bresenham.hh (revision 920) +++ oln/draw/bresenham.hh (working copy) @@ -31,6 +31,8 @@ # include <oln/core/concept/image.hh> # include <oln/core/gen/safe_image.hh> # include <oln/core/2d/line2d.hh> +# include <oln/core/gen/single_value_image.hh> +// # include <oln/level/paste.hh> @@ -60,6 +62,9 @@ { line2d l(begin, end); safe_image input_(input); +// // FIXME: rec pb. +// single_value_image<typename I::pset, oln_value(I)> tmp(input.points(), value); +// level::paste((tmp | l), input); typename line2d::piter p(l); // FIXME: Generalize with an 'assign' routine... for_all(p) input_(p) = value; Index: oln/level/fill.hh --- oln/level/fill.hh (revision 920) +++ oln/level/fill.hh (working copy) @@ -49,27 +49,24 @@ namespace level { - /// Fwd decls. + // Fwd decls. template <typename I> - void fill(Mutable_Image& input, const oln_value(I)& value); - - template <typename I, typename V> - void fill(Mutable_Image& input, const V values[]); + void fill(Mutable_Image& target, /* with */ const oln_value(I)& value); template <typename I, typename J> - void fill(Mutable_Image& input, const Image<J>& ima); + void fill(Mutable_Image& target, /* with */ const Image<J>& data); template <typename I, typename F> - void fill(Mutable_Image& input, const Function_p2v<F>& fun); + void fill(Mutable_Image& target, /* with */ const Function_p2v<F>& fun); template <typename I, typename V, typename P> - void fill(Mutable_Image& input, V (*fun)(P)); + void fill(Mutable_Image& target, /* with */ V (*fun)(P)); // FIXME: Inactivated. // template <typename I> -// void fill(Value_Wise_Mutable_Image& input, const oln_value(I)& value); +// void fill(Value_Wise_Mutable_Image& target, const oln_value(I)& value); # ifndef OLN_INCLUDE_ONLY @@ -79,45 +76,36 @@ { template <typename I> - void fill_from_value_(Mutable_Image& input, const oln_value(I)& value) - { - oln_piter(I) p(input.points()); - for_all(p) - input(p) = value; - } - - template <typename I, typename V> - void fill_from_values_(Mutable_Image& input, const V values[]) + void fill_from_value_(Mutable_Image& target, const oln_value(I)& value) { - oln_piter(I) p(input.points()); - unsigned i = 0; + oln_piter(I) p(target.points()); for_all(p) - input(p) = values[i++]; + target(p) = value; } template <typename I, typename J> - void fill_from_image_(Mutable_Image& input, const Image<J>& ima) + void fill_from_image_(Mutable_Image& target, const Image<J>& data) { - oln_piter(I) p(input.points()); + oln_piter(I) p(target.points()); for_all(p) - input(p) = ima(p); + target(p) = data(p); } template <typename I, typename F> - void fill_from_function_(Mutable_Image& input, const F& f) + void fill_from_function_(Mutable_Image& target, const F& f) { - oln_piter(I) p(input.points()); + oln_piter(I) p(target.points()); for_all(p) - input(p) = f(p); + target(p) = f(p); } // template <typename I> -// void fill_(Value_Wise_Mutable_Image& input, +// void fill_(Value_Wise_Mutable_Image& target, // const oln_value(I)& value) // { -// oln_viter(I) v(input); +// oln_viter(I) v(target); // for_all(v) -// input.value_(v) = value; +// target.value_(v) = value; // } } // end of namespace oln::level::impl @@ -127,36 +115,30 @@ /// Facades. template <typename I> - void fill(Mutable_Image& input, const oln_value(I)& value) - { - impl::fill_from_value_(exact(input), value); - } - - template <typename I, typename V> - void fill(Mutable_Image& input, const V values[]) + void fill(Mutable_Image& target, const oln_value(I)& value) { - impl::fill_from_values_(exact(input), values); + impl::fill_from_value_(exact(target), value); } template <typename I, typename J> - void fill(Mutable_Image& input, const Image<J>& ima) + void fill(Mutable_Image& target, const Image<J>& data) { assert_same_grid_<I, J>::check(); - precondition(input.points() <= ima.points()); - impl::fill_from_image_(exact(input), exact(ima)); + precondition(target.points() <= data.points()); + impl::fill_from_image_(exact(target), exact(data)); } template <typename I, typename F> - void fill(Mutable_Image& input, const Function_p2v<F>& fun) + void fill(Mutable_Image& target, const Function_p2v<F>& fun) { - impl::fill_from_function_(exact(input), exact(fun)); + impl::fill_from_function_(exact(target), exact(fun)); } template <typename I, typename V, typename P> - void fill(Mutable_Image& input, V (*f)(P)) + void fill(Mutable_Image& target, V (*f)(P)) { mlc::assert_< mlc_is_a(P, Point) >::check(); // FIXME: Add err msg. - impl::fill_from_function_(exact(input), functorize_p2v(f)); + impl::fill_from_function_(exact(target), functorize_p2v(f)); } # endif // ! OLN_INCLUDE_ONLY Index: oln/level/paste.hh --- oln/level/paste.hh (revision 0) +++ oln/level/paste.hh (revision 0) @@ -0,0 +1,83 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_LEVEL_PASTE_HH +# define OLN_LEVEL_PASTE_HH + +# include <oln/core/concept/image.hh> + + +namespace oln +{ + + namespace level + { + + // Fwd decl. + + template <typename I, typename J> + void paste(const Image& data, /* in */ Mutable_Image<J>& destination); + + +# ifndef OLN_INCLUDE_ONLY + + namespace impl + { + + // Generic version. + + template <typename I, typename J> + void paste_(const Image& data, Mutable_Image<J>& destination) + { + oln_piter(I) p(data.points()); + for_all(p) + destination(p) = data(p); + } + + // FIXME: Fast version... + + } // end of namespace oln::level::impl + + + // Facade. + + template <typename I, typename J> + void paste(const Image& data, Mutable_Image<J>& destination) + { + assert_same_grid_<I, J>::check(); + precondition(data.points() <= destination.points()); + impl::paste_(exact(data), exact(destination)); + } + +# endif // ! OLN_INCLUDE_ONLY + + } // end of namespace oln::level + +} // end of namespace oln + + +#endif // ! OLN_LEVEL_PASTE_HH

17 years, 9 months

920: Fix CC_tarjan + test, sequential reconstruction.

by Ugo Jardonnet

Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Fix CC_tarjan + test, sequential reconstruction. * tests/algorithms/cc_tarjan.cc: . * oln/morpho/reconstruction.hh: New. * oln/morpho/cc_tarjan.hh: . * oln/io/pnm.hh: . oln/io/pnm.hh | 53 ++++++++++++++-------------- oln/morpho/cc_tarjan.hh | 9 +--- oln/morpho/reconstruction.hh | 78 ++++++++++++++++++++++++++++++++++++++++++ tests/algorithms/cc_tarjan.cc | 52 ++++++++++------------------ 4 files changed, 128 insertions(+), 64 deletions(-) Index: tests/algorithms/cc_tarjan.cc --- tests/algorithms/cc_tarjan.cc (revision 919) +++ tests/algorithms/cc_tarjan.cc (working copy) @@ -4,42 +4,30 @@ #include <oln/morpho/cc_tarjan.hh> -#include <oln/debug/print.hh> - - -template <typename I> -void set(I& ima, - int i, - int j) -{ - oln_point(I) p(i, j); - ima(p) = true; -} - int main() { using namespace oln; typedef image2d<bool> I; I ima(3, 3); - set(ima, 0, 0); - set(ima, 0, 1); - set(ima, 0, 2); - - set(ima, 2, 0); - set(ima, 2, 1); - set(ima, 2, 2); - - I out = morpho::cc_tarjan(ima + c4); - -// for (unsigned i; i < 3; i++) -// for (unsigned j; j < 3; j++) -// { -// if (i == 0) -// assert(ima(i, j) == 1); -// if (i == 1) -// assert(ima(i, j) == 0); -// if (i == 2) -// assert(ima(i, j) == 2); -// } + ima.at(0, 0) = true; + ima.at(0, 1) = true; + ima.at(0, 2) = true; + + ima.at(2, 0) = true; + ima.at(2, 1) = true; + ima.at(2, 2) = true; + + image2d<unsigned int> out = (morpho::cc_tarjan(ima + c4)).image(); + + for (unsigned i = 0; i < 3; i++) + for (unsigned j = 0; j < 3; j++) + { + if (i == 0) + assert(out.at(i, j) == 1); + if (i == 1) + assert(out.at(i, j) == 0); + if (i == 2) + assert(out.at(i, j) == 2); + } } Index: oln/morpho/reconstruction.hh --- oln/morpho/reconstruction.hh (revision 0) +++ oln/morpho/reconstruction.hh (revision 0) @@ -0,0 +1,78 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_MORPHO_RECONSTRUCTION_HH +# define OLN_MORPHO_RECONSTRUCTION_HH + +#include <oln/accumulator/max.hh> + +namespace oln +{ + + namespace morpho + { + + namespace impl + { + + template <typename I , typename J> + void // FIXME : slow version. + reconstruction_(const Image_with_Nbh& marker, + const Binary_Image& mask) + { + // first + oln_fwd_piter(I) p(input.points()); + for_all(p) + marker(p) = local(max, marker, p) && mask(p); // FIXME : local_sup. + + + // second + oln_bkd_piter(I) p(input.points()); + for_all(p) + marker(p) = local(max, marker, p) && mask(p); // FIXME : local_inf. + } + + } // end of namespace oln::morpho::impl + + template <typename I , typename J> + void + reconstruction(const Image_with_Nbh& marker, + const Binary_Image<J>& mask) + { + impl::reconstruction_(exact(mask), exact(marker)); + } + + } + +# endif // ! OLN_INCLUDE_ONLY + + } // end of namespace oln::morpho + +} // end of namespace oln + + +#endif // ! OLN_MORPHO_DILATION_HH Index: oln/morpho/cc_tarjan.hh --- oln/morpho/cc_tarjan.hh (revision 919) +++ oln/morpho/cc_tarjan.hh (working copy) @@ -10,7 +10,7 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // General Public License for more details. // -// You should have received a copy of the GNU General Public License +// You should have receiv a copy of the GNU General Public License // along with this library; see the file COPYING. If not, write to // the Free Software Foundation, 51 Franklin Street, Fifth Floor, // Boston, MA 02111-1307, USA. @@ -70,18 +70,15 @@ oln_bkd_piter(I) p(input.points()); for_all(p) { + parent(p) = p; if ( input(p) ) { - parent(p) = p; oln_niter(I) n(p, input); for_all(n) { - if ( input(n) ) - { - if ( is_processed(n) ) + if ( input(n) && is_processed(n) ) do_union(input ,n, p, parent); } - } is_processed(p) = true; } } Index: oln/io/pnm.hh --- oln/io/pnm.hh (revision 919) +++ oln/io/pnm.hh (working copy) @@ -33,8 +33,9 @@ # include <fstream> # include <string> -# include <oln/basics2d.hh> - +# include <oln/core/2d/image2d.hh> +# include <oln/core/2d/window2d.hh> +# include <oln/core/2d/neighb2d.hh> namespace oln { @@ -117,7 +118,7 @@ oln_coord(I) cols = 0; unsigned bits = 0; unsigned char c = 0; - oln_fwd_piter(I) p(ima.topo()); + oln_fwd_piter(I) p(ima.points()); for_all(p) { if (bits == 0) @@ -126,7 +127,7 @@ bits = 8; } ima(p) = (c & (1 << --bits)) ? false : true; - if (++cols >= int(ima.bbox().ncols())) + if (++cols >= int(ima.max_col())) cols = bits = 0; } } @@ -136,7 +137,7 @@ template <typename I> void load_pbm_ascii(std::ifstream& file, I& ima) { - oln_fwd_piter(I) p(ima.topo()); + oln_fwd_piter(I) p(ima.points()); for_all(p) ima(p) = (file.get() == '0'); } @@ -162,7 +163,7 @@ template <typename I> void load_pnm_raw_2d(std::ifstream& file, I& ima) { - int col = ima.pmin().col(); + int col = ima.col(); size_t len = ima.bbox().ncols(); for (int row = ima.pmin().row(); row <= ima.pmax().row(); ++row) file.read((char*)(ima.adr_at(row, col)), @@ -195,26 +196,26 @@ } - image2d<unsigned char> load_pgm(const std::string& filename) - { - std::ifstream file(filename.c_str()); - if (not file) - { - std::cerr << "error: file '" << filename - << "' not found!"; - abort(); - } - char type; - int nrows, ncols; - internal::read_pnm_header('2', '5', file, type, nrows, ncols); - image2d<unsigned char> ima(nrows, ncols); - if (type == '4') - internal::load_pnm_raw_2d(file, ima); - else - // type == '1' - internal::load_pnm_ascii(file, ima); - return ima; - } +// image2d<unsigned char> load_pgm(const std::string& filename) +// { +// std::ifstream file(filename.c_str()); +// if (not file) +// { +// std::cerr << "error: file '" << filename +// << "' not found!"; +// abort(); +// } +// char type; +// int nrows, ncols; +// internal::read_pnm_header('2', '5', file, type, nrows, ncols); +// image2d<unsigned char> ima(nrows, ncols); +// if (type == '4') +// internal::load_pnm_raw_2d(file, ima); +// else +// // type == '1' +// internal::load_pnm_ascii(file, ima); +// return ima; +// } } // end of namespace oln::io

17 years, 9 months

919: Add line2d, bresenham, the safe_image morpher, and underlying types.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add line2d, bresenham, the safe_image morpher, and underlying types. * oln/core/2d/line2d.hh, * oln/core/gen/safe_image.hh, * oln/core/internal/pset_adaptor.hh, * oln/draw, * oln/draw/bresenham.hh: New. * TODO: Augment. * oln/core/concept/image.hh (read_, write_): New. * oln/core/concept/image_identity.hh: Update. * oln/core/concept/generalised_point.hh (include): Fix. * oln/core/concept/point_set.hh (~Point_Set): New. * oln/core/concept/value.hh: Cosmetic changes. * oln/core/1d/array1d.hh (operator()): Remove. (array1d_): Fix. * oln/core/1d/image1d.hh, * oln/core/1d/image1d_b.hh: Update. * oln/core/1d/box1d.hh, * oln/core/1d/point1d.hh, * oln/core/2d/box2d.hh, * oln/core/2d/point2d.hh, * oln/core/gen/box.hh: Clean up. * oln/core/2d/image2d.hh, * oln/core/2d/image2d_b.hh (impl_write): New. * oln/core/gen/pset_compare.hh (op_leq_): New. * oln/core/gen/fbbox.hh (fbbox_): Fix. (box_t): New. (include): Add point_set_base. * oln/core/gen/single_value_image.hh, * oln/core/internal/box.hh: Cosmetic changes. * oln/core/internal/point_set_base.hh (f_box_from_point_): New. * oln/core/internal/op_image_restricted_to_pset.hh (impl_owns_): New. * oln/core/internal/point_set_std_based.hh (box): New in vtypes. (pset_std_based_fwd_piter_): Change inheritance to internal::iterator_on_points_base. Make the constructor argument type more general. (pset_std_based_bkd_piter_): Likewise. * oln/core/internal/image_base.hh (operator |): Add non-const versions. * oln/core/internal/iterator_on_points_base.hh: Add a FIXME. * oln/value/builtin.hh: Fix. TODO | 7 oln/core/1d/array1d.hh | 33 +--- oln/core/1d/box1d.hh | 6 oln/core/1d/image1d.hh | 17 +- oln/core/1d/image1d_b.hh | 13 + oln/core/1d/point1d.hh | 4 oln/core/2d/box2d.hh | 6 oln/core/2d/image2d.hh | 9 + oln/core/2d/image2d_b.hh | 9 + oln/core/2d/line2d.hh | 161 +++++++++++++++++++ oln/core/2d/point2d.hh | 6 oln/core/concept/generalised_point.hh | 3 oln/core/concept/image.hh | 20 ++ oln/core/concept/image_identity.hh | 18 +- oln/core/concept/point_set.hh | 8 oln/core/concept/value.hh | 2 oln/core/gen/box.hh | 11 - oln/core/gen/fbbox.hh | 19 +- oln/core/gen/pset_compare.hh | 25 ++- oln/core/gen/safe_image.hh | 187 +++++++++++++++++++++++ oln/core/gen/single_value_image.hh | 2 oln/core/internal/box.hh | 6 oln/core/internal/image_base.hh | 21 ++ oln/core/internal/iterator_on_points_base.hh | 2 oln/core/internal/op_image_restricted_to_pset.hh | 10 + oln/core/internal/point_set_base.hh | 22 ++ oln/core/internal/point_set_std_based.hh | 31 ++- oln/core/internal/pset_adaptor.hh | 135 ++++++++++++++++ oln/draw/bresenham.hh | 87 ++++++++++ oln/value/builtin.hh | 16 + 30 files changed, 804 insertions(+), 92 deletions(-) Index: TODO --- TODO (revision 918) +++ TODO (working copy) @@ -12,7 +12,7 @@ function, an accessor, a projection, etc.) basics important routines: fill, assign, clone, unmorph (undress?), -convert, ... +convert, ... + add 'with' to disambiguate torus and mask types, and the proper niter type deductions (with or without virtual border) @@ -30,7 +30,10 @@ meta-window type; for instance, ball, segment, etc. -const promotions for op_<L,O,R> types +const promotions for op_<L,O,R> types + result is Mutable only +if the underlying type is not 'const' + +in image_identity.hh use 'current' * Tiny improvements Index: oln/core/concept/image.hh --- oln/core/concept/image.hh (revision 918) +++ oln/core/concept/image.hh (working copy) @@ -133,6 +133,7 @@ bool owns_(const psite& p) const; rvalue operator()(const psite& p) const; + rvalue read_(const psite& p) const; const pset& points() const; @@ -183,10 +184,12 @@ public automatic::get_impl<Mutable_Image, Exact> { stc_using_from(Image, psite); + stc_using_from(Image, value); using Image<Exact>::operator(); stc_typename(lvalue); lvalue operator()(const psite& p); + void write_(const psite& p, const value& v); protected: Mutable_Image(); @@ -438,6 +441,14 @@ } template <typename Exact> + typename Image<Exact>::rvalue + Image<Exact>::read_(const typename Image<Exact>::psite& p) const + { + precondition(this->owns_(p)); + return exact(this)->impl_read(p); + } + + template <typename Exact> const typename Image<Exact>::box& Image<Exact>::bbox() const { @@ -502,6 +513,15 @@ } template <typename Exact> + void + Mutable_Image<Exact>::write_(const typename Mutable_Image<Exact>::psite& p, + const typename Mutable_Image<Exact>::value& v) + { + precondition(this->owns_(p)); + exact(this)->impl_write(p, v); + } + + template <typename Exact> Mutable_Image<Exact>::Mutable_Image() { } Index: oln/core/concept/image_identity.hh --- oln/core/concept/image_identity.hh (revision 918) +++ oln/core/concept/image_identity.hh (working copy) @@ -85,7 +85,9 @@ { stc_typename(psite); stc_typename(lvalue); + stc_typename(value); lvalue impl_read_write(const psite& p); + void impl_write(const psite& p, const value& v); }; @@ -228,13 +230,25 @@ /// Concept-class "Mutable_Image". +# define current set_impl< Mutable_Image, behavior::identity, Exact > + template <typename Exact> - typename set_impl< Mutable_Image, behavior::identity, Exact >::lvalue - set_impl< Mutable_Image, behavior::identity, Exact >::impl_read_write(const typename set_impl< Mutable_Image, behavior::identity, Exact >::psite& p) + typename current::lvalue + current::impl_read_write(const typename current::psite& p) { return exact(this)->image().operator()(p); } + template <typename Exact> + void + current::impl_write(const typename current::psite& p, + const typename current::value& v) + { + return exact(this)->image().write_(p, v); + } + +# undef current + /// Concept-class "Fast_Image". Index: oln/core/concept/generalised_point.hh --- oln/core/concept/generalised_point.hh (revision 918) +++ oln/core/concept/generalised_point.hh (working copy) @@ -28,6 +28,9 @@ #ifndef OLN_CORE_CONCEPT_GENERALISED_POINTS_HH # define OLN_CORE_CONCEPT_GENERALISED_POINTS_HH +# include <oln/core/equipment.hh> + + namespace oln { Index: oln/core/concept/point_set.hh --- oln/core/concept/point_set.hh (revision 918) +++ oln/core/concept/point_set.hh (working copy) @@ -59,6 +59,7 @@ protected: Point_Set(); + ~Point_Set(); }; // end of oln::Point_Set<Exact> @@ -117,6 +118,13 @@ } template <typename Exact> + Point_Set<Exact>::~Point_Set() + { + // FIXME: check method impls. + // unsigned (Exact::*m)() const = & Exact::impl_npoints; + } + + template <typename Exact> Box<Exact>::Box() { } Index: oln/core/concept/value.hh --- oln/core/concept/value.hh (revision 918) +++ oln/core/concept/value.hh (working copy) @@ -70,7 +70,7 @@ { } -# endif +# endif // ! OLN_INCLUDE_ONLY } // end of namespace oln Index: oln/core/1d/array1d.hh --- oln/core/1d/array1d.hh (revision 918) +++ oln/core/1d/array1d.hh (working copy) @@ -59,11 +59,8 @@ /// Dtor. ~array1d_(); - const T& operator()(C i) const; - T& operator()(C i); - - const T& operator[](std::size_t ind) const; - T& operator[](std::size_t ind); + const T& operator[](C i) const; + T& operator[](C i); bool has(C i) const; @@ -119,36 +116,22 @@ } template <typename T, typename C> - const T& array1d_<T, C>::operator()(C i) const + const T& array1d_<T, C>::operator[](C i) const { + precondition(buffer_ != 0); precondition(has(i)); return buffer_[i]; } template <typename T, typename C> - T& array1d_<T, C>::operator()(C i) + T& array1d_<T, C>::operator[](C i) { + precondition(buffer_ != 0); precondition(has(i)); return buffer_[i]; } template <typename T, typename C> - const T& array1d_<T, C>::operator[](std::size_t ind) const - { - precondition(buffer_ != 0); - precondition(ind < len_); - return buffer_[ind]; - } - - template <typename T, typename C> - T& array1d_<T, C>::operator[](std::size_t ind) - { - precondition(buffer_ != 0); - precondition(ind < len_); - return buffer_[ind]; - } - - template <typename T, typename C> bool array1d_<T, C>::has(C i) const { return i >= imin_ and i <= imax_; @@ -195,17 +178,19 @@ void array1d_<T, C>::allocate_() { buffer_ = new T[len_]; + buffer_ -= imin_; } template <typename T, typename C> void array1d_<T, C>::deallocate_() { precondition(buffer_ != 0); + buffer_ += imin_; delete[] buffer_; buffer_ = 0; // safety } -# endif +# endif // ! OLN_INCLUDE_ONLY } // end of namespace oln Index: oln/core/1d/image1d.hh --- oln/core/1d/image1d.hh (revision 918) +++ oln/core/1d/image1d.hh (working copy) @@ -95,6 +95,8 @@ T& impl_read_write(const point1d& p); T& impl_index_read_write(unsigned i); + void impl_write(const point1d& p, const T& v); + std::size_t impl_npoints() const; const box1d& impl_points() const; @@ -135,7 +137,7 @@ const T& image1d<T>::impl_read(const point1d& p) const { assert(this->has_data()); - return this->data_->first.operator()(p.ind()); + return this->data_->first[p.ind()]; } template <typename T> @@ -143,14 +145,14 @@ { assert(this->has_data()); assert(i < this->npoints()); - return this->data_->first.operator[](i); + return this->data_->first[i]; } template <typename T> T& image1d<T>::impl_read_write(const point1d& p) { assert(this->has_data()); - return this->data_->first.operator()(p.ind()); + return this->data_->first[p.ind()]; } template <typename T> @@ -158,7 +160,14 @@ { assert(this->has_data()); assert(i < this->npoints()); - return this->data_->first.operator[](i); + return this->data_->first[i]; + } + + template <typename T> + void image1d<T>::impl_write(const point1d& p, const T& v) + { + assert(this->has_data()); + this->data_->first[p.ind()] = v; } template <typename T> Index: oln/core/1d/image1d_b.hh --- oln/core/1d/image1d_b.hh (revision 918) +++ oln/core/1d/image1d_b.hh (working copy) @@ -103,6 +103,8 @@ T& impl_read_write(const point1d& p); T& impl_index_read_write(unsigned i); + void impl_write(const point1d& p, const T& v); + std::size_t impl_npoints() const; const box1d& impl_points() const; @@ -149,7 +151,7 @@ const T& image1d_b<T>::impl_read(const point1d& p) const { assert(this->has_data()); - return this->data_->first(p.ind()); + return this->data_->first[p.ind()]; } template <typename T> @@ -164,7 +166,7 @@ T& image1d_b<T>::impl_read_write(const point1d& p) { assert(this->has_data()); - return this->data_->first(p.ind()); + return this->data_->first[p.ind()]; } template <typename T> @@ -176,6 +178,13 @@ } template <typename T> + void image1d_b<T>::impl_write(const point1d& p, const T& v) + { + assert(this->has_data()); + this->data_->first[p.ind()] = v; + } + + template <typename T> const box1d& image1d_b<T>::impl_points() const { assert(this->has_data()); Index: oln/core/1d/box1d.hh --- oln/core/1d/box1d.hh (revision 918) +++ oln/core/1d/box1d.hh (working copy) @@ -35,14 +35,13 @@ namespace oln { - // Forward declarations - struct box1d; + // Fwd decl. + class box1d; // Super type template <> struct super_trait_< box1d > { - typedef box1d current; typedef internal::box_<box1d> ret; }; @@ -57,7 +56,6 @@ // Class box1d class box1d : public internal::box_< box1d > { - typedef box1d current; typedef internal::box_< box1d > super; public: // Note: we can't use stc_using because box1d isn't a templated class Index: oln/core/1d/point1d.hh --- oln/core/1d/point1d.hh (revision 918) +++ oln/core/1d/point1d.hh (working copy) @@ -37,8 +37,8 @@ { - struct point1d; - struct dpoint1d; + class point1d; + class dpoint1d; /// Super type. Index: oln/core/2d/image2d.hh --- oln/core/2d/image2d.hh (revision 918) +++ oln/core/2d/image2d.hh (working copy) @@ -99,6 +99,8 @@ T& impl_index_read_write(unsigned i); T& impl_at(int row, int col); + void impl_write(const point2d& p, const T& v); + std::size_t impl_npoints() const; const box2d& impl_points() const; @@ -192,6 +194,13 @@ } template <typename T> + void image2d<T>::impl_write(const point2d& p, const T& v) + { + assert(this->has_data()); + this->data_->first(p.row(), p.col()) = v; + } + + template <typename T> std::size_t image2d<T>::impl_npoints() const { // faster than the default code given by primitive_image_ Index: oln/core/2d/image2d_b.hh --- oln/core/2d/image2d_b.hh (revision 918) +++ oln/core/2d/image2d_b.hh (working copy) @@ -104,6 +104,8 @@ T& impl_index_read_write(unsigned i); T& impl_at(int row, int col); + void impl_write(const point2d& p, const T& v); + std::size_t impl_npoints() const; const box2d& impl_points() const; @@ -210,6 +212,13 @@ } template <typename T> + void image2d_b<T>::impl_write(const point2d& p, const T& v) + { + assert(this->has_data()); + this->data_->first(p.row(), p.col()) = v; + } + + template <typename T> const box2d& image2d_b<T>::impl_points() const { assert(this->has_data()); Index: oln/core/2d/line2d.hh --- oln/core/2d/line2d.hh (revision 0) +++ oln/core/2d/line2d.hh (revision 0) @@ -0,0 +1,161 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_2D_LINE2D_HH +# define OLN_CORE_2D_LINE2D_HH + +# include <oln/core/2d/box2d.hh> +# include <oln/core/internal/pset_adaptor.hh> +# include <oln/core/gen/pvec.hh> + + +namespace oln +{ + + // FIXME: Move it! + namespace util + { + template <typename T> + int sign(const T& t) + { + if (t != 0) + return t > 0 ? 1 : -1; + else + return 0; + } + + } // end of namespace oln::util + + + + // Fwd decl. + class line2d; + + + // Super type. + template <> + struct super_trait_< line2d > + { + typedef internal::pset_adaptor_<line2d> ret; + }; + + + // Virtual types. + template <> + struct vtypes< line2d > + { + typedef pvec_<point2d> adapted; + }; + + class line2d : public internal::pset_adaptor_<line2d> + { + public: + + line2d(const point2d& begin, const point2d& end); + const point2d& begin_point() const; + const point2d& end_point() const; + + const pvec_<point2d>& pvec() const; + const std::vector<point2d>& con() const { return this->ps_.con(); } + + protected: + point2d beg_, end_; + void compute_(); // FIXME: we also need a semi_open_line (without the end point)... + }; + + +# ifndef OLN_INCLUDE_ONLY + + line2d::line2d(const point2d& begin, + const point2d& end) + : beg_(begin), + end_(end) + { + this->compute_(); + } + + const point2d& + line2d::begin_point() const + { + return this->beg_; + } + + const point2d& + line2d::end_point() const + { + return this->end_; + } + + void + line2d::compute_() + { + dpoint2d dp = this->end_ - this->beg_; + int + srow = util::sign(dp.row()), drow = std::abs(dp.row()), ddrow = 2 * drow, + scol = util::sign(dp.col()), dcol = std::abs(dp.col()), ddcol = 2 * dcol, + row = this->beg_.row(), + col = this->beg_.row(); + + if ( dcol > drow ) + { + int e = ddrow - dcol; + for (int i = 0; i < dcol; ++i) + { + this->ps_.append(point2d(row, col)); + while (e >= 0) + { + row += srow; + e -= ddcol; + } + col += scol; + e += ddrow; + } + } + else + { + int e = ddcol - drow; + for (int i = 0; i < drow; ++i) + { + this->ps_.append(point2d(row, col)); + while (e >= 0) + { + col += scol; + e -= ddrow; + } + row += srow; + e += ddcol; + } + } + this->ps_.append(point2d(row, col)); + } + +# endif // ! OLN_INCLUDE_ONLY + + +} // end of namespace oln + +#endif // ! OLN_CORE_2D_LINE2D_HH Index: oln/core/2d/box2d.hh --- oln/core/2d/box2d.hh (revision 918) +++ oln/core/2d/box2d.hh (working copy) @@ -36,14 +36,13 @@ namespace oln { - // Forward declarations - struct box2d; + // Fwd decl. + class box2d; // Super type template <> struct super_trait_< box2d > { - typedef box2d current; typedef internal::box_<box2d> ret; }; @@ -58,7 +57,6 @@ // Class box2d class box2d : public internal::box_< box2d > { - typedef box2d current; typedef internal::box_< box2d > super; public: // Note: we can't use stc_using because box2d isn't a templated class Index: oln/core/2d/point2d.hh --- oln/core/2d/point2d.hh (revision 918) +++ oln/core/2d/point2d.hh (working copy) @@ -37,8 +37,8 @@ { - struct point2d; - struct dpoint2d; + class point2d; + class dpoint2d; /// Super type. @@ -93,7 +93,7 @@ this->col() = dat->second.value; } -# endif // OLN_INCLUDE_ONLY +# endif // ! OLN_INCLUDE_ONLY } // end of namespace oln Index: oln/core/gen/pset_compare.hh --- oln/core/gen/pset_compare.hh (revision 918) +++ oln/core/gen/pset_compare.hh (working copy) @@ -90,18 +90,14 @@ } - // Point_Set L < Point_Set R - // ----------------------------- - - // Generic version. + // Point_Set L <= Point_Set R template <typename L, typename R> - bool op_less_(const Point_Set<L>& lhs, const Point_Set<R>& rhs) + bool op_leq_(const Point_Set<L>& lhs, const Point_Set<R>& rhs) { - if (lhs.npoints() >= rhs.npoints()) // quick test + if (lhs.npoints() > rhs.npoints()) // quick test return false; - // we have lhs.npoints() < rhs.npoints() - // so we shall now test that all points of lhs are IN rhs + // all points of lhs are IN rhs? oln_piter(R) p_rhs(rhs); p_rhs.start(); oln_piter(L) p_lhs(lhs); @@ -116,6 +112,19 @@ } + // Point_Set L < Point_Set R + + template <typename L, typename R> + bool op_less_(const Point_Set<L>& lhs, const Point_Set<R>& rhs) + { + return op_leq_(lhs, rhs) and lhs.npoints() < rhs.npoints(); + } + + + + + + // Box L <= Box R. Index: oln/core/gen/box.hh --- oln/core/gen/box.hh (revision 918) +++ oln/core/gen/box.hh (working copy) @@ -38,11 +38,11 @@ { - // Forward declarations. + // Fwd decl. template <typename P> class gen_box; - // Super type declaration. + // Super type. template <typename P> struct super_trait_< gen_box > { @@ -51,7 +51,7 @@ }; - /// Virtual types associated to oln::gen_box. + /// Virtual types. template <typename P> struct vtypes< gen_box > { @@ -88,10 +88,6 @@ # ifndef OLN_INCLUDE_ONLY - - // -------------------- gen_box - - template <typename P> gen_box::gen_box() { @@ -118,7 +114,6 @@ # endif // !OLN_INCLUDE_ONLY - } // end of namespace oln Index: oln/core/gen/fbbox.hh --- oln/core/gen/fbbox.hh (revision 918) +++ oln/core/gen/fbbox.hh (working copy) @@ -31,6 +31,7 @@ # include <oln/core/gen/box.hh> # include <oln/core/concept/point.hh> +# include <oln/core/internal/point_set_base.hh> namespace oln @@ -48,17 +49,19 @@ public: + typedef typename f_box_from_point_::ret box_t; + fbbox_(); - operator gen_box() const; + operator box_t() const; bool is_valid() const; void flush(); fbbox_& take(const P& p); - const gen_box& box() const; + const box_t& box() const; private: bool is_valid_; - gen_box b_; + box_t b_; }; // end of class oln::fbbox_ @@ -73,7 +76,7 @@ } template <typename P> - fbbox_::operator gen_box() const + fbbox_::operator typename fbbox_::box_t() const { precondition(this->is_valid_); return this->b_; @@ -92,7 +95,8 @@ } template <typename P> - fbbox_& fbbox_::take(const P& p) + fbbox_& + fbbox_::take(const P& p) { if (not this->is_valid_) { @@ -112,13 +116,14 @@ } template <typename P> - const gen_box& fbbox_::box() const + const typename fbbox_::box_t& + fbbox_::box() const { precondition(this->is_valid_); return this->b_; } -# endif +# endif // ! OLN_INCLUDE_ONLY } // end of namespace oln Index: oln/core/gen/single_value_image.hh --- oln/core/gen/single_value_image.hh (revision 918) +++ oln/core/gen/single_value_image.hh (working copy) @@ -146,7 +146,7 @@ this->data_->second = new_value; } -# endif // OLN_INCLUDE_ONLY +# endif // ! OLN_INCLUDE_ONLY } // end of namespace oln Index: oln/core/gen/safe_image.hh --- oln/core/gen/safe_image.hh (revision 0) +++ oln/core/gen/safe_image.hh (revision 0) @@ -0,0 +1,187 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_GEN_SAFE_IMAGE_HH +# define OLN_CORE_GEN_SAFE_IMAGE_HH + +# include <oln/core/internal/image_base.hh> + + +namespace oln +{ + + + // Fwd decl. + template <typename I> class safe_image; + + + /// Virtual types. + template <typename I> + struct vtypes< safe_image > + { + typedef I delegatee; + typedef behavior::identity behavior; + + typedef internal::singleton data; + + typedef safe_image< oln_plain(I) > plain; + typedef safe_image< pl::rec > skeleton; + }; + + + /// Super type. + template <typename I> + struct super_trait_< safe_image > + { + typedef safe_image current; + typedef internal::single_image_morpher_<current> ret; + }; + + + /// Class for images defined by a point set and a single value. + + template <typename I> + class safe_image : public internal::single_image_morpher_< safe_image > + { + typedef safe_image current; + typedef internal::single_image_morpher_<current> super; + public: + + stc_using(point); + stc_using(rvalue); + stc_using(lvalue); + stc_using(value); + stc_using(data); + stc_using(delegatee); + + safe_image(); + safe_image(Mutable_Image& ima); + + bool impl_owns_(const point& p) const; + + rvalue impl_read(const point& p) const; + lvalue impl_read_write(const point& p); + void impl_write(const point& p, const value& v); + + delegatee& impl_image(); + const delegatee& impl_image() const; + + }; // end of safe_image + + + + template <typename I> + safe_image safe(Mutable_Image& ima) + { + safe_image tmp(ima); + return tmp; + } + + + +# ifndef OLN_INCLUDE_ONLY + + template <typename I> + safe_image::safe_image() + { + } + + template <typename I> + safe_image::safe_image(Mutable_Image& ima) + { + precondition(exact(ima).has_data()); + this->data_ = new data(exact(ima)); + } + + template <typename I> + bool + safe_image::impl_owns_(const typename safe_image::point&) const + { + assert(this->has_data()); + return true; // always! + } + + template <typename I> + typename safe_image::rvalue + safe_image::impl_read(const typename safe_image::point& p) const + { + assert(this->has_data()); + assert(this->image().has_data()); + static oln_value(I) tmp; + if (this->image().owns_(p)) + return this->image()(p); + else + return tmp; + } + + template <typename I> + typename safe_image::lvalue + safe_image::impl_read_write(const typename safe_image::point& p) + { + assert(this->has_data()); + assert(this->image().has_data()); + static oln_value(I) tmp; + if (this->image().owns_(p)) + return this->image()(p); + else + return tmp; + } + + template <typename I> + void + safe_image::impl_write(const typename safe_image::point& p, + const typename safe_image::value& v) + { + assert(this->has_data()); + assert(this->image().has_data()); + static oln_value(I) tmp; + if (this->image().owns_(p)) + this->image().write_(p, v); + } + + template <typename I> + typename safe_image::delegatee& + safe_image::impl_image() + { + assert(this->has_data()); + return this->data_->value; + } + + template <typename I> + const typename safe_image::delegatee& + safe_image::impl_image() const + { + assert(this->has_data()); + return this->data_->value; + } + +# endif // ! OLN_INCLUDE_ONLY + +} // end of namespace oln + + +#endif // ! OLN_CORE_GEN_SAFE_IMAGE_HH Index: oln/core/internal/box.hh --- oln/core/internal/box.hh (revision 918) +++ oln/core/internal/box.hh (working copy) @@ -61,7 +61,9 @@ namespace internal { - /// Generic box class based on a point class. + + /// Base implementation class for box types. + template <typename Exact> class box_ : public point_set_base_< Exact > { @@ -71,7 +73,6 @@ stc_using(point); stc_using(box); - typedef internal::initializer_< internal::pair< internal::from_t<point>, internal::to_t<point> > > from_to_t; @@ -82,7 +83,6 @@ public: enum { n = mlc_value(dim__) }; - unsigned impl_npoints() const; bool impl_has(const point& p) const; const Exact& impl_bbox() const; Index: oln/core/internal/point_set_base.hh --- oln/core/internal/point_set_base.hh (revision 918) +++ oln/core/internal/point_set_base.hh (working copy) @@ -34,6 +34,28 @@ namespace oln { + // function : point -> box + + template <typename P> class gen_box; + + template <typename P> + struct f_box_from_point_ { typedef gen_box ret; }; + + class point1d; + class box1d; + + template <> + struct f_box_from_point_< point1d > { typedef box1d ret; }; + + class point2d; + class box2d; + + template <> + struct f_box_from_point_< point2d > { typedef box2d ret; }; + + // FIXME: Move the code above elsewhere. + + namespace internal { Index: oln/core/internal/op_image_restricted_to_pset.hh --- oln/core/internal/op_image_restricted_to_pset.hh (revision 918) +++ oln/core/internal/op_image_restricted_to_pset.hh (working copy) @@ -79,12 +79,14 @@ public: stc_using(pset); stc_using(box); + stc_using(psite); stc_using(data); stc_using(delegatee); delegatee& impl_image(); const delegatee& impl_image() const; + bool impl_owns_(const psite& p) const; const pset& impl_points() const; protected: @@ -134,6 +136,14 @@ } template <typename I, typename S> + bool + current::impl_owns_(const typename current::psite& p) const + { + assert(this->has_data()); + return this->has(p); + } + + template <typename I, typename S> typename current::delegatee& current::impl_image() { Index: oln/core/internal/point_set_std_based.hh --- oln/core/internal/point_set_std_based.hh (revision 918) +++ oln/core/internal/point_set_std_based.hh (working copy) @@ -32,7 +32,7 @@ # include <algorithm> # include <oln/core/internal/point_set_base.hh> -# include <oln/core/concept/iterator_on_points.hh> +# include <oln/core/internal/iterator_on_points_base.hh> # include <oln/core/gen/fbbox.hh> @@ -61,9 +61,12 @@ typedef stc::abstract std_container; typedef stc_deferred(std_container) std_container__; - typedef stc::final< typename std_container__::value_type > point; + typedef typename std_container__::value_type point__; + + typedef stc::final< point__ > point; typedef stc::final< pset_std_based_fwd_piter_<std_container__> > fwd_piter; typedef stc::final< pset_std_based_bkd_piter_<std_container__> > bkd_piter; + typedef stc::final< typename f_box_from_point_<point__>::ret > box; }; @@ -173,14 +176,14 @@ struct super_trait_< pset_std_based_fwd_piter_<C> > { typedef pset_std_based_fwd_piter_<C> current__; - typedef Iterator_on_Points<current__> ret; + typedef internal::iterator_on_points_base<current__> ret; }; template <typename C> struct super_trait_< pset_std_based_bkd_piter_<C> > { typedef pset_std_based_bkd_piter_<C> current__; - typedef Iterator_on_Points<current__> ret; + typedef internal::iterator_on_points_base<current__> ret; }; @@ -203,16 +206,16 @@ // Class pset_std_based_fwd_piter_<C>. template <typename C> - class pset_std_based_fwd_piter_ : public Iterator_on_Points< pset_std_based_fwd_piter_<C> > + class pset_std_based_fwd_piter_ : public internal::iterator_on_points_base< pset_std_based_fwd_piter_<C> > { typedef pset_std_based_fwd_piter_<C> current; - typedef Iterator_on_Points<current> super; + typedef internal::iterator_on_points_base<current> super; public: stc_using(point); template <typename Ps> - pset_std_based_fwd_piter_(const internal::point_set_std_based_<Ps>& con); + pset_std_based_fwd_piter_(const Point_Set<Ps>& pset); void impl_start(); void impl_next(); @@ -232,16 +235,16 @@ // Class pset_std_based_bkd_piter_<C>. template <typename C> - class pset_std_based_bkd_piter_ : public Iterator_on_Points< pset_std_based_bkd_piter_<C> > + class pset_std_based_bkd_piter_ : public internal::iterator_on_points_base< pset_std_based_bkd_piter_<C> > { typedef pset_std_based_bkd_piter_<C> current; - typedef Iterator_on_Points<current> super; + typedef internal::iterator_on_points_base<current> super; public: stc_using(point); template <typename Ps> - pset_std_based_bkd_piter_(const internal::point_set_std_based_<Ps>& pts); + pset_std_based_bkd_piter_(const Point_Set<Ps>& pts); void impl_start(); void impl_next(); @@ -268,8 +271,8 @@ template <typename C> template <typename Ps> - pset_std_based_fwd_piter_<C>::pset_std_based_fwd_piter_(const internal::point_set_std_based_<Ps>& pts) - : con_(pts.con()) + pset_std_based_fwd_piter_<C>::pset_std_based_fwd_piter_(const Point_Set<Ps>& pts) + : con_(exact(pts).con()) { this->it_ = this->con_.end(); } @@ -325,8 +328,8 @@ template <typename C> template <typename Ps> - pset_std_based_bkd_piter_<C>::pset_std_based_bkd_piter_(const internal::point_set_std_based_<Ps>& pts) - : con_(pts.con()) + pset_std_based_bkd_piter_<C>::pset_std_based_bkd_piter_(const Point_Set<Ps>& pts) + : con_(exact(pts).con()) { this->it_ = this->con_.rend(); } Index: oln/core/internal/image_base.hh --- oln/core/internal/image_base.hh (revision 918) +++ oln/core/internal/image_base.hh (working copy) @@ -506,6 +506,17 @@ return tmp; } + template <typename I, typename B, typename P> + op_<I, such_as, const fun_p2b_ > + operator | (Image& ima, B (*f)(P)) + { + typedef oln_strip_(P) P_; + mlc::assert_< mlc_is_a(P_, Point) >::check(); // FIXME: Add err msg. + mlc::assert_equal_< P_, oln_point(I) >::check(); + op_<I, such_as, const fun_p2b_ > tmp(exact(ima), f); + return tmp; + } + // Specialization "Image such_as ima : P -> B". @@ -519,6 +530,16 @@ return tmp; } + template <typename I, typename J> + op_<I, such_as, const fun_p2b_< Binary_Image<J> > > + operator | (Image& ima, const Binary_Image<J>& f_ima_b) + { + precondition(f_ima_b.points() >= ima.points()); + mlc::assert_equal_< oln_point(I), oln_point(J) >::check(); + op_<I, such_as, const fun_p2b_< Binary_Image<J> > > tmp(exact(ima), f_ima_b); + return tmp; + } + // FIXME: What about Mutable_Image so that "ima | something" can be left-value? Index: oln/core/internal/pset_adaptor.hh --- oln/core/internal/pset_adaptor.hh (revision 0) +++ oln/core/internal/pset_adaptor.hh (revision 0) @@ -0,0 +1,135 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_INTERNAL_PSET_ADAPTOR_HH +# define OLN_CORE_INTERNAL_PSET_ADAPTOR_HH + +# include <oln/core/internal/point_set_base.hh> + + +namespace oln +{ + + + // Fwd decl. + namespace internal { template <typename Exact> class pset_adaptor_; } + + + // Super type. + template <typename Exact> + struct super_trait_< internal::pset_adaptor_<Exact> > + { + typedef internal::point_set_base_<Exact> ret; + }; + + + // Virtual types. + template <typename Exact> + struct vtypes< internal::pset_adaptor_<Exact> > + { + typedef stc::abstract adapted; + + typedef stc_deferred(adapted) adapted__; + typedef stc::final< oln_point(adapted__) > point; + typedef stc::final< oln_fwd_piter(adapted__) > fwd_piter; + typedef stc::final< oln_bkd_piter(adapted__) > bkd_piter; + typedef stc::final< oln_box(adapted__) > box; + }; + + + namespace internal + { + + // Base implementation class for types of iterator on points + // defined over other types of iterator on points. + + template <typename Exact> + class pset_adaptor_ : public internal::point_set_base_<Exact> + { + typedef internal::point_set_base_<Exact> super; + public: + stc_typename(adapted); + + stc_using(point); + stc_using(box); + + unsigned impl_npoints() const; + bool impl_has(const point& p) const; + const box& impl_bbox() const; + + protected: + adapted ps_; + pset_adaptor_(); + pset_adaptor_(const adapted& ps); + + }; // end of class oln::internal::pset_adaptor_<Exact> + + + +# ifndef OLN_INCLUDE_ONLY + + template <typename Exact> + pset_adaptor_<Exact>::pset_adaptor_() + : ps_() + { + } + + template <typename Exact> + pset_adaptor_<Exact>::pset_adaptor_(const adapted& ps) + : ps_(ps) + { + } + + template <typename Exact> + unsigned + pset_adaptor_<Exact>::impl_npoints() const + { + return this->ps_.npoints(); + } + + template <typename Exact> + bool + pset_adaptor_<Exact>::impl_has(const typename pset_adaptor_<Exact>::point& p) const + { + return this->ps_.has(p); + } + + template <typename Exact> + const typename pset_adaptor_<Exact>::box& + pset_adaptor_<Exact>::impl_bbox() const + { + return this->ps_.bbox(); + } + +# endif // ! OLN_INCLUDE_ONLY + + } // end of namespace oln::internal + +} // end of namespace oln + + +#endif // ! OLN_CORE_INTERNAL_PSET_ADAPTOR_HH Index: oln/core/internal/iterator_on_points_base.hh --- oln/core/internal/iterator_on_points_base.hh (revision 918) +++ oln/core/internal/iterator_on_points_base.hh (working copy) @@ -40,7 +40,7 @@ namespace internal { template <typename Exact> - struct iterator_on_points_base; + struct iterator_on_points_base; // FIXME: End with '_'! } // Super type Index: oln/draw/bresenham.hh --- oln/draw/bresenham.hh (revision 0) +++ oln/draw/bresenham.hh (revision 0) @@ -0,0 +1,87 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_DRAW_BRESENHAM_HH +# define OLN_DRAW_BRESENHAM_HH + +# include <oln/core/concept/image.hh> +# include <oln/core/gen/safe_image.hh> +# include <oln/core/2d/line2d.hh> + + + +namespace oln +{ + + namespace draw + { + + // Fwd decl. + + template <typename I> + void bresenham(Mutable_Image& input, + const oln_point(I)& begin, const oln_point(I)& end, + const oln_value(I)& value); + + +# ifndef OLN_INCLUDE_ONLY + + namespace impl + { + + template <typename I> + void bresenham_(Mutable_Image& input, + const oln_point(I)& begin, const oln_point(I)& end, + const oln_value(I)& value) + { + line2d l(begin, end); + safe_image input_(input); + typename line2d::piter p(l); // FIXME: Generalize with an 'assign' routine... + for_all(p) + input_(p) = value; + } + + } // end of namespace oln::draw::impl + + // Facade. + + template <typename I> + void bresenham(Mutable_Image& input, + const oln_point(I)& begin, const oln_point(I)& end, + const oln_value(I)& value) + { + impl::bresenham_(exact(input), begin, end, value); + } + +# endif // ! OLN_INCLUDE_ONLY + + } // end of namespace oln::draw + +} // end of namespace oln + + +#endif // ! OLN_DRAW_BRESENHAM_HH Index: oln/value/builtin.hh --- oln/value/builtin.hh (revision 918) +++ oln/value/builtin.hh (working copy) @@ -44,7 +44,7 @@ template <typename Exact> struct vtypes< internal::builtin_base<Exact> > { - typedef stc::final< stc:is<Value> > category; + typedef stc::final< stc::is<Value> > category; }; @@ -59,11 +59,21 @@ builtin_base(); }; + +# ifndef OLN_INCLUDE_ONLY + + template <typename Exact> + builtin_base<Exact>::builtin_base() + { + } + +# endif // ! OLN_INCLUDE_ONLY + } // end of namespace oln::internal - // int + // int, float, ... template <> struct super_trait_< int > @@ -90,6 +100,8 @@ typedef float ret; }; + // FIXME: To be continued... + } // end of namespace oln

17 years, 9 months

917: Update cc_tarjan impl + facade.

by Ugo Jardonnet

Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Update cc_tarjan impl + facade. * oln/morpho/cc_tarjan.hh: Up (shape). cc_tarjan.hh | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-) Index: oln/morpho/cc_tarjan.hh --- oln/morpho/cc_tarjan.hh (revision 916) +++ oln/morpho/cc_tarjan.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_MORPHO_DILATION_HH -# define OLN_MORPHO_DILATION_HH +#ifndef OLN_MORPHO_CC_TARJAN_HH +# define OLN_MORPHO_CC_TARJAN_HH #include <oln/debug/print.hh> @@ -36,21 +36,19 @@ namespace morpho { + namespace impl + { template <typename I> oln_point(I) find_root(I& ima, const oln_point(I)& x, oln_plain_value(I, oln_point(I))& parent) { - std::cout << "enter_root( " << parent(x) << "," << x << " )" << std::endl; - if (parent(x) != x) { parent(x) = find_root(ima, parent(x), parent); return parent(x); } return x; - - std::cout << "leave_root" << std::endl; } template <typename I> @@ -81,17 +79,12 @@ if ( input(n) ) { if ( is_processed(n) ) - { do_union(input ,n, p, parent); - std::cout << "union ("< parent :" << std::endl; - debug::print(parent); - } } } is_processed(p) = true; } } - std::cout << "pass 1" << std::endl; } template <typename I> @@ -100,26 +93,19 @@ oln_plain_value(I, unsigned)& output) { unsigned current_label = 0; - - // Second pass oln_fwd_piter(I) p(input.points()); for_all(p) { - if ( input(p) ) - { - if ( parent(p) == p ) + if ( input(p) && parent(p) == p ) output(p) = ++current_label; else output(p) = output(parent(p)); - std::cout << "output :" << std::endl; - debug::print(output); - } } } template <typename I> oln_plain_value(I, unsigned) - cc_tarjan(const Image_with_Nbh& input) + cc_tarjan_(const Image_with_Nbh& input) { oln_plain_value(I, unsigned) output; prepare(output, with, input); @@ -127,24 +113,31 @@ oln_plain_value(I, oln_point(I)) parent; prepare(parent, with, input); - // Init oln_plain(I) is_processed; prepare(is_processed, with, input); oln_piter(I) p1(input.points()); for_all(p1) - is_processed(p1) = false; // FIXME : built with. + is_processed(p1) = false; // FIXME : built with ?. first_pass(input, parent, is_processed); - second_pass(input, parent, output); - - ::oln::debug::print(parent); return output; } + } // end of namespace oln::morpho::impl + + // Facades. + + template <typename I> + oln_plain_value(I, unsigned) + cc_tarjan(const Binary_Image& input) + { + return impl::cc_tarjan_(exact(input)); + } + } // end of namespace oln::morpho } // end of namespace oln -#endif // ! OLN_MORPHO_DILATION_HH +#endif // ! OLN_MORPHO_CC_TARJAN_HH

17 years, 9 months

916: Add elementary cc_tarjan on Binary image.

by Ugo Jardonnet

Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Add elementary cc_tarjan on Binary image. * tests/algorithms/cc_tarjan.cc: New. * tests/algorithms/Makefile.am: Updated for check. * oln/morpho/cc_tarjan.hh: New. * oln/morpho/cc_tarjan.cc: Remove. * oln/level/apply.hh: . oln/morpho/cc_tarjan.hh | 99 ++++++++++++++++++++++++++++++------------ tests/algorithms/Makefile.am | 4 + tests/algorithms/cc_tarjan.cc | 45 +++++++++++++++++++ 3 files changed, 119 insertions(+), 29 deletions(-) Index: tests/algorithms/cc_tarjan.cc --- tests/algorithms/cc_tarjan.cc (revision 0) +++ tests/algorithms/cc_tarjan.cc (revision 0) @@ -0,0 +1,45 @@ +#include <oln/core/2d/image2d.hh> +#include <oln/core/2d/window2d.hh> +#include <oln/core/2d/neighb2d.hh> + +#include <oln/morpho/cc_tarjan.hh> + +#include <oln/debug/print.hh> + + +template <typename I> +void set(I& ima, + int i, + int j) +{ + oln_point(I) p(i, j); + ima(p) = true; +} + +int main() +{ + using namespace oln; + typedef image2d<bool> I; + I ima(3, 3); + + set(ima, 0, 0); + set(ima, 0, 1); + set(ima, 0, 2); + + set(ima, 2, 0); + set(ima, 2, 1); + set(ima, 2, 2); + + I out = morpho::cc_tarjan(ima + c4); + +// for (unsigned i; i < 3; i++) +// for (unsigned j; j < 3; j++) +// { +// if (i == 0) +// assert(ima(i, j) == 1); +// if (i == 1) +// assert(ima(i, j) == 0); +// if (i == 2) +// assert(ima(i, j) == 2); +// } +} Index: tests/algorithms/Makefile.am --- tests/algorithms/Makefile.am (revision 915) +++ tests/algorithms/Makefile.am (working copy) @@ -24,10 +24,12 @@ check_PROGRAMS = \ fill \ - basic_morpho + basic_morpho \ + cc_tarjan # Algorithms. fill_SOURCES = fill.cc basic_morpho_SOURCES = basic_morpho.cc +cc_tarjan_SOURCES = cc_tarjan.cc TESTS = $(check_PROGRAMS) Index: oln/morpho/cc_tarjan.hh --- oln/morpho/cc_tarjan.hh (revision 912) +++ oln/morpho/cc_tarjan.hh (working copy) @@ -28,6 +28,8 @@ #ifndef OLN_MORPHO_DILATION_HH # define OLN_MORPHO_DILATION_HH +#include <oln/debug/print.hh> + namespace oln { @@ -35,70 +37,111 @@ { template <typename I> - oln_point(I) find_root(const oln_point(I)& x) + oln_point(I) find_root(I& ima, + const oln_point(I)& x, + oln_plain_value(I, oln_point(I))& parent) { - if (parent[x] != x) + std::cout << "enter_root( " << parent(x) << "," << x << " )" << std::endl; + + if (parent(x) != x) { - parent[x] = find_root(parent[x]); + parent(x) = find_root(ima, parent(x), parent); return parent(x); } return x; + + std::cout << "leave_root" << std::endl; } template <typename I> - void do_union(const oln_point(I)& n, + void do_union(I& ima, + const oln_point(I)& n, const oln_point(I)& p, - const oln_plain_value(I, oln_point(I))& parent) + oln_plain_value(I, oln_point(I))& parent) { - oln_point(I) r = find_root(n); + oln_point(I) r = find_root(ima, n, parent); if (r != p) parent(r) = p; } template <typename I> - oln_plain_value(I, unsigned) - cc_tarjan(const Binary_Image& input) + void first_pass(const I& input, + oln_plain_value(I, oln_point(I))& parent, + oln_plain(I)& is_processed) { - oln_plain_value(I, unsigned) output; - prepare(output, with, input); - - oln_plain_value(I, oln_point(I)) parent; - prepare(parent, with, input); - - // Init - unsigned current_label = 0; - oln_plain(I) is_processed; - prepare(is_processed, with, input); - oln_piter(I) p(input.points()); - for_all(p) - is_processed(p) = false; // FIXME : built with. - - - // Fist pass - oln_piter(I) p(input.points()); + oln_bkd_piter(I) p(input.points()); for_all(p) { + if ( input(p) ) + { + parent(p) = p; oln_niter(I) n(p, input); for_all(n) { + if ( input(n) ) + { if ( is_processed(n) ) - do_union(n, p, parent); + { + do_union(input ,n, p, parent); + std::cout << "union ("< parent :" << std::endl; + debug::print(parent); + } + } } is_processed(p) = true; } + } + std::cout << "pass 1" << std::endl; + } + template <typename I> + void second_pass(const I& input, + oln_plain_value(I, oln_point(I))& parent, + oln_plain_value(I, unsigned)& output) + { + unsigned current_label = 0; // Second pass - oln_piter(I) p2(input.points()); - for_all(p2) + oln_fwd_piter(I) p(input.points()); + for_all(p) + { + if ( input(p) ) { if ( parent(p) == p ) output(p) = ++current_label; else output(p) = output(parent(p)); + std::cout << "output :" << std::endl; + debug::print(output); + } } } + template <typename I> + oln_plain_value(I, unsigned) + cc_tarjan(const Image_with_Nbh& input) + { + oln_plain_value(I, unsigned) output; + prepare(output, with, input); + + oln_plain_value(I, oln_point(I)) parent; + prepare(parent, with, input); + + // Init + oln_plain(I) is_processed; + prepare(is_processed, with, input); + oln_piter(I) p1(input.points()); + for_all(p1) + is_processed(p1) = false; // FIXME : built with. + + first_pass(input, parent, is_processed); + + second_pass(input, parent, output); + + ::oln::debug::print(parent); + return output; + } + } // end of namespace oln::morpho } // end of namespace oln Index: oln/level/apply.hh

17 years, 9 months

915: Add traits and fix compile errors.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/trunk/olena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add traits and fix compile errors. * oln/core/gen/traits.hh, * oln/value/builtin.hh: New. * oln/arith/plus.hh (include): Fix. (set_trait_): New. (operator +): Update sig and use 'prepare'. * oln/arith/minus.hh: Likewise. * oln/core/concept/image.hh (Fast_Image): Fix. * oln/core/concept/point.hh (set_trait_): New. (assert_same_point_): New. * oln/core/concept/generalised_point.hh: Fix. * oln/core/concept/dpoint.hh (set_trait_): New. * oln/core/concept/operators.hh (include): Add oln/core/gen/traits.hh. * oln/core/init.hh: Cosmetic change. * oln/core/2d/image2d_b.hh (prepare): Fix. * oln/core/2d/box2d.hh (box2d): Fix. * oln/core/gen/fun.hh (fun_p2b_, fun_v2v_): Add & to ctor arg. (fun_p2v_, functorize_p2v): New. * oln/core/internal/box.hh: Cosmetic changes. * oln/core/internal/image_base.hh (operator |): Activate test. * oln/core/internal/iterator_on_points_base.hh: Fix. * oln/morpher/add_isubset.hh, * oln/morpher/add_isubset.hxx, * oln/morpher/add_neighborhood.hxx: Remove; obsolete. * oln/level/fill.hh (include): Update. (fill): Rename the internal routines as... (fill_from_value_, fill_from_values_): ...these... (fill_from_image_, fill_from_function_): ...and these. (fill_): Activate. (fill): Activate version for Function_p2v. (fill): New version for Image. arith/minus.hh | 35 +++-- arith/plus.hh | 33 +++-- core/2d/box2d.hh | 6 core/2d/image2d_b.hh | 2 core/concept/dpoint.hh | 23 +++ core/concept/generalised_point.hh | 11 - core/concept/image.hh | 2 core/concept/operators.hh | 2 core/concept/point.hh | 38 +++++ core/gen/fun.hh | 65 +++++++++- core/gen/traits.hh | 199 +++++++++++++++++++++++++++++++ core/init.hh | 2 core/internal/box.hh | 13 +- core/internal/image_base.hh | 6 core/internal/iterator_on_points_base.hh | 7 - level/fill.hh | 92 +++++++------- value/builtin.hh | 98 +++++++++++++++ 17 files changed, 534 insertions(+), 100 deletions(-) Index: oln/level/fill.hh --- oln/level/fill.hh (revision 914) +++ oln/level/fill.hh (working copy) @@ -29,8 +29,12 @@ #ifndef OLN_LEVEL_FILL_HH # define OLN_LEVEL_FILL_HH +#include <iostream> + # include <oln/core/concept/image.hh> -// # include <oln/core/concept/function.hh> +# include <oln/core/concept/point.hh> +# include <oln/core/gen/fun.hh> + namespace oln @@ -38,7 +42,7 @@ namespace ERROR { - struct FIRST_ARGUMENT_OF_oln_level_fill_IS_NOT_MUTABLE; + struct FIRST_ARGUMENT_OF_oln_level_fill_IS_NOT_MUTABLE; // FIXME: Use it! } @@ -53,16 +57,17 @@ template <typename I, typename V> void fill(Mutable_Image& input, const V values[]); - template <typename I, typename V, typename P> - void fill(Mutable_Image& input, V (*fun)(P)); + template <typename I, typename J> + void fill(Mutable_Image& input, const Image<J>& ima); + template <typename I, typename F> + void fill(Mutable_Image& input, const Function_p2v<F>& fun); + template <typename I, typename V, typename P> + void fill(Mutable_Image& input, V (*fun)(P)); // FIXME: Inactivated. -// template <typename I, typename F> -// void fill(Mutable_Image& input, const abstract::fun_p2v<F>& fun); - // template <typename I> // void fill(Value_Wise_Mutable_Image& input, const oln_value(I)& value); @@ -74,24 +79,15 @@ { template <typename I> - void fill(Mutable_Image& input, const oln_value(I)& value) + void fill_from_value_(Mutable_Image& input, const oln_value(I)& value) { oln_piter(I) p(input.points()); for_all(p) input(p) = value; } -// template <typename I> -// void fill(Value_Wise_Mutable_Image& input, -// const oln_value(I)& value) -// { -// oln_viter(I) v(input); -// for_all(v) -// input.value_(v) = value; -// } - template <typename I, typename V> - void fill(Mutable_Image& input, const V values[]) + void fill_from_values_(Mutable_Image& input, const V values[]) { oln_piter(I) p(input.points()); unsigned i = 0; @@ -99,20 +95,29 @@ input(p) = values[i++]; } - template <typename I, typename V, typename P> - void fill(Mutable_Image& input, V (*fun)(P)) + template <typename I, typename J> + void fill_from_image_(Mutable_Image& input, const Image<J>& ima) { oln_piter(I) p(input.points()); for_all(p) - input(p) = fun(p); + input(p) = ima(p); } -// template <typename I, typename F> -// void fill(Mutable_Image& input, const abstract::fun_p2v<F>& fun) + template <typename I, typename F> + void fill_from_function_(Mutable_Image& input, const F& f) + { + oln_piter(I) p(input.points()); + for_all(p) + input(p) = f(p); + } + +// template <typename I> +// void fill_(Value_Wise_Mutable_Image& input, +// const oln_value(I)& value) // { -// oln_piter(I) p(input.points()); -// for_all(p) -// input(p) = fun.exact()(p); +// oln_viter(I) v(input); +// for_all(v) +// input.value_(v) = value; // } } // end of namespace oln::level::impl @@ -124,34 +129,37 @@ template <typename I> void fill(Mutable_Image& input, const oln_value(I)& value) { - impl::fill(exact(input), value); + impl::fill_from_value_(exact(input), value); } template <typename I, typename V> void fill(Mutable_Image& input, const V values[]) { - impl::fill(exact(input), values); + impl::fill_from_values_(exact(input), values); } - template <typename I, typename V, typename P> - void fill(Mutable_Image& input, V (*fun)(P)) + template <typename I, typename J> + void fill(Mutable_Image& input, const Image<J>& ima) { - impl::fill(exact(input), fun); + assert_same_grid_<I, J>::check(); + precondition(input.points() <= ima.points()); + impl::fill_from_image_(exact(input), exact(ima)); } -// template <typename I, typename F> -// void fill(Mutable_Image& input, const abstract::fun_p2v<F>& fun) -// { -// impl::fill(exact(input), fun); -// } + template <typename I, typename F> + void fill(Mutable_Image& input, const Function_p2v<F>& fun) + { + impl::fill_from_function_(exact(input), exact(fun)); + } -// template <typename I> -// void fill(Value_Wise_Mutable_Image& input, const oln_value(I)& value) -// { -// impl::fill(exact(input), value); -// } + template <typename I, typename V, typename P> + void fill(Mutable_Image& input, V (*f)(P)) + { + mlc::assert_< mlc_is_a(P, Point) >::check(); // FIXME: Add err msg. + impl::fill_from_function_(exact(input), functorize_p2v(f)); + } -# endif +# endif // ! OLN_INCLUDE_ONLY } // end of namespace oln::level Index: oln/arith/plus.hh --- oln/arith/plus.hh (revision 914) +++ oln/arith/plus.hh (working copy) @@ -28,27 +28,40 @@ #ifndef OLN_ARITH_PLUS_HH # define OLN_ARITH_PLUS_HH +# include <oln/core/concept/image.hh> +// # include <oln/core/internal/f_ch_value.hh> +# include <oln/core/gen/traits.hh> + namespace oln { - namespace arith + + // Trait. + + template <typename I, typename J> + struct set_trait_< Image, I, plus_id, Image, J > { + typedef oln_plus_trait(oln_value(I), oln_value(J)) V; + typedef oln_plain_value(I, V) ret; + }; // Fwd decl. - template <typename I> - oln_plain(I) - operator + (const Image& lhs, const Image& rhs); + template <typename I, typename J> + oln_plus_trait(I, J) + operator + (const Image& lhs, const Image<J>& rhs); + # ifndef OLN_INCLUDE_ONLY - template <typename I> - oln_plain(I) - operator + (const Image& lhs, const Image& rhs) + template <typename I, typename J> + oln_plus_trait(I, J) + operator + (const Image& lhs, const Image<J>& rhs) { - oln_plain(I) output; - init(output, with, lhs); + precondition(lhs.points() = rhs.points()); + oln_plus_trait(I, J) output; + prepare(output, with, lhs); oln_piter(I) p(lhs.points()); for_all(p) output(p) = lhs(p) + rhs(p); @@ -57,8 +70,6 @@ # endif // ! OLN_INCLUDE_ONLY - } // end of namespace oln::arith - } // end of namespace oln #endif // ! OLN_ARITH_PLUS_HH Index: oln/arith/minus.hh --- oln/arith/minus.hh (revision 914) +++ oln/arith/minus.hh (working copy) @@ -28,27 +28,40 @@ #ifndef OLN_ARITH_MINUS_HH # define OLN_ARITH_MINUS_HH +# include <oln/core/concept/image.hh> +// # include <oln/core/internal/f_ch_value.hh> +# include <oln/core/gen/traits.hh> + namespace oln { -// namespace arith -// { + // Trait. + + template <typename I, typename J> + struct set_trait_< Image, I, minus_id, Image, J > + { + typedef oln_minus_trait(oln_value(I), oln_value(J)) V; + typedef oln_plain_value(I, V) ret; + }; + // Fwd decl. - template <typename I> - oln_plain(I) - operator - (const Image& lhs, const Image& rhs); + template <typename I, typename J> + oln_minus_trait(I, J) + operator - (const Image& lhs, const Image<J>& rhs); + # ifndef OLN_INCLUDE_ONLY - template <typename I> - oln_plain(I) - operator - (const Image& lhs, const Image& rhs) + template <typename I, typename J> + oln_minus_trait(I, J) + operator - (const Image& lhs, const Image<J>& rhs) { - oln_plain(I) output; - init(output, with, lhs); + precondition(lhs.points() = rhs.points()); + oln_minus_trait(I, J) output; + prepare(output, with, lhs); oln_piter(I) p(lhs.points()); for_all(p) output(p) = lhs(p) - rhs(p); @@ -57,8 +70,6 @@ # endif // ! OLN_INCLUDE_ONLY -// } // end of namespace oln::arith - } // end of namespace oln #endif // ! OLN_ARITH_MINUS_HH Index: oln/core/concept/image.hh --- oln/core/concept/image.hh (revision 914) +++ oln/core/concept/image.hh (working copy) @@ -200,7 +200,7 @@ public automatic::get_impl<Fast_Image, Exact> { stc_using_from(Image, rvalue); - stc_using_from(Image, lvalue); + stc_using_from(Mutable_Image, lvalue); stc_typename(index); Index: oln/core/concept/point.hh --- oln/core/concept/point.hh (revision 914) +++ oln/core/concept/point.hh (working copy) @@ -72,9 +72,18 @@ }; // end of oln::Point<Exact> + /// Operator -. + template <typename P> - typename P::dpoint operator-(const Point& lhs, const Point& rhs); + struct set_trait_< Point, P, minus_id, Point, P > + { + typedef typename P::dpoint ret; + }; + + template <typename P> + typename P::dpoint + operator - (const Point& lhs, const Point& rhs); @@ -91,6 +100,28 @@ + namespace ERROR + { + + template < typename Type_1, + typename Type_2, + typename Point_1 = oln_point(Type_1), + typename Point_2 = oln_point(Type_2) > + struct both_types_should_have_the_same_point_ + { + }; + + } // end of namespace oln::ERROR + + + template <typename T1, typename T2> + struct assert_same_point_ + : public mlc::assert_< mlc::eq_<oln_point(T1), oln_point(T2)>, + ERROR::both_types_should_have_the_same_point_<T1, T2> > + {}; + + + # ifndef OLN_INCLUDE_ONLY @@ -134,12 +165,13 @@ } template <typename P> - typename P::dpoint operator-(const Point& lhs, const Point& rhs) + typename P::dpoint + operator-(const Point& lhs, const Point& rhs) { return lhs.op_minus_(exact(rhs)); } -# endif +# endif // ! OLN_INCLUDE_ONLY } // end of namespace oln Index: oln/core/concept/generalised_point.hh --- oln/core/concept/generalised_point.hh (revision 914) +++ oln/core/concept/generalised_point.hh (working copy) @@ -31,10 +31,6 @@ namespace oln { - /// FIXME: Instant value. - // oln_decl_instant_value(point); - - // Generalised_Point concept template <typename Exact> @@ -58,11 +54,10 @@ template <typename Exact> Generalised_Point<Exact>::Generalised_Point() { - }; - + } -# endif // OLN_INCLUDE_ONLY +# endif // ! OLN_INCLUDE_ONLY -} +} // end of namespace oln #endif // !OLN_CORE_CONCEPT_GENERALISED_POINTS_HH Index: oln/core/concept/dpoint.hh --- oln/core/concept/dpoint.hh (revision 914) +++ oln/core/concept/dpoint.hh (working copy) @@ -80,12 +80,35 @@ }; // end of oln::Dpoint<Exact> + /// \{ + /// Operator "Point - Dpoint". + + template <typename P, typename D> + struct set_trait_< Point, P, minus_id, Dpoint, D > + { + typedef P ret; + }; + template <typename P, typename D> P operator-(const Point& lhs, const Dpoint<D>& rhs); + /// \} + + + /// \{ + /// Operator "Point + Dpoint". + + template <typename P, typename D> + struct set_trait_< Point, P, plus_id, Dpoint, D > + { + typedef P ret; + }; + template <typename P, typename D> P operator+(const Point& lhs, const Dpoint<D>& rhs); + /// \} + /// \{ /// Invalid operators. Index: oln/core/concept/operators.hh --- oln/core/concept/operators.hh (revision 914) +++ oln/core/concept/operators.hh (working copy) @@ -29,6 +29,7 @@ # define OLN_CORE_CONCEPT_OPERATORS_HH # include <oln/core/equipment.hh> +# include <oln/core/gen/traits.hh> namespace oln @@ -76,7 +77,6 @@ - # ifndef OLN_INCLUDE_ONLY template <typename L, typename R> Index: oln/core/init.hh --- oln/core/init.hh (revision 914) +++ oln/core/init.hh (working copy) @@ -181,7 +181,7 @@ } -# endif // OLN_INCLUDE_ONLY +# endif // ! OLN_INCLUDE_ONLY } // end of namespace oln Index: oln/core/2d/image2d_b.hh --- oln/core/2d/image2d_b.hh (revision 914) +++ oln/core/2d/image2d_b.hh (working copy) @@ -250,7 +250,7 @@ bool box_ok = init(b, with, dat); postcondition(box_ok); unsigned border = 2; // FIXME: Use init! - array2d_<T,int> ptr = new array2d_<T,int>(b.pmin().row() - border, + array2d_<T,int>* ptr = new array2d_<T,int>(b.pmin().row() - border, b.pmin().col() - border, b.pmax().row() + border, b.pmax().col() + border); Index: oln/core/2d/box2d.hh --- oln/core/2d/box2d.hh (revision 914) +++ oln/core/2d/box2d.hh (working copy) @@ -63,6 +63,7 @@ public: // Note: we can't use stc_using because box2d isn't a templated class typedef super::point point; + typedef super::from_to_t from_to_t; box2d(); box2d(const box2d::from_to_t& dat); @@ -102,9 +103,10 @@ } template <typename D> - box2d::box2d(const internal::initializer_<D>& data) : - super(data) + box2d::box2d(const internal::initializer_<D>& data) { + bool box_ok = internal::init__(internal::tag::box_t(), *this, data.value()); + postcondition(box_ok); } Index: oln/core/gen/fun.hh --- oln/core/gen/fun.hh (revision 914) +++ oln/core/gen/fun.hh (working copy) @@ -31,6 +31,7 @@ # include <oln/core/internal/category_of.hh> # include <oln/core/concept/function.hh> # include <oln/core/concept/image.hh> +# include <oln/core/concept/point.hh> # include <oln/core/concept/value.hh> @@ -41,6 +42,10 @@ +// FIXME: Separate defs and decls. + + + namespace oln { @@ -105,7 +110,7 @@ typedef oln_arg_of_(F) argument; typedef oln_res_of_(F) result; - fun_p2b_(F f) : f_(f) {} + fun_p2b_(const F& f) : f_(f) {} result operator()(argument arg) const { @@ -138,6 +143,53 @@ + // ----------------------------- fun_p2v_<F> + + + // Fwd decl. + template <typename F> struct fun_p2v_; + + // Category. + namespace internal + { + template <typename F> + struct set_category_of_< fun_p2v_<F> > + { + typedef stc::is< Function_p2v > ret; + }; + } + + // Class. + template <typename F> + struct fun_p2v_ : public Function_p2v< fun_p2v_<F> > + { + typedef oln_arg_of_(F) argument; + typedef oln_res_of_(F) result; + + fun_p2v_(const F& f) : f_(f) {} + + result operator()(argument arg) const + { + return this->f_(arg); + } + + private: + F f_; + }; + + + // functorize_p2v + + template <typename V, typename P> + fun_p2v_<V (*)(P)> + functorize_p2v(V (*f)(P)) + { + mlc::assert_< mlc_is_a(P, Point) >::check(); // FIXME: Add err msg. + fun_p2v_<V (*)(P)> tmp(f); + return tmp; + } + + // ----------------------------- fun_v2v_<F> @@ -161,7 +213,7 @@ typedef oln_arg_of_(F) argument; typedef oln_res_of_(F) result; - fun_v2v_(F f) : f_(f) {} + fun_v2v_(const F& f) : f_(f) {} result operator()(argument arg) const { @@ -174,11 +226,12 @@ // functorize_v2v - template <typename R, typename A> - fun_v2v_<R (*)(A)> - functorize_v2v(R (*f)(A)) + + template <typename Vr, typename Va> + fun_v2v_<Vr (*)(Va)> + functorize_v2v(Vr (*f)(Va)) { - fun_v2v_<R (*)(A)> tmp(f); + fun_v2v_<Vr (*)(Va)> tmp(f); return tmp; } Index: oln/core/gen/traits.hh --- oln/core/gen/traits.hh (revision 0) +++ oln/core/gen/traits.hh (revision 0) @@ -0,0 +1,199 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_CORE_GEN_TRAITS_HH +# define OLN_CORE_GEN_TRAITS_HH + +# include <oln/core/internal/category_of.hh> + + +// arith + +# define oln_plus_trait(L, R) \ + typename oln::get_trait_<L, oln::plus_id, R>::ret + +# define oln_minus_trait(L, R) \ + typename oln::get_trait_<L, oln::minus_id, R>::ret + +# define oln_times_trait(L, R) \ + typename oln::get_trait_<L, oln::times_id, R>::ret + +# define oln_div_trait(L, R) \ + typename oln::get_trait_<L, oln::div_id, R>::ret + +# define oln_mod_trait(L, R) \ + typename oln::get_trait_<L, oln::mod_id, R>::ret + +// cmp + +# define oln_eq_trait(L, R) \ + typename oln::get_trait_<L, oln::eq_id, R>::ret + +# define oln_neq_trait(L, R) \ + typename oln::get_trait_<L, oln::neq_id, R>::ret + +// ord + +# define oln_less_trait(L, R) \ + typename oln::get_trait_<L, oln::less_id, R>::ret + +# define oln_leq_trait(L, R) \ + typename oln::get_trait_<L, oln::leq_id, R>::ret + +# define oln_geq_trait(L, R) \ + typename oln::get_trait_<L, oln::geq_id, R>::ret + +# define oln_greater_trait(L, R) \ + typename oln::get_trait_<L, oln::greater_id, R>::ret + +// logic + +# define oln_and_trait(L, R) \ + typename oln::get_trait_<L, oln::and_id, R>::ret + +# define oln_or_trait(L, R) \ + typename oln::get_trait_<L, oln::or_id, R>::ret + +# define oln_xor_trait(L, R) \ + typename oln::get_trait_<L, oln::xor_id, R>::ret + + + + + + + + +# define oln_internal_specialize_bin_trait_bool_(Name) \ + \ + template <template <class> class Cl, typename L, \ + template <class> class Cr, typename R> \ + struct set_trait_< Cl, L, Name##_id, Cr, R > \ + { \ + typedef bool ret; \ + } + + +# define oln_internal_specialize_bin_trait_T_(Name) \ + \ + template <template <class> class Cl, typename T, \ + template <class> class Cr> \ + struct set_trait_< Cl, T, Name##_id, Cr, T > \ + { \ + typedef T ret; \ + } + + + + +namespace oln +{ + + // set_trait_ + + template <template <class> class Cl, typename L, + typename Op, + template <class> class Cr, typename R> + struct set_trait_; + + + // ids + + struct plus_id; + struct minus_id; + struct times_id; + struct div_id; + struct mod_id; + + struct eq_id; + struct neq_id; + + struct less_id; + struct leq_id; + struct geq_id; + struct greater_id; + + struct and_id; + struct or_id; + struct xor_id; + + + + // default (see oln/core/concept/operators.hh) + + /* + + oln_internal_specialize_bin_trait_T_(plus); + oln_internal_specialize_bin_trait_T_(minus); + oln_internal_specialize_bin_trait_T_(times); + oln_internal_specialize_bin_trait_T_(div); + oln_internal_specialize_bin_trait_T_(mod); + + oln_internal_specialize_bin_trait_bool_(eq); + oln_internal_specialize_bin_trait_bool_(neq); + + oln_internal_specialize_bin_trait_bool_(less); + oln_internal_specialize_bin_trait_bool_(leq); + oln_internal_specialize_bin_trait_bool_(geq); + oln_internal_specialize_bin_trait_bool_(greater); + + oln_internal_specialize_bin_trait_T_(and); + oln_internal_specialize_bin_trait_T_(or); + oln_internal_specialize_bin_trait_T_(xor); + + */ + + + namespace internal + { + + // get_trait_cat_ + + template <typename Cl, typename L, typename Op, typename Cr, typename R> + struct get_trait_cat__; + + template < template <class> class Cl, typename L, + typename Op, + template <class> class Cr, typename R > + struct get_trait_cat__< stc::is<Cl>, L, Op, stc::is<Cr>, R > + { + typedef typename oln::set_trait_< Cl, L, Op, Cr, R >::ret ret; + }; + + } // end of namespace oln::internal + + + template <typename L, typename Op, typename R> + struct get_trait_ : public internal::get_trait_cat__< oln_category_of_(L), L, Op, oln_category_of_(R), R > + { + }; + + +} // end of namespace oln + + +#endif // ! OLN_CORE_GEN_TRAITS_HH Index: oln/core/internal/box.hh --- oln/core/internal/box.hh (revision 914) +++ oln/core/internal/box.hh (working copy) @@ -199,11 +199,11 @@ # ifndef OLN_INCLUDE_ONLY - namespace internal - { - // -------------------- box_<Exact> + // -------------------- internal::box_<Exact> + namespace internal + { template <typename Exact> box_<Exact>::box_() @@ -293,7 +293,9 @@ { return this->pmax_; } - } + + } // end of namespace oln::internal + // -------------------- box_fwd_piter_ @@ -421,7 +423,8 @@ return &p_; } -# endif // OLN_INCLUDE_ONLY +# endif // ! OLN_INCLUDE_ONLY + } // end of namespace oln Index: oln/core/internal/image_base.hh --- oln/core/internal/image_base.hh (revision 914) +++ oln/core/internal/image_base.hh (working copy) @@ -493,7 +493,7 @@ oln_decl_op_such_as(Image, Function_p2b); - // Specialization. + // Specialization "Image such_as f : P -> B". template <typename I, typename B, typename P> op_<const I, such_as, const fun_p2b_ > @@ -507,13 +507,13 @@ } - // Specialization. + // Specialization "Image such_as ima : P -> B". template <typename I, typename J> op_<const I, such_as, const fun_p2b_< Binary_Image<J> > > operator | (const Image& ima, const Binary_Image<J>& f_ima_b) { - // FIXME: Activate precondition(f_ima_b.points() >= ima.points()); + precondition(f_ima_b.points() >= ima.points()); mlc::assert_equal_< oln_point(I), oln_point(J) >::check(); op_<const I, such_as, const fun_p2b_< Binary_Image<J> > > tmp(exact(ima), f_ima_b); return tmp; Index: oln/core/internal/iterator_on_points_base.hh --- oln/core/internal/iterator_on_points_base.hh (revision 914) +++ oln/core/internal/iterator_on_points_base.hh (working copy) @@ -41,7 +41,7 @@ namespace internal { template <typename Exact> struct iterator_on_points_base; - }; + } // Super type @@ -88,10 +88,9 @@ } # endif // !OLN_INCLUDE_ONLY -} + } // end of namespace oln::internal - -} +} // end of namespace oln #endif // !OLN_CORE_INTERNAL_ITERATOR_ON_POINTS_BASE_HH Index: oln/value/builtin.hh --- oln/value/builtin.hh (revision 0) +++ oln/value/builtin.hh (revision 0) @@ -0,0 +1,98 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef OLN_VALUE_BUILTIN_HH +# define OLN_VALUE_BUILTIN_HH + +# include <oln/core/concept/value.hh> +# include <oln/core/gen/traits.hh> + + +namespace oln +{ + + + // Fwd decl. + namespace internal { template <typename Exact> struct builtin_base; } + + + // Virtual types. + template <typename Exact> + struct vtypes< internal::builtin_base<Exact> > + { + typedef stc::final< stc:is<Value> > category; + }; + + + namespace internal + { + + // Base class for builtin types. + template <typename Exact> + struct builtin_base : public Value<Exact> + { + protected: + builtin_base(); + }; + + } // end of namespace oln::internal + + + + // int + + template <> + struct super_trait_< int > + { + typedef internal::builtin_base<int> ret; + }; + + template <> + struct super_trait_< float > + { + typedef internal::builtin_base<float> ret; + }; + + + template <typename Op> + struct set_trait_< Value, int, Op, Value, float > + { + typedef float ret; + }; + + template <typename Op> + struct set_trait_< Value, float, Op, Value, int > + { + typedef float ret; + }; + + +} // end of namespace oln + + +#endif // ! OLN_VALUE_BUILTIN_HH +

17 years, 9 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches March 2007