September 2008 - Olena-patches

cleanup-2008 2388: Add dispatch for morpho erosion.
by Thierry Geraud 24 Sep '08

24 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add dispatch for morpho erosion. * tests/morpho/temp.erosion.cc: New. * mln/morpho/erosion.spe.hh: Add dispatch. mln/morpho/erosion.spe.hh | 159 +++++++++++++++++++++++++++++++++++++------ tests/morpho/temp.erosion.cc | 116 +++++++++++++++++++++++++++++++ 2 files changed, 253 insertions(+), 22 deletions(-) Index: tests/morpho/temp.erosion.cc --- tests/morpho/temp.erosion.cc (revision 0) +++ tests/morpho/temp.erosion.cc (revision 0) @@ -0,0 +1,116 @@ +// Copyright (C) 2007, 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/morpho/erosion.cc + * + * \brief Test on mln::morpho::erosion. + */ + +#include <mln/core/image/image2d.hh> +#include <mln/win/rectangle2d.hh> +#include <mln/win/octagon2d.hh> +#include <mln/win/diag2d.hh> +#include <mln/win/backdiag2d.hh> +#include <mln/core/alias/window2d.hh> + +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/value/int_u8.hh> +#include <mln/level/fill.hh> +#include <mln/morpho/erosion.hh> + +#include <mln/pw/value.hh> +#include <mln/pw/cst.hh> +#include <mln/fun/ops.hh> + +#include <mln/convert/to_p_array.hh> +#include <mln/convert/to_window.hh> + + +int main() +{ + using namespace mln; + using value::int_u8; + + unsigned + l_oct = 11, L_oct = 6 * l_oct + 1, + l_rec = 29, L_rec = 2 * l_rec + 1; + + // l_ + // oct rec err + // 0 0 3 + // 0 1 5 + // 1 2 15 + // 1 3 9 + // 2 5 11 + // 3 8 9 + // 5 13 15 + // 8 21 11 + // 11 29 1 + // 25 66 15 + + image2d<int_u8> lena; + io::pgm::load(lena, "./tiny.pgm"); + + trace::quiet = false; + + { + win::rectangle2d rec(L_rec, L_rec); + io::pgm::save(morpho::erosion(lena, rec), + "out1.pgm"); + } + +// { +// win::octagon2d oct(L_oct); +// io::pgm::save(morpho::erosion(lena, oct), +// "out2.pgm"); +// } + +// { +// p_array<point2d> vec = convert::to_p_array(rec, point2d::zero); +// window2d win = convert::to_window(vec); + +// image2d<int_u8> out(lena.domain()); +// level::ero(lena, win, out); +// morpho::erosion(lena, win, out); +// io::pgm::save(out, "out.pgm"); +// } + +// { +// image2d<bool> bin(lena.domain()), out(lena.domain()); +// level::fill(bin, pw::value(lena) > pw::cst(127)); +// morpho::erosion(bin, rec, out); + +// image2d<int_u8> test(lena.domain()); +// image2d<int_u8>::fwd_piter p(lena.domain()); +// for_all(p) +// test(p) = out(p) ? 255 : 0; +// io::pgm::save(test, "test.pgm"); +// } + +} Index: mln/morpho/erosion.spe.hh --- mln/morpho/erosion.spe.hh (revision 2387) +++ mln/morpho/erosion.spe.hh (working copy) @@ -267,7 +267,7 @@ erosion_arbitrary_2d_fastest_functor(const I& input, const W& win) : input(input), win(win), - min(input.values()), + min(), win_left(set::diff(geom::shift(win, left), win)), win_right(set::diff(win, geom::shift(win, left))), win_bot(set::diff(win, geom::shift(win, up))), @@ -328,8 +328,7 @@ trace::entering("morpho::impl:erosion_arbitrary_2d_fastest"); typedef erosion_arbitrary_2d_fastest_functor<I, W> F; - mlc_equal(W, win::octagon2d)::check(); - F f(input, win); + F f(exact(input), exact(win)); canvas::browsing::snake_fwd(f); trace::exiting("morpho::impl:erosion_arbitrary_2d_fastest"); @@ -363,7 +362,7 @@ erosion_arbitrary_2d_functor(const I& input, const W& win) : input(input), win(win), - min(input.values()), + min(), win_left(set::diff(geom::shift(win, left), win)), win_right(set::diff(win, geom::shift(win, left))), win_bot(set::diff(win, geom::shift(win, up))), @@ -424,8 +423,7 @@ trace::entering("morpho::impl:erosion_arbitrary_2d"); typedef erosion_arbitrary_2d_functor<I, W> F; - mlc_equal(W, win::octagon2d)::check(); - F f(input, win); + F f(exact(input), exact(win)); canvas::browsing::snake_fwd(f); trace::exiting("morpho::impl:erosion_arbitrary_2d"); @@ -438,30 +436,147 @@ namespace internal { + + // dispatch for the generic version + template <typename I, typename W> mln_concrete(I) - erosion_dispatch(const Image& input, const Window<W>& win) + erosion_dispatch_for_generic(trait::image::kind::logic, // On sets. + trait::image::speed::fastest, + const I& input, const W& win) { - if (mlc_equal(mln_trait_image_kind(I)(), - trait::image::kind::logic)::value == true) -/* FIXME: Temporarily disabled, since this dynamic dispatch triggers - errors when class I has no pixter associated type(s). */ -#if 0 - if (mlc_equal(mln_trait_image_speed(I)(), - trait::image::speed::fastest)::value == true) + if (win.is_centered()) + return impl::erosion_on_set_centered_fastest(input, win); + else return impl::erosion_on_set_fastest(input, win); + } + + template <typename I, typename W> + mln_concrete(I) + erosion_dispatch_for_generic(trait::image::kind::any, // On functions. + trait::image::speed::fastest, + const I& input, const W& win) + { + return impl::erosion_on_function_fastest(input, win); + } + + template <typename I, typename W> + mln_concrete(I) + erosion_dispatch_for_generic(trait::image::kind::logic, // On sets. + trait::image::speed::any, + const I& input, const W& win) + { + if (win.is_centered()) + return erosion_on_set_centered(input, win); else -#endif return impl::generic::erosion_on_set(input, win); + } + + template <typename I, typename W> + mln_concrete(I) + erosion_dispatch_for_generic(trait::image::kind::any, // On functions. + trait::image::speed::any, + const I& input, const W& win) + { + return impl::generic::erosion_on_function(input, win); + } + + template <typename I, typename W> + mln_concrete(I) + erosion_dispatch_for_generic(const I& input, const W& win) // Entry point. + { + return erosion_dispatch_for_generic(mln_trait_image_kind(I)(), + mln_trait_image_speed(I)(), + input, win); + } + + + // dispatch for arbitrary elements + + template <typename I, typename W> + bool + erosion_chooses_arbitrary(const I& input, const W& win) + { + return + win.size() >= 25 // size is not too small + && + // 2d case only + mlc_equal(mln_trait_image_dimension(I), + trait::image::dimension::two_d)::value + && + // on a grid + mlc_is_a(mln_site(I), + Gpoint)::value + && + // continuous data + mlc_not_equal(mln_trait_image_value_storage(I), + trait::image::value_storage::disrupted)::value; + } + + template <typename I, typename W> + mln_concrete(I) + erosion_dispatch_for_arbitrary(trait::image::speed::fastest, + const I& input, const W& win) + { + return impl::erosion_arbitrary_2d_fastest(input, win); + } + + template <typename I, typename W> + mln_concrete(I) + erosion_dispatch_for_arbitrary(trait::image::speed::any, + const I& input, const W& win) + { + return impl::erosion_arbitrary_2d(input, win); + } + + template <typename I, typename W> + mln_concrete(I) + erosion_dispatch_for_arbitrary(const I& input, const W& win) + { + return erosion_dispatch_for_arbitrary(mln_trait_image_speed(I)(), + input, win); + } + + // dispatch w.r.t. win + + template <typename I, typename W> + mln_concrete(I) + erosion_dispatch_wrt_win(const I& input, const W& win) + { + if (erosion_chooses_arbitrary(input, win)) + return erosion_dispatch_for_arbitrary(input, win); else -// FIXME: Likewise. -#if 0 - if (mlc_equal(mln_trait_image_speed(I)(), - trait::image::speed::fastest)::value == true) - return impl::erosion_on_function_fastest(input, win); + return erosion_dispatch_for_generic(input, win); + } + + template <typename I> + mln_concrete(I) + erosion_dispatch_wrt_win(const I& input, const win::rectangle2d& win) + { + if (win.size() <= 9) // FIXME: Hard-coded! + return erosion_dispatch_for_generic(input, win); else -#endif - return impl::generic::erosion_on_function(input, win); + return impl::erosion_rectangle2d(input, win); + } + + template <typename I> + mln_concrete(I) + erosion_dispatch_wrt_win(const I& input, const win::octagon2d& win) + { + if (win.size() <= 9) // FIXME: Hard-coded! + return erosion_dispatch_for_generic(input, win); + else + return impl::erosion_octagon2d(input, win); + } + + + // The dispatch entry point. + + template <typename I, typename W> + mln_concrete(I) + erosion_dispatch(const Image& input, const Window<W>& win) + { + return erosion_dispatch_wrt_win(exact(input), exact(win)); } } // end of namespace mln::morpho::internal

1 0

cleanup-2008 2387: Fix/Update interpolated image.
by Ugo Jardonnet 24 Sep '08

24 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Fix/Update interpolated image. * mln/core/image/interpolated.hh: Fix/Update traits and accessors. interpolated.hh | 83 ++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 51 insertions(+), 32 deletions(-) Index: mln/core/image/interpolated.hh --- mln/core/image/interpolated.hh (revision 2386) +++ mln/core/image/interpolated.hh (working copy) @@ -32,6 +32,8 @@ * * \brief Definition of a morpher that makes an image become readable * with floating coordinates. + * + * \todo think having has(algebra::vec v) as a method */ # include <cmath> @@ -44,32 +46,47 @@ { // Fwd decl. - template <typename I> struct interpolated; + template <typename I, template <class> class F> struct interpolated; namespace internal { /// Data structure for \c mln::interpolated. - template <typename I> - struct data< interpolated > + template <typename I, template <class> class F> + struct data< interpolated<I,F> > { data(I& ima); - I ima_; + I& ima_; }; } // end of namespace mln::internal + + namespace trait + { + + template <typename I, template <class> class F> + struct image_< interpolated<I,F> > + : public image_ // Same as I except... + { + // ...these changes. + typedef trait::image::value_io::read_only value_io; + }; + + } // end of namespace mln::trait + + /*! \brief Morpher that makes underlaying image being accessed with floating coordinate. * */ - template <typename I> + template <typename I, template <class> class F> struct interpolated : - public mln::internal::image_identity< I, mln_pset(I), interpolated > + public mln::internal::image_identity< I, mln_pset(I), interpolated<I,F> > { typedef mln::internal::image_identity< I, mln_pset(I), - interpolated > super_; + interpolated<I,F> > super_; /// Point_Site associated type. typedef mln_psite(I) psite; @@ -84,7 +101,7 @@ typedef mln_rvalue(I) rvalue; /// Skeleton. - typedef interpolated< tag::image_ > skeleton; + typedef interpolated< tag::image_, F > skeleton; /// Constructors. @@ -102,15 +119,15 @@ using super_::has; /// Test if a pixel value is accessible at \p v. - bool has(const mln::algebra::vec<I::point::dim, float>& v) const; + bool has(const mln::algebra::vec<I::psite::dim, float>& v) const; /// Read-only access of pixel value at point site \p p. /// Mutable access is only OK for reading (not writing). using super_::operator(); - mln_value(I) operator()(const mln::algebra::vec<I::point::dim, float>& v) const; - + mln_value(I) operator()(const mln::algebra::vec<I::psite::dim, float>& v) const; + const F fun_; }; @@ -122,66 +139,68 @@ // internal::data< interpolated<I,S> > - template <typename I> + template <typename I, template <class> class F> inline - data< interpolated >::data(I& ima) + data< interpolated<I,F> >::data(I& ima) : ima_(ima) { } } // end of namespace mln::internal - template <typename I> + template <typename I, template <class> class F> inline - interpolated::interpolated(I& ima) + interpolated<I,F>::interpolated(I& ima) + : fun_(ima) { mln_precondition(ima.has_data()); init_(ima); } - template <typename I> + template <typename I, template <class> class F> inline - interpolated::interpolated() + interpolated<I,F>::interpolated() { } - template <typename I> + template <typename I, template <class> class F> inline void - interpolated::init_(I& ima) + interpolated<I, F >::init_(I& ima) { mln_precondition(ima.has_data()); - this->data_ = new internal::data< interpolated >(ima); + this->data_ = new internal::data< interpolated<I,F> >(ima); } - template <typename I> + template <typename I, template <class> class F> inline - bool interpolated::has_data() const + bool interpolated<I,F>::has_data() const { mln_invariant(this->data_->ima_.has_data()); return true; } - template <typename I> + template <typename I, template <class> class F> inline - bool interpolated::has(const mln::algebra::vec<I::point::dim, float>& v) const + bool interpolated<I,F>::has(const mln::algebra::vec<I::psite::dim, float>& v) const { mln_psite(I) p; - for (unsigned i = 0; i < I::point::dim; ++i) + for (unsigned i = 0; i < I::psite::dim; ++i) p[i] = static_cast<int>(round(v[i])); return this->data_->ima_.has(p); } - template <typename I> + template <typename I, template <class> class F> inline mln_value(I) - interpolated::operator()(const mln::algebra::vec<I::point::dim, float>& v) const + interpolated<I,F>::operator()(const mln::algebra::vec<I::psite::dim, float>& v) const { - mln_psite(I) p; - for (unsigned i = 0; i < I::point::dim; ++i) - p[i] = static_cast<int>(round(v[i])); - mln_assertion(this->data_->ima_.has(p)); - return this->data_->ima_(p); + // mln_psite(I) p; + // for (unsigned i = 0; i < I::point::dim; ++i) + // p[i] = static_cast<int>(round(v[i])); + // mln_assertion(this->data_->ima_.has(p)); + // return this->data_->ima_(p); + return fun_(v); } # endif // ! MLN_INCLUDE_ONLY

1 0

cleanup-2008 2386: Sandbox: Make use of interpolated image.
by Ugo Jardonnet 24 Sep '08

24 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Sandbox: Make use of interpolated image. * jardonnet/virtual/access.hh (bilinear): Fix rounding error. * jardonnet/virtual/access.cc (test2): Add, make use of interpolated. * jardonnet/virtual/bilinear.ppm: Fixed result. access.cc | 29 +++++++++++++++++++++++++++-- access.hh | 50 +++++++++++++++++++++++++++++++++----------------- 2 files changed, 60 insertions(+), 19 deletions(-) Index: jardonnet/virtual/access.hh --- jardonnet/virtual/access.hh (revision 2385) +++ jardonnet/virtual/access.hh (working copy) @@ -74,11 +74,12 @@ const I& ima; }; + template < typename I > struct bilinear : public fun::internal::selector_<const algebra::vec<3,float>, // 3,float is a dummy parameter (real is n,T) - mln_value(I), linear >::ret + mln_value(I), bilinear >::ret { typedef mln_value(I) result; @@ -100,44 +101,59 @@ double x = v[0]; double y = v[1]; - double x1 = mln_psite(I)::coord(v[0]); - double x2 = mln_psite(I)::coord(v[0]+ 1); - double y1 = mln_psite(I)::coord(v[1]); - double y2 = mln_psite(I)::coord(v[1]+ 1); + double x1 = std::floor(v[0]); + double x2 = std::floor(v[0]) + 1; + double y1 = std::floor(v[1]); + double y2 = std::floor(v[1]) + 1; + //if (not ima.has(point2d(x1, y1))) return mln_value(I)(); vsum q11 = ima(point2d(x1, y1)); vsum q12 = ima(point2d(x1, y2)); vsum q21 = ima(point2d(x2, y1)); vsum q22 = ima(point2d(x2, y2)); - //if (x2 - x1 == 0) - //std::cout << x2 <<" - " << x1 << std::endl; - double x2_x1 = (x2 - x1) ? x2 - x1 : 0.000001; - double y2_y1 = (y2 - y1) ? y2 - y1 : 0.000001; + double x2_x1 = x2 - x1; + double y2_y1 = y2 - y1; // linear interpolation #1 vsum img_r1 = q11 * (x2 - x) / (x2_x1) + q21 * (x - x1) / (x2_x1); - //std::cout << "l1 : "<< img_r1 << std::endl; // linear interpolation #2 - vsum img_r2 = q12 * (x2 - x) / (x2_x1) + - q22 * (x - x1) / (x2_x1); - //std::cout << "l2 : "<< img_r2 << std::endl; + vsum img_r2 = q12 * (x2 - x) / (x2_x1) + q22 * (x - x1) / (x2_x1); // interpolating in y direction - // FIXME : Sometime try to cast neg value to rgb component vsum res = (img_r1 * (y2 - y) / (y2_y1) + img_r2 * (y - y1) /(y2_y1)); - res[0] = (res[0] < 0) ? 0 : res[0]; - res[1] = (res[1] < 0) ? 0 : res[1]; - res[2] = (res[2] < 0) ? 0 : res[2]; return convert::to<mln_value(I)>(res); } const I& ima; }; + + template < typename I > + struct bicubic + : public fun::internal::selector_<const algebra::vec<3,float>, + // 3,float is a dummy parameter (real is n,T) + mln_value(I), bicubic >::ret + { + typedef mln_value(I) result; + + bicubic(const I& ima) : ima(ima) {} + + template <unsigned n, typename T> + mln_value(I) + operator()(const algebra::vec<n,T>& v) const + { + typedef mln_sum(mln_value(I)) vsum; + + + //return convert::to<mln_value(I)>(res); + } + + const I& ima; + }; } namespace access Index: jardonnet/virtual/bilinear.ppm Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: jardonnet/virtual/access.cc --- jardonnet/virtual/access.cc (revision 2385) +++ jardonnet/virtual/access.cc (working copy) @@ -10,6 +10,7 @@ #include <mln/border/adjust.hh> #include <mln/border/fill.hh> #include <mln/literal/all.hh> +#include <mln/core/image/interpolated.hh> template < template <class> class N, typename I, typename T> @@ -30,6 +31,23 @@ } +template <typename I, typename O, typename T> +void +test2(const I& interp, O& output, + const mln::Function_x2x<T>& t_) +{ + T t = exact(t_); + + mln_piter(I) p(output.domain()); + for_all(p) + { + mln::algebra::vec<2,float> v = mln::point2d(p); + mln::algebra::vec<2,float> tip = t.inv()(v); + output(p) = interp(tip); + } +} + + int main() { using namespace mln; @@ -39,13 +57,20 @@ io::ppm::load(input, "./lena.ppm"); image2d< value::rgb<8> > output(input.domain()); - border::adjust(input, 512); - border::fill(input, literal::black); + // adjust border + border::adjust(input, 100); + //border::fill(input, literal::black); + + interpolated< image2d< value::rgb<8> >, interpolation::bilinear> + interp(input); + + //border::adjust(interp, 20); //transformation fun::x2x::translation<2,float> t(make::vec(20,20)); fun::x2x::rotation<2,float> r(0.12, make::vec(0,1)); test1<interpolation::bilinear>(input, output, compose(r,t)); + //test2(interp, output, compose(r,t)); mln::io::ppm::save(output,"./out.ppm"); }

1 0

2385: * tests/core/image/complex_image.cc: Exercise iterators on p_faces.
by Roland Levillain 24 Sep '08

24 Sep '08

--- milena/ChangeLog | 4 +++ milena/tests/core/image/complex_image.cc | 34 ++++++++++++++++++++++++++--- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 743cc09..f4e7d20 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + * tests/core/image/complex_image.cc: Exercise iterators on p_faces. + +2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Add iterators on p_faces. * mln/core/site_set/p_faces_piter.hh: New. diff --git a/milena/tests/core/image/complex_image.cc b/milena/tests/core/image/complex_image.cc index 39e6239..1b06036 100644 --- a/milena/tests/core/image/complex_image.cc +++ b/milena/tests/core/image/complex_image.cc @@ -141,24 +141,48 @@ int main() | Complex-based image iterators. | `--------------------------------*/ + // ---------------------------- // + // Iterators on all the faces. // + // ---------------------------- // + mln_fwd_piter_(ima_t) fp(ima.domain()); for_all(fp) std::cout << "ima(" << fp << ") = " << ima(fp) << std::endl; - std::cout << std::endl; mln_bkd_piter_(ima_t) bp(ima.domain()); for_all(bp) std::cout << "ima(" << bp << ") = " << ima(bp) << std::endl; + std::cout << std::endl; + + + // ----------------------------------------------- // + // Iterators on n-faces (with n fixed in [0, D]). // + // ----------------------------------------------- // + + // We need to instantiate a (non temporary) object on the stack, so + // that it can be referenced later by face_psites held by iterators + // (as for windows and neighborhoods). + + typedef p_faces<0, D, point2d> p0f_t; + p0f_t pf(ima.domain()); + mln_piter_(p0f_t) f0p(pf); + for_all(f0p) + /* FIXME: This explicit call to unproxy_() is not elegant... But + is required for ima() to work, since the target operator() is + templated. */ + std::cout << "ima(" << f0p << ") = " << ima(f0p.unproxy_()) << std::endl; /* FIXME: Implement other psite iterators, for instance: - - iterators on N-faces with N fixed in [0, D] (using p_faces - and faces_psite?) - iterators on N-faces with N in a subset of [0, D]; - etc. */ + // ---------------------------------------- // + // Iterators on windows and neighborhoods. // + // ---------------------------------------- // + /* FIXME: Implement windows (and neighborhoods) and corresponding iterators for complex-based images. @@ -188,5 +212,7 @@ int main() - what else? We might want to look at operators on (simplicial?) complexes - like star, link, etc. and possibly implement them. */ + like star, link, etc. and possibly implement them. + + See also https://trac.lrde.org/olena/ticket/162. */ } -- 1.6.0.1

1 0

2384: Add iterators on p_faces.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/site_set/p_faces_piter.hh: New. Add forward declarations for these iterators... * mln/core/site_set/p_faces.hh: ...here. (mln::p_faces<N,D,P>::fwd_piter): Set to p_faces_fwd_piter_<N,D,P>. (mln::p_faces<N,D,P>::bkd_piter): Set to p_faces_bkd_piter_<N,D,P>. (mln::p_faces<N, D, P>::p_faces(const p_complex<D, P>&)): New ctor. --- milena/ChangeLog | 12 +++ milena/mln/core/site_set/p_faces.hh | 32 +++++-- milena/mln/core/site_set/p_faces_piter.hh | 148 +++++++++++++++++++++++++++++ 3 files changed, 184 insertions(+), 8 deletions(-) create mode 100644 milena/mln/core/site_set/p_faces_piter.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 784f4a4..743cc09 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Add iterators on p_faces. + + * mln/core/site_set/p_faces_piter.hh: New. + Add forward declarations for these iterators... + * mln/core/site_set/p_faces.hh: ...here. + (mln::p_faces<N,D,P>::fwd_piter): Set to p_faces_fwd_piter_<N,D,P>. + (mln::p_faces<N,D,P>::bkd_piter): Set to p_faces_bkd_piter_<N,D,P>. + (mln::p_faces<N, D, P>::p_faces(const p_complex<D, P>&)): + New ctor. + +2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Make internal::p_complex_piter_base generic w.r.t. the site set. * mln/core/internal/p_complex_piter_base.hh diff --git a/milena/mln/core/site_set/p_faces.hh b/milena/mln/core/site_set/p_faces.hh index 3c48100..21cd898 100644 --- a/milena/mln/core/site_set/p_faces.hh +++ b/milena/mln/core/site_set/p_faces.hh @@ -34,10 +34,12 @@ # include <mln/core/internal/site_set_base.hh> -# include <mln/accu/bbox.hh> # include <mln/core/complex.hh> # include <mln/core/faces_psite.hh> +# include <mln/core/site_set/p_faces_piter.hh> + +# include <mln/core/site_set/p_complex.hh> namespace mln @@ -45,11 +47,9 @@ namespace mln // Forward declarations. template <unsigned N, unsigned D, typename P> class p_faces; - // FIXME: Enable when available. -#if 0 + template <unsigned N, unsigned D, typename P> class p_faces_fwd_piter_; template <unsigned N, unsigned D, typename P> class p_faces_bkd_piter_; -#endif namespace trait @@ -79,8 +79,14 @@ namespace mln /// \brief Construct a faces psite set from an mln::complex. /// /// \param gr The complex upon which the complex psite set is built. + p_faces(const complex<D>& cplx); + + /// \brief Construct a faces psite set from an mln::p_complex. + /// + /// \param gr The complex upon which the complex psite set is built. /// - p_faces (const complex<D>& cplx); + /// \todo When available, get location information from \a pc. + p_faces(const p_complex<D, P>& pc); /// Associated types. /// \{ @@ -92,11 +98,11 @@ namespace mln // FIXME: Fake. /// Forward Site_Iterator associated type. - typedef void fwd_piter; + typedef p_faces_fwd_piter_<N, D, P> fwd_piter; // FIXME: Fake. /// Backward Site_Iterator associated type. - typedef void bkd_piter; + typedef p_faces_bkd_piter_<N, D, P> bkd_piter; /// Site_Iterator associated type. typedef fwd_piter piter; @@ -119,6 +125,7 @@ namespace mln // simplify (and lighten) the implementation of piters, psites, // etc. + // FIXME: This method is probably useless now. /// Is this site set valid? bool is_valid() const; @@ -192,6 +199,15 @@ namespace mln template <unsigned N, unsigned D, typename P> inline + p_faces<N, D, P>::p_faces(const p_complex<D, P>& pc) + : cplx_(pc.cplx()) + { + // Ensure N is compatible with D. + metal::bool_< N <= D >::check(); + } + + template <unsigned N, unsigned D, typename P> + inline unsigned p_faces<N, D, P>::nsites() const { @@ -223,7 +239,7 @@ namespace mln return // Check whether P's complex is compatible with this pset's complex. (p.site_set() == *this) && - // Check whether the complex has the face associated to P. + // Check whether P is valid. (p.is_valid()); } diff --git a/milena/mln/core/site_set/p_faces_piter.hh b/milena/mln/core/site_set/p_faces_piter.hh new file mode 100644 index 0000000..b26ca9b --- /dev/null +++ b/milena/mln/core/site_set/p_faces_piter.hh @@ -0,0 +1,148 @@ +// 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_SITE_SET_P_FACES_PITER_HH +# define MLN_CORE_SITE_SET_P_FACES_PITER_HH + +/// \file mln/core/site_set/p_faces_piter.hh +/// \brief Definition of point iterator on complex-based pset. + +# include <mln/core/site_set/p_faces.hh> +# include <mln/core/internal/p_complex_piter_base.hh> +# include <mln/core/faces_iter.hh> + + +namespace mln +{ + + // Forward declarations. + template <unsigned N, unsigned D, typename P> class p_faces; + + template <unsigned N, unsigned D> class faces_fwd_iter_; + template <unsigned N, unsigned D> class faces_bkd_iter_; + + + /*------------------------------. + | p_faces_fwd_piter_<N, D, P>. | + `------------------------------*/ + + /// \brief Forward iterator on point sites of a mln::p_faces<N, D, P>. + template <unsigned N, unsigned D, typename P> + class p_faces_fwd_piter_ + : public internal::p_complex_piter_base_< faces_fwd_iter_<N, D>, + p_faces<N, D, P>, + P, + p_faces_fwd_piter_<N, D, P> > + { + typedef p_faces_fwd_piter_<N, D, P> self_; + typedef internal::p_complex_piter_base_< faces_fwd_iter_<N, D>, + p_faces<N, D, P>, + P, + self_ > super_; + + public: + /// Construction and assignment. + /// \{ + p_faces_fwd_piter_(); + p_faces_fwd_piter_(const p_faces<N, D, P>& pc); + /// \} + }; + + + /*------------------------------. + | p_faces_bkd_piter_<N, D, P>. | + `------------------------------*/ + + /// \brief Backward iterator on point sites of a mln::p_faces<N, D, P>. + template <unsigned N, unsigned D, typename P> + class p_faces_bkd_piter_ + /* FIXME: Rename internal::p_complex_piter_base_ to something else, + as it is also used for p_faces piters! */ + : public internal::p_complex_piter_base_< faces_bkd_iter_<N, D>, + p_faces<N, D, P>, + P, + p_faces_bkd_piter_<N, D, P> > + { + typedef p_faces_bkd_piter_<N, D, P> self_; + typedef internal::p_complex_piter_base_< faces_bkd_iter_<N, D>, + p_faces<N, D, P>, + P, + self_ > super_; + + public: + /// Construction and assignment. + /// \{ + p_faces_bkd_piter_(); + p_faces_bkd_piter_(const p_faces<N, D, P>& pc); + /// \} + }; + + + +# ifndef MLN_INCLUDE_ONLY + + /*------------------------------. + | p_faces_fwd_piter_<N, D, P>. | + `------------------------------*/ + + template <unsigned N, unsigned D, typename P> + inline + p_faces_fwd_piter_<N, D, P>::p_faces_fwd_piter_() + { + } + + template <unsigned N, unsigned D, typename P> + inline + p_faces_fwd_piter_<N, D, P>::p_faces_fwd_piter_(const p_faces<N, D, P>& pc) + : super_(pc) + { + } + + + /*------------------------------. + | p_faces_bkd_piter_<N, D, P>. | + `------------------------------*/ + + template <unsigned N, unsigned D, typename P> + inline + p_faces_bkd_piter_<N, D, P>::p_faces_bkd_piter_() + { + } + + template <unsigned N, unsigned D, typename P> + inline + p_faces_bkd_piter_<N, D, P>::p_faces_bkd_piter_(const p_faces<N, D, P>& pc) + : super_(pc) + { + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of mln + + +#endif // ! MLN_CORE_SITE_SET_P_FACES_PITER_HH -- 1.6.0.1

1 0

2383: Make internal::p_complex_piter_base generic w.r.t. the site set.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/internal/p_complex_piter_base.hh (mln::internal::p_complex_piter_base<I, P, E>): Take an additional parameter and turn this class into... (mln::internal::p_complex_piter_base<I, S, P, E>): ...this. Adjust inheritance and member definitions. (mln::internal::p_complex_piter_base<I, S, P, E>::complex_dim): Remove constant. * mln/core/site_set/p_complex_piter.hh: Catch up with the changes in mln::internal::p_complex_piter_base. --- milena/ChangeLog | 14 ++++ milena/mln/core/internal/p_complex_piter_base.hh | 82 +++++++++++----------- milena/mln/core/site_set/p_complex_piter.hh | 23 +++++- 3 files changed, 73 insertions(+), 46 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 413bbb6..784f4a4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Make internal::p_complex_piter_base generic w.r.t. the site set. + + * mln/core/internal/p_complex_piter_base.hh + (mln::internal::p_complex_piter_base<I, P, E>): Take an additional + parameter and turn this class into... + (mln::internal::p_complex_piter_base<I, S, P, E>): ...this. + Adjust inheritance and member definitions. + (mln::internal::p_complex_piter_base<I, S, P, E>::complex_dim): + Remove constant. + * mln/core/site_set/p_complex_piter.hh: Catch up with the changes + in mln::internal::p_complex_piter_base. + +2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Have mln::complex_image be accessible via faces_psites. * mln/core/image/complex_image.hh diff --git a/milena/mln/core/internal/p_complex_piter_base.hh b/milena/mln/core/internal/p_complex_piter_base.hh index c9787c1..41cc29d 100644 --- a/milena/mln/core/internal/p_complex_piter_base.hh +++ b/milena/mln/core/internal/p_complex_piter_base.hh @@ -33,40 +33,37 @@ /// iterators on mln::p_complex. # 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> +/* FIXME: Rename internal::p_complex_piter_base_ to something else, as + it is also used for p_faces piters. Maybe + internal::complex_piter_base_, but it is really close to + internal::complex_iter_base_... */ namespace mln { - // Forward declarations. - template <unsigned D, typename P> class p_complex; - template <unsigned D, typename P> class complex_psite; - namespace internal { - /*---------------------------------. - | p_complex_piter_base_<I, P, E>. | - `---------------------------------*/ + /*------------------------------------. + | p_complex_piter_base_<I, S, P, E>. | + `------------------------------------*/ + + // FIXME: P could probably be deduced from S. /// \brief Factoring class for iterators on mln::p_complex. /// /// \arg \p I The type of the underlying complex iterator. + /// \arg \p S The associated site set 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> + template <typename I, typename S, typename P, typename 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> > + : public internal::site_set_iterator_base< S, + p_complex_piter_base_<I, S, P, E> > { - static const unsigned D = I::complex_dim; - - typedef p_complex_piter_base_<I, P, E> self_; - typedef internal::site_set_iterator_base< p_complex<D, P>, - self_ > super_; + typedef p_complex_piter_base_<I, S, P, E> self_; + typedef internal::site_set_iterator_base< S, self_ > super_; /// The type of the underlying complex iterator. typedef I iter; @@ -75,7 +72,7 @@ namespace mln /// Construction and assignment. /// \{ p_complex_piter_base_(); - p_complex_piter_base_(const p_complex<D, P>& pc); + p_complex_piter_base_(const S& pc); /// \} /// Manipulation. @@ -106,87 +103,88 @@ namespace mln }; - /// Print an mln::p_complex_piter_base_<I, P, E>. - template <typename I, typename P, typename E> + /// Print an mln::p_complex_piter_base_<I, S, P, E>. + template <typename I, typename S, typename P, typename E> inline std::ostream& - operator<<(std::ostream& ostr, const p_complex_piter_base_<I, P, E>& p); + operator<<(std::ostream& ostr, const p_complex_piter_base_<I, S, P, E>& p); # ifndef MLN_INCLUDE_ONLY - /*---------------------------------. - | p_complex_piter_base_<I, P, E>. | - `---------------------------------*/ + /*------------------------------------. + | p_complex_piter_base_<I, S, P, E>. | + `------------------------------------*/ - template <typename I, typename P, typename E> + template <typename I, typename S, typename P, typename E> inline - p_complex_piter_base_<I, P, E>::p_complex_piter_base_() + p_complex_piter_base_<I, S, P, E>::p_complex_piter_base_() { mln_postcondition(!this->is_valid()); } - template <typename I, typename P, typename E> + template <typename I, typename S, typename P, typename E> inline - p_complex_piter_base_<I, P, E>::p_complex_piter_base_(const p_complex<D, P>& pc) + p_complex_piter_base_<I, S, P, E>::p_complex_piter_base_(const S& pc) { this->change_target(pc); iter_.set_cplx(pc.cplx()); mln_postcondition(!this->is_valid()); } - template <typename I, typename P, typename E> + template <typename I, typename S, typename P, typename E> inline bool - p_complex_piter_base_<I, P, E>::is_valid_() const + p_complex_piter_base_<I, S, P, E>::is_valid_() const { return iter_.is_valid(); } - template <typename I, typename P, typename E> + template <typename I, typename S, typename P, typename E> inline void - p_complex_piter_base_<I, P, E>::invalidate_() + p_complex_piter_base_<I, S, P, E>::invalidate_() { iter_.invalidate(); } - template <typename I, typename P, typename E> + template <typename I, typename S, typename P, typename E> inline void - p_complex_piter_base_<I, P, E>::start_() + p_complex_piter_base_<I, S, P, E>::start_() { iter_.start(); if (this->is_valid()) update_(); } - template <typename I, typename P, typename E> + template <typename I, typename S, typename P, typename E> inline void - p_complex_piter_base_<I, P, E>::next_() + p_complex_piter_base_<I, S, P, E>::next_() { iter_.next_(); if (this->is_valid()) update_(); } - template <typename I, typename P, typename E> + template <typename I, typename S, typename P, typename E> inline void - p_complex_piter_base_<I, P, E>::update_() + p_complex_piter_base_<I, S, P, E>::update_() { mln_precondition(this->is_valid()); // Update psite_. - p_ = complex_psite<D, P>(exact(this)->site_set(), iter_); + typedef mln_psite(S) psite; + p_ = psite(exact(this)->site_set(), iter_); } - template <typename I, typename P, typename E> + template <typename I, typename S, typename P, typename E> inline std::ostream& - operator<<(std::ostream& ostr, const p_complex_piter_base_<I, P, E>& p) + operator<<(std::ostream& ostr, const p_complex_piter_base_<I, S, P, E>& p) { return ostr << p.unproxy_(); } diff --git a/milena/mln/core/site_set/p_complex_piter.hh b/milena/mln/core/site_set/p_complex_piter.hh index 7cde5bf..41671ce 100644 --- a/milena/mln/core/site_set/p_complex_piter.hh +++ b/milena/mln/core/site_set/p_complex_piter.hh @@ -31,11 +31,20 @@ /// \file mln/core/site_set/p_complex_piter.hh /// \brief Definition of point iterator on complex-based pset. +# include <mln/core/site_set/p_complex.hh> # include <mln/core/internal/p_complex_piter_base.hh> +# include <mln/core/complex_iter.hh> namespace mln { + // Forward declarations. + template <unsigned D, typename P> class p_complex; + + template <unsigned D> class complex_fwd_iter_; + template <unsigned D> class complex_bkd_iter_; + + /*-----------------------------. | p_complex_fwd_piter_<D, P>. | `-----------------------------*/ @@ -44,12 +53,15 @@ namespace mln template <unsigned D, typename P> class p_complex_fwd_piter_ : public internal::p_complex_piter_base_< complex_fwd_iter_<D>, + p_complex<D, P>, P, p_complex_fwd_piter_<D, P> > { typedef p_complex_fwd_piter_<D, P> self_; - typedef - internal::p_complex_piter_base_< complex_fwd_iter_<D>, P, self_ > super_; + typedef internal::p_complex_piter_base_< complex_fwd_iter_<D>, + p_complex<D, P>, + P, + self_ > super_; public: /// Construction and assignment. @@ -68,12 +80,15 @@ namespace mln template <unsigned D, typename P> class p_complex_bkd_piter_ : public internal::p_complex_piter_base_< complex_bkd_iter_<D>, + p_complex<D, P>, P, p_complex_bkd_piter_<D, P> > { typedef p_complex_bkd_piter_<D, P> self_; - typedef - internal::p_complex_piter_base_< complex_bkd_iter_<D>, P, self_ > super_; + typedef internal::p_complex_piter_base_< complex_bkd_iter_<D>, + p_complex<D, P>, + P, + self_ > super_; public: /// Construction and assignment. -- 1.6.0.1

1 0

2382: Have mln::complex_image be accessible via faces_psites.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/image/complex_image.hh (complex_image<D, P, V>::operator()(const faces_psite<N, D, P>) const) (complex_image<D, P, V>::operator()(const faces_psite<N, D, P>)): New operators. --- milena/ChangeLog | 9 +++++++ milena/mln/core/image/complex_image.hh | 37 +++++++++++++++++++++++++++---- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index afbf257..413bbb6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Have mln::complex_image be accessible via faces_psites. + + * mln/core/image/complex_image.hh + (complex_image<D, P, V>::operator()(const faces_psite<N, D, P>) const) + (complex_image<D, P, V>::operator()(const faces_psite<N, D, P>)): + New operators. + +2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Complete iterators on faces. * mln/core/faces_iter.hh diff --git a/milena/mln/core/image/complex_image.hh b/milena/mln/core/image/complex_image.hh index 6dbc522..0512d0f 100644 --- a/milena/mln/core/image/complex_image.hh +++ b/milena/mln/core/image/complex_image.hh @@ -143,12 +143,18 @@ namespace mln void init_(const p_complex<D, P>& pc, const metal::vec< D + 1, std::vector<V> >& values); - /// Read-only access of pixel value at point site \p p. + /// Read-only access of face value at point site \p p. rvalue operator()(const complex_psite<D, P>& p) const; - - /// Read-write access of pixel value at point site \p p. + /// Read-write access of face value at point site \p p. lvalue operator()(const complex_psite<D, P>& p); + /// Read-only access of face value at point site \p p. + template <unsigned N> + rvalue operator()(const faces_psite<N, D, P>& p) const; + /// Read-write access of face value at point site \p p. + template <unsigned N> + lvalue operator()(const faces_psite<N, D, P>& p); + /// Accessors. /// \{ /// Return the domain of psites od the image. @@ -193,8 +199,7 @@ namespace mln template <unsigned D, typename P, typename V> inline data< complex_image<D, P, V> >::data(const p_complex<D, P>& pc, - const metal::vec< D + 1, - std::vector<V> >& values) + const metal::vec< D + 1, std::vector<V> >& values) : values_(values), pc_(pc) { @@ -272,6 +277,28 @@ namespace mln } template <unsigned D, typename P, typename V> + template <unsigned N> + inline + typename complex_image<D, P, V>::rvalue + complex_image<D, P, V>::operator()(const faces_psite<N, D, P>& p) const + { + /* FIXME: We should ensure data_->pc_ has P, but it is not + trivial: a daces_psite has no idea what a p_complex is. */ + return this->data_->values_[p.n()][p.face_id()]; + } + + template <unsigned D, typename P, typename V> + template <unsigned N> + inline + typename complex_image<D, P, V>::lvalue + complex_image<D, P, V>::operator()(const faces_psite<N, D, P>& p) + { + /* FIXME: We should ensure data_->pc_ has P, but it is not + trivial: a daces_psite has no idea what a p_complex is. */ + return this->data_->values_[p.n()][p.face_id()]; + } + + template <unsigned D, typename P, typename V> inline const metal::vec< D + 1, std::vector<V> >& complex_image<D, P, V>::face_values() const -- 1.6.0.1

1 0

2381: Complete iterators on faces.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/faces_iter.hh (mln::faces_fwd_iter_<N, D>::set_cplx) (mln::faces_bkd_iter_<N, D>::set_cplx): New accessors. --- milena/ChangeLog | 9 +++++++++ milena/mln/core/faces_iter.hh | 28 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6e0cd55..afbf257 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + + Complete iterators on faces. + + * mln/core/faces_iter.hh + (mln::faces_fwd_iter_<N, D>::set_cplx) + (mln::faces_bkd_iter_<N, D>::set_cplx): + New accessors. + 2008-09-23 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Get consistent naming for p_line2d and dpsites_impl. diff --git a/milena/mln/core/faces_iter.hh b/milena/mln/core/faces_iter.hh index d16eaa7..522f2ab 100644 --- a/milena/mln/core/faces_iter.hh +++ b/milena/mln/core/faces_iter.hh @@ -73,6 +73,10 @@ namespace mln /// Manipulation. /// \{ + /// Change the target complex. + // FIXME: Same comment as the ctor above. + void set_cplx(complex<D>& c); + /// Test if the iterator is valid. void start(); /// Go to the next point. @@ -120,6 +124,10 @@ namespace mln /// Manipulation. /// \{ + /// Change the target complex. + // FIXME: Same comment as the ctor above. + void set_cplx(complex<D>& c); + /// Start an iteration. void start(); /// Go to the next point. @@ -167,6 +175,16 @@ namespace mln template <unsigned N, unsigned D> inline + void + faces_fwd_iter_<N, D>::set_cplx(complex<D>& c) + { + face_.set_cplx(c); + // Invalidate face_. + invalidate(); + } + + template <unsigned N, unsigned D> + inline faces_fwd_iter_<N, D>& faces_fwd_iter_<N, D>::operator=(const faces_fwd_iter_<N, D>& rhs) { @@ -239,6 +257,16 @@ namespace mln template <unsigned N, unsigned D> inline + void + faces_bkd_iter_<N, D>::set_cplx(complex<D>& c) + { + face_.set_cplx(c); + // Invalidate face_. + invalidate(); + } + + template <unsigned N, unsigned D> + inline faces_bkd_iter_<N, D>& faces_bkd_iter_<N, D>::operator=(const faces_bkd_iter_<N, D>& rhs) { -- 1.6.0.1

1 0

2380: No longer hold complexes through tracked_ptr in site sets.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/site_set/p_complex.hh (mln::p_complex<D, P>::cplx_): * mln/core/site_set/p_faces.hh (mln::p_faces<D, P>::cplx_): Remove the tracked_ptr wrapper and change type to mutable complex<D>. (p_complex<D, P>::p_complex(const complex<D>&)) (p_faces<N, D, P>::p_faces(const complex<D>&)): Adjust ctors. (p_complex<D, P>::nfaces) (p_complex<D, P>::is_valid) (p_complex<D, P>::cplx) (p_faces<N, D, P>::nfaces) (p_faces<N, D, P>::is_valid) (p_faces<N, D, P>::cplx) (operator==(const p_complex<D, P>&, const p_complex<D, P>&)) (operator< (const p_complex<D, P>&, const p_complex<D, P>&)) (operator==(const p_faces<N, D, P>&, const p_faces<N, D, P>&)) (operator< (const p_faces<N, D, P>&, const p_faces<N, D, P>&)): Adjust. --- milena/ChangeLog | 23 ++++++++++++++ milena/mln/core/site_set/p_complex.hh | 55 ++++++++++++-------------------- milena/mln/core/site_set/p_faces.hh | 44 +++++++++++++++----------- 3 files changed, 69 insertions(+), 53 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5ace73e..6e0cd55 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -74,6 +74,29 @@ 2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + No longer hold complexes through tracked_ptr in site sets. + + * mln/core/site_set/p_complex.hh (mln::p_complex<D, P>::cplx_): + * mln/core/site_set/p_faces.hh (mln::p_faces<D, P>::cplx_): + Remove the tracked_ptr wrapper and change type to + mutable complex<D>. + (p_complex<D, P>::p_complex(const complex<D>&)) + (p_faces<N, D, P>::p_faces(const complex<D>&)): + Adjust ctors. + (p_complex<D, P>::nfaces) + (p_complex<D, P>::is_valid) + (p_complex<D, P>::cplx) + (p_faces<N, D, P>::nfaces) + (p_faces<N, D, P>::is_valid) + (p_faces<N, D, P>::cplx) + (operator==(const p_complex<D, P>&, const p_complex<D, P>&)) + (operator< (const p_complex<D, P>&, const p_complex<D, P>&)) + (operator==(const p_faces<N, D, P>&, const p_faces<N, D, P>&)) + (operator< (const p_faces<N, D, P>&, const p_faces<N, D, P>&)): + Adjust. + +2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + Have the compiler check more code, even in NDEBUG mode. * mln/core/complex.hh (mln::complex<D>::add_face): Use diff --git a/milena/mln/core/site_set/p_complex.hh b/milena/mln/core/site_set/p_complex.hh index 6065df4..6c30c25 100644 --- a/milena/mln/core/site_set/p_complex.hh +++ b/milena/mln/core/site_set/p_complex.hh @@ -33,7 +33,6 @@ # include <mln/core/internal/site_set_base.hh> -# include <mln/util/tracked_ptr.hh> # include <mln/core/complex.hh> # include <mln/core/complex_psite.hh> @@ -44,6 +43,8 @@ namespace mln { // Forward declarations. + template <unsigned D, typename P> class p_complex; + template <unsigned D, typename P> class p_complex_fwd_piter_; template <unsigned D, typename P> class p_complex_bkd_piter_; @@ -98,9 +99,6 @@ namespace mln /// \brief Construct a complex psite set from a complex. /// /// \param gr The complex upon which the complex psite set is built. - /// - /// \a gr is \em copied internally, so that the complex psite set is - /// still valid after the initial complex has been removed. p_complex (const complex<D>& cplx); /// Associated types. @@ -161,29 +159,20 @@ namespace mln private: /// The complex on which this pset is built. - /* FIXME:Get rid of this `mutable' qualifier. This is needed for - compatiblity reasons with any_face_handle (see p_complex_piter) + /* FIXME: Get rid of this `mutable' qualifier. This is needed for + compatiblity reasons with any_face_handle (see + p_complex_piter). We should either - - do not use any_face_handle in the implementation of - p_complex_piter; - - - have an additional version of any_face_handles holding a + - have an additional version of any_face_handle holding a const (not mutable) complex; - - or even have face_handle and any_face_handle do not hold a - reference on a complex, leading to a design of complexes - similar to graphs, where vertex and edge handles (named `id's) - are not tied to a specific graph. */ - mutable util::tracked_ptr< complex<D> > cplx_; - - // FIXME: Remove as soon as the tracked_ptr is move into the - // complex itself. - template <unsigned D_, typename P_> - friend - bool operator==(const p_complex<D_, P_>& lhs, - const p_complex<D_, P_>& rhs); + - have face_handle and any_face_handle do not hold a reference + on a complex, leading to a design of complexes similar to + graphs, where vertex and edge handles (named `id's) are not + tied to a specific graph. */ + mutable complex<D> cplx_; }; @@ -214,8 +203,7 @@ namespace mln template <unsigned D, typename P> inline p_complex<D, P>::p_complex(const complex<D>& cplx) - // Create a deep, managed copy of CPLX. - : cplx_(new complex<D>(cplx)) + : cplx_(cplx) { } @@ -232,7 +220,7 @@ namespace mln std::size_t p_complex<D, P>::nfaces() const { - return cplx_->nfaces(); + return cplx_.nfaces(); } template <unsigned D, typename P> @@ -240,8 +228,7 @@ namespace mln bool p_complex<D, P>::is_valid() const { - // FIXME: Might be too low-level, again. - return (cplx_.ptr_); + return true; } template <unsigned D, typename P> @@ -272,7 +259,7 @@ namespace mln p_complex<D, P>::cplx() const { mln_precondition(is_valid()); - return *cplx_.ptr_; + return cplx_; } template <unsigned D, typename P> @@ -280,7 +267,7 @@ namespace mln p_complex<D, P>::cplx() { mln_precondition(is_valid()); - return *cplx_.ptr_; + return cplx_; } @@ -292,17 +279,17 @@ namespace mln bool operator==(const p_complex<D, P>& lhs, const p_complex<D, P>& 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.cplx_.ptr_ == rhs.cplx_.ptr_; + /* FIXME: When actual location data is attached to a p_complex, + check also the equlity w.r.t. to these data. */ + return lhs.cplx() == rhs.cplx(); } template <unsigned D, typename P> bool operator<=(const p_complex<D, P>& lhs, const p_complex<D, P>& rhs) { + /* FIXME: When actual location data is attached to a p_complex, + check also the equality w.r.t. to these data. */ return lhs == rhs; } diff --git a/milena/mln/core/site_set/p_faces.hh b/milena/mln/core/site_set/p_faces.hh index 025023d..3c48100 100644 --- a/milena/mln/core/site_set/p_faces.hh +++ b/milena/mln/core/site_set/p_faces.hh @@ -35,7 +35,6 @@ # include <mln/core/internal/site_set_base.hh> # include <mln/accu/bbox.hh> -# include <mln/util/tracked_ptr.hh> # include <mln/core/complex.hh> # include <mln/core/faces_psite.hh> @@ -77,12 +76,10 @@ namespace mln typedef p_faces<N, D, P> self_; typedef internal::site_set_base_< faces_psite<N, D, P>, self_ > super_; - /// \brief Construct a complex psite set from a complex. + /// \brief Construct a faces psite set from an mln::complex. /// /// \param gr The complex upon which the complex psite set is built. /// - /// \a gr is \em copied internally, so that the complex psite set is - /// still valid after the initial complex has been removed. p_faces (const complex<D>& cplx); /// Associated types. @@ -144,12 +141,19 @@ namespace mln private: /// The complex on which this pset is built. - util::tracked_ptr< complex<D> > cplx_; + /* FIXME: Get rid of this `mutable' qualifier. This is needed for + compatiblity reasons with face_handle (see p_faces_piter). - template <unsigned D_, unsigned N_, typename P_> - friend - bool operator==(const p_faces<D_, N_, P_>& lhs, - const p_faces<D_, N_, P_>& rhs); + We should either + + - have an additional version of face_handle holding a const + (not mutable) complex; + + - have face_handle and any_face_handle do not hold a reference + on a complex, leading to a design of complexes similar to + graphs, where vertex and edge handles (named `id's) are not + tied to a specific graph. */ + mutable complex<D> cplx_; }; @@ -180,8 +184,7 @@ namespace mln template <unsigned N, unsigned D, typename P> inline p_faces<N, D, P>::p_faces(const complex<D>& cplx) - // Create a deep, managed copy of CPLX. - : cplx_(new complex<D>(cplx)) + : cplx_(cplx) { // Ensure N is compatible with D. metal::bool_< N <= D >::check(); @@ -200,7 +203,7 @@ namespace mln std::size_t p_faces<N, D, P>::nfaces() const { - return cplx_->template nfaces<N>(); + return cplx_.template nfaces<N>(); } template <unsigned N, unsigned D, typename P> @@ -208,8 +211,7 @@ namespace mln bool p_faces<N, D, P>::is_valid() const { - // FIXME: Might be too low-level, again. - return (cplx_.ptr_); + return true; } template <unsigned N, unsigned D, typename P> @@ -239,16 +241,16 @@ namespace mln complex<D>& p_faces<N, D, P>::cplx() const { - mln_precondition(cplx_); - return *cplx_.ptr_; + mln_precondition(is_valid()); + return cplx_; } template <unsigned N, unsigned D, typename P> complex<D>& p_faces<N, D, P>::cplx() { - mln_precondition(cplx_); - return *cplx_.ptr_; + mln_precondition(is_valid()); + return cplx_; } @@ -260,13 +262,17 @@ namespace mln bool operator==(const p_faces<N, D, P>& lhs, const p_faces<N, D, P>& rhs) { - return lhs.cplx_.ptr_ == rhs.cplx_.ptr_; + /* FIXME: When actual location data is attached to a p_faces, + check also the equality w.r.t. to these data. */ + return lhs.cplx() == rhs.cplx(); } template <unsigned N, unsigned D, typename P> bool operator<=(const p_faces<N, D, P>& lhs, const p_faces<N, D, P>& rhs) { + /* FIXME: When actual location data is attached to a p_faces, + check also the equality w.r.t. to these data. */ return lhs == rhs; } -- 1.6.0.1

1 0

2379: Have the compiler check more code, even in NDEBUG mode.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/complex.hh (mln::complex<D>::add_face): Use `if (!HAS_NDEBUG)' instead of `#ifndef NDEBUG'. --- milena/ChangeLog | 7 +++++++ milena/mln/core/complex.hh | 17 +++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 44e4772..5ace73e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -74,6 +74,13 @@ 2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + Have the compiler check more code, even in NDEBUG mode. + + * mln/core/complex.hh (mln::complex<D>::add_face): Use + `if (!HAS_NDEBUG)' instead of `#ifndef NDEBUG'. + +2008-09-23 Roland Levillain <roland(a)lrde.epita.fr> + Make use of the new semantics of complexes in tests. * tests/core/image/complex_image.cc: Update. diff --git a/milena/mln/core/complex.hh b/milena/mln/core/complex.hh index d1e5bad..32197f4 100644 --- a/milena/mln/core/complex.hh +++ b/milena/mln/core/complex.hh @@ -420,16 +420,13 @@ namespace mln typedef typename std::vector< face_handle<N, D> >::const_iterator iter_t; // Ensure ADJACENT_FACES are already part of the complex. - /* FIXME: We need additional macros in mln/core/contract.hh for - big blocks of preconditions like this one. */ -# ifndef NDEBUG - for (iter_t a = adjacent_faces.faces().begin(); - a != adjacent_faces.faces().end(); ++a) - { - mln_precondition(&a->cplx() == this); - mln_precondition(a->is_valid()); - } -# endif // !NDEBUG + if (!HAS_NDEBUG) + for (iter_t a = adjacent_faces.faces().begin(); + a != adjacent_faces.faces().end(); ++a) + { + mln_precondition(&a->cplx() == this); + mln_precondition(a->is_valid()); + } face<N + 1, D> f; /* FIXME: This is not thread-proof (these two lines should -- 1.6.0.1

1 0