Olena-patches September 2009

olena-patches@lrde.epita.fr

9 participants
188 discussions

[PATCH 14/22] Add a dummy operator< to mln::util::multi_site.

by Roland Levillain

* mln/util/multi_site.hh (operator< (const multi_site& lhs, const multi_site& rhs)): New. --- milena/ChangeLog | 8 ++++++++ milena/mln/util/multi_site.hh | 21 +++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c90e910..fd80747 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-09-29 Roland Levillain <roland(a)lrde.epita.fr> + Add a dummy operator< to mln::util::multi_site. + + * mln/util/multi_site.hh + (operator< (const multi_site& lhs, const multi_site& rhs)): + New. + +2009-09-29 Roland Levillain <roland(a)lrde.epita.fr> + Have mln::topo::is_n_face expose a more tolerant interface. * mln/topo/is_n_face.hh diff --git a/milena/mln/util/multi_site.hh b/milena/mln/util/multi_site.hh index 220308d..6011e91 100644 --- a/milena/mln/util/multi_site.hh +++ b/milena/mln/util/multi_site.hh @@ -31,10 +31,14 @@ # include <cstddef> +# include <algorithm> # include <vector> # include <mln/core/concept/object.hh> +# include <mln/util/ord.hh> + + namespace mln { @@ -80,6 +84,12 @@ namespace mln bool operator==(const multi_site& lhs, const multi_site& rhs); + /* FIXME: Required (indirectly) by a postcondition in + mln::morpho::dilation. */ + template <typename P> + bool + operator< (const multi_site& lhs, const multi_site& rhs); + # ifndef MLN_INCLUDE_ONLY @@ -143,6 +153,17 @@ namespace mln return lhs.sites == rhs.sites; } + template <typename P> + bool + operator< (const multi_site& lhs, const multi_site& rhs) + { + // FIXME: This comparison is meaningless, since LHS and RHS are + // not sorted! + return std::lexicographical_compare(lhs.sites.begin(), lhs.sites.end(), + rhs.sites.begin(), rhs.sites.end(), + util::ord()); + } + # endif // ! MLN_INCLUDE_ONLY } // end of mln::util -- 1.6.3.1

14 years, 7 months

[PATCH 13/22] Have mln::topo::is_n_face expose a more tolerant interface.

by Roland Levillain

* mln/topo/is_n_face.hh (is_n_face<N>::operator()(const mln::complex_psite<D, G>& p) const): Turn into... (is_n_face<N>::operator()(const P& p) const): ...this. --- milena/ChangeLog | 10 ++++++++++ milena/mln/topo/is_n_face.hh | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b420d56..c90e910 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2009-09-29 Roland Levillain <roland(a)lrde.epita.fr> + Have mln::topo::is_n_face expose a more tolerant interface. + + * mln/topo/is_n_face.hh + (is_n_face<N>::operator()(const mln::complex_psite<D, G>& p) const): + Turn into... + (is_n_face<N>::operator()(const P& p) const): + ...this. + +2009-09-29 Roland Levillain <roland(a)lrde.epita.fr> + Make complex window and complex neighborhood piters symmetric. * mln/core/image/complex_neighborhood_piter.hh diff --git a/milena/mln/topo/is_n_face.hh b/milena/mln/topo/is_n_face.hh index 235c1dd..bc9aa71 100644 --- a/milena/mln/topo/is_n_face.hh +++ b/milena/mln/topo/is_n_face.hh @@ -49,18 +49,18 @@ namespace mln { typedef bool result; - template <unsigned D, typename G> - bool operator()(const mln::complex_psite<D, G>& p) const; + template <typename P> + bool operator()(const P& p) const; }; # ifndef MLN_INCLUDE_ONLY template <unsigned N> - template <unsigned D, typename G> + template <typename P> inline bool - is_n_face<N>::operator()(const mln::complex_psite<D, G>& p) const + is_n_face<N>::operator()(const P& p) const { return p.n() == N; } -- 1.6.3.1

14 years, 7 months

[PATCH 12/22] Make complex window and complex neighborhood piters symmetric.

by Roland Levillain

* mln/core/image/complex_neighborhood_piter.hh (complex_window_fwd_piter<I, G, W>::init_) (complex_window_bkd_piter<I, G, W>::init_): s/center_at/this->center_at/ Misc. documentation changes. * mln/core/image/complex_window_piter.hh (complex_neighborhood_fwd_piter(const Neighborhood<N>&, const Pref&)) (complex_neighborhood_bkd_piter(const Neighborhood<N>&, const Pref&)): Move the initializations... (complex_neighborhood_fwd_piter<I, G, N>::init_) (complex_neighborhood_bkd_piter<I, G, N>::init_): ...here (new method). Misc. documentation changes. --- milena/ChangeLog | 18 +++++++ .../mln/core/image/complex_neighborhood_piter.hh | 49 +++++++++++++++---- milena/mln/core/image/complex_window_piter.hh | 17 +++---- 3 files changed, 64 insertions(+), 20 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b19c004..b420d56 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,23 @@ 2009-09-29 Roland Levillain <roland(a)lrde.epita.fr> + Make complex window and complex neighborhood piters symmetric. + + * mln/core/image/complex_neighborhood_piter.hh + (complex_window_fwd_piter<I, G, W>::init_) + (complex_window_bkd_piter<I, G, W>::init_): + s/center_at/this->center_at/ + Misc. documentation changes. + * mln/core/image/complex_window_piter.hh + (complex_neighborhood_fwd_piter(const Neighborhood<N>&, const Pref&)) + (complex_neighborhood_bkd_piter(const Neighborhood<N>&, const Pref&)): + Move the initializations... + (complex_neighborhood_fwd_piter<I, G, N>::init_) + (complex_neighborhood_bkd_piter<I, G, N>::init_): + ...here (new method). + Misc. documentation changes. + +2009-09-29 Roland Levillain <roland(a)lrde.epita.fr> + Have complex neighborhoods depend on complex windows. * mln/core/internal/complex_neighborhood_base.hh diff --git a/milena/mln/core/image/complex_neighborhood_piter.hh b/milena/mln/core/image/complex_neighborhood_piter.hh index 04e0626..6298aac 100644 --- a/milena/mln/core/image/complex_neighborhood_piter.hh +++ b/milena/mln/core/image/complex_neighborhood_piter.hh @@ -27,7 +27,6 @@ # define MLN_CORE_IMAGE_COMPLEX_NEIGHBORHOOD_PITER_HH /// \file -/// /// Definition of a site iterator on a complex neighborhood. # include <mln/core/concept/neighborhood.hh> @@ -36,10 +35,10 @@ // FIXME: These might be factor-able, both between fwd/bkd and nbh/win. /* FIXME: Do we really want to inherit from - internal::site_relative_iterator_base? I might duplicate things, + internal::site_relative_iterator_base? It might duplicate things, since most of the implementation of this iterator is delegated to - the underlying complex iter. Moreover, change_target_() is - useless. Think about introducing base class replacement. */ + the underlying complex iter. Think about introducing base class + replacement. */ namespace mln @@ -49,7 +48,7 @@ namespace mln | complex_neighborhood_fwd_piter<I, G, N>. | `------------------------------------------*/ - /// Forward iterator on complex neighborhood. + /// \brief Forward iterator on complex neighborhood. template <typename I, typename G, typename N> class complex_neighborhood_fwd_piter : public internal::site_relative_iterator_base< N, @@ -73,6 +72,10 @@ namespace mln const Pref& p_ref); /// \} + /// Delayed initialization. + template <typename Pref> + void init_(const Neighborhood<N>& nbh, const Pref& p_ref); + /// Manipulation. /// \{ /// Test if the iterator is valid. @@ -85,7 +88,7 @@ namespace mln /// Go to the next site. void do_next_(); - /// Set the reference psite. + /// Additional work while setting the reference site. template <typename Pref> void center_at_(const Pref& c); @@ -93,7 +96,7 @@ namespace mln psite compute_p_() const; /// \} - /// Accessors. + /// \brief Accessors. /// \{ const iter_type& iter() const; iter_type& iter(); @@ -116,7 +119,7 @@ namespace mln | complex_neighborhood_bkd_piter<I, G, N>. | `------------------------------------------*/ - /// Backward iterator on complex neighborhood. + /// \brief Backward iterator on complex neighborhood. template <typename I, typename G, typename N> class complex_neighborhood_bkd_piter : public internal::site_relative_iterator_base< N, @@ -140,6 +143,10 @@ namespace mln const Pref& p_ref); /// \} + /// Delayed initialization. + template <typename Pref> + void init_(const Neighborhood<N>& nbh, const Pref& p_ref); + /// Manipulation. /// \{ /// Test if the iterator is valid. @@ -152,15 +159,15 @@ namespace mln /// Go to the next site. void do_next_(); - /// Do some work while setting the reference site. + /// Additional work while setting the reference site. template <typename Pref> - void center_at_(const Pref&); + void center_at_(const Pref& c); /// Compute the current psite. psite compute_p_() const; /// \} - /// Accessors. + /// \brief Accessors. /// \{ const iter_type& iter() const; iter_type& iter(); @@ -198,6 +205,16 @@ namespace mln complex_neighborhood_fwd_piter<I, G, N>::complex_neighborhood_fwd_piter(const Neighborhood<N>& nbh, const Pref& p_ref) { + init_(nbh, p_ref); + } + + template <typename I, typename G, typename N> + template <typename Pref> + inline + void + complex_neighborhood_fwd_piter<I, G, N>::init_(const Neighborhood<N>& nbh, + const Pref& p_ref) + { this->change_target(exact(nbh)); this->center_at(p_ref); mln_postcondition(!this->is_valid()); @@ -295,6 +312,16 @@ namespace mln complex_neighborhood_bkd_piter<I, G, N>::complex_neighborhood_bkd_piter(const Neighborhood<N>& nbh, const Pref& p_ref) { + init_(nbh, p_ref); + } + + template <typename I, typename G, typename N> + template <typename Pref> + inline + void + complex_neighborhood_bkd_piter<I, G, N>::init_(const Neighborhood<N>& nbh, + const Pref& p_ref) + { this->change_target(exact(nbh)); this->center_at(p_ref); mln_postcondition(!this->is_valid()); diff --git a/milena/mln/core/image/complex_window_piter.hh b/milena/mln/core/image/complex_window_piter.hh index b723ec6..8a54adb 100644 --- a/milena/mln/core/image/complex_window_piter.hh +++ b/milena/mln/core/image/complex_window_piter.hh @@ -29,17 +29,16 @@ /// \file /// \brief Definition of a site iterator on a complex window. +# include <mln/core/concept/window.hh> # include <mln/core/internal/site_relative_iterator_base.hh> // FIXME: These might be factor-able, both between fwd/bkd and nbh/win. /* FIXME: Do we really want to inherit from - internal::site_relative_iterator_base? I might duplicate things, + internal::site_relative_iterator_base? It might duplicate things, since most of the implementation of this iterator is delegated to - the underlying complex iter. Moreover, change_target_() is - useless, and center_at() ``hides'' an existing method in (one of) - the super class(es) which is not sound, IMHO. Think about - introducing base class replacement. */ + the underlying complex iter. Think about introducing base class + replacement. */ namespace mln @@ -88,7 +87,7 @@ namespace mln /// Go to the next site. void do_next_(); - /// Do some work while setting the reference site. + /// Additional work while setting the reference site. template <typename Pref> void center_at_(const Pref& c); @@ -158,7 +157,7 @@ namespace mln /// Go to the next site. void do_next_(); - /// Do some work while setting the reference site. + /// Additional work while setting the reference site. template <typename Pref> void center_at_(const Pref& c); @@ -215,7 +214,7 @@ namespace mln const Pref& p_ref) { this->change_target(exact(win)); - center_at(p_ref); + this->center_at(p_ref); mln_postcondition(!this->is_valid()); } @@ -323,7 +322,7 @@ namespace mln const Pref& p_ref) { this->change_target(exact(win)); - center_at(p_ref); + this->center_at(p_ref); mln_postcondition(!this->is_valid()); } -- 1.6.3.1

14 years, 7 months

[PATCH 11/22] Have complex neighborhoods depend on complex windows.

by Roland Levillain

* mln/core/internal/complex_neighborhood_base.hh (mln::internal::complex_neighborhood_base<D, G, F, B, E>): Turn class into... (mln::internal::complex_neighborhood_base<W, E>): ...this. (mln::internal::complex_neighborhood_base<W, E>::complex_fwd_iter) (mln::internal::complex_neighborhood_base<W, E>::complex_bkd_iter) (mln::internal::complex_neighborhood_base<W, E>::psite) (mln::internal::complex_neighborhood_base<W, E>::site) (mln::internal::complex_neighborhood_base<W, E>::window): Depend on W. (mln::internal::complex_neighborhood_base<W, E>::G): New typedef. (mln::internal::complex_neighborhood_base<W, E>::win) (mln::internal::complex_neighborhood_base<W, E>::is_valid): Provide actual implementations. (mln::internal::complex_neighborhood_base<W, E>::win_): New attribute. * mln/core/image/complex_neighborhoods.hh (mln_gen_complex_neighborhood(Nbh,Fwd_Complex_Iter,Bkd_Complex_Iter)): Turn macro into... (mln_gen_complex_neighborhood(Nbh,Win)): ...this. Adjust callers. * mln/core/internal/complex_window_base.hh: Typo in comment. --- milena/ChangeLog | 30 +++++ milena/mln/core/image/complex_neighborhoods.hh | 44 ++----- .../mln/core/internal/complex_neighborhood_base.hh | 138 ++++++++++---------- milena/mln/core/internal/complex_window_base.hh | 2 +- 4 files changed, 113 insertions(+), 101 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index eb868cc..b19c004 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,35 @@ 2009-09-29 Roland Levillain <roland(a)lrde.epita.fr> + Have complex neighborhoods depend on complex windows. + + * mln/core/internal/complex_neighborhood_base.hh + (mln::internal::complex_neighborhood_base<D, G, F, B, E>): + Turn class into... + (mln::internal::complex_neighborhood_base<W, E>): + ...this. + (mln::internal::complex_neighborhood_base<W, E>::complex_fwd_iter) + (mln::internal::complex_neighborhood_base<W, E>::complex_bkd_iter) + (mln::internal::complex_neighborhood_base<W, E>::psite) + (mln::internal::complex_neighborhood_base<W, E>::site) + (mln::internal::complex_neighborhood_base<W, E>::window): + Depend on W. + (mln::internal::complex_neighborhood_base<W, E>::G): + New typedef. + (mln::internal::complex_neighborhood_base<W, E>::win) + (mln::internal::complex_neighborhood_base<W, E>::is_valid): + Provide actual implementations. + (mln::internal::complex_neighborhood_base<W, E>::win_): + New attribute. + * mln/core/image/complex_neighborhoods.hh + (mln_gen_complex_neighborhood(Nbh,Fwd_Complex_Iter,Bkd_Complex_Iter)): + Turn macro into... + (mln_gen_complex_neighborhood(Nbh,Win)): + ...this. + Adjust callers. + * mln/core/internal/complex_window_base.hh: Typo in comment. + +2009-09-29 Roland Levillain <roland(a)lrde.epita.fr> + Fix target change in complex piters. * mln/core/internal/p_complex_piter_base.hh diff --git a/milena/mln/core/image/complex_neighborhoods.hh b/milena/mln/core/image/complex_neighborhoods.hh index a6ae7c2..2b50425 100644 --- a/milena/mln/core/image/complex_neighborhoods.hh +++ b/milena/mln/core/image/complex_neighborhoods.hh @@ -30,34 +30,24 @@ /// \brief Definitions of some neighborhoods of complex images. # include <mln/core/internal/complex_neighborhood_base.hh> +# include <mln/core/image/complex_windows.hh> -# include <mln/topo/adj_lower_face_iter.hh> -# include <mln/topo/adj_higher_face_iter.hh> -# include <mln/topo/adj_lower_higher_face_iter.hh> -# include <mln/topo/adj_lower_dim_connected_n_face_iter.hh> -# include <mln/topo/adj_higher_dim_connected_n_face_iter.hh> +# include <mln/topo/complex_iterators.hh> -/** \brief Generate a complex neighborhood class. +/** \brief Generate a complex neighborhood class (based on a window). - \param Nbh The name of the class to generate. - \param Fwd_Complex_Iter The underlying forward iterator type. - \param Bkd_Complex_Iter The underlying backward iterator type. + \param Nbh The name of the class to generate. + \param Win The underlying window (with no parameter). The generated class inherits from - mln:: internal::complex_neighborhood_base< D, G, - Fwd_Complex_Iter<D>, - Bkd_Complex_Iter<D>, - Nbh <D, G> > + mln::internal::complex_neighborhood_base< Win <D, G>, Nbh <D, G> > where D and G are template parameters of the generated Nbh class. */ -# define mln_gen_complex_neighborhood(Nbh, Fwd_Complex_Iter, Bkd_Complex_Iter) \ +# define mln_gen_complex_neighborhood(Nbh, Win) \ template <unsigned D, typename G> \ struct Nbh \ - : internal::complex_neighborhood_base< D, G, \ - Fwd_Complex_Iter <D>, \ - Bkd_Complex_Iter <D>, \ - Nbh <D, G> > \ + : internal::complex_neighborhood_base< Win <D, G>, Nbh <D, G> > \ { \ } @@ -68,38 +58,32 @@ namespace mln /// \brief Neighborhood centered on an n-face of complex returning /// its adjacent (n-1)-faces. mln_gen_complex_neighborhood(complex_lower_neighborhood, - topo::adj_lower_face_fwd_iter, - topo::adj_lower_face_bkd_iter); + complex_lower_window); /// \brief Neighborhood centered on an n-face of complex returning /// its adjacent (n+1)-faces. mln_gen_complex_neighborhood(complex_higher_neighborhood, - topo::adj_higher_face_fwd_iter, - topo::adj_higher_face_bkd_iter); + complex_higher_window); /// \brief Neighborhood centered on an n-face of complex returning /// its adjacent (n-1)-faces and (n+1)-faces. mln_gen_complex_neighborhood(complex_lower_higher_neighborhood, - topo::adj_lower_higher_face_fwd_iter, - topo::adj_lower_higher_face_bkd_iter); + complex_lower_higher_window); /// \brief Neighborhood centered on an n-face of complex returning /// the n-faces sharing an (n-1)-face with the center n-face. mln_gen_complex_neighborhood(complex_lower_dim_connected_n_face_neighborhood, - topo::adj_lower_dim_connected_n_face_fwd_iter, - topo::adj_lower_dim_connected_n_face_bkd_iter); + complex_lower_dim_connected_n_face_window); /// \brief Neighborhood centered on an n-face of complex returning /// the n-faces sharing an (n+1)-face with the center n-face. mln_gen_complex_neighborhood(complex_higher_dim_connected_n_face_neighborhood, - topo::adj_higher_dim_connected_n_face_fwd_iter, - topo::adj_higher_dim_connected_n_face_bkd_iter); + complex_higher_dim_connected_n_face_window); /// \brief Neighborhood centered on an n-face of complex returning /// the m-faces transitively adjacent to this center n-face. mln_gen_complex_neighborhood(complex_m_face_neighborhood, - topo::adj_m_face_fwd_iter, - topo::adj_m_face_bkd_iter); + complex_m_face_window); } // end of namespace mln diff --git a/milena/mln/core/internal/complex_neighborhood_base.hh b/milena/mln/core/internal/complex_neighborhood_base.hh index 1473e28..d71dec9 100644 --- a/milena/mln/core/internal/complex_neighborhood_base.hh +++ b/milena/mln/core/internal/complex_neighborhood_base.hh @@ -27,15 +27,15 @@ # define MLN_CORE_INTERNAL_COMPLEX_NEIGHBORHOOD_BASE_HH /// \file -/// \brief Definition of a generic neighborhood centered on the face -/// of a complex, based on a pair of (forward and backward) complex +/// \brief Definition of a generic neighborhood of the face of a +/// complex, based on a pair of (forward and backward) complex /// iterators. # include <mln/core/concept/neighborhood.hh> # include <mln/core/site_set/complex_psite.hh> # include <mln/core/image/complex_neighborhood_piter.hh> -// FIXME: Factor with mln::internal::complex_window_base. +# include <mln/core/internal/neighb_base.hh> namespace mln @@ -48,7 +48,7 @@ namespace mln namespace internal { - template <unsigned D, typename G, typename F, typename B, typename E> + template <typename W, typename E> class complex_neighborhood_base; } @@ -58,78 +58,76 @@ namespace mln /** \brief Generic neighborhood centered on the face of a complex, based on an pair of (forward and backward) complex iterators. - \tparam D The dimension of the complex. - \tparam G The type of the geometry functor of the complex. - \tparam F The underlying forward iterator type. - \tparam B The underlying backward iterator type. + \tparam W The underlying window. \tparam E The exact type. */ - template <unsigned D, typename G, typename F, typename B, typename E> - class complex_neighborhood_base : public Neighborhood<E> - { - public: - /// The associated complex iterators. - /// \{ - typedef F complex_fwd_iter; - typedef B complex_bkd_iter; - /// \} - - public: - /// Associated types. - /// \{ - /// The type of psite corresponding to the neighborhood. - typedef complex_psite<D, G> psite; - /// The type of site corresponding to the neighborhood. - typedef mln_site(psite) site; - - /// \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, G, E> fwd_niter; - - /// \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, G, E> bkd_niter; - - /// The default niter type. - typedef fwd_niter niter; - /// \} - - /// Conversions. - /// \{ - /// The window type corresponding to this neighborhood. - // FIXME: Dummy. - typedef E window; - /// Create a window corresponding to this neighborhood. - const window& win() const; - /// \} - - /// Return true by default. - bool is_valid() const; - }; + template <typename W, typename E> + class complex_neighborhood_base : public Neighborhood<E> + { + public: + /// The associated complex iterators. + /// \{ + typedef typename W::complex_fwd_iter complex_fwd_iter; + typedef typename W::complex_bkd_iter complex_bkd_iter; + /// \} + + public: + /// Associated types. + /// \{ + /// The geometry of the complex. + typedef mln_geom(W) G; + /// The type of psite corresponding to the neighborhood. + typedef mln_psite(W) psite; + /// The type of site corresponding to the neighborhood. + typedef mln_site(W) site; + + /// \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, G, E> fwd_niter; + + /// \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, G, E> bkd_niter; + + /// The default niter type. + typedef fwd_niter niter; + + /// The window type corresponding to this neighborhood. + typedef W window; + /// \} + + public: + /// Get the corresponding window. + const W& win() const; + + /// Is this neighborhood valid? + bool is_valid() const; + + private: + /// The underlying window. + W win_; + }; # ifndef MLN_INCLUDE_ONLY - // FIXME: Dummy. - template <unsigned D, typename G, typename F, typename B, typename E> - inline - // FIXME: Change (dummy) type. - const typename complex_neighborhood_base<D, G, F, B, E>::window& - complex_neighborhood_base<D, G, F, B, E>::win() const - { - // FIXME: Dummy. - return exact(*this); - } - - template <unsigned D, typename G, typename F, typename B, typename E> - inline - bool - complex_neighborhood_base<D, G, F, B, E>::is_valid() const - { - return true; - } + template <typename W, typename E> + inline + const W& + complex_neighborhood_base<W, E>::win() const + { + return win_; + } + + template <typename W, typename E> + inline + bool + complex_neighborhood_base<W, E>::is_valid() const + { + return win().is_valid(); + } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/core/internal/complex_window_base.hh b/milena/mln/core/internal/complex_window_base.hh index df08e6d..1a248a0 100644 --- a/milena/mln/core/internal/complex_window_base.hh +++ b/milena/mln/core/internal/complex_window_base.hh @@ -103,7 +103,7 @@ namespace mln typedef void dpsite; /* FIXME: Ideally, the `is_centered' information should be - fetched from the iterators, but that's not an straighforward + fetched from the iterators, but that's not a straighforward task. */ complex_window_base(bool is_centered = false); -- 1.6.3.1

14 years, 7 months

[PATCH 10/22] Fix target change in complex piters.

by Roland Levillain

* mln/core/internal/p_complex_piter_base.hh (p_complex_piter_base<I, S, P, E>::p_complex_piter_base_(const S&)): Move the underlying iterator's (target) complex assignment... (p_complex_piter_base<I, S, P, E>::change_target_): ...here (new method). --- milena/ChangeLog | 10 ++++++++++ milena/mln/core/internal/p_complex_piter_base.hh | 12 +++++++++++- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5da882c..eb868cc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2009-09-29 Roland Levillain <roland(a)lrde.epita.fr> + Fix target change in complex piters. + + * mln/core/internal/p_complex_piter_base.hh + (p_complex_piter_base<I, S, P, E>::p_complex_piter_base_(const S&)): + Move the underlying iterator's (target) complex assignment... + (p_complex_piter_base<I, S, P, E>::change_target_): + ...here (new method). + +2009-09-29 Roland Levillain <roland(a)lrde.epita.fr> + Allow iterators to perform extra work while changing their target. * mln/core/concept/pseudo_site.hh diff --git a/milena/mln/core/internal/p_complex_piter_base.hh b/milena/mln/core/internal/p_complex_piter_base.hh index 6d7f5f6..9d4ff21 100644 --- a/milena/mln/core/internal/p_complex_piter_base.hh +++ b/milena/mln/core/internal/p_complex_piter_base.hh @@ -85,6 +85,9 @@ namespace mln /// Go to the next point. void next_(); + /// Change the target of the underlying complex iterator. + void change_target_(const S& pc); + private: /// Update the psite. void update_(); @@ -124,12 +127,19 @@ namespace mln 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 S, typename P, typename E> inline + void + p_complex_piter_base_<I, S, P, E>::change_target_(const S& pc) + { + iter_.set_cplx(pc.cplx()); + } + + template <typename I, typename S, typename P, typename E> + inline bool p_complex_piter_base_<I, S, P, E>::is_valid_() const { -- 1.6.3.1

14 years, 7 months

[PATCH 09/22] Allow iterators to perform extra work while changing their target.

by Roland Levillain

* mln/core/concept/pseudo_site.hh (change_target(Pseudo_Site&, const typename P::target_t&)): Remove useless declaration. Wrap long lines. * mln/core/internal/site_set_iterator_base.hh (mln::internal::site_set_iterator_base<S, E>::change_target_): New method. Call its exact version... (mln::internal::site_set_iterator_base<S, E>::change_target): ...here. --- milena/ChangeLog | 15 +++++++++++++++ milena/mln/core/concept/pseudo_site.hh | 15 ++++++++------- milena/mln/core/internal/site_set_iterator_base.hh | 17 ++++++++++++++++- 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4215c0c..5da882c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,20 @@ 2009-09-29 Roland Levillain <roland(a)lrde.epita.fr> + Allow iterators to perform extra work while changing their target. + + * mln/core/concept/pseudo_site.hh + (change_target(Pseudo_Site&, const typename P::target_t&)): + Remove useless declaration. + Wrap long lines. + * mln/core/internal/site_set_iterator_base.hh + (mln::internal::site_set_iterator_base<S, E>::change_target_): + New method. + Call its exact version... + (mln::internal::site_set_iterator_base<S, E>::change_target): + ...here. + +2009-09-29 Roland Levillain <roland(a)lrde.epita.fr> + Work around std::vector<bool> specialization in mln::complex_image. * mln/core/image/complex_image.hh diff --git a/milena/mln/core/concept/pseudo_site.hh b/milena/mln/core/concept/pseudo_site.hh index 302e152..e8e5b03 100644 --- a/milena/mln/core/concept/pseudo_site.hh +++ b/milena/mln/core/concept/pseudo_site.hh @@ -79,10 +79,9 @@ namespace mln namespace if_possible { - // Nota: This procedure is used in internal::site_iterator_base. - - template <typename P> - void change_target(Pseudo_Site& p, const typename P::target_t& new_target); + // Nota: This procedure is used in + // internal::site_set_iterator_base and + // site_relative_iterator_base. template <typename O, typename T> void change_target(Object<O>&, const T&); @@ -125,9 +124,10 @@ namespace mln template <> struct helper< /* is an Object */ true > { - + template <typename P> - void change_target(Pseudo_Site& p, const mln_target(P)& new_target) const + void change_target(Pseudo_Site& p, + const mln_target(P)& new_target) const { exact(p).change_target(new_target); } @@ -157,7 +157,8 @@ namespace mln void change_target(O& o, const D& d) { enum { is_object = mlc_is_a(O, Object)::value }; - mln::if_possible::internal::helper< is_object >().change_target(exact(o), d); + mln::if_possible::internal::helper< is_object >().change_target(exact(o), + d); } } // end of namespace mln::if_possible diff --git a/milena/mln/core/internal/site_set_iterator_base.hh b/milena/mln/core/internal/site_set_iterator_base.hh index 8109f0d..66c94d5 100644 --- a/milena/mln/core/internal/site_set_iterator_base.hh +++ b/milena/mln/core/internal/site_set_iterator_base.hh @@ -45,7 +45,8 @@ namespace mln /// Parameter \c S is the targeted site set type. /// /// IMPORTANT: Sub-classes have to define start_, next_, - /// is_valid_ and invalidate_. + /// is_valid_ and invalidate_. They may also define + /// change_target_. // template <typename S, typename E> class site_set_iterator_base : public site_iterator_base<S, E> @@ -64,6 +65,10 @@ namespace mln /// Change the site set targeted by this iterator. void change_target(const S& s); + /// Part of the change_target specific to the exact iterator + /// type, empty by default (to be overloaded). + void change_target_(const S& s); + protected: /// The psite designated by this iterator. @@ -100,12 +105,22 @@ namespace mln // p might be also updated since it can hold a pointer towards // the set it designates, so: if_possible::change_target(p_, s); + // Likewise, the iterator might need to update specific data. + exact(this)->change_target_(s); // Last: this->invalidate(); } template <typename S, typename E> inline + void + site_set_iterator_base<S, E>::change_target_(const S& /* s */) + { + // Empty by default. + } + + template <typename S, typename E> + inline const mln_psite(S)& site_set_iterator_base<S, E>::p_hook_() const { -- 1.6.3.1

14 years, 7 months

[PATCH 08/22] Work around std::vector<bool> specialization in mln::complex_image.

by Roland Levillain

* mln/core/image/complex_image.hh (mln::internal::bool_proxy): New class. (mln::internal::unbool<V>:): New trait class. (mlc_unbool): New (local) shortcut macro. (mln::internal::data< complex_image<D, G, V> >::values_): Change type from metal::vec< D + 1, std::vector<V> > to metal::vec< D + 1, std::vector< mlc_unbool(V) > >. (mln::complex_image<D, G, V>::lvalue) (mln::complex_image<D, G, V>::rvalue): Adjust typedefs. (mln::complex_image<D, G, V>::values() const): Adjust method. (data< complex_image<D, G, V> >::data): Adjust ctor. Simplify precondition. (complex_image<D, G, V>::complex_image(const p_complex<D, G>&)): Simplify. (init_(image_t, complex_image<D,G,V>&, const complex_image<D,G,W>&)): Depend on model's domain instead of its values to compute the number of n-faces. --- milena/ChangeLog | 25 +++++++++++ milena/mln/core/image/complex_image.hh | 73 +++++++++++++++++++++++++------- 2 files changed, 83 insertions(+), 15 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 43d281c..4215c0c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,28 @@ +2009-09-29 Roland Levillain <roland(a)lrde.epita.fr> + + Work around std::vector<bool> specialization in mln::complex_image. + + * mln/core/image/complex_image.hh + (mln::internal::bool_proxy): New class. + (mln::internal::unbool<V>:): New trait class. + (mlc_unbool): New (local) shortcut macro. + (mln::internal::data< complex_image<D, G, V> >::values_): + Change type from metal::vec< D + 1, std::vector<V> > + to metal::vec< D + 1, std::vector< mlc_unbool(V) > >. + (mln::complex_image<D, G, V>::lvalue) + (mln::complex_image<D, G, V>::rvalue): + Adjust typedefs. + (mln::complex_image<D, G, V>::values() const): + Adjust method. + (data< complex_image<D, G, V> >::data): + Adjust ctor. + Simplify precondition. + (complex_image<D, G, V>::complex_image(const p_complex<D, G>&)): + Simplify. + (init_(image_t, complex_image<D,G,V>&, const complex_image<D,G,W>&)): + Depend on model's domain instead of its values to compute the + number of n-faces. + 2009-09-28 Roland Levillain <roland(a)lrde.epita.fr> Miscellaneous corrections to complex_window_base. diff --git a/milena/mln/core/image/complex_image.hh b/milena/mln/core/image/complex_image.hh index 9f273a5..07c6e91 100644 --- a/milena/mln/core/image/complex_image.hh +++ b/milena/mln/core/image/complex_image.hh @@ -40,6 +40,45 @@ # include <mln/core/site_set/complex_psite.hh> # include <mln/value/set.hh> +// FIXME: Move this elsewhere. +// Working around std::vector<bool>'s (forced) specialization. + +# define mlc_unbool(V) \ + typename mln::internal::unbool<V>::ret + +namespace mln +{ + + namespace internal + { + + /// A boolean proxy, used to fool std::vector. + struct bool_proxy + { + public: + bool_proxy() {} + bool_proxy(bool b) : b_(b) {} + bool& operator=(bool b) { b_ = b; return *this; } + + operator bool&() { return b_; } + operator const bool&() const { return b_; } + + bool operator==(const bool_proxy& rhs) { return b_ == rhs.b_; } + bool operator< (const bool_proxy& rhs) { return b_ < rhs.b_; } + + private: + /// The value. + bool b_; + }; + + template <typename V> struct unbool { typedef V ret; }; + template <> struct unbool<bool> { typedef bool_proxy ret; }; + + } // end of namespace mln::internal + +} + + /* FIXME: In the current implementation, the type of values on faces of different dimensions is necessarily the same (V). We should @@ -62,7 +101,7 @@ namespace mln data(const p_complex<D, G>& pc, const metal::vec< D + 1, std::vector<V> >& values); - metal::vec< D + 1, std::vector<V> > values_; + metal::vec< D + 1, std::vector< mlc_unbool(V) > > values_; const p_complex<D, G> pc_; }; @@ -135,15 +174,10 @@ namespace mln typedef V value; /// Return type of read-write access. - /// - /// We use the associated type \c reference instead of a plain - /// reference on the value type (\p V), because it's the only way - /// to safely form a reference on the element in the case of a - /// std::vector<bool>. - typedef typename std::vector<V>::reference lvalue; + typedef V& lvalue; /// Return type of read-only access. - typedef typename std::vector<V>::const_reference rvalue; + typedef const V& rvalue; /// Skeleton. typedef complex_image< D, tag::psite_<G>, tag::value_<V> > skeleton; @@ -172,7 +206,7 @@ namespace mln const p_complex<D, G>& domain() const; /// Return the array of values associated to the faces. - const metal::vec<D + 1, std::vector<V> >& values() const; + const metal::vec<D + 1, std::vector< mlc_unbool(V) > >& values() const; /// \} }; @@ -197,7 +231,7 @@ namespace mln { metal::vec<D + 1, std::vector<V> > values; for (unsigned i = 0; i <= D; ++i) - values[i].resize(model.values()[i].size()); + values[i].resize(model.domain().nfaces_of_dim(i)); target.init_(model.domain(), values); } @@ -211,15 +245,23 @@ namespace mln inline data< complex_image<D, G, V> >::data(const p_complex<D, G>& pc, const metal::vec< D + 1, std::vector<V> >& values) - : values_(values), - pc_(pc) + : pc_(pc) { + // We cannot use the initialization list for values_ (it + // would not work when V = bool). + for (unsigned i = 0; i <= D; ++i) + { + values_[i].reserve(values[i].size()); + values_[i].insert(values_[i].begin(), + values[i].begin(), values[i].end()); + } + // Ensure the complex is consistent with the values. /* FIXME: We need additional macros in mln/core/contract.hh for big blocks of preconditions like this one. */ # ifndef NDEBUG for (unsigned i = 0; i < D; ++i) - mln_precondition(pc.cplx().nfaces_of_dim(i) == values[i].size()); + mln_precondition(pc.nfaces_of_dim(i) == values[i].size()); # endif // !NDEBUG } @@ -241,7 +283,7 @@ namespace mln { metal::vec<D + 1, std::vector<V> > values; for (unsigned i = 0; i <= D; ++i) - values[i].resize(pc.cplx().nfaces_of_dim(i)); + values[i].resize(pc.nfaces_of_dim(i)); init_(pc, values); } @@ -289,7 +331,7 @@ namespace mln template <unsigned D, typename G, typename V> inline - const metal::vec< D + 1, std::vector<V> >& + const metal::vec< D + 1, std::vector< mlc_unbool(V) > >& complex_image<D, G, V>::values() const { return this->data_->values_; @@ -308,5 +350,6 @@ namespace mln } // end of namespace mln +# undef mlc_unbool #endif // ! MLN_CORE_IMAGE_COMPLEX_IMAGE_HH -- 1.6.3.1

14 years, 7 months

[PATCH 07/22] Miscellaneous corrections to complex_window_base.

by Roland Levillain

* mln/core/internal/complex_window_base.hh: Add missing inline keywords. (complex_window_base<D, G, F, B, E>::geom): New typedef. (complex_window_base<D, G, F, B, E>::is_valid): Improve documentation. --- milena/ChangeLog | 10 ++++++++++ milena/mln/core/internal/complex_window_base.hh | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3daaaa6..43d281c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,13 @@ +2009-09-28 Roland Levillain <roland(a)lrde.epita.fr> + + Miscellaneous corrections to complex_window_base. + + * mln/core/internal/complex_window_base.hh: Add missing inline + keywords. + (complex_window_base<D, G, F, B, E>::geom): New typedef. + (complex_window_base<D, G, F, B, E>::is_valid): Improve + documentation. + 2009-09-25 Roland Levillain <roland(a)lrde.epita.fr> Add non-centered complex windows. diff --git a/milena/mln/core/internal/complex_window_base.hh b/milena/mln/core/internal/complex_window_base.hh index 559c9de..df08e6d 100644 --- a/milena/mln/core/internal/complex_window_base.hh +++ b/milena/mln/core/internal/complex_window_base.hh @@ -92,6 +92,8 @@ namespace mln public: /// Associated types. /// \{ + /// The geometry of the complex. + typedef G geom; /// The type of psite corresponding to the window. typedef complex_psite<D, G> psite; /// The type of site corresponding to the window. @@ -130,7 +132,7 @@ namespace mln /// Is this window centered? bool is_centered() const; - /// Return true by default. + /// Is this window valid ? (Return true by default.) bool is_valid() const; /// \} @@ -143,6 +145,7 @@ namespace mln # ifndef MLN_INCLUDE_ONLY template <unsigned D, typename G, typename F, typename B, typename E> + inline complex_window_base<D, G, F, B, E>::complex_window_base(bool is_centered) : is_centered_(is_centered) { @@ -150,6 +153,7 @@ namespace mln template <unsigned D, typename G, typename F, typename B, typename E> + inline bool complex_window_base<D, G, F, B, E>::is_empty() const { @@ -157,6 +161,7 @@ namespace mln } template <unsigned D, typename G, typename F, typename B, typename E> + inline bool complex_window_base<D, G, F, B, E>::is_centered() const { @@ -164,6 +169,7 @@ namespace mln } template <unsigned D, typename G, typename F, typename B, typename E> + inline bool complex_window_base<D, G, F, B, E>::is_valid() const { -- 1.6.3.1

14 years, 7 months

[PATCH 06/22] Add non-centered complex windows.

by Roland Levillain

* mln/core/image/complex_windows.hh (mln_gen_complex_window): New (generator) macro. (complex_lower_window) (complex_higher_window) (complex_lower_higher_window) (complex_lower_dim_connected_n_face_window) (complex_higher_dim_connected_n_face_window) (complex_m_face_window): New classes. --- milena/ChangeLog | 14 ++++++ milena/mln/core/image/complex_windows.hh | 69 ++++++++++++++++++++++++++++- 2 files changed, 80 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2da5700..3daaaa6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2009-09-25 Roland Levillain <roland(a)lrde.epita.fr> + Add non-centered complex windows. + + * mln/core/image/complex_windows.hh (mln_gen_complex_window): + New (generator) macro. + (complex_lower_window) + (complex_higher_window) + (complex_lower_higher_window) + (complex_lower_dim_connected_n_face_window) + (complex_higher_dim_connected_n_face_window) + (complex_m_face_window): + New classes. + +2009-09-25 Roland Levillain <roland(a)lrde.epita.fr> + Prepare the factoring of complex windows generators. * mln/core/image/complex_windows.hh diff --git a/milena/mln/core/image/complex_windows.hh b/milena/mln/core/image/complex_windows.hh index c2c21fb..b409282 100644 --- a/milena/mln/core/image/complex_windows.hh +++ b/milena/mln/core/image/complex_windows.hh @@ -29,11 +29,10 @@ /// \file /// \brief Definitions of some windows of complex images. +# include <mln/core/internal/complex_window_base.hh> # include <mln/core/internal/complex_window_p_base.hh> -# include <mln/topo/adj_lower_face_iter.hh> -# include <mln/topo/adj_higher_face_iter.hh> -# include <mln/topo/adj_lower_higher_face_iter.hh> +# include <mln/topo/complex_iterators.hh> /** \brief Generate a complex window class, as well as its traits, @@ -77,6 +76,28 @@ } +/** \brief Generate a (non-centered) complex window class, as well as + its traits. + + \param Win The name of the class to generate. + \param Fwd_Complex_Iter The underlying forward iterator type. + \param Bkd_Complex_Iter The underlying backward iterator type. + + The generated class inherits from + + mln::internal::complex_window_base< D, G, + Fwd_Complex_Iter<D>, + Bkd_Complex_Iter<D>, + Win <D, G> > + + where D and G are template parameters of the generated Win class. */ +# define mln_gen_complex_window(Win, Fwd_Complex_Iter, Bkd_Complex_Iter) \ + mln_gen_complex_window_with_base(Win, \ + Fwd_Complex_Iter, \ + Bkd_Complex_Iter, \ + mln::internal::complex_window_base) + + /** \brief Generate a centered complex window class, as well as its traits. \param Win The name of the class to generate. @@ -102,6 +123,47 @@ namespace mln { + /*-----------------------. + | Non-centered windows. | + `-----------------------*/ + + /// \brief Window centered on an n-face of complex returning its + /// adjacent (n-1)-faces. + mln_gen_complex_window(complex_lower_window, + topo::adj_lower_face_fwd_iter, + topo::adj_lower_face_bkd_iter); + + /// \brief Window centered on an n-face of complex returning its + /// adjacent (n+1)-faces. + mln_gen_complex_window(complex_higher_window, + topo::adj_higher_face_fwd_iter, + topo::adj_higher_face_bkd_iter); + + /// \brief Window centered on an n-face of complex returning its + /// adjacent (n-1)-faces and (n+1)-faces. + mln_gen_complex_window(complex_lower_higher_window, + topo::adj_lower_higher_face_fwd_iter, + topo::adj_lower_higher_face_bkd_iter); + + /// \brief Window centered on an n-face of complex returning the + /// n-faces sharing an (n-1)-face with the center n-face. + mln_gen_complex_window(complex_lower_dim_connected_n_face_window, + topo::adj_lower_dim_connected_n_face_fwd_iter, + topo::adj_lower_dim_connected_n_face_bkd_iter); + + /// \brief Window centered on an n-face of complex returning the + /// n-faces sharing an (n+1)-face with the center n-face. + mln_gen_complex_window(complex_higher_dim_connected_n_face_window, + topo::adj_higher_dim_connected_n_face_fwd_iter, + topo::adj_higher_dim_connected_n_face_bkd_iter); + + /// \brief Window centered on an n-face of complex returning + /// the m-faces transitively adjacent to this center n-face. + mln_gen_complex_window(complex_m_face_window, + topo::adj_m_face_fwd_iter, + topo::adj_m_face_bkd_iter); + + /*-------------------. | Centered windows. | `-------------------*/ @@ -149,6 +211,7 @@ namespace mln } // end of namespace mln # undef mln_gen_complex_window_p +# undef mln_gen_complex_window # undef mln_gen_complex_window_from_base #endif // ! MLN_CORE_IMAGE_COMPLEX_WINDOWS_HH -- 1.6.3.1

14 years, 7 months

[PATCH 05/22] Prepare the factoring of complex windows generators.

by Roland Levillain

* mln/core/image/complex_windows.hh (mln_gen_complex_window_with_base): New macro. Use it to factor... (mln_gen_complex_window_p): ...this macro. --- milena/ChangeLog | 9 +++++ milena/mln/core/image/complex_windows.hh | 51 +++++++++++++++++++++-------- 2 files changed, 46 insertions(+), 14 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5d91401..2da5700 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2009-09-25 Roland Levillain <roland(a)lrde.epita.fr> + Prepare the factoring of complex windows generators. + + * mln/core/image/complex_windows.hh + (mln_gen_complex_window_with_base): New macro. + Use it to factor... + (mln_gen_complex_window_p): ...this macro. + +2009-09-25 Roland Levillain <roland(a)lrde.epita.fr> + Rename mln::complex_m_face_window as mln::complex_m_face_window_p. * mln/core/image/complex_windows.hh: Here. diff --git a/milena/mln/core/image/complex_windows.hh b/milena/mln/core/image/complex_windows.hh index 30dcadc..c2c21fb 100644 --- a/milena/mln/core/image/complex_windows.hh +++ b/milena/mln/core/image/complex_windows.hh @@ -35,21 +35,21 @@ # include <mln/topo/adj_higher_face_iter.hh> # include <mln/topo/adj_lower_higher_face_iter.hh> -/** \brief Generate a centered complex window class, as well as its traits. + +/** \brief Generate a complex window class, as well as its traits, + using a given base class. \param Win The name of the class to generate. \param Fwd_Complex_Iter The underlying forward iterator type. \param Bkd_Complex_Iter The underlying backward iterator type. + \param Base The name of the base class, with no parameter. The generated class inherits from - mln:: internal::complex_window_p_base< D, G, - Fwd_Complex_Iter<D>, - Bkd_Complex_Iter<D>, - Win <D, G> > + Base < D, G, Fwd_Complex_Iter<D>, Bkd_Complex_Iter<D>, Win <D, G> > where D and G are template parameters of the generated Win class. */ -# define mln_gen_complex_window_p(Win, Fwd_Complex_Iter, Bkd_Complex_Iter) \ +# define mln_gen_complex_window_with_base(Win, Fwd_Complex_Iter, Bkd_Complex_Iter, Base) \ /* Forward declaration. */ \ template <unsigned D, typename G> struct Win; \ \ @@ -58,10 +58,10 @@ { \ template <unsigned D, typename G> \ struct window_< Win <D, G> > \ - : window_< mln::internal::complex_window_p_base< D, G, \ - Fwd_Complex_Iter<D>, \ - Bkd_Complex_Iter <D>, \ - Win <D, G> > > \ + : window_< Base < D, G, \ + Fwd_Complex_Iter<D>, \ + Bkd_Complex_Iter <D>, \ + Win <D, G> > > \ { \ }; \ } \ @@ -69,14 +69,36 @@ /* Definition. */ \ template <unsigned D, typename G> \ struct Win \ - : internal::complex_window_p_base< D, G, \ - Fwd_Complex_Iter <D>, \ - Bkd_Complex_Iter <D>, \ - Win <D, G> > \ + : Base < D, G, \ + Fwd_Complex_Iter <D>, \ + Bkd_Complex_Iter <D>, \ + Win <D, G> > \ { \ } +/** \brief Generate a centered complex window class, as well as its traits. + + \param Win The name of the class to generate. + \param Fwd_Complex_Iter The underlying forward iterator type. + \param Bkd_Complex_Iter The underlying backward iterator type. + + The generated class inherits from + + mln::internal::complex_window_p_base< D, G, + Fwd_Complex_Iter<D>, + Bkd_Complex_Iter<D>, + Win <D, G> > + + where D and G are template parameters of the generated Win class. */ +# define mln_gen_complex_window_p(Win, Fwd_Complex_Iter, Bkd_Complex_Iter) \ + mln_gen_complex_window_with_base(Win, \ + Fwd_Complex_Iter, \ + Bkd_Complex_Iter, \ + mln::internal::complex_window_p_base) + + + namespace mln { @@ -127,5 +149,6 @@ namespace mln } // end of namespace mln # undef mln_gen_complex_window_p +# undef mln_gen_complex_window_from_base #endif // ! MLN_CORE_IMAGE_COMPLEX_WINDOWS_HH -- 1.6.3.1

14 years, 7 months

← Newer
1
2
3
4
5
6
7
8
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches September 2009