* mln/core/internal/site_relative_iterator_base.hh (mln::internal::site_relative_iterator_base<S, E>::site_set): New method. --- milena/ChangeLog | 8 ++++++++ .../core/internal/site_relative_iterator_base.hh | 15 ++++++++++++++- 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 75826ef..763076d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2008-09-17 Roland Levillain <roland@lrde.epita.fr> + Add a site_set accessor on site_relative_iterator_base. + + * mln/core/internal/site_relative_iterator_base.hh + (mln::internal::site_relative_iterator_base<S, E>::site_set): + New method. + +2008-09-17 Roland Levillain <roland@lrde.epita.fr> + Update line graph psite set iterators. * mln/core/site_set/p_line_graph_piter.hh diff --git a/milena/mln/core/internal/site_relative_iterator_base.hh b/milena/mln/core/internal/site_relative_iterator_base.hh index ea30c22..f9b582f 100644 --- a/milena/mln/core/internal/site_relative_iterator_base.hh +++ b/milena/mln/core/internal/site_relative_iterator_base.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -75,6 +75,10 @@ namespace mln /// Go to the next point. void next_(); + /// Give the site set (neighborhood or window) that this + /// iterator browses. + const S& site_set() const; + /// The psite around which this iterator moves. const mln_psite(S)& center() const; @@ -172,6 +176,15 @@ namespace mln template <typename S, typename E> inline + const S& + site_relative_iterator_base<S, E>::site_set() const + { + mln_precondition(this->s_ != 0); + return *this->s_; + } + + template <typename S, typename E> + inline const mln_psite(S)& site_relative_iterator_base<S,E>::subj_() { -- 1.6.0.1