September 2008 - Olena-patches

2378: Make use of the new semantics of complexes in tests.
by Roland Levillain 24 Sep '08

24 Sep '08

* tests/core/image/complex_image.cc: Update. --- milena/ChangeLog | 6 +++ milena/tests/core/image/complex_image.cc | 57 +---------------------------- 2 files changed, 8 insertions(+), 55 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 537aa93..44e4772 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -74,6 +74,12 @@ 2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + Make use of the new semantics of complexes in tests. + + * tests/core/image/complex_image.cc: Update. + +2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + Have complexes share common data and behave as pointers. * mln/core/complex.hh (mln::internal::complex_data<D>): New class. diff --git a/milena/tests/core/image/complex_image.cc b/milena/tests/core/image/complex_image.cc index 7711f38..39e6239 100644 --- a/milena/tests/core/image/complex_image.cc +++ b/milena/tests/core/image/complex_image.cc @@ -91,60 +91,7 @@ int main() // A pset. p_complex<D, point2d> pc(c); - /* An any-face handle (on E0). - - Note that AF is built on `e0_', not `e0' (e0_ is built on - `pc.cplx()', not `c'), since the p_complex `pc' makes a copy of - the complex `c', and crossed-ownership tests doesn't work. I.e., - - pc.has(e0); - - is false. - - - FIXME: This might be a problem, since `pc.cplx()' and `c' - represent the same complex, in two different memory location (but - the former is controlled by PC, while the latter can be modified, - or even destroyed). This is a common problem for ``big'' values - that we don't want to manipulate by value (copy), or when we - don't want to use expensive, deep comparisons of pset to ensure - consistency. Here (and in graph-based images), we choose to - create a copy of the pset once, and manipulate it with a - tracked_ptr, to ensure both - - 1. perfect control of the lifetime of the pset (here, you can - delete `c', and `pc' will still be valid); - - 2. no pset duplication when creating new images based on it. - - - I (Roland) don't see elegant solutions here. A possiblity would - be to disconnect a face_handle from its complex (currently, a - face_handle is a bit like a Trivial Iterator from the C++ - Standard Library), but this means relaxed dynamic checks, and - more obscure errors. - - At least, we could have better error messages, i.e., something - like - - mln/core/image/complex_image.hh 267: - mln::complex_image<D, P, V>::operator(): Uncompatible p_complex. - - instead of - - mln/core/image/complex_image.hh:267: - typename mln::complex_image<D, P, V>::lvalue - mln::complex_image<D, P, V>::operator()(const mln::complex_psite<D, P>&) - [with unsigned int D = 2u, - P = mln::point<mln::grid::square, int>, - V = mln::value::int_u<8u>]: - Assertion `this->data_->pc_.has(p)' failed. - - (which looks even uglier in the original, non-indented version). - - Ask Akim for his improved versions of abort() and assert(). */ - face_handle<1, D> e0_(pc.cplx(), 0); - any_face_handle<D> af(e0_); + any_face_handle<D> af(e0); // An associated psite. complex_psite<D, point2d> cs(pc, af); @@ -186,7 +133,7 @@ int main() // Create and init an image based on PC. ima_t ima(pc, values); - // Check the value associated to edge E0_ (through complex psite CS). + // Check the value associated to edge E0 (through complex psite CS). mln_assertion(ima(cs) == 1u); -- 1.6.0.1

1 0

2377: Have complexes share common data and behave as pointers.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/complex.hh (mln::internal::complex_data<D>): New class. (mln::complex<D>): No longer inherit from mln::internal::faces_set_mixin<D, D>. (mln::complex<D>::data_): New attribute, holding data previously stored in mln::complex<D>. (mln::complex<D>): Adjust accesses to data. (mln::complex<D>::complex): New default ctor. (operator==(const complex<D>&, const complex<D>&)): New. --- milena/ChangeLog | 13 ++++++ milena/mln/core/complex.hh | 94 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 89 insertions(+), 18 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ac62c58..537aa93 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -74,6 +74,19 @@ 2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + Have complexes share common data and behave as pointers. + + * mln/core/complex.hh (mln::internal::complex_data<D>): New class. + (mln::complex<D>): No longer inherit from + mln::internal::faces_set_mixin<D, D>. + (mln::complex<D>::data_): New attribute, holding data previously + stored in mln::complex<D>. + (mln::complex<D>): Adjust accesses to data. + (mln::complex<D>::complex): New default ctor. + (operator==(const complex<D>&, const complex<D>&)): New. + +2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + * tests/morpho/line_graph_image_wst.cc: Remove useless #include's. 2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/mln/core/complex.hh b/milena/mln/core/complex.hh index 3b4571b..d1e5bad 100644 --- a/milena/mln/core/complex.hh +++ b/milena/mln/core/complex.hh @@ -41,6 +41,8 @@ # include <mln/metal/bool.hh> +# include <mln/util/tracked_ptr.hh> + # include <mln/core/face.hh> # include <mln/core/complex_iter.hh> # include <mln/core/faces_iter.hh> @@ -52,6 +54,9 @@ namespace mln // Forward declarations. namespace internal { + template <unsigned D> + struct complex_data; + template <unsigned N, unsigned D> struct faces_set_mixin; } @@ -67,7 +72,7 @@ namespace mln /// \brief General complex of dimension \p D. template <unsigned D> - class complex : private internal::faces_set_mixin<D, D> + class complex { public: /// Forward mln::Iterator type iterating on all faces. @@ -84,6 +89,9 @@ namespace mln /// Complex construction. /// \{ + /// Create a new \p D-complex. + complex(); + /// \brief Add a 0-face to the complex. face_handle<0u, D> add_face(); @@ -131,6 +139,12 @@ namespace mln /// \} private: + /// The actual data of the complex. + util::tracked_ptr< internal::complex_data<D> > data_; + + template <unsigned D_> + friend bool operator==(const complex<D_>& lhs, const complex<D_>& rhs); + /// Accessors. /// \{ template <unsigned N, unsigned D_> friend class face_handle; @@ -181,12 +195,38 @@ namespace mln }; + /// Compare two complexes for equality. + template <unsigned D> + bool + operator==(const complex<D>& lhs, const complex<D>& rhs); + + /// Pretty print a complex. template <unsigned D> std::ostream& operator<<(std::ostream& ostr, const complex<D>& c); + /*---------------. + | Complex data. | + `---------------*/ + + namespace internal + { + // Forward declarations. + template <unsigned N, unsigned D> + struct faces_set_mixin; + + /// \brief Complex data. + template <unsigned D> + struct complex_data : faces_set_mixin<D, D> + { + // Data is contained in super classes. + }; + + } // end of namespace mln::internal::complex + + /*---------------------. | Faces of a complex. | `---------------------*/ @@ -200,10 +240,9 @@ namespace mln template <unsigned N, unsigned D> struct lower_dim_faces_set_mixin; template <unsigned N, unsigned D> struct higher_dim_faces_set_mixin; - - /*---------------------------------. - | mln::internal::faces_set_mixin. | - `---------------------------------*/ + // -------------------------------- // + // mln::internal::faces_set_mixin. // + // -------------------------------- // /// \brief Recursive mixins of set of faces. /// \{ @@ -324,10 +363,10 @@ namespace mln /// \} - /*--------------------------------------------. - | mln::internal::lower_dim_faces_set_mixin. | - | mln::internal::higher_dim_faces_set_mixin. | - `--------------------------------------------*/ + // ------------------------------------------- // + // mln::internal::lower_dim_faces_set_mixin. // + // mln::internal::higher_dim_faces_set_mixin. // + // ------------------------------------------- // /// Mixins of mixin mln::faces_set_mixin. /// \{ @@ -355,12 +394,19 @@ namespace mln `-----------------------*/ template <unsigned D> + complex<D>::complex() + // Allocate data for this complex. + : data_(new internal::complex_data<D>()) + { + } + + template <unsigned D> face_handle<0u, D> complex<D>::add_face() { /* FIXME: This is not thread-proof (these two lines should form an atomic section). */ - internal::faces_set_mixin<0u, D>::faces_.push_back(face<0u, D>()); + data_->internal::faces_set_mixin<0u, D>::faces_.push_back(face<0u, D>()); unsigned id = nfaces<0u>() - 1; return face_handle<0u, D>(*this, id); @@ -388,7 +434,7 @@ namespace mln face<N + 1, D> f; /* FIXME: This is not thread-proof (these two lines should form an atomic section). */ - internal::faces_set_mixin<N + 1, D>::faces_.push_back(f); + data_->internal::faces_set_mixin<N + 1, D>::faces_.push_back(f); unsigned id = nfaces<N + 1>() - 1; face_handle<N + 1, D> fh(*this, id); @@ -462,7 +508,7 @@ namespace mln std::size_t complex<D>::nfaces() const { - return internal::faces_set_mixin<N, D>::faces_.size(); + return data_->internal::faces_set_mixin<N, D>::faces_.size(); } @@ -489,7 +535,7 @@ namespace mln face<N, D>& complex<D>::face_(unsigned face_id) { - return internal::faces_set_mixin<N, D>::faces_[face_id]; + return data_->internal::faces_set_mixin<N, D>::faces_[face_id]; } template <unsigned D> @@ -497,7 +543,7 @@ namespace mln const face<N, D>& complex<D>::face_(unsigned face_id) const { - return internal::faces_set_mixin<N, D>::faces_[face_id]; + return data_->internal::faces_set_mixin<N, D>::faces_[face_id]; } template <unsigned D> @@ -514,6 +560,18 @@ namespace mln } + /*-------------. + | Comparison. | + `-------------*/ + + template <unsigned D> + bool + operator==(const complex<D>& lhs, const complex<D>& rhs) + { + return lhs.data_.ptr_ == rhs.data_.ptr_; + } + + /*------------------. | Pretty-printing. | `------------------*/ @@ -530,7 +588,7 @@ namespace mln void complex<D>::print(std::ostream& ostr) const { - internal::faces_set_mixin<D, D>::print_rec_asc(ostr); + data_->internal::faces_set_mixin<D, D>::print_rec_asc(ostr); } template <unsigned D> @@ -541,7 +599,7 @@ namespace mln // Ensure N is compatible with D. metal::bool_< N <= D >::check(); - internal::faces_set_mixin<N, D>::print(ostr); + data_->internal::faces_set_mixin<N, D>::print(ostr); } @@ -674,7 +732,7 @@ namespace mln T complex<D>::fold_left_(const BinaryFunction& f, const T& accu) const { - return internal::faces_set_mixin<D, D>::fold_left_(f, accu); + return data_->internal::faces_set_mixin<D, D>::fold_left_(f, accu); } namespace internal @@ -731,7 +789,7 @@ namespace mln { // Ensure N is compatible with D. mln_precondition(n <= D); - return internal::faces_set_mixin<D, D>::apply_if_dim_matches_(n, f); + return data_->internal::faces_set_mixin<D, D>::apply_if_dim_matches_(n, f); } namespace internal -- 1.6.0.1

1 0

cleanup-2008 2376: Get consistent naming for p_line2d and dpsites_impl.
by Thierry Geraud 23 Sep '08

23 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Get consistent naming for p_line2d and dpsites_impl. Ensure consistent naming. * mln/core/site_set/line2d.hh: Rename as... * mln/core/site_set/p_line2d.hh: ...this. * mln/core/internal/dpoints_base.hh: Rename as... * mln/core/internal/dpsites_impl.hh: ...this. (dpoints_base_): Rename as... (dpsites_impl): ...this. * doc/tutorial/examples/p_line2d.cc, * mln/core/site_set/all.hh, * mln/core/image/extension_ima.hh, * mln/core/clock_neighb.hh, * mln/draw/line.hh, * mln/draw/plot.hh, * mln/win/cube3d.hh, * mln/win/line.hh, * mln/win/rectangle2d.hh, * mln/win/diag2d.hh, * mln/win/backdiag2d.hh, * mln/win/cuboid3d.hh, * mln/win/octagon2d.hh, * mln/win/disk2d.hh, * sandbox/pellegrin/set/core/line2d.hh, * sandbox/nivault/dyn_line.hh: Update. Misc. * mln/core/neighborhood.hh: Remove; obsolete because we now fully rely on neighb<W>. * doc/tutorial/examples/window.cc (include): Fix missing. doc/tutorial/examples/p_line2d.cc | 2 +- doc/tutorial/examples/window.cc | 1 + mln/core/clock_neighb.hh | 2 +- mln/core/image/extension_ima.hh | 2 +- mln/core/internal/dpsites_impl.hh | 32 ++++++++++++++++---------------- mln/core/site_set/all.hh | 2 +- mln/core/site_set/p_line2d.hh | 2 +- mln/draw/line.hh | 2 +- mln/draw/plot.hh | 2 +- mln/win/backdiag2d.hh | 4 ++-- mln/win/cube3d.hh | 4 ++-- mln/win/cuboid3d.hh | 4 ++-- mln/win/diag2d.hh | 4 ++-- mln/win/disk2d.hh | 4 ++-- mln/win/line.hh | 4 ++-- mln/win/octagon2d.hh | 4 ++-- mln/win/rectangle2d.hh | 4 ++-- sandbox/nivault/dyn_line.hh | 4 ++-- sandbox/pellegrin/set/core/line2d.hh | 2 +- 19 files changed, 43 insertions(+), 42 deletions(-) Index: doc/tutorial/examples/p_line2d.cc --- doc/tutorial/examples/p_line2d.cc (revision 2375) +++ doc/tutorial/examples/p_line2d.cc (working copy) @@ -1,7 +1,7 @@ # include <mln/core/image/image2d.hh> # include <mln/pw/all.hh> -# include <mln/core/site_set/line2d.hh> +# include <mln/core/site_set/p_line2d.hh> # include <mln/core/site_set/p_set.hh> # include <mln/core/image/sub_image.hh> Index: doc/tutorial/examples/window.cc --- doc/tutorial/examples/window.cc (revision 2375) +++ doc/tutorial/examples/window.cc (working copy) @@ -6,6 +6,7 @@ # include <mln/debug/println.hh> # include <mln/core/alias/neighb2d.hh> +# include <mln/convert/to.hh> template <typename I, typename W, typename P> Index: mln/core/site_set/all.hh --- mln/core/site_set/all.hh (revision 2375) +++ mln/core/site_set/all.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/site_set/box.hh> -# include <mln/core/site_set/line2d.hh> +# include <mln/core/site_set/p_line2d.hh> # include <mln/core/site_set/p_array.hh> # include <mln/core/site_set/p_centered.hh> # include <mln/core/site_set/p_if.hh> Index: mln/core/site_set/p_line2d.hh --- mln/core/site_set/p_line2d.hh (revision 2375) +++ mln/core/site_set/p_line2d.hh (working copy) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_P_LINE2D_HH # define MLN_CORE_P_LINE2D_HH -/*! \file mln/core/site_set/line2d.hh +/*! \file mln/core/site_set/p_line2d.hh * * \brief Definition of a 2D discrete line of points (based on * p_array). Index: mln/core/image/extension_ima.hh --- mln/core/image/extension_ima.hh (revision 2375) +++ mln/core/image/extension_ima.hh (working copy) @@ -84,7 +84,7 @@ template <typename I, typename J, typename V> struct ch_value< extension_ima<I, J>, V > { - typedef mlc_converts_to(mln_result(J), V) keep_ext; + typedef mlc_converts_to(mln_value(J), V) keep_ext; typedef mln_ch_value(I, V) Iv; typedef extension_ima<Iv, J> Iv_ext; typedef mlc_if(keep_ext, Iv_ext, Iv) ret; Index: mln/core/clock_neighb.hh --- mln/core/clock_neighb.hh (revision 2375) +++ mln/core/clock_neighb.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/neighborhood.hh> -# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/internal/dpsites_impl.hh> # include <mln/core/dpoint.hh> # include <mln/core/site_set/p_array.hh> Index: mln/core/internal/dpsites_impl.hh --- mln/core/internal/dpsites_impl.hh (revision 2375) +++ mln/core/internal/dpsites_impl.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_INTERNAL_DPOINTS_BASE_HH -# define MLN_CORE_INTERNAL_DPOINTS_BASE_HH +#ifndef MLN_CORE_INTERNAL_DPSITES_IMPL_HH +# define MLN_CORE_INTERNAL_DPSITES_IMPL_HH -/*! \file mln/core/internal/dpoints_base.hh +/*! \file mln/core/internal/dpsites_impl.hh * * \brief Definition of a base class for classes based on a set of dpoints. * @@ -52,7 +52,7 @@ * */ template <typename D, typename E> - class dpoints_base_ + class dpsites_impl { public: @@ -98,7 +98,7 @@ protected: - dpoints_base_(); + dpsites_impl(); void insert(const D& d); @@ -111,27 +111,27 @@ template <typename D, typename E> inline - dpoints_base_<D,E>::dpoints_base_() + dpsites_impl<D,E>::dpsites_impl() { } template <typename D, typename E> inline - bool dpoints_base_<D,E>::is_centered() const + bool dpsites_impl<D,E>::is_centered() const { return win_.is_centered(); } template <typename D, typename E> inline - bool dpoints_base_<D,E>::is_empty() const + bool dpsites_impl<D,E>::is_empty() const { return win_.is_empty(); } template <typename D, typename E> inline - unsigned dpoints_base_<D,E>::delta() const + unsigned dpsites_impl<D,E>::delta() const { return win_.delta(); } @@ -139,7 +139,7 @@ template <typename D, typename E> inline unsigned - dpoints_base_<D,E>::size() const + dpsites_impl<D,E>::size() const { return win_.size(); } @@ -147,7 +147,7 @@ template <typename D, typename E> inline const D& - dpoints_base_<D,E>::dp(unsigned i) const + dpsites_impl<D,E>::dp(unsigned i) const { mln_precondition(i < size()); return win_.dp(i); @@ -156,7 +156,7 @@ template <typename D, typename E> inline const std::vector<D>& - dpoints_base_<D,E>::std_vector() const + dpsites_impl<D,E>::std_vector() const { return win_.std_vector(); } @@ -164,7 +164,7 @@ template <typename D, typename E> inline const std::vector<D>& - dpoints_base_<D,E>::vect() const + dpsites_impl<D,E>::vect() const { return std_vector(); } @@ -172,7 +172,7 @@ template <typename D, typename E> inline bool - dpoints_base_<D,E>::has(const D& dp) const + dpsites_impl<D,E>::has(const D& dp) const { return win_.has(dp); } @@ -180,7 +180,7 @@ template <typename D, typename E> inline void - dpoints_base_<D,E>::insert(const D& d) + dpsites_impl<D,E>::insert(const D& d) { win_.insert(d); } @@ -192,4 +192,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_INTERNAL_DPOINTS_BASE_HH +#endif // ! MLN_CORE_INTERNAL_DPSITES_IMPL_HH Index: mln/draw/line.hh --- mln/draw/line.hh (revision 2375) +++ mln/draw/line.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/site_set/line2d.hh> +# include <mln/core/site_set/p_line2d.hh> # include <mln/level/paste.hh> # include <mln/pw/image.hh> # include <mln/pw/cst.hh> Index: mln/draw/plot.hh --- mln/draw/plot.hh (revision 2375) +++ mln/draw/plot.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/site_set/line2d.hh> +# include <mln/core/site_set/p_line2d.hh> # include <mln/level/paste.hh> # include <mln/pw/image.hh> # include <mln/pw/cst.hh> Index: mln/win/cube3d.hh --- mln/win/cube3d.hh (revision 2375) +++ mln/win/cube3d.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/internal/window_base.hh> -# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/internal/dpsites_impl.hh> # include <mln/core/alias/dpoint3d.hh> @@ -64,7 +64,7 @@ * is defined with length = 3. */ struct cube3d : public internal::window_base< dpoint3d, cube3d >, - public internal::dpoints_base_< dpoint3d, cube3d > + public internal::dpsites_impl< dpoint3d, cube3d > { /*! \brief Constructor. * Index: mln/win/line.hh --- mln/win/line.hh (revision 2375) +++ mln/win/line.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/internal/window_base.hh> -# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/internal/dpsites_impl.hh> # include <mln/core/dpoint.hh> @@ -57,7 +57,7 @@ */ template <typename M, unsigned i, typename C> struct line : public internal::window_base< dpoint<M, C>, line<M,i,C> >, - public internal::dpoints_base_< dpoint<M, C>, line<M,i,C> > + public internal::dpsites_impl< dpoint<M, C>, line<M,i,C> > { /*! \brief Constructor. * Index: mln/win/rectangle2d.hh --- mln/win/rectangle2d.hh (revision 2375) +++ mln/win/rectangle2d.hh (working copy) @@ -36,7 +36,7 @@ */ # include <mln/core/internal/window_base.hh> -# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/internal/dpsites_impl.hh> # include <mln/core/alias/dpoint2d.hh> # include <mln/core/def/coord.hh> @@ -59,7 +59,7 @@ * is defined with height = 3 and width = 5. */ struct rectangle2d : public internal::window_base< dpoint2d, rectangle2d >, - public internal::dpoints_base_< dpoint2d, rectangle2d > + public internal::dpsites_impl< dpoint2d, rectangle2d > { /*! \brief Constructor. * Index: mln/win/diag2d.hh --- mln/win/diag2d.hh (revision 2375) +++ mln/win/diag2d.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/internal/window_base.hh> -# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/internal/dpsites_impl.hh> # include <mln/core/alias/dpoint2d.hh> @@ -58,7 +58,7 @@ * is defined with length = 5. */ struct diag2d : public internal::window_base< dpoint2d, diag2d >, - public internal::dpoints_base_< dpoint2d, diag2d > + public internal::dpsites_impl< dpoint2d, diag2d > { /*! \brief Constructor. * Index: mln/win/backdiag2d.hh --- mln/win/backdiag2d.hh (revision 2375) +++ mln/win/backdiag2d.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/internal/window_base.hh> -# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/internal/dpsites_impl.hh> # include <mln/core/alias/dpoint2d.hh> @@ -58,7 +58,7 @@ * is defined with length = 5. */ struct backdiag2d : public internal::window_base< dpoint2d, backdiag2d >, - public internal::dpoints_base_< dpoint2d, backdiag2d > + public internal::dpsites_impl< dpoint2d, backdiag2d > { /*! \brief Constructor. * Index: mln/win/cuboid3d.hh --- mln/win/cuboid3d.hh (revision 2375) +++ mln/win/cuboid3d.hh (working copy) @@ -32,7 +32,7 @@ /// \brief Definition of the mln::win::cuboid3d window. # include <mln/core/internal/window_base.hh> -# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/internal/dpsites_impl.hh> # include <mln/core/alias/dpoint3d.hh> @@ -74,7 +74,7 @@ http://en.wikipedia.org/wiki/Cuboid */ struct cuboid3d : public internal::window_base< dpoint3d, cuboid3d >, - public internal::dpoints_base_< dpoint3d, cuboid3d > + public internal::dpsites_impl< dpoint3d, cuboid3d > { /// \brief Constructor. /// Index: mln/win/octagon2d.hh --- mln/win/octagon2d.hh (revision 2375) +++ mln/win/octagon2d.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/internal/window_base.hh> -# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/internal/dpsites_impl.hh> # include <mln/core/alias/dpoint2d.hh> @@ -62,7 +62,7 @@ * is defined with L = 7 (l = 1). */ struct octagon2d : public internal::window_base< dpoint2d, octagon2d >, - public internal::dpoints_base_< dpoint2d, octagon2d > + public internal::dpsites_impl< dpoint2d, octagon2d > { /*! \brief Constructor. * Index: mln/win/disk2d.hh --- mln/win/disk2d.hh (revision 2375) +++ mln/win/disk2d.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/internal/window_base.hh> -# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/internal/dpsites_impl.hh> # include <mln/core/alias/dpoint2d.hh> @@ -50,7 +50,7 @@ * */ struct disk2d : public internal::window_base< dpoint2d, disk2d >, - public internal::dpoints_base_< dpoint2d, disk2d > + public internal::dpsites_impl< dpoint2d, disk2d > { /*! \brief Constructor. * Index: sandbox/pellegrin/set/core/line2d.hh --- sandbox/pellegrin/set/core/line2d.hh (revision 2375) +++ sandbox/pellegrin/set/core/line2d.hh (working copy) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_SITE_SET_LINE2D_HH # define MLN_CORE_SITE_SET_LINE2D_HH -/*! \file mln/core/site_set/line2d.hh +/*! \file mln/core/site_set/p_line2d.hh * * \brief Definition of a point set class based on std::vector. */ Index: sandbox/nivault/dyn_line.hh --- sandbox/nivault/dyn_line.hh (revision 2375) +++ sandbox/nivault/dyn_line.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/window.hh> -# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/internal/dpsites_impl.hh> # include <mln/core/dpoint.hh> # include <mln/core/dpsites_piter.hh> @@ -47,7 +47,7 @@ template <typename M, typename C> struct dyn_line : public Window< dyn_line<M,C> >, - public internal::dpoints_base_<dpoint_<M, C>, point_<M, C> > + public internal::dpsites_impl<dpoint_<M, C>, point_<M, C> > { /// Point associated type. typedef point_<M, int> point;

1 0

scool r95: Use Abox instead of strings
by Maxime van Noppen 23 Sep '08

23 Sep '08

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-09-23 Maxime van Noppen <yabo(a)lrde.epita.fr> Use Abox instead of strings * pp-cxx/CxxExp.str: Use Abox format instead of strings. CxxExp.str | 63 ++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 34 insertions(+), 29 deletions(-) Index: branches/scool-ng/src/pp-cxx/CxxExp.str =================================================================== --- branches/scool-ng/src/pp-cxx/CxxExp.str (revision 94) +++ branches/scool-ng/src/pp-cxx/CxxExp.str (revision 95) @@ -4,53 +4,58 @@ rules - CxxArgListToStr: - [ e | [h|tail] ] -> <concat-strings> [ <CxxExpToStr> e, ", ", <CxxArgListToStr> [h|tail] ] - - CxxArgListToStr: - [e | []] -> <CxxExpToStr> e + CxxArgListToAbox: +// [ e | [h|tail] ] -> <concat-strings> [ <CxxExpToStr> e, ", ", <CxxArgListToStr> [h|tail] ] + [ e | l ] -> H hs=0 [ ~<CxxExpToAbox> e H hs=1 [ "," ~<CxxArgListToAbox> l ] ] + where + not(<?[]> l) - CxxArgListToStr: - [] -> "" + CxxArgListToAbox: + [e | []] -> H hs=0 [ ~<CxxExpToAbox> e ] - CxxExpToStr: - CxxInt(i) -> i + CxxArgListToAbox: + [] -> [] - CxxExpToStr: - CxxSum(e1, e2) -> <concat-strings> [<CxxExpToStr> e1, " + ", <CxxExpToStr> e2] - CxxExpToStr: - CxxKeyword(idf, exp) -> <concat-strings> [idf, " ", <CxxExpToStr> exp] + CxxExpToAbox: + CxxFunCall(params, CxxId(idf), args) -> H hs=0 [ ~<CxxIdToAbox> idf ~<CxxParametersToAbox> params "(" ~<CxxArgListToAbox> args ")" ] - CxxExpToStr: - CxxAssign(idf, exp) -> <concat-strings> [idf, " = ", <CxxExpToStr> exp] + CxxParametersToAbox: + params -> H hs=1 [ "<" ~<CxxListToAbox(CxxParameterToAbox|",")> params ">" ] + where + not(<?[]> params) - CxxExpToStr: - CxxFunCall([], CxxId(idf), args) -> <concat-strings> [ idf, "(", <CxxArgListToStr> args, ")" ] + CxxExpToAbox: + CxxAdressOf(idf) -> H hs=0 [ "&" ~<CxxIdToAbox> idf ] - CxxExpToStr: - CxxProgram(exp) -> exp + CxxExpToAbox: + CxxInt(i) -> S(i) - CxxExpToStr: - x -> x - where <is-string> x + CxxExpToAbox: + CxxSum(e1, e2) -> H hs=1 [~<CxxExpToAbox> e1 "+" ~<CxxExpToAbox> e2] - CxxExpToStr: - CxxId(idf) -> idf + CxxExpToAbox: + CxxKeyword(idf, exp) -> H hs=1 [ ~<CxxIdToAbox> idf ~<CxxExpToAbox> exp] + CxxExpToAbox: + CxxAssign(idf, exp) -> H hs=1 [ ~<CxxIdToAbox> idf "=" ~<CxxExpToAbox> exp] + CxxExpToAbox: + CxxProgram(exp) -> S(exp) CxxExpToAbox: - CxxAdressOf(idf) -> H hs=0 [ "&" ~<CxxIdToAbox> idf ] + x -> S(x) + where + <is-string> x CxxExpToAbox: - x -> S(<CxxExpToStr> x) + CxxId(idf) -> S(idf) - CxxExpToAbox: - CxxFunCall(params, CxxId(idf), args) -> H hs=0 [ ~<CxxIdToAbox> idf "< " ~<CxxListToAbox(CxxParameterToAbox|",")> params " >" "(" ~S(~<CxxArgListToStr> args) ")" ] - where <debug> params + // FIXME: This shouldn't be here. + CxxParametersToAbox: + [] -> H [] CxxParameterToAbox: type -> abox_type -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

1 0

cleanup-2008 2375: Make basic neighborhoods rely on neighb<W> and fix from_to.
by Thierry Geraud 23 Sep '08

23 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Make basic neighborhoods rely on neighb<W> and fix from_to. * tests/core/other/neighb.cc: Revamp. * doc/tutorial/examples/p_key.cc: Augment. * mln/core/window.hh (clear): New. (insert): New overload. * mln/core/alias/neighb1d.hh, * mln/core/alias/neighb2d.hh, * mln/core/alias/neighb3d.hh: Update. They now rely on neighb<W>. * mln/core/alias/window1d.hh, * mln/core/alias/window2d.hh, * mln/core/alias/window3d.hh: Update. (impl::from_to_): Replace by... (from_to): ...these new overloads. * mln/core/neighb.hh (todo): New. (include): Fix missings. (to_window): Rename as... (win): ...this. (size, delta, hook_win_): New. (impl::from_to_): Replace by... (from_to): ...this and update. * mln/core/concept/neighborhood.hh: Update. * mln/metal/abort.hh (mlc_abort): New. * mln/make/neighb2d.hh: Remove. * mln/convert/to.hh (impl::from_to_): Update call to... (from_to): ...this. * mln/convert/from_to.hh (impl::from_to_): Rename as... (from_to): ...this. Now convert::from_to is a set of overloaded routines; that makes much easier the definitions of new versions. doc/tutorial/examples/p_key.cc | 6 +- mln/convert/from_to.hh | 83 ++++++++++++++++------------------ mln/convert/to.hh | 2 mln/core/alias/neighb1d.hh | 15 +++--- mln/core/alias/neighb2d.hh | 95 +++++++++++++++++++++++++++------------ mln/core/alias/neighb3d.hh | 77 ++++++++++++++----------------- mln/core/alias/window1d.hh | 17 +----- mln/core/alias/window2d.hh | 38 ++++++--------- mln/core/alias/window3d.hh | 17 +----- mln/core/concept/neighborhood.hh | 7 ++ mln/core/neighb.hh | 71 ++++++++++++++++++++++------- mln/core/window.hh | 29 +++++++++++ mln/metal/abort.hh | 2 tests/core/other/neighb.cc | 30 ++++++------ 14 files changed, 287 insertions(+), 202 deletions(-) Index: tests/core/other/neighb.cc --- tests/core/other/neighb.cc (revision 2374) +++ tests/core/other/neighb.cc (working copy) @@ -26,33 +26,37 @@ // Public License. /// \file tests/core/other/neighb.cc -/// \brief Tests on mln::neighb<D> specializations. +/// \brief Tests on regular neighborhoods. #include <mln/core/alias/neighb1d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/alias/neighb3d.hh> +#include <mln/literal/origin.hh> using namespace mln; + template <typename N> -void test(const Neighborhood<N>& nbh, const mln_site(N)& p_ref, - unsigned size) +unsigned +size(const N& nbh) { - mln_niter(N) n(nbh, p_ref); - unsigned i = 0; + mln_site(N) O = literal::origin; + mln_niter(N) n(nbh, O); + unsigned s = 0; for_all(n) - ++i; - mln_assertion(i == size); + ++s; + return s; } + int main() { - test(c2(), point1d(0), 2); + mln_assertion(size(c2()) == 2); - test(c4(), point2d(0, 0), 4); - test(c8(), point2d(0, 0), 8); + mln_assertion(size(c4()) == 4); + mln_assertion(size(c8()) == 8); - test( c6(), point3d(0, 0, 0), 6); - test(c18(), point3d(0, 0, 0), 18); - test(c26(), point3d(0, 0, 0), 26); + mln_assertion(size( c6()) == 6); + mln_assertion(size(c18()) == 18); + mln_assertion(size(c26()) == 26); } Index: doc/tutorial/examples/p_key.cc --- doc/tutorial/examples/p_key.cc (revision 2374) +++ doc/tutorial/examples/p_key.cc (working copy) @@ -41,6 +41,8 @@ for (unsigned i = 0; i < 7; ++i) p += dp[i], s.insert(p.row(), p); + picture(s); + std::cout << s.keys() << std::endl; std::cout << s << std::endl; } @@ -78,8 +80,8 @@ s.remove_key(0); std::cout << s << std::endl; - std::cout << "change key 2 -> 4" << std::endl; - s.change_key(2, 4); + std::cout << "change key 2 -> 5" << std::endl; + s.change_key(2, 5); std::cout << s << std::endl; std::cout << "remove key 3" << std::endl; Index: mln/core/window.hh --- mln/core/window.hh (revision 2374) +++ mln/core/window.hh (working copy) @@ -114,6 +114,9 @@ */ bool is_empty() const; + /// Clear the window. + void clear(); + /*! \brief Give the maximum coordinate gap between the window center and a window point. */ @@ -128,6 +131,10 @@ /// Insert a delta-point \p dp. window<D>& insert(const D& dp); + /// Insert another window \p win. + template <typename W> + window<D>& insert(const Window<W>& win); + /// \{ Insertion of a delta-point with different numbers of /// arguments (coordinates) w.r.t. the dimension. window<D>& insert(const mln_coord(D)& dind); // For 1D or index access. @@ -211,7 +218,6 @@ *this = tmp; } - template <typename D> inline bool @@ -222,6 +228,14 @@ template <typename D> inline + void + window<D>::clear() + { + dps_.clear(); + } + + template <typename D> + inline unsigned window<D>::delta() const { @@ -280,6 +294,19 @@ } template <typename D> + template <typename W> + inline + window<D>& + window<D>::insert(const Window<W>& win_) + { + const W& win = exact(win_); + const unsigned n = win.size(); + for (unsigned i = 0; i < n; ++i) + dps_.insert(win.dp(i)); + return *this; + } + + template <typename D> inline window<D>& window<D>::insert(const mln_coord(D)& dind) Index: mln/core/alias/neighb1d.hh --- mln/core/alias/neighb1d.hh (revision 2374) +++ mln/core/alias/neighb1d.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 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 @@ -36,7 +36,8 @@ # include <cmath> # include <mln/core/neighb.hh> -# include <mln/core/alias/dpoint1d.hh> +# include <mln/core/alias/window1d.hh> +# include <mln/geom/sym.hh> namespace mln @@ -45,7 +46,7 @@ /*! \brief Type alias for a neighborhood defined on the 1D square * grid with integer coordinates. */ - typedef neighb_<dpoint1d> neighb1d; + typedef neighb<window1d> neighb1d; /*! \brief 2-connectivity neighborhood on the 1D grid. @@ -62,12 +63,12 @@ inline const neighb1d& c2() { - static bool flower = true; static neighb1d it; - if (flower) + if (it.size() == 0) { - it.insert(dpoint1d(+1)); - flower = false; + it.hook_win_() + .insert(dpoint1d(-1)) + .insert(dpoint1d(+1)); } return it; } Index: mln/core/alias/neighb2d.hh --- mln/core/alias/neighb2d.hh (revision 2374) +++ mln/core/alias/neighb2d.hh (working copy) @@ -32,11 +32,14 @@ * * \brief Definition of the mln::neighb2d alias and of some classical * 2D neighborhoods. + * + * \todo Add symmetry and non-centering tests in conversion. */ # include <cmath> -# include <mln/core/neighborhood.hh> -# include <mln/core/alias/dpoint2d.hh> +# include <mln/core/alias/window2d.hh> +# include <mln/core/neighb.hh> +# include <mln/convert/from_to.hh> namespace mln @@ -45,14 +48,11 @@ /*! \brief Type alias for a neighborhood defined on the 2D square * grid with integer coordinates. */ - typedef neighborhood<dpoint2d> neighb2d; + typedef neighb<window2d> neighb2d; } -# include <mln/make/neighb2d.hh> - - namespace mln { @@ -101,20 +101,31 @@ + namespace convert + { + + template <unsigned S> + void from_to(const bool (&values)[S], neighb2d& nbh); + + template <unsigned R, unsigned C> + void from_to(bool const (&values)[R][C], neighb2d& nbh); + + } // end of namespace mln::convert + + + # ifndef MLN_INCLUDE_ONLY inline const neighb2d& c4() { - // FIXME: `flower' is probably not a canonical name to state - // whether the neighborhood is initialized or not. :) - static bool flower = true; static neighb2d it; - if (flower) + if (it.size() == 0) { - it.insert(0, 1) - .insert(1, 0); - flower = false; + static const bool vals[] = { 0, 1, 0, + 1, 0, 1, + 0, 1, 0 }; + convert::from_to(vals, it); } return it; } @@ -122,15 +133,13 @@ inline const neighb2d& c8() { - static bool flower = true; static neighb2d it; - if (flower) + if (it.size() == 0) { - it.insert(0, 1) - .insert(1,-1) - .insert(1, 0) - .insert(1, 1); - flower = false; + static const bool vals[] = { 1, 1, 1, + 1, 0, 1, + 1, 1, 1 }; + convert::from_to(vals, it); } return it; } @@ -138,12 +147,13 @@ inline const neighb2d& c2_row() { - static bool flower = true; static neighb2d it; - if (flower) + if (it.size() == 0) { - it.insert(0, 1); - flower = false; + static const bool vals[] = { 0, 0, 0, + 1, 0, 1, + 0, 0, 0 }; + convert::from_to(vals, it); } return it; } @@ -151,16 +161,45 @@ inline const neighb2d& c2_col() { - static bool flower = true; static neighb2d it; - if (flower) + if (it.size() == 0) { - it.insert(1, 0); - flower = false; + static const bool vals[] = { 0, 1, 0, + 0, 0, 0, + 0, 1, 0 }; + convert::from_to(vals, it); } return it; } + + namespace convert + { + + template <unsigned S> + void + from_to(const bool (&values)[S], neighb2d& nbh) + { + enum { h = mlc_sqrt_int(S) / 2 }; + mlc_bool((2 * h + 1) * (2 * h + 1) == S)::check(); + window2d& win = nbh.hook_win_(); + convert::from_to(values, win); + mln_postcondition(win.is_neighbable_()); + } + + template <unsigned R, unsigned C> + void + from_to(bool const (&values)[R][C], neighb2d& nbh) + { + mlc_bool(R % 2 == 1)::check(); + mlc_bool(C % 2 == 1)::check(); + window2d& win = nbh.hook_win_(); + convert::from_to(values, win); + mln_postcondition(win.is_neighbable_()); + } + + } // end of namespace mln::convert + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln Index: mln/core/alias/neighb3d.hh --- mln/core/alias/neighb3d.hh (revision 2374) +++ mln/core/alias/neighb3d.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 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 @@ -36,7 +36,8 @@ # include <cmath> # include <mln/core/neighb.hh> -# include <mln/core/alias/dpoint3d.hh> +# include <mln/core/alias/window3d.hh> +# include <mln/geom/sym.hh> namespace mln @@ -45,7 +46,7 @@ /*! \brief Type alias for a neighborhood defined on the 3D square * grid with integer coordinates. */ - typedef neighb_<dpoint3d> neighb3d; + typedef neighb<window3d> neighb3d; /*! \brief 6-connectivity neighborhood on the 3D grid. @@ -102,19 +103,23 @@ */ const neighb3d& c26(); + + # ifndef MLN_INCLUDE_ONLY inline const neighb3d& c6() { - static bool flower = true; static neighb3d it; - if (flower) + if (it.size() == 0) { - it.insert(dpoint3d(+1, 0, 0)); - it.insert(dpoint3d(0, +1, 0)); - it.insert(dpoint3d(0, 0, +1)); - flower = false; + window3d& win = it.hook_win_(); + win + .insert(1, 0, 0) + .insert(0, 1, 0) + .insert(0, 0, 1); + win + .insert(geom::sym(win)); } return it; } @@ -122,22 +127,20 @@ inline const neighb3d& c18() { - static bool flower = true; static neighb3d it; - if (flower) + if (it.size() == 0) { - it.insert(dpoint3d(+1, 0, 0)); - it.insert(dpoint3d(0, +1, 0)); - it.insert(dpoint3d(0, 0, +1)); - - it.insert(dpoint3d(+1, 0, +1)); - it.insert(dpoint3d(+1, 0, -1)); - it.insert(dpoint3d(0, +1, +1)); - it.insert(dpoint3d(0, +1, -1)); - it.insert(dpoint3d(+1, +1, 0)); - it.insert(dpoint3d(+1, -1, 0)); - - flower = false; + window3d& win = it.hook_win_(); + win + .insert(1, 0, 1) + .insert(1, 0, -1) + .insert(0, 1, 1) + .insert(0, 1, -1) + .insert(1, 1, 0) + .insert(1, -1, 0); + win + .insert(geom::sym(win)) + .insert(c6().win()); } return it; } @@ -145,26 +148,18 @@ inline const neighb3d& c26() { - static bool flower = true; static neighb3d it; - if (flower) + if (it.size() == 0) { - it.insert(dpoint3d(+1, 0, 0)); - it.insert(dpoint3d(0, +1, 0)); - it.insert(dpoint3d(0, 0, +1)); - - it.insert(dpoint3d(+1, 0, +1)); - it.insert(dpoint3d(+1, 0, -1)); - it.insert(dpoint3d(0, +1, +1)); - it.insert(dpoint3d(0, +1, -1)); - it.insert(dpoint3d(+1, +1, 0)); - it.insert(dpoint3d(+1, -1, 0)); - - it.insert(dpoint3d(+1, +1, +1)); - it.insert(dpoint3d(+1, +1, -1)); - it.insert(dpoint3d(+1, -1, +1)); - it.insert(dpoint3d(+1, -1, -1)); - flower = false; + window3d& win = it.hook_win_(); + win + .insert(1, 1, 1) + .insert(1, 1, -1) + .insert(1, -1, 1) + .insert(1, -1, -1); + win + .insert(geom::sym(win)) + .insert(c18().win()); } return it; } Index: mln/core/alias/window1d.hh --- mln/core/alias/window1d.hh (revision 2374) +++ mln/core/alias/window1d.hh (working copy) @@ -47,13 +47,9 @@ namespace convert { - namespace impl - { template <unsigned M> - void from_to_(bool const (&values)[M], window1d& win); - - } // end of namespace mln::convert::impl + void from_to(const bool (&values)[M], window1d& win); } // end of namespace mln::convert @@ -63,25 +59,20 @@ namespace convert { - namespace impl - { template <unsigned M> void - from_to_(bool const (&values)[M], window1d& win) + from_to(bool const (&values)[M], window1d& win) { mlc_bool(M % 2 == 1)::check(); - mln_precondition(win.is_empty()); // FIXME: or just .clear() it? - + win.clear(); const int h = int(M) / 2; unsigned i = 0; for (int ind = - h; ind <= h; ++ind) if (values[i++]) - win.insert(dpoint1d(ind)); + win.insert(ind); } - } // end of namespace mln::convert::impl - } // end of namespace mln::convert # endif // ! MLN_INCLUDE_ONLY Index: mln/core/alias/window2d.hh --- mln/core/alias/window2d.hh (revision 2374) +++ mln/core/alias/window2d.hh (working copy) @@ -31,6 +31,8 @@ /// \file mln/core/alias/window2d.hh /// \brief Definition of the mln::window2d alias and of a construction /// routine. +/// +/// \todo c8p etc. # include <mln/core/window.hh> # include <mln/core/alias/dpoint2d.hh> @@ -58,16 +60,12 @@ namespace convert { - namespace impl - { template <unsigned S> - void from_to_(bool const (&values)[S], window2d& win); + void from_to(const bool (&values)[S], window2d& win); template <unsigned R, unsigned C> - void from_to_(bool const (&values)[R][C], window2d& win); - - } // end of namespace mln::convert::impl + void from_to(const bool (&values)[R][C], window2d& win); } // end of namespace mln::convert @@ -78,16 +76,15 @@ inline const window2d& win_c4p() { - static bool initialized_p = false; static window2d it; - if (!initialized_p) + if (it.size() == 0) { - it.insert(dpoint2d( 0, -1)); - it.insert(dpoint2d(-1, 0)); - it.insert(dpoint2d( 0, 0)); - it.insert(dpoint2d(+1, 0)); - it.insert(dpoint2d( 0, +1)); - initialized_p = true; + it + .insert( 0, -1) + .insert(-1, 0) + .insert( 0, 0) + .insert(+1, 0) + .insert( 0, +1); } return it; } @@ -95,16 +92,14 @@ namespace convert { - namespace impl - { template <unsigned S> void - from_to_(bool const (&values)[S], window2d& win) + from_to(const bool (&values)[S], window2d& win) { - mln_precondition(win.is_empty()); // FIXME: or just .clear() it? enum { h = mlc_sqrt_int(S) / 2 }; mlc_bool((2 * h + 1) * (2 * h + 1) == S)::check(); + win.clear(); unsigned i = 0; for (int row = - h; row <= h; ++row) for (int col = - h; col <= h; ++col) @@ -114,12 +109,11 @@ template <unsigned R, unsigned C> void - from_to_(bool const (&values)[R][C], window2d& win) + from_to(const bool (&values)[R][C], window2d& win) { mlc_bool(R % 2 == 1)::check(); mlc_bool(C % 2 == 1)::check(); - mln_precondition(win.is_empty()); // FIXME: or just .clear() it? - + win.clear(); const int drow = int(R) / 2, dcol = int(C) / 2; for (int row = - drow; row <= drow; ++row) for (int col = - dcol; col <= dcol; ++col) @@ -127,8 +121,6 @@ win.insert(row, col); } - } // end of namespace mln::convert::impl - } // end of namespace mln::convert # endif // ! MLN_INCLUDE_ONLY Index: mln/core/alias/window3d.hh --- mln/core/alias/window3d.hh (revision 2374) +++ mln/core/alias/window3d.hh (working copy) @@ -48,13 +48,9 @@ namespace convert { - namespace impl - { template <unsigned M> - void from_to_(bool const (&values)[M], window3d& win); - - } // end of namespace mln::convert::impl + void from_to(bool const (&values)[M], window3d& win); } // end of namespace mln::convert @@ -64,27 +60,22 @@ namespace convert { - namespace impl - { template <unsigned M> void - from_to_(bool const (&values)[M], window3d& win) + from_to(bool const (&values)[M], window3d& win) { - mln_precondition(win.is_empty()); // FIXME: or just .clear() it? const int h = unsigned(std::pow(float(M), float(1. / 3.))) / 2; mln_precondition((2 * h + 1) * (2 * h + 1) * (2 * h + 1) == M); - + win.clear(); unsigned i = 0; for (int sli = - h; sli <= h; ++sli) for (int row = - h; row <= h; ++row) for (int col = - h; col <= h; ++col) if (values[i++]) - win.insert(dpoint3d(sli, row, col)); + win.insert(sli, row, col); } - } // end of namespace mln::convert::impl - } // end of namespace mln::convert # endif // ! MLN_INCLUDE_ONLY Index: mln/core/neighb.hh --- mln/core/neighb.hh (revision 2374) +++ mln/core/neighb.hh (working copy) @@ -31,9 +31,17 @@ /*! \file mln/core/neighb.hh * * \brief Definition of a window-to-neighborhood adapter. + * + * \todo Introduce properties so that we can deal properly with + * optional methods. + * + * \todo See if the impl of from_to is fine. What about removing the + * origin? etc. */ +# include <mln/core/concept/window.hh> # include <mln/core/internal/neighborhood_base.hh> +# include <mln/core/internal/site_relative_iterator_base.hh> # include <mln/convert/from_to.hh> @@ -53,8 +61,8 @@ { public: + /// Window associated type. typedef W window; - const W& to_window() const { return win_; } /// Forward site iterator associated type. typedef neighb_fwd_niter<W> fwd_niter; @@ -78,6 +86,21 @@ /// Change the corresponding window. void change_window(const W& new_win); + + // Optional methods... + + /// Give the neighborhood size, i.e., the number of elements it + /// contains. + unsigned size() const; + + /// Give the maximum coordinate gap between the neighborhood + /// center and a neighboring point. + unsigned delta() const; + + + /// \internal Hook to the window. + W& hook_win_(); + private: W win_; }; @@ -86,18 +109,14 @@ namespace convert { - namespace impl - { template <typename W> void - from_to_(const mln::neighb<W>& from, W& to); + from_to(const mln::neighb<W>& from, W& to); template <typename W> void - from_to_(const W& from, mln::neighb<W>& to); - - } // end of namespace convert::impl + from_to(const W& from, mln::neighb<W>& to); } // end of namespace convert @@ -211,30 +230,50 @@ win_ = new_win; } + template <typename W> + inline + unsigned + neighb<W>::size() const + { + return win_.size(); + } + + template <typename W> + inline + unsigned + neighb<W>::delta() const + { + return win_.delta(); + } + + template <typename W> + inline + W& + neighb<W>::hook_win_() + { + return win_; + } + - // convert::impl::from_to_ + // convert::from_to namespace convert { - namespace impl - { template <typename W> void - from_to_(const mln::neighb<W>& from, W& to) + from_to(const mln::neighb<W>& from, W& to) { to = from.win(); } template <typename W> void - from_to_(const W& from, mln::neighb<W>& to) + from_to(const W& from, mln::neighb<W>& to) { to.change_window(from); } - } // end of namespace convert::impl - } // end of namespace convert @@ -254,7 +293,7 @@ this->change_target(nbh); this->center_at(c); i_.center_at(c); // Always before change_target for this kind of iter. - i_.change_target(nbh.to_window()); + i_.change_target(nbh.win()); } template <typename W> @@ -314,7 +353,7 @@ this->change_target(nbh); this->center_at(c); i_.center_at(c); // Always before change_target for this kind of iter. - i_.change_target(nbh.to_window()); + i_.change_target(nbh.win()); } template <typename W> Index: mln/core/concept/neighborhood.hh --- mln/core/concept/neighborhood.hh (revision 2374) +++ mln/core/concept/neighborhood.hh (working copy) @@ -65,7 +65,10 @@ typedef bkd_niter; typedef window; - window to_window() const; + either + const window& win() const; + or + window win() const; */ protected: @@ -85,7 +88,7 @@ typedef mln_bkd_niter(E) bkd_niter; typedef mln_window(E) window; - bool m = (& E::to_window) == (& E::to_window); + bool m = (& E::win) == (& E::win); m = 0; // const window& (E::*m)() const = & E::to_window; // m = 0; Index: mln/metal/abort.hh --- mln/metal/abort.hh (revision 2374) +++ mln/metal/abort.hh (working copy) @@ -35,6 +35,8 @@ # include <mln/metal/bool.hh> +# define mlc_abort(A_TYPE) mln::metal::abort_< A_TYPE > + namespace mln { Index: mln/convert/to.hh --- mln/convert/to.hh (revision 2374) +++ mln/convert/to.hh (working copy) @@ -68,7 +68,7 @@ trace::entering("convert::to"); T tmp; - impl::from_to_(from, tmp); + from_to(from, tmp); trace::exiting("convert::to"); return tmp; Index: mln/convert/from_to.hh --- mln/convert/from_to.hh (revision 2374) +++ mln/convert/from_to.hh (working copy) @@ -32,9 +32,11 @@ * * \brief General conversion procedure between two objects. * - * \todo Prefer a static check that fails in the "unknown" case. - * * \todo Use 'round' instead of static_cast in vec->Gpoint. + * + * \todo Test the effectiveness of guards. + * \todo Add fwd decls. + * \todo Dispatch code in appropriate files. */ # include <mln/core/concept/object.hh> @@ -46,6 +48,7 @@ # include <mln/algebra/vec.hh> # include <mln/metal/is.hh> +# include <mln/metal/abort.hh> @@ -56,49 +59,63 @@ { - /// Conversion of an object \p from towards an object \p to. + /// Guards. + template <typename F, typename T> + void + from_to(const F& from, Object<T>& to); + template <typename F, typename T> - inline void - from_to(F& from, Object<T>& to); // See below an explanation of this signature. + from_to(const Object<F>& from, Object<T>& to); + + template <typename F, typename T> + void + from_to(const Object<F>& from, T& to); + /// end of Guards. template <typename T> - inline void from_to(const float& from, Object<T>& to); template <typename T> - inline void from_to(const int& from, Object<T>& to); - // Technical note: - - // In order to remain as general as possible (for instance to be - // able to pass a C array to 'from'), the signature cannot be - // "const F& from." It cannot embed the strong typing "Object<*>" - // neither. +# ifndef MLN_INCLUDE_ONLY -# ifndef MLN_INCLUDE_ONLY + /// Guards. + template <typename F, typename T> + void + from_to(const F&, Object<T>&) + { + mlc_abort(F)::check(); + } - namespace impl + template <typename F, typename T> + void + from_to(const Object<F>&, Object<T>&) { + mlc_abort(F)::check(); + } - // Default (F -> Object) means "unknown conversion". template <typename F, typename T> void - from_to_(const F& from, Object<T>& to); + from_to(const Object<F>&, T&) + { + mlc_abort(F)::check(); + } + /// end of Guards. // Image -> Site_Set. template <typename I, typename S> inline void - from_to_(const Image& from, Site_Set<S>& to) + from_to(const Image& from, Site_Set<S>& to) { mlc_is(mln_trait_site_set_contents(S), mln::trait::site_set::contents::dynamic)::check(); @@ -110,7 +127,7 @@ template <unsigned n, typename T, typename P> inline void - from_to_(const algebra::vec<n,T>& from, Gpoint& to_) + from_to(const algebra::vec<n,T>& from, Gpoint& to_) { mlc_bool(P::dim == n)::check(); P& to = exact(to_); @@ -122,7 +139,7 @@ template <typename T, unsigned m> inline void - from_to_(const algebra::vec<3,T>& from, value::rgb<m>& to_) + from_to(const algebra::vec<3,T>& from, value::rgb<m>& to_) { value::rgb<m>& to = exact(to_); algebra::vec<3, unsigned> tmp; @@ -132,34 +149,16 @@ to = value::rgb<m>(tmp); } - + // Value -> Value template <typename F, typename T> inline void - from_to_(const Value<F>& from, Value<T>& to) + from_to(const Value<F>& from, Value<T>& to) { mln::convert::impl::from_value_to_value(from, to); } - } // end of namespace mln::convert::impl - - - - // Facades. - - - template <typename F, typename T> - inline - void - from_to(F& from, Object<T>& to) - { - trace::entering("convert::from_to"); - mlc_equal(F, mln_exact(F))::check(); - impl::from_to_(from, exact(to)); - trace::exiting("convert::from_to"); - } - - + // float -> Object template <typename T> inline void @@ -169,7 +168,7 @@ exact(to) = from; } - + // int -> Object template <typename T> inline void

1 0

scool r94: Add template functions to the pretty-printer
by Maxime van Noppen 23 Sep '08

23 Sep '08

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-09-23 Maxime van Noppen <yabo(a)lrde.epita.fr> Add template functions to the pretty-printer * pp-cxx/CxxExp.str: Implement CxxFunCall constructor. * pp-cxx/CxxStm.str: Be more strict when adding a semicolon. CxxExp.str | 19 +++++++++++++++++-- CxxStm.str | 5 +++-- 2 files changed, 20 insertions(+), 4 deletions(-) Index: branches/scool-ng/src/pp-cxx/CxxExp.str =================================================================== --- branches/scool-ng/src/pp-cxx/CxxExp.str (revision 93) +++ branches/scool-ng/src/pp-cxx/CxxExp.str (revision 94) @@ -5,10 +5,10 @@ rules CxxArgListToStr: - [ e | [h|tail] ] -> <concat-strings> [ e, ", ", <CxxArgListToStr> [h|tail] ] + [ e | [h|tail] ] -> <concat-strings> [ <CxxExpToStr> e, ", ", <CxxArgListToStr> [h|tail] ] CxxArgListToStr: - [e | []] -> e + [e | []] -> <CxxExpToStr> e CxxArgListToStr: [] -> "" @@ -46,3 +46,18 @@ CxxExpToAbox: x -> S(<CxxExpToStr> x) + + CxxExpToAbox: + CxxFunCall(params, CxxId(idf), args) -> H hs=0 [ ~<CxxIdToAbox> idf "< " ~<CxxListToAbox(CxxParameterToAbox|",")> params " >" "(" ~S(~<CxxArgListToStr> args) ")" ] + where <debug> params + + + CxxParameterToAbox: + type -> abox_type + where + <CxxTypeToAbox> type => abox_type + + CxxParameterToAbox: + exp -> abox_exp + where + <CxxExpToAbox> exp => abox_exp Index: branches/scool-ng/src/pp-cxx/CxxStm.str =================================================================== --- branches/scool-ng/src/pp-cxx/CxxStm.str (revision 93) +++ branches/scool-ng/src/pp-cxx/CxxStm.str (revision 94) @@ -11,8 +11,9 @@ // As said on https://trac.lrde.org/scool/wiki/SCOOL/Specs/Misc the C++ inserted // must be valid and so contain an ending ';' Semicolon: - _#([_, CxxProgram(exp)]) -> S("") + _#([_, CxxProgram(_)]) -> S("") Semicolon: - _#([_, _]) -> S(";") + x -> S(";") + where not(<?_#([_, CxxProgram(_)])> x) -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

1 0

scool r93: Add reference files for tests on template functions
by Maxime van Noppen 23 Sep '08

23 Sep '08

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-09-23 Maxime van Noppen <yabo(a)lrde.epita.fr> Add reference files for tests on template functions * check.sh: Remove debug message. * function/c++_src/call_001.cc: New. * function/c++_src/call_002.cc: New. * function/c++_src/call_003.cc: New. * function/c++_src/call_004.cc: New. * function/c++_src/call_005.cc: New. * function/c++_src/call_006.cc: New. check.sh | 1 - function/c++_src/call_001.cc | 4 ++++ function/c++_src/call_002.cc | 4 ++++ function/c++_src/call_003.cc | 4 ++++ function/c++_src/call_004.cc | 4 ++++ function/c++_src/call_005.cc | 4 ++++ function/c++_src/call_006.cc | 4 ++++ 7 files changed, 24 insertions(+), 1 deletion(-) Index: branches/scool-ng/tests/function/c++_src/call_001.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/call_001.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/call_001.cc (revision 93) @@ -0,0 +1,4 @@ +void doit() +{ + foo(); +} Index: branches/scool-ng/tests/function/c++_src/call_002.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/call_002.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/call_002.cc (revision 93) @@ -0,0 +1,4 @@ +void doit() +{ + foo(42); +} Index: branches/scool-ng/tests/function/c++_src/call_003.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/call_003.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/call_003.cc (revision 93) @@ -0,0 +1,4 @@ +void doit() +{ + foo(bar, 42); +} Index: branches/scool-ng/tests/function/c++_src/call_004.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/call_004.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/call_004.cc (revision 93) @@ -0,0 +1,4 @@ +void doit() +{ + foo< int >(); +} Index: branches/scool-ng/tests/function/c++_src/call_005.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/call_005.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/call_005.cc (revision 93) @@ -0,0 +1,4 @@ +void doit() +{ + foo< 42 >(); +} Index: branches/scool-ng/tests/function/c++_src/call_006.cc =================================================================== --- branches/scool-ng/tests/function/c++_src/call_006.cc (revision 0) +++ branches/scool-ng/tests/function/c++_src/call_006.cc (revision 93) @@ -0,0 +1,4 @@ +void doit() +{ + foo< int, 42 >(42); +} Index: branches/scool-ng/tests/check.sh =================================================================== --- branches/scool-ng/tests/check.sh (revision 92) +++ branches/scool-ng/tests/check.sh (revision 93) @@ -266,7 +266,6 @@ -t) shift tests="$1" - echo "XTEST: " $1 ;; -h | --help) -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

1 0

cleanup-2008 2373: Start a new documentation file about the value properties.
by Nicolas Ballas 23 Sep '08

23 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> Start a new documentation file about the value properties. * doc/technical/designs/properties: New. * doc/technical/designs/properties/values.txt: New doc file. values.txt | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) Index: doc/technical/designs/properties/values.txt --- doc/technical/designs/properties/values.txt (revision 0) +++ doc/technical/designs/properties/values.txt (revision 0) @@ -0,0 +1,168 @@ +-*- outline -*- + + Values related properties + + +* TODO + -> Are the properties related to the values sufficiant? + -> What are the interface related to each value property? + -> How these values properties affect the fill/paste/transform process? + +* Values properties list: + +** value_access: /any/ + | + + -- direct + | + + -- computed + + +** value_storage:/any/ + | + + -- /organized/ + | | + | + -- singleton + | | + | + -- one_block + | | + | + -- piecewise + | + + -- disrupted + +=> Methods related: + value_storage == singleton + => ima.value() -> return the image value + + value_storage == one_block + => image.nelements() -> return the number of elements in memory + => image.buffer() -> return the start adress of the ima buffer + + value_storage == piece_wise + //FIXME + +** value_browsing:/any/ + | + + -- site_wise_only + | + + -------- cell_wise + | | + + -- value_wise | + \ | + -- + -- cell_and_value_wise + +=> Methods related: + value_browsing == value_wise + => ima.values_taken() -> return the current values taken by + ima + => ima.change_value(oldVal, newVal) -> change the value oldVal to newVal + => ima.change_values(f) -> apply f (a function v2v) to all the + values + => ima.sites(v) -> return the sites associated to the + value v + + value_browsing == cell_wise + => ima.values_cell() -> return the cells composing the image + + value_browsing == cell_and_value_wise + method of value_wise property value + cell_wise property value + + + + + +* fill (depends on the value_storage property) + +*** values_storage == oneblock +// Replace by Memcopy? +const unsigned n = ima.nelements(); +mln_value(I)* ptr = ima.buffer(); +for (unsigned i = 0; i < n; ++i) + *ptr++ = val; + +**** Method related +-> nelements +-> buffer + + +*** value_storage == piece_wise +// MemCopy on the runs? +for (ungsigned i = 0; i < ima.nruns(); ++i) + //FIXME +**** Method related: + nruns ??? + + +*** value_storage == any && value_browsing == value_wise + +// direct access to the value +mln_viter(mln_taken_values(I)) viter(I.taken_values(); +for_all(viter); + ima.changes_values(viter, v); + +**** Method related: + -> iterator on value taken + -> change_values + +*** Generic case: all the other case +mln_piter(I) p(ima.domain()); +for_all(p) + ima(p) = v; + + +* To keep in Mind + +-image storage in memory + +=> Computed + [...] + +=> All is store + + 0 1 2 3 4 + ---------- +0 |eeeeeeeeee| +1 |errrbbbgge| +2 |ebbbggrrre| +3 |errbbbrrbe| // e is the extended border +4 |eeeeeeeeee| + ---------- + + +=> Run + + 0 1 2 3 4 + ---------- +0 | | +1 | rbrrb | +2 | | +3 | bbbbb| +4 |grgbb | + ---------- + +=> Values oriented + +r : (5,2), (4, 2), (6, 2) +g : (5,4), (4, 4), (6, 3) +b : (2,2), (1, 2), (3, 2) + +-differentiate the localization of an image and its storage method. + +* Image related with 'special' values access + +** Run Images (sparce, value_encoded) + +=> fill: *cpt++ = v sur chaque run +| ++-> related to memory storage + +** Pkey Images + +=> change_value + + + +* Note + +- Cell access and Value access wise property depends on the image + --> property related: + cell-wise and value wise

1 0

2373: * tests/morpho/line_graph_image_wst.cc: Remove useless #include's.
by Roland Levillain 23 Sep '08

23 Sep '08

--- milena/ChangeLog | 4 ++++ milena/tests/morpho/line_graph_image_wst.cc | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f0781e3..bd979d4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + * tests/morpho/line_graph_image_wst.cc: Remove useless #include's. + +2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + Fix test graph_image_wst. * tests/core/image/graph_image_wst.cc: Move test... diff --git a/milena/tests/morpho/line_graph_image_wst.cc b/milena/tests/morpho/line_graph_image_wst.cc index 06e22e7..ce6514f 100644 --- a/milena/tests/morpho/line_graph_image_wst.cc +++ b/milena/tests/morpho/line_graph_image_wst.cc @@ -37,10 +37,6 @@ #include <mln/morpho/meyer_wst.hh> -#include <mln/draw/graph.hh> -#include <mln/debug/iota.hh> -#include <mln/debug/println.hh> - int main() { -- 1.6.0.1

1 0

2372: Fix test graph_image_wst.
by Roland Levillain 23 Sep '08

23 Sep '08

* tests/core/image/graph_image_wst.cc: Move test... * tests/morpho/graph_image_wst.cc: ...here. Catch up with interfaces of cleanup-2008. Turn this test into an actual WST segmentation of a graph image. * tests/core/image/Makefile.am (check_PROGRAM): Remove graph_image_wst. (graph_image_wst_SOURCES): Move... * tests/morpho/Makefile.am: ...here. (check_PROGRAM): Add graph_image_wst. --- milena/ChangeLog | 14 +++ milena/tests/core/image/Makefile.am | 5 - milena/tests/core/image/graph_image_wst.cc | 149 ---------------------------- milena/tests/morpho/Makefile.am | 3 + milena/tests/morpho/graph_image_wst.cc | 120 ++++++++++++++++++++++ 5 files changed, 137 insertions(+), 154 deletions(-) delete mode 100644 milena/tests/core/image/graph_image_wst.cc create mode 100644 milena/tests/morpho/graph_image_wst.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 193a46d..f0781e3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + Fix test graph_image_wst. + + * tests/core/image/graph_image_wst.cc: Move test... + * tests/morpho/graph_image_wst.cc: ...here. + Catch up with interfaces of cleanup-2008. + Turn this test into an actual WST segmentation of a graph image. + * tests/core/image/Makefile.am (check_PROGRAM): Remove + graph_image_wst. + (graph_image_wst_SOURCES): Move... + * tests/morpho/Makefile.am: ...here. + (check_PROGRAM): Add graph_image_wst. + +2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + Fix more morphological tests on graph-based images. * tests/morpho/Makefile.am (check_PROGRAMS): Re-enable diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am index dc247cc..27435a1 100644 --- a/milena/tests/core/image/Makefile.am +++ b/milena/tests/core/image/Makefile.am @@ -10,7 +10,6 @@ check_PROGRAMS = \ flat_image \ ## hexa \ graph_image \ -## graph_image_wst \ image1d \ image2d \ ## image2d_h \ @@ -36,10 +35,6 @@ cast_image_SOURCES = cast_image.cc complex_image_SOURCES = complex_image.cc decorated_image_SOURCES = decorated_image.cc graph_image_SOURCES = graph_image.cc -### FIXME: graph_image_wst is almost a clone of graph_image: move it -### into tests/morpho and turn it into a real test on the WST (see -### line_graph_image_wst). -##graph_image_wst_SOURCES = graph_image_wst.cc flat_image_SOURCES = flat_image.cc ##hexa_SOURCES = hexa.cc image1d_SOURCES = image1d.cc diff --git a/milena/tests/core/image/graph_image_wst.cc b/milena/tests/core/image/graph_image_wst.cc deleted file mode 100644 index 8f2acc3..0000000 --- a/milena/tests/core/image/graph_image_wst.cc +++ /dev/null @@ -1,149 +0,0 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) -// -// 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. - -/// \file tests/core/image/graph_image_wst.cc -/// \brief Tests on the Watershed Transform on a mln::graph_image. - -#include <vector> - -#include <mln/core/alias/point2d.hh> -#include <mln/core/image/graph_image.hh> -#include <mln/core/image/graph_elt_window.hh> -#include <mln/core/image/graph_window_piter.hh> - -#include <mln/morpho/dilation.hh> - -#include <mln/draw/graph.hh> -#include <mln/debug/iota.hh> -#include <mln/debug/println.hh> - - -int main() -{ - using namespace mln; - - /*--------. - | Graph. | - `--------*/ - - // Points associated to nodes. - std::vector<point2d> points; - points.push_back(point2d(0,0)); // Point associated to node 0. - points.push_back(point2d(2,2)); // Point associated to node 1. - points.push_back(point2d(0,4)); // Point associated to node 2. - points.push_back(point2d(4,3)); // Point associated to node 3. - points.push_back(point2d(4,4)); // Point associated to node 4. - - // Edges. - util::graph<point2d> g; - // Populate the graph with nodes. - for (unsigned i = 0; i < points.size(); ++i) - g.add_node (points[i]); - // Populate the graph with edges. - g.add_edge(0, 1); - g.add_edge(1, 2); - g.add_edge(1, 3); - g.add_edge(3, 4); - g.add_edge(4, 2); - - /*-------. - | Graph. | - `-------*/ - - p_graph<point2d> pg(g); - - /*-------------. - | Graph image. | - `-------------*/ - - // Values ("empty" vector). - std::vector<int> values(5); - // Graph image. - typedef graph_image<point2d, int> ima_t; - ima_t ima(pg, values); - // Initialize values. - debug::iota(ima); - // Print the image. - /* FIXME: Unfortunately, displaying graph images is not easy right - now (2008-02-05). We could use - - debug::println(ima); - - but there's not specialization working for graph_image; the one - selected by the compiler is based on a 2-D bbox, and expects the - interface of graph_image to work with points (not psites). - Moreover, this implementation only shows *values*, not the graph - itslef. - - An alternative is to use draw::graph (which, again, is misnamed), - but it doesn't show the values, only the nodes and edges of the - graph. - - The current solution is a mix between draw::graph and hand-made - iterations. */ - image2d<int> ima_rep(ima.bbox()); - // We use the value 9 in draw::graph instead of the default (which is - // 1) to represent edges to distinguish it from nodes holding a - // value of 1. - draw::graph (ima_rep, ima, 9); - debug::println (ima_rep); - - - /*------------. - | Iterators. | - `------------*/ - - // Manual iteration over the domain of IMA. - mln_piter_(ima_t) p(ima.domain()); - for_all (p) - std::cout << "ima (" < win_t; - win_t win; - mln_qiter_(win_t) q(win, p); - for_all (p) - { - std::cout << "neighbors of " << p << " (" << ima(p) << "), " - << "including the site itself:" << std::endl; - for_all (q) - std::cout << " " << q << " (level = " << ima(q) << ")" << std::endl; - } - std::cout << std::endl; - - /*-------------------------. - | Processing graph images. | - `-------------------------*/ - - graph_image<point2d, int> ima_dil = morpho::dilation(ima, win); - draw::graph(ima_rep, ima_dil, 9); - debug::println(ima_rep); - - graph_image<point2d, int> ima_ero = morpho::erosion(ima, win); - draw::graph(ima_rep, ima_ero, 9); - debug::println(ima_rep); -} diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am index 48e3a82..d47f5d4 100644 --- a/milena/tests/morpho/Makefile.am +++ b/milena/tests/morpho/Makefile.am @@ -16,6 +16,7 @@ check_PROGRAMS = \ gradient \ gradient_elementary \ graph_image_morpho \ + graph_image_wst \ hit_or_miss \ laplacian \ lena_line_graph_image_wst1 \ @@ -54,9 +55,11 @@ laplacian_SOURCES = laplacian.cc thinning_SOURCES = thinning.cc graph_image_morpho_SOURCES = graph_image_morpho.cc +graph_image_wst_SOURCES = graph_image_wst.cc line_graph_image_morpho_SOURCES = line_graph_image_morpho.cc line_graph_image_wst_SOURCES = line_graph_image_wst.cc + meyer_wst_SOURCES = meyer_wst.cc combined_SOURCES = combined.cc diff --git a/milena/tests/morpho/graph_image_wst.cc b/milena/tests/morpho/graph_image_wst.cc new file mode 100644 index 0000000..41dcd5e --- /dev/null +++ b/milena/tests/morpho/graph_image_wst.cc @@ -0,0 +1,120 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// +// 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. + +/// \file tests/morpho/graph_image_wst.cc +/// \brief Tests on the Watershed Transform on a mln::graph_image. + +#include <vector> + +#include <mln/core/alias/point2d.hh> +#include <mln/core/image/graph_image.hh> +#include <mln/core/image/graph_elt_neighborhood.hh> +#include <mln/core/image/graph_neighborhood_piter.hh> + +#include <mln/morpho/meyer_wst.hh> + + +int main() +{ + using namespace mln; + + /*--------. + | Graph. | + `--------*/ + + /* The graph is as follows: + + 0 1 2 3 4 + .----------- + | + 0 | 0 2 + 1 | \ / | + 2 | 1 | + 3 | \ | + 4 | 3-0 + + */ + + // Points associated to vertices. + std::vector<point2d> points; + points.push_back(point2d(0,0)); // Point associated to vertex 0. + points.push_back(point2d(2,2)); // Point associated to vertex 1. + points.push_back(point2d(0,4)); // Point associated to vertex 2. + points.push_back(point2d(4,3)); // Point associated to vertex 3. + points.push_back(point2d(4,4)); // Point associated to vertex 4. + + // Edges. + util::graph<point2d> g; + // Populate the graph with vertices. + for (unsigned i = 0; i < points.size(); ++i) + g.add_vertex (points[i]); + // Populate the graph with edges. + g.add_edge(0, 1); + g.add_edge(1, 2); + g.add_edge(1, 3); + g.add_edge(3, 4); + g.add_edge(4, 2); + + /*-------. + | Graph. | + `-------*/ + + p_graph<point2d> pg(g); + + /*-------------. + | Graph image. | + `-------------*/ + + // Values. + std::vector<int> values(5); + values[0] = 0; // Value associated to vertex 0. + values[1] = 1; // Value associated to vertex 1. + values[2] = 2; // Value associated to vertex 2. + values[3] = 3; // Value associated to vertex 3. + values[4] = 0; // Value associated to vertex 4. + // Graph image. + typedef graph_image<point2d, int> ima_t; + ima_t ima(pg, values); + + /*------. + | WST. | + `------*/ + + typedef graph_elt_neighborhood<point2d> nbh_t; + nbh_t nbh; + + typedef unsigned wst_val_t; + wst_val_t nbasins; + typedef graph_image<point2d, wst_val_t> wst_ima_t; + wst_ima_t wshed = morpho::meyer_wst(ima, nbh, nbasins); + std::cout << "nbasins = " << nbasins << std::endl; + + // Manual iteration over the domain of WSHED. + mln_piter_(wst_ima_t) pw(wshed.domain()); + for_all (pw) + std::cout << "wshed (" << pw << ") = " << wshed(pw) << std::endl; +} -- 1.6.0.1

1 0