February 2009 - Olena-patches

3237: Add core/alias/all.hh and alias/vec3d.hh.
by Guillaume Lazzara 03 Feb '09

03 Feb '09

* doc/tutorial/examples/examples.mk * doc/tutorial/figures/figures.mk * doc/tutorial/outputs/outputs.mk * doc/tutorial/samples/samples.mk: Update generated files. * headers.mk: add new header to distribution. * mln/core/alias/all.hh: new header. * mln/core/alias/vec3d.hh: new aliases for 3d algebra::vec. * mln/core/alias/box2d.hh, * mln/core/alias/box3d.hh: update comments. * mln/core/all.hh: include alias/all.hh. * mln/essential/3d.hh: add image3d.hh and vec3d.hh. * tests/unit_test/Makefile.am, * tests/unit_test/mln_core_alias_all.cc, * tests/unit_test/mln_core_alias_vec3d.cc, * tests/unit_test/mln_make_image3d.cc: add new unit test files. --- milena/doc/tutorial/examples/examples.mk | 1 - milena/doc/tutorial/figures/figures.mk | 1 - milena/doc/tutorial/outputs/outputs.mk | 1 - milena/doc/tutorial/samples/samples.mk | 1 - milena/headers.mk | 3 + milena/mln/core/alias/{box2d.hh => all.hh} | 66 +++++++++++++---------- milena/mln/core/alias/box2d.hh | 27 +++++----- milena/mln/core/alias/box3d.hh | 27 +++++----- milena/mln/core/alias/{box3d.hh => vec3d.hh} | 30 +++++------ milena/mln/core/all.hh | 1 + milena/mln/essential/3d.hh | 2 + milena/tests/unit_test/Makefile.am | 3 + milena/tests/unit_test/mln_core_alias_all.cc | 11 ++++ milena/tests/unit_test/mln_core_alias_vec3d.cc | 11 ++++ milena/tests/unit_test/mln_make_image3d.cc | 11 ++++ 15 files changed, 118 insertions(+), 78 deletions(-) copy milena/mln/core/alias/{box2d.hh => all.hh} (56%) copy milena/mln/core/alias/{box3d.hh => vec3d.hh} (71%) create mode 100644 milena/tests/unit_test/mln_core_alias_all.cc create mode 100644 milena/tests/unit_test/mln_core_alias_vec3d.cc create mode 100644 milena/tests/unit_test/mln_make_image3d.cc diff --git a/milena/doc/tutorial/examples/examples.mk b/milena/doc/tutorial/examples/examples.mk index 146f068..7458ead 100644 --- a/milena/doc/tutorial/examples/examples.mk +++ b/milena/doc/tutorial/examples/examples.mk @@ -1,6 +1,5 @@ ## Generated by ../generate_dist_files, do not modify ## EXTRA_DIST += \ -examples \ examples/cpp_issue.cc \ examples/sub_image.cc \ examples/sub_image_if.cc \ diff --git a/milena/doc/tutorial/figures/figures.mk b/milena/doc/tutorial/figures/figures.mk index 3d11a2b..aba2682 100644 --- a/milena/doc/tutorial/figures/figures.mk +++ b/milena/doc/tutorial/figures/figures.mk @@ -1,6 +1,5 @@ ## Generated by ../generate_dist_files, do not modify ## EXTRA_DIST += \ -figures \ figures/ima2d-rot-2.ppm \ figures/tuto3_rw_image-1.ppm \ figures/logical-not-2.pbm \ diff --git a/milena/doc/tutorial/outputs/outputs.mk b/milena/doc/tutorial/outputs/outputs.mk index 7d7596d..c6d318a 100644 --- a/milena/doc/tutorial/outputs/outputs.mk +++ b/milena/doc/tutorial/outputs/outputs.mk @@ -1,6 +1,5 @@ ## Generated by ../generate_dist_files, do not modify ## EXTRA_DIST += \ -outputs \ outputs/win-create-1-display.txt \ outputs/win-create-2.txt \ outputs/accu-right-instanciation.txt \ diff --git a/milena/doc/tutorial/samples/samples.mk b/milena/doc/tutorial/samples/samples.mk index 7213ed1..40b410d 100644 --- a/milena/doc/tutorial/samples/samples.mk +++ b/milena/doc/tutorial/samples/samples.mk @@ -1,6 +1,5 @@ ## Generated by ../generate_dist_files, do not modify ## EXTRA_DIST += \ -samples \ samples/paste-call-1.cc \ samples/dpoint-1.cc \ samples/parray-append.cc \ diff --git a/milena/headers.mk b/milena/headers.mk index 74a3002..037b5cc 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -134,6 +134,7 @@ mln/trace/stop.hh \ mln/trace/essential.hh \ mln/make/graph.hh \ mln/make/double_neighb2d.hh \ +mln/make/image3d.hh \ mln/make/dpoint2d_h.hh \ mln/make/w_window.hh \ mln/make/image.hh \ @@ -800,11 +801,13 @@ mln/core/alias/p_run2d.hh \ mln/core/alias/point3d.hh \ mln/core/alias/neighb3d.hh \ mln/core/alias/window3d.hh \ +mln/core/alias/all.hh \ mln/core/alias/neighb2d.hh \ mln/core/alias/complex_image.hh \ mln/core/alias/w_window1d_float.hh \ mln/core/alias/neighb1d.hh \ mln/core/alias/w_window2d_float.hh \ +mln/core/alias/vec3d.hh \ mln/core/alias/w_window2d_int.hh \ mln/core/alias/box1d.hh \ mln/core/alias/box2d.hh \ diff --git a/milena/mln/core/alias/box2d.hh b/milena/mln/core/alias/all.hh similarity index 56% copy from milena/mln/core/alias/box2d.hh copy to milena/mln/core/alias/all.hh index fb51e5d..ce509a6 100644 --- a/milena/mln/core/alias/box2d.hh +++ b/milena/mln/core/alias/all.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2009 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 @@ -25,34 +25,42 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_SITE_SET_BOX2D_HH -# define MLN_CORE_SITE_SET_BOX2D_HH +#ifndef MLN_CORE_ALIAS_ALL_HH +# define MLN_CORE_ALIAS_ALL_HH -/*! \file mln/core/alias/box2d.hh - * - * \brief Definition of the mln::box2d alias and of construction - * routines. - */ +/// \file mln/core/alias/all.hh +/// +/// File that includes all the aliases. -# include <mln/core/site_set/box.hh> -# include <mln/core/alias/point2d.hh> +#include <box1d.hh> +#include <box2d.hh> +#include <box2d_h.hh> +#include <box3d.hh> +#include <complex_geometry.hh> +#include <complex_image.hh> +#include <dpoint1d.hh> +#include <dpoint2d.hh> +#include <dpoint2d_h.hh> +#include <dpoint3d.hh> +#include <neighb1d.hh> +#include <neighb2d.hh> +#include <neighb3d.hh> +#include <p_run2d.hh> +#include <p_runs2d.hh> +#include <point1d.hh> +#include <point2d.hh> +#include <point2d_h.hh> +#include <point3d.hh> +#include <point3df.hh> +#include <vec3d.hh> +#include <w_window1d_float.hh> +#include <w_window1d_int.hh> +#include <w_window2d_float.hh> +#include <w_window2d_int.hh> +#include <w_window3d_float.hh> +#include <w_window3d_int.hh> +#include <window1d.hh> +#include <window2d.hh> +#include <window3d.hh> - -namespace mln -{ - - /*! \brief Type alias for a box defined on the 2D square grid with - * integer coordinates. - * - * \see mln::win::rectangle2d. - */ - typedef box<mln::point2d> box2d; - - -} // end of namespace mln - - -# include <mln/make/box2d.hh> - - -#endif // ! MLN_CORE_SITE_SET_BOX2D_HH +#endif // ! MLN_CORE_ALIAS_ALL_HH diff --git a/milena/mln/core/alias/box2d.hh b/milena/mln/core/alias/box2d.hh index fb51e5d..20cae3b 100644 --- a/milena/mln/core/alias/box2d.hh +++ b/milena/mln/core/alias/box2d.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 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 @@ -25,14 +26,13 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_SITE_SET_BOX2D_HH -# define MLN_CORE_SITE_SET_BOX2D_HH +#ifndef MLN_CORE_ALIAS_BOX2D_HH +# define MLN_CORE_ALIAS_BOX2D_HH -/*! \file mln/core/alias/box2d.hh - * - * \brief Definition of the mln::box2d alias and of construction - * routines. - */ +/// \file mln/core/alias/box2d.hh +/// +/// Definition of the mln::box2d alias and of construction +/// routines. # include <mln/core/site_set/box.hh> # include <mln/core/alias/point2d.hh> @@ -41,11 +41,10 @@ namespace mln { - /*! \brief Type alias for a box defined on the 2D square grid with - * integer coordinates. - * - * \see mln::win::rectangle2d. - */ + /// Type alias for a box defined on the 2D square grid with + /// integer coordinates. + /// + /// \see mln::win::rectangle2d. typedef box<mln::point2d> box2d; @@ -55,4 +54,4 @@ namespace mln # include <mln/make/box2d.hh> -#endif // ! MLN_CORE_SITE_SET_BOX2D_HH +#endif // ! MLN_CORE_ALIAS_BOX2D_HH diff --git a/milena/mln/core/alias/box3d.hh b/milena/mln/core/alias/box3d.hh index 54beaf6..4deafb7 100644 --- a/milena/mln/core/alias/box3d.hh +++ b/milena/mln/core/alias/box3d.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2009 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 @@ -25,14 +26,13 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_SITE_SET_BOX3D_HH -# define MLN_CORE_SITE_SET_BOX3D_HH +#ifndef MLN_CORE_ALIAS_BOX3D_HH +# define MLN_CORE_ALIAS_BOX3D_HH -/*! \file mln/core/alias/box3d.hh - * - * \brief Definition of the mln::box3d alias and of construction - * routines. - */ +/// \file mln/core/alias/box3d.hh +/// +/// Definition of the mln::box3d alias and of construction +/// routines. # include <mln/core/site_set/box.hh> # include <mln/core/alias/point3d.hh> @@ -41,11 +41,10 @@ namespace mln { - /*! \brief Type alias for a box defined on the 3D square grid with - * integer coordinates. - * - * \see mln::win::rectangle3d. - */ + /// Type alias for a box defined on the 3D square grid with + /// integer coordinates. + /// + /// \see mln::win::rectangle3d. typedef box<point3d> box3d; @@ -55,4 +54,4 @@ namespace mln # include <mln/make/box3d.hh> -#endif // ! MLN_CORE_SITE_SET_BOX3D_HH +#endif // ! MLN_CORE_ALIAS_BOX3D_HH diff --git a/milena/mln/core/alias/box3d.hh b/milena/mln/core/alias/vec3d.hh similarity index 71% copy from milena/mln/core/alias/box3d.hh copy to milena/mln/core/alias/vec3d.hh index 54beaf6..621b505 100644 --- a/milena/mln/core/alias/box3d.hh +++ b/milena/mln/core/alias/vec3d.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2009 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 @@ -25,28 +25,24 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_SITE_SET_BOX3D_HH -# define MLN_CORE_SITE_SET_BOX3D_HH +#ifndef MLN_CORE_ALIAS_VEC3D_HH +# define MLN_CORE_ALIAS_VEC3D_HH -/*! \file mln/core/alias/box3d.hh - * - * \brief Definition of the mln::box3d alias and of construction - * routines. - */ +/// \file mln/core/alias/vec3d.hh +/// +/// Definition of the mln::vec3d* alias -# include <mln/core/site_set/box.hh> -# include <mln/core/alias/point3d.hh> +# include <mln/algebra/vec.hh> namespace mln { - /*! \brief Type alias for a box defined on the 3D square grid with - * integer coordinates. - * - * \see mln::win::rectangle3d. - */ - typedef box<point3d> box3d; + /// 3D vector with float coordinates. + typedef algebra::vec<3u,float> vec3d_f; + + /// 3D vector with double coordinates. + typedef algebra::vec<3u,double> vec3d_d; } // end of namespace mln @@ -55,4 +51,4 @@ namespace mln # include <mln/make/box3d.hh> -#endif // ! MLN_CORE_SITE_SET_BOX3D_HH +#endif // ! MLN_CORE_ALIAS_VEC3D_HH diff --git a/milena/mln/core/all.hh b/milena/mln/core/all.hh index f92dbd8..d0ab2c3 100644 --- a/milena/mln/core/all.hh +++ b/milena/mln/core/all.hh @@ -34,6 +34,7 @@ // Sub-directories. +# include <mln/core/alias/all.hh> # include <mln/core/concept/all.hh> # include <mln/core/def/all.hh> # include <mln/core/image/all.hh> diff --git a/milena/mln/essential/3d.hh b/milena/mln/essential/3d.hh index 8d782c6..ec1a602 100644 --- a/milena/mln/essential/3d.hh +++ b/milena/mln/essential/3d.hh @@ -34,11 +34,13 @@ # include <mln/core/alias/dpoint3d.hh> # include <mln/core/alias/neighb3d.hh> # include <mln/core/alias/point3d.hh> +# include <mln/core/alias/vec3d.hh> # include <mln/core/alias/w_window3d_float.hh> # include <mln/core/alias/w_window3d_int.hh> # include <mln/core/alias/window3d.hh> # include <mln/geom/size3d.hh> # include <mln/make/box3d.hh> +# include <mln/make/image3d.hh> # include <mln/make/w_window3d.hh> # include <mln/make/w_window3d_int.hh> # include <mln/metal/array3d.hh> diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index 0475cc4..2653f23 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -131,6 +131,7 @@ mln_trace_stop \ mln_trace_essential \ mln_make_graph \ mln_make_double_neighb2d \ +mln_make_image3d \ mln_make_dpoint2d_h \ mln_make_w_window \ mln_make_image \ @@ -791,11 +792,13 @@ mln_core_alias_p_run2d \ mln_core_alias_point3d \ mln_core_alias_neighb3d \ mln_core_alias_window3d \ +mln_core_alias_all \ mln_core_alias_neighb2d \ mln_core_alias_complex_image \ mln_core_alias_w_window1d_float \ mln_core_alias_neighb1d \ mln_core_alias_w_window2d_float \ +mln_core_alias_vec3d \ mln_core_alias_w_window2d_int \ mln_core_alias_box1d \ mln_core_alias_box2d \ diff --git a/milena/tests/unit_test/mln_core_alias_all.cc b/milena/tests/unit_test/mln_core_alias_all.cc new file mode 100644 index 0000000..97f068e --- /dev/null +++ b/milena/tests/unit_test/mln_core_alias_all.cc @@ -0,0 +1,11 @@ +// Unit test for mln/core/alias/all.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/core/alias/all.hh> +#include <mln/core/alias/all.hh> + +int main() +{ + // Nothing. +} diff --git a/milena/tests/unit_test/mln_core_alias_vec3d.cc b/milena/tests/unit_test/mln_core_alias_vec3d.cc new file mode 100644 index 0000000..476c522 --- /dev/null +++ b/milena/tests/unit_test/mln_core_alias_vec3d.cc @@ -0,0 +1,11 @@ +// Unit test for mln/core/alias/vec3d.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/core/alias/vec3d.hh> +#include <mln/core/alias/vec3d.hh> + +int main() +{ + // Nothing. +} diff --git a/milena/tests/unit_test/mln_make_image3d.cc b/milena/tests/unit_test/mln_make_image3d.cc new file mode 100644 index 0000000..85fbb01 --- /dev/null +++ b/milena/tests/unit_test/mln_make_image3d.cc @@ -0,0 +1,11 @@ +// Unit test for mln/make/image3d.hh. +// Generated by ./build_unit_test.sh, do not modify. + +// Include the file twice, so we detect missing inclusion guards. +#include <mln/make/image3d.hh> +#include <mln/make/image3d.hh> + +int main() +{ + // Nothing. +} -- 1.5.6.5

1 0

3236: Update Laurent's cleanup code.
by Thierry Geraud 03 Feb '09

03 Feb '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Update Laurent's cleanup code. * theo/esiee/laurent/ismm09/trash.hh: New. * theo/esiee/laurent/ismm09/util.hh: New. * theo/esiee/laurent/ismm09/main.cc: Update. main.cc | 251 +++++++++++++++++++++++++++++++++++++++------------------------ trash.hh | 62 +++++++++++++++ util.hh | 62 +++++++++++++++ 3 files changed, 280 insertions(+), 95 deletions(-) Index: theo/esiee/laurent/ismm09/trash.hh --- theo/esiee/laurent/ismm09/trash.hh (revision 0) +++ theo/esiee/laurent/ismm09/trash.hh (revision 0) @@ -0,0 +1,62 @@ + +namespace mln +{ + + + template <typename F, typename N, typename A, typename W> + void // util::array<unsigned> + compute_attribute_extincted(const F& f, const N& nbh, const A& a, + const W& w) + { + typedef value::label_16 L; + L n_basins; + mln_ch_value(F,L) regmins = labeling::regional_minima(f, nbh, n_basins); + + typedef p_array<mln_psite(F)> S; + S s = level::sort_psites_decreasing(f); + + typedef morpho::tree::data<F,S> tree_t; + tree_t t(f, s, nbh); + mln_VAR(a_ima, morpho::tree::compute_attribute_image(a, t)); + + std::cout << "BEFORE:" << std::endl; + debug::println("a_ima:", a_ima); + debug::println("a_ima | w_line:", a_ima | (pw::value(w) == 0)); + debug::println("a_ima | basins:", a_ima | (pw::value(w) != 0)); + // debug::println("a_ima | regmins:", a_ima | (pw::value(regmins) != 0)); + + + extinct_attributes(t, a_ima); + + std::cout << "AFTER:" << std::endl; + debug::println("a_ima:", a_ima); + debug::println("a_ima | w_line:", a_ima | (pw::value(w) == 0)); + debug::println("a_ima | basins:", a_ima | (pw::value(w) != 0)); + debug::println("a_ima | regmins:", a_ima | (pw::value(regmins) != 0)); + } + + +} // end of namespace mln + + + + +// Trash code: + + +// { +// L n_regmins; +// mln_VAR(regmins, labeling::regional_minima(g, cplx2d::e2e(), n_regmins)); +// mln_invariant(n_regmins == n_basins); +// debug::println("regmins(g):", regmins); + +// debug::println("w:", w); +// std::cout << "n basins = " << n_basins << std::endl +// << std::endl; +// } + +// // accu::count< util::pix<g_t> > a_; +// accu::height<g_t> a_; + +// compute_attribute_extincted(g, cplx2d::e2e(), a_, +// w); Index: theo/esiee/laurent/ismm09/main.cc --- theo/esiee/laurent/ismm09/main.cc (revision 3235) +++ theo/esiee/laurent/ismm09/main.cc (working copy) @@ -19,13 +19,15 @@ #include <mln/labeling/compute.hh> #include <mln/level/sort_psites.hh> +#include <mln/core/site_set/p_queue.hh> +#include <mln/core/site_set/p_priority.hh> + #include <mln/morpho/gradient.hh> #include <mln/morpho/meyer_wst.hh> #include <mln/morpho/tree/data.hh> #include <mln/morpho/tree/compute_attribute_image.hh> #include <mln/accu/count.hh> -#include <mln/accu/height.hh> @@ -160,102 +162,70 @@ } - } // end of namespace mln::cplx2d - - - namespace internal - { - - template <typename T> - struct node_pred : Function_p2b< node_pred<T> > - { - typedef bool result; - - template <typename P> - bool operator()(const P& p) const + inline + point2d p1_from_e(const point2d& e) { - return t->is_a_node(p); + return e + (is_row_odd(e) ? up : left); } - const T* t; - }; - - template <typename T, typename I, typename M> - mln_value(I) rec(const T& t, // tree - I& a, // attribute image - M& mark, - const mln_psite(I)& p) + inline + point2d p2_from_e(const point2d& e) { - mln_invariant(mark(p) == false); - mark(p) = true; - if (t.parent(p) == p || mark(t.parent(p)) == true) // Stop. - return a(p); - return a(p) = rec(t, a, mark, t.parent(p)); + return e + (is_row_odd(e) ? down : right); } - } // internal - - - template <typename T, typename A> + template <typename W, typename L> + inline void - extinct_attributes(const T& t, // Tree. - A& a) // Attribute image. + e_to_labels(const W& w, const point2d& e, L& l1, L& l2) { - mln_ch_value(A, bool) mark; - initialize(mark, a); - data::fill(mark, false); - - internal::node_pred<T> node_only; - node_only.t = &t; - - typedef p_array<mln_site(A)> S; - S s = level::sort_psites_increasing(a | node_only); - - mln_fwd_piter(S) p(s); - for_all(p) - { - if (mark(p) == true) - continue; - internal::rec(t, a, mark, p); - } + mln_precondition(w(e) == 0); + l1 = 0; + l2 = 0; + mln_niter(dbl_neighb2d) n(e2e(), e); + for_all(n) + if (w.has(n) && w(n) != 0) + { + if (l1 == 0) // First label to be stored. + l1 = w(n); + else + if (w(n) != l1 && l2 == 0) // Second label to be stored. + l2 = w(n); + else + mln_invariant(w(n) == l1 || w(n) == l2); + } + mln_invariant(l1 != 0 && l2 != 0); + if (l1 > l2) + std::swap(l1, l2); + mln_postcondition(l2 >= l1); } - template <typename F, typename N, typename A, typename W> - void // util::array<unsigned> - compute_attribute_extincted(const F& f, const N& nbh, const A& a, - const W& w) - { - typedef value::label_16 L; - L n_basins; - mln_ch_value(F,L) regmins = labeling::regional_minima(f, nbh, n_basins); - - typedef p_array<mln_psite(F)> S; - S s = level::sort_psites_decreasing(f); - - typedef morpho::tree::data<F,S> tree_t; - tree_t t(f, s, nbh); - mln_VAR(a_ima, morpho::tree::compute_attribute_image(a, t)); + } // end of namespace mln::cplx2d - std::cout << "BEFORE:" << std::endl; - debug::println("a_ima:", a_ima); - debug::println("a_ima | w_line:", a_ima | (pw::value(w) == 0)); - debug::println("a_ima | basins:", a_ima | (pw::value(w) != 0)); - // debug::println("a_ima | regmins:", a_ima | (pw::value(regmins) != 0)); - extinct_attributes(t, a_ima); + template <typename A, typename L> + util::array<L> + sort_by_increasing_attributes(const util::array<A>& a, L n_basins) + { + typedef std::pair<A,L> pair_t; + std::vector<pair_t> v; + v.reserve(n_basins); + for (L l = 1; l <= n_basins; ++l) + v.push_back(pair_t(a[l], l)); + + std::sort(v.begin(), v.end()); + + util::array<L> l(n_basins); + for (unsigned i = 0; i < n_basins; ++i) + l[i] = v[i].second; - std::cout << "AFTER:" << std::endl; - debug::println("a_ima:", a_ima); - debug::println("a_ima | w_line:", a_ima | (pw::value(w) == 0)); - debug::println("a_ima | basins:", a_ima | (pw::value(w) != 0)); - debug::println("a_ima | regmins:", a_ima | (pw::value(regmins) != 0)); + return l; } - } // end of namespace mln @@ -291,34 +261,125 @@ mln_VAR(g, cplx2d::f_to_g(f) ); debug::println("g:", g); + typedef mln_value_(g_t) T; // <--- Type of edge values. + typedef mln_psite_(g_t) E; // <--- Type of edges. + + + mln_VAR(nbh_g, cplx2d::e2e()); // Neighborhood between edges. + // w: watershed labeling on edges. - typedef label_16 L; + typedef label_16 L; // <--- Type of labels. L n_basins; - mln_VAR( w, morpho::meyer_wst(g, cplx2d::e2e(), n_basins) ); + mln_VAR( w, morpho::meyer_wst(g, nbh_g, n_basins) ); + debug::println("w:", w); + + + mln_VAR( w_line, pw::value(w) == pw::cst(0) ); + mln_VAR( g_line, g | w_line ); + debug::println("g | line:", g_line); + { - L n_regmins; - mln_VAR(regmins, labeling::regional_minima(g, cplx2d::e2e(), n_regmins)); - mln_invariant(n_regmins == n_basins); - debug::println("regmins(g):", regmins); + /* + // debug::println("w | line:", w | w_line); + mln_VAR(w_ext, cplx2d::extend_w_edges_to_all_faces(w)); + debug::println("w_ext:", w_ext); + // debug::println("w_ext | line:", w_ext | (pw::value(w_ext) == pw::cst(0))); + */ + } - debug::println("w:", w); - std::cout << "n basins = " << n_basins << std::endl - << std::endl; -// mln_VAR(w_ext, cplx2d::extend_w_edges_to_all_faces(w)); -// debug::println("w_ext:", w_ext); -// mln_VAR(is_line, pw::value(w_ext) == pw::cst(0)); -// debug::println("w line:", w_ext | is_line); + // a: array "label -> attribute". + + typedef unsigned A; // <--- Type of attributes. + + util::array<A> a = labeling::compute(accu::meta::count(), + g, // image of values + w, // image of labels + n_basins); + + util::array<L> l = sort_by_increasing_attributes(a, n_basins); + + { + /* + std::cout << "l:" << std::endl; + for (unsigned i = 0; i < l.nelements(); ++i) + std::cout << l[i] << "(" << a[l[i]] << ") "; + std::cout << std::endl; + */ + } + + +// { +// // Test adjacency "e -> (l1, l2)". +// L l1, l2; +// mln_piter_(g_t) e(g.domain()); +// for_all(e) +// if (w(e) == 0) +// { +// cplx2d::e_to_labels(w, e, l1, l2); +// std::cout << e << ':' << l1 << ',' << l2 << std::endl; +// } +// } + + + + // Edges -> Priority queue. + + typedef p_priority< T, p_queue<E> > Q; + util::array<Q> q(n_basins.next()); + + { + L l1, l2; + mln_piter_(g_t) e(g.domain()); + for_all(e) + if (w(e) == 0) + { + cplx2d::e_to_labels(w, e, // input + l1, l2); // output + q[l1].push(mln_max(T) - g(e), e); + q[l2].push(mln_max(T) - g(e), e); + } + } + + + // Information "label l -> edge e". + + E null = E(0,0); // Impossible value. + + util::array<E> edge(n_basins.next()); + for (L l = 0; l <= n_basins; ++l) + edge[l] = null; + + + // Initialization. + + util::array<L> lpar(n_basins.next()); + for (L l = 0; l <= n_basins; ++l) + lpar[l] = l; // Make-Set. + + + + mln_ch_value_(g_line_t, E) + epar, // Edge forest. + z_epar; // Auxiliary data: edge forest with compression and balancing. + + { + initialize(epar, g_line); + initialize(z_epar, g_line); + mln_piter_(g_line_t) e(g_line.domain()); + for_all(e) + { + // Make-Set. + epar(e) = e; + z_epar(e) = e; + } + debug::println("all edges:", epar); // epar(e) == e so we depict the edges! } - // accu::count< util::pix<g_t> > a_; - accu::height<g_t> a_; - compute_attribute_extincted(g, cplx2d::e2e(), a_, - w); } Index: theo/esiee/laurent/ismm09/util.hh --- theo/esiee/laurent/ismm09/util.hh (revision 0) +++ theo/esiee/laurent/ismm09/util.hh (revision 0) @@ -0,0 +1,62 @@ + +namespace mln +{ + + namespace internal + { + + template <typename T> + struct node_pred : Function_p2b< node_pred<T> > + { + typedef bool result; + + template <typename P> + bool operator()(const P& p) const + { + return t->is_a_node(p); + } + + const T* t; + }; + + template <typename T, typename I, typename M> + mln_value(I) rec(const T& t, // tree + I& a, // attribute image + M& mark, + const mln_psite(I)& p) + { + mln_invariant(mark(p) == false); + mark(p) = true; + if (t.parent(p) == p || mark(t.parent(p)) == true) // Stop. + return a(p); + return a(p) = rec(t, a, mark, t.parent(p)); + } + + } // internal + + + template <typename T, typename A> + void + extinct_attributes(const T& t, // Tree. + A& a) // Attribute image. + { + mln_ch_value(A, bool) mark; + initialize(mark, a); + data::fill(mark, false); + + internal::node_pred<T> node_only; + node_only.t = &t; + + typedef p_array<mln_site(A)> S; + S s = level::sort_psites_increasing(a | node_only); + + mln_fwd_piter(S) p(s); + for_all(p) + { + if (mark(p) == true) + continue; + internal::rec(t, a, mark, p); + } + } + +} // end of namespace mln

1 0

r3235: Add dispatch functions for accumulator
by Edwin Carlinet 02 Feb '09

02 Feb '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-02-02 Edwin Carlinet <carlinet(a)lrde.epita.fr> Add dispatch functions for accumulator. * .: New. * fredwin.cc: New. --- fredwin.cc | 220 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 220 insertions(+) Index: trunk/milena/sandbox/edwin/fredwin.cc =================================================================== --- trunk/milena/sandbox/edwin/fredwin.cc (revision 0) +++ trunk/milena/sandbox/edwin/fredwin.cc (revision 3235) @@ -0,0 +1,220 @@ + + +template <typename E> +struct Accumulator +{ +}; + + +template <typename E> +struct Meta_Accumulator +{ +}; + +// Cf. mln/core/concept/* + + +namespace accu +{ + + template <typename T> + struct card : Accumulator<card> + { + void take(const T& elt) { ++c_; } + unsigned c_; + }; + + namespace meta + { + struct card : Meta_Accumulator<card> + { + template <typename T> + struct with + { + typedef accu::card<T> ret; + }; + }; + + // FIXME: passez de accu::meta::card a accu::card<T> ? + + // Cf. mln/accu/count.hh + // et mln/accu/compute.hh + + } // meta + +} // accu + + + +namespace impl +{ + + // Leveling + // -------- + + template <typename I, typename A> + void + leveling(const Image& input, const Accumulator<A>& acc) + { + const I& ima = exact(input); + // algo en resume : + mln_piter(I) p(ima.domain()); + for_all(p) + acc.take(make::pix(ima, p)); // util::pix + } + + template <typename I, typename A> + void + leveling_fastest(const Image& input_, const Accumulator<A>& acc) + { + const I& input = exact(input_); + + // algo en resume : + mln_pixter(const I) pxl(input); + for_all(pxl) + acc.take(pxl); + } + + + // FIXME: pb: on a 2 fois le même code, plusieurs fois car 1 + // spécialisation pour les images fastest + + + // Algebraic + // --------- + + + template <typename I, typename A> + void + generic_algebraic(const Image& input, const Accumulator<A>& acc) + { + // algo en resume : + mln_piter(I) p(ima.domain()); + for_all(p) + acc.take(p); // psite + } + + template <typename I, typename A> + void + algebraic_fastest(const Image& input, const Accumulator<A>& acc) + { + // algo en resume : + mln_pixter(const I) pxl(input); + for_all(pxl) + acc.take(pxl); + } + + + // FIXME: pb: soit on passe du "site", soit du "pixel"... + + + // pour mémoire mais on s'en fout (!!!) : + /* + template <typename I, typename A> + void + algebraic_fastest_alt(const Image& input, const Accumulator<A>& acc) + { + for (unsigned i = 0; i < n; ++i) + acc.take(input, i); // (image, offset) -> site + // Cf. methode image2d<T>::point_at_index(i) + } + */ + + + // FIXME: On veut qqch qui ressemble à : + + template <typename I, typename A> + void + generic_algebraic_or_leveling(const Image& input, const Accumulator<A>& acc) + { + // algo en resume : + mln_piter(I) p(ima.domain()); + for_all(p) + acc.take( FIXME ); + } + + template <typename I, typename A> + void + algebraic_or_leveling_fastest(const Image& input, const Accumulator<A>& acc) + { + // algo en resume : + mln_pixter(const I) pxl(input); + for_all(pxl) + acc.take( FIXME ); + } + + + // FIXME: Mais ce n'est peut-être pas possible avec des + // Accumulator... + + +} // impl + + + +namespace internal +{ + + // dispatch for geneneric implementation. + template <typename M, typename I> + void + algebraic_dispatch(metal::false_, + const Image& input, + const Meta_Accumulator<M>& acc) + { + typedef mln_accu_with(M, mln_piter(I)) A; + + mln_piter(I)* piter; + A accu = accu::unmeta(exact(acc), piter); + + generic_algebraic(input, acc); + } + + + // dispatch for fastest implementation. + template <typename M, typename I> + void + algebraic_dispatch(metal::true_, + const Image& input, + const Meta_Accumulator<M>& acc) + { + typedef mln_accu_with(M, util::pix) A; + + util::pix* pix_; + A accu = accu::unmeta(exact(acc), pix_); + + algebraic_fastest(input, acc); + } + + template <typename M, typename I> + void + algebraic_dispatch(const Image& input, + const Meta_Accumulator<M>& acc) + { + + + algebraic_dispatch(mlc_equal(mln_trait_image_speed(I), + trait::image::speed::fastest)::value, + input, + acc); + } + +} + + + +// Facade. + +template <typename M, typename I> +void +algebraic(const Image& input, const Meta_Accumulator<M>& acc) // FIXME: on préfère Meta_Accumulator ! +{ + internal::algebraic_dispatch(input, acc); +} + + + +int main() +{ + algebraic(ima, accu::meta::card()); +}

1 0

3233: Fix tutorial generation.
by Guillaume Lazzara 02 Feb '09

02 Feb '09

* doc/tutorial/generate_dist_files.sh: dot not include current directory... * doc/tutorial/samples/borderthickness.cc: Fix a non initialized border. --- milena/ChangeLog | 10 ++++++++++ milena/doc/tutorial/generate_dist_files.sh | 2 +- milena/doc/tutorial/samples/borderthickness.cc | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index cdffe3f..eb424b1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,13 @@ +2009-02-02 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix tutorial generation. + + * doc/tutorial/generate_dist_files.sh: dot not include current + directory... + + * doc/tutorial/samples/borderthickness.cc: Fix a non initialized + border. + 2009-02-02 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Activate fastest version of algebraic union-find. diff --git a/milena/doc/tutorial/generate_dist_files.sh b/milena/doc/tutorial/generate_dist_files.sh index 5864bff..91f75f1 100755 --- a/milena/doc/tutorial/generate_dist_files.sh +++ b/milena/doc/tutorial/generate_dist_files.sh @@ -4,7 +4,7 @@ for dir in samples figures outputs examples; do OUT="$dir/$dir.mk" echo "## Generated by ../generate_dist_files, do not modify ##" > $OUT echo -n "EXTRA_DIST += " >> $OUT - for file in `find $dir`; do + for file in `find $dir -mindepth 1`; do echo " \\" >> $OUT echo -n $file >> $OUT done diff --git a/milena/doc/tutorial/samples/borderthickness.cc b/milena/doc/tutorial/samples/borderthickness.cc index 8c96bfb..ce02abe 100644 --- a/milena/doc/tutorial/samples/borderthickness.cc +++ b/milena/doc/tutorial/samples/borderthickness.cc @@ -9,6 +9,7 @@ int main() { 1, 1, 0 } }; image2d<bool> ima_def = make::image(vals); + border::fill(ima_def, false); debug::println_with_border(ima_def); std::cout << "===========" << std::endl << std::endl; -- 1.5.6.5

1 0

3232: Activate fastest version of algebraic union-find.
by Thierry Geraud 02 Feb '09

02 Feb '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Activate fastest version of algebraic union-find. * mln/morpho/closing_attribute.hh (closing_attribute_dispatch): Activate for fastest images. * mln/canvas/morpho/algebraic_union_find.hh: Likewise. * mln/canvas/labeling.hh: Remove dead code. canvas/labeling.hh | 155 ---------------------------------- canvas/morpho/algebraic_union_find.hh | 30 +++--- morpho/closing_attribute.hh | 28 +++--- 3 files changed, 35 insertions(+), 178 deletions(-) Index: mln/morpho/closing_attribute.hh --- mln/morpho/closing_attribute.hh (revision 3231) +++ mln/morpho/closing_attribute.hh (working copy) @@ -209,22 +209,22 @@ template <typename A, typename I, typename N> inline mln_concrete(I) - closing_attribute_dispatch(trait::image::speed::any, + closing_attribute_dispatch(metal::false_, const Image& input, const Neighborhood<N>& nbh, mln_result(A) lambda) { return impl::generic::closing_attribute<A>(input, nbh, lambda); } -// template <typename A, typename I, typename N> -// inline -// mln_concrete(I) -// closing_attribute_dispatch(trait::image::speed::fastest, -// const Image& input, const Neighborhood<N>& nbh, -// mln_result(A) lambda) -// { -// return impl::closing_attribute_fastest<A>(input, nbh, lambda); -// } + template <typename A, typename I, typename N> + inline + mln_concrete(I) + closing_attribute_dispatch(metal::true_, + const Image& input, const Neighborhood<N>& nbh, + mln_result(A) lambda) + { + return impl::closing_attribute_fastest<A>(input, nbh, lambda); + } template <typename A, typename I, typename N> inline @@ -232,7 +232,13 @@ closing_attribute_dispatch(const Image& input, const Neighborhood<N>& nbh, mln_result(A) lambda) { - return closing_attribute_dispatch<A>(mln_trait_image_speed(I)(), + enum { + test = mlc_equal(mln_trait_image_speed(I), + trait::image::speed::fastest)::value + && + mln_is_simple_neighborhood(N)::value + }; + return closing_attribute_dispatch<A>(metal::bool_<test>(), input, nbh, lambda); } Index: mln/canvas/morpho/algebraic_union_find.hh --- mln/canvas/morpho/algebraic_union_find.hh (revision 3231) +++ mln/canvas/morpho/algebraic_union_find.hh (working copy) @@ -336,7 +336,7 @@ template <typename I, typename N, typename F> inline mln_concrete(I) - algebraic_union_find_dispatch(trait::image::speed::any, + algebraic_union_find_dispatch(metal::false_, const Image& input, const Neighborhood<N>& nbh, F& f) @@ -344,16 +344,16 @@ return impl::generic::algebraic_union_find(input, nbh, f); } - // template <typename I, typename N, typename F> - // inline - // mln_concrete(I) - // algebraic_union_find_dispatch(trait::image::speed::fastest, - // const Image& input, - // const Neighborhood<N>& nbh, - // F& f) - // { - // return impl::algebraic_union_find_fastest(input, nbh, f); - // } + template <typename I, typename N, typename F> + inline + mln_concrete(I) + algebraic_union_find_dispatch(metal::true_, + const Image& input, + const Neighborhood<N>& nbh, + F& f) + { + return impl::algebraic_union_find_fastest(input, nbh, f); + } template <typename I, typename N, typename F> inline @@ -362,7 +362,13 @@ const Neighborhood<N>& nbh, F& f) { - return algebraic_union_find_dispatch(mln_trait_image_speed(I)(), + enum { + test = mlc_equal(mln_trait_image_speed(I), + trait::image::speed::fastest)::value + && + mln_is_simple_neighborhood(N)::value + }; + return algebraic_union_find_dispatch(metal::bool_<test>(), input, nbh, f); } Index: mln/canvas/labeling.hh --- mln/canvas/labeling.hh (revision 3231) +++ mln/canvas/labeling.hh (working copy) @@ -203,161 +203,6 @@ - - - - - // ----------------------------------------------------------- - // Old code below. - - - /* - - // Fastest version. - - template <typename F> - struct labeling_fastest - { - // Functor. - F& f; - - typedef typename F::I I; - typedef typename F::N N; - typedef typename F::L L; - - // Auxiliary data. - mln_ch_value(I, unsigned) parent; - - // Output. - mln_ch_value(I, L) output; - L nlabels; - bool status; - - // Ctor. - labeling_fastest(F& f); - - void init(); - - void pass_1(); - - void pass_2(); - - // Auxiliary methods. - - bool is_root(unsigned p) const; - - unsigned find_root(unsigned x); - - void do_union(unsigned n, unsigned p); - - }; - - template <typename F> - labeling_fastest<F>::labeling_fastest(F& f) - : f(f) - { - trace::entering("canvas::labeling_fastest"); - - init(); - f.init(); // Client initialization. - pass_1(); - pass_2(); - - trace::exiting("canvas::labeling_fastest"); - } - - template <typename F> - void - labeling_fastest<F>::init() - { - initialize(parent, f.input); - for (unsigned p = 0; p < parent.nelements(); ++p) - parent.element(p) = p; // make_set - initialize(output, f.input); - mln::data::fill(output, 0); // FIXME: Use literal::zero. - nlabels = 0; - } - - template <typename F> - void - labeling_fastest<F>::pass_1() - { - mln_bkd_pixter(const I) p(f.input); - - typedef window<mln_dpsite(I)> W; - W win = mln::convert::to_upper_window(f.nbh); - mln_qixter(const I, W) n(p, win); - - for_all(p) if (f.handles(p)) - { - f.init_attr(p); - for_all(n) - if (f.equiv(n, p)) - do_union(n, p); - else - f.do_no_union(n, p); - } - } - - template <typename F> - void - labeling_fastest<F>::pass_2() - { - mln_fwd_pixter(const I) p(f.input); - - for_all(p) if (f.handles(p)) - { - if (is_root(p)) - { - if (f.labels(p)) - { - if (nlabels == mln_max(L)) - { - status = false; - return; - } - output(p) = ++nlabels; - } - } - else - output(p) = output(parent.element(p)); - } - status = true; - } - - template <typename F> - bool - labeling_fastest<F>::is_root(unsigned p) const - { - return parent.element(p) == p; - } - - template <typename F> - unsigned - labeling_fastest<F>::find_root(unsigned x) - { - if (parent.element(x) == x) - return x; - else - return parent.element(x) = find_root(parent.element(x)); - } - - template <typename F> - void - labeling_fastest<F>::do_union(unsigned n, unsigned p) - { - unsigned r = find_root(n); - if (r != p) - { - parent.element(r) = p; - f.merge_attr(r, p); - } - } - - */ - - - // Dispatch. namespace internal

1 0

3231: Update Laurent's cleanup code.
by Thierry Geraud 02 Feb '09

02 Feb '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Update Laurent's cleanup code. * theo/esiee/laurent/ismm09/main.cc: Update. * theo/esiee/jean/pfg3d.cc: Update. * igr/images/s7.ppm: Remove image. jean/pfg3d.cc | 2 laurent/ismm09/main.cc | 169 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 167 insertions(+), 4 deletions(-) Index: theo/esiee/laurent/ismm09/main.cc --- theo/esiee/laurent/ismm09/main.cc (revision 3230) +++ theo/esiee/laurent/ismm09/main.cc (working copy) @@ -2,6 +2,7 @@ #include <mln/core/var.hh> #include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> #include <mln/make/double_neighb2d.hh> #include <mln/core/image/image_if.hh> @@ -15,8 +16,17 @@ #include <mln/data/fill.hh> #include <mln/data/paste.hh> +#include <mln/labeling/compute.hh> +#include <mln/level/sort_psites.hh> #include <mln/morpho/gradient.hh> +#include <mln/morpho/meyer_wst.hh> +#include <mln/morpho/tree/data.hh> +#include <mln/morpho/tree/compute_attribute_image.hh> + +#include <mln/accu/count.hh> +#include <mln/accu/height.hh> + namespace mln @@ -109,6 +119,7 @@ } + image_if< image2d<value::int_u8>, predicate_t > f_to_g(const image2d<value::int_u8>& f) { @@ -117,23 +128,138 @@ data::fill(f_, 0); // Useless but for display! data__paste_values(f, (f_ | is_pixel).rw()); - debug::println(f_ | is_pixel); mln_VAR(g, f_ | is_edge); data::paste(morpho::gradient(extend(g, f_), e2p().win()), g); - debug::println(g); return g; } - } // end of namespace mln::face2 + template <typename W> + image2d<mln_value(W)> + extend_w_edges_to_all_faces(W& w) + { + mln_VAR(w_ext, w.unmorph_()); + + // edges (1D-faces) -> pixels (2D-faces) + data::paste(morpho::dilation(extend(w_ext | is_pixel, + pw::value(w_ext)), + c4().win()), + w_ext); + + // edges (1D-faces) -> points (0D-faces) + data::paste(morpho::erosion(extend(w_ext | is_point, + pw::value(w_ext)), + c4().win()), + w_ext); + + return w_ext; + } + + + } // end of namespace mln::cplx2d + + + namespace internal + { + + template <typename T> + struct node_pred : Function_p2b< node_pred<T> > + { + typedef bool result; + + template <typename P> + bool operator()(const P& p) const + { + return t->is_a_node(p); + } + + const T* t; + }; + + template <typename T, typename I, typename M> + mln_value(I) rec(const T& t, // tree + I& a, // attribute image + M& mark, + const mln_psite(I)& p) + { + mln_invariant(mark(p) == false); + mark(p) = true; + if (t.parent(p) == p || mark(t.parent(p)) == true) // Stop. + return a(p); + return a(p) = rec(t, a, mark, t.parent(p)); + } + + } // internal + + + template <typename T, typename A> + void + extinct_attributes(const T& t, // Tree. + A& a) // Attribute image. + { + mln_ch_value(A, bool) mark; + initialize(mark, a); + data::fill(mark, false); + + internal::node_pred<T> node_only; + node_only.t = &t; + + typedef p_array<mln_site(A)> S; + S s = level::sort_psites_increasing(a | node_only); + + mln_fwd_piter(S) p(s); + for_all(p) + { + if (mark(p) == true) + continue; + internal::rec(t, a, mark, p); + } + } + + + template <typename F, typename N, typename A, typename W> + void // util::array<unsigned> + compute_attribute_extincted(const F& f, const N& nbh, const A& a, + const W& w) + { + typedef value::label_16 L; + L n_basins; + mln_ch_value(F,L) regmins = labeling::regional_minima(f, nbh, n_basins); + + typedef p_array<mln_psite(F)> S; + S s = level::sort_psites_decreasing(f); + + typedef morpho::tree::data<F,S> tree_t; + tree_t t(f, s, nbh); + mln_VAR(a_ima, morpho::tree::compute_attribute_image(a, t)); + + std::cout << "BEFORE:" << std::endl; + debug::println("a_ima:", a_ima); + debug::println("a_ima | w_line:", a_ima | (pw::value(w) == 0)); + debug::println("a_ima | basins:", a_ima | (pw::value(w) != 0)); + // debug::println("a_ima | regmins:", a_ima | (pw::value(regmins) != 0)); + + + extinct_attributes(t, a_ima); + + std::cout << "AFTER:" << std::endl; + debug::println("a_ima:", a_ima); + debug::println("a_ima | w_line:", a_ima | (pw::value(w) == 0)); + debug::println("a_ima | basins:", a_ima | (pw::value(w) != 0)); + debug::println("a_ima | regmins:", a_ima | (pw::value(regmins) != 0)); + } + + + } // end of namespace mln + void usage(char* argv[]) { std::cerr << "usage: " << argv[0] << " input.pgm echo output.pgm" << std::endl; @@ -154,8 +280,45 @@ if (argc != 4) usage(argv); + // f: regular image. + image2d<int_u8> f; io::pgm::load(f, argv[1]); + + // g: weights on edges. + mln_VAR(g, cplx2d::f_to_g(f) ); + debug::println("g:", g); + + + // w: watershed labeling on edges. + + typedef label_16 L; + L n_basins; + mln_VAR( w, morpho::meyer_wst(g, cplx2d::e2e(), n_basins) ); + + { + L n_regmins; + mln_VAR(regmins, labeling::regional_minima(g, cplx2d::e2e(), n_regmins)); + mln_invariant(n_regmins == n_basins); + debug::println("regmins(g):", regmins); + + debug::println("w:", w); + std::cout << "n basins = " << n_basins << std::endl + << std::endl; + +// mln_VAR(w_ext, cplx2d::extend_w_edges_to_all_faces(w)); +// debug::println("w_ext:", w_ext); + +// mln_VAR(is_line, pw::value(w_ext) == pw::cst(0)); +// debug::println("w line:", w_ext | is_line); + } + + // accu::count< util::pix<g_t> > a_; + accu::height<g_t> a_; + + compute_attribute_extincted(g, cplx2d::e2e(), a_, + w); + } Index: theo/esiee/jean/pfg3d.cc --- theo/esiee/jean/pfg3d.cc (revision 3230) +++ theo/esiee/jean/pfg3d.cc (working copy) @@ -70,7 +70,7 @@ { using namespace mln; - box3d b = make::box3d(-1,1, -1,1, -1,1); + box3d b = make::box3d(-1,-1,-1, +1,+1,+1); image3d<unsigned> ima(b); debug::iota(ima); debug::println(ima);

1 0