- Olena-patches

2385: * tests/core/image/complex_image.cc: Exercise iterators on p_faces.
by Roland Levillain 24 Sep '08

24 Sep '08

--- milena/ChangeLog | 4 +++ milena/tests/core/image/complex_image.cc | 34 ++++++++++++++++++++++++++--- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 743cc09..f4e7d20 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + * tests/core/image/complex_image.cc: Exercise iterators on p_faces. + +2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Add iterators on p_faces. * mln/core/site_set/p_faces_piter.hh: New. diff --git a/milena/tests/core/image/complex_image.cc b/milena/tests/core/image/complex_image.cc index 39e6239..1b06036 100644 --- a/milena/tests/core/image/complex_image.cc +++ b/milena/tests/core/image/complex_image.cc @@ -141,24 +141,48 @@ int main() | Complex-based image iterators. | `--------------------------------*/ + // ---------------------------- // + // Iterators on all the faces. // + // ---------------------------- // + mln_fwd_piter_(ima_t) fp(ima.domain()); for_all(fp) std::cout << "ima(" << fp << ") = " << ima(fp) << std::endl; - std::cout << std::endl; mln_bkd_piter_(ima_t) bp(ima.domain()); for_all(bp) std::cout << "ima(" << bp << ") = " << ima(bp) << std::endl; + std::cout << std::endl; + + + // ----------------------------------------------- // + // Iterators on n-faces (with n fixed in [0, D]). // + // ----------------------------------------------- // + + // We need to instantiate a (non temporary) object on the stack, so + // that it can be referenced later by face_psites held by iterators + // (as for windows and neighborhoods). + + typedef p_faces<0, D, point2d> p0f_t; + p0f_t pf(ima.domain()); + mln_piter_(p0f_t) f0p(pf); + for_all(f0p) + /* FIXME: This explicit call to unproxy_() is not elegant... But + is required for ima() to work, since the target operator() is + templated. */ + std::cout << "ima(" << f0p << ") = " << ima(f0p.unproxy_()) << std::endl; /* FIXME: Implement other psite iterators, for instance: - - iterators on N-faces with N fixed in [0, D] (using p_faces - and faces_psite?) - iterators on N-faces with N in a subset of [0, D]; - etc. */ + // ---------------------------------------- // + // Iterators on windows and neighborhoods. // + // ---------------------------------------- // + /* FIXME: Implement windows (and neighborhoods) and corresponding iterators for complex-based images. @@ -188,5 +212,7 @@ int main() - what else? We might want to look at operators on (simplicial?) complexes - like star, link, etc. and possibly implement them. */ + like star, link, etc. and possibly implement them. + + See also https://trac.lrde.org/olena/ticket/162. */ } -- 1.6.0.1

1 0

2384: Add iterators on p_faces.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/site_set/p_faces_piter.hh: New. Add forward declarations for these iterators... * mln/core/site_set/p_faces.hh: ...here. (mln::p_faces<N,D,P>::fwd_piter): Set to p_faces_fwd_piter_<N,D,P>. (mln::p_faces<N,D,P>::bkd_piter): Set to p_faces_bkd_piter_<N,D,P>. (mln::p_faces<N, D, P>::p_faces(const p_complex<D, P>&)): New ctor. --- milena/ChangeLog | 12 +++ milena/mln/core/site_set/p_faces.hh | 32 +++++-- milena/mln/core/site_set/p_faces_piter.hh | 148 +++++++++++++++++++++++++++++ 3 files changed, 184 insertions(+), 8 deletions(-) create mode 100644 milena/mln/core/site_set/p_faces_piter.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 784f4a4..743cc09 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Add iterators on p_faces. + + * mln/core/site_set/p_faces_piter.hh: New. + Add forward declarations for these iterators... + * mln/core/site_set/p_faces.hh: ...here. + (mln::p_faces<N,D,P>::fwd_piter): Set to p_faces_fwd_piter_<N,D,P>. + (mln::p_faces<N,D,P>::bkd_piter): Set to p_faces_bkd_piter_<N,D,P>. + (mln::p_faces<N, D, P>::p_faces(const p_complex<D, P>&)): + New ctor. + +2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Make internal::p_complex_piter_base generic w.r.t. the site set. * mln/core/internal/p_complex_piter_base.hh diff --git a/milena/mln/core/site_set/p_faces.hh b/milena/mln/core/site_set/p_faces.hh index 3c48100..21cd898 100644 --- a/milena/mln/core/site_set/p_faces.hh +++ b/milena/mln/core/site_set/p_faces.hh @@ -34,10 +34,12 @@ # include <mln/core/internal/site_set_base.hh> -# include <mln/accu/bbox.hh> # include <mln/core/complex.hh> # include <mln/core/faces_psite.hh> +# include <mln/core/site_set/p_faces_piter.hh> + +# include <mln/core/site_set/p_complex.hh> namespace mln @@ -45,11 +47,9 @@ namespace mln // Forward declarations. template <unsigned N, unsigned D, typename P> class p_faces; - // FIXME: Enable when available. -#if 0 + template <unsigned N, unsigned D, typename P> class p_faces_fwd_piter_; template <unsigned N, unsigned D, typename P> class p_faces_bkd_piter_; -#endif namespace trait @@ -79,8 +79,14 @@ namespace mln /// \brief Construct a faces psite set from an mln::complex. /// /// \param gr The complex upon which the complex psite set is built. + p_faces(const complex<D>& cplx); + + /// \brief Construct a faces psite set from an mln::p_complex. + /// + /// \param gr The complex upon which the complex psite set is built. /// - p_faces (const complex<D>& cplx); + /// \todo When available, get location information from \a pc. + p_faces(const p_complex<D, P>& pc); /// Associated types. /// \{ @@ -92,11 +98,11 @@ namespace mln // FIXME: Fake. /// Forward Site_Iterator associated type. - typedef void fwd_piter; + typedef p_faces_fwd_piter_<N, D, P> fwd_piter; // FIXME: Fake. /// Backward Site_Iterator associated type. - typedef void bkd_piter; + typedef p_faces_bkd_piter_<N, D, P> bkd_piter; /// Site_Iterator associated type. typedef fwd_piter piter; @@ -119,6 +125,7 @@ namespace mln // simplify (and lighten) the implementation of piters, psites, // etc. + // FIXME: This method is probably useless now. /// Is this site set valid? bool is_valid() const; @@ -192,6 +199,15 @@ namespace mln template <unsigned N, unsigned D, typename P> inline + p_faces<N, D, P>::p_faces(const p_complex<D, P>& pc) + : cplx_(pc.cplx()) + { + // Ensure N is compatible with D. + metal::bool_< N <= D >::check(); + } + + template <unsigned N, unsigned D, typename P> + inline unsigned p_faces<N, D, P>::nsites() const { @@ -223,7 +239,7 @@ namespace mln return // Check whether P's complex is compatible with this pset's complex. (p.site_set() == *this) && - // Check whether the complex has the face associated to P. + // Check whether P is valid. (p.is_valid()); } diff --git a/milena/mln/core/site_set/p_faces_piter.hh b/milena/mln/core/site_set/p_faces_piter.hh new file mode 100644 index 0000000..b26ca9b --- /dev/null +++ b/milena/mln/core/site_set/p_faces_piter.hh @@ -0,0 +1,148 @@ +// Copyright (C) 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. +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_SITE_SET_P_FACES_PITER_HH +# define MLN_CORE_SITE_SET_P_FACES_PITER_HH + +/// \file mln/core/site_set/p_faces_piter.hh +/// \brief Definition of point iterator on complex-based pset. + +# include <mln/core/site_set/p_faces.hh> +# include <mln/core/internal/p_complex_piter_base.hh> +# include <mln/core/faces_iter.hh> + + +namespace mln +{ + + // Forward declarations. + template <unsigned N, unsigned D, typename P> class p_faces; + + template <unsigned N, unsigned D> class faces_fwd_iter_; + template <unsigned N, unsigned D> class faces_bkd_iter_; + + + /*------------------------------. + | p_faces_fwd_piter_<N, D, P>. | + `------------------------------*/ + + /// \brief Forward iterator on point sites of a mln::p_faces<N, D, P>. + template <unsigned N, unsigned D, typename P> + class p_faces_fwd_piter_ + : public internal::p_complex_piter_base_< faces_fwd_iter_<N, D>, + p_faces<N, D, P>, + P, + p_faces_fwd_piter_<N, D, P> > + { + typedef p_faces_fwd_piter_<N, D, P> self_; + typedef internal::p_complex_piter_base_< faces_fwd_iter_<N, D>, + p_faces<N, D, P>, + P, + self_ > super_; + + public: + /// Construction and assignment. + /// \{ + p_faces_fwd_piter_(); + p_faces_fwd_piter_(const p_faces<N, D, P>& pc); + /// \} + }; + + + /*------------------------------. + | p_faces_bkd_piter_<N, D, P>. | + `------------------------------*/ + + /// \brief Backward iterator on point sites of a mln::p_faces<N, D, P>. + template <unsigned N, unsigned D, typename P> + class p_faces_bkd_piter_ + /* FIXME: Rename internal::p_complex_piter_base_ to something else, + as it is also used for p_faces piters! */ + : public internal::p_complex_piter_base_< faces_bkd_iter_<N, D>, + p_faces<N, D, P>, + P, + p_faces_bkd_piter_<N, D, P> > + { + typedef p_faces_bkd_piter_<N, D, P> self_; + typedef internal::p_complex_piter_base_< faces_bkd_iter_<N, D>, + p_faces<N, D, P>, + P, + self_ > super_; + + public: + /// Construction and assignment. + /// \{ + p_faces_bkd_piter_(); + p_faces_bkd_piter_(const p_faces<N, D, P>& pc); + /// \} + }; + + + +# ifndef MLN_INCLUDE_ONLY + + /*------------------------------. + | p_faces_fwd_piter_<N, D, P>. | + `------------------------------*/ + + template <unsigned N, unsigned D, typename P> + inline + p_faces_fwd_piter_<N, D, P>::p_faces_fwd_piter_() + { + } + + template <unsigned N, unsigned D, typename P> + inline + p_faces_fwd_piter_<N, D, P>::p_faces_fwd_piter_(const p_faces<N, D, P>& pc) + : super_(pc) + { + } + + + /*------------------------------. + | p_faces_bkd_piter_<N, D, P>. | + `------------------------------*/ + + template <unsigned N, unsigned D, typename P> + inline + p_faces_bkd_piter_<N, D, P>::p_faces_bkd_piter_() + { + } + + template <unsigned N, unsigned D, typename P> + inline + p_faces_bkd_piter_<N, D, P>::p_faces_bkd_piter_(const p_faces<N, D, P>& pc) + : super_(pc) + { + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of mln + + +#endif // ! MLN_CORE_SITE_SET_P_FACES_PITER_HH -- 1.6.0.1

1 0

2383: Make internal::p_complex_piter_base generic w.r.t. the site set.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/internal/p_complex_piter_base.hh (mln::internal::p_complex_piter_base<I, P, E>): Take an additional parameter and turn this class into... (mln::internal::p_complex_piter_base<I, S, P, E>): ...this. Adjust inheritance and member definitions. (mln::internal::p_complex_piter_base<I, S, P, E>::complex_dim): Remove constant. * mln/core/site_set/p_complex_piter.hh: Catch up with the changes in mln::internal::p_complex_piter_base. --- milena/ChangeLog | 14 ++++ milena/mln/core/internal/p_complex_piter_base.hh | 82 +++++++++++----------- milena/mln/core/site_set/p_complex_piter.hh | 23 +++++- 3 files changed, 73 insertions(+), 46 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 413bbb6..784f4a4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Make internal::p_complex_piter_base generic w.r.t. the site set. + + * mln/core/internal/p_complex_piter_base.hh + (mln::internal::p_complex_piter_base<I, P, E>): Take an additional + parameter and turn this class into... + (mln::internal::p_complex_piter_base<I, S, P, E>): ...this. + Adjust inheritance and member definitions. + (mln::internal::p_complex_piter_base<I, S, P, E>::complex_dim): + Remove constant. + * mln/core/site_set/p_complex_piter.hh: Catch up with the changes + in mln::internal::p_complex_piter_base. + +2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Have mln::complex_image be accessible via faces_psites. * mln/core/image/complex_image.hh diff --git a/milena/mln/core/internal/p_complex_piter_base.hh b/milena/mln/core/internal/p_complex_piter_base.hh index c9787c1..41cc29d 100644 --- a/milena/mln/core/internal/p_complex_piter_base.hh +++ b/milena/mln/core/internal/p_complex_piter_base.hh @@ -33,40 +33,37 @@ /// iterators on mln::p_complex. # include <mln/core/internal/site_set_iterator_base.hh> -# include <mln/core/site_set/p_complex.hh> -# include <mln/core/complex_psite.hh> -# include <mln/core/complex_iter.hh> +/* FIXME: Rename internal::p_complex_piter_base_ to something else, as + it is also used for p_faces piters. Maybe + internal::complex_piter_base_, but it is really close to + internal::complex_iter_base_... */ namespace mln { - // Forward declarations. - template <unsigned D, typename P> class p_complex; - template <unsigned D, typename P> class complex_psite; - namespace internal { - /*---------------------------------. - | p_complex_piter_base_<I, P, E>. | - `---------------------------------*/ + /*------------------------------------. + | p_complex_piter_base_<I, S, P, E>. | + `------------------------------------*/ + + // FIXME: P could probably be deduced from S. /// \brief Factoring class for iterators on mln::p_complex. /// /// \arg \p I The type of the underlying complex iterator. + /// \arg \p S The associated site set type. /// \arg \p P The associated site type. /// \arg \p E The type exact type of the iterator. - template <typename I, typename P, typename E> + template <typename I, typename S, typename P, typename E> class p_complex_piter_base_ - : public internal::site_set_iterator_base< p_complex<I::complex_dim, P>, - p_complex_piter_base_<I, P, E> > + : public internal::site_set_iterator_base< S, + p_complex_piter_base_<I, S, P, E> > { - static const unsigned D = I::complex_dim; - - typedef p_complex_piter_base_<I, P, E> self_; - typedef internal::site_set_iterator_base< p_complex<D, P>, - self_ > super_; + typedef p_complex_piter_base_<I, S, P, E> self_; + typedef internal::site_set_iterator_base< S, self_ > super_; /// The type of the underlying complex iterator. typedef I iter; @@ -75,7 +72,7 @@ namespace mln /// Construction and assignment. /// \{ p_complex_piter_base_(); - p_complex_piter_base_(const p_complex<D, P>& pc); + p_complex_piter_base_(const S& pc); /// \} /// Manipulation. @@ -106,87 +103,88 @@ namespace mln }; - /// Print an mln::p_complex_piter_base_<I, P, E>. - template <typename I, typename P, typename E> + /// Print an mln::p_complex_piter_base_<I, S, P, E>. + template <typename I, typename S, typename P, typename E> inline std::ostream& - operator<<(std::ostream& ostr, const p_complex_piter_base_<I, P, E>& p); + operator<<(std::ostream& ostr, const p_complex_piter_base_<I, S, P, E>& p); # ifndef MLN_INCLUDE_ONLY - /*---------------------------------. - | p_complex_piter_base_<I, P, E>. | - `---------------------------------*/ + /*------------------------------------. + | p_complex_piter_base_<I, S, P, E>. | + `------------------------------------*/ - template <typename I, typename P, typename E> + template <typename I, typename S, typename P, typename E> inline - p_complex_piter_base_<I, P, E>::p_complex_piter_base_() + p_complex_piter_base_<I, S, P, E>::p_complex_piter_base_() { mln_postcondition(!this->is_valid()); } - template <typename I, typename P, typename E> + template <typename I, typename S, typename P, typename E> inline - p_complex_piter_base_<I, P, E>::p_complex_piter_base_(const p_complex<D, P>& pc) + p_complex_piter_base_<I, S, P, E>::p_complex_piter_base_(const S& pc) { this->change_target(pc); iter_.set_cplx(pc.cplx()); mln_postcondition(!this->is_valid()); } - template <typename I, typename P, typename E> + template <typename I, typename S, typename P, typename E> inline bool - p_complex_piter_base_<I, P, E>::is_valid_() const + p_complex_piter_base_<I, S, P, E>::is_valid_() const { return iter_.is_valid(); } - template <typename I, typename P, typename E> + template <typename I, typename S, typename P, typename E> inline void - p_complex_piter_base_<I, P, E>::invalidate_() + p_complex_piter_base_<I, S, P, E>::invalidate_() { iter_.invalidate(); } - template <typename I, typename P, typename E> + template <typename I, typename S, typename P, typename E> inline void - p_complex_piter_base_<I, P, E>::start_() + p_complex_piter_base_<I, S, P, E>::start_() { iter_.start(); if (this->is_valid()) update_(); } - template <typename I, typename P, typename E> + template <typename I, typename S, typename P, typename E> inline void - p_complex_piter_base_<I, P, E>::next_() + p_complex_piter_base_<I, S, P, E>::next_() { iter_.next_(); if (this->is_valid()) update_(); } - template <typename I, typename P, typename E> + template <typename I, typename S, typename P, typename E> inline void - p_complex_piter_base_<I, P, E>::update_() + p_complex_piter_base_<I, S, P, E>::update_() { mln_precondition(this->is_valid()); // Update psite_. - p_ = complex_psite<D, P>(exact(this)->site_set(), iter_); + typedef mln_psite(S) psite; + p_ = psite(exact(this)->site_set(), iter_); } - template <typename I, typename P, typename E> + template <typename I, typename S, typename P, typename E> inline std::ostream& - operator<<(std::ostream& ostr, const p_complex_piter_base_<I, P, E>& p) + operator<<(std::ostream& ostr, const p_complex_piter_base_<I, S, P, E>& p) { return ostr << p.unproxy_(); } diff --git a/milena/mln/core/site_set/p_complex_piter.hh b/milena/mln/core/site_set/p_complex_piter.hh index 7cde5bf..41671ce 100644 --- a/milena/mln/core/site_set/p_complex_piter.hh +++ b/milena/mln/core/site_set/p_complex_piter.hh @@ -31,11 +31,20 @@ /// \file mln/core/site_set/p_complex_piter.hh /// \brief Definition of point iterator on complex-based pset. +# include <mln/core/site_set/p_complex.hh> # include <mln/core/internal/p_complex_piter_base.hh> +# include <mln/core/complex_iter.hh> namespace mln { + // Forward declarations. + template <unsigned D, typename P> class p_complex; + + template <unsigned D> class complex_fwd_iter_; + template <unsigned D> class complex_bkd_iter_; + + /*-----------------------------. | p_complex_fwd_piter_<D, P>. | `-----------------------------*/ @@ -44,12 +53,15 @@ namespace mln template <unsigned D, typename P> class p_complex_fwd_piter_ : public internal::p_complex_piter_base_< complex_fwd_iter_<D>, + p_complex<D, P>, P, p_complex_fwd_piter_<D, P> > { typedef p_complex_fwd_piter_<D, P> self_; - typedef - internal::p_complex_piter_base_< complex_fwd_iter_<D>, P, self_ > super_; + typedef internal::p_complex_piter_base_< complex_fwd_iter_<D>, + p_complex<D, P>, + P, + self_ > super_; public: /// Construction and assignment. @@ -68,12 +80,15 @@ namespace mln template <unsigned D, typename P> class p_complex_bkd_piter_ : public internal::p_complex_piter_base_< complex_bkd_iter_<D>, + p_complex<D, P>, P, p_complex_bkd_piter_<D, P> > { typedef p_complex_bkd_piter_<D, P> self_; - typedef - internal::p_complex_piter_base_< complex_bkd_iter_<D>, P, self_ > super_; + typedef internal::p_complex_piter_base_< complex_bkd_iter_<D>, + p_complex<D, P>, + P, + self_ > super_; public: /// Construction and assignment. -- 1.6.0.1

1 0

2382: Have mln::complex_image be accessible via faces_psites.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/image/complex_image.hh (complex_image<D, P, V>::operator()(const faces_psite<N, D, P>) const) (complex_image<D, P, V>::operator()(const faces_psite<N, D, P>)): New operators. --- milena/ChangeLog | 9 +++++++ milena/mln/core/image/complex_image.hh | 37 +++++++++++++++++++++++++++---- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index afbf257..413bbb6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Have mln::complex_image be accessible via faces_psites. + + * mln/core/image/complex_image.hh + (complex_image<D, P, V>::operator()(const faces_psite<N, D, P>) const) + (complex_image<D, P, V>::operator()(const faces_psite<N, D, P>)): + New operators. + +2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Complete iterators on faces. * mln/core/faces_iter.hh diff --git a/milena/mln/core/image/complex_image.hh b/milena/mln/core/image/complex_image.hh index 6dbc522..0512d0f 100644 --- a/milena/mln/core/image/complex_image.hh +++ b/milena/mln/core/image/complex_image.hh @@ -143,12 +143,18 @@ namespace mln void init_(const p_complex<D, P>& pc, const metal::vec< D + 1, std::vector<V> >& values); - /// Read-only access of pixel value at point site \p p. + /// Read-only access of face value at point site \p p. rvalue operator()(const complex_psite<D, P>& p) const; - - /// Read-write access of pixel value at point site \p p. + /// Read-write access of face value at point site \p p. lvalue operator()(const complex_psite<D, P>& p); + /// Read-only access of face value at point site \p p. + template <unsigned N> + rvalue operator()(const faces_psite<N, D, P>& p) const; + /// Read-write access of face value at point site \p p. + template <unsigned N> + lvalue operator()(const faces_psite<N, D, P>& p); + /// Accessors. /// \{ /// Return the domain of psites od the image. @@ -193,8 +199,7 @@ namespace mln template <unsigned D, typename P, typename V> inline data< complex_image<D, P, V> >::data(const p_complex<D, P>& pc, - const metal::vec< D + 1, - std::vector<V> >& values) + const metal::vec< D + 1, std::vector<V> >& values) : values_(values), pc_(pc) { @@ -272,6 +277,28 @@ namespace mln } template <unsigned D, typename P, typename V> + template <unsigned N> + inline + typename complex_image<D, P, V>::rvalue + complex_image<D, P, V>::operator()(const faces_psite<N, D, P>& p) const + { + /* FIXME: We should ensure data_->pc_ has P, but it is not + trivial: a daces_psite has no idea what a p_complex is. */ + return this->data_->values_[p.n()][p.face_id()]; + } + + template <unsigned D, typename P, typename V> + template <unsigned N> + inline + typename complex_image<D, P, V>::lvalue + complex_image<D, P, V>::operator()(const faces_psite<N, D, P>& p) + { + /* FIXME: We should ensure data_->pc_ has P, but it is not + trivial: a daces_psite has no idea what a p_complex is. */ + return this->data_->values_[p.n()][p.face_id()]; + } + + template <unsigned D, typename P, typename V> inline const metal::vec< D + 1, std::vector<V> >& complex_image<D, P, V>::face_values() const -- 1.6.0.1

1 0

2381: Complete iterators on faces.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/faces_iter.hh (mln::faces_fwd_iter_<N, D>::set_cplx) (mln::faces_bkd_iter_<N, D>::set_cplx): New accessors. --- milena/ChangeLog | 9 +++++++++ milena/mln/core/faces_iter.hh | 28 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6e0cd55..afbf257 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + + Complete iterators on faces. + + * mln/core/faces_iter.hh + (mln::faces_fwd_iter_<N, D>::set_cplx) + (mln::faces_bkd_iter_<N, D>::set_cplx): + New accessors. + 2008-09-23 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Get consistent naming for p_line2d and dpsites_impl. diff --git a/milena/mln/core/faces_iter.hh b/milena/mln/core/faces_iter.hh index d16eaa7..522f2ab 100644 --- a/milena/mln/core/faces_iter.hh +++ b/milena/mln/core/faces_iter.hh @@ -73,6 +73,10 @@ namespace mln /// Manipulation. /// \{ + /// Change the target complex. + // FIXME: Same comment as the ctor above. + void set_cplx(complex<D>& c); + /// Test if the iterator is valid. void start(); /// Go to the next point. @@ -120,6 +124,10 @@ namespace mln /// Manipulation. /// \{ + /// Change the target complex. + // FIXME: Same comment as the ctor above. + void set_cplx(complex<D>& c); + /// Start an iteration. void start(); /// Go to the next point. @@ -167,6 +175,16 @@ namespace mln template <unsigned N, unsigned D> inline + void + faces_fwd_iter_<N, D>::set_cplx(complex<D>& c) + { + face_.set_cplx(c); + // Invalidate face_. + invalidate(); + } + + template <unsigned N, unsigned D> + inline faces_fwd_iter_<N, D>& faces_fwd_iter_<N, D>::operator=(const faces_fwd_iter_<N, D>& rhs) { @@ -239,6 +257,16 @@ namespace mln template <unsigned N, unsigned D> inline + void + faces_bkd_iter_<N, D>::set_cplx(complex<D>& c) + { + face_.set_cplx(c); + // Invalidate face_. + invalidate(); + } + + template <unsigned N, unsigned D> + inline faces_bkd_iter_<N, D>& faces_bkd_iter_<N, D>::operator=(const faces_bkd_iter_<N, D>& rhs) { -- 1.6.0.1

1 0

2380: No longer hold complexes through tracked_ptr in site sets.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/site_set/p_complex.hh (mln::p_complex<D, P>::cplx_): * mln/core/site_set/p_faces.hh (mln::p_faces<D, P>::cplx_): Remove the tracked_ptr wrapper and change type to mutable complex<D>. (p_complex<D, P>::p_complex(const complex<D>&)) (p_faces<N, D, P>::p_faces(const complex<D>&)): Adjust ctors. (p_complex<D, P>::nfaces) (p_complex<D, P>::is_valid) (p_complex<D, P>::cplx) (p_faces<N, D, P>::nfaces) (p_faces<N, D, P>::is_valid) (p_faces<N, D, P>::cplx) (operator==(const p_complex<D, P>&, const p_complex<D, P>&)) (operator< (const p_complex<D, P>&, const p_complex<D, P>&)) (operator==(const p_faces<N, D, P>&, const p_faces<N, D, P>&)) (operator< (const p_faces<N, D, P>&, const p_faces<N, D, P>&)): Adjust. --- milena/ChangeLog | 23 ++++++++++++++ milena/mln/core/site_set/p_complex.hh | 55 ++++++++++++-------------------- milena/mln/core/site_set/p_faces.hh | 44 +++++++++++++++----------- 3 files changed, 69 insertions(+), 53 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5ace73e..6e0cd55 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -74,6 +74,29 @@ 2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + No longer hold complexes through tracked_ptr in site sets. + + * mln/core/site_set/p_complex.hh (mln::p_complex<D, P>::cplx_): + * mln/core/site_set/p_faces.hh (mln::p_faces<D, P>::cplx_): + Remove the tracked_ptr wrapper and change type to + mutable complex<D>. + (p_complex<D, P>::p_complex(const complex<D>&)) + (p_faces<N, D, P>::p_faces(const complex<D>&)): + Adjust ctors. + (p_complex<D, P>::nfaces) + (p_complex<D, P>::is_valid) + (p_complex<D, P>::cplx) + (p_faces<N, D, P>::nfaces) + (p_faces<N, D, P>::is_valid) + (p_faces<N, D, P>::cplx) + (operator==(const p_complex<D, P>&, const p_complex<D, P>&)) + (operator< (const p_complex<D, P>&, const p_complex<D, P>&)) + (operator==(const p_faces<N, D, P>&, const p_faces<N, D, P>&)) + (operator< (const p_faces<N, D, P>&, const p_faces<N, D, P>&)): + Adjust. + +2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + Have the compiler check more code, even in NDEBUG mode. * mln/core/complex.hh (mln::complex<D>::add_face): Use diff --git a/milena/mln/core/site_set/p_complex.hh b/milena/mln/core/site_set/p_complex.hh index 6065df4..6c30c25 100644 --- a/milena/mln/core/site_set/p_complex.hh +++ b/milena/mln/core/site_set/p_complex.hh @@ -33,7 +33,6 @@ # include <mln/core/internal/site_set_base.hh> -# include <mln/util/tracked_ptr.hh> # include <mln/core/complex.hh> # include <mln/core/complex_psite.hh> @@ -44,6 +43,8 @@ namespace mln { // Forward declarations. + template <unsigned D, typename P> class p_complex; + template <unsigned D, typename P> class p_complex_fwd_piter_; template <unsigned D, typename P> class p_complex_bkd_piter_; @@ -98,9 +99,6 @@ namespace mln /// \brief Construct a complex psite set from a complex. /// /// \param gr The complex upon which the complex psite set is built. - /// - /// \a gr is \em copied internally, so that the complex psite set is - /// still valid after the initial complex has been removed. p_complex (const complex<D>& cplx); /// Associated types. @@ -161,29 +159,20 @@ namespace mln private: /// The complex on which this pset is built. - /* FIXME:Get rid of this `mutable' qualifier. This is needed for - compatiblity reasons with any_face_handle (see p_complex_piter) + /* FIXME: Get rid of this `mutable' qualifier. This is needed for + compatiblity reasons with any_face_handle (see + p_complex_piter). We should either - - do not use any_face_handle in the implementation of - p_complex_piter; - - - have an additional version of any_face_handles holding a + - have an additional version of any_face_handle holding a const (not mutable) complex; - - or even have face_handle and any_face_handle do not hold a - reference on a complex, leading to a design of complexes - similar to graphs, where vertex and edge handles (named `id's) - are not tied to a specific graph. */ - mutable util::tracked_ptr< complex<D> > cplx_; - - // FIXME: Remove as soon as the tracked_ptr is move into the - // complex itself. - template <unsigned D_, typename P_> - friend - bool operator==(const p_complex<D_, P_>& lhs, - const p_complex<D_, P_>& rhs); + - have face_handle and any_face_handle do not hold a reference + on a complex, leading to a design of complexes similar to + graphs, where vertex and edge handles (named `id's) are not + tied to a specific graph. */ + mutable complex<D> cplx_; }; @@ -214,8 +203,7 @@ namespace mln template <unsigned D, typename P> inline p_complex<D, P>::p_complex(const complex<D>& cplx) - // Create a deep, managed copy of CPLX. - : cplx_(new complex<D>(cplx)) + : cplx_(cplx) { } @@ -232,7 +220,7 @@ namespace mln std::size_t p_complex<D, P>::nfaces() const { - return cplx_->nfaces(); + return cplx_.nfaces(); } template <unsigned D, typename P> @@ -240,8 +228,7 @@ namespace mln bool p_complex<D, P>::is_valid() const { - // FIXME: Might be too low-level, again. - return (cplx_.ptr_); + return true; } template <unsigned D, typename P> @@ -272,7 +259,7 @@ namespace mln p_complex<D, P>::cplx() const { mln_precondition(is_valid()); - return *cplx_.ptr_; + return cplx_; } template <unsigned D, typename P> @@ -280,7 +267,7 @@ namespace mln p_complex<D, P>::cplx() { mln_precondition(is_valid()); - return *cplx_.ptr_; + return cplx_; } @@ -292,17 +279,17 @@ namespace mln bool operator==(const p_complex<D, P>& lhs, const p_complex<D, P>& rhs) { - /* FIXME: We should not rely on pointer equality here, as graph - will soon become shells using (shared) tracked pointers to - actual data. So, delegate the equality test to the graphs - themselves. */ - return lhs.cplx_.ptr_ == rhs.cplx_.ptr_; + /* FIXME: When actual location data is attached to a p_complex, + check also the equlity w.r.t. to these data. */ + return lhs.cplx() == rhs.cplx(); } template <unsigned D, typename P> bool operator<=(const p_complex<D, P>& lhs, const p_complex<D, P>& rhs) { + /* FIXME: When actual location data is attached to a p_complex, + check also the equality w.r.t. to these data. */ return lhs == rhs; } diff --git a/milena/mln/core/site_set/p_faces.hh b/milena/mln/core/site_set/p_faces.hh index 025023d..3c48100 100644 --- a/milena/mln/core/site_set/p_faces.hh +++ b/milena/mln/core/site_set/p_faces.hh @@ -35,7 +35,6 @@ # include <mln/core/internal/site_set_base.hh> # include <mln/accu/bbox.hh> -# include <mln/util/tracked_ptr.hh> # include <mln/core/complex.hh> # include <mln/core/faces_psite.hh> @@ -77,12 +76,10 @@ namespace mln typedef p_faces<N, D, P> self_; typedef internal::site_set_base_< faces_psite<N, D, P>, self_ > super_; - /// \brief Construct a complex psite set from a complex. + /// \brief Construct a faces psite set from an mln::complex. /// /// \param gr The complex upon which the complex psite set is built. /// - /// \a gr is \em copied internally, so that the complex psite set is - /// still valid after the initial complex has been removed. p_faces (const complex<D>& cplx); /// Associated types. @@ -144,12 +141,19 @@ namespace mln private: /// The complex on which this pset is built. - util::tracked_ptr< complex<D> > cplx_; + /* FIXME: Get rid of this `mutable' qualifier. This is needed for + compatiblity reasons with face_handle (see p_faces_piter). - template <unsigned D_, unsigned N_, typename P_> - friend - bool operator==(const p_faces<D_, N_, P_>& lhs, - const p_faces<D_, N_, P_>& rhs); + We should either + + - have an additional version of face_handle holding a const + (not mutable) complex; + + - have face_handle and any_face_handle do not hold a reference + on a complex, leading to a design of complexes similar to + graphs, where vertex and edge handles (named `id's) are not + tied to a specific graph. */ + mutable complex<D> cplx_; }; @@ -180,8 +184,7 @@ namespace mln template <unsigned N, unsigned D, typename P> inline p_faces<N, D, P>::p_faces(const complex<D>& cplx) - // Create a deep, managed copy of CPLX. - : cplx_(new complex<D>(cplx)) + : cplx_(cplx) { // Ensure N is compatible with D. metal::bool_< N <= D >::check(); @@ -200,7 +203,7 @@ namespace mln std::size_t p_faces<N, D, P>::nfaces() const { - return cplx_->template nfaces<N>(); + return cplx_.template nfaces<N>(); } template <unsigned N, unsigned D, typename P> @@ -208,8 +211,7 @@ namespace mln bool p_faces<N, D, P>::is_valid() const { - // FIXME: Might be too low-level, again. - return (cplx_.ptr_); + return true; } template <unsigned N, unsigned D, typename P> @@ -239,16 +241,16 @@ namespace mln complex<D>& p_faces<N, D, P>::cplx() const { - mln_precondition(cplx_); - return *cplx_.ptr_; + mln_precondition(is_valid()); + return cplx_; } template <unsigned N, unsigned D, typename P> complex<D>& p_faces<N, D, P>::cplx() { - mln_precondition(cplx_); - return *cplx_.ptr_; + mln_precondition(is_valid()); + return cplx_; } @@ -260,13 +262,17 @@ namespace mln bool operator==(const p_faces<N, D, P>& lhs, const p_faces<N, D, P>& rhs) { - return lhs.cplx_.ptr_ == rhs.cplx_.ptr_; + /* FIXME: When actual location data is attached to a p_faces, + check also the equality w.r.t. to these data. */ + return lhs.cplx() == rhs.cplx(); } template <unsigned N, unsigned D, typename P> bool operator<=(const p_faces<N, D, P>& lhs, const p_faces<N, D, P>& rhs) { + /* FIXME: When actual location data is attached to a p_faces, + check also the equality w.r.t. to these data. */ return lhs == rhs; } -- 1.6.0.1

1 0

2379: Have the compiler check more code, even in NDEBUG mode.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/complex.hh (mln::complex<D>::add_face): Use `if (!HAS_NDEBUG)' instead of `#ifndef NDEBUG'. --- milena/ChangeLog | 7 +++++++ milena/mln/core/complex.hh | 17 +++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 44e4772..5ace73e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -74,6 +74,13 @@ 2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + Have the compiler check more code, even in NDEBUG mode. + + * mln/core/complex.hh (mln::complex<D>::add_face): Use + `if (!HAS_NDEBUG)' instead of `#ifndef NDEBUG'. + +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. diff --git a/milena/mln/core/complex.hh b/milena/mln/core/complex.hh index d1e5bad..32197f4 100644 --- a/milena/mln/core/complex.hh +++ b/milena/mln/core/complex.hh @@ -420,16 +420,13 @@ namespace mln typedef typename std::vector< face_handle<N, D> >::const_iterator iter_t; // Ensure ADJACENT_FACES are already part of the complex. - /* FIXME: We need additional macros in mln/core/contract.hh for - big blocks of preconditions like this one. */ -# ifndef NDEBUG - for (iter_t a = adjacent_faces.faces().begin(); - a != adjacent_faces.faces().end(); ++a) - { - mln_precondition(&a->cplx() == this); - mln_precondition(a->is_valid()); - } -# endif // !NDEBUG + if (!HAS_NDEBUG) + for (iter_t a = adjacent_faces.faces().begin(); + a != adjacent_faces.faces().end(); ++a) + { + mln_precondition(&a->cplx() == this); + mln_precondition(a->is_valid()); + } face<N + 1, D> f; /* FIXME: This is not thread-proof (these two lines should -- 1.6.0.1

1 0

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