September 2008 - Olena-patches

cleanup-2008 2409: Revamp extension fill and fix dependant morpho operators.
by Thierry Geraud 25 Sep '08

25 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Revamp extension fill and fix dependant morpho operators. * tests/core/routine/extend.cc: New. * tests/core/routine/Makefile.am: Update. * sandbox/geraud/cs2d/dbl_neighb.cc: Rename as... * doc/examples/tuto_one.cc: ...this. Update. * mln/core/image/extension_ima.hh (change_extension): New. * mln/core/routine/extend.hh (todo): New. * mln/core/internal/image_morpher.hh (unmorph_): New. * mln/border/fill.hh: Revamp. * mln/morpho/closing_area.hh (closing_area): New up-to-date sig. * mln/morpho/erosion.spe.hh: Update. De-activate some parts because of multiple windows. (FIXME): New couple. * mln/morpho/erosion.hh (has): Replace by... (domain.has): ...this. * mln/morpho/dilation.hh: Likewise. * mln/morpho/meyer_wst.hh: Likewise. * mln/canvas/morpho/algebraic_union_find.hh: Likewise. * mln/canvas/labeling.hh: Likewise. * mln/morpho/includes.hh: New include. * mln/extension/fill.hh: Revamp. doc/examples/tuto_one.cc | 33 +++---- mln/border/fill.hh | 105 ++++++++++++++++++---- mln/canvas/labeling.hh | 4 mln/canvas/morpho/algebraic_union_find.hh | 2 mln/core/image/extension_ima.hh | 13 ++ mln/core/internal/image_morpher.hh | 15 +++ mln/core/routine/extend.hh | 1 mln/extension/fill.hh | 140 +++++++++++++++++++++++------- mln/morpho/closing_area.hh | 14 +++ mln/morpho/dilation.hh | 4 mln/morpho/erosion.hh | 4 mln/morpho/erosion.spe.hh | 59 +++++++----- mln/morpho/includes.hh | 2 mln/morpho/meyer_wst.hh | 6 - tests/core/routine/Makefile.am | 2 tests/core/routine/extend.cc | 72 +++++++++++++++ 16 files changed, 374 insertions(+), 102 deletions(-) Index: tests/core/routine/Makefile.am --- tests/core/routine/Makefile.am (revision 2408) +++ tests/core/routine/Makefile.am (working copy) @@ -5,10 +5,12 @@ check_PROGRAMS = \ clone \ exact \ + extend \ initialize clone_SOURCES = clone.cc exact_SOURCES = exact.cc +extend_SOURCES = extend.cc initialize_SOURCES = initialize.cc TESTS = $(check_PROGRAMS) Index: tests/core/routine/extend.cc --- tests/core/routine/extend.cc (revision 0) +++ tests/core/routine/extend.cc (revision 0) @@ -0,0 +1,72 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory +// +// 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/core/routine/extend.cc + * + * \brief Tests on mln::extend. + */ + +#include <mln/core/var.hh> + +#include <mln/core/image/image2d.hh> +#include <mln/core/image/sub_image.hh> + +#include <mln/core/image/extended.hh> +#include <mln/core/routine/extend.hh> + +#include <mln/debug/iota.hh> +#include <mln/debug/println.hh> + +#include <mln/extension/fill.hh> + + + +int main() +{ + using namespace mln; + + image2d<int> ima(3, 3, 1); + debug::iota(ima); + + box2d bb = ima.domain().to_larger(1); + box2d BB = ima.domain().to_larger(2); + + debug::println(ima); + debug::println(extended_to(ima, bb)); + + mln_VAR(ima_, extend(ima | make::box2d(2,2), 7)); + debug::println(ima_); + + debug::println(extended_to(ima_, BB)); + + extension::fill(ima_, 8); + + debug::println(ima_); + debug::println(extended_to(ima_, BB)); + + debug::println(ima_); +} Index: doc/examples/tuto_one.cc --- doc/examples/tuto_one.cc (revision 2406) +++ doc/examples/tuto_one.cc (working copy) @@ -3,6 +3,7 @@ # include <mln/value/int_u8.hh> # include <mln/value/rgb8.hh> +# include <mln/core/var.hh> # include <mln/core/image/image2d.hh> # include <mln/core/alias/neighb2d.hh> # include <mln/core/alias/window2d.hh> @@ -11,7 +12,7 @@ # include <mln/convert/to_image.hh> # include <mln/debug/println.hh> -# include "dbl_neighb.hh" +# include <mln/make/double_neighb2d.hh> # include <mln/io/pgm/load.hh> # include <mln/io/pgm/save.hh> @@ -29,14 +30,6 @@ -struct is_chess_t -{ - bool operator()(const mln::point2d& p) const - { - return p.col() % 2 == p.row() % 2; - } -}; - struct colorize : mln::Function_v2v< colorize > { @@ -58,6 +51,12 @@ }; + bool is_chess(const mln::point2d& p) + { + return p.col() % 2 == p.row() % 2; + } + + void usage(char* argv[]) { std::cerr << "usage: " << argv[0] << " input.pgm lambda output.ppm" << std::endl; @@ -70,6 +69,7 @@ using namespace mln; using value::int_u8; + if (argc != 4) usage(argv); @@ -84,26 +84,27 @@ 1, 0, 1, 1, 1, 0 }; - dbl_neighb_<dpoint2d, is_chess_t> nbh; - nbh - .when_true (make::neighb2d(vert)) - .when_false(make::neighb2d(hori)); + mln_VAR( nbh, make::double_neighb2d(is_chess, vert, hori) ); +// mln_VAR(nbh, c4()); +// mln_VAR(nbh, c8()); - image2d<int_u8> clo, grad = morpho::gradient(lena, nbh); - // io::pgm::save(grad, "grad.pgm"); + image2d<int_u8> clo, grad = morpho::gradient(lena, nbh.win()); + // io::pgm::save(grad, "tmp_grad.pgm"); int lambda = atoi(argv[2]); if (lambda > 1) { clo = morpho::closing_area(grad, nbh, lambda); - // io::pgm::save(clo, "clo.pgm"); + io::pgm::save(clo, "tmp_clo.pgm"); } else clo = grad; unsigned l; image2d<unsigned> wst = morpho::meyer_wst(clo, nbh, l); + std::cout << "l = " << l << std::endl; + debug::println(wst); io::ppm::save(level::transform(wst, colorize(l)), argv[3]); Index: mln/core/image/extension_ima.hh --- mln/core/image/extension_ima.hh (revision 2408) +++ mln/core/image/extension_ima.hh (working copy) @@ -39,6 +39,7 @@ */ # include <mln/core/internal/image_identity.hh> +# include <mln/level/fill_with_value.hh> @@ -142,6 +143,9 @@ /// Mutable access to the extension domain (image). This domain /// can be modified if J a read-write image type. J& extension(); + + /// Change the value in the extension domain (image). + void change_extension(const mln_value(I)& v); }; @@ -266,6 +270,15 @@ return this->data_->ext_; } + template <typename I, typename J> + inline + void + extension_ima<I, J>::change_extension(const mln_value(I)& v) + { + mlc_equal(mln_trait_image_value_io(J), + trait::image::value_io::read_write)::check(); + level::fill_with_value(v); + } // init_ Index: mln/core/routine/extend.hh --- mln/core/routine/extend.hh (revision 2408) +++ mln/core/routine/extend.hh (working copy) @@ -35,6 +35,7 @@ * * \todo Use the 'instant' mechanism. * \todo Deal with ambiguities. + * \todo Check that there is no extension yet (except "extendable"). */ # include <mln/core/image/extension_ima.hh> Index: mln/core/internal/image_morpher.hh --- mln/core/internal/image_morpher.hh (revision 2408) +++ mln/core/internal/image_morpher.hh (working copy) @@ -61,6 +61,11 @@ /// Return the delegatee_ pointer (non-const version); default code. I* delegatee_(); + + /// Give the morphed image. + I& unmorph_(); + + /* \brief Test if this image has been initialized; default impl. * * This default impl is stronger than the one inherited from @@ -130,6 +135,16 @@ template <typename I, typename T, typename S, typename E> inline + I& + image_morpher<I, T, S, E>::unmorph_() + { + I* ptr = delegatee_(); + mln_assertion(ptr != 0); + return *ptr; + } + + template <typename I, typename T, typename S, typename E> + inline image_morpher<I, T, S, E>::operator I() const { mln_precondition(exact(this)->has_data()); Index: mln/border/fill.hh --- mln/border/fill.hh (revision 2408) +++ mln/border/fill.hh (working copy) @@ -58,16 +58,34 @@ template <typename I> void fill(const Image& ima, const mln_value(I)& v); + # ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + template <typename I> + inline + void fill_tests(const Image& ima, const mln_value(I)& v) + { + mln_precondition(exact(ima).has_data()); + } + + } // end of namespace mln::border::internal + + namespace impl { template <typename I> inline - void fill_size_1_(const I& ima, const mln_value(I)& v) + void fill_size_1(const Image& ima_, const mln_value(I)& v) { - trace::entering("border::impl::fill_size_1_"); + trace::entering("border::impl::fill_size_1"); + + const I& ima = exact(ima_); + internal::fill_tests(ima, v); typedef mln_psite(I) P; typedef mln_psite(I) P; @@ -88,14 +106,18 @@ *(const int*)(&v), ima.nelements () - st); - trace::exiting("border::impl::fill_size_1_"); + trace::exiting("border::impl::fill_size_1"); } + template <typename I> inline - void fill_size_n_(const I& ima, const mln_value(I)& v) + void fill_size_n(const I& ima_, const mln_value(I)& v) { - trace::entering("border::impl::fill_size_n_"); + trace::entering("border::impl::fill_size_n"); + + const I& ima = exact(ima_); + internal::fill_tests(ima, v); typedef mln_psite(I) P; mln_box_runstart_piter(I) pl(ima.domain()); @@ -112,34 +134,81 @@ for (std::size_t i = st; i < ima.nelements (); ++i) const_cast<I&>(ima).element(i) = v; - trace::exiting("border::impl::fill_size_n_"); + trace::exiting("border::impl::fill_size_n"); + } + + + } // end of namespace mln::border::impl + + + namespace internal + { + + // Dispatch. + + template <typename I> + inline + void fill_dispatch(const Image& ima, const mln_value(I)& v); + + template <typename I> + inline + void fill_dispatch(mln::trait::image::category::primary, + mln::trait::image::speed::fastest, + I& ima, const mln_value(I)& v) + { + if (sizeof(mln_value(I)) == 1) + impl::fill_size_1(ima, v); + else + impl::fill_size_n(ima, v); + } + + template <typename I> + inline + void fill_dispatch(mln::trait::image::category::primary, + mln::trait::image::speed::any, + I& ima, const mln_value(I)& v) + { + // No border so no-op. } + template <typename I> + inline + void fill_dispatch(mln::trait::image::category::morpher, + mln::trait::image::speed::any, + I& ima, const mln_value(I)& v) + { + fill_dispatch(ima.unmorph_(), v); } + template <typename I> + inline + void fill_dispatch(const Image& ima_, const mln_value(I)& v) + { + I& ima = const_cast<I&>(exact(ima_)); + fill_dispatch(mln_trait_image_category(I)(), + mln_trait_image_speed(I)(), + ima, v); + } + + } // end of namespace mln::border::internal + + + // Facade. template <typename I> inline - void fill(const Image& ima_, const mln_value(I)& v) + void fill(const Image& ima, const mln_value(I)& v) { trace::entering("border::fill"); - typedef mln_psite(I) P; - const I& ima = exact(ima_); - - mlc_is(mln_trait_image_speed(I), trait::image::speed::fastest)::check(); - mln_precondition(ima.has_data()); - if (!ima.border ()) - return; - if (sizeof(mln_value(I)) == 1) - impl::fill_size_1_(ima, v); - else - impl::fill_size_n_(ima, v); + internal::fill_tests(ima, v); + internal::fill_dispatch(ima, v); trace::exiting("border::fill"); } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::border Index: mln/morpho/closing_area.hh --- mln/morpho/closing_area.hh (revision 2408) +++ mln/morpho/closing_area.hh (working copy) @@ -48,6 +48,10 @@ void closing_area(const Image& input, const Neighborhood<N>& nbh, std::size_t lambda, Image<O>& output); + template <typename I, typename N> + mln_concrete(I) closing_area(const Image& input, const Neighborhood<N>& nbh, + std::size_t lambda); + # ifndef MLN_INCLUDE_ONLY @@ -62,6 +66,16 @@ closing_attribute< accu::count_<pix_t> >(input, nbh, lambda, output); } + template <typename I, typename N> + mln_concrete(I) closing_area(const Image& input, const Neighborhood<N>& nbh, + std::size_t lambda) + { + mln_concrete(I) output; + initialize(output, input); + closing_area(input, nbh, lambda, output); + return output; + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::morpho Index: mln/morpho/erosion.spe.hh --- mln/morpho/erosion.spe.hh (revision 2408) +++ mln/morpho/erosion.spe.hh (working copy) @@ -93,7 +93,7 @@ O output; initialize(output, input); -// border::fill(input, mln_max(mln_value(I))); + extension::fill(input, mln_max(mln_value(I))); mln_pixter(const I) p(input); mln_pixter(O) o(output); @@ -124,7 +124,7 @@ O output; initialize(output, input); -// border::fill(input, true); + extension::fill(input, true); mln_pixter(const I) p(input); mln_pixter(O) p_out(output); @@ -154,7 +154,7 @@ const W& win = exact(win_); O output; -// border::fill(input, true); + extension::fill(input, true); output = clone(input); mln_piter(I) p(input.domain()); @@ -183,7 +183,7 @@ const W& win = exact(win_); O output; -// border::fill(input, true); + extension::fill(input, true); output = clone(input); mln_pixter(const I) p(input); @@ -439,26 +439,29 @@ // dispatch for the generic version - template <typename I, typename W> - mln_concrete(I) - erosion_dispatch_for_generic(trait::image::kind::logic, // On sets. - trait::image::speed::fastest, - const I& input, const W& win) - { - if (win.is_centered()) - return impl::erosion_on_set_centered_fastest(input, win); - else - return impl::erosion_on_set_fastest(input, win); - } + // FIXME: De-activate because when the window is multiple, the access + // win.dp(i), used in dpoints_pixter, is impossible. - 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::fastest, +// const I& input, const W& win) +// { +// 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) @@ -543,9 +546,13 @@ 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: De-activate because, when win is multiple, + // geom::shift does not work. We have to introduce + // props from windows, then re-write geom::shift. + +// if (erosion_chooses_arbitrary(input, win)) +// return erosion_dispatch_for_arbitrary(input, win); +// else return erosion_dispatch_for_generic(input, win); } Index: mln/morpho/erosion.hh --- mln/morpho/erosion.hh (revision 2408) +++ mln/morpho/erosion.hh (working copy) @@ -79,7 +79,7 @@ for_all(p) { min.init(); - for_all(q) if (input.has(q)) + for_all(q) if (input.domain().has(q)) min.take(input(q)); output(p) = min; } @@ -107,7 +107,7 @@ mln_qiter(W) q(win, p); for_all(p) { - for_all(q) if (input.has(q)) + for_all(q) if (input.domain().has(q)) if (input(q) == false) break; output(p) = ! q.is_valid(); Index: mln/morpho/dilation.hh --- mln/morpho/dilation.hh (revision 2408) +++ mln/morpho/dilation.hh (working copy) @@ -99,7 +99,7 @@ for_all(p) { max.init(); - for_all(q) if (input.has(q)) + for_all(q) if (input.domain().has(q)) max.take(input(q)); output(p) = max.to_result(); } @@ -122,7 +122,7 @@ mln_qiter(W) q(win, p); for_all(p) if (!input(p)) - for_all(q) if (input.has(q)) + for_all(q) if (input.domain().has(q)) if (input(q)) { output(p) = true; Index: mln/morpho/includes.hh --- mln/morpho/includes.hh (revision 2408) +++ mln/morpho/includes.hh (working copy) @@ -54,7 +54,9 @@ # include <mln/level/fill.hh> # include <mln/test/positive.hh> + // # include <mln/border/all.hh> +# include <mln/extension/fill.hh> # include <mln/geom/sym.hh> # include <mln/set/inter.hh> Index: mln/morpho/meyer_wst.hh --- mln/morpho/meyer_wst.hh (revision 2408) +++ mln/morpho/meyer_wst.hh (working copy) @@ -138,7 +138,7 @@ for_all (p) if (output(p) == unmarked) for_all(n) - if (output.has(n) && output(n) != unmarked) + if (output.domain().has(n) && output(n) != unmarked) { queue.push(p); break; @@ -157,7 +157,7 @@ bool single_adjacent_marker_p = true; mln_niter(N) n(nbh, p); for_all(n) - if (output.has(n) && output(n) != unmarked) + if (output.domain().has(n) && output(n) != unmarked) { if (adjacent_marker == unmarked) { @@ -179,7 +179,7 @@ { output(p) = adjacent_marker; for_all(n) - if (output.has(n) && output(n) == unmarked) + if (output.domain().has(n) && output(n) == unmarked) queue.push(n); } } Index: mln/canvas/morpho/algebraic_union_find.hh --- mln/canvas/morpho/algebraic_union_find.hh (revision 2408) +++ mln/canvas/morpho/algebraic_union_find.hh (working copy) @@ -92,7 +92,7 @@ { make_set(p); for_all(n) - if (f.input.has(n) && deja_vu(n)) + if (f.input.domain().has(n) && deja_vu(n)) do_union(n, p); deja_vu(p) = true; } Index: mln/canvas/labeling.hh --- mln/canvas/labeling.hh (revision 2408) +++ mln/canvas/labeling.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -173,7 +173,7 @@ { make_set(p); for_all(n) - if (f.input.has(n) && deja_vu(n)) + if (f.input.domain().has(n) && deja_vu(n)) { if (f.equiv(n, p)) do_union(n, p); Index: mln/extension/fill.hh --- mln/extension/fill.hh (revision 2408) +++ mln/extension/fill.hh (working copy) @@ -25,7 +25,6 @@ // reasons why the executable file might be covered by the GNU General // Public License. - #ifndef MLN_CORE_EXTENSION_FILL_HH # define MLN_CORE_EXTENSION_FILL_HH @@ -33,6 +32,9 @@ * * \brief Define function that fills domain extension. * + * + * \todo Test the compatibility between val and mln_value(I) because, + * while unmorphing, this type can change... */ # include <mln/core/concept/image.hh> @@ -40,6 +42,7 @@ # include <mln/border/fill.hh> # include <mln/level/fill_with_value.hh> + namespace mln { @@ -50,63 +53,136 @@ * single value \p v. * * \param[in,out] ima The image whose domain extension is to be filled. - * \param[in] v The value to assign. + * \param[in] val The value to assign. * * \pre \p ima has to be initialized. * * \todo Optimize with memset if possible. */ template <typename I> - void fill(const Image& ima, const mln_value(I)& v); + void fill(const Image& ima, const mln_value(I)& val); + + + +# ifndef MLN_INCLUDE_ONLY + - namespace impl + namespace internal { + + // Do it. + + template <typename I> + void do_fill(I& ima, const mln_value(I)& val); // Entry point. + template <typename I> - void fill_fixed_extension(const Image& ima, const mln_value(I)& v); + void do_fill(mln::trait::image::ext_domain::some, + mln::trait::image::ext_value::single, + mln::trait::image::ext_domain::none, + I& ima, const mln_value(I)& val) + { + ima.change_extension(val); } -# ifndef MLN_INCLUDE_ONLY + template <typename I> + void do_fill(mln::trait::image::ext_domain::some, + mln::trait::image::ext_value::multiple, + mln::trait::image::ext_domain::none, + I& ima, const mln_value(I)& val) + { + border::fill(ima, val); + ima.change_extension(val); + } template <typename I> - void fill(const Image& ima, const mln_value(I)& v) + void do_fill(mln::trait::image::ext_domain::some, + mln::trait::image::ext_value::any, + mln::trait::image::ext_domain::some, + I& ima, const mln_value(I)& val) { - // Case of ext_io::read_only. - if (mlc_equal(mln_trait_image_ext_io(I), - mln::trait::image::ext_io::read_only)::value == true) - return; // No-op. + mln::extension::fill(ima.unmorph_(), val); + } - // Case of ext_domain::none. - if (mlc_equal(mln_trait_image_ext_domain(I), - mln::trait::image::ext_domain::none)::value == true) - return; // No-op. + template <typename I> + void do_fill(mln::trait::image::ext_domain::none, + mln::trait::image::ext_value::any, + mln::trait::image::ext_domain::any, + I& ima, const mln_value(I)& val) + { + // Oops... + } + + template <typename I> + void do_fill(I& ima, const mln_value(I)& val) + { + typedef typename I::delegatee D; + do_fill(mln_trait_image_ext_domain(I)(), + mln_trait_image_ext_value(I)(), + mln_trait_image_ext_domain(D)(), + ima, val); + } - // Case of ext_domain::extendable. - if (mlc_equal(mln_trait_image_ext_domain(I), - mln::trait::image::ext_domain::extendable)::value == true) - return mln::border::fill(ima, v); - // Case of ext_domain::fixed. - if (mlc_equal(mln_trait_image_ext_domain(I), - mln::trait::image::ext_domain::fixed)::value == true) + // Dispatch. - // Case of ext_value::single. - if (mlc_equal(mln_trait_image_ext_value(I), - mln::trait::image::ext_value::single)::value == true) - return impl::fill_fixed_extension(const_cast<I&>(exact(ima)), v); - else - return mln::level::fill_with_value(const_cast<I&>(exact(ima)), v); + template <typename I> + void fill_dispatch(mln::trait::image::ext_domain::none, + mln::trait::image::ext_io::any, + I& ima, const mln_value(I)& val) + { + // No-op cause no extension domain, no border. + } + template <typename I> + void fill_dispatch(mln::trait::image::ext_domain::some, + mln::trait::image::ext_io::read_only, + I& ima, const mln_value(I)& val) + { + // No-op for the extension domain, yet: + border::fill(ima, val); + } + + template <typename I> + void fill_dispatch(mln::trait::image::ext_domain::extendable, + mln::trait::image::ext_io::read_write, + I& ima, const mln_value(I)& val) + { + // Just fill the border. + border::fill(ima, val); } - namespace impl + template <typename I> + void fill_dispatch(mln::trait::image::ext_domain::some, + mln::trait::image::ext_io::read_write, + I& ima, const mln_value(I)& val) { + do_fill(ima, val); + } + template <typename I> - void fill_fixed_extension(Image& ima_, const mln_value(I)& v) + void fill_dispatch(const Image& ima_, const mln_value(I)& val) { - I& ima = exact(ima_); - ima.extension() = v; + I& ima = const_cast<I&>(exact(ima_)); + fill_dispatch(mln_trait_image_ext_domain(I)(), + mln_trait_image_ext_io(I)(), + ima, val); } + + } // end of namespace mln::extension::internal + + + // Facade. + + template <typename I> + void fill(const Image& ima, const mln_value(I)& val) + { + trace::entering("extension::fill"); + + mln_precondition(exact(ima).has_data()); + internal::fill_dispatch(ima, val); + + trace::exiting("extension::fill"); } # endif // ! MLN_INCLUDE_ONLY

1 0

cleanup-2008 2408: Fix interpolated and tr_image.
by Ugo Jardonnet 25 Sep '08

25 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 interpolated and tr_image. * mln/core/image/tr_image.hh (operator()): Fix. Fix trait. * mln/convert/from_to.hh (from_to): Move (vec -> rgb)... * mln/value/rgb.hh: ...here. convert/from_to.hh | 15 --------------- core/image/tr_image.hh | 10 +++++----- value/rgb.hh | 21 +++++++++++++++++++++ 3 files changed, 26 insertions(+), 20 deletions(-) Index: mln/core/image/tr_image.hh --- mln/core/image/tr_image.hh (revision 2407) +++ mln/core/image/tr_image.hh (working copy) @@ -73,6 +73,7 @@ { // ...these changes. typedef trait::image::value_io::read_only value_io; + typedef mln_internal_trait_image_speed_from(I) speed; // Un-fastest. }; } // end of namespace mln::trait @@ -97,10 +98,10 @@ typedef mln_value(I) value; /// Return type of read-write access. - typedef mln_lvalue(I) lvalue; // FIXME: Depends on lvalue presence in I. + typedef mln_value(I) lvalue; // FIXME: Depends on lvalue presence in I. /// Return type of read-only access. - typedef mln_rvalue(I) rvalue; + typedef mln_value(I) rvalue; /// Skeleton. typedef tr_image< S, tag::image_, T> skeleton; @@ -130,10 +131,10 @@ /// Read-only access of pixel value at point site \p p. /// Mutable access is only OK for reading (not writing). - using super_::operator(); + //using super_::operator(); - mln_value(I) operator()(const psite& p); mln_value(I) operator()(const psite& p) const; + mln_value(I) operator()(const psite& p); void set_tr(T& tr); }; @@ -205,7 +206,6 @@ mln_value(I) tr_image<S,I,T>::operator()(const psite& p) const { - std::cout << "yay" << std::endl; algebra::vec<I::psite::dim, float> v = p; return this->data_->ima_(this->data_->tr_.inv()(v)); } Index: mln/value/rgb.hh --- mln/value/rgb.hh (revision 2407) +++ mln/value/rgb.hh (working copy) @@ -283,6 +283,7 @@ operator/(const rgb<n>& lhs, const mln::value::scalar_<S>& s); /// \} + # ifndef MLN_INCLUDE_ONLY /*---------------. @@ -496,6 +497,26 @@ } // end of namespace mln::value + + namespace convert + { + + // algebra::vec -> rgb. + template <typename T, unsigned m> + inline + void + from_to(const algebra::vec<3,T>& from, value::rgb<m>& to_) + { + value::rgb<m>& to = exact(to_); + algebra::vec<3, unsigned> tmp; + for (unsigned i = 0; i < 3; ++i) + tmp[i] = static_cast<unsigned>(from[i]); // FIXME: Use from_to instead of cast. + + to = value::rgb<m>(tmp); + } + + } // end of namespace mln::convert + } // end of namespace mln Index: mln/convert/from_to.hh --- mln/convert/from_to.hh (revision 2407) +++ mln/convert/from_to.hh (working copy) @@ -42,7 +42,6 @@ # include <mln/core/concept/object.hh> # include <mln/core/concept/gpoint.hh> # include <mln/value/concept/all.hh> -# include <mln/value/rgb.hh> # include <mln/convert/impl/all.hh> @@ -115,20 +114,6 @@ to[i] = static_cast< typename P::coord >(from[i]); } - // algebra::vec -> rgb. - template <typename T, unsigned m> - inline - void - from_to(const algebra::vec<3,T>& from, value::rgb<m>& to_) - { - value::rgb<m>& to = exact(to_); - algebra::vec<3, unsigned> tmp; - for (unsigned i = 0; i < 3; ++i) - tmp[i] = static_cast<unsigned>(from[i]); - - to = value::rgb<m>(tmp); - } - // Value -> Value template <typename F, typename T> inline

1 0

cleanup-2008 2407: Sandbox: Update test.
by Ugo Jardonnet 25 Sep '08

25 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: Update test. * jardonnet/virtual/access.cc: Update test. access.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) Index: jardonnet/virtual/access.cc --- jardonnet/virtual/access.cc (revision 2406) +++ jardonnet/virtual/access.cc (working copy) @@ -72,7 +72,8 @@ // adjust border border::adjust(input, 100); - //border::fill(input, literal::black); + border::fill(input, literal::red); + // See extension_fill interpolated< image2d< value::rgb<8> >, interpolation::bilinear> interp(input); @@ -89,7 +90,7 @@ //border::adjust(interp, 20); //test1<interpolation::bilinear>(input, output, compose(r,t)); - //test2(interp, output, compose(r,t)); - test3(tr_ima, output); + test2(interp, output, compose(r,t)); + //test3(tr_ima, output); mln::io::ppm::save(output,"./out.ppm"); }

1 0

cleanup-2008 2406: Conversions from proxies keep the possible reference.
by Thierry Geraud 25 Sep '08

25 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Conversions from proxies keep the possible reference. * mln/core/concept/proxy.hxx (get_proxy_impl::operator): New overload (mutable) conversion towards the immediate subject. Keep ref or ptr in conversion return type. * mln/core/concept/site_proxy.hh (operator site): De-activate the static check of its presence since "site" can be either a ref, a const ref, or a plain type. * mln/core/concept/accumulator.hh (result_): Update. * mln/core/dpoints_pixter.hh (get_adr): Replace by conversion. Add a static check about the p_ref argument type. * mln/core/internal/site_relative_iterator_base.hh: Likewise. * mln/metal/fix_return.hh: New. core/concept/accumulator.hh | 5 +- core/concept/proxy.hxx | 14 +++++ core/concept/site_proxy.hh | 5 +- core/dpoints_pixter.hh | 6 ++ core/internal/site_relative_iterator_base.hh | 6 +- metal/fix_return.hh | 64 +++++++++++++++++++++++++++ 6 files changed, 90 insertions(+), 10 deletions(-) Index: mln/core/concept/proxy.hxx --- mln/core/concept/proxy.hxx (revision 2405) +++ mln/core/concept/proxy.hxx (working copy) @@ -37,6 +37,7 @@ # include <mln/metal/unconst.hh> # include <mln/metal/is_not_ref.hh> # include <mln/metal/ref.hh> +# include <mln/metal/fix_return.hh> namespace mln @@ -265,7 +266,9 @@ struct get_proxy_impl : helper_get_proxy_impl< Subject, E, mlc_is_a(Subject, Proxy)::value > { - operator mlc_unqualif(Subject) () const; + public: + operator mlc_fix_return(Subject) (); + operator mlc_fix_return(mlc_const_return(Subject)) () const; }; template <typename Subject, typename E> @@ -378,7 +381,7 @@ template <typename Subject, typename E> inline - get_proxy_impl<Subject, E>::operator mlc_unqualif(Subject) () const + get_proxy_impl<Subject, E>::operator mlc_fix_return(mlc_const_return(Subject)) () const { return mln::internal::force_exact<const E>(*this).unproxy_(); @@ -391,6 +394,13 @@ // return *adr; } + template <typename Subject, typename E> + inline + get_proxy_impl<Subject, E>::operator mlc_fix_return(Subject) () + { + return mln::internal::force_exact<E>(*this).unproxy_(); + } + // get_adr Index: mln/core/concept/site_proxy.hh --- mln/core/concept/site_proxy.hh (revision 2405) +++ mln/core/concept/site_proxy.hh (working copy) @@ -86,8 +86,9 @@ const site& (E::*m1)() const = & E::to_site; m1 = 0; - site (E::*m2)() const = & E::operator site; - m2 = 0; + // De-activate because sometimes it returns a "const site&"... +// site (E::*m2)() const = & E::operator site; +// m2 = 0; } # endif // ! MLN_INCLUDE_ONLY Index: mln/core/concept/accumulator.hh --- mln/core/concept/accumulator.hh (revision 2405) +++ mln/core/concept/accumulator.hh (working copy) @@ -34,7 +34,8 @@ */ # include <mln/core/concept/proxy.hh> -# include <mln/metal/unqualif.hh> +# include <mln/metal/fix_return.hh> +# include <mln/metal/const.hh> namespace mln @@ -104,7 +105,7 @@ result (E::*m4)() const = & E::to_result; m4 = 0; - typedef mlc_unqualif(result) result_; + typedef mlc_fix_return(mlc_const_return(result)) result_; result_ (E::*m5)() const = & E::operator result_; m5 = 0; } Index: mln/core/dpoints_pixter.hh --- mln/core/dpoints_pixter.hh (revision 2405) +++ mln/core/dpoints_pixter.hh (working copy) @@ -38,6 +38,7 @@ # include <mln/core/concept/pixel_iterator.hh> # include <mln/core/internal/pixel_impl.hh> +# include <mln/metal/converts_to.hh> namespace mln @@ -225,7 +226,10 @@ : super_(image) { mln_precondition(image.has_data()); - internal::get_adr(p_ref_, p_ref); + + mlc_converts_to(Pref, const mln_psite(I)&)::check(); + p_ref_ = & static_cast< const mln_psite(I)& >(p_ref); + value_ref_ = 0; init_(dps); } Index: mln/core/internal/site_relative_iterator_base.hh --- mln/core/internal/site_relative_iterator_base.hh (revision 2405) +++ mln/core/internal/site_relative_iterator_base.hh (working copy) @@ -41,6 +41,7 @@ # include <vector> # include <mln/core/internal/site_iterator_base.hh> +# include <mln/metal/converts_to.hh> namespace mln @@ -138,9 +139,8 @@ void site_relative_iterator_base<S,E>::center_at(const P& c) { - internal::get_adr(c_, c); - mln_precondition(c_ != 0); - // c_ == 0 means that the center c does not have the expected type. + mlc_converts_to(P, const mln_psite(S)&)::check(); + c_ = & static_cast< const mln_psite(S)& >(c); this->invalidate(); } Index: mln/metal/fix_return.hh --- mln/metal/fix_return.hh (revision 0) +++ mln/metal/fix_return.hh (revision 0) @@ -0,0 +1,64 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory +// +// 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. + +#ifndef MLN_METAL_FIX_RETURN_HH +# define MLN_METAL_FIX_RETURN_HH + +/*! + * \file mln/metal/fix_return.hh + * + * \brief FIXME. + */ + + +# define mlc_fix_return(T) typename mln::metal::fix_return< T >::ret + + +namespace mln +{ + + namespace metal + { + + // No-op. + template <typename T> struct fix_return { typedef T ret; }; + template <typename T> struct fix_return< T& > { typedef T& ret; }; + template <typename T> struct fix_return< const T& > { typedef const T& ret; }; + template <typename T> struct fix_return< T* > { typedef T* ret; }; + template <typename T> struct fix_return< const T* > { typedef const T* ret; }; + + // Remove const. + template <typename T> struct fix_return< const T > { typedef T ret; }; + template <typename T> struct fix_return< T* const > { typedef T* ret; }; + template <typename T> struct fix_return< const T* const > { typedef const T* ret; }; + + } // end of namespace mln::metal + +} // end of namespace mln + + +#endif // ! MLN_METAL_FIX_RETURN_HH

1 0

cleanup-2008 2405: Update interpolated and tr_image morphers.
by Ugo Jardonnet 25 Sep '08

25 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Update interpolated and tr_image morphers. * mln/core/image/tr_image.hh: Update (traits ...) . * mln/core/image/interpolated.hh (operator()): Add non const version. interpolated.hh | 14 ++++-- tr_image.hh | 117 ++++++++++++++++++++++++++++++++++---------------------- 2 files changed, 81 insertions(+), 50 deletions(-) Index: mln/core/image/tr_image.hh --- mln/core/image/tr_image.hh (revision 2404) +++ mln/core/image/tr_image.hh (working copy) @@ -46,35 +46,49 @@ { // Fwd decl. - template <typename T, typename I> struct tr_image; + template <typename S, typename I, typename T> struct tr_image; namespace internal { /// Data structure for \c mln::tr_image<T,I>. - template <typename T, typename I> - struct data< tr_image<T,I> > + template <typename S, typename I, typename T> + struct data< tr_image<S,I,T> > { - data(I& ima, T& tr); + data(const S& s,I& ima, const T& tr); I ima_; T tr_; + S s_; }; } // end of namespace mln::internal + namespace trait + { + + template <typename S, typename I, typename T> + struct image_< tr_image<S,I,T> > + : 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 an image become transformed by a given * transformation. * */ - template <typename T, typename I> + template <typename S, typename I, typename T> struct tr_image : - public mln::internal::image_identity< I, mln_pset(I), tr_image<T,I> > + public mln::internal::image_identity< I, mln_pset(I), tr_image<S,I,T> > { /// Super type. typedef - mln::internal::image_identity< I, mln_pset(I), tr_image<T,I> > super_; + mln::internal::image_identity< I, mln_pset(I), tr_image<S,I,T> > super_; /// Point_Site associated type. typedef mln_psite(I) psite; @@ -89,11 +103,11 @@ typedef mln_rvalue(I) rvalue; /// Skeleton. - typedef tr_image< T, tag::image_ > skeleton; + typedef tr_image< S, tag::image_, T> skeleton; /// Constructors. - tr_image(I& ima, T& tr); + tr_image(const S& s, I& ima, const T& tr); /* FIXME: What's the purpose of this ctor? AFAIK, morphers objects (and images in general) cannot have their structure / core data altered after they're built. Here, there's a @@ -103,6 +117,8 @@ tr_image(); + void init_(const S& s, I& ima, const T& tr); + /// Test if this image has been initialized. bool has_data() const; @@ -110,18 +126,14 @@ 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; - - using super_::has; - - /// Test if a pixel value is belonging to image 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 psite& p); + mln_value(I) operator()(const psite& p) const; void set_tr(T& tr); }; @@ -135,41 +147,50 @@ // internal::data< tr_image<I,S> > - template <typename T, typename I> + template <typename S, typename I, typename T> inline - data< tr_image<T,I> >::data(I& ima, T& tr) + data< tr_image<S,I,T> >::data(const S& s, I& ima, const T& tr) : ima_(ima), - tr_(tr) + tr_(tr), + s_(s) { } } // end of namespace mln::internal - template <typename T, typename I> + template <typename S, typename I, typename T> + inline + tr_image<S,I,T>::tr_image(const S& s, I& ima, const T& tr) + { + mln_precondition(ima.has_data()); + this->data_ = new internal::data< tr_image<S,I,T> >(s, ima, tr); + } + + template <typename S, typename I, typename T> inline - tr_image<T,I>::tr_image(I& ima, T& tr) + void tr_image<S,I,T>::init_(const S& s, I& ima, const T& tr) { mln_precondition(ima.has_data()); - this->data_ = new internal::data< tr_image<T,I> >(ima, tr); + this->data_ = new internal::data< tr_image<S,I,T> >(s, ima, tr); } - template <typename T, typename I> + template <typename S, typename I, typename T> inline - tr_image<T,I>::tr_image() + tr_image<S,I,T>::tr_image() { } - template <typename T, typename I> + template <typename S, typename I, typename T> inline - bool tr_image<T,I>::has_data() const + bool tr_image<S,I,T>::has_data() const { mln_invariant(this->delegatee_()->has_data()); return true; } - template <typename T, typename I> + template <typename S, typename I, typename T> inline - bool tr_image<T,I>::has(const algebra::vec<I::point::dim, float>& v) const + bool tr_image<S,I,T>::has(const algebra::vec<I::psite::dim, float>& v) const { mln_psite(I) p; algebra::vec<I::point::dim, float> v2 = this->data_->tr_.inv()(v); @@ -178,38 +199,44 @@ return this->delegatee_().has(p); } - template <typename T, typename I> + + template <typename S, typename I, typename T> inline - bool tr_image<T,I>::has(const algebra::vec<I::point::dim, float>& v) const + mln_value(I) + tr_image<S,I,T>::operator()(const psite& p) const { - mln_psite(I) p; - algebra::vec<I::point::dim, float> v2 = this->data_->tr_.inv()(v); - for (unsigned i = 0; i < I::point::dim; ++i) - p[i] = static_cast<int>(round(v2[i])); - return this->delegatee_()->domain().has(p); + std::cout << "yay" << std::endl; + algebra::vec<I::psite::dim, float> v = p; + return this->data_->ima_(this->data_->tr_.inv()(v)); } - template <typename T, typename I> + template <typename S, typename I, typename T> inline mln_value(I) - tr_image<T,I>::operator()(const algebra::vec<I::point::dim, float>& v) const + tr_image<S,I,T>::operator()(const psite& p) { - mln_psite(I) p; - algebra::vec<I::point::dim, float> v2 = this->data_->tr_.inv()(v); - for (unsigned i = 0; i < I::point::dim; ++i) - p[i] = static_cast<int>(round(v2[i])); - mln_assertion(this->delegatee_()->has(p)); - return (*this->delegatee_())(p); + std::cout << "yay" << std::endl; + algebra::vec<I::psite::dim, float> v = p; + return this->data_->ima_(this->data_->tr_.inv()(v)); } - template <typename T, typename I> + template <typename S, typename I, typename T> inline void - tr_image<T,I>::set_tr(T& tr) + tr_image<S,I,T>::set_tr(T& tr) { this->data_->tr_ = tr; } + template <typename S, typename I, typename T> + inline + tr_image<S,I,T> + transposed_image(const Site_Set<S>& s, Image& ima, const Function_x2x<T>& t) + { + tr_image<S,I,T> tmp(exact(s), exact(ima), exact(t)); + return tmp; + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln Index: mln/core/image/interpolated.hh --- mln/core/image/interpolated.hh (revision 2404) +++ mln/core/image/interpolated.hh (working copy) @@ -126,6 +126,7 @@ using super_::operator(); mln_value(I) operator()(const mln::algebra::vec<I::psite::dim, float>& v) const; + mln_value(I) operator()(const mln::algebra::vec<I::psite::dim, float>& v); const F fun_; }; @@ -195,11 +196,14 @@ mln_value(I) 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); + return fun_(v); + } + + template <typename I, template <class> class F> + inline + mln_value(I) + interpolated<I,F>::operator()(const mln::algebra::vec<I::psite::dim, float>& v) + { return fun_(v); }

1 0

cleanup-2008 2404: Sandbox: Add basic test for tr_image over interpolated.
by Ugo Jardonnet 25 Sep '08

25 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: Add basic test for tr_image over interpolated. * jardonnet/virtual/access.cc: Instanciate and use updated morphers. access.cc | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) Index: jardonnet/virtual/access.cc --- jardonnet/virtual/access.cc (revision 2403) +++ jardonnet/virtual/access.cc (working copy) @@ -11,6 +11,9 @@ #include <mln/border/fill.hh> #include <mln/literal/all.hh> #include <mln/core/image/interpolated.hh> +#include <mln/core/image/tr_image.hh> +#include <mln/core/var.hh> +#include <mln/level/fill.hh> template < template <class> class N, typename I, typename T> @@ -42,8 +45,18 @@ 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); + output(p) = interp(t.inv()(v)); + } +} + +template <typename I, typename O> +void +test3(const I& tr_ima, O& output) +{ + mln_piter(I) p(output.domain()); + for_all(p) + { + output(p) = tr_ima(p); } } @@ -64,13 +77,19 @@ 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)); + mln_VAR(rt, compose(r,t)); + mln_VAR(tr_ima, transposed_image(interp.domain(), interp, rt)); + + // level::fill(output, tr_ima); + + + //border::adjust(interp, 20); - test1<interpolation::bilinear>(input, output, compose(r,t)); + //test1<interpolation::bilinear>(input, output, compose(r,t)); //test2(interp, output, compose(r,t)); + test3(tr_ima, output); mln::io::ppm::save(output,"./out.ppm"); }

1 0

[Olena] #166: Revamp util::complex
by Olena 25 Sep '08

25 Sep '08

#166: Revamp util::complex -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: enhancement | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- * As for images, use a `tracked_ptr` to handle the data of the complex, i.e. split the `complex` classe in two: * the complex « shell(s) », holding `tracked_ptr` to shared data; and * the actual complex data (vertices and egdes). Also, handle complexes directly from `p_complex` instead of using a `tracked_ptr`, as copying complexes will become cheap (as for images). * Move complex-related types and routines from `mln/core/` to `mln/topo/`. -- Ticket URL: <https://trac.lrde.org/olena/ticket/166> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 3

2403: Move mln/core/complex_psite.hh to mln/core/site_set/.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/complex_psite.hh: Move... * mln/core/site_set/complex_psite.hh: ...here. Adjust headers guard and documentation. * mln/core/image/complex_image.hh, * mln/core/site_set/p_complex.hh: Adjust paths. --- milena/ChangeLog | 11 +++++++++++ milena/mln/core/image/complex_image.hh | 2 +- milena/mln/core/{ => site_set}/complex_psite.hh | 8 ++++---- milena/mln/core/site_set/p_complex.hh | 2 +- 4 files changed, 17 insertions(+), 6 deletions(-) rename milena/mln/core/{ => site_set}/complex_psite.hh (98%) diff --git a/milena/ChangeLog b/milena/ChangeLog index e782fee..72e9ec6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Move mln/core/complex_psite.hh to mln/core/site_set/. + + * mln/core/complex_psite.hh: Move... + * mln/core/site_set/complex_psite.hh: ...here. + Adjust headers guard and documentation. + * mln/core/image/complex_image.hh, + * mln/core/site_set/p_complex.hh: + Adjust paths. + +2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + * tests/core/site_set/Makefile.am (p_bgraph_SOURCES): Disable. 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/mln/core/image/complex_image.hh b/milena/mln/core/image/complex_image.hh index 09d6e13..a9cea01 100644 --- a/milena/mln/core/image/complex_image.hh +++ b/milena/mln/core/image/complex_image.hh @@ -38,7 +38,7 @@ # include <mln/core/internal/image_primary.hh> # include <mln/metal/vec.hh> # include <mln/core/site_set/p_complex.hh> -# include <mln/core/complex_psite.hh> +# include <mln/core/site_set/complex_psite.hh> # include <mln/value/set.hh> diff --git a/milena/mln/core/complex_psite.hh b/milena/mln/core/site_set/complex_psite.hh similarity index 98% rename from milena/mln/core/complex_psite.hh rename to milena/mln/core/site_set/complex_psite.hh index d6692e7..71dd84e 100644 --- a/milena/mln/core/complex_psite.hh +++ b/milena/mln/core/site_set/complex_psite.hh @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_COMPLEX_PSITE_HH -# define MLN_CORE_COMPLEX_PSITE_HH +#ifndef MLN_CORE_SITE_SET_COMPLEX_PSITE_HH +# define MLN_CORE_SITE_SET_COMPLEX_PSITE_HH -/// \file mln/core/complex_psite.hh +/// \file mln/core/site_set/complex_psite.hh /// \brief Definition of a complex-based point site. # include <mln/core/internal/pseudo_site_base.hh> @@ -370,4 +370,4 @@ namespace mln } // end of mln -#endif // MLN_CORE_COMPLEX_PSITE_HH +#endif // MLN_CORE_SITE_SET_COMPLEX_PSITE_HH diff --git a/milena/mln/core/site_set/p_complex.hh b/milena/mln/core/site_set/p_complex.hh index ecbc0fa..206cd34 100644 --- a/milena/mln/core/site_set/p_complex.hh +++ b/milena/mln/core/site_set/p_complex.hh @@ -35,7 +35,7 @@ # include <mln/topo/complex.hh> -# include <mln/core/complex_psite.hh> +# include <mln/core/site_set/complex_psite.hh> # include <mln/core/site_set/p_complex_piter.hh> # include <mln/core/site_set/p_complex_faces_piter.hh> -- 1.6.0.1

1 0

2402: * tests/core/site_set/Makefile.am (p_bgraph_SOURCES): Disable.
by Roland Levillain 24 Sep '08

24 Sep '08

--- milena/ChangeLog | 4 ++++ milena/tests/core/site_set/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6db7873..e782fee 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + * tests/core/site_set/Makefile.am (p_bgraph_SOURCES): Disable. + +2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Update complex-based images w.r.t. the creation of mln/topo/. * mln/core/faces_psite.hh, diff --git a/milena/tests/core/site_set/Makefile.am b/milena/tests/core/site_set/Makefile.am index c8059d9..c1f1e14 100644 --- a/milena/tests/core/site_set/Makefile.am +++ b/milena/tests/core/site_set/Makefile.am @@ -13,7 +13,7 @@ check_PROGRAMS = \ pset_if p_array_SOURCES = p_array.cc -p_bgraph_SOURCES = p_bgraph.cc +##p_bgraph_SOURCES = p_bgraph.cc p_image_SOURCES = p_image.cc p_priority_queue_SOURCES = p_priority_queue.cc p_queue_SOURCES = p_queue.cc -- 1.6.0.1

1 0

2401: Update complex-based images w.r.t. the creation of mln/topo/.
by Roland Levillain 24 Sep '08

24 Sep '08

* mln/core/faces_psite.hh, * mln/core/complex_psite.hh, * mln/core/site_set/p_complex.hh, * mln/core/site_set/p_complex_faces_piter.hh, * mln/core/site_set/p_complex_piter.hh, * mln/core/site_set/p_faces.hh, * mln/core/site_set/p_faces_piter.hh, * tests/core/image/complex_image.cc: Adjust names. --- milena/ChangeLog | 14 +++++++++++ milena/mln/core/complex_psite.hh | 13 +++++----- milena/mln/core/faces_psite.hh | 12 +++++----- milena/mln/core/site_set/p_complex.hh | 17 ++++++------- milena/mln/core/site_set/p_complex_faces_piter.hh | 11 ++++----- milena/mln/core/site_set/p_complex_piter.hh | 11 ++++----- milena/mln/core/site_set/p_faces.hh | 19 +++++++-------- milena/mln/core/site_set/p_faces_piter.hh | 11 ++++----- milena/tests/core/image/complex_image.cc | 26 ++++++++++---------- 9 files changed, 72 insertions(+), 62 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0963983..6db7873 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Update complex-based images w.r.t. the creation of mln/topo/. + + * mln/core/faces_psite.hh, + * mln/core/complex_psite.hh, + * mln/core/site_set/p_complex.hh, + * mln/core/site_set/p_complex_faces_piter.hh, + * mln/core/site_set/p_complex_piter.hh, + * mln/core/site_set/p_faces.hh, + * mln/core/site_set/p_faces_piter.hh, + * tests/core/image/complex_image.cc: + Adjust names. + +2008-09-24 Roland Levillain <roland(a)lrde.epita.fr> + Move complex-related entities to mln/topo/. * mln/topo/: New directory. diff --git a/milena/mln/core/complex_psite.hh b/milena/mln/core/complex_psite.hh index 2a9a0e7..d6692e7 100644 --- a/milena/mln/core/complex_psite.hh +++ b/milena/mln/core/complex_psite.hh @@ -33,7 +33,7 @@ # include <mln/core/internal/pseudo_site_base.hh> -# include <mln/core/complex.hh> +# include <mln/topo/complex.hh> // FIXME: There's a circular dependency issue between complex_psite // and p_complex (likewise for faces_psite and p_faces): they have to @@ -72,7 +72,8 @@ namespace mln /// \{ complex_psite(); /// \pre pc.cplx() == face.cplx(). - complex_psite(const p_complex<D, P>& pc, const any_face_handle<D>& face); + complex_psite(const p_complex<D, P>& pc, + const topo::any_face_handle<D>& face); complex_psite(const p_complex<D, P>& pc, unsigned n, unsigned face_id); /// \} @@ -106,7 +107,7 @@ namespace mln /// Face handle manipulators. /// \{ /// Return the face handle of this point site. - any_face_handle<D> face() const; + topo::any_face_handle<D> face() const; /// Return the dimension of the face of this psite. unsigned n() const; @@ -141,7 +142,7 @@ namespace mln /// The mln::p_faces this point site belongs to. const target* pc_; /// The handle of the face this psite is pointing towards. - any_face_handle<D> face_; + topo::any_face_handle<D> face_; /// \} }; @@ -208,7 +209,7 @@ namespace mln template <unsigned D, typename P> inline complex_psite<D, P>::complex_psite(const p_complex<D, P>& pc, - const any_face_handle<D>& face) + const topo::any_face_handle<D>& face) : pc_(&pc), face_(face) { @@ -288,7 +289,7 @@ namespace mln template <unsigned D, typename P> inline - any_face_handle<D> + topo::any_face_handle<D> complex_psite<D, P>::face() const { return face_; diff --git a/milena/mln/core/faces_psite.hh b/milena/mln/core/faces_psite.hh index 102394b..dd213b6 100644 --- a/milena/mln/core/faces_psite.hh +++ b/milena/mln/core/faces_psite.hh @@ -34,7 +34,7 @@ # include <mln/core/internal/pseudo_site_base.hh> -# include <mln/core/complex.hh> +# include <mln/topo/complex.hh> // FIXME: Factor complex_psite and faces_psite? @@ -66,7 +66,7 @@ namespace mln /// \{ faces_psite(); /// \pre pf.cplx() == face.cplx(). - faces_psite(const p_faces<N, D, P>& pf, const face_handle<N, D>& face); + faces_psite(const p_faces<N, D, P>& pf, const topo::face_handle<N, D>& face); faces_psite(const p_faces<N, D, P>& pf, unsigned face_id); /// \} @@ -100,7 +100,7 @@ namespace mln /// Face handle manipulators. /// \{ /// Return the face handle of this point site. - face_handle<N, D> face() const; + topo::face_handle<N, D> face() const; /// Return the dimension of the face of this psite. unsigned n() const; @@ -134,7 +134,7 @@ namespace mln /// The mln::p_faces this point site belongs to. const target* pf_; /// The handle of the face this psite is pointing towards. - face_handle<N, D> face_; + topo::face_handle<N, D> face_; /// \} }; @@ -199,7 +199,7 @@ namespace mln template <unsigned N, unsigned D, typename P> inline faces_psite<N, D, P>::faces_psite(const p_faces<N, D, P>& pf, - const face_handle<N, D>& face) + const topo::face_handle<N, D>& face) : pf_(&pf), face_(face) { @@ -285,7 +285,7 @@ namespace mln template <unsigned N, unsigned D, typename P> inline - face_handle<N, D> + topo::face_handle<N, D> faces_psite<N, D, P>::face() const { return face_; diff --git a/milena/mln/core/site_set/p_complex.hh b/milena/mln/core/site_set/p_complex.hh index de6e0ad..ecbc0fa 100644 --- a/milena/mln/core/site_set/p_complex.hh +++ b/milena/mln/core/site_set/p_complex.hh @@ -33,7 +33,7 @@ # include <mln/core/internal/site_set_base.hh> -# include <mln/core/complex.hh> +# include <mln/topo/complex.hh> # include <mln/core/complex_psite.hh> # include <mln/core/site_set/p_complex_piter.hh> @@ -105,7 +105,7 @@ namespace mln /// \brief Construct a complex psite set from a complex. /// /// \param gr The complex upon which the complex psite set is built. - p_complex (const complex<D>& cplx); + p_complex (const topo::complex<D>& cplx); /// Associated types. /// \{ @@ -158,10 +158,10 @@ namespace mln /// version) /* FIXME: Move back the const qualifier on this return type (see comment below on cplx_). */ - complex<D>& cplx() const; + topo::complex<D>& cplx() const; /// Return the complex associated to the p_complex domain (mutable /// version). - complex<D>& cplx(); + topo::complex<D>& cplx(); /// \} private: @@ -179,7 +179,7 @@ namespace mln 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_; + mutable topo::complex<D> cplx_; }; @@ -209,7 +209,7 @@ namespace mln template <unsigned D, typename P> inline - p_complex<D, P>::p_complex(const complex<D>& cplx) + p_complex<D, P>::p_complex(const topo::complex<D>& cplx) : cplx_(cplx) { } @@ -262,7 +262,7 @@ namespace mln } template <unsigned D, typename P> - complex<D>& + topo::complex<D>& p_complex<D, P>::cplx() const { mln_precondition(is_valid()); @@ -270,7 +270,7 @@ namespace mln } template <unsigned D, typename P> - complex<D>& + topo::complex<D>& p_complex<D, P>::cplx() { mln_precondition(is_valid()); @@ -304,5 +304,4 @@ namespace mln } // end of mln - #endif // MLN_CORE_SITE_SET_P_COMPLEX_HH diff --git a/milena/mln/core/site_set/p_complex_faces_piter.hh b/milena/mln/core/site_set/p_complex_faces_piter.hh index ef77272..de10d54 100644 --- a/milena/mln/core/site_set/p_complex_faces_piter.hh +++ b/milena/mln/core/site_set/p_complex_faces_piter.hh @@ -37,7 +37,7 @@ # include <mln/core/site_set/p_complex.hh> # include <mln/core/internal/p_complex_piter_base.hh> -# include <mln/core/complex_faces_iter.hh> +# include <mln/topo/complex_faces_iter.hh> /* FIXME: p_complex_faces_fwd_piter_ and p_complex_faces_bkd_piter_ are really long names: find something shorter. */ @@ -61,13 +61,13 @@ namespace mln /// mln::p_complex<D, P>. template <unsigned N, unsigned D, typename P> class p_complex_faces_fwd_piter_ - : public internal::p_complex_piter_base_< complex_faces_fwd_iter_<N, D>, + : public internal::p_complex_piter_base_< topo::complex_faces_fwd_iter_<N, D>, p_complex<D, P>, P, p_complex_faces_fwd_piter_<N, D, P> > { typedef p_complex_faces_fwd_piter_<N, D, P> self_; - typedef internal::p_complex_piter_base_< complex_faces_fwd_iter_<N, D>, + typedef internal::p_complex_piter_base_< topo::complex_faces_fwd_iter_<N, D>, p_complex<D, P>, P, self_ > super_; @@ -91,13 +91,13 @@ namespace mln class p_complex_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_< complex_faces_bkd_iter_<N, D>, + : public internal::p_complex_piter_base_< topo::complex_faces_bkd_iter_<N, D>, p_complex<D, P>, P, p_complex_faces_bkd_piter_<N, D, P> > { typedef p_complex_faces_bkd_piter_<N, D, P> self_; - typedef internal::p_complex_piter_base_< complex_faces_bkd_iter_<N, D>, + typedef internal::p_complex_piter_base_< topo::complex_faces_bkd_iter_<N, D>, p_complex<D, P>, P, self_ > super_; @@ -153,5 +153,4 @@ namespace mln } // end of mln - #endif // ! MLN_CORE_SITE_SET_P_COMPLEX_FACES_PITER_HH diff --git a/milena/mln/core/site_set/p_complex_piter.hh b/milena/mln/core/site_set/p_complex_piter.hh index 114eed6..996b637 100644 --- a/milena/mln/core/site_set/p_complex_piter.hh +++ b/milena/mln/core/site_set/p_complex_piter.hh @@ -36,7 +36,7 @@ # include <mln/core/site_set/p_complex.hh> # include <mln/core/internal/p_complex_piter_base.hh> -# include <mln/core/complex_iter.hh> +# include <mln/topo/complex_iter.hh> namespace mln { @@ -55,13 +55,13 @@ namespace mln /// \brief Forward iterator on (all) the faces of an mln::p_complex<D, P>. template <unsigned D, typename P> class p_complex_fwd_piter_ - : public internal::p_complex_piter_base_< complex_fwd_iter_<D>, + : public internal::p_complex_piter_base_< topo::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>, + typedef internal::p_complex_piter_base_< topo::complex_fwd_iter_<D>, p_complex<D, P>, P, self_ > super_; @@ -82,13 +82,13 @@ namespace mln /// \brief Backward iterator on (all) the faces of an mln::p_complex<D, P>. template <unsigned D, typename P> class p_complex_bkd_piter_ - : public internal::p_complex_piter_base_< complex_bkd_iter_<D>, + : public internal::p_complex_piter_base_< topo::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>, + typedef internal::p_complex_piter_base_< topo::complex_bkd_iter_<D>, p_complex<D, P>, P, self_ > super_; @@ -144,5 +144,4 @@ namespace mln } // end of mln - #endif // ! MLN_CORE_SITE_SET_P_COMPLEX_PITER_HH diff --git a/milena/mln/core/site_set/p_faces.hh b/milena/mln/core/site_set/p_faces.hh index 21cd898..b17f85a 100644 --- a/milena/mln/core/site_set/p_faces.hh +++ b/milena/mln/core/site_set/p_faces.hh @@ -34,7 +34,7 @@ # include <mln/core/internal/site_set_base.hh> -# include <mln/core/complex.hh> +# include <mln/topo/complex.hh> # include <mln/core/faces_psite.hh> # include <mln/core/site_set/p_faces_piter.hh> @@ -71,7 +71,7 @@ namespace mln template <unsigned N, unsigned D, typename P> struct p_faces : public internal::site_set_base_< faces_psite<N, D, P>, - p_faces<N, D, P> > + p_faces<N, D, P> > { typedef p_faces<N, D, P> self_; typedef internal::site_set_base_< faces_psite<N, D, P>, self_ > super_; @@ -79,7 +79,7 @@ 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); + p_faces(const topo::complex<D>& cplx); /// \brief Construct a faces psite set from an mln::p_complex. /// @@ -140,10 +140,10 @@ namespace mln /// version). /* FIXME: Move back the const qualifier on this return type (see comment below on cplx_). */ - complex<D>& cplx() const; + topo::complex<D>& cplx() const; /// Return the complex associated to the p_faces domain (mutable /// version). - complex<D>& cplx(); + topo::complex<D>& cplx(); /// \} private: @@ -160,7 +160,7 @@ namespace mln 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_; + mutable topo::complex<D> cplx_; }; @@ -190,7 +190,7 @@ namespace mln template <unsigned N, unsigned D, typename P> inline - p_faces<N, D, P>::p_faces(const complex<D>& cplx) + p_faces<N, D, P>::p_faces(const topo::complex<D>& cplx) : cplx_(cplx) { // Ensure N is compatible with D. @@ -254,7 +254,7 @@ namespace mln } template <unsigned N, unsigned D, typename P> - complex<D>& + topo::complex<D>& p_faces<N, D, P>::cplx() const { mln_precondition(is_valid()); @@ -262,7 +262,7 @@ namespace mln } template <unsigned N, unsigned D, typename P> - complex<D>& + topo::complex<D>& p_faces<N, D, P>::cplx() { mln_precondition(is_valid()); @@ -296,5 +296,4 @@ namespace mln } // end of mln - #endif // MLN_CORE_SITE_SET_P_FACES_HH diff --git a/milena/mln/core/site_set/p_faces_piter.hh b/milena/mln/core/site_set/p_faces_piter.hh index 65f07fd..bfd1031 100644 --- a/milena/mln/core/site_set/p_faces_piter.hh +++ b/milena/mln/core/site_set/p_faces_piter.hh @@ -36,7 +36,7 @@ # include <mln/core/site_set/p_faces.hh> # include <mln/core/internal/p_complex_piter_base.hh> -# include <mln/core/faces_iter.hh> +# include <mln/topo/faces_iter.hh> namespace mln @@ -57,13 +57,13 @@ namespace mln /// 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>, + : public internal::p_complex_piter_base_< topo::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>, + typedef internal::p_complex_piter_base_< topo::faces_fwd_iter_<N, D>, p_faces<N, D, P>, P, self_ > super_; @@ -87,13 +87,13 @@ namespace mln 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>, + : public internal::p_complex_piter_base_< topo::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>, + typedef internal::p_complex_piter_base_< topo::faces_bkd_iter_<N, D>, p_faces<N, D, P>, P, self_ > super_; @@ -149,5 +149,4 @@ namespace mln } // end of mln - #endif // ! MLN_CORE_SITE_SET_P_FACES_PITER_HH diff --git a/milena/tests/core/image/complex_image.cc b/milena/tests/core/image/complex_image.cc index 24f0a2c..3b40fba 100644 --- a/milena/tests/core/image/complex_image.cc +++ b/milena/tests/core/image/complex_image.cc @@ -65,24 +65,24 @@ int main() const unsigned D = 2; - complex<D> c; + topo::complex<D> c; // 0-faces (points). - face_handle<0, D> v0 = c.add_face(); - face_handle<0, D> v1 = c.add_face(); - face_handle<0, D> v2 = c.add_face(); - face_handle<0, D> v3 = c.add_face(); + topo::face_handle<0, D> v0 = c.add_face(); + topo::face_handle<0, D> v1 = c.add_face(); + topo::face_handle<0, D> v2 = c.add_face(); + topo::face_handle<0, D> v3 = c.add_face(); // 1-faces (segments). - face_handle<1, D> e0 = c.add_face(v0 + v1); - face_handle<1, D> e1 = c.add_face(v0 + v2); - face_handle<1, D> e2 = c.add_face(v1 + v2); - face_handle<1, D> e3 = c.add_face(v0 + v3); - face_handle<1, D> e4 = c.add_face(v2 + v3); + topo::face_handle<1, D> e0 = c.add_face(v0 + v1); + topo::face_handle<1, D> e1 = c.add_face(v0 + v2); + topo::face_handle<1, D> e2 = c.add_face(v1 + v2); + topo::face_handle<1, D> e3 = c.add_face(v0 + v3); + topo::face_handle<1, D> e4 = c.add_face(v2 + v3); // 2-faces (triangles). - face_handle<2, D> t0 = c.add_face(e0 + e1 + e2); - face_handle<2, D> t1 = c.add_face(e1 + e3 + e4); + topo::face_handle<2, D> t0 = c.add_face(e0 + e1 + e2); + topo::face_handle<2, D> t1 = c.add_face(e1 + e3 + e4); /*---------------------. @@ -91,7 +91,7 @@ int main() // A pset. p_complex<D, point2d> pc(c); - any_face_handle<D> af(e0); + topo::any_face_handle<D> af(e0); // An associated psite. complex_psite<D, point2d> cs(pc, af); -- 1.6.0.1

1 0