October 2008 - Olena-patches

2492: mln/core/macros.hh (mln_face, mln_face_): New macros.
by Roland Levillain 03 Oct '08

03 Oct '08

--- milena/ChangeLog | 4 ++++ milena/mln/core/macros.hh | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e07f8bc..be4dc71 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + * mln/core/macros.hh (mln_face, mln_face_): New macros. + +2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Overhaul neighborhoods of adjacent lower- and higher-dimension faces. * mln/core/image/complex_lower_neighborhood.hh, diff --git a/milena/mln/core/macros.hh b/milena/mln/core/macros.hh index 3dc9036..8052ce1 100644 --- a/milena/mln/core/macros.hh +++ b/milena/mln/core/macros.hh @@ -146,6 +146,12 @@ // f +/// Shortcuts to access the (complex) face type associated to T. +/// \{ +# define mln_face(T) typename T::face +# define mln_face_(T) T::face +/// \} + /// Shortcuts to access the element-forward-iterator type associated /// to T. /// \{ -- 1.6.0.1

1 0

2491: Overhaul neighborhoods of adjacent lower- and higher-dimension faces.
by Roland Levillain 03 Oct '08

03 Oct '08

* mln/core/image/complex_lower_neighborhood.hh, * mln/core/image/complex_higher_neighborhood.hh: Update the documentation. --- milena/ChangeLog | 8 ++++++++ .../mln/core/image/complex_higher_neighborhood.hh | 10 ++++++---- .../mln/core/image/complex_lower_neighborhood.hh | 10 ++++++---- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1fe4229..e07f8bc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Overhaul neighborhoods of adjacent lower- and higher-dimension faces. + + * mln/core/image/complex_lower_neighborhood.hh, + * mln/core/image/complex_higher_neighborhood.hh: + Update the documentation. + +2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Overhaul piters on complex neighborhood. * mln/core/image/complex_neighborhood_piter.hh diff --git a/milena/mln/core/image/complex_higher_neighborhood.hh b/milena/mln/core/image/complex_higher_neighborhood.hh index 2b52c5b..3b56d68 100644 --- a/milena/mln/core/image/complex_higher_neighborhood.hh +++ b/milena/mln/core/image/complex_higher_neighborhood.hh @@ -43,7 +43,7 @@ namespace mln { - // Fwd decls. + // Forward declarations. template <typename I, typename P, typename N> class complex_neighborhood_fwd_piter; template <typename I, typename P, typename N> @@ -58,10 +58,12 @@ namespace mln { typedef complex_higher_neighborhood<D, P> self_; - // FIXME: The associated complex iterators. public: + /// The associated complex iterators. + /// \{ typedef topo::adj_higher_face_fwd_iter<D> complex_fwd_iter; typedef topo::adj_higher_face_bkd_iter<D> complex_bkd_iter; + /// \} public: /// Associated types. @@ -71,12 +73,12 @@ namespace mln /// The type of site corresponding to the neighborhood. typedef mln_site(psite) site; - /// \brief Point_Iterator type to browse the psites of the neighborhood + /// \brief Site_Iterator type to browse the psites of the neighborhood /// w.r.t. the ordering of vertices. typedef complex_neighborhood_fwd_piter<complex_fwd_iter, P, self_> fwd_niter; - /// \brief Point_Iterator type to browse the psites of the neighborhood + /// \brief Site_Iterator type to browse the psites of the neighborhood /// w.r.t. the reverse ordering of vertices. typedef complex_neighborhood_bkd_piter<complex_bkd_iter, P, self_> bkd_niter; diff --git a/milena/mln/core/image/complex_lower_neighborhood.hh b/milena/mln/core/image/complex_lower_neighborhood.hh index 7eb8fc4..6c21acc 100644 --- a/milena/mln/core/image/complex_lower_neighborhood.hh +++ b/milena/mln/core/image/complex_lower_neighborhood.hh @@ -43,7 +43,7 @@ namespace mln { - // Fwd decls. + // Forward declarations. template <typename I, typename P, typename N> class complex_neighborhood_fwd_piter; template <typename I, typename P, typename N> @@ -58,10 +58,12 @@ namespace mln { typedef complex_lower_neighborhood<D, P> self_; - // FIXME: The associated complex iterators. public: + /// The associated complex iterators. + /// \{ typedef topo::adj_lower_face_fwd_iter<D> complex_fwd_iter; typedef topo::adj_lower_face_bkd_iter<D> complex_bkd_iter; + /// \} public: /// Associated types. @@ -71,12 +73,12 @@ namespace mln /// The type of site corresponding to the neighborhood. typedef mln_site(psite) site; - /// \brief Point_Iterator type to browse the psites of the neighborhood + /// \brief Site_Iterator type to browse the psites of the neighborhood /// w.r.t. the ordering of vertices. typedef complex_neighborhood_fwd_piter<complex_fwd_iter, P, self_> fwd_niter; - /// \brief Point_Iterator type to browse the psites of the neighborhood + /// \brief Site_Iterator type to browse the psites of the neighborhood /// w.r.t. the reverse ordering of vertices. typedef complex_neighborhood_bkd_piter<complex_bkd_iter, P, self_> bkd_niter; -- 1.6.0.1

1 0

2490: Overhaul piters on complex neighborhood.
by Roland Levillain 03 Oct '08

03 Oct '08

* mln/core/image/complex_neighborhood_piter.hh Update the documentation. (mln::complex_neighborhood_fwd_piter<I, P, N>::dpoint) (mln::complex_neighborhood_fwd_piter<I, P, N>::mesh) (mln::complex_neighborhood_bkd_piter<I, P, N>::dpoint) (mln::complex_neighborhood_bkd_piter<I, P, N>::mesh): Remove (already disabled) typedefs. --- milena/ChangeLog | 12 ++++++++++++ .../mln/core/image/complex_neighborhood_piter.hh | 18 ++++-------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1090e90..1fe4229 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Overhaul piters on complex neighborhood. + + * mln/core/image/complex_neighborhood_piter.hh + Update the documentation. + (mln::complex_neighborhood_fwd_piter<I, P, N>::dpoint) + (mln::complex_neighborhood_fwd_piter<I, P, N>::mesh) + (mln::complex_neighborhood_bkd_piter<I, P, N>::dpoint) + (mln::complex_neighborhood_bkd_piter<I, P, N>::mesh): + Remove (already disabled) typedefs. + +2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Fix the definition of mln::complex_neighborhood_bkd_piter. * mln/core/image/complex_neighborhood_piter.hh diff --git a/milena/mln/core/image/complex_neighborhood_piter.hh b/milena/mln/core/image/complex_neighborhood_piter.hh index 85d2a0a..ed9474d 100644 --- a/milena/mln/core/image/complex_neighborhood_piter.hh +++ b/milena/mln/core/image/complex_neighborhood_piter.hh @@ -61,14 +61,9 @@ namespace mln typedef internal::site_relative_iterator_base< N, self_ > super_; public: - /// The Point_Site type. + /// The Pseudo_Site type. typedef mln_psite(N) psite; - // FIXME: Dummy typedef. -// typedef void dpoint; - // FIXME: Dummy typedef. -// typedef void mesh; - public: /// Construction. /// \{ @@ -87,7 +82,7 @@ namespace mln /// Start an iteration. void do_start_(); - /// Go to the next point. + /// Go to the next site. void do_next_(); /// Set the reference psite. @@ -129,14 +124,9 @@ namespace mln typedef internal::site_relative_iterator_base< N, self_ > super_; public: - /// The Point_Site type. + /// The Pseudo_Site type. typedef mln_psite(N) psite; - // FIXME: Dummy typedef. -// typedef void dpoint; - // FIXME: Dummy typedef. -// typedef void mesh; - public: /// Construction. /// \{ @@ -155,7 +145,7 @@ namespace mln /// Start an iteration. void do_start_(); - /// Go to the next point. + /// Go to the next site. void do_next_(); /// Set the reference psite. -- 1.6.0.1

1 0

2489: Fix the definition of mln::complex_neighborhood_bkd_piter.
by Roland Levillain 03 Oct '08

03 Oct '08

* mln/core/image/complex_neighborhood_piter.hh (mln::complex_neighborhood_bkd_piter<I, P, N>::iter): Set to N::complex_bkd_iter (instead of N::complex_fwd_iter). --- milena/ChangeLog | 8 ++++++++ .../mln/core/image/complex_neighborhood_piter.hh | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f07a35b..1090e90 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Fix the definition of mln::complex_neighborhood_bkd_piter. + + * mln/core/image/complex_neighborhood_piter.hh + (mln::complex_neighborhood_bkd_piter<I, P, N>::iter): Set to + N::complex_bkd_iter (instead of N::complex_fwd_iter). + +2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Overhaul iterators on adjacent lower- and higher-dimension faces. * mln/topo/adj_lower_face_iter.hh: diff --git a/milena/mln/core/image/complex_neighborhood_piter.hh b/milena/mln/core/image/complex_neighborhood_piter.hh index ff06cd0..85d2a0a 100644 --- a/milena/mln/core/image/complex_neighborhood_piter.hh +++ b/milena/mln/core/image/complex_neighborhood_piter.hh @@ -170,7 +170,7 @@ namespace mln private: /// The type of the underlying complex iterator. - typedef typename N::complex_fwd_iter iter; + typedef typename N::complex_bkd_iter iter; /// The underlying complex iterator. iter iter_; }; -- 1.6.0.1

1 0

2488: Overhaul iterators on adjacent lower- and higher-dimension faces.
by Roland Levillain 03 Oct '08

03 Oct '08

* mln/topo/adj_lower_face_iter.hh: * mln/topo/adj_higher_face_iter.hh: Update the documentation. (mln::topo::adj_lower_face_fwd_iter<D>::is_valid) (mln::topo::adj_lower_face_fwd_iter<D>::invalidate) (mln::topo::adj_lower_face_bkd_iter<D>::is_valid) (mln::topo::adj_lower_face_bkd_iter<D>::invalidate) (mln::topo::adj_higher_face_fwd_iter<D>::is_valid) (mln::topo::adj_higher_face_fwd_iter<D>::invalidate) (mln::topo::adj_higher_face_bkd_iter<D>::is_valid) (mln::topo::adj_higher_face_bkd_iter<D>::invalidate): Remove useless `using' declarations. (mln::topo::adj_lower_face_fwd_iter<D>::adj_lower_face_fwd_iter) (mln::topo::adj_lower_face_bkd_iter<D>::adj_lower_face_bkd_iter) (mln::topo::adj_higher_face_fwd_iter<D>::adj_higher_face_fwd_iter) (mln::topo::adj_higher_face_bkd_iter<D>::adj_higher_face_bkd_iter): Delegate the construction to the super class. --- milena/ChangeLog | 22 ++++++++++++++++++++++ milena/mln/topo/adj_higher_face_iter.hh | 28 ++++++++-------------------- milena/mln/topo/adj_lower_face_iter.hh | 26 ++++++++------------------ 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5bbff03..f07a35b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,27 @@ 2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Overhaul iterators on adjacent lower- and higher-dimension faces. + + * mln/topo/adj_lower_face_iter.hh: + * mln/topo/adj_higher_face_iter.hh: + Update the documentation. + (mln::topo::adj_lower_face_fwd_iter<D>::is_valid) + (mln::topo::adj_lower_face_fwd_iter<D>::invalidate) + (mln::topo::adj_lower_face_bkd_iter<D>::is_valid) + (mln::topo::adj_lower_face_bkd_iter<D>::invalidate) + (mln::topo::adj_higher_face_fwd_iter<D>::is_valid) + (mln::topo::adj_higher_face_fwd_iter<D>::invalidate) + (mln::topo::adj_higher_face_bkd_iter<D>::is_valid) + (mln::topo::adj_higher_face_bkd_iter<D>::invalidate): + Remove useless `using' declarations. + (mln::topo::adj_lower_face_fwd_iter<D>::adj_lower_face_fwd_iter) + (mln::topo::adj_lower_face_bkd_iter<D>::adj_lower_face_bkd_iter) + (mln::topo::adj_higher_face_fwd_iter<D>::adj_higher_face_fwd_iter) + (mln::topo::adj_higher_face_bkd_iter<D>::adj_higher_face_bkd_iter): + Delegate the construction to the super class. + +2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Overhaul mln::topo::internal::complex_relative_iterator_base. * mln/topo/internal/complex_relative_iterator_base.hh: diff --git a/milena/mln/topo/adj_higher_face_iter.hh b/milena/mln/topo/adj_higher_face_iter.hh index 5301c05..cfea904 100644 --- a/milena/mln/topo/adj_higher_face_iter.hh +++ b/milena/mln/topo/adj_higher_face_iter.hh @@ -50,7 +50,8 @@ namespace mln | topo::adj_higher_face_fwd_iter<D>. | `------------------------------------*/ - /// \brief Forward iterator on all the faces of an mln::complex<D>. + /// \brief Forward iterator on all the adjacent (n+1)-faces of the + /// n-face of an mln::complex<D>. /// /// \arg \p D The dimension of the complex this iterator belongs to. template <unsigned D> @@ -58,17 +59,12 @@ namespace mln : public internal::forward_complex_relative_iterator_base< face<D>, adj_higher_face_fwd_iter<D> > { - private: typedef adj_higher_face_fwd_iter<D> self_; typedef internal::forward_complex_relative_iterator_base< face<D>, self_ > super_; public: - using super_::is_valid; - using super_::invalidate; - - public: - /// Construction and assignment. + /// Construction. /// \{ adj_higher_face_fwd_iter(); template <typename Fref> @@ -84,7 +80,8 @@ namespace mln | topo::adj_higher_face_bkd_iter<D>. | `------------------------------------*/ - /// \brief Backward iterator on all the faces of an mln::complex<D>. + /// \brief Backward iterator on all the adjacent (n+1)-faces of the + /// n-face of an mln::complex<D>. /// /// \arg \p D The dimension of the complex this iterator belongs to. template <unsigned D> @@ -92,17 +89,12 @@ namespace mln : public internal::backward_complex_relative_iterator_base< face<D>, adj_higher_face_bkd_iter<D> > { - private: typedef adj_higher_face_bkd_iter<D> self_; typedef internal::backward_complex_relative_iterator_base< face<D>, self_ > super_; public: - using super_::is_valid; - using super_::invalidate; - - public: - /// Construction and assignment. + /// Construction. /// \{ adj_higher_face_bkd_iter(); template <typename Fref> @@ -131,10 +123,8 @@ namespace mln template <typename Fref> inline adj_higher_face_fwd_iter<D>::adj_higher_face_fwd_iter(const Fref& f_ref) + : super_(f_ref) { - center_at(f_ref); - // FIXME: Move this to the super class? - invalidate(); } template <unsigned D> @@ -161,10 +151,8 @@ namespace mln template <typename Fref> inline adj_higher_face_bkd_iter<D>::adj_higher_face_bkd_iter(const Fref& f_ref) + : super_(f_ref) { - center_at(f_ref); - // FIXME: Move this to the super class? - invalidate(); } template <unsigned D> diff --git a/milena/mln/topo/adj_lower_face_iter.hh b/milena/mln/topo/adj_lower_face_iter.hh index 498357b..e8f5f3f 100644 --- a/milena/mln/topo/adj_lower_face_iter.hh +++ b/milena/mln/topo/adj_lower_face_iter.hh @@ -50,7 +50,8 @@ namespace mln | topo::adj_lower_face_fwd_iter<D>. | `-----------------------------------*/ - /// \brief Forward iterator on all the faces of an mln::complex<D>. + /// \brief Forward iterator on all the adjacent (n-1)-faces of the + /// n-face of an mln::complex<D>. /// /// \arg \p D The dimension of the complex this iterator belongs to. template <unsigned D> @@ -64,11 +65,7 @@ namespace mln self_ > super_; public: - using super_::is_valid; - using super_::invalidate; - - public: - /// Construction and assignment. + /// Construction. /// \{ adj_lower_face_fwd_iter(); template <typename Fref> @@ -84,7 +81,8 @@ namespace mln | topo::adj_lower_face_bkd_iter<D>. | `-----------------------------------*/ - /// \brief Backward iterator on all the faces of an mln::complex<D>. + /// \brief Backward iterator on all the adjacent (n-1)-faces of the + /// n-face of an mln::complex<D>. /// /// \arg \p D The dimension of the complex this iterator belongs to. template <unsigned D> @@ -98,11 +96,7 @@ namespace mln self_ > super_; public: - using super_::is_valid; - using super_::invalidate; - - public: - /// Construction and assignment. + /// Construction. /// \{ adj_lower_face_bkd_iter(); template <typename Fref> @@ -131,10 +125,8 @@ namespace mln template <typename Fref> inline adj_lower_face_fwd_iter<D>::adj_lower_face_fwd_iter(const Fref& f_ref) + : super_(f_ref) { - center_at(f_ref); - // FIXME: Move this to the super class? - invalidate(); } template <unsigned D> @@ -161,10 +153,8 @@ namespace mln template <typename Fref> inline adj_lower_face_bkd_iter<D>::adj_lower_face_bkd_iter(const Fref& f_ref) + : super_(f_ref) { - center_at(f_ref); - // FIXME: Move this to the super class? - invalidate(); } template <unsigned D> -- 1.6.0.1

1 0

2487: Overhaul mln::topo::internal::complex_relative_iterator_base.
by Roland Levillain 03 Oct '08

03 Oct '08

* mln/topo/internal/complex_relative_iterator_base.hh: Update the documentation. Wrap long lines. (mln::complex_relative_iterator_base<F, E>::complex_type) (mln::forward_complex_relative_iterator_base<F, E>::complex_type) (mln::backward_complex_relative_iterator_base<F, E>::complex_type): Remove (useless) typedefs. (complex_relative_iterator_base(const Fref&)) (forward_complex_relative_iterator_base(const Fref&)) (backward_complex_relative_iterator_base(const Fref&)): New ctors. (complex_relative_iterator_base): Explicitely invalidate the iterator in this default ctor. (mln::forward_complex_relative_iterator_base<F, E>::update_f_) (mln::backward_complex_relative_iterator_base<F, E>::update_f_) Add more assertions. --- milena/ChangeLog | 21 ++++++ .../internal/complex_relative_iterator_base.hh | 73 ++++++++++++++------ 2 files changed, 72 insertions(+), 22 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e84ab00..5bbff03 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,26 @@ 2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Overhaul mln::topo::internal::complex_relative_iterator_base. + + * mln/topo/internal/complex_relative_iterator_base.hh: + Update the documentation. + Wrap long lines. + (mln::complex_relative_iterator_base<F, E>::complex_type) + (mln::forward_complex_relative_iterator_base<F, E>::complex_type) + (mln::backward_complex_relative_iterator_base<F, E>::complex_type): + Remove (useless) typedefs. + (complex_relative_iterator_base(const Fref&)) + (forward_complex_relative_iterator_base(const Fref&)) + (backward_complex_relative_iterator_base(const Fref&)): + New ctors. + (complex_relative_iterator_base): + Explicitely invalidate the iterator in this default ctor. + (mln::forward_complex_relative_iterator_base<F, E>::update_f_) + (mln::backward_complex_relative_iterator_base<F, E>::update_f_) + Add more assertions. + +2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + Overhaul mln::topo::internal::complex_set_iterator_base. * mln/topo/internal/complex_set_iterator_base.hh: Update diff --git a/milena/mln/topo/internal/complex_relative_iterator_base.hh b/milena/mln/topo/internal/complex_relative_iterator_base.hh index 8fe8c2e..c59f16b 100644 --- a/milena/mln/topo/internal/complex_relative_iterator_base.hh +++ b/milena/mln/topo/internal/complex_relative_iterator_base.hh @@ -48,7 +48,9 @@ \endverbatim */ -# include <limits> +# include <iosfwd> + +# include <vector> # include <mln/metal/equal.hh> @@ -88,16 +90,14 @@ namespace mln typedef complex_relative_iterator_base<F, E> self_; public: + /// The type of the iterated faces. typedef F face; - // FIXME: Maybe we could just get the dimension D of the face's - // complex, an define complex_type as mln::complex<D>? - typedef typename F::complex_type complex_type; - /// Construction and assignment. + /// Construction. /// \{ - /* FIXME: Keep this non-const? See a (big) comment about this in - milena/tests/complex_image.cc. */ complex_relative_iterator_base(); + template <typename Fref> + complex_relative_iterator_base(const Fref& f_ref); /// \} /// Manipulation. @@ -111,9 +111,9 @@ namespace mln void next_(); /// \} - /// Conversion and accessors. + /// Conversion. /// \{ - /// Convert the iterator into an face handle. + /// Return a reference to the corresponding face handle. operator const face&() const; /// \} @@ -139,7 +139,8 @@ namespace mln template <typename F, typename E> inline std::ostream& - operator<<(std::ostream& ostr, const complex_relative_iterator_base<F, E>& p); + operator<<(std::ostream& ostr, + const complex_relative_iterator_base<F, E>& p); /*---------------------------------------------------------------. @@ -160,16 +161,13 @@ namespace mln public: typedef F face; - // FIXME: Maybe we could just get the dimension D of the face's - // complex, an define complex_type as mln::complex<D>? - typedef typename F::complex_type complex_type; public: - /// Construction and assignment. + /// Construction. /// \{ - /* FIXME: Keep this non-const? See a (big) comment about this in - milena/tests/complex_image.cc. */ forward_complex_relative_iterator_base(); + template <typename Fref> + forward_complex_relative_iterator_base(const Fref& f_ref); /// \} public: @@ -213,16 +211,13 @@ namespace mln public: typedef F face; - // FIXME: Maybe we could just get the dimension D of the face's - // complex, an define complex_type as mln::complex<D>? - typedef typename F::complex_type complex_type; public: - /// Construction and assignment. + /// Construction. /// \{ - /* FIXME: Keep this non-const? See a (big) comment about this in - milena/tests/complex_image.cc. */ backward_complex_relative_iterator_base(); + template <typename Fref> + backward_complex_relative_iterator_base(const Fref& f_ref); /// \} public: @@ -265,6 +260,22 @@ namespace mln // Check for required methods in E. void (E::*m)() = & E::update_adj_faces_; m = 0; + + exact(this)->invalidate(); + } + + template <typename F, typename E> + template <typename Fref> + inline + complex_relative_iterator_base<F, E>::complex_relative_iterator_base(const Fref& f_ref) + { + // Ensure F and E are compatible. + mlc_equal(F, typename E::face)::check(); + // Check for required methods in E. + void (E::*m)() = & E::update_adj_faces_; + m = 0; + + center_at(f_ref); } template <typename F, typename E> @@ -325,6 +336,14 @@ namespace mln } template <typename F, typename E> + template <typename Fref> + inline + forward_complex_relative_iterator_base<F, E>::forward_complex_relative_iterator_base(const Fref& f_ref) + : super_(f_ref) + { + } + + template <typename F, typename E> inline bool forward_complex_relative_iterator_base<F, E>::is_valid() const @@ -362,6 +381,7 @@ namespace mln void forward_complex_relative_iterator_base<F, E>::update_f_() { + mln_precondition(is_valid()); this->f_ = *i_; } @@ -377,6 +397,14 @@ namespace mln } template <typename F, typename E> + template <typename Fref> + inline + backward_complex_relative_iterator_base<F, E>::backward_complex_relative_iterator_base(const Fref& f_ref) + : super_(f_ref) + { + } + + template <typename F, typename E> inline bool backward_complex_relative_iterator_base<F, E>::is_valid() const @@ -414,6 +442,7 @@ namespace mln void backward_complex_relative_iterator_base<F, E>::update_f_() { + mln_precondition(is_valid()); this->f_ = *i_; } -- 1.6.0.1

1 0

2486: Overhaul mln::topo::internal::complex_set_iterator_base.
by Roland Levillain 03 Oct '08

03 Oct '08

* mln/topo/internal/complex_set_iterator_base.hh: Update documentation and headers. Don't include header `limits'. Include header `iosfwd'. --- milena/ChangeLog | 9 +++++++++ .../mln/topo/internal/complex_set_iterator_base.hh | 3 ++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5a11379..e84ab00 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2008-10-03 Roland Levillain <roland(a)lrde.epita.fr> + + Overhaul mln::topo::internal::complex_set_iterator_base. + + * mln/topo/internal/complex_set_iterator_base.hh: Update + documentation and headers. + Don't include header `limits'. + Include header `iosfwd'. + 2008-10-02 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Start to integrate registration in Milena. diff --git a/milena/mln/topo/internal/complex_set_iterator_base.hh b/milena/mln/topo/internal/complex_set_iterator_base.hh index 7e76b76..51f67c1 100644 --- a/milena/mln/topo/internal/complex_set_iterator_base.hh +++ b/milena/mln/topo/internal/complex_set_iterator_base.hh @@ -32,7 +32,7 @@ /// \brief Definition of an implementation (factoring) class for /// iterators on faces of a complex. -# include <limits> +# include <iosfwd> # include <mln/metal/equal.hh> @@ -61,6 +61,7 @@ namespace mln typedef complex_set_iterator_base<F, E> self_; public: + /// The type of the iterated faces. typedef F face; // FIXME: Maybe we could just get the dimension D of the face's // complex, an define complex_type as mln::complex<D>? -- 1.6.0.1

1 0

2485: Move sandbox-only-related entries from milena/ChangeLog into milena/sandbox/ChangeLog, and adjust paths.
by Roland Levillain 03 Oct '08

03 Oct '08

--- milena/ChangeLog | 31 ------------------------------- milena/sandbox/ChangeLog | 35 +++++++++++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 28809a7..5a11379 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -103,12 +103,6 @@ 2008-10-01 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - Fix missing parentheses in sandbox Rd by union-find. - - * sandbox/geraud/Rd/union_find.hh: Fix. - -2008-10-01 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - Fix wrong namespace in win/shift. * mln/win/shift.hh (geom): Change to... @@ -2377,31 +2371,6 @@ 2008-09-17 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - Add some morphological reconstruction algorithms in sandbox. - - * sandbox/geraud/Rd: New directory. - * sandbox/geraud/Rd/hybrid.hh, - * sandbox/geraud/Rd/queue_based.hh, - * sandbox/geraud/Rd/parallel.cc, - * sandbox/geraud/Rd/parallel_wo.cc, - * sandbox/geraud/Rd/union_find.hh, - * sandbox/geraud/Rd/parallel.hh, - * sandbox/geraud/Rd/diff.cc, - * sandbox/geraud/Rd/sequential_bench.cc, - * sandbox/geraud/Rd/sequential.cc, - * sandbox/geraud/Rd/utils.hh, - * sandbox/geraud/Rd/deco.cc, - * sandbox/geraud/Rd/hybrid.cc, - * sandbox/geraud/Rd/queue_based.cc, - * sandbox/geraud/Rd/sequential_bench.hh, - * sandbox/geraud/Rd/min.cc, - * sandbox/geraud/Rd/sequential.hh, - * sandbox/geraud/Rd/debase.union_find.hh, - * sandbox/geraud/Rd/union_find.cc, - * sandbox/geraud/Rd/svg.queue_based.hh: New files. - -2008-09-17 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> - Fix double_neighb2d name. * mln/core/image/ch_piter.hh: New. diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 42a1bb1..645ba74 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -58,6 +58,12 @@ * jardonnet/perl/test/v2v/id.hh, * jardonnet/perl/test/v2v/rgb_to_hsi.hh: Add test files. +2008-10-01 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Fix missing parentheses in sandbox Rd by union-find. + + * geraud/Rd/union_find.hh: Fix. + 2008-09-30 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Sandbox: continue to revamp registration. @@ -132,6 +138,31 @@ * jardonnet/virtual/access.cc: Update. * jardonnet/virtual/Makefile: Add warning. +2008-09-17 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Add some morphological reconstruction algorithms in sandbox. + + * geraud/Rd: New directory. + * geraud/Rd/hybrid.hh, + * geraud/Rd/queue_based.hh, + * geraud/Rd/parallel.cc, + * geraud/Rd/parallel_wo.cc, + * geraud/Rd/union_find.hh, + * geraud/Rd/parallel.hh, + * geraud/Rd/diff.cc, + * geraud/Rd/sequential_bench.cc, + * geraud/Rd/sequential.cc, + * geraud/Rd/utils.hh, + * geraud/Rd/deco.cc, + * geraud/Rd/hybrid.cc, + * geraud/Rd/queue_based.cc, + * geraud/Rd/sequential_bench.hh, + * geraud/Rd/min.cc, + * geraud/Rd/sequential.hh, + * geraud/Rd/debase.union_find.hh, + * geraud/Rd/union_find.cc, + * geraud/Rd/svg.queue_based.hh: New files. + 2008-09-09 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Sandbox: Sync access.hh/.cc with trunk. @@ -1048,9 +1079,9 @@ Make Tikz output able to valuate pixels. - * sandbox/abraham/io/tikz/save_header.hh: New + * abraham/io/tikz/save_header.hh: New (mln::io::tikz::save_header) Write the header of the LaTeX file. - * sandbox/abraham/io/tikz/save.hh: + * abraham/io/tikz/save.hh: (mln::io::tikz::save) Can now take another image in argument to put values on pixels. -- 1.6.0.1

1 0

2483: Refactor graph_vertex_psite.
by Guillaume Lazzara 03 Oct '08

03 Oct '08

Introduce graph_psite_base. --- .../{graph_vertex_psite.hh => graph_psite_base.hh} | 126 ++++++++++--------- milena/mln/util/internal/graph_vertex_psite.hh | 109 +++-------------- 2 files changed, 82 insertions(+), 153 deletions(-) copy milena/mln/util/internal/{graph_vertex_psite.hh => graph_psite_base.hh} (51%) diff --git a/milena/mln/util/internal/graph_vertex_psite.hh b/milena/mln/util/internal/graph_psite_base.hh similarity index 51% copy from milena/mln/util/internal/graph_vertex_psite.hh copy to milena/mln/util/internal/graph_psite_base.hh index b2fadf9..fa0fb80 100644 --- a/milena/mln/util/internal/graph_vertex_psite.hh +++ b/milena/mln/util/internal/graph_psite_base.hh @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_UTIL_INTERNAL_GRAPH_VERTEX_PSITE_HH -# define MLN_UTIL_INTERNAL_GRAPH_VERTEX_PSITE_HH +#ifndef MLN_UTIL_INTERNAL_GRAPH_PSITE_BASE_HH +# define MLN_UTIL_INTERNAL_GRAPH_PSITE_BASE_HH # include <mln/core/concept/pseudo_site.hh> @@ -37,8 +37,8 @@ namespace mln } // end of namespace mln -/// \file mln/util/internal/graph_vertex_psite.hh -/// \brief Implementation of p_vertices psite. +/// \file mln/util/internal/graph_psite_base.hh +/// \brief Base implementation for graph based psites. namespace mln { @@ -46,38 +46,58 @@ namespace mln namespace internal { - template <typename G, typename F> - class vertex_psite : public mln::Pseudo_Site< vertex_psite<G, F> >, - public internal::proxy_impl< const typename F::result&, vertex_psite<G, F> > + template <typename V, typename P, typename S, typename E> + class graph_psite_base : public mln::Pseudo_Site<E>, + public internal::proxy_impl<const P&, E> { - typedef Pseudo_Site< vertex_psite<G, F> > super; + typedef Pseudo_Site< graph_psite_base<V, P, S, E> > super; public: - typedef p_vertices<G, F> site_set; - typedef mlc_const(site_set) target; - typedef typename F::result site; - - vertex_psite(); - vertex_psite(const target& t); - + /// Associated types. + /// \{ + typedef P site; + typedef S target; + /// \} + + + /// Constructors. + /// \{ + graph_psite_base(); + /// \p t A site set. + /// \sa p_vertices, p_edges. + graph_psite_base(const target& t); + /// \} + + /// Setters. + /// \{ + /// Change the targe site set. void change_target(const target& new_target); - void change_vertex_id(unsigned id_v); + /// Update the underlying element's id. + /// This element can be an edge, a vertex... void update_id(unsigned v_id); + /// \} + /// Return the target (the site set). const target* target_() const; // Hook to the target. + /// Check whether it is valid. bool is_valid() const; + /// Invalidate this psite. void invalidate(); + /// Pseudo site Interface + /// \{ + /// Subject type. typedef const site& q_subject; + /// Return the subject. const site& subj_(); + /// Return the underlying site. const site& to_site() const; - - const util::vertex<G>& v() const; + /// \} protected: - target* t_; - util::vertex<G> v_; + mlc_const(target)* t_; + V v_; }; } // end of namespace internal @@ -93,98 +113,84 @@ namespace mln namespace internal { - template <typename G, typename F> + template <typename V, typename P, typename S, typename E> inline - vertex_psite<G, F>::vertex_psite() + graph_psite_base<V, P, S, E>::graph_psite_base() : t_(0) { } - template <typename G, typename F> + template <typename V, typename P, typename S, typename E> inline - vertex_psite<G, F>::vertex_psite(const target& t) + graph_psite_base<V, P, S, E>::graph_psite_base(const target& t) : t_(0) { change_target(t); } - template <typename G, typename F> + template <typename V, typename P, typename S, typename E> inline void - vertex_psite<G, F>::change_target(const target& new_target) + graph_psite_base<V, P, S, E>::change_target(const target& new_target) { t_ = &new_target; v_.change_graph(new_target.g()); } - template <typename G, typename F> + template <typename V, typename P, typename S, typename E> inline void - vertex_psite<G, F>::change_vertex_id(unsigned id_v) + graph_psite_base<V, P, S, E>::update_id(unsigned id) { - v_.update_id(id_v); + v_.update_id(id); } - template <typename G, typename F> + template <typename V, typename P, typename S, typename E> inline - void - vertex_psite<G, F>::update_id(unsigned v_id) - { - v_.update_id(v_id); - } - - template <typename G, typename F> - inline - const typename vertex_psite<G, F>::target* - vertex_psite<G, F>::target_() const + const typename graph_psite_base<V, P, S, E>::target* + graph_psite_base<V, P, S, E>::target_() const { return t_; } - template <typename G, typename F> + template <typename V, typename P, typename S, typename E> inline bool - vertex_psite<G, F>::is_valid() const + graph_psite_base<V, P, S, E>::is_valid() const { - return t_ != 0 && t_->is_valid(); + return t_ != 0 && t_->is_valid() && v_.is_valid(); } - template <typename G, typename F> + template <typename V, typename P, typename S, typename E> inline void - vertex_psite<G, F>::invalidate() + graph_psite_base<V, P, S, E>::invalidate() { t_ = 0; + v_.invalidate(); } - template <typename G, typename F> + template <typename V, typename P, typename S, typename E> inline - const typename vertex_psite<G, F>::site& - vertex_psite<G, F>::subj_() + const typename graph_psite_base<V, P, S, E>::site& + graph_psite_base<V, P, S, E>::subj_() { return to_site(); } - template <typename G, typename F> + template <typename V, typename P, typename S, typename E> inline - const typename vertex_psite<G, F>::site& - vertex_psite<G, F>::to_site() const + const typename graph_psite_base<V, P, S, E>::site& + graph_psite_base<V, P, S, E>::to_site() const { return t_->function()(v_); } - template <typename G, typename F> - inline - const util::vertex<G>& - vertex_psite<G, F>::v() const - { - return v_; - } - } // end of namespace internal } // end of namespace mln + # endif // !MLN_INCLUDE_ONLY -#endif // !MLN_UTIL_INTERNAL_GRAPH_VERTEX_PSITE_HH +#endif // !MLN_UTIL_INTERNAL_GRAPH_PSITE_BASE_HH diff --git a/milena/mln/util/internal/graph_vertex_psite.hh b/milena/mln/util/internal/graph_vertex_psite.hh index b2fadf9..b0b57cd 100644 --- a/milena/mln/util/internal/graph_vertex_psite.hh +++ b/milena/mln/util/internal/graph_vertex_psite.hh @@ -29,6 +29,7 @@ # define MLN_UTIL_INTERNAL_GRAPH_VERTEX_PSITE_HH # include <mln/core/concept/pseudo_site.hh> +# include <mln/util/internal/graph_psite_base.hh> namespace mln { @@ -47,37 +48,26 @@ namespace mln { template <typename G, typename F> - class vertex_psite : public mln::Pseudo_Site< vertex_psite<G, F> >, - public internal::proxy_impl< const typename F::result&, vertex_psite<G, F> > + class vertex_psite : + public graph_psite_base<util::vertex<G>, typename F::result, + p_vertices<G, F>, + vertex_psite<G, F> > { - typedef Pseudo_Site< vertex_psite<G, F> > super; + typedef vertex_psite<G, F> self_; + typedef p_vertices<G, F> target_t; + typedef graph_psite_base<util::vertex<G>, typename F::result, target_t, self_> super_; + typedef util::vertex<G> vertex_t; - public: - typedef p_vertices<G, F> site_set; - typedef mlc_const(site_set) target; + public: typedef typename F::result site; vertex_psite(); - vertex_psite(const target& t); + vertex_psite(const target_t& t); - void change_target(const target& new_target); - void change_vertex_id(unsigned id_v); - void update_id(unsigned v_id); - - const target* target_() const; // Hook to the target. - - bool is_valid() const; - void invalidate(); - - typedef const site& q_subject; - const site& subj_(); - const site& to_site() const; - - const util::vertex<G>& v() const; + const vertex_t& v() const; protected: - target* t_; - util::vertex<G> v_; + using super_::v_; }; } // end of namespace internal @@ -96,86 +86,19 @@ namespace mln template <typename G, typename F> inline vertex_psite<G, F>::vertex_psite() - : t_(0) - { - } - - template <typename G, typename F> - inline - vertex_psite<G, F>::vertex_psite(const target& t) - : t_(0) - { - change_target(t); - } - - template <typename G, typename F> - inline - void - vertex_psite<G, F>::change_target(const target& new_target) - { - t_ = &new_target; - v_.change_graph(new_target.g()); - } - - template <typename G, typename F> - inline - void - vertex_psite<G, F>::change_vertex_id(unsigned id_v) - { - v_.update_id(id_v); - } - - template <typename G, typename F> - inline - void - vertex_psite<G, F>::update_id(unsigned v_id) - { - v_.update_id(v_id); - } - - template <typename G, typename F> - inline - const typename vertex_psite<G, F>::target* - vertex_psite<G, F>::target_() const - { - return t_; - } - - template <typename G, typename F> - inline - bool - vertex_psite<G, F>::is_valid() const - { - return t_ != 0 && t_->is_valid(); - } - - template <typename G, typename F> - inline - void - vertex_psite<G, F>::invalidate() - { - t_ = 0; - } - - template <typename G, typename F> - inline - const typename vertex_psite<G, F>::site& - vertex_psite<G, F>::subj_() { - return to_site(); } template <typename G, typename F> inline - const typename vertex_psite<G, F>::site& - vertex_psite<G, F>::to_site() const + vertex_psite<G, F>::vertex_psite(const target_t& t) { - return t_->function()(v_); + this->change_target(t); } template <typename G, typename F> inline - const util::vertex<G>& + const typename vertex_psite<G, F>::vertex_t& vertex_psite<G, F>::v() const { return v_; -- 1.5.6.5

1 0

2482: Fix is_subgraph_of
by Guillaume Lazzara 03 Oct '08

03 Oct '08

--- milena/mln/util/graph.hh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/milena/mln/util/graph.hh b/milena/mln/util/graph.hh index ba148d3..b94dabc 100644 --- a/milena/mln/util/graph.hh +++ b/milena/mln/util/graph.hh @@ -94,7 +94,7 @@ namespace mln /// Return whether this graph is a subgraph /// Return always false here. template <typename G2> - bool is_subgraph_of(const G2& g); + bool is_subgraph_of(const G2& g) const; }; } // end of namespace mln::util @@ -113,9 +113,9 @@ namespace mln template <typename G2> inline bool - graph::is_subgraph_of(const G2& g) + graph::is_subgraph_of(const G2& g) const { - return false; + return &g == this; } } // end of namespace mln::util -- 1.5.6.5

1 0