[Olena-patches] 2359: 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. --- 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 &lt;roland(a)lrde.epita.fr&gt; + 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 &lt;roland(a)lrde.epita.fr&gt; + 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<P>(this->pg(), *i_); + return graph_psite<P>(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<P>(this->pg(), *i_); + return graph_psite<P>(this->center().site_set(), *i_); } # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5