October 2008 - Olena-patches

2454: Fix mln::topo::complex_psite<D, P> conversion to topo::face<D>.
by Roland Levillain 01 Oct '08

01 Oct '08

* mln/core/site_set/complex_psite.hh (mln::topo::complex_psite<D, P>): Return a const reference to the held face instead of a copy, so that its address can be safely taken. --- milena/ChangeLog | 9 +++++++++ milena/mln/core/site_set/complex_psite.hh | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e6ca427..641ceda 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2008-10-01 Roland Levillain <roland(a)lrde.epita.fr> + Fix mln::topo::complex_psite<D, P> conversion to topo::face<D>. + + * mln/core/site_set/complex_psite.hh + (mln::topo::complex_psite<D, P>): Return a const reference to the + held face instead of a copy, so that its address can be safely + taken. + +2008-10-01 Roland Levillain <roland(a)lrde.epita.fr> + Fix comparison operators on topo::face<D> and topo::n_face<N, D>. * mln/topo/face.hh diff --git a/milena/mln/core/site_set/complex_psite.hh b/milena/mln/core/site_set/complex_psite.hh index 02ab19e..fdff939 100644 --- a/milena/mln/core/site_set/complex_psite.hh +++ b/milena/mln/core/site_set/complex_psite.hh @@ -107,7 +107,7 @@ namespace mln /// Face handle manipulators. /// \{ /// Return the face handle of this point site. - topo::face<D> face() const; + const topo::face<D>& face() const; /// Return the dimension of the face of this psite. unsigned n() const; @@ -289,7 +289,7 @@ namespace mln template <unsigned D, typename P> inline - topo::face<D> + const topo::face<D>& complex_psite<D, P>::face() const { return face_; -- 1.6.0.1

1 0

2453: Fix comparison operators on topo::face<D> and topo::n_face<N, D>.
by Roland Levillain 01 Oct '08

01 Oct '08

* mln/topo/face.hh (operator==(const face<D>&, const face<D>&)) (operator< (const face<D>&, const face<D>&)): * mln/topo/n_face.hh (operator==(const n_face<N, D>&, const n_face<N, D>&)) (operator< (const n_face<N, D>&, const n_face<N, D>&)): Fix preconditions. Fix and catch up with the current interface of mln::topo::face<D>. --- milena/ChangeLog | 13 +++++++++++++ milena/mln/topo/face.hh | 12 +++++------- milena/mln/topo/n_face.hh | 8 ++++---- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5cefbda..e6ca427 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,18 @@ 2008-10-01 Roland Levillain <roland(a)lrde.epita.fr> + Fix comparison operators on topo::face<D> and topo::n_face<N, D>. + + * mln/topo/face.hh + (operator==(const face<D>&, const face<D>&)) + (operator< (const face<D>&, const face<D>&)): + * mln/topo/n_face.hh + (operator==(const n_face<N, D>&, const n_face<N, D>&)) + (operator< (const n_face<N, D>&, const n_face<N, D>&)): + Fix preconditions. + Fix and catch up with the current interface of mln::topo::face<D>. + +2008-10-01 Roland Levillain <roland(a)lrde.epita.fr> + Fix exact type of mln::internal::p_complex_piter_base_ * mln/core/internal/p_complex_piter_base.hh diff --git a/milena/mln/topo/face.hh b/milena/mln/topo/face.hh index 00d6049..686c50a 100644 --- a/milena/mln/topo/face.hh +++ b/milena/mln/topo/face.hh @@ -380,10 +380,8 @@ namespace mln operator==(const face<D>& lhs, const face<D>& rhs) { // Ensure LHS and RHS belong to the same complex. - mln_precondition(&lhs.face.cplx() == &rhs.face.cplx()); - return - lhs.face().n() == rhs.face().n() && - lhs.face().id() == rhs.face().id(); + mln_precondition(lhs.cplx() == rhs.cplx()); + return lhs.n() == rhs.n() && lhs.face_id() == rhs.face_id(); } template <unsigned D> @@ -392,10 +390,10 @@ namespace mln operator< (const face<D>& lhs, const face<D>& rhs) { // Ensure LHS and RHS belong to the same complex. - mln_precondition(&lhs.face.cplx() == &rhs.face.cplx()); + mln_precondition(lhs.cplx() == rhs.cplx()); // Ensure LHS and RHS have the same dimension. - mln_precondition(lhs.face().n() == rhs.face().n()); - return lhs.face().id() < rhs.face().id(); + mln_precondition(lhs.n() == rhs.n()); + return lhs.face_id() < rhs.face_id(); } diff --git a/milena/mln/topo/n_face.hh b/milena/mln/topo/n_face.hh index fddf568..343f7b0 100644 --- a/milena/mln/topo/n_face.hh +++ b/milena/mln/topo/n_face.hh @@ -239,8 +239,8 @@ namespace mln operator==(const n_face<N, D>& lhs, const n_face<N, D>& rhs) { // Ensure LHS and RHS belong to the same complex. - mln_precondition(&lhs.face.cplx() == &rhs.face.cplx()); - return lhs.face().id() == rhs.face().id(); + mln_precondition(lhs.cplx() == rhs.cplx()); + return lhs.face_id() == rhs.face_id(); } template <unsigned N, unsigned D> @@ -249,8 +249,8 @@ namespace mln operator< (const n_face<N, D>& lhs, const n_face<N, D>& rhs) { // Ensure LHS and RHS belong to the same complex. - mln_precondition(&lhs.face.cplx() == &rhs.face.cplx()); - return lhs.face().id() < rhs.face().id(); + mln_precondition(lhs.cplx() == rhs.cplx()); + return lhs.face_id() < rhs.face_id(); } -- 1.6.0.1

1 0

2452: Fix exact type of mln::internal::p_complex_piter_base_
by Roland Levillain 01 Oct '08

01 Oct '08

* mln/core/internal/p_complex_piter_base.hh (mln::internal::p_complex_piter_base_<I, S, P, E>): Fix the type of the base class w.r.t. the exact type. (mln::internal::p_complex_piter_base_<I, S, P, E>::super_): Adjust. --- milena/ChangeLog | 10 ++++++++++ milena/mln/core/internal/p_complex_piter_base.hh | 7 +++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c32bd1d..5cefbda 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,13 @@ +2008-10-01 Roland Levillain <roland(a)lrde.epita.fr> + + Fix exact type of mln::internal::p_complex_piter_base_ + + * mln/core/internal/p_complex_piter_base.hh + (mln::internal::p_complex_piter_base_<I, S, P, E>): Fix the type + of the base class w.r.t. the exact type. + (mln::internal::p_complex_piter_base_<I, S, P, E>::super_): + Adjust. + 2008-09-30 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Add interpolation function. Revamp lazy_image. diff --git a/milena/mln/core/internal/p_complex_piter_base.hh b/milena/mln/core/internal/p_complex_piter_base.hh index d906011..edd73b5 100644 --- a/milena/mln/core/internal/p_complex_piter_base.hh +++ b/milena/mln/core/internal/p_complex_piter_base.hh @@ -59,11 +59,10 @@ namespace mln /// \arg \p E The type exact type of the iterator. template <typename I, typename S, typename P, typename E> class p_complex_piter_base_ - : public internal::site_set_iterator_base< S, - p_complex_piter_base_<I, S, P, E> > + : public internal::site_set_iterator_base< S, E > { - typedef p_complex_piter_base_<I, S, P, E> self_; - typedef internal::site_set_iterator_base< S, self_ > super_; + typedef p_complex_piter_base_< I, S, P, E > self_; + typedef internal::site_set_iterator_base< S, E > super_; /// The type of the underlying complex iterator. typedef I iter; -- 1.6.0.1

1 0