* mln/core/image/line_graph_image.hh (mln::line_graph_image<P, V>::operator() const) (mln::line_graph_image<P, V>::operator()): Adjust to the new psite interface. s/id()/edge_id()/. Adjust preconditions. --- milena/ChangeLog | 11 +++++++++++ milena/mln/core/image/line_graph_image.hh | 12 ++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index eaec49e..a98db9a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2008-09-17 Roland Levillain <roland@lrde.epita.fr> + Update line graph image. + + * mln/core/image/line_graph_image.hh + (mln::line_graph_image<P, V>::operator() const) + (mln::line_graph_image<P, V>::operator()): + Adjust to the new psite interface. + s/id()/edge_id()/. + Adjust preconditions. + +2008-09-17 Roland Levillain <roland@lrde.epita.fr> + Update line graph neighborhood & window piters. * mln/core/internal/line_graph_vicinity_piter.hh diff --git a/milena/mln/core/image/line_graph_image.hh b/milena/mln/core/image/line_graph_image.hh index 6770a08..69d9509 100644 --- a/milena/mln/core/image/line_graph_image.hh +++ b/milena/mln/core/image/line_graph_image.hh @@ -277,9 +277,9 @@ namespace mln typename line_graph_image<P, V>::rvalue line_graph_image<P, V>::operator()(const line_graph_psite<P>& p) const { - mln_precondition(p.plg() == this->data_->plg_); - mln_precondition(p.id() < this->data_->edge_val_.size()); - return this->data_->edge_val_[p.id()]; + mln_precondition(p.is_valid()); + mln_precondition(p.site_set() == this->data_->plg_); + return this->data_->edge_val_[p.edge_id()]; } template <typename P, typename V> @@ -287,9 +287,9 @@ namespace mln typename line_graph_image<P, V>::lvalue line_graph_image<P, V>::operator()(const line_graph_psite<P>& p) { - mln_precondition(p.plg() == this->data_->plg_); - mln_precondition(p.id() < this->data_->edge_val_.size()); - return this->data_->edge_val_[p.id()]; + mln_precondition(p.is_valid()); + mln_precondition(p.site_set() == this->data_->plg_); + return this->data_->edge_val_[p.edge_id()]; } template <typename P, typename V> -- 1.6.0.1