* 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 &lt;roland(a)lrde.epita.fr&gt; + 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 &lt;roland(a)lrde.epita.fr&gt; + 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