September 2008 - Olena-patches

2362: Update elementary neighborhood on graph image.
by Roland Levillain 22 Sep '08

22 Sep '08

* mln/core/image/graph_elt_neighborhood.hh (mln::graph_elt_neighborhood::point) (mln::graph_elt_neighborhood::dpoint): Remove typedefs. (mln::graph_elt_neighborhood::psite) (mln::graph_elt_neighborhood::window): New typedefs. (mln::graph_elt_neighborhood::to_window): New method. (mln::graph_elt_neighborhood::compute_sites_): Catch up with the new interface of iterators on graph neighborhood. --- milena/ChangeLog | 17 +++++++++ milena/mln/core/image/graph_elt_neighborhood.hh | 42 +++++++++++++++++------ 2 files changed, 48 insertions(+), 11 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 65bbcef..f7932d2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,22 @@ 2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update elementary neighborhood on graph image. + + * mln/core/image/graph_elt_neighborhood.hh + (mln::graph_elt_neighborhood::point) + (mln::graph_elt_neighborhood::dpoint): + Remove typedefs. + (mln::graph_elt_neighborhood::psite) + (mln::graph_elt_neighborhood::window): + New typedefs. + (mln::graph_elt_neighborhood::to_window): + New method. + (mln::graph_elt_neighborhood::compute_sites_): + Catch up with the new interface of iterators on graph + neighborhood. + +2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update elementary window on graph image. * mln/core/image/graph_elt_window.hh diff --git a/milena/mln/core/image/graph_elt_neighborhood.hh b/milena/mln/core/image/graph_elt_neighborhood.hh index 6270801..df0420a 100644 --- a/milena/mln/core/image/graph_elt_neighborhood.hh +++ b/milena/mln/core/image/graph_elt_neighborhood.hh @@ -38,16 +38,22 @@ - mln::graph_elt_window - mln::graph_elt_neighborhood - mln::line_graph_elt_window - - mln::line_graph_elt_neighborhood. */ + - mln::line_graph_elt_neighborhood. + + See https://trac.lrde.org/olena/ticket/139. */ /* FIXME: Due to the poor interface of mln::p_line_graph and mln::util::graph, we show to much implementation details here. Enrich their interfaces to avoid that. */ +# include <set> + # include <mln/core/concept/neighborhood.hh> # include <mln/core/image/graph_psite.hh> # include <mln/core/image/graph_neighborhood_piter.hh> +# include <mln/core/image/graph_elt_window.hh> + namespace mln { @@ -56,7 +62,7 @@ namespace mln template <typename P, typename N> class graph_neighborhood_bkd_piter; - /// Elementary neighborhood on graph class. + /// \brief Elementary neighborhood on graph class. template <typename P> class graph_elt_neighborhood : public Neighborhood< graph_elt_neighborhood > @@ -66,17 +72,14 @@ namespace mln public: /// Associated types. /// \{ - /// The type of point corresponding to the neighborhood. - typedef P point; /// The type of psite corresponding to the neighborhood. typedef graph_psite psite; + /// The type of site corresponding to the neighborhood. + typedef mln_site(psite) site; // The type of the set of neighbors (vertex ids adjacent to the // reference psite). typedef std::set<util::vertex_id> sites_t; - // FIXME: This is a dummy value. - typedef void dpoint; - /// \brief Site_Iterator type to browse the psites of the /// neighborhood w.r.t. the ordering of vertices. typedef graph_neighborhood_fwd_piter<P, self_> fwd_niter; @@ -89,6 +92,14 @@ namespace mln typedef fwd_niter niter; /// \} + /// Conversions. + /// \{ + /// The window type corresponding to this neighborhood. + typedef graph_elt_window window; + /// Create a window corresponding to this neighborhood. + window to_window() const; + /// \} + /// Services for iterators. /// \{ /// Compute the set of sites for this neighborhood around \a piter. @@ -101,16 +112,25 @@ namespace mln # ifndef MLN_INCLUDE_ONLY template <typename P> + inline + graph_elt_window + graph_elt_neighborhood::to_window() const + { + return graph_elt_window(); + } + + template <typename P> template <typename Piter> inline void graph_elt_neighborhood::compute_sites_(Site_Iterator<Piter>& piter_) const { Piter& piter = exact(piter_); - util::vertex_id ref_vertex_id = piter.p_ref().id(); - const util::vertex& ref_vertex = piter.pg().gr_->vertex(ref_vertex_id); + util::vertex_id ref_vertex_id = piter.center().vertex_id(); sites_t& sites = piter.sites(); sites.clear(); + const util::vertex& ref_vertex = + piter.center().site_set().gr_->vertex(ref_vertex_id); /* FIXME: Move this computation out of the neighborhood. In fact, this should be a service of the graph, also proposed by the p_line_graph. */ @@ -119,12 +139,12 @@ namespace mln ref_vertex.edges.begin(); e != ref_vertex.edges.end(); ++e) { - util::vertex_id v1 = piter.pg().gr_->edges()[*e]->v1(); + util::vertex_id v1 = piter.center().site_set().gr_->edges()[*e]->v1(); // We explicitly enforce that the reference piter vertex id is // *not* inserted into SITES. if (v1 != ref_vertex_id) sites.insert(v1); - util::vertex_id v2 = piter.pg().gr_->edges()[*e]->v2(); + util::vertex_id v2 = piter.center().site_set().gr_->edges()[*e]->v2(); // Likewise. if (v2 != ref_vertex_id) sites.insert(v2); -- 1.5.6.5

1 0

2361: Update elementary window on graph image.
by Roland Levillain 22 Sep '08

22 Sep '08

* mln/core/image/graph_elt_window.hh (mln::graph_elt_window::point): Remove typedef. (mln::graph_elt_window::psite): New typedef. (mln::graph_elt_window::dpoint): Turn typedef into... (mln::graph_elt_window::dpsite): ...this. (mln::graph_elt_window::compute_sites_): Catch up with the new interface of iterators on graph window. --- milena/ChangeLog | 12 ++++++++++++ milena/mln/core/image/graph_elt_window.hh | 19 +++++++++++-------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a2e7ce6..65bbcef 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update elementary window on graph image. + + * mln/core/image/graph_elt_window.hh + (mln::graph_elt_window::point): Remove typedef. + (mln::graph_elt_window::psite): New typedef. + (mln::graph_elt_window::dpoint): Turn typedef into... + (mln::graph_elt_window::dpsite): ...this. + (mln::graph_elt_window::compute_sites_): + Catch up with the new interface of iterators on graph window. + +2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update graph neighborhood piters. * mln/core/image/graph_neighborhood_piter.hh diff --git a/milena/mln/core/image/graph_elt_window.hh b/milena/mln/core/image/graph_elt_window.hh index 9e936bd..c679afd 100644 --- a/milena/mln/core/image/graph_elt_window.hh +++ b/milena/mln/core/image/graph_elt_window.hh @@ -38,7 +38,9 @@ - mln::graph_elt_window - mln::graph_elt_neighborhood - mln::line_graph_elt_window - - mln::line_graph_elt_neighborhood. */ + - mln::line_graph_elt_neighborhood. + + See https://trac.lrde.org/olena/ticket/139. */ /* FIXME: Due to the poor interface of mln::p_line_graph and mln::util::graph, we show to much implementation details here. @@ -65,16 +67,16 @@ namespace mln public: /// Associated types. /// \{ - /// The type of point corresponding to the window. - typedef P point; /// The type of psite corresponding to the window. typedef graph_psite psite; + /// The type of site corresponding to the window. + typedef mln_site(psite) site; // The type of the set of window sites (vertex ids adjacent to the // reference psite). typedef std::set<util::vertex_id> sites_t; // FIXME: This is a dummy value. - typedef void dpoint; + typedef void dpsite; /// \brief Site_Iterator type to browse the psites of the window /// w.r.t. the ordering of vertices. @@ -132,10 +134,11 @@ namespace mln graph_elt_window::compute_sites_(Site_Iterator<Piter>& piter_) const { Piter& piter = exact(piter_); - util::vertex_id ref_vertex_id = piter.p_ref().id(); - const util::vertex& ref_vertex = piter.pg().gr_->vertex(ref_vertex_id); + util::vertex_id ref_vertex_id = piter.center().vertex_id(); sites_t& sites = piter.sites(); sites.clear(); + const util::vertex& ref_vertex = + piter.center().site_set().gr_->vertex(ref_vertex_id); /* FIXME: Move this computation out of the window. In fact, this should be a service of the graph, also proposed by the p_line_graph. */ @@ -149,9 +152,9 @@ namespace mln ref_vertex.edges.begin(); e != ref_vertex.edges.end(); ++e) { - util::vertex_id v1 = piter.pg().gr_->edges()[*e]->v1(); + util::vertex_id v1 = piter.center().site_set().gr_->edges()[*e]->v1(); sites.insert(v1); - util::vertex_id v2 = piter.pg().gr_->edges()[*e]->v2(); + util::vertex_id v2 = piter.center().site_set().gr_->edges()[*e]->v2(); sites.insert(v2); } } -- 1.5.6.5

1 0

2360: Update graph neighborhood piters.
by Roland Levillain 22 Sep '08

22 Sep '08

* mln/core/image/graph_neighborhood_piter.hh (mln::graph_neighborhood_fwd_piter<P, N>) (mln::graph_neighborhood_bkd_piter<P, N>): Adjust to the new interface of internal::graph_vicinity_piter_. (mln::graph_neighborhood_fwd_piter<P, N>::super_) (mln::graph_neighborhood_bkd_piter<P, N>::super_): Adjust. (mln::graph_neighborhood_fwd_piter<P, N>::psite) (mln::graph_neighborhood_bkd_piter<P, N>::psite): New typedefs. (mln::graph_neighborhood_fwd_piter<P, N>::graph_neighborhood_fwd_piter) (mln::graph_neighborhood_bkd_piter<P, N>::graph_neighborhood_bkd_piter): New default ctors. (graph_neighborhood_fwd_piter(const Neighborhood<N>&, const Point_Site<Pref>&)) (graph_neighborhood_bkd_piter(const Neighborhood<N>&, const Point_Site<Pref>&)): Turn ctors into... (graph_neighborhood_fwd_piter(const Neighborhood<N>&, const Pref&)) (graph_neighborhood_bkd_piter(const Neighborhood<N>&, const Pref&)): ...these. Adjust. (mln::graph_neighborhood_fwd_piter<P, N>::is_valid) (mln::graph_neighborhood_fwd_piter<P, N>::invalidate) (mln::graph_neighborhood_fwd_piter<P, N>::start) (mln::graph_neighborhood_fwd_piter<P, N>::next_) (mln::graph_neighborhood_bkd_piter<P, N>::is_valid) (mln::graph_neighborhood_bkd_piter<P, N>::invalidate) (mln::graph_neighborhood_bkd_piter<P, N>::start) (mln::graph_neighborhood_bkd_piter<P, N>::next_): Catch up with the new interface of internal::graph_vicinity_piter_. Rename as... (mln::graph_neighborhood_fwd_piter<P, N>::is_valid_) (mln::graph_neighborhood_fwd_piter<P, N>::invalidate_) (mln::graph_neighborhood_fwd_piter<P, N>::do_start_) (mln::graph_neighborhood_fwd_piter<P, N>::do_next_) (mln::graph_neighborhood_bkd_piter<P, N>::is_valid_) (mln::graph_neighborhood_bkd_piter<P, N>::invalidate_) (mln::graph_neighborhood_bkd_piter<P, N>::do_start_) (mln::graph_neighborhood_bkd_piter<P, N>::do_next_): ...these. (mln::graph_neighborhood_fwd_piter<P, N>::compute_sites_) (mln::graph_neighborhood_bkd_piter<P, N>::compute_sites_): New methods. (mln::graph_neighborhood_fwd_piter<P, N>::nbh_) (mln::graph_neighborhood_bkd_piter<P, N>::nbh_): Remove attributes. --- milena/ChangeLog | 51 +++++++ milena/mln/core/image/graph_neighborhood_piter.hh | 166 +++++++++------------ 2 files changed, 119 insertions(+), 98 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5ef0f52..a2e7ce6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,56 @@ 2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update graph neighborhood piters. + + * mln/core/image/graph_neighborhood_piter.hh + (mln::graph_neighborhood_fwd_piter<P, N>) + (mln::graph_neighborhood_bkd_piter<P, N>): + Adjust to the new interface of internal::graph_vicinity_piter_. + (mln::graph_neighborhood_fwd_piter<P, N>::super_) + (mln::graph_neighborhood_bkd_piter<P, N>::super_): + Adjust. + (mln::graph_neighborhood_fwd_piter<P, N>::psite) + (mln::graph_neighborhood_bkd_piter<P, N>::psite): + New typedefs. + (mln::graph_neighborhood_fwd_piter<P, N>::graph_neighborhood_fwd_piter) + (mln::graph_neighborhood_bkd_piter<P, N>::graph_neighborhood_bkd_piter): + New default ctors. + (graph_neighborhood_fwd_piter(const Neighborhood<N>&, const Point_Site<Pref>&)) + (graph_neighborhood_bkd_piter(const Neighborhood<N>&, const Point_Site<Pref>&)): + Turn ctors into... + (graph_neighborhood_fwd_piter(const Neighborhood<N>&, const Pref&)) + (graph_neighborhood_bkd_piter(const Neighborhood<N>&, const Pref&)): + ...these. + Adjust. + (mln::graph_neighborhood_fwd_piter<P, N>::is_valid) + (mln::graph_neighborhood_fwd_piter<P, N>::invalidate) + (mln::graph_neighborhood_fwd_piter<P, N>::start) + (mln::graph_neighborhood_fwd_piter<P, N>::next_) + (mln::graph_neighborhood_bkd_piter<P, N>::is_valid) + (mln::graph_neighborhood_bkd_piter<P, N>::invalidate) + (mln::graph_neighborhood_bkd_piter<P, N>::start) + (mln::graph_neighborhood_bkd_piter<P, N>::next_): + Catch up with the new interface of + internal::graph_vicinity_piter_. + Rename as... + (mln::graph_neighborhood_fwd_piter<P, N>::is_valid_) + (mln::graph_neighborhood_fwd_piter<P, N>::invalidate_) + (mln::graph_neighborhood_fwd_piter<P, N>::do_start_) + (mln::graph_neighborhood_fwd_piter<P, N>::do_next_) + (mln::graph_neighborhood_bkd_piter<P, N>::is_valid_) + (mln::graph_neighborhood_bkd_piter<P, N>::invalidate_) + (mln::graph_neighborhood_bkd_piter<P, N>::do_start_) + (mln::graph_neighborhood_bkd_piter<P, N>::do_next_): + ...these. + (mln::graph_neighborhood_fwd_piter<P, N>::compute_sites_) + (mln::graph_neighborhood_bkd_piter<P, N>::compute_sites_): + New methods. + (mln::graph_neighborhood_fwd_piter<P, N>::nbh_) + (mln::graph_neighborhood_bkd_piter<P, N>::nbh_): + Remove attributes. + +2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update graph window piters. * mln/core/image/graph_window_piter.hh diff --git a/milena/mln/core/image/graph_neighborhood_piter.hh b/milena/mln/core/image/graph_neighborhood_piter.hh index b83099a..a39128f 100644 --- a/milena/mln/core/image/graph_neighborhood_piter.hh +++ b/milena/mln/core/image/graph_neighborhood_piter.hh @@ -46,39 +46,42 @@ namespace mln template <typename P, typename N> class graph_neighborhood_fwd_piter : - public internal::graph_vicinity_piter_< P, + public internal::graph_vicinity_piter_< P, N, graph_neighborhood_fwd_piter<P, N> > { typedef graph_neighborhood_fwd_piter<P, N> self_; - typedef internal::graph_vicinity_piter_<P, self_> super_; + typedef internal::graph_vicinity_piter_<P, N, self_> super_; + + public: + /// The Point_Site type. + typedef mln_psite(N) psite; public: /// Construction. /// \{ + graph_neighborhood_fwd_piter(); template <typename Pref> graph_neighborhood_fwd_piter(const Neighborhood<N>& nbh, - const Point_Site<Pref>& p_ref); + const Pref& p_ref); /// \} /// Manipulation. /// \{ /// Test if the iterator is valid. - bool is_valid() const; + bool is_valid_() const; /// Invalidate the iterator. - void invalidate(); - /// Start an iteration. - void start(); + void invalidate_(); + /// Start an iteration. + void do_start_(); /// Go to the next point. - void next_(); - /// Update the internal data of the iterator. - void update_(); + void do_next_(); + + /// Compute the current psite. + psite compute_p_() const; /// \} private: - /// The neighborhood. - const N& nbh_; - /// An iterator on the set of adjacent edges. typename super_::sites_t::const_iterator i_; }; @@ -90,39 +93,41 @@ namespace mln template <typename P, typename N> class graph_neighborhood_bkd_piter : - public internal::graph_vicinity_piter_< P, + public internal::graph_vicinity_piter_< P, N, graph_neighborhood_bkd_piter<P, N> > { typedef graph_neighborhood_bkd_piter<P, N> self_; - typedef internal::graph_vicinity_piter_<P, self_> super_; + typedef internal::graph_vicinity_piter_<P, N, self_> super_; + + /// The Point_Site type. + typedef mln_psite(N) psite; public: /// Construction. /// \{ + graph_neighborhood_bkd_piter(); template <typename Pref> graph_neighborhood_bkd_piter(const Neighborhood<N>& nbh, - const Point_Site<Pref>& p_ref); + const Pref& p_ref); /// \} /// Manipulation. /// \{ /// Test if the iterator is valid. - bool is_valid() const; + bool is_valid_() const; /// Invalidate the iterator. - void invalidate(); - /// Start an iteration. - void start(); + void invalidate_(); + /// Start an iteration. + void do_start_(); /// Go to the next point. - void next_(); - /// Update the internal data of the iterator. - void update_(); + void do_next_(); + + /// Compute the current psite. + psite compute_p_() const; /// \} private: - /// The neighborhood. - const N& nbh_; - /// An iterator on the set of adjacent edges. typename super_::sites_t::const_reverse_iterator i_; }; @@ -136,36 +141,33 @@ namespace mln `-------------------------------------*/ template <typename P, typename N> + inline + graph_neighborhood_fwd_piter<P, N>::graph_neighborhood_fwd_piter() + { + } + + template <typename P, typename N> template <typename Pref> inline graph_neighborhood_fwd_piter<P, N>::graph_neighborhood_fwd_piter(const Neighborhood<N>& nbh, - const Point_Site<Pref>& p_ref) - : super_(p_ref), - nbh_(exact(nbh)) + const Pref& p_ref) + : super_(p_ref) { - // Invalidate i_. - invalidate(); + this->change_target(exact(nbh)); } template <typename P, typename N> inline bool - graph_neighborhood_fwd_piter<P, N>::is_valid() const + graph_neighborhood_fwd_piter<P, N>::is_valid_() const { - return - // The reference point must be valid... - this->p_ref_.is_valid() - // ...and must not have changed since the neighborhood has been - // computed... - && this->p_ref_ == this->saved_p_ref_ - // ...and the iterator i_ must point a valid value. - && i_ != this->sites_.end(); + return i_ != this->sites_.end(); } template <typename P, typename N> inline void - graph_neighborhood_fwd_piter<P, N>::invalidate() + graph_neighborhood_fwd_piter<P, N>::invalidate_() { i_ = this->sites_.end(); } @@ -173,41 +175,26 @@ namespace mln template <typename P, typename N> inline void - graph_neighborhood_fwd_piter<P, N>::start() + graph_neighborhood_fwd_piter<P, N>::do_start_() { - mln_precondition(this->p_ref_.is_valid()); - // Update the neighbors, if needed. - if (!this->saved_p_ref_.is_valid() || this->p_ref_ != this->saved_p_ref_) - { - this->saved_p_ref_ = this->p_ref_; - nbh_.compute_sites_(*this); - } + this->site_set().compute_sites_(*this); i_ = this->sites_.begin(); - // FIXME: We might move the is_valid condition within update_. - if (is_valid()) - update_(); } template <typename P, typename N> inline void - graph_neighborhood_fwd_piter<P, N>::next_() + graph_neighborhood_fwd_piter<P, N>::do_next_() { - // Ensure the p_ref_ has not changed. - mln_precondition(this->p_ref_ == this->saved_p_ref_); ++i_; - // FIXME: We might move the is_valid condition within update_. - if (is_valid()) - update_(); } template <typename P, typename N> inline - void - graph_neighborhood_fwd_piter<P, N>::update_() + mln_psite(N) + graph_neighborhood_fwd_piter<P, N>::compute_p_() const { - // Update psite_. - this->psite_ = graph_psite(this->pg(), *i_); + return graph_psite(this->center().site_set(), *i_); } @@ -216,36 +203,33 @@ namespace mln `-------------------------------------*/ template <typename P, typename N> + inline + graph_neighborhood_bkd_piter<P, N>::graph_neighborhood_bkd_piter() + { + } + + template <typename P, typename N> template <typename Pref> inline graph_neighborhood_bkd_piter<P, N>::graph_neighborhood_bkd_piter(const Neighborhood<N>& nbh, - const Point_Site<Pref>& p_ref) - : super_(p_ref), - nbh_(exact(nbh)) + const Pref& p_ref) + : super_(p_ref) { - // Invalidate i_. - invalidate(); + this->change_target(exact(nbh)); } template <typename P, typename N> inline bool - graph_neighborhood_bkd_piter<P, N>::is_valid() const + graph_neighborhood_bkd_piter<P, N>::is_valid_() const { - return - // The reference point must be valid... - this->p_ref_.is_valid() - // ...and must not have changed since the neighborhood has been - // computed... - && this->p_ref_ == this->saved_p_ref_ - // ...and the iterator i_ must point a valid value. - && i_ != this->sites_.rend(); + return i_ != this->sites_.rend(); } template <typename P, typename N> inline void - graph_neighborhood_bkd_piter<P, N>::invalidate() + graph_neighborhood_bkd_piter<P, N>::invalidate_() { i_ = this->sites_.rend(); } @@ -253,43 +237,29 @@ namespace mln template <typename P, typename N> inline void - graph_neighborhood_bkd_piter<P, N>::start() + graph_neighborhood_bkd_piter<P, N>::do_start_() { - mln_precondition(this->p_ref_.is_valid()); - // Update the neighbors, if needed. - if (!this->saved_p_ref_.is_valid() || this->p_ref_ != this->saved_p_ref_) - { - this->saved_p_ref_ = this->p_ref_; - nbh_.compute_sites_(*this); - } + this->site_set().compute_sites_(*this); i_ = this->sites_.rbegin(); - // FIXME: We might move the is_valid condition within update_. - if (is_valid()) - update_(); } template <typename P, typename N> inline void - graph_neighborhood_bkd_piter<P, N>::next_() + graph_neighborhood_bkd_piter<P, N>::do_next_() { - // Ensure the p_ref_ has not changed. - mln_precondition(this->p_ref_ == this->saved_p_ref_); ++i_; - // FIXME: We might move the is_valid condition within update_. - if (is_valid()) - update_(); } template <typename P, typename N> inline - void - graph_neighborhood_bkd_piter<P, N>::update_() + mln_psite(N) + graph_neighborhood_bkd_piter<P, N>::compute_p_() const { - // Update psite_. - this->psite_ = graph_psite(this->pg(), *i_); + return graph_psite(this->center().site_set(), *i_); } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln -- 1.5.6.5

1 0

2359: Update graph window piters.
by Roland Levillain 22 Sep '08

22 Sep '08

* mln/core/image/graph_window_piter.hh (mln::graph_window_fwd_piter<P, W>) (mln::graph_window_bkd_piter<P, W>): Adjust to the new interface of internal::graph_vicinity_piter_. (mln::graph_window_fwd_piter<P, W>::super_) (mln::graph_window_bkd_piter<P, W>::super_): Adjust. (mln::graph_window_fwd_piter<P, W>::psite) (mln::graph_window_bkd_piter<P, W>::psite): New typedefs. (mln::graph_window_fwd_piter<P, W>::graph_window_fwd_piter) (mln::graph_window_bkd_piter<P, W>::graph_window_bkd_piter): New default ctors. (graph_window_fwd_piter(const Window<W>&, const Point_Site<Pref>&)) (graph_window_bkd_piter(const Window<W>&, const Point_Site<Pref>&)): Turn ctors into... (graph_window_fwd_piter(const Window<W>&, const Pref&)) (graph_window_bkd_piter(const Window<W>&, const Pref&)): ...these. Adjust. (mln::graph_window_fwd_piter<P, W>::is_valid) (mln::graph_window_fwd_piter<P, W>::invalidate) (mln::graph_window_fwd_piter<P, W>::start) (mln::graph_window_fwd_piter<P, W>::next_) (mln::graph_window_bkd_piter<P, W>::is_valid) (mln::graph_window_bkd_piter<P, W>::invalidate) (mln::graph_window_bkd_piter<P, W>::start) (mln::graph_window_bkd_piter<P, W>::next_): Catch up with the new interface of internal::graph_vicinity_piter_. Rename as... (mln::graph_window_fwd_piter<P, W>::is_valid_) (mln::graph_window_fwd_piter<P, W>::invalidate_) (mln::graph_window_fwd_piter<P, W>::do_start_) (mln::graph_window_fwd_piter<P, W>::do_next_) (mln::graph_window_bkd_piter<P, W>::is_valid_) (mln::graph_window_bkd_piter<P, W>::invalidate_) (mln::graph_window_bkd_piter<P, W>::do_start_) (mln::graph_window_bkd_piter<P, W>::do_next_): ...these. (mln::graph_window_fwd_piter<P, W>::compute_sites_) (mln::graph_window_bkd_piter<P, W>::compute_sites_): New methods. (mln::graph_window_fwd_piter<P, W>::win_) (mln::graph_window_bkd_piter<P, W>::win_): Remove attributes. --- milena/ChangeLog | 51 ++++++++ milena/mln/core/image/graph_window_piter.hh | 164 +++++++++++---------------- 2 files changed, 119 insertions(+), 96 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e450700..5ef0f52 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,56 @@ 2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update graph window piters. + + * mln/core/image/graph_window_piter.hh + (mln::graph_window_fwd_piter<P, W>) + (mln::graph_window_bkd_piter<P, W>): + Adjust to the new interface of internal::graph_vicinity_piter_. + (mln::graph_window_fwd_piter<P, W>::super_) + (mln::graph_window_bkd_piter<P, W>::super_): + Adjust. + (mln::graph_window_fwd_piter<P, W>::psite) + (mln::graph_window_bkd_piter<P, W>::psite): + New typedefs. + (mln::graph_window_fwd_piter<P, W>::graph_window_fwd_piter) + (mln::graph_window_bkd_piter<P, W>::graph_window_bkd_piter): + New default ctors. + (graph_window_fwd_piter(const Window<W>&, const Point_Site<Pref>&)) + (graph_window_bkd_piter(const Window<W>&, const Point_Site<Pref>&)): + Turn ctors into... + (graph_window_fwd_piter(const Window<W>&, const Pref&)) + (graph_window_bkd_piter(const Window<W>&, const Pref&)): + ...these. + Adjust. + (mln::graph_window_fwd_piter<P, W>::is_valid) + (mln::graph_window_fwd_piter<P, W>::invalidate) + (mln::graph_window_fwd_piter<P, W>::start) + (mln::graph_window_fwd_piter<P, W>::next_) + (mln::graph_window_bkd_piter<P, W>::is_valid) + (mln::graph_window_bkd_piter<P, W>::invalidate) + (mln::graph_window_bkd_piter<P, W>::start) + (mln::graph_window_bkd_piter<P, W>::next_): + Catch up with the new interface of + internal::graph_vicinity_piter_. + Rename as... + (mln::graph_window_fwd_piter<P, W>::is_valid_) + (mln::graph_window_fwd_piter<P, W>::invalidate_) + (mln::graph_window_fwd_piter<P, W>::do_start_) + (mln::graph_window_fwd_piter<P, W>::do_next_) + (mln::graph_window_bkd_piter<P, W>::is_valid_) + (mln::graph_window_bkd_piter<P, W>::invalidate_) + (mln::graph_window_bkd_piter<P, W>::do_start_) + (mln::graph_window_bkd_piter<P, W>::do_next_): + ...these. + (mln::graph_window_fwd_piter<P, W>::compute_sites_) + (mln::graph_window_bkd_piter<P, W>::compute_sites_): + New methods. + (mln::graph_window_fwd_piter<P, W>::win_) + (mln::graph_window_bkd_piter<P, W>::win_): + Remove attributes. + +2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update relative iterators on graph image vicinity. * mln/core/internal/graph_vicinity_piter.hh diff --git a/milena/mln/core/image/graph_window_piter.hh b/milena/mln/core/image/graph_window_piter.hh index e38484a..d9191ee 100644 --- a/milena/mln/core/image/graph_window_piter.hh +++ b/milena/mln/core/image/graph_window_piter.hh @@ -47,37 +47,40 @@ namespace mln /// \brief Forward iterator on graph window. template <typename P, typename W> class graph_window_fwd_piter : - public internal::graph_vicinity_piter_< P, graph_window_fwd_piter<P, W> > + public internal::graph_vicinity_piter_< P, W, graph_window_fwd_piter<P, W> > { typedef graph_window_fwd_piter<P, W> self_; - typedef internal::graph_vicinity_piter_<P, self_> super_; + typedef internal::graph_vicinity_piter_<P, W, self_> super_; + + public: + /// The Point_Site type. + typedef mln_psite(W) psite; public: /// Construction. /// \{ + graph_window_fwd_piter(); template <typename Pref> - graph_window_fwd_piter(const Window<W>& win, const Point_Site<Pref>& p_ref); + graph_window_fwd_piter(const Window<W>& win, const Pref& p_ref); /// \} /// Manipulation. /// \{ /// Test if the iterator is valid. - bool is_valid() const; + bool is_valid_() const; /// Invalidate the iterator. - void invalidate(); - /// Start an iteration. - void start(); + void invalidate_(); + /// Start an iteration. + void do_start_(); /// Go to the next point. - void next_(); - /// Update the internal data of the iterator. - void update_(); + void do_next_(); + + /// Compute the current psite. + psite compute_p_() const; /// \} private: - /// The window. - const W& win_; - /// An iterator on the set of adjacent vertices. typename super_::sites_t::const_iterator i_; }; @@ -90,37 +93,40 @@ namespace mln /// \brief Backward iterator on graph window. template <typename P, typename W> class graph_window_bkd_piter : - public internal::graph_vicinity_piter_< P, graph_window_bkd_piter<P, W> > + public internal::graph_vicinity_piter_< P, W, graph_window_bkd_piter<P, W> > { typedef graph_window_bkd_piter<P, W> self_; - typedef internal::graph_vicinity_piter_<P, self_> super_; + typedef internal::graph_vicinity_piter_<P, W, self_> super_; + + public: + /// The Point_Site type. + typedef mln_psite(W) psite; public: /// Construction. /// \{ + graph_window_bkd_piter(); template <typename Pref> - graph_window_bkd_piter(const Window<W>& win, const Point_Site<Pref>& p_ref); + graph_window_bkd_piter(const Window<W>& win, const Pref& p_ref); /// \} /// Manipulation. /// \{ /// Test if the iterator is valid. - bool is_valid() const; + bool is_valid_() const; /// Invalidate the iterator. - void invalidate(); - /// Start an iteration. - void start(); + void invalidate_(); + /// Start an iteration. + void do_start_(); /// Go to the next point. - void next_(); - /// Update the internal data of the iterator. - void update_(); + void do_next_(); + + /// Compute the current psite. + psite compute_p_() const; /// \} private: - /// The window. - const W& win_; - /// An iterator on the set of adjacent vertices. typename super_::sites_t::const_reverse_iterator i_; }; @@ -134,35 +140,33 @@ namespace mln `-------------------------------*/ template <typename P, typename W> + inline + graph_window_fwd_piter<P, W>::graph_window_fwd_piter() + { + } + + template <typename P, typename W> template <typename Pref> inline graph_window_fwd_piter<P, W>::graph_window_fwd_piter(const Window<W>& win, - const Point_Site<Pref>& p_ref) - : super_(p_ref), - win_(exact(win)) + const Pref& p_ref) + : super_(p_ref) { - // Invalidate i_. - invalidate(); + this->change_target(exact(win)); } template <typename P, typename W> inline bool - graph_window_fwd_piter<P, W>::is_valid() const + graph_window_fwd_piter<P, W>::is_valid_() const { - return - // The reference point must be valid... - this->p_ref_.is_valid() - // ...and must not have changed since the window has been computed... - && this->p_ref_ == this->saved_p_ref_ - // ...and the iterator i_ must point a valid value. - && i_ != this->sites_.end(); + return i_ != this->sites_.end(); } template <typename P, typename W> inline void - graph_window_fwd_piter<P, W>::invalidate() + graph_window_fwd_piter<P, W>::invalidate_() { i_ = this->sites_.end(); } @@ -170,41 +174,26 @@ namespace mln template <typename P, typename W> inline void - graph_window_fwd_piter<P, W>::start() + graph_window_fwd_piter<P, W>::do_start_() { - mln_precondition(this->p_ref_.is_valid()); - // Update the sites, if needed. - if (!this->saved_p_ref_.is_valid() || this->p_ref_ != this->saved_p_ref_) - { - this->saved_p_ref_ = this->p_ref_; - win_.compute_sites_(*this); - } + this->site_set().compute_sites_(*this); i_ = this->sites_.begin(); - // FIXME: We might move the is_valid condition within update_. - if (is_valid()) - update_(); } template <typename P, typename W> inline void - graph_window_fwd_piter<P, W>::next_() + graph_window_fwd_piter<P, W>::do_next_() { - // Ensure the p_ref_ has not changed. - mln_precondition(this->p_ref_ == this->saved_p_ref_); ++i_; - // FIXME: We might move the is_valid condition within update_. - if (is_valid()) - update_(); } template <typename P, typename W> inline - void - graph_window_fwd_piter<P, W>::update_() + mln_psite(W) + graph_window_fwd_piter<P, W>::compute_p_() const { - // Update psite_. - this->psite_ = graph_psite(this->pg(), *i_); + return graph_psite(this->center().site_set(), *i_); } @@ -213,35 +202,33 @@ namespace mln `-------------------------------*/ template <typename P, typename W> + inline + graph_window_bkd_piter<P, W>::graph_window_bkd_piter() + { + } + + template <typename P, typename W> template <typename Pref> inline graph_window_bkd_piter<P, W>::graph_window_bkd_piter(const Window<W>& win, - const Point_Site<Pref>& p_ref) - : super_(p_ref), - win_(exact(win)) + const Pref& p_ref) + : super_(p_ref) { - // Invalidate i_. - invalidate(); + this->change_target(exact(win)); } template <typename P, typename W> inline bool - graph_window_bkd_piter<P, W>::is_valid() const + graph_window_bkd_piter<P, W>::is_valid_() const { - return - // The reference point must be valid... - this->p_ref_.is_valid() - // ...and must not have changed since the window has been computed... - && this->p_ref_ == this->saved_p_ref_ - // ...and the iterator i_ must point a valid value. - && i_ != this->sites_.rend(); + return i_ != this->sites_.rend(); } template <typename P, typename W> inline void - graph_window_bkd_piter<P, W>::invalidate() + graph_window_bkd_piter<P, W>::invalidate_() { i_ = this->sites_.rend(); } @@ -249,41 +236,26 @@ namespace mln template <typename P, typename W> inline void - graph_window_bkd_piter<P, W>::start() + graph_window_bkd_piter<P, W>::do_start_() { - mln_precondition(this->p_ref_.is_valid()); - // Update the sites, if needed. - if (!this->saved_p_ref_.is_valid() || this->p_ref_ != this->saved_p_ref_) - { - this->saved_p_ref_ = this->p_ref_; - win_.compute_sites_(*this); - } + this->site_set().compute_sites_(*this); i_ = this->sites_.rbegin(); - // FIXME: We might move the is_valid condition within update_. - if (is_valid()) - update_(); } template <typename P, typename W> inline void - graph_window_bkd_piter<P, W>::next_() + graph_window_bkd_piter<P, W>::do_next_() { - // Ensure the p_ref_ has not changed. - mln_precondition(this->p_ref_ == this->saved_p_ref_); ++i_; - // FIXME: We might move the is_valid condition within update_. - if (is_valid()) - update_(); } template <typename P, typename W> inline - void - graph_window_bkd_piter<P, W>::update_() + mln_psite(W) + graph_window_bkd_piter<P, W>::compute_p_() const { - // Update psite_. - this->psite_ = graph_psite(this->pg(), *i_); + return graph_psite(this->center().site_set(), *i_); } # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5

1 0

2358: Update relative iterators on graph image vicinity.
by Roland Levillain 22 Sep '08

22 Sep '08

* mln/core/internal/graph_vicinity_piter.hh (mln::internal::graph_vicinity_piter_<P, S, E>): Take and additional parameter S. Inherit from internal::site_relative_iterator_base. Adjust. (graph_vicinity_piter_<P, S, E>::graph_vicinity_piter_): New default ctor. Adjust other ctor. (mln::internal::graph_vicinity_piter_<P, S, E>::self_) (mln::internal::graph_vicinity_piter_<P, S, E>::super_) (mln::internal::graph_vicinity_piter_<P, S, E>::psite) (mln::internal::graph_vicinity_piter_<P, S, E>::point) (mln::internal::graph_vicinity_piter_<P, S, E>::coord): Remove typedefs. (mln::internal::graph_vicinity_piter_<P, S, E>::to_point) (mln::internal::graph_vicinity_piter_<P, S, E>::to_psite) (mln::internal::graph_vicinity_piter_<P, S, E>::operator psite) (mln::internal::graph_vicinity_piter_<P, S, E>::p_ref) (mln::internal::graph_vicinity_piter_<P, S, E>::pg) (mln::internal::graph_vicinity_piter_<P, S, E>::operator[]): Remove methods. (mln::internal::graph_vicinity_piter_<P, S, E>::p_ref_) (mln::internal::graph_vicinity_piter_<P, S, E>::saved_p_ref_) (mln::internal::graph_vicinity_piter_<P, S, E>::psite_) (mln::internal::graph_vicinity_piter_<P, S, E>::p_): Remove attributes. (operator<<(std::ostream&, const graph_vicinity_piter_<P, E>&_)): Adjust, turn into... (operator<<(std::ostream&, const graph_vicinity_piter_<P, S, E>&_)): ...this. Adjust. --- milena/ChangeLog | 36 ++++++ milena/mln/core/internal/graph_vicinity_piter.hh | 144 +++++----------------- 2 files changed, 65 insertions(+), 115 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ee2ec1b..e450700 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,41 @@ 2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update relative iterators on graph image vicinity. + + * mln/core/internal/graph_vicinity_piter.hh + (mln::internal::graph_vicinity_piter_<P, S, E>): Take and + additional parameter S. + Inherit from internal::site_relative_iterator_base. + Adjust. + (graph_vicinity_piter_<P, S, E>::graph_vicinity_piter_): + New default ctor. + Adjust other ctor. + (mln::internal::graph_vicinity_piter_<P, S, E>::self_) + (mln::internal::graph_vicinity_piter_<P, S, E>::super_) + (mln::internal::graph_vicinity_piter_<P, S, E>::psite) + (mln::internal::graph_vicinity_piter_<P, S, E>::point) + (mln::internal::graph_vicinity_piter_<P, S, E>::coord): + Remove typedefs. + (mln::internal::graph_vicinity_piter_<P, S, E>::to_point) + (mln::internal::graph_vicinity_piter_<P, S, E>::to_psite) + (mln::internal::graph_vicinity_piter_<P, S, E>::operator psite) + (mln::internal::graph_vicinity_piter_<P, S, E>::p_ref) + (mln::internal::graph_vicinity_piter_<P, S, E>::pg) + (mln::internal::graph_vicinity_piter_<P, S, E>::operator[]): + Remove methods. + (mln::internal::graph_vicinity_piter_<P, S, E>::p_ref_) + (mln::internal::graph_vicinity_piter_<P, S, E>::saved_p_ref_) + (mln::internal::graph_vicinity_piter_<P, S, E>::psite_) + (mln::internal::graph_vicinity_piter_<P, S, E>::p_): + Remove attributes. + (operator<<(std::ostream&, const graph_vicinity_piter_<P, E>&_)): + Adjust, turn into... + (operator<<(std::ostream&, const graph_vicinity_piter_<P, S, E>&_)): + ...this. + Adjust. + +2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update iterators on mln::p_graph. * mln/core/site_set/p_graph_piter.hh diff --git a/milena/mln/core/internal/graph_vicinity_piter.hh b/milena/mln/core/internal/graph_vicinity_piter.hh index 4a53616..b51ab97 100644 --- a/milena/mln/core/internal/graph_vicinity_piter.hh +++ b/milena/mln/core/internal/graph_vicinity_piter.hh @@ -32,46 +32,43 @@ /// \brief Factored implementation for point iterators on a graph windows /// and graph neighborhoods, called "vicinities". +# include <set> + +# include <mln/core/internal/site_relative_iterator_base.hh> +# include <mln/core/site_set/p_graph.hh> +# include <mln/core/image/graph_psite.hh> + /* FIXME: Factor those classes: - mln::internal::graph_vicinity_piter.hh - mln::internal::line_graph_vicinity_piter.hh */ -# include <mln/core/concept/site_iterator.hh> -# include <mln/core/site_set/p_graph.hh> -# include <mln/core/image/graph_psite.hh> - /* FIXME: Due to the poor interface of mln::p_graph and mln::util::graph, we show to much implementation details here. Enrich their interfaces to avoid that. */ + namespace mln { // Fwd decls. template <typename P> class p_graph; template <typename P> class graph_psite; + // FIXME: Consider renaming graph_vicinity_piter_ as + // graph_relative_piter_. - /*----------------------------------------. - | internal::graph_vicinity_piter_<P, E>. | - `----------------------------------------*/ namespace internal { /// \brief Base for iterator on a graph vicinity. - template <typename P, typename E> - class graph_vicinity_piter_ : public Site_Iterator< E > + template <typename P, typename S, typename E> + class graph_vicinity_piter_ + : public internal::site_relative_iterator_base< S, E > { - typedef graph_vicinity_piter_<P, E> self_; - typedef Site_Iterator< self_ > super_; - public: enum { dim = P::dim }; - typedef graph_psite psite; - typedef P point; - typedef mln_coord(P) coord; // FIXME: Dummy typedef. typedef void dpoint; // FIXME: Dummy value. @@ -81,145 +78,62 @@ namespace mln typedef std::set<util::vertex_id> sites_t; public: - /// Conversion and accessors. - /// \{ - /// Reference to the corresponding point. - const point& to_point() const; - /// Reference to the corresponding point site. - const psite& to_psite() const; - /// Convert the iterator into a line graph psite. - operator psite() const; - - /// Return the reference psite. - const psite& p_ref() const; - /// Return the mln::p_graph corresponding to this piter. - const p_graph& pg() const; /// Return the set of sites (adjacent vertex ids). sites_t& sites(); - /// Read-only access to the \a i-th coordinate. - coord operator[](unsigned i) const; - /// \} - protected: /// Construction. /// \{ + graph_vicinity_piter_(); template <typename Pref> - graph_vicinity_piter_(const Point_Site<Pref>& p_ref); - /// \} - - /// Internals, used by the vicinity. - /// \{ - public: - /// An internal iterator on the set of vertices of the underlying graph. - util::vertex_id id_; + graph_vicinity_piter_(const Pref& p_ref); /// \} protected: - /// The ``central'' psite of the vicinity (for instance, the - /// center of the neighborhood, in the case of a neighborhood - /// piter). - const psite& p_ref_; - - /// The last reference psite whose ajacent psites have been computed. - psite saved_p_ref_; /// The set of edge ids adjacent to the reference psite. sites_t sites_; - - /// The psite corresponding to this iterator. - psite psite_; - /// The point corresponding to this iterator. - point p_; }; - /* FIXME: This hand-made delegation is painful. We should rely on - the general mechanism provided by Point_Site. But then again, we - need to refine/adjust the interface of Point_Site w.r.t. the - mandatory conversions to points. */ - template <typename P, typename E> + + /// Print an mln::line_graph_vicinity_piter_<P, S, E>. + template <typename P, typename S, typename E> inline std::ostream& - operator<<(std::ostream& ostr, const graph_vicinity_piter_<P, E>& p); + operator<<(std::ostream& ostr, const graph_vicinity_piter_<P, S, E>& p); # ifndef MLN_INCLUDE_ONLY - template <typename P, typename E> - template <typename Pref> + template <typename P, typename S, typename E> inline - graph_vicinity_piter_<P, E>::graph_vicinity_piter_(const Point_Site<Pref>& p_ref) - : p_ref_(exact(p_ref).to_psite()), - // Initialize psite_ to a dummy value. - psite_(), - p_() + graph_vicinity_piter_<P, S, E>::graph_vicinity_piter_() { } - template <typename P, typename E> - inline - const P& - graph_vicinity_piter_<P, E>::to_point() const - { - return p_; - } - - template <typename P, typename E> - inline - const graph_psite& - graph_vicinity_piter_<P, E>::to_psite() const - { - return psite_; - } - - template <typename P, typename E> - inline - graph_vicinity_piter_<P, E>::operator graph_psite() const - { - mln_precondition(exact(*this).is_valid()); - return psite_; - } - - template <typename P, typename E> - inline - const graph_psite& - graph_vicinity_piter_<P, E>::p_ref() const - { - return p_ref_; - } - - template <typename P, typename E> + template <typename P, typename S, typename E> + template <typename Pref> inline - const p_graph& - graph_vicinity_piter_<P, E>::pg() const + graph_vicinity_piter_<P, S, E>::graph_vicinity_piter_(const Pref& p_ref) { - return p_ref_.pg(); + center_at(p_ref); } - template <typename P, typename E> + template <typename P, typename S, typename E> inline std::set<util::vertex_id>& - graph_vicinity_piter_<P, E>::sites() + graph_vicinity_piter_<P, S, E>::sites() { return sites_; } - template <typename P, typename E> - inline - mln_coord(P) - graph_vicinity_piter_<P, E>::operator[](unsigned i) const - { - assert(i < dim); - return p_[i]; - } - - template <typename P, typename E> + template <typename P, typename S, typename E> inline std::ostream& - operator<<(std::ostream& ostr, const graph_vicinity_piter_<P, E>& p) + operator<<(std::ostream& ostr, const graph_vicinity_piter_<P, S, E>& p) { - return ostr << p.to_psite(); + return ostr << p.unproxy_(); } # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5

1 0

2357: Update iterators on mln::p_graph.
by Roland Levillain 22 Sep '08

22 Sep '08

* mln/core/site_set/p_graph_piter.hh (mln::p_graph_fwd_piter) (mln::p_graph_bkd_piter): Inherit from internal::site_set_iterator_base. (mln::p_graph_fwd_piter::super_) (mln::p_graph_bkd_piter::super_): Adjust. (mln::p_graph_fwd_piter::dim) (mln::p_graph_bkd_piter::dim): Remove enums. (mln::p_graph_fwd_piter::psite) (mln::p_graph_fwd_piter::point) (mln::p_graph_fwd_piter::coord) (mln::p_graph_bkd_piter::psite) (mln::p_graph_bkd_piter::point) (mln::p_graph_bkd_piter::coord): Remove typedefs. (mln::p_graph_fwd_piter::p_graph_fwd_piter) (mln::p_graph_bkd_piter::p_graph_bkd_piter): New default ctors. (mln::p_graph_fwd_piter::p_graph_fwd_piter(const p_graph& pg)) (mln::p_graph_bkd_piter::p_graph_bkd_piter(const p_graph& pg)): Ajust ctors. (mln::p_graph_fwd_piter::p_graph_fwd_piter(const self_&)) (mln::p_graph_bkd_piter::p_graph_bkd_piter(const self_&)) (mln::p_graph_fwd_piter::operator=(const self_&)) (mln::p_graph_bkd_piter::operator=(const self_&)): Remove. (mln::p_graph_fwd_piter::next_) (mln::p_graph_bkd_piter::next_): Catch up with the new interface of graph_psite. (mln::p_graph_fwd_piter::is_valid) (mln::p_graph_fwd_piter::invalidate) (mln::p_graph_fwd_piter::start) (mln::p_graph_bkd_piter::is_valid) (mln::p_graph_bkd_piter::invalidate) (mln::p_graph_bkd_piter::start): Likewise. Rename as... (mln::p_graph_fwd_piter::is_valid_) (mln::p_graph_fwd_piter::invalidate_) (mln::p_graph_fwd_piter::start_): (mln::p_graph_bkd_piter::is_valid_) (mln::p_graph_bkd_piter::invalidate_) (mln::p_graph_bkd_piter::start_): ...these. (mln::p_graph_fwd_piter::to_point) (mln::p_graph_fwd_piter::to_psite) (mln::p_graph_fwd_piter::operator psite) (mln::p_graph_fwd_piter::operator[]) (mln::p_graph_bkd_piter::to_point) (mln::p_graph_bkd_piter::to_psite) (mln::p_graph_bkd_piter::operator psite) (mln::p_graph_bkd_piter::operator[]): Remove. (mln::p_graph_fwd_piter::pg_) (mln::p_graph_fwd_piter::id_) (mln::p_graph_fwd_piter::psite_) (mln::p_graph_bkd_piter::pg_) (mln::p_graph_bkd_piter::id_) (mln::p_graph_bkd_piter::psite_): Remove attributes (mln::p_graph_fwd_piter::p_) (mln::p_graph_bkd_piter::p_): Remove. Use the one from the super class. --- milena/ChangeLog | 71 ++++++ milena/mln/core/site_set/p_graph_piter.hh | 349 +++++------------------------ 2 files changed, 127 insertions(+), 293 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 323a1fe..ee2ec1b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,76 @@ 2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update iterators on mln::p_graph. + + * mln/core/site_set/p_graph_piter.hh + (mln::p_graph_fwd_piter) + (mln::p_graph_bkd_piter): + Inherit from internal::site_set_iterator_base. + (mln::p_graph_fwd_piter::super_) + (mln::p_graph_bkd_piter::super_): + Adjust. + (mln::p_graph_fwd_piter::dim) + (mln::p_graph_bkd_piter::dim): + Remove enums. + (mln::p_graph_fwd_piter::psite) + (mln::p_graph_fwd_piter::point) + (mln::p_graph_fwd_piter::coord) + (mln::p_graph_bkd_piter::psite) + (mln::p_graph_bkd_piter::point) + (mln::p_graph_bkd_piter::coord): + Remove typedefs. + (mln::p_graph_fwd_piter::p_graph_fwd_piter) + (mln::p_graph_bkd_piter::p_graph_bkd_piter): + New default ctors. + (mln::p_graph_fwd_piter::p_graph_fwd_piter(const p_graph& pg)) + (mln::p_graph_bkd_piter::p_graph_bkd_piter(const p_graph& pg)): + Ajust ctors. + (mln::p_graph_fwd_piter::p_graph_fwd_piter(const self_&)) + (mln::p_graph_bkd_piter::p_graph_bkd_piter(const self_&)) + (mln::p_graph_fwd_piter::operator=(const self_&)) + (mln::p_graph_bkd_piter::operator=(const self_&)): + Remove. + (mln::p_graph_fwd_piter::next_) + (mln::p_graph_bkd_piter::next_): + Catch up with the new interface of graph_psite. + (mln::p_graph_fwd_piter::is_valid) + (mln::p_graph_fwd_piter::invalidate) + (mln::p_graph_fwd_piter::start) + (mln::p_graph_bkd_piter::is_valid) + (mln::p_graph_bkd_piter::invalidate) + (mln::p_graph_bkd_piter::start): + Likewise. + Rename as... + (mln::p_graph_fwd_piter::is_valid_) + (mln::p_graph_fwd_piter::invalidate_) + (mln::p_graph_fwd_piter::start_): + (mln::p_graph_bkd_piter::is_valid_) + (mln::p_graph_bkd_piter::invalidate_) + (mln::p_graph_bkd_piter::start_): + ...these. + (mln::p_graph_fwd_piter::to_point) + (mln::p_graph_fwd_piter::to_psite) + (mln::p_graph_fwd_piter::operator psite) + (mln::p_graph_fwd_piter::operator[]) + (mln::p_graph_bkd_piter::to_point) + (mln::p_graph_bkd_piter::to_psite) + (mln::p_graph_bkd_piter::operator psite) + (mln::p_graph_bkd_piter::operator[]): + Remove. + (mln::p_graph_fwd_piter::pg_) + (mln::p_graph_fwd_piter::id_) + (mln::p_graph_fwd_piter::psite_) + (mln::p_graph_bkd_piter::pg_) + (mln::p_graph_bkd_piter::id_) + (mln::p_graph_bkd_piter::psite_): + Remove attributes + (mln::p_graph_fwd_piter::p_) + (mln::p_graph_bkd_piter::p_): + Remove. + Use the one from the super class. + +2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update site of mln::p_graph. * mln/core/image/graph_psite.hh (mln::graph_psite): Inherit diff --git a/milena/mln/core/site_set/p_graph_piter.hh b/milena/mln/core/site_set/p_graph_piter.hh index 56419d9..7ef1859 100644 --- a/milena/mln/core/site_set/p_graph_piter.hh +++ b/milena/mln/core/site_set/p_graph_piter.hh @@ -28,12 +28,16 @@ #ifndef MLN_CORE_SITE_SET_P_GRAPH_PITER_HH # define MLN_CORE_SITE_SET_P_GRAPH_PITER_HH -# include <mln/core/internal/site_iterator_base.hh> +/// \file mln/core/site_set/p_graph_piter.hh +/// \brief Definition of point iterator on graph-based point set. + +# include <mln/core/internal/site_set_iterator_base.hh> # include <mln/core/site_set/p_graph.hh> # include <mln/core/image/graph_psite.hh> -/// \file mln/core/site_set/p_graph_piter.hh -/// \brief Definition of point iterator on graph-based point set. +/* FIXME: Iterators on p_graph and p_line_graph share common code. + Factor as much as possible. */ + namespace mln { @@ -41,6 +45,7 @@ namespace mln template <typename P> class p_graph; template <typename P> class graph_psite; + /*------------------------. | p_graph_fwd_piter_. | `------------------------*/ @@ -48,69 +53,39 @@ namespace mln /// \brief Forward iterator on point sites of a mln::p_graph. template <typename P> class p_graph_fwd_piter_ - : public internal::site_iterator_base< P, p_graph_fwd_piter_ > + : public internal::site_set_iterator_base< p_graph, + p_graph_fwd_piter_ > { typedef p_graph_fwd_piter_ self_; - typedef internal::site_iterator_base< P, self_ > super_; + typedef internal::site_set_iterator_base< p_graph, self_ > super_; public: - // Make definitions from super class available. - enum { dim = super_::dim }; - - typedef graph_psite psite; - typedef P point; - typedef mln_coord(point) coord; - /// Construction and assignment. /// \{ + p_graph_fwd_piter_(); p_graph_fwd_piter_(const p_graph& pg); - p_graph_fwd_piter_(const self_& rhs); - self_& operator= (const self_& rhs); /// \} /// Manipulation. /// \{ /// Test if the iterator is valid. - bool is_valid() const; + bool is_valid_() const; /// Invalidate the iterator. - void invalidate(); - /// Start an iteration. - void start(); + void invalidate_(); + /// Start an iteration. + void start_(); /// Go to the next point. void next_(); - /// Update the internal data of the iterator. - void update_(); - /// \} - - /// Conversion and accessors. - /// \{ - /// Reference to the corresponding point. - const point& to_point () const; - /// Reference to the corresponding point site. - const psite& to_psite () const; - /// Convert the iterator into a graph psite. - operator psite() const; - - /// Read-only access to the \p i-th coordinate. - mln_coord(P) operator[](unsigned i) const; /// \} private: - /// The p_graph this point site belongs to. - const p_graph* pg_; - /// The id of the vertex this psite is pointing towards. - unsigned id_; /// The psite corresponding to this iterator. - psite psite_; - /// The point corresponding to this iterator. - point p_; + using super_::p_; }; - /* FIXME: This hand-made delegation is painful. We should rely on - the general mechanism provided by Point_Site. But then again, we - need to refine/adjust the interface of Point_Site w.r.t. the - mandatory conversions to points. */ + + /// Print an mln::p_graph_fwd_piter_. template <typename P> inline std::ostream& @@ -124,76 +99,46 @@ namespace mln /// \brief Backward iterator on point sites of a mln::p_graph. template <typename P> class p_graph_bkd_piter_ - : public internal::site_iterator_base< P, p_graph_bkd_piter_ > + : public internal::site_set_iterator_base< p_graph, + p_graph_bkd_piter_ > { typedef p_graph_bkd_piter_ self_; - typedef internal::site_iterator_base< P, self_ > super_; + typedef internal::site_set_iterator_base< p_graph, self_ > super_; public: - // Make definitions from super class available. - enum { dim = super_::dim }; - - typedef graph_psite psite; - typedef P point; - typedef mln_coord(point) coord; - /// Construction and assignment. /// \{ + p_graph_bkd_piter_(); p_graph_bkd_piter_(const p_graph& pg); - p_graph_bkd_piter_(const self_& rhs); - self_& operator= (const self_& rhs); /// \} /// Manipulation. /// \{ /// Test if the iterator is valid. - bool is_valid() const; + bool is_valid_() const; /// Invalidate the iterator. - void invalidate(); - /// Start an iteration. - void start(); + void invalidate_(); + /// Start an iteration. + void start_(); /// Go to the next point. void next_(); - /// Update the internal data of the iterator. - void update_(); - /// \} - - /// Conversion and accessors. - /// \{ - /// Reference to the corresponding point. - const point& to_point () const; - /// Reference to the corresponding point site. - const psite& to_psite () const; - /// Convert the iterator into a graph psite. - operator psite() const; - - /// Read-only access to the \p i-th coordinate. - coord operator[](unsigned i) const; /// \} private: - /// The p_graph this point site belongs to. - const p_graph* pg_; - /// The id of the vertex this psite is pointing towards. - unsigned id_; /// The psite corresponding to this iterator. - psite psite_; - /// The point corresponding to this iterator. - point p_; + using super_::p_; }; - /* FIXME: This hand-made delegation is painful. We should rely on - the general mechanism provided by Point_Site. But then again, we - need to refine/adjust the interface of Point_Site w.r.t. the - mandatory conversions to points. */ + /// Print an mln::p_graph_bkd_piter_. template <typename P> inline std::ostream& operator<<(std::ostream& ostr, const p_graph_bkd_piter_& p); + # ifndef MLN_INCLUDE_ONLY /*------------------------. @@ -202,71 +147,41 @@ namespace mln template <typename P> inline - p_graph_fwd_piter_::p_graph_fwd_piter_(const p_graph& pg) - : pg_(&pg), - // Initialize psite_ to a dummy value. - psite_(pg, -1) - { - // Invalidate id_. - invalidate(); - } - - template <typename P> - inline - p_graph_fwd_piter_::p_graph_fwd_piter_(const p_graph_fwd_piter_& rhs) - : pg_(rhs.pg_), - id_(rhs.id_), - psite_(rhs.psite_), - p_(rhs.p_) - { - } - - template <typename P> - inline - p_graph_fwd_piter_& - p_graph_fwd_piter_::operator=(const p_graph_fwd_piter_& rhs) + p_graph_fwd_piter_::p_graph_fwd_piter_() { - if (&rhs == this) - return *this; - pg_ = rhs.pg_; - id_ = rhs.id_; - psite_ = rhs.psite_; - p_ = rhs.p_; - return *this; + mln_postcondition(!this->is_valid()); } template <typename P> inline - mln_coord(P) - p_graph_fwd_piter_::operator[](unsigned i) const + p_graph_fwd_piter_::p_graph_fwd_piter_(const p_graph& pg) { - return p_[i]; + this->change_target(pg); + mln_postcondition(!this->is_valid()); } template <typename P> inline bool - p_graph_fwd_piter_::is_valid() const + p_graph_fwd_piter_::is_valid_() const { - return pg_ && id_ < pg_->nvertices(); + return p_.is_valid(); } template <typename P> inline void - p_graph_fwd_piter_::invalidate() + p_graph_fwd_piter_::invalidate_() { - id_ = -1; + p_.invalidate(); } template <typename P> inline void - p_graph_fwd_piter_::start() + p_graph_fwd_piter_::start_() { - id_ = 0; - if (is_valid()) - update_(); + p_.change_vertex_id(0); } template <typename P> @@ -274,66 +189,7 @@ namespace mln void p_graph_fwd_piter_::next_() { - ++id_; - if (is_valid()) - update_(); - } - - template <typename P> - inline - void - p_graph_fwd_piter_::update_() - { - // Update psite_. - psite_ = graph_psite(*pg_, id_); - // Update p_. - p_ = pg_->point_from_id(id_); - } - - template <typename P> - inline - const P& - p_graph_fwd_piter_::to_point() const - { - /* We don't check whether the iterator is valid before returning - the value using - - mln_precondition(is_valid()); - - since this method may be called *before* the iterator is - actually initialized. This is the case for instance when this - point iterator (say, P) is used to initialize another iterator - on window or neighborhood (say, Q); most of the time, for_all() - is responsible for the initialization of P, but it takes place - *after* the creation of Q. */ - return p_; - } - - template <typename P> - inline - const graph_psite& - p_graph_fwd_piter_::to_psite() const - { - /* We don't check whether the iterator is valid before returning - the value using - - mln_precondition(is_valid()); - - since this method may be called *before* the iterator is - actually initialized. This is the case for instance when this - point iterator (say, P) is used to initialize another iterator - on window or neighborhood (say, Q); most of the time, for_all() - is responsible for the initialization of P, but it takes place - *after* the creation of Q. */ - return psite_; - } - - template <typename P> - inline - p_graph_fwd_piter_::operator graph_psite() const - { - mln_precondition(is_valid()); - return psite_; + p_.inc_vertex_id(); } @@ -342,9 +198,7 @@ namespace mln std::ostream& operator<<(std::ostream& ostr, const p_graph_fwd_piter_& p) { - // FIXME: We should use p.to_psite() here, but as it lacks the - // precondition the conversion operator has, we use the latter. - return ostr << static_cast< graph_psite >(p); + return ostr << p.unproxy_(); } @@ -354,71 +208,41 @@ namespace mln template <typename P> inline - p_graph_bkd_piter_::p_graph_bkd_piter_(const p_graph& pg) - : pg_(&pg), - // Initialize psite_ to a dummy value. - psite_(pg, -1) - { - // Invalidate id_. - invalidate(); - } - - template <typename P> - inline - p_graph_bkd_piter_::p_graph_bkd_piter_(const p_graph_bkd_piter_& rhs) - : pg_(rhs.pg_), - id_(rhs.id_), - psite_(rhs.psite_), - p_(rhs.p_) - { - } - - template <typename P> - inline - p_graph_bkd_piter_& - p_graph_bkd_piter_::operator=(const p_graph_bkd_piter_& rhs) + p_graph_bkd_piter_::p_graph_bkd_piter_() { - if (&rhs == this) - return *this; - pg_ = rhs.pg_; - id_ = rhs.id_; - psite_ = rhs.psite_; - p_ = rhs.p_; - return *this; + mln_postcondition(!this->is_valid()); } template <typename P> inline - mln_coord(P) - p_graph_bkd_piter_::operator[](unsigned i) const + p_graph_bkd_piter_::p_graph_bkd_piter_(const p_graph& pg) { - return p_[i]; + this->change_target(pg); + mln_postcondition(!this->is_valid()); } template <typename P> inline bool - p_graph_bkd_piter_::is_valid() const + p_graph_bkd_piter_::is_valid_() const { - return pg_ && id_ < pg_->nvertices(); + return p_.is_valid(); } template <typename P> inline void - p_graph_bkd_piter_::invalidate() + p_graph_bkd_piter_::invalidate_() { - id_ = -1; + p_.invalidate(); } template <typename P> inline void - p_graph_bkd_piter_::start() + p_graph_bkd_piter_::start_() { - id_ = pg_->nvertices() - 1; - if (is_valid()) - update_(); + p_.change_vertex_id(this->site_set().nvertices() - 1); } template <typename P> @@ -426,66 +250,7 @@ namespace mln void p_graph_bkd_piter_::next_() { - --id_; - if (is_valid()) - update_(); - } - - template <typename P> - inline - void - p_graph_bkd_piter_::update_() - { - // Update psite_. - psite_ = graph_psite(*pg_, id_); - // Update p_. - p_ = pg_->point_from_id(id_); - } - - template <typename P> - inline - const P& - p_graph_bkd_piter_::to_point() const - { - /* We don't check whether the iterator is valid before returning - the value using - - mln_precondition(is_valid()); - - since this method may be called *before* the iterator is - actually initialized. This is the case for instance when this - point iterator (say, P) is used to initialize another iterator - on window or neighborhood (say, Q); most of the time, for_all() - is responsible for the initialization of P, but it takes place - *after* the creation of Q. */ - return p_; - } - - template <typename P> - inline - const graph_psite& - p_graph_bkd_piter_::to_psite() const - { - /* We don't check whether the iterator is valid before returning - the value using - - mln_precondition(is_valid()); - - since this method may be called *before* the iterator is - actually initialized. This is the case for instance when this - point iterator (say, P) is used to initialize another iterator - on window or neighborhood (say, Q); most of the time, for_all() - is responsible for the initialization of P, but it takes place - *after* the creation of Q. */ - return psite_; - } - - template <typename P> - inline - p_graph_bkd_piter_::operator graph_psite() const - { - mln_precondition(is_valid()); - return psite_; + p_.dec_vertex_id(); } @@ -494,9 +259,7 @@ namespace mln std::ostream& operator<<(std::ostream& ostr, const p_graph_bkd_piter_& p) { - // FIXME: We should use p.to_psite() here, but as it lacks the - // precondition the conversion operator has, we use the latter. - return ostr << static_cast< graph_psite >(p); + return ostr << p.unproxy_(); } # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5

1 0

2356: Update site of mln::p_graph.
by Roland Levillain 22 Sep '08

22 Sep '08

* mln/core/image/graph_psite.hh (mln::graph_psite): Inherit from internal::pseudo_site_base_. (mln::graph_psite::super_) (mln::graph_psite::mesh) (mln::graph_psite::point) (mln::graph_psite::dpoint) (mln::graph_psite::coord): Remove typedefs. (mln::graph_psite::dim): Remove enum. (mln::graph_psite::target): New typedef. (mln::graph_psite::graph_psite(const self_&)) (mln::graph_psite::operator=(const self_&)): Remove. (mln::graph_psite::to_psite) (mln::graph_psite::to_point) (mln::graph_psite::operator[]): Remove methods. (mln::graph_psite::graph_psite) (mln::graph_psite::graph_psite(const p_graph&, util::vertex_id)): Update ctors. (mln::graph_psite::is_valid): Update. (mln::graph_psite::invalidate) (mln::graph_psite::update_) (mln::graph_psite::site_set) (mln::graph_psite::target_) (mln::graph_psite::change_target) (mln::graph_psite::subj_): New methods. (mln::graph_psite::id): Rename accessor as... (mln::graph_psite::vertex_id): ...this. (mln::graph_psite::change_vertex_id) (mln::graph_psite::inc_vertex_id) (mln::graph_psite::dec_vertex_id): New methods. (mln::graph_psite::p_): New attribute. (operator!=(const graph_psite&, const graph_psite&)) (operator<<(std::ostream&, const graph_psite&)): New operators. (operator==(const graph_psite&, const graph_psite&)) (operator< (const graph_psite&, const graph_psite&)): Update operators. --- milena/ChangeLog | 47 +++++++ milena/mln/core/image/graph_psite.hh | 227 ++++++++++++++++++++++++--------- 2 files changed, 212 insertions(+), 62 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 746a34a..323a1fe 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,52 @@ 2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update site of mln::p_graph. + + * mln/core/image/graph_psite.hh (mln::graph_psite): Inherit + from internal::pseudo_site_base_. + (mln::graph_psite::super_) + (mln::graph_psite::mesh) + (mln::graph_psite::point) + (mln::graph_psite::dpoint) + (mln::graph_psite::coord): + Remove typedefs. + (mln::graph_psite::dim): Remove enum. + (mln::graph_psite::target): New typedef. + (mln::graph_psite::graph_psite(const self_&)) + (mln::graph_psite::operator=(const self_&)): + Remove. + (mln::graph_psite::to_psite) + (mln::graph_psite::to_point) + (mln::graph_psite::operator[]): + Remove methods. + (mln::graph_psite::graph_psite) + (mln::graph_psite::graph_psite(const p_graph&, util::vertex_id)): + Update ctors. + (mln::graph_psite::is_valid): + Update. + (mln::graph_psite::invalidate) + (mln::graph_psite::update_) + (mln::graph_psite::site_set) + (mln::graph_psite::target_) + (mln::graph_psite::change_target) + (mln::graph_psite::subj_): + New methods. + (mln::graph_psite::id): Rename accessor as... + (mln::graph_psite::vertex_id): ...this. + (mln::graph_psite::change_vertex_id) + (mln::graph_psite::inc_vertex_id) + (mln::graph_psite::dec_vertex_id): + New methods. + (mln::graph_psite::p_): New attribute. + (operator!=(const graph_psite&, const graph_psite&)) + (operator<<(std::ostream&, const graph_psite&)): + New operators. + (operator==(const graph_psite&, const graph_psite&)) + (operator< (const graph_psite&, const graph_psite&)): + Update operators. + +2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update site set mln::p_graph. * mln/core/site_set/p_graph.hh diff --git a/milena/mln/core/image/graph_psite.hh b/milena/mln/core/image/graph_psite.hh index ef0fedb..0a70497 100644 --- a/milena/mln/core/image/graph_psite.hh +++ b/milena/mln/core/image/graph_psite.hh @@ -29,64 +29,102 @@ # define MLN_CORE_IMAGE_GRAPH_PSITE_HH /// \file mln/core/image/graph_psite.hh -/// \brief Definition of a graph-based point site. +/// \brief Definition of a graph-based psite. -# include <mln/core/concept/point_site.hh> +# include <mln/core/internal/pseudo_site_base.hh> # include <mln/core/site_set/p_graph.hh> +/* FIXME: This class shares a lot with line_graph_psite. Factor as + much as possible. */ + +// FIXME: Rename graph_psite as p_graph_psite, and move this +// to core/site_set. + namespace mln { // Forward declaration. template <typename P> class p_graph; + template <typename P> class graph_psite; /// \brief Point site associated to a mln::graph_image. + /// + /// \arg \p P The type of the site. template <typename P> - class graph_psite : public Point_Site< graph_psite > + class graph_psite + : public internal::pseudo_site_base_< const P&, graph_psite > { typedef graph_psite self_; - typedef Point_Site<self_> super_; public: - typedef mln_mesh(P) mesh; - enum { dim = P::dim }; - typedef P point; - typedef mln_dpoint(P) dpoint; - typedef mln_coord(P) coord; + // This associated type is important to know that this particular + // pseudo site knows the site set it refers to. + typedef p_graph target; /// Construction and assignment. /// \{ graph_psite(); graph_psite(const p_graph& pg_, util::vertex_id id); - graph_psite(const self_& rhs); - self_& operator= (const self_& rhs); /// \} - /// Access to psite. - const self_& to_psite() const; + /// Psite manipulators. + /// \{ + /// Is this psite valid? + bool is_valid() const; + /// Invalidate this psite. + void invalidate(); + /// \} - /// Access to point. + /// Site set manipulators. /// \{ - const point& to_point() const; - coord operator[](unsigned id) const; + /// \brief Get the site set (shortcut for *target()). + /// \pre Member plg_ is non null. + const target& site_set() const; + + /// Get a pointer to the target site_set. + const target* target_() const; + /// Set the target site_set. + void change_target(const target& new_target); /// \} - /// Return the p_graph this point site belongs to. - const p_graph& pg() const; + /// Proxy manipulators. + /// \{ + /// Return the site corresponding to this psite. + const P& subj_(); + /// \} + + /// Vertex id manipulators. + //// \{ /// Return the vertex id of this point site. - util::vertex_id id() const; + util::vertex_id vertex_id() const; + /// Set the vertex id of this point site. + void change_vertex_id(const util::vertex_id& id); + /// Increment the vertex id of this point site. + void inc_vertex_id(); + /// Increment the vertex id of this point site. + void dec_vertex_id(); + /// \} - /// Is this psite valid? - bool is_valid() const; + private: + /// Site-related members. + /// \{ + /// Update the site corresponding to this psite. + void update_(); + // The site corresponding to this psite. + P p_; + /// \} private: + /// Graph-related members. + /// \{ /// The p_graph this point site belongs to. - const p_graph* pg_; + const target* pg_; /// The id of the vertex this psite is pointing towards. util::vertex_id id_; + /// \} }; @@ -103,6 +141,14 @@ namespace mln bool operator==(const graph_psite& lhs, const graph_psite& rhs); + /// \brief Is \a lhs not equal to \a rhs? + /// + /// \pre Arguments \a lhs and \a rhs must belong to the same + /// mln::p_graph. + template <typename P> + bool + operator!=(const graph_psite& lhs, const graph_psite& rhs); + /// \brief Is \a lhs ``less'' than \a rhs? /// /// This comparison is required by algorithms sorting psites. @@ -115,97 +161,134 @@ namespace mln /// \} + template <typename P> + inline + std::ostream& + operator<<(std::ostream& ostr, const graph_psite& p); + + # ifndef MLN_INCLUDE_ONLY template <typename P> inline graph_psite::graph_psite() - // Dummy initializations. - : super_(), - pg_(0), - id_(-1) + : pg_(0) { } template <typename P> inline graph_psite::graph_psite(const p_graph& g, util::vertex_id id) - : super_(), - pg_(&g), + // FIXME: Use change_target instead. + : pg_(&g), id_(id) { + update_(); } template <typename P> inline - graph_psite::graph_psite(const graph_psite& rhs) - : super_(rhs), - pg_(rhs.pg_), - id_(rhs.id_) + bool + graph_psite::is_valid() const { + /* FIXME: Instead of `plg_->gr_->nvertices()', we should have + something like `run_->has_edge_id(id_)' (see the implementation of + p_run_psite. */ + return pg_ && id_ < pg_->gr_->nvertices(); } template <typename P> inline - graph_psite& - graph_psite::operator= (const graph_psite& rhs) + void + graph_psite::invalidate() { - if (&rhs == this) - return *this; - pg_ = rhs.pg_; - id_ = rhs.id_; - return *this; + /* FIXME: Instead of `plg_->gr_->nvertices()', we should have + something like `run_->has_edge_id(id_)' (see the implementation of + p_run_psite. */ + id_ = pg_->gr_->nvertices(); } template <typename P> inline - bool - graph_psite::is_valid() const + const p_graph& + graph_psite::site_set() const { - return pg_ && id_ < pg_->gr_->nvertices(); + mln_precondition(target_()); + return *target_(); } template <typename P> inline - const graph_psite& - graph_psite::to_psite() const + const p_graph* + graph_psite::target_() const { - return *this; + return pg_; } template <typename P> inline + void + graph_psite::change_target(const p_graph& new_target) + { + pg_ = &new_target; + invalidate(); + } + + // FIXME: Write or extend a test to exercise this method. + template <typename P> + inline const P& - graph_psite::to_point() const + graph_psite::subj_() { - return pg().point_from_id(id_); + return p_; } template <typename P> inline - mln_coord(P) - graph_psite::operator[](unsigned i) const + util::vertex_id + graph_psite::vertex_id() const { - mln_assertion(is_valid()); - return to_point()[i]; + return id_; } template <typename P> inline - const p_graph& - graph_psite::pg() const + void + graph_psite::change_vertex_id(const util::vertex_id& id) { - mln_assertion(pg_); - return *pg_; + id_ = id; + if (is_valid()) + update_(); } template <typename P> inline - util::vertex_id - graph_psite::id() const + void + graph_psite::inc_vertex_id() { - return id_; + ++id_.to_equiv(); + if (is_valid()) + update_(); + } + + template <typename P> + inline + void + graph_psite::dec_vertex_id() + { + --id_.to_equiv(); + if (is_valid()) + update_(); + } + + template <typename P> + inline + void + graph_psite::update_() + { + mln_precondition(is_valid()); + p_ = site_set().point_from_id(id_); } @@ -217,19 +300,39 @@ namespace mln bool operator==(const graph_psite& lhs, const graph_psite& rhs) { - mln_assertion(&lhs.pg() == &rhs.pg()); - return lhs.id() == rhs.id(); + mln_assertion(lhs.target_() == rhs.target_()); + return lhs.vertex_id() == rhs.vertex_id(); + } + + template <typename P> + bool + operator!=(const graph_psite& lhs, const graph_psite& rhs) + { + mln_assertion(lhs.target_() == rhs.target_()); + return lhs.vertex_id() != rhs.vertex_id(); } template <typename P> bool operator< (const graph_psite& lhs, const graph_psite& rhs) { - mln_assertion(&lhs.pg() == &rhs.pg()); - return lhs.id() < rhs.id(); + mln_assertion(lhs.target_() == rhs.target_()); + return lhs.vertex_id() < rhs.vertex_id(); } + /*------------------. + | Pretty-printing. | + `------------------*/ + + template <typename P> + inline + std::ostream& + operator<<(std::ostream& ostr, const graph_psite& p) + { + return ostr << p.unproxy_(); + } + # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5

1 0

2355: Update site set mln::p_graph.
by Roland Levillain 22 Sep '08

22 Sep '08

* mln/core/site_set/p_graph.hh (mln::trait::site_set_< p_graph >): New properties. (mln::p_graph): Inherit from internal::site_set_base_. (mln::p_graph::self_ (mln::p_graph::super_) (mln::p_graph::element) (mln::p_graph::piter): New typedefs. (mln::p_graph::bbox): Remove method. (mln::p_graph::bb_): Remove attribute. (mln::p_graph::p_graph): Adjust ctor. (mln::p_graph::has): Update. (mln::p_graph::to_graph): Update accessors. Rename them as... (mln::p_graph::gr): ...these. (mln::p_graph::nsites): Change return type of this method to unsigned. (mln::p_graph::is_valid) (mln::p_graph::memory_size): New methods. --- milena/ChangeLog | 25 ++++++ milena/mln/core/site_set/p_graph.hh | 158 ++++++++++++++++++++++++----------- 2 files changed, 134 insertions(+), 49 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ba324e4..746a34a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,30 @@ 2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update site set mln::p_graph. + + * mln/core/site_set/p_graph.hh + (mln::trait::site_set_< p_graph >): New properties. + (mln::p_graph): Inherit from internal::site_set_base_. + (mln::p_graph::self_ + (mln::p_graph::super_) + (mln::p_graph::element) + (mln::p_graph::piter): + New typedefs. + (mln::p_graph::bbox): Remove method. + (mln::p_graph::bb_): Remove attribute. + (mln::p_graph::p_graph): Adjust ctor. + (mln::p_graph::has): Update. + (mln::p_graph::to_graph): Update accessors. + Rename them as... + (mln::p_graph::gr): ...these. + (mln::p_graph::nsites): Change return type of this method to + unsigned. + (mln::p_graph::is_valid) + (mln::p_graph::memory_size): + New methods. + +2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update complex-based image. * mln/core/complex_iter.hh: More documentation. diff --git a/milena/mln/core/site_set/p_graph.hh b/milena/mln/core/site_set/p_graph.hh index d7de799..073b91f 100644 --- a/milena/mln/core/site_set/p_graph.hh +++ b/milena/mln/core/site_set/p_graph.hh @@ -28,26 +28,49 @@ #ifndef MLN_CORE_SITE_SET_P_GRAPH_HH # define MLN_CORE_SITE_SET_P_GRAPH_HH -# include <mln/core/concept/point_site.hh> +/// \file mln/core/site_set/p_graph.hh +/// \brief Definition of a point set based on a graph. + # include <mln/core/internal/site_set_base.hh> -# include <mln/accu/bbox.hh> -# include <mln/util/tracked_ptr.hh> # include <mln/util/graph.hh> +# include <mln/util/tracked_ptr.hh> # include <mln/core/image/graph_psite.hh> # include <mln/core/site_set/p_graph_piter.hh> +/* FIXME: This class shares a lot with p_line_graph. Factor as much + as possible. */ + +/* FIXME: We should move the `adjacent'/`adjacent_or_equal' methods + out of this class (into iterators on *graph*). */ + namespace mln { - /* FIXME: Contray to, e.g., p_array, the sole parameter P of p_graph - is expected to be a point, not a psite!! We should have a - uniform scheme for point site sets. */ + // Forward declaration. + template <typename P> struct p_graph; + + namespace trait + { + template <typename P> + struct site_set_< p_graph > + { + typedef trait::site_set::nsites::known nsites; + // FIXME: Depends on P! + typedef trait::site_set::bbox::unknown bbox; + typedef trait::site_set::contents::fixed contents; + typedef trait::site_set::arity::unique arity; + }; + } // end of namespace mln::trait + template <typename P> struct p_graph - : public internal::site_set_base_< graph_psite, p_graph > + : public internal::site_set_base_< P, p_graph > { + typedef p_graph self_; + typedef internal::site_set_base_< P, self_ > super_; + typedef util::graph graph; /// \brief Construct a graph psite set from a graph of points. @@ -56,8 +79,12 @@ namespace mln /// /// \a gr is \em copied internally, so that the graph psite set is /// still valid after the initial graph has been removed. - p_graph (const graph& gr); + p_graph(const graph& gr); + /// Associated types. + /// \{ + /// Element associated type. + typedef mln_site(super_) element; /// Point_Site associated type. typedef graph_psite psite; @@ -67,27 +94,48 @@ namespace mln /// Backward Site_Iterator associated type. typedef p_graph_bkd_piter_ bkd_piter; + /// Site_Iterator associated type. + typedef fwd_piter piter; + /// \} + /// \brief Return The number of points (sites) of the set, i.e., /// the number of \em vertices. /// /// Required by the mln::Point_Set concept. - std::size_t nsites() const; + /* FIXME: Return type should be std::size_t (see + mln/core/concept/site_set.hh). */ + unsigned nsites() const; /// Return The number of vertices in the graph. std::size_t nvertices() const; /// Return The number of edges in the graph. std::size_t nedges() const; - /// Give the exact bounding box. - const box& bbox() const; + /// Is this site set valid? + bool is_valid() const; + /// Does this site set has \a p? bool has(const psite& p) const; + // FIXME: Dummy. + std::size_t memory_size() const; + + /// Accessors. + /// \{ + /// Return the graph associated to this site set (const version) + const graph& gr() const; + /// Return the graph associated to this site set (mutable version). + graph& gr(); + /// \} + + /// \brief Graph-related services + /// + /// \todo Move them into iterators on graphs. + /// \{ /// Return the graph point (FIXME site?) from an index const P& point_from_id(const util::vertex_id& id) const; P& point_from_id(const util::vertex_id& id); - /// Return the point contained in the first vertex adjacent // to the edge id \a e. const P& vertex1(const util::edge_id& e) const; @@ -95,6 +143,9 @@ namespace mln /// to the edge id \a e. const P& vertex2(const util::edge_id& e) const; + // FIXME: These would probably be no longer needed as soon as + // iterators on graphs are available. + /// Adjacency tests. /// \{ /// Return true if the psites \a lhs and \a rhs are adjacent. @@ -111,21 +162,11 @@ namespace mln const util::vertex_id& rhs) const; /// \} - /// Return the graph associated to the p_graph domain. - // FIXME: Rename as something else (graph() ?). - const graph& to_graph() const; - graph& to_graph(); - + /// \} - // FIXME: Should be private. public: + // FIXME: Should be private. util::tracked_ptr<graph> gr_; - // FIXME: (Roland) Is it really useful/needed? - /* 2007-12-19: It seems so, since graph_image must implement a method - named bbox(). Now the question is: should each image type have a - bounding box? */ - private: - box bb_; }; @@ -137,6 +178,10 @@ namespace mln bool operator==(const p_graph& lhs, const p_graph& rhs); + + /* FIXME: Extend the `ord' mechanism instead of this ill-defined + pseudo-order. */ + /// \brief Inclusion of a mln::p_graph in another one. /// /// This inclusion relation is very strict for the moment, since our @@ -159,15 +204,11 @@ namespace mln // Create a deep, managed copy of GR. : gr_ (new util::graph(gr)) { - accu::bbox a; - for (unsigned i = 0; i < nsites(); ++i) - a.take(gr_->vertex_data(i)); - bb_ = a.to_result(); } template <typename P> inline - std::size_t + unsigned p_graph::nsites() const { return nvertices(); @@ -191,10 +232,11 @@ namespace mln template <typename P> inline - const box& - p_graph::bbox() const + bool + p_graph::is_valid() const { - return bb_; + // FIXME: Might be too low-level, again. + return gr_.ptr_; } template <typename P> @@ -202,11 +244,39 @@ namespace mln bool p_graph::has(const psite& p) const { + mln_precondition(is_valid()); return // Check whether P is compatible with this psite set. - (&p.pg() == this) && - // Check that the vertex id of P belongs to the range of valid vertex ids. - (p.id() < gr_->nvertices()); + (p.target_() == this) && + // Check that the vertex id of P belongs to the range of valid + // vertex ids. + (p.is_valid()); + } + + template <typename P> + inline + std::size_t + p_graph::memory_size() const + { + // FIXME: Dummy; implement (see other site sets). + abort(); + return 0; + } + + template <typename P> + const typename p_graph::graph& + p_graph::gr() const + { + mln_precondition(is_valid()); + return *gr_.ptr; + } + + template <typename P> + typename p_graph::graph& + p_graph::gr() + { + mln_precondition(is_valid()); + return *gr_.ptr; } template <typename P> @@ -301,25 +371,15 @@ namespace mln return adjacent(lhs, rhs); } - template <typename P> - const typename p_graph::graph& - p_graph::to_graph() const - { - return this->gr_; - } - - template <typename P> - typename p_graph::graph& - p_graph::to_graph() - { - return this->gr_; - } - template <typename P> bool operator==(const p_graph& lhs, const p_graph& rhs) { + /* FIXME: We should not rely on pointer equality here, as graph + will soon become shells using (shared) tracked pointers to + actual data. So, delegate the equality test to the graphs + themselves. */ return lhs.gr_.ptr_ == rhs.gr_.ptr_; } -- 1.5.6.5

1 0

2354: Update complex-based image.
by Roland Levillain 22 Sep '08

22 Sep '08

* mln/core/complex_iter.hh: More documentation. * mln/core/image/complex_image.hh (mln::internal::data< complex_image<D, P, V> >): Update properties. (mln::complex_image<D, P, V>): Fix access to members. (mln::complex_image<D, P, V>::super_): Remove typedef. * tests/core/image/complex_image.: Catch up with the current interfaces of mln::complex_psite and mln::faces_psite. * tests/core/image/Makefile.am (check_PROGRAMS): Re-enable complex_image. (complex_image_SOURCES): Re-enable. --- milena/ChangeLog | 16 +++++++++++ milena/mln/core/complex_iter.hh | 9 ++++++ milena/mln/core/image/complex_image.hh | 42 +++++++++++++++++------------ milena/tests/core/image/Makefile.am | 4 +- milena/tests/core/image/complex_image.cc | 8 +++--- 5 files changed, 56 insertions(+), 23 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ee684ea..ba324e4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,21 @@ 2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update complex-based image. + + * mln/core/complex_iter.hh: More documentation. + * mln/core/image/complex_image.hh + (mln::internal::data< complex_image<D, P, V> >): + Update properties. + (mln::complex_image<D, P, V>): Fix access to members. + (mln::complex_image<D, P, V>::super_): Remove typedef. + * tests/core/image/complex_image.: Catch up with the current + interfaces of mln::complex_psite and mln::faces_psite. + * tests/core/image/Makefile.am (check_PROGRAMS): Re-enable + complex_image. + (complex_image_SOURCES): Re-enable. + +2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update iterators on p_complex. * mln/core/internal/p_complex_piter_base.hh diff --git a/milena/mln/core/complex_iter.hh b/milena/mln/core/complex_iter.hh index ba2731e..1e60fe0 100644 --- a/milena/mln/core/complex_iter.hh +++ b/milena/mln/core/complex_iter.hh @@ -33,6 +33,9 @@ # include <mln/core/internal/complex_iter_base.hh> +// FIXME: Factor a bit more? (Using complex_iter_base_.) + + namespace mln { @@ -52,7 +55,10 @@ namespace mln complex_fwd_iter_<D> > { public: + /// Type of associated face. typedef any_face_handle<D> face; + // FIXME: Rename as dim? + /// Dimension of the complex. static const unsigned complex_dim = D; private: @@ -103,7 +109,10 @@ namespace mln complex_bkd_iter_<D> > { public: + /// Type of associated face. typedef any_face_handle<D> face; + // FIXME: Rename as dim? + /// Dimension of the complex. static const unsigned complex_dim = D; private: diff --git a/milena/mln/core/image/complex_image.hh b/milena/mln/core/image/complex_image.hh index 3923454..6dbc522 100644 --- a/milena/mln/core/image/complex_image.hh +++ b/milena/mln/core/image/complex_image.hh @@ -50,8 +50,8 @@ namespace mln { - // Fwd decl. - template <unsigned D, typename P, typename V> struct complex_image; + // Forward declaration. + template <unsigned D, typename P, typename V> class complex_image; namespace internal { @@ -80,16 +80,25 @@ namespace mln typedef trait::image::category::primary category; // FIXME: Is that right? - typedef trait::image::access::random access; - typedef typename trait::image::space_from_point::ret space; - typedef trait::image::size::regular size; - typedef trait::image::support::irregular support; - - typedef trait::image::border::none border; - typedef trait::image::data::stored data; - typedef trait::image::io::read_write io; + typedef trait::image::speed::fast speed; + typedef trait::image::size::regular size; + + // Value. + typedef trait::image::value_access::direct value_access; // FIXME: Is that right? - typedef trait::image::speed::fast speed; + typedef trait::image::value_storage::one_block value_storage; + typedef trait::image::value_browsing::site_wise_only value_browsing; + typedef trait::image::value_io::read_write value_io; + + // Site / domain. + typedef trait::image::localization::space localization; + // FIXME: Likewise. + typedef typename trait::image::space_from_point::ret dimension; + + // Extended domain. + typedef trait::image::ext_domain::none ext_domain; + typedef trait::image::ext_value::irrelevant ext_value; + typedef trait::image::ext_io::irrelevant ext_io; }; } // end of namespace mln::trait @@ -99,13 +108,11 @@ namespace mln /// /// Values are stored on the vertices of the graph. template <unsigned D, typename P, typename V> - struct complex_image : - public internal::image_primary_< V, p_complex<D, P>, complex_image<D,P,V> > + class complex_image + : public internal::image_primary< V, p_complex<D, P>, + complex_image<D, P, V> > { - /// Super type. - typedef mln::internal::image_base_< p_complex<D, P>, - complex_image<D, P, V> > super_; - + public: /// Value associated type. typedef V value; @@ -123,6 +130,7 @@ namespace mln /// Skeleton. typedef complex_image< D, tag::psite_, tag::value_<V> > skeleton; + public: /// Constructors. /// \{ complex_image(); diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am index 5c7e6ac..583cbba 100644 --- a/milena/tests/core/image/Makefile.am +++ b/milena/tests/core/image/Makefile.am @@ -5,7 +5,7 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ ## bgraph_image \ cast_image \ -## complex_image \ + complex_image \ decorated_image \ flat_image \ ## hexa \ @@ -33,7 +33,7 @@ check_PROGRAMS = \ ##bgraph_image_SOURCES = bgraph_image.cc cast_image_SOURCES = cast_image.cc -##complex_image_SOURCES = complex_image.cc +complex_image_SOURCES = complex_image.cc decorated_image_SOURCES = decorated_image.cc ##graph_image_SOURCES = graph_image.cc ##graph_image_wst_SOURCES = graph_image_wst.cc diff --git a/milena/tests/core/image/complex_image.cc b/milena/tests/core/image/complex_image.cc index 44a62f0..7711f38 100644 --- a/milena/tests/core/image/complex_image.cc +++ b/milena/tests/core/image/complex_image.cc @@ -146,7 +146,7 @@ int main() face_handle<1, D> e0_(pc.cplx(), 0); any_face_handle<D> af(e0_); // An associated psite. - complex_psite<D, point2d> cs(af); + complex_psite<D, point2d> cs(pc, af); /*--------------------. @@ -161,9 +161,9 @@ int main() p_faces<2, D, point2d> pf2(c); // Some psites on faces. - faces_psite<0, D, point2d> fs0(v0); - faces_psite<1, D, point2d> fs1(e0); - faces_psite<2, D, point2d> fs2(t0); + faces_psite<0, D, point2d> fs0(pf0, v0); + faces_psite<1, D, point2d> fs1(pf1, e0); + faces_psite<2, D, point2d> fs2(pf2, t0); /*----------------------. -- 1.6.0.1

1 0

2353: Update iterators on p_complex.
by Roland Levillain 22 Sep '08

22 Sep '08

* mln/core/internal/p_complex_piter_base.hh (mln::p_complex_piter_base_<D, P>): Inherit from internal::site_set_iterator_base. (mln::p_complex_piter_base_<D, P>::super_): Update typedef. (mln::p_complex_piter_base_<D, P>::complex_dim): New constant. (mln::p_complex_piter_base_<D, P>::pset) (mln::p_complex_piter_base_<D, P>::psite): Remove typedefs. (mln::p_complex_piter_base_<D, P>::p_complex_piter_base_): New default ctor. (mln::p_complex_piter_base_<D, P>::p_complex_piter_base_(const self&)): Remove copy ctor. (mln::p_complex_piter_base_<D, P>::p_complex_piter_base_): Update other ctor. (mln::p_complex_piter_base_<D, P>::operator=(const self&)): Remove operator. (mln::p_complex_piter_base_<D, P>::next_) (mln::p_complex_piter_base_<D, P>::update_): Update methods. (mln::p_complex_piter_base_<D, P>::is_valid) (mln::p_complex_piter_base_<D, P>::invalidate) (mln::p_complex_piter_base_<D, P>::start): Likewise. Rename as... (mln::p_complex_piter_base_<D, P>::is_valid_) (mln::p_complex_piter_base_<D, P>::invalidate_) (mln::p_complex_piter_base_<D, P>::start_): ...these. (mln::p_complex_piter_base_<D, P>::to_point) (mln::p_complex_piter_base_<D, P>::to_psite) (mln::p_complex_piter_base_<D, P>::operator psite) (mln::p_complex_piter_base_<D, P>::operator[]): Remove methods. (operator<<(std::ostream&, const p_complex_piter_base_<I, P, E>&)): Update. (mln::p_complex_piter_base_<D, P>::p_): Get it from the super class. (mln::p_complex_piter_base_<D, P>::psite): Remove attribute. * mln/core/site_set/p_complex_piter.hh: (mln::p_complex_fwd_piter_<D, P>::p_complex_fwd_piter_) (mln::p_complex_bkd_piter_<D, P>::p_complex_bkd_piter_): New default ctors. (mln::p_complex_fwd_piter_<D, P>::p_complex_fwd_piter_) (mln::p_complex_bkd_piter_<D, P>::p_complex_bkd_piter_): Adjust other ctor. (mln::p_complex_fwd_piter_<D, P>::p_complex_fwd_piter_(const self_&)) (mln::p_complex_bkd_piter_<D, P>::p_complex_bkd_piter_(const self_&)) (mln::p_complex_fwd_piter_<D, P>::operator=(const self_&)) (mln::p_complex_bkd_piter_<D, P>::operator=(const self_&)): Remove. --- milena/ChangeLog | 55 +++++++ milena/mln/core/internal/p_complex_piter_base.hh | 173 +++++----------------- milena/mln/core/site_set/p_complex_piter.hh | 44 +----- 3 files changed, 103 insertions(+), 169 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 583ddc0..ee684ea 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,60 @@ 2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update iterators on p_complex. + + * mln/core/internal/p_complex_piter_base.hh + (mln::p_complex_piter_base_<D, P>): Inherit + from internal::site_set_iterator_base. + (mln::p_complex_piter_base_<D, P>::super_): Update typedef. + (mln::p_complex_piter_base_<D, P>::complex_dim): New constant. + (mln::p_complex_piter_base_<D, P>::pset) + (mln::p_complex_piter_base_<D, P>::psite): + Remove typedefs. + (mln::p_complex_piter_base_<D, P>::p_complex_piter_base_): + New default ctor. + (mln::p_complex_piter_base_<D, P>::p_complex_piter_base_(const self&)): + Remove copy ctor. + (mln::p_complex_piter_base_<D, P>::p_complex_piter_base_): + Update other ctor. + (mln::p_complex_piter_base_<D, P>::operator=(const self&)): + Remove operator. + (mln::p_complex_piter_base_<D, P>::next_) + (mln::p_complex_piter_base_<D, P>::update_): + Update methods. + (mln::p_complex_piter_base_<D, P>::is_valid) + (mln::p_complex_piter_base_<D, P>::invalidate) + (mln::p_complex_piter_base_<D, P>::start): + Likewise. + Rename as... + (mln::p_complex_piter_base_<D, P>::is_valid_) + (mln::p_complex_piter_base_<D, P>::invalidate_) + (mln::p_complex_piter_base_<D, P>::start_): + ...these. + (mln::p_complex_piter_base_<D, P>::to_point) + (mln::p_complex_piter_base_<D, P>::to_psite) + (mln::p_complex_piter_base_<D, P>::operator psite) + (mln::p_complex_piter_base_<D, P>::operator[]): + Remove methods. + (operator<<(std::ostream&, const p_complex_piter_base_<I, P, E>&)): + Update. + (mln::p_complex_piter_base_<D, P>::p_): Get it from the super + class. + (mln::p_complex_piter_base_<D, P>::psite): Remove attribute. + * mln/core/site_set/p_complex_piter.hh: + (mln::p_complex_fwd_piter_<D, P>::p_complex_fwd_piter_) + (mln::p_complex_bkd_piter_<D, P>::p_complex_bkd_piter_): + New default ctors. + (mln::p_complex_fwd_piter_<D, P>::p_complex_fwd_piter_) + (mln::p_complex_bkd_piter_<D, P>::p_complex_bkd_piter_): + Adjust other ctor. + (mln::p_complex_fwd_piter_<D, P>::p_complex_fwd_piter_(const self_&)) + (mln::p_complex_bkd_piter_<D, P>::p_complex_bkd_piter_(const self_&)) + (mln::p_complex_fwd_piter_<D, P>::operator=(const self_&)) + (mln::p_complex_bkd_piter_<D, P>::operator=(const self_&)): + Remove. + +2008-09-22 Roland Levillain <roland(a)lrde.epita.fr> + Update site on mln::p_faces. * mln/core/faces_psite.hh (mln::faces_psite<N, D, P>): Inherit diff --git a/milena/mln/core/internal/p_complex_piter_base.hh b/milena/mln/core/internal/p_complex_piter_base.hh index a9d5f6d..c9787c1 100644 --- a/milena/mln/core/internal/p_complex_piter_base.hh +++ b/milena/mln/core/internal/p_complex_piter_base.hh @@ -32,16 +32,14 @@ /// \brief Definition of an implementation (factoring) class for /// iterators on mln::p_complex. -# include <limits> - -# include <mln/core/internal/point_iterator_base.hh> -# include <mln/core/p_complex.hh> +# include <mln/core/internal/site_set_iterator_base.hh> +# include <mln/core/site_set/p_complex.hh> # include <mln/core/complex_psite.hh> # include <mln/core/complex_iter.hh> + namespace mln { - /* FIXME: Get rid of P? */ // Forward declarations. template <unsigned D, typename P> class p_complex; @@ -57,75 +55,58 @@ namespace mln /// \brief Factoring class for iterators on mln::p_complex. /// /// \arg \p I The type of the underlying complex iterator. - /// \arg \p P The associated point type. + /// \arg \p P The associated site type. /// \arg \p E The type exact type of the iterator. template <typename I, typename P, typename E> - class p_complex_piter_base_ : public point_iterator_base_< P, E > + class p_complex_piter_base_ + : public internal::site_set_iterator_base< p_complex<I::complex_dim, P>, + p_complex_piter_base_<I, P, E> > { + static const unsigned D = I::complex_dim; + typedef p_complex_piter_base_<I, P, E> self_; - typedef point_iterator_base_< P, E > super_; + typedef internal::site_set_iterator_base< p_complex<D, P>, + self_ > super_; /// The type of the underlying complex iterator. typedef I iter; public: - typedef p_complex<iter::complex_dim, P> pset; - typedef complex_psite<iter::complex_dim, P> psite; - typedef P point; - typedef mln_coord(point) coord; - /// Construction and assignment. /// \{ - p_complex_piter_base_(const pset& pc); - p_complex_piter_base_(const self_& rhs); - self_& operator= (const self_& rhs); + p_complex_piter_base_(); + p_complex_piter_base_(const p_complex<D, P>& pc); /// \} /// Manipulation. /// \{ + public: /// Test if the iterator is valid. - bool is_valid() const; + bool is_valid_() const; /// Invalidate the iterator. - void invalidate(); - /// Start an iteration. - void start(); + void invalidate_(); + /// Start an iteration. + void start_(); /// Go to the next point. void next_(); - /// Update the internal data of the iterator. + + private: + /// Update the psite. void update_(); /// \} - /// Conversion and accessors. - /// \{ - /// Reference to the corresponding point. - // FIXME: Don't use this method (dummy value). - const point& to_point () const; - /// Reference to the corresponding point site. - const psite& to_psite () const; - /// Convert the iterator into a line graph psite. - operator psite() const; - - /// Read-only access to the \a i-th coordinate. - // FIXME: Don't use this operator (dummy value). - coord operator[](unsigned i) const; - /// \} + protected: + /// The psite corresponding to this iterator. + using super_::p_; private: /// The underlying complex iterator. iter iter_; - /// The psite corresponding to this iterator. - psite psite_; - /// \brief The point associated to this psite. - // FIXME: Actually, this is a dummy value! - point p_; }; - /* FIXME: This hand-made delegation is painful. We should rely on - the general mechanism provided by Point_Site. But then again, we - need to refine/adjust the interface of Point_Site w.r.t. the - mandatory conversions to points. */ + /// Print an mln::p_complex_piter_base_<I, P, E>. template <typename I, typename P, typename E> inline std::ostream& @@ -133,7 +114,6 @@ namespace mln - # ifndef MLN_INCLUDE_ONLY /*---------------------------------. @@ -142,50 +122,24 @@ namespace mln template <typename I, typename P, typename E> inline - p_complex_piter_base_<I, P, E>::p_complex_piter_base_(const pset& pc) - // Initialize psite_ and p_ a dummy values. - : psite_(), - p_() - { - iter_.set_cplx(pc.cplx()); - mln_postcondition(!is_valid()); - } - - template <typename I, typename P, typename E> - inline - p_complex_piter_base_<I, P, E>::p_complex_piter_base_(const p_complex_piter_base_<I, P, E>& rhs) - : iter_(rhs.iter_), - psite_(rhs.psite_), - // Dummy value. - p_() - { - } - - template <typename I, typename P, typename E> - inline - p_complex_piter_base_<I, P, E>& - p_complex_piter_base_<I, P, E>::operator=(const p_complex_piter_base_<I, P, E>& rhs) + p_complex_piter_base_<I, P, E>::p_complex_piter_base_() { - if (&rhs == this) - return *this; - iter_ = rhs.iter_; - psite_ = rhs.psite_; - return *this; + mln_postcondition(!this->is_valid()); } template <typename I, typename P, typename E> inline - mln_coord(P) - p_complex_piter_base_<I, P, E>::operator[](unsigned i) const + p_complex_piter_base_<I, P, E>::p_complex_piter_base_(const p_complex<D, P>& pc) { - // Dummy value. - return p_[i]; + this->change_target(pc); + iter_.set_cplx(pc.cplx()); + mln_postcondition(!this->is_valid()); } template <typename I, typename P, typename E> inline bool - p_complex_piter_base_<I, P, E>::is_valid() const + p_complex_piter_base_<I, P, E>::is_valid_() const { return iter_.is_valid(); } @@ -193,7 +147,7 @@ namespace mln template <typename I, typename P, typename E> inline void - p_complex_piter_base_<I, P, E>::invalidate() + p_complex_piter_base_<I, P, E>::invalidate_() { iter_.invalidate(); } @@ -201,10 +155,11 @@ namespace mln template <typename I, typename P, typename E> inline void - p_complex_piter_base_<I, P, E>::start() + p_complex_piter_base_<I, P, E>::start_() { iter_.start(); - update_(); + if (this->is_valid()) + update_(); } template <typename I, typename P, typename E> @@ -213,7 +168,7 @@ namespace mln p_complex_piter_base_<I, P, E>::next_() { iter_.next_(); - if (is_valid()) + if (this->is_valid()) update_(); } @@ -222,44 +177,9 @@ namespace mln void p_complex_piter_base_<I, P, E>::update_() { + mln_precondition(this->is_valid()); // Update psite_. - psite_ = psite(iter_); - } - - template <typename I, typename P, typename E> - inline - const P& - p_complex_piter_base_<I, P, E>::to_point() const - { - // Dummy value. - return p_; - } - - template <typename I, typename P, typename E> - inline - const typename p_complex_piter_base_<I, P, E>::psite& - p_complex_piter_base_<I, P, E>::to_psite() const - { - /* We don't check whether the iterator is valid before returning - the value using - - mln_precondition(is_valid()); - - since this method may be called *before* the iterator is - actually initialized. This is the case for instance when this - point iterator (say, P) is used to initialize another iterator - on window or neighborhood (say, Q); most of the time, for_all() - is responsible for the initialization of P, but it takes place - *after* the creation of Q. */ - return psite_; - } - - template <typename I, typename P, typename E> - inline - p_complex_piter_base_<I, P, E>::operator psite() const - { - mln_precondition(is_valid()); - return psite_; + p_ = complex_psite<D, P>(exact(this)->site_set(), iter_); } @@ -268,20 +188,7 @@ namespace mln std::ostream& operator<<(std::ostream& ostr, const p_complex_piter_base_<I, P, E>& p) { - /* FIXME: We should use p.to_psite() here, but as it lacks the - precondition the conversion operator has, so we use the latter. - - We should - - rename `to_psite' as `to_psite_'; - - write a new `to_psite' routine checking the validity of the - iterator; - - have the conversion operator to psite use this new `to_psite' - routine; - - adjust former clients of `to_psite' - - This is a general remark that applies to all point/psite - iterators of Milena. */ - return ostr << static_cast< mln_psite(E) >(p); + return ostr << p.unproxy_(); } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/core/site_set/p_complex_piter.hh b/milena/mln/core/site_set/p_complex_piter.hh index 817306e..7cde5bf 100644 --- a/milena/mln/core/site_set/p_complex_piter.hh +++ b/milena/mln/core/site_set/p_complex_piter.hh @@ -35,8 +35,6 @@ namespace mln { - /* FIXME: Get rid of P? */ - /*-----------------------------. | p_complex_fwd_piter_<D, P>. | @@ -56,9 +54,8 @@ namespace mln public: /// Construction and assignment. /// \{ + p_complex_fwd_piter_(); p_complex_fwd_piter_(const p_complex<D, P>& pc); - p_complex_fwd_piter_(const self_& rhs); - self_& operator= (const self_& rhs); /// \} }; @@ -81,9 +78,8 @@ namespace mln public: /// Construction and assignment. /// \{ + p_complex_bkd_piter_(); p_complex_bkd_piter_(const p_complex<D, P>& pc); - p_complex_bkd_piter_(const self_& rhs); - self_& operator= (const self_& rhs); /// \} }; @@ -97,27 +93,15 @@ namespace mln template <unsigned D, typename P> inline - p_complex_fwd_piter_<D, P>::p_complex_fwd_piter_(const p_complex<D, P>& pc) - : super_(pc) - { - } - - template <unsigned D, typename P> - inline - p_complex_fwd_piter_<D, P>::p_complex_fwd_piter_(const p_complex_fwd_piter_<D, P>& rhs) - : super_(rhs) + p_complex_fwd_piter_<D, P>::p_complex_fwd_piter_() { } template <unsigned D, typename P> inline - p_complex_fwd_piter_<D, P>& - p_complex_fwd_piter_<D, P>::operator=(const p_complex_fwd_piter_<D, P>& rhs) + p_complex_fwd_piter_<D, P>::p_complex_fwd_piter_(const p_complex<D, P>& pc) + : super_(pc) { - if (&rhs == this) - return *this; - super_::operator=(rhs); - return *this; } @@ -127,27 +111,15 @@ namespace mln template <unsigned D, typename P> inline - p_complex_bkd_piter_<D, P>::p_complex_bkd_piter_(const p_complex<D, P>& pc) - : super_(pc) + p_complex_bkd_piter_<D, P>::p_complex_bkd_piter_() { } template <unsigned D, typename P> inline - p_complex_bkd_piter_<D, P>::p_complex_bkd_piter_(const p_complex_bkd_piter_<D, P>& rhs) - : super_(rhs) - { - } - - template <unsigned D, typename P> - inline - p_complex_bkd_piter_<D, P>& - p_complex_bkd_piter_<D, P>::operator=(const p_complex_bkd_piter_<D, P>& rhs) + p_complex_bkd_piter_<D, P>::p_complex_bkd_piter_(const p_complex<D, P>& pc) + : super_(pc) { - if (&rhs == this) - return *this; - super_::operator=(rhs); - return *this; } # endif // ! MLN_INCLUDE_ONLY -- 1.6.0.1

1 0