- Olena-patches

[Olena] #159: Distribute SWIG wrappers
by Olena 14 May '09

14 May '09

#159: Distribute SWIG wrappers -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: minor | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- According to Alexandre Hamez, files generated by `swig` (e.g., `*.py` and `*-wrap.cc`) are portable. We should distribute them, as * it would save users wanting to use Swilena some time; * it would free them to have SWIG to compile Swilena. To do: * distribute these files (remove `nodist_` prefixes); * ensure they're available at distribution time (use `dist-hook` in `Makefile.am`); * add generated files to `MAINTAINERCLEANFILES`; * adjust `configure.ac`? (see what Alexandre uses). -- Ticket URL: <https://trac.lrde.org/olena/ticket/159> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

2 2

3790: Add morpho reconstruction by_dilation union_find algorithm.
by Thierry Geraud 14 May '09

14 May '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add morpho reconstruction by_dilation union_find algorithm. * mln/morpho/reconstruction, * mln/morpho/reconstruction/by_dilation, * tests/morpho/reconstruction, * tests/morpho/reconstruction/by_dilation: New directories. * sandbox/theo/Rd/union_find.hh: Copy to... * mln/morpho/reconstruction/by_dilation/union_find.hh: ...this new file. Update. * mln/morpho/all.hh: Fix comments. * mln/morpho/reconstruction/all.hh: New. * mln/morpho/reconstruction/by_dilation/all.hh: New. * tests/morpho/reconstruction/Makefile.am: New. * tests/morpho/reconstruction/by_dilation/Makefile.am: New. * tests/morpho/reconstruction/by_dilation/union_find.cc: New. * tests/morpho/Makefile.am: Update. mln/morpho/all.hh | 9 mln/morpho/reconstruction/all.hh | 57 +++ mln/morpho/reconstruction/by_dilation/all.hh | 59 +++ mln/morpho/reconstruction/by_dilation/union_find.hh | 272 ++++++++++++------ tests/morpho/Makefile.am | 1 tests/morpho/reconstruction/Makefile.am | 11 tests/morpho/reconstruction/by_dilation/Makefile.am | 15 tests/morpho/reconstruction/by_dilation/union_find.cc | 64 ++++ 8 files changed, 408 insertions(+), 80 deletions(-) Index: mln/morpho/all.hh --- mln/morpho/all.hh (revision 3789) +++ mln/morpho/all.hh (working copy) @@ -31,22 +31,22 @@ /// \file mln/morpho/all.hh /// -/// File that includes all morpho-related routines. +/// File that includes all mathematical morphology routines. namespace mln { - /// Namespace of morphological image processing routines. + /// Namespace of mathematical morphology routines. namespace morpho { - /// Namespace of morphological image processing routines + /// Namespace of mathematical morphology routines /// implementations. namespace impl { - /// Namespace of morphological image processing routines + /// Namespace of mathematical morphology routines /// generic implementations. namespace generic {} @@ -85,6 +85,7 @@ # include <mln/morpho/closing/all.hh> # include <mln/morpho/elementary/all.hh> # include <mln/morpho/opening/all.hh> +# include <mln/morpho/reconstruction/all.hh> # include <mln/morpho/tree/all.hh> # include <mln/morpho/watershed/all.hh> Index: mln/morpho/reconstruction/all.hh --- mln/morpho/reconstruction/all.hh (revision 0) +++ mln/morpho/reconstruction/all.hh (revision 0) @@ -0,0 +1,57 @@ +// 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 +// 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_MORPHO_RECONSTRUCTION_ALL_HH +# define MLN_MORPHO_RECONSTRUCTION_ALL_HH + + +/// \file mln/morpho/reconstruction/all.hh +/// +/// File that includes all morphological reconstruction routines. + + +namespace mln +{ + + namespace morpho + { + + /// Namespace of morphological reconstruction routines. + namespace reconstruction + {} + + } +} + + +// Sub-directories. + +# include <mln/morpho/reconstruction/by_dilation/all.hh> +// ... + + +#endif // ! MLN_MORPHO_RECONSTRUCTION_ALL_HH Index: mln/morpho/reconstruction/by_dilation/union_find.hh --- mln/morpho/reconstruction/by_dilation/union_find.hh (revision 0) +++ mln/morpho/reconstruction/by_dilation/union_find.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 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 @@ -25,10 +26,14 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_MORPHO_RD_UNION_FIND_HH -# define MLN_MORPHO_RD_UNION_FIND_HH +#ifndef MLN_MORPHO_RECONSTRUCTION_BY_DILATION_UNION_FIND_HH +# define MLN_MORPHO_RECONSTRUCTION_BY_DILATION_UNION_FIND_HH -# include "utils.hh" +# include <vector> +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/level/compare.hh> +# include <mln/level/sort_psites.hh> namespace mln @@ -37,130 +42,245 @@ namespace morpho { - namespace Rd + namespace reconstruction { + namespace by_dilation + { + + + template <typename I, typename J, typename N> + mln_concrete(I) + union_find(const Image& f, const Image<J>& g, + const Neighborhood<N>& nbh); + + +# ifndef MLN_INCLUDE_ONLY - template <typename I, typename N> - struct union_find_t + + // Tests. + + namespace internal { - typedef mln_site(I) point; - typedef mln_value(I) value; - // in: - const I f, g; - N nbh; + template <typename I, typename J, typename N> + inline + void + union_find_tests(const Image& f_, const Image<J>& g_, + const Neighborhood<N>& nbh_) + { + const I& f = exact(f_); + const J& g = exact(g_); + const N& nbh = exact(nbh_); + + mln_precondition(f.is_valid()); + mln_precondition(g.is_valid()); + mln_precondition(nbh.is_valid()); + + mln_precondition(f.domain() == g.domain()); // FIXME: Relax? + mln_precondition(f <= g); + + // mlc_equal(mln_value(I), mln_value(J))::check(); // FIXME: Too strong! + // FIXME: Also check that we have a total ordering for values. + + (void) f; + (void) g; + (void) nbh; + } + - // out: - I o; - // aux: - std::vector<point> S; +// template <typename P> +// inline +// bool is_proc(const P& n, const P& p) const +// { +// return g(n) > g(p) or (g(n) == g(p) && +// util::ord_strict(n, p)); +// } + + template <typename Par> + inline + mln_site(Par) find_root(Par& parent, mln_site(Par) x) + { + if (parent(x) == x) + return x; + else + return parent(x) = find_root(parent, parent(x)); + } + + + } // end of namespace mln::morpho::reconstruction::by_dilation::internal + + + // Implementations. + + namespace impl + { + + namespace generic + { + + template <typename I, typename J, typename N> + inline + mln_concrete(I) + union_find(const Image& f_, const Image<J>& g_, + const Neighborhood<N>& nbh_) + { + trace::entering("morpho::reconstruction::by_dilation::impl::generic::union_find"); + + const I& f = exact(f_); + const J& g = exact(g_); + const N& nbh = exact(nbh_); + + internal::union_find_tests(f, g, nbh); + + + typedef mln_site(I) P; + typedef mln_value(I) V; + + // Auxiliary data. + p_array s; mln_ch_value(I, bool) deja_vu; - mln_ch_value(I, point) parent; + mln_ch_value(I, P) parent; + mln_concrete(I) output; - union_find_t(const I& f, const I& g, const N& nbh) - : f(f), g(g), nbh(nbh) + // Initialization. { - initialize(o, f); + initialize(output, f); + data::paste(f, output); initialize(parent, f); initialize(deja_vu, f); - - // init - data::fill(deja_vu, false); - S = histo_reverse_sort(g); - data::paste(f, o); // Replace: for all p, make_set(p) { data(p) = f(p) } - // first pass + s = level::sort_psites_decreasing(g); + } - for (unsigned i = 0; i < S.size(); ++i) + // First pass. { - point p = S[i]; - make_set(p); + for (unsigned i = 0; i < s.nsites(); ++i) + { + P p = s[i]; + parent(p) = p; // Make-Set. mln_niter(N) n(nbh, p); for_all(n) { - if (f.has(n)) - mln_invariant(deja_vu(n) == is_proc(n, p)); - if (f.has(n) && deja_vu(n)) - do_union(n, p); + // if (f.domain().has(n)) + // mln_invariant(deja_vu(n) == is_proc(n, p)); + if (f.domain().has(n) && deja_vu(n)) + { + // Do-Union. + P r = internal::find_root(parent, n); + if (r != p) + { + if (g(r) == g(p) || g(p) >= output(r)) // Equivalence test. + { + parent(r) = p; + if (output(r) > output(p)) + output(p) = output(r); // Increasing criterion. + } + else + output(p) = mln_max(V); + } + } } deja_vu(p) = true; } + } - // second pass - - for (int i = S.size() - 1; i >= 0; --i) + // Second pass. + { + for (int i = s.nsites() - 1; i >= 0; --i) { - point p = S[i]; + P p = s[i]; if (parent(p) == p) { - if (o(p) == mln_max(value)) - o(p) = g(p); + if (output(p) == mln_max(V)) + output(p) = g(p); } else - o(p) = o(parent(p)); + output(p) = output(parent(p)); } - } - bool is_proc(const point& n, const point& p) const - { - return g(n) > g(p) or (g(n) == g(p) && - util::ord_strict(n, p)); + mln_postcondition(output >= f); + mln_postcondition(output <= g); + + trace::exiting("morpho::reconstruction::by_dilation::impl::generic::union_find"); + return output; } - void make_set(const point& p) + + } // end of namespace mln::morpho::reconstruction::by_dilation::impl::generic + + } // end of namespace mln::morpho::reconstruction::by_dilation::impl + + + // Dispatch. + + namespace internal { - parent(p) = p; - // was: data(p) = f(p); - // now: in "initialization" - } - point find_root(const point& x) + template <typename I, typename J, typename N> + inline + mln_concrete(I) + union_find_dispatch(trait::image::kind::logic, + const Image& f, const Image<J>& g, + const Neighborhood<N>& nbh) { - if (parent(x) == x) - return x; - else - return parent(x) = find_root(parent(x)); + // FIXME: Not yet implemented. } - void do_union(const point& n, const point& p) - { - point r = find_root(n); - if (r != p) + template <typename I, typename J, typename N> + inline + mln_concrete(I) + union_find_dispatch(trait::image::kind::any, + const Image& f, const Image<J>& g, + const Neighborhood<N>& nbh) { - // NEW: o replaces data + return impl::generic::union_find(f, g, nbh); + } - if (g(r) == g(p) or g(p) >= o(r)) // equiv test + template <typename I, typename J, typename N> + inline + mln_concrete(I) + union_find_dispatch(const Image& f, const Image<J>& g, + const Neighborhood<N>& nbh) { - parent(r) = p; - if (o(r) > o(p)) - o(p) = o(r); // increasing criterion - } - else - o(p) = mln_max(value); - } + return union_find_dispatch(mln_trait_image_kind(I)(), + f, g, nbh); } - }; + } // end of namespace mln::morpho::reconstruction::by_dilation::internal - template <typename I, typename N> - I union_find(const I& f, const I& g, const N& nbh) + // Facade. + + template <typename I, typename J, typename N> + inline + mln_concrete(I) + union_find(const Image& f, const Image<J>& g, + const Neighborhood<N>& nbh) { - mln_precondition(f <= g); - union_find_t<I, N> run(f, g, nbh); - return run.o; + trace::entering("morpho::reconstruction::by_dilation::union_find"); + + internal::union_find_tests(f, g, nbh); + + mln_concrete(I) output; + output = internal::union_find_dispatch(f, g, nbh); + + trace::exiting("morpho::reconstruction::by_dilation::union_find"); + return output; } +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::morpho::reconstruction::by_dilation - } // end of namespace mln::morpho::Rd + } // end of namespace mln::morpho::reconstruction } // end of namespace mln::morpho } // end of namespace mln -#endif // ! MLN_MORPHO_RD_UNION_FIND_HH +#endif // ! MLN_MORPHO_RECONSTRUCTION_BY_DILATION_UNION_FIND_HH Property changes on: mln/morpho/reconstruction/by_dilation/union_find.hh ___________________________________________________________________ Added: svn:mergeinfo Index: mln/morpho/reconstruction/by_dilation/all.hh --- mln/morpho/reconstruction/by_dilation/all.hh (revision 0) +++ mln/morpho/reconstruction/by_dilation/all.hh (revision 0) @@ -0,0 +1,59 @@ +// 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 +// 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_MORPHO_RECONSTRUCTION_BY_DILATION_ALL_HH +# define MLN_MORPHO_RECONSTRUCTION_BY_DILATION_ALL_HH + + +/// \file mln/morpho/reconstruction by dilation/all.hh +/// +/// File that includes all morphological reconstruction by dilation routines. + + +namespace mln +{ + + namespace morpho + { + + namespace reconstruction + { + + /// Namespace of morphological reconstruction by dilation routines. + namespace by_dilation + {} + + } + } +} + + +# include <mln/morpho/reconstruction/by_dilation/union_find.hh> +// ... + + +#endif // ! MLN_MORPHO_RECONSTRUCTION_BY_DILATION_ALL_HH Index: tests/morpho/reconstruction/Makefile.am --- tests/morpho/reconstruction/Makefile.am (revision 0) +++ tests/morpho/reconstruction/Makefile.am (revision 0) @@ -0,0 +1,11 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +include $(top_srcdir)/milena/tests/tests.mk + +SUBDIRS = \ + by_dilation + + +TESTS = $(check_PROGRAMS) + + Index: tests/morpho/reconstruction/by_dilation/Makefile.am --- tests/morpho/reconstruction/by_dilation/Makefile.am (revision 0) +++ tests/morpho/reconstruction/by_dilation/Makefile.am (revision 0) @@ -0,0 +1,15 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +include $(top_srcdir)/milena/tests/tests.mk + + +check_PROGRAMS = \ + union_find + + +union_find_SOURCES = union_find.cc + + +TESTS = $(check_PROGRAMS) + + Index: tests/morpho/reconstruction/by_dilation/union_find.cc --- tests/morpho/reconstruction/by_dilation/union_find.cc (revision 0) +++ tests/morpho/reconstruction/by_dilation/union_find.cc (revision 0) @@ -0,0 +1,64 @@ +// 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// \file tests/morpho/reconstruction/by_dilation/union_find.cc +/// +/// Test on mln::morpho::reconstruction::by_dilation::union_find + +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/pw/all.hh> + +#include <mln/io/pgm/load.hh> +#include <mln/value/int_u8.hh> +#include <mln/level/compare.hh> + +#include <mln/morpho/reconstruction/by_dilation/union_find.hh> + +#include "tests/data.hh" + + + +int main() +{ + using namespace mln; + using namespace morpho::reconstruction::by_dilation; + + image2d<value::int_u8> lena, lena_2, out; + io::pgm::load(lena, MLN_IMG_DIR "/tiny.pgm"); + + { + out = union_find(lena, lena, c4()); + mln_assertion(out == lena); + } + + { + initialize(lena_2, lena); + data::fill(lena_2, lena); + out = union_find(lena_2, lena, c4()); + } +} Index: tests/morpho/Makefile.am --- tests/morpho/Makefile.am (revision 3789) +++ tests/morpho/Makefile.am (working copy) @@ -8,6 +8,7 @@ closing \ elementary \ opening \ + reconstruction \ tree \ watershed

1 0

[PATCH 29/31] Add morpho reconstruction by_dilation union_find algorithm.
by Roland Levillain 14 May '09

14 May '09

* mln/morpho/reconstruction, * mln/morpho/reconstruction/by_dilation, * tests/morpho/reconstruction, * tests/morpho/reconstruction/by_dilation: New directories. * sandbox/theo/Rd/union_find.hh: Copy to... * mln/morpho/reconstruction/by_dilation/union_find.hh: ...this new file. Update. * mln/morpho/all.hh: Fix comments. * mln/morpho/reconstruction/all.hh: New. * mln/morpho/reconstruction/by_dilation/all.hh: New. * tests/morpho/reconstruction/Makefile.am: New. * tests/morpho/reconstruction/by_dilation/Makefile.am: New. * tests/morpho/reconstruction/by_dilation/union_find.cc: New. * tests/morpho/Makefile.am: Update. --- milena/ChangeLog | 21 ++ milena/mln/morpho/all.hh | 9 +- milena/mln/morpho/reconstruction/all.hh | 57 ++++ .../mln/morpho/reconstruction/by_dilation/all.hh | 59 ++++ .../reconstruction/by_dilation/union_find.hh | 286 ++++++++++++++++++++ milena/tests/morpho/Makefile.am | 1 + milena/tests/morpho/reconstruction/Makefile.am | 11 + .../morpho/reconstruction/by_dilation/Makefile.am | 15 + .../reconstruction/by_dilation/union_find.cc | 64 +++++ 9 files changed, 519 insertions(+), 4 deletions(-) create mode 100644 milena/mln/morpho/reconstruction/all.hh create mode 100644 milena/mln/morpho/reconstruction/by_dilation/all.hh create mode 100644 milena/mln/morpho/reconstruction/by_dilation/union_find.hh create mode 100644 milena/tests/morpho/reconstruction/Makefile.am create mode 100644 milena/tests/morpho/reconstruction/by_dilation/Makefile.am create mode 100644 milena/tests/morpho/reconstruction/by_dilation/union_find.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index b26865f..34bb8a0 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,24 @@ +2009-05-14 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + Add morpho reconstruction by_dilation union_find algorithm. + + * mln/morpho/reconstruction, + * mln/morpho/reconstruction/by_dilation, + * tests/morpho/reconstruction, + * tests/morpho/reconstruction/by_dilation: New directories. + + * sandbox/theo/Rd/union_find.hh: Copy to... + * mln/morpho/reconstruction/by_dilation/union_find.hh: ...this new file. + Update. + + * mln/morpho/all.hh: Fix comments. + * mln/morpho/reconstruction/all.hh: New. + * mln/morpho/reconstruction/by_dilation/all.hh: New. + * tests/morpho/reconstruction/Makefile.am: New. + * tests/morpho/reconstruction/by_dilation/Makefile.am: New. + * tests/morpho/reconstruction/by_dilation/union_find.cc: New. + * tests/morpho/Makefile.am: Update. + 2009-05-12 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> De-activate hsl stuff in value rgb. diff --git a/milena/mln/morpho/all.hh b/milena/mln/morpho/all.hh index d420dd1..8d7425a 100644 --- a/milena/mln/morpho/all.hh +++ b/milena/mln/morpho/all.hh @@ -31,22 +31,22 @@ /// \file mln/morpho/all.hh /// -/// File that includes all morpho-related routines. +/// File that includes all mathematical morphology routines. namespace mln { - /// Namespace of morphological image processing routines. + /// Namespace of mathematical morphology routines. namespace morpho { - /// Namespace of morphological image processing routines + /// Namespace of mathematical morphology routines /// implementations. namespace impl { - /// Namespace of morphological image processing routines + /// Namespace of mathematical morphology routines /// generic implementations. namespace generic {} @@ -85,6 +85,7 @@ namespace mln # include <mln/morpho/closing/all.hh> # include <mln/morpho/elementary/all.hh> # include <mln/morpho/opening/all.hh> +# include <mln/morpho/reconstruction/all.hh> # include <mln/morpho/tree/all.hh> # include <mln/morpho/watershed/all.hh> diff --git a/milena/mln/morpho/reconstruction/all.hh b/milena/mln/morpho/reconstruction/all.hh new file mode 100644 index 0000000..4b7db9e --- /dev/null +++ b/milena/mln/morpho/reconstruction/all.hh @@ -0,0 +1,57 @@ +// 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 +// 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_MORPHO_RECONSTRUCTION_ALL_HH +# define MLN_MORPHO_RECONSTRUCTION_ALL_HH + + +/// \file mln/morpho/reconstruction/all.hh +/// +/// File that includes all morphological reconstruction routines. + + +namespace mln +{ + + namespace morpho + { + + /// Namespace of morphological reconstruction routines. + namespace reconstruction + {} + + } +} + + +// Sub-directories. + +# include <mln/morpho/reconstruction/by_dilation/all.hh> +// ... + + +#endif // ! MLN_MORPHO_RECONSTRUCTION_ALL_HH diff --git a/milena/mln/morpho/reconstruction/by_dilation/all.hh b/milena/mln/morpho/reconstruction/by_dilation/all.hh new file mode 100644 index 0000000..d88213d --- /dev/null +++ b/milena/mln/morpho/reconstruction/by_dilation/all.hh @@ -0,0 +1,59 @@ +// 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 +// 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_MORPHO_RECONSTRUCTION_BY_DILATION_ALL_HH +# define MLN_MORPHO_RECONSTRUCTION_BY_DILATION_ALL_HH + + +/// \file mln/morpho/reconstruction by dilation/all.hh +/// +/// File that includes all morphological reconstruction by dilation routines. + + +namespace mln +{ + + namespace morpho + { + + namespace reconstruction + { + + /// Namespace of morphological reconstruction by dilation routines. + namespace by_dilation + {} + + } + } +} + + +# include <mln/morpho/reconstruction/by_dilation/union_find.hh> +// ... + + +#endif // ! MLN_MORPHO_RECONSTRUCTION_BY_DILATION_ALL_HH diff --git a/milena/mln/morpho/reconstruction/by_dilation/union_find.hh b/milena/mln/morpho/reconstruction/by_dilation/union_find.hh new file mode 100644 index 0000000..4a7dec0 --- /dev/null +++ b/milena/mln/morpho/reconstruction/by_dilation/union_find.hh @@ -0,0 +1,286 @@ +// Copyright (C) 2007, 2008, 2009 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_MORPHO_RECONSTRUCTION_BY_DILATION_UNION_FIND_HH +# define MLN_MORPHO_RECONSTRUCTION_BY_DILATION_UNION_FIND_HH + +# include <vector> +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/level/compare.hh> +# include <mln/level/sort_psites.hh> + + +namespace mln +{ + + namespace morpho + { + + namespace reconstruction + { + + namespace by_dilation + { + + + template <typename I, typename J, typename N> + mln_concrete(I) + union_find(const Image& f, const Image<J>& g, + const Neighborhood<N>& nbh); + + +# ifndef MLN_INCLUDE_ONLY + + + // Tests. + + namespace internal + { + + template <typename I, typename J, typename N> + inline + void + union_find_tests(const Image& f_, const Image<J>& g_, + const Neighborhood<N>& nbh_) + { + const I& f = exact(f_); + const J& g = exact(g_); + const N& nbh = exact(nbh_); + + mln_precondition(f.is_valid()); + mln_precondition(g.is_valid()); + mln_precondition(nbh.is_valid()); + + mln_precondition(f.domain() == g.domain()); // FIXME: Relax? + mln_precondition(f <= g); + + // mlc_equal(mln_value(I), mln_value(J))::check(); // FIXME: Too strong! + // FIXME: Also check that we have a total ordering for values. + + (void) f; + (void) g; + (void) nbh; + } + + + +// template <typename P> +// inline +// bool is_proc(const P& n, const P& p) const +// { +// return g(n) > g(p) or (g(n) == g(p) && +// util::ord_strict(n, p)); +// } + + template <typename Par> + inline + mln_site(Par) find_root(Par& parent, mln_site(Par) x) + { + if (parent(x) == x) + return x; + else + return parent(x) = find_root(parent, parent(x)); + } + + + } // end of namespace mln::morpho::reconstruction::by_dilation::internal + + + // Implementations. + + namespace impl + { + + namespace generic + { + + template <typename I, typename J, typename N> + inline + mln_concrete(I) + union_find(const Image& f_, const Image<J>& g_, + const Neighborhood<N>& nbh_) + { + trace::entering("morpho::reconstruction::by_dilation::impl::generic::union_find"); + + const I& f = exact(f_); + const J& g = exact(g_); + const N& nbh = exact(nbh_); + + internal::union_find_tests(f, g, nbh); + + + typedef mln_site(I) P; + typedef mln_value(I) V; + + // Auxiliary data. + p_array s; + mln_ch_value(I, bool) deja_vu; + mln_ch_value(I, P) parent; + mln_concrete(I) output; + + // Initialization. + { + initialize(output, f); + data::paste(f, output); + initialize(parent, f); + initialize(deja_vu, f); + data::fill(deja_vu, false); + + s = level::sort_psites_decreasing(g); + } + + // First pass. + { + for (unsigned i = 0; i < s.nsites(); ++i) + { + P p = s[i]; + parent(p) = p; // Make-Set. + mln_niter(N) n(nbh, p); + for_all(n) + { + // if (f.domain().has(n)) + // mln_invariant(deja_vu(n) == is_proc(n, p)); + if (f.domain().has(n) && deja_vu(n)) + { + // Do-Union. + P r = internal::find_root(parent, n); + if (r != p) + { + if (g(r) == g(p) || g(p) >= output(r)) // Equivalence test. + { + parent(r) = p; + if (output(r) > output(p)) + output(p) = output(r); // Increasing criterion. + } + else + output(p) = mln_max(V); + } + } + } + deja_vu(p) = true; + } + } + + // Second pass. + { + for (int i = s.nsites() - 1; i >= 0; --i) + { + P p = s[i]; + if (parent(p) == p) + { + if (output(p) == mln_max(V)) + output(p) = g(p); + } + else + output(p) = output(parent(p)); + } + } + + mln_postcondition(output >= f); + mln_postcondition(output <= g); + + trace::exiting("morpho::reconstruction::by_dilation::impl::generic::union_find"); + return output; + } + + + } // end of namespace mln::morpho::reconstruction::by_dilation::impl::generic + + } // end of namespace mln::morpho::reconstruction::by_dilation::impl + + + // Dispatch. + + namespace internal + { + + template <typename I, typename J, typename N> + inline + mln_concrete(I) + union_find_dispatch(trait::image::kind::logic, + const Image& f, const Image<J>& g, + const Neighborhood<N>& nbh) + { + // FIXME: Not yet implemented. + } + + template <typename I, typename J, typename N> + inline + mln_concrete(I) + union_find_dispatch(trait::image::kind::any, + const Image& f, const Image<J>& g, + const Neighborhood<N>& nbh) + { + return impl::generic::union_find(f, g, nbh); + } + + template <typename I, typename J, typename N> + inline + mln_concrete(I) + union_find_dispatch(const Image& f, const Image<J>& g, + const Neighborhood<N>& nbh) + { + return union_find_dispatch(mln_trait_image_kind(I)(), + f, g, nbh); + } + + } // end of namespace mln::morpho::reconstruction::by_dilation::internal + + + // Facade. + + template <typename I, typename J, typename N> + inline + mln_concrete(I) + union_find(const Image& f, const Image<J>& g, + const Neighborhood<N>& nbh) + { + trace::entering("morpho::reconstruction::by_dilation::union_find"); + + internal::union_find_tests(f, g, nbh); + + mln_concrete(I) output; + output = internal::union_find_dispatch(f, g, nbh); + + trace::exiting("morpho::reconstruction::by_dilation::union_find"); + return output; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::morpho::reconstruction::by_dilation + + } // end of namespace mln::morpho::reconstruction + + } // end of namespace mln::morpho + +} // end of namespace mln + + +#endif // ! MLN_MORPHO_RECONSTRUCTION_BY_DILATION_UNION_FIND_HH diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am index a4b7c6b..f66924d 100644 --- a/milena/tests/morpho/Makefile.am +++ b/milena/tests/morpho/Makefile.am @@ -8,6 +8,7 @@ SUBDIRS = \ closing \ elementary \ opening \ + reconstruction \ tree \ watershed diff --git a/milena/tests/morpho/reconstruction/Makefile.am b/milena/tests/morpho/reconstruction/Makefile.am new file mode 100644 index 0000000..1cfac92 --- /dev/null +++ b/milena/tests/morpho/reconstruction/Makefile.am @@ -0,0 +1,11 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +include $(top_srcdir)/milena/tests/tests.mk + +SUBDIRS = \ + by_dilation + + +TESTS = $(check_PROGRAMS) + + diff --git a/milena/tests/morpho/reconstruction/by_dilation/Makefile.am b/milena/tests/morpho/reconstruction/by_dilation/Makefile.am new file mode 100644 index 0000000..fd83a0b --- /dev/null +++ b/milena/tests/morpho/reconstruction/by_dilation/Makefile.am @@ -0,0 +1,15 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +include $(top_srcdir)/milena/tests/tests.mk + + +check_PROGRAMS = \ + union_find + + +union_find_SOURCES = union_find.cc + + +TESTS = $(check_PROGRAMS) + + diff --git a/milena/tests/morpho/reconstruction/by_dilation/union_find.cc b/milena/tests/morpho/reconstruction/by_dilation/union_find.cc new file mode 100644 index 0000000..46631f0 --- /dev/null +++ b/milena/tests/morpho/reconstruction/by_dilation/union_find.cc @@ -0,0 +1,64 @@ +// 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 +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// \file tests/morpho/reconstruction/by_dilation/union_find.cc +/// +/// Test on mln::morpho::reconstruction::by_dilation::union_find + +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/pw/all.hh> + +#include <mln/io/pgm/load.hh> +#include <mln/value/int_u8.hh> +#include <mln/level/compare.hh> + +#include <mln/morpho/reconstruction/by_dilation/union_find.hh> + +#include "tests/data.hh" + + + +int main() +{ + using namespace mln; + using namespace morpho::reconstruction::by_dilation; + + image2d<value::int_u8> lena, lena_2, out; + io::pgm::load(lena, MLN_IMG_DIR "/tiny.pgm"); + + { + out = union_find(lena, lena, c4()); + mln_assertion(out == lena); + } + + { + initialize(lena_2, lena); + data::fill(lena_2, lena); + out = union_find(lena_2, lena, c4()); + } +} -- 1.6.1.2

1 0

r3789: Add a morpho transformation before edges computation
by Fabien Freling 12 May '09

12 May '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-05-12 Fabien Freling <fabien.freling(a)lrde.epita.fr> Add a morpho transformation before edges computation. * fabien/igr/smooth_fixed_seg/main.cc: New edge computation, using morpho transformations. --- main.cc | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) Index: trunk/milena/sandbox/fabien/igr/smooth_fixed_seg/main.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/smooth_fixed_seg/main.cc (revision 0) +++ trunk/milena/sandbox/fabien/igr/smooth_fixed_seg/main.cc (revision 3789) @@ -0,0 +1,177 @@ +#include <algorithm> + +#include <mln/core/image/image1d.hh> +#include <mln/core/alias/window1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/slice_image.hh> +#include <mln/core/image/image_if.hh> +#include <mln/core/routine/duplicate.hh> +#include <mln/core/routine/extend.hh> +#include <mln/core/var.hh> + +#include <mln/io/dump/all.hh> +#include <mln/io/pgm/save.hh> +#include <mln/io/ppm/save.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/int_u12.hh> +#include <mln/value/label_16.hh> + +#include <mln/accu/sum.hh> +#include <mln/accu/mean.hh> +#include <mln/accu/image/all.hh> +#include <mln/data/fill.hh> +#include <mln/data/paste.hh> +#include <mln/convert/from_to.hh> +#include <mln/labeling/wrap.hh> +#include <mln/level/compute.hh> +#include <mln/level/convert.hh> +#include <mln/level/stretch.hh> +#include <mln/make/image2d.hh> +#include <mln/math/diff_abs.hh> +#include <mln/morpho/dilation.hh> +#include <mln/morpho/erosion.hh> +#include <mln/morpho/closing/structural.hh> +#include <mln/morpho/opening/structural.hh> +#include <mln/morpho/elementary/gradient.hh> +#include <mln/morpho/watershed/flooding.hh> +#include <mln/pw/all.hh> +#include <mln/util/array.hh> + +#include <mln/world/inter_pixel/display_edge.hh> +#include <mln/world/inter_pixel/compute.hh> +#include <mln/world/inter_pixel/immerse.hh> +#include <mln/world/inter_pixel/neighb2d.hh> +#include <mln/world/inter_pixel/all.hh> + +#include <mln/labeling/colorize.hh> +#include <mln/debug/println.hh> +#include <mln/trace/quiet.hh> + + +using namespace mln; +using value::int_u8; +using value::int_u12; +using value::label_16; + + + + +// Mean image. +//------------ +template <typename V> +inline +image1d<float> +mean_image(image1d<V>& input) +{ + window1d win_1; + win_1 + .insert(-2) + .insert(-1) + .insert(0) + .insert(1) + .insert(2); + + image1d<V> closing_ima = morpho::closing::structural(input, win_1); + image1d<V> opening_ima = morpho::opening::structural(input, win_1); + + image1d<accu::mean<float> > result; + + initialize(result, input); + + accu::image::init(result); + accu::image::take(result, closing_ima); + accu::image::take(result, opening_ima); + + return accu::image::to_result(result); +} + + + +// Distance function. +//------------------- + +struct dist_t : Function_vv2v<dist_t> +{ + typedef float result; + + template <typename V> + float operator()(util::array<V> v1, util::array<V> v2) const + { + float res = 0.f; + + accu::sum<V> accu_sum; + + image1d<V> tmp_ima; + convert::from_to(v1, tmp_ima); + image1d<float> morpho_ima = mean_image(tmp_ima); + float sum_v1 = level::compute(accu_sum, morpho_ima); + + image1d<V> tmp_ima2; + convert::from_to(v2, tmp_ima2); + image1d<float> morpho_ima2 = mean_image(tmp_ima2); + float sum_v2 = level::compute(accu_sum, morpho_ima2); + + mln_piter(image1d<float>) p(morpho_ima.domain()); + for_all(p) + res += std::min(morpho_ima(p), morpho_ima2(p)); + + res /= std::max(sum_v1, sum_v2); + + return 1 - res; + } +} dist; + + + + + + + + +int usage(const char* bin) +{ + std::cout << "Usage: " << bin << " input.dump" << std::endl; + return 1; +} + +int main(int argc, char* argv[]) +{ + if (argc != 2) + return usage(argv[0]); + + + // Initialization. + image3d<int_u12> input; + io::dump::load(input, argv[1]); + typedef image2d<util::array<int_u12> > I; + I ima_arr; + initialize(ima_arr, slice(input, 0)); + for (unsigned int i = 0; i < input.nslices(); ++i) + { + image2d<int_u12> tmp_slice = duplicate(slice(input, i)); + mln_piter_(image2d<int_u12>) p(tmp_slice.domain()); + for_all(p) + ima_arr(p).append(tmp_slice(p)); + } + + + // Edges image creation. + //image2d<float> edges = dist_on_edges(ima_arr); + typedef image_if<I, world::inter_pixel::is_pixel> Ix; + Ix imax = world::inter_pixel::immerse(ima_arr); + + // Edges distance computation. + mln_VAR(edges, world::inter_pixel::compute(imax, dist)); + + { + // Display. + mln_VAR(display_ima, world::inter_pixel::display_edge(edges.unmorph_(), 0.0, 3)); + io::pgm::save(level::stretch(int_u8(), display_ima), "edges.pgm"); + } + + + return 0; +}

1 0

[PATCH 28/31] Add a morpho transformation before edges computation.
by Roland Levillain 12 May '09

12 May '09

* fabien/igr/smooth_fixed_seg/main.cc: New edge computation, using morpho transformations. --- milena/sandbox/ChangeLog | 6 + milena/sandbox/fabien/igr/smooth_fixed_seg/main.cc | 177 ++++++++++++++++++++ 2 files changed, 183 insertions(+), 0 deletions(-) create mode 100644 milena/sandbox/fabien/igr/smooth_fixed_seg/main.cc diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index b83f3fc..c971477 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,9 @@ +2009-05-12 Fabien Freling <fabien.freling(a)lrde.epita.fr> + + Add a morpho transformation before edges computation. + * fabien/igr/smooth_fixed_seg/main.cc: New edge computation, using + morpho transformations. + 2009-05-12 Edwin Carlinet <carlinet(a)lrde.epita.fr> Inim project fixes. diff --git a/milena/sandbox/fabien/igr/smooth_fixed_seg/main.cc b/milena/sandbox/fabien/igr/smooth_fixed_seg/main.cc new file mode 100644 index 0000000..7ae0066 --- /dev/null +++ b/milena/sandbox/fabien/igr/smooth_fixed_seg/main.cc @@ -0,0 +1,177 @@ +#include <algorithm> + +#include <mln/core/image/image1d.hh> +#include <mln/core/alias/window1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/slice_image.hh> +#include <mln/core/image/image_if.hh> +#include <mln/core/routine/duplicate.hh> +#include <mln/core/routine/extend.hh> +#include <mln/core/var.hh> + +#include <mln/io/dump/all.hh> +#include <mln/io/pgm/save.hh> +#include <mln/io/ppm/save.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/int_u12.hh> +#include <mln/value/label_16.hh> + +#include <mln/accu/sum.hh> +#include <mln/accu/mean.hh> +#include <mln/accu/image/all.hh> +#include <mln/data/fill.hh> +#include <mln/data/paste.hh> +#include <mln/convert/from_to.hh> +#include <mln/labeling/wrap.hh> +#include <mln/level/compute.hh> +#include <mln/level/convert.hh> +#include <mln/level/stretch.hh> +#include <mln/make/image2d.hh> +#include <mln/math/diff_abs.hh> +#include <mln/morpho/dilation.hh> +#include <mln/morpho/erosion.hh> +#include <mln/morpho/closing/structural.hh> +#include <mln/morpho/opening/structural.hh> +#include <mln/morpho/elementary/gradient.hh> +#include <mln/morpho/watershed/flooding.hh> +#include <mln/pw/all.hh> +#include <mln/util/array.hh> + +#include <mln/world/inter_pixel/display_edge.hh> +#include <mln/world/inter_pixel/compute.hh> +#include <mln/world/inter_pixel/immerse.hh> +#include <mln/world/inter_pixel/neighb2d.hh> +#include <mln/world/inter_pixel/all.hh> + +#include <mln/labeling/colorize.hh> +#include <mln/debug/println.hh> +#include <mln/trace/quiet.hh> + + +using namespace mln; +using value::int_u8; +using value::int_u12; +using value::label_16; + + + + +// Mean image. +//------------ +template <typename V> +inline +image1d<float> +mean_image(image1d<V>& input) +{ + window1d win_1; + win_1 + .insert(-2) + .insert(-1) + .insert(0) + .insert(1) + .insert(2); + + image1d<V> closing_ima = morpho::closing::structural(input, win_1); + image1d<V> opening_ima = morpho::opening::structural(input, win_1); + + image1d<accu::mean<float> > result; + + initialize(result, input); + + accu::image::init(result); + accu::image::take(result, closing_ima); + accu::image::take(result, opening_ima); + + return accu::image::to_result(result); +} + + + +// Distance function. +//------------------- + +struct dist_t : Function_vv2v<dist_t> +{ + typedef float result; + + template <typename V> + float operator()(util::array<V> v1, util::array<V> v2) const + { + float res = 0.f; + + accu::sum<V> accu_sum; + + image1d<V> tmp_ima; + convert::from_to(v1, tmp_ima); + image1d<float> morpho_ima = mean_image(tmp_ima); + float sum_v1 = level::compute(accu_sum, morpho_ima); + + image1d<V> tmp_ima2; + convert::from_to(v2, tmp_ima2); + image1d<float> morpho_ima2 = mean_image(tmp_ima2); + float sum_v2 = level::compute(accu_sum, morpho_ima2); + + mln_piter(image1d<float>) p(morpho_ima.domain()); + for_all(p) + res += std::min(morpho_ima(p), morpho_ima2(p)); + + res /= std::max(sum_v1, sum_v2); + + return 1 - res; + } +} dist; + + + + + + + + +int usage(const char* bin) +{ + std::cout << "Usage: " << bin << " input.dump" << std::endl; + return 1; +} + +int main(int argc, char* argv[]) +{ + if (argc != 2) + return usage(argv[0]); + + + // Initialization. + image3d<int_u12> input; + io::dump::load(input, argv[1]); + typedef image2d<util::array<int_u12> > I; + I ima_arr; + initialize(ima_arr, slice(input, 0)); + for (unsigned int i = 0; i < input.nslices(); ++i) + { + image2d<int_u12> tmp_slice = duplicate(slice(input, i)); + mln_piter_(image2d<int_u12>) p(tmp_slice.domain()); + for_all(p) + ima_arr(p).append(tmp_slice(p)); + } + + + // Edges image creation. + //image2d<float> edges = dist_on_edges(ima_arr); + typedef image_if<I, world::inter_pixel::is_pixel> Ix; + Ix imax = world::inter_pixel::immerse(ima_arr); + + // Edges distance computation. + mln_VAR(edges, world::inter_pixel::compute(imax, dist)); + + { + // Display. + mln_VAR(display_ima, world::inter_pixel::display_edge(edges.unmorph_(), 0.0, 3)); + io::pgm::save(level::stretch(int_u8(), display_ima), "edges.pgm"); + } + + + return 0; +} -- 1.6.1.2

1 0

3788: De-activate hsl stuff in value rgb.
by Thierry Geraud 12 May '09

12 May '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> De-activate hsl stuff in value rgb. * mln/value/rgb.hh: De-activate hsl stuff. It shall be moved elsewhere. * mln/trait/value_.hh (mln_dim): New macro. Layout; sort short macros by name. * mln/fun/c.hh (todo): New. fun/c.hh | 3 ++ trait/value_.hh | 7 ++--- value/rgb.hh | 78 ++++++++++++++++++++++++++++---------------------------- 3 files changed, 46 insertions(+), 42 deletions(-) Index: mln/trait/value_.hh --- mln/trait/value_.hh (revision 3787) +++ mln/trait/value_.hh (working copy) @@ -53,11 +53,12 @@ # define mln_trait_value_quant_(V) mln::trait::value_< V >::quant -# define mln_nbits(V) mln::trait::value_< V >::nbits # define mln_card(V) mln::trait::value_< V >::card -# define mln_min(V) mln::trait::value_< V >::min() -# define mln_max(V) mln::trait::value_< V >::max() +# define mln_dim(V) mln::trait::value_< V >::dim # define mln_epsilon(V) mln::trait::value_< V >::epsilon() +# define mln_max(V) mln::trait::value_< V >::max() +# define mln_min(V) mln::trait::value_< V >::min() +# define mln_nbits(V) mln::trait::value_< V >::nbits /// Give the summation type for values of type \c T. Index: mln/value/rgb.hh --- mln/value/rgb.hh (revision 3787) +++ mln/value/rgb.hh (working copy) @@ -42,7 +42,7 @@ # include <mln/value/ops.hh> -# include <mln/fun/v2v/hsl_to_rgb.hh> +// # include <mln/fun/v2v/hsl_to_rgb.hh> # include <mln/value/concept/vectorial.hh> # include <mln/value/int_u.hh> # include <mln/algebra/vec.hh> @@ -55,24 +55,24 @@ - namespace fun - { +// namespace fun +// { - namespace v2v - { +// namespace v2v +// { - template <typename T_rgb> - struct f_hsl_to_rgb_; +// template <typename T_rgb> +// struct f_hsl_to_rgb_; - typedef f_hsl_to_rgb_< value::rgb<8> > f_hsl_to_rgb_3x8_t; - typedef f_hsl_to_rgb_< value::rgb<16> > f_hsl_to_rgb_3x16_t; +// typedef f_hsl_to_rgb_< value::rgb<8> > f_hsl_to_rgb_3x8_t; +// typedef f_hsl_to_rgb_< value::rgb<16> > f_hsl_to_rgb_3x16_t; - extern f_hsl_to_rgb_3x8_t f_hsl_to_rgb_3x8; - extern f_hsl_to_rgb_3x16_t f_hsl_to_rgb_3x16; +// extern f_hsl_to_rgb_3x8_t f_hsl_to_rgb_3x8; +// extern f_hsl_to_rgb_3x16_t f_hsl_to_rgb_3x16; - } +// } - } +// } namespace literal @@ -103,11 +103,11 @@ } - // Forward declaration. - namespace value - { - template <typename H, typename S, typename L> class hsl_; - } +// // Forward declaration. +// namespace value +// { +// template <typename H, typename S, typename L> class hsl_; +// } namespace convert @@ -128,13 +128,13 @@ template <unsigned m> void from_to_(const value::int_u<m>& from, value::rgb<m>& to); - // hsl -> rgb8. - template <typename H, typename S, typename L> - void from_to_(const value::hsl_<H,S,L>&, value::rgb<8>& to); - - // hsl -> rgb16. - template <typename H, typename S, typename L> - void from_to_(const value::hsl_<H,S,L>&, value::rgb<16>& to); +// // hsl -> rgb8. +// template <typename H, typename S, typename L> +// void from_to_(const value::hsl_<H,S,L>&, value::rgb<8>& to); + +// // hsl -> rgb16. +// template <typename H, typename S, typename L> +// void from_to_(const value::hsl_<H,S,L>&, value::rgb<16>& to); // rgb -> bool. template <unsigned m> @@ -397,8 +397,8 @@ } // end of namespace mln -// Needed by from_to_. -# include <mln/fun/v2v/rgb_to_hsl.hh> +// // Needed by from_to_. +// # include <mln/fun/v2v/rgb_to_hsl.hh> # ifndef MLN_INCLUDE_ONLY @@ -787,19 +787,19 @@ to = value::rgb<m>(from, from, from); } - template <typename H, typename S, typename L> - void - from_to_(const value::hsl_<H,S,L>& from, value::rgb<8>& to) - { - to = fun::v2v::f_hsl_to_rgb_3x8(from); - } +// template <typename H, typename S, typename L> +// void +// from_to_(const value::hsl_<H,S,L>& from, value::rgb<8>& to) +// { +// to = fun::v2v::f_hsl_to_rgb_3x8(from); +// } - template <typename H, typename S, typename L> - void - from_to_(const value::hsl_<H,S,L>& from, value::rgb<16>& to) - { - to = fun::v2v::f_hsl_to_rgb_3x16(from); - } +// template <typename H, typename S, typename L> +// void +// from_to_(const value::hsl_<H,S,L>& from, value::rgb<16>& to) +// { +// to = fun::v2v::f_hsl_to_rgb_3x16(from); +// } template <unsigned m> void Index: mln/fun/c.hh --- mln/fun/c.hh (revision 3787) +++ mln/fun/c.hh (working copy) @@ -33,6 +33,9 @@ /// /// Encapsulate a plain (C language-like) pointer to function /// into a functor. +/// +/// \todo Fix category: super is not defined! +/// See mln/value/builtin/integers.hh for an example. # include <mln/fun/internal/selector.hh> # include <mln/metal/unqualif.hh>

1 0

[PATCH 27/31] De-activate hsl stuff in value rgb.
by Roland Levillain 12 May '09

12 May '09

* mln/value/rgb.hh: De-activate hsl stuff. It shall be moved elsewhere. * mln/trait/value_.hh (mln_dim): New macro. Layout; sort short macros by name. * mln/fun/c.hh (todo): New. --- milena/ChangeLog | 10 ++++++ milena/mln/fun/c.hh | 3 ++ milena/mln/trait/value_.hh | 7 ++-- milena/mln/value/rgb.hh | 78 ++++++++++++++++++++++---------------------- 4 files changed, 56 insertions(+), 42 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 44d34d3..b26865f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,13 @@ +2009-05-12 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + + De-activate hsl stuff in value rgb. + + * mln/value/rgb.hh: De-activate hsl stuff. + It shall be moved elsewhere. + * mln/trait/value_.hh (mln_dim): New macro. + Layout; sort short macros by name. + * mln/fun/c.hh (todo): New. + 2009-05-11 Fabien Freling <fabien.freling(a)lrde.epita.fr> Fix full2image() domain for cropped images. diff --git a/milena/mln/fun/c.hh b/milena/mln/fun/c.hh index 400c781..bd07d0e 100644 --- a/milena/mln/fun/c.hh +++ b/milena/mln/fun/c.hh @@ -33,6 +33,9 @@ /// /// Encapsulate a plain (C language-like) pointer to function /// into a functor. +/// +/// \todo Fix category: super is not defined! +/// See mln/value/builtin/integers.hh for an example. # include <mln/fun/internal/selector.hh> # include <mln/metal/unqualif.hh> diff --git a/milena/mln/trait/value_.hh b/milena/mln/trait/value_.hh index d445bdf..571f8b7 100644 --- a/milena/mln/trait/value_.hh +++ b/milena/mln/trait/value_.hh @@ -53,11 +53,12 @@ # define mln_trait_value_quant_(V) mln::trait::value_< V >::quant -# define mln_nbits(V) mln::trait::value_< V >::nbits # define mln_card(V) mln::trait::value_< V >::card -# define mln_min(V) mln::trait::value_< V >::min() -# define mln_max(V) mln::trait::value_< V >::max() +# define mln_dim(V) mln::trait::value_< V >::dim # define mln_epsilon(V) mln::trait::value_< V >::epsilon() +# define mln_max(V) mln::trait::value_< V >::max() +# define mln_min(V) mln::trait::value_< V >::min() +# define mln_nbits(V) mln::trait::value_< V >::nbits /// Give the summation type for values of type \c T. diff --git a/milena/mln/value/rgb.hh b/milena/mln/value/rgb.hh index 54e6b76..c8ff8d9 100644 --- a/milena/mln/value/rgb.hh +++ b/milena/mln/value/rgb.hh @@ -42,7 +42,7 @@ # include <mln/value/ops.hh> -# include <mln/fun/v2v/hsl_to_rgb.hh> +// # include <mln/fun/v2v/hsl_to_rgb.hh> # include <mln/value/concept/vectorial.hh> # include <mln/value/int_u.hh> # include <mln/algebra/vec.hh> @@ -55,24 +55,24 @@ namespace mln - namespace fun - { +// namespace fun +// { - namespace v2v - { +// namespace v2v +// { - template <typename T_rgb> - struct f_hsl_to_rgb_; +// template <typename T_rgb> +// struct f_hsl_to_rgb_; - typedef f_hsl_to_rgb_< value::rgb<8> > f_hsl_to_rgb_3x8_t; - typedef f_hsl_to_rgb_< value::rgb<16> > f_hsl_to_rgb_3x16_t; +// typedef f_hsl_to_rgb_< value::rgb<8> > f_hsl_to_rgb_3x8_t; +// typedef f_hsl_to_rgb_< value::rgb<16> > f_hsl_to_rgb_3x16_t; - extern f_hsl_to_rgb_3x8_t f_hsl_to_rgb_3x8; - extern f_hsl_to_rgb_3x16_t f_hsl_to_rgb_3x16; +// extern f_hsl_to_rgb_3x8_t f_hsl_to_rgb_3x8; +// extern f_hsl_to_rgb_3x16_t f_hsl_to_rgb_3x16; - } +// } - } +// } namespace literal @@ -103,11 +103,11 @@ namespace mln } - // Forward declaration. - namespace value - { - template <typename H, typename S, typename L> class hsl_; - } +// // Forward declaration. +// namespace value +// { +// template <typename H, typename S, typename L> class hsl_; +// } namespace convert @@ -128,13 +128,13 @@ namespace mln template <unsigned m> void from_to_(const value::int_u<m>& from, value::rgb<m>& to); - // hsl -> rgb8. - template <typename H, typename S, typename L> - void from_to_(const value::hsl_<H,S,L>&, value::rgb<8>& to); +// // hsl -> rgb8. +// template <typename H, typename S, typename L> +// void from_to_(const value::hsl_<H,S,L>&, value::rgb<8>& to); - // hsl -> rgb16. - template <typename H, typename S, typename L> - void from_to_(const value::hsl_<H,S,L>&, value::rgb<16>& to); +// // hsl -> rgb16. +// template <typename H, typename S, typename L> +// void from_to_(const value::hsl_<H,S,L>&, value::rgb<16>& to); // rgb -> bool. template <unsigned m> @@ -397,8 +397,8 @@ namespace mln } // end of namespace mln -// Needed by from_to_. -# include <mln/fun/v2v/rgb_to_hsl.hh> +// // Needed by from_to_. +// # include <mln/fun/v2v/rgb_to_hsl.hh> # ifndef MLN_INCLUDE_ONLY @@ -787,19 +787,19 @@ namespace mln to = value::rgb<m>(from, from, from); } - template <typename H, typename S, typename L> - void - from_to_(const value::hsl_<H,S,L>& from, value::rgb<8>& to) - { - to = fun::v2v::f_hsl_to_rgb_3x8(from); - } - - template <typename H, typename S, typename L> - void - from_to_(const value::hsl_<H,S,L>& from, value::rgb<16>& to) - { - to = fun::v2v::f_hsl_to_rgb_3x16(from); - } +// template <typename H, typename S, typename L> +// void +// from_to_(const value::hsl_<H,S,L>& from, value::rgb<8>& to) +// { +// to = fun::v2v::f_hsl_to_rgb_3x8(from); +// } + +// template <typename H, typename S, typename L> +// void +// from_to_(const value::hsl_<H,S,L>& from, value::rgb<16>& to) +// { +// to = fun::v2v::f_hsl_to_rgb_3x16(from); +// } template <unsigned m> void -- 1.6.1.2

1 0

r3787: Inim project fixes
by Edwin Carlinet 12 May '09

12 May '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-05-12 Edwin Carlinet <carlinet(a)lrde.epita.fr> Inim project fixes. * edwin/inim/inim.cc: Try to fix bug linked to image noise border. --- inim.cc | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) Index: trunk/milena/sandbox/edwin/inim/inim.cc =================================================================== --- trunk/milena/sandbox/edwin/inim/inim.cc (revision 3786) +++ trunk/milena/sandbox/edwin/inim/inim.cc (revision 3787) @@ -25,6 +25,7 @@ #include <mln/transform/distance_front.hh> #include <mln/morpho/attribute/bbox.hh> #include <mln/morpho/attribute/card.hh> +#include <mln/morpho/attribute/volume.hh> #include <mln/make/w_window2d_int.hh> /* io */ @@ -47,6 +48,8 @@ /* Draw debug */ #include <mln/draw/box.hh> +#include <mln/literal/colors.hh> +#include <mln/level/convert.hh> /* std */ #include <string> @@ -154,7 +157,7 @@ if (mydebug) { dsp("Distance geodesic"); - io::pgm::save(input, "distance.pgm"); + } /* Component tree creation */ @@ -166,7 +169,7 @@ /* Compute Attribute On Image */ typedef morpho::attribute::bbox bbox_t; - typedef morpho::attribute::card card_t; + typedef morpho::attribute::volume card_t; typedef mln_ch_value_(I, double) A; mln_VAR(attr_image, morpho::tree::compute_attribute_image(bbox_t (), tree)); @@ -245,14 +248,28 @@ io::ppm::save(output, "label.pgm"); /* Now store output image image */ - O out; + O out, distance; initialize(out, input); + distance = level::convert(value::rgb8 (), input); data::fill(out, literal::black_t()); data::paste(output | pw::value(input_), out); + { + mln_piter_(p_array<mln_psite_(I)>) it(obj_array); + for_all(it) + { + std::cout << it << " :: " << attr_image(it).pmin() << " -> " << a(it) + << std::endl; + + draw::box(out, attr_image(it), literal::red_t ()); + draw::box(distance, attr_image(it), literal::red_t ()); + } + } + if (mydebug) { dsp("Mask input"); } + io::ppm::save(distance, "distance.pgm"); io::ppm::save(out, "output.pgm"); }

1 0

[PATCH 26/31] Inim project fixes.
by Roland Levillain 12 May '09

12 May '09

* edwin/inim/inim.cc: Try to fix bug linked to image noise border. --- milena/sandbox/ChangeLog | 5 +++++ milena/sandbox/edwin/inim/inim.cc | 23 ++++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 1fd08b0..b83f3fc 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,8 @@ +2009-05-12 Edwin Carlinet <carlinet(a)lrde.epita.fr> + + Inim project fixes. + * edwin/inim/inim.cc: Try to fix bug linked to image noise border. + 2009-05-12 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add some code to extend the work of Etienne and Fred. diff --git a/milena/sandbox/edwin/inim/inim.cc b/milena/sandbox/edwin/inim/inim.cc index f38130d..748aa10 100644 --- a/milena/sandbox/edwin/inim/inim.cc +++ b/milena/sandbox/edwin/inim/inim.cc @@ -25,6 +25,7 @@ #include <mln/transform/distance_front.hh> #include <mln/morpho/attribute/bbox.hh> #include <mln/morpho/attribute/card.hh> +#include <mln/morpho/attribute/volume.hh> #include <mln/make/w_window2d_int.hh> /* io */ @@ -47,6 +48,8 @@ /* Draw debug */ #include <mln/draw/box.hh> +#include <mln/literal/colors.hh> +#include <mln/level/convert.hh> /* std */ #include <string> @@ -154,7 +157,7 @@ int main(int argc, char* argv[]) if (mydebug) { dsp("Distance geodesic"); - io::pgm::save(input, "distance.pgm"); + } /* Component tree creation */ @@ -166,7 +169,7 @@ int main(int argc, char* argv[]) /* Compute Attribute On Image */ typedef morpho::attribute::bbox bbox_t; - typedef morpho::attribute::card card_t; + typedef morpho::attribute::volume card_t; typedef mln_ch_value_(I, double) A; mln_VAR(attr_image, morpho::tree::compute_attribute_image(bbox_t (), tree)); @@ -245,14 +248,28 @@ int main(int argc, char* argv[]) io::ppm::save(output, "label.pgm"); /* Now store output image image */ - O out; + O out, distance; initialize(out, input); + distance = level::convert(value::rgb8 (), input); data::fill(out, literal::black_t()); data::paste(output | pw::value(input_), out); + { + mln_piter_(p_array<mln_psite_(I)>) it(obj_array); + for_all(it) + { + std::cout << it << " :: " << attr_image(it).pmin() << " -> " << a(it) + << std::endl; + + draw::box(out, attr_image(it), literal::red_t ()); + draw::box(distance, attr_image(it), literal::red_t ()); + } + } + if (mydebug) { dsp("Mask input"); } + io::ppm::save(distance, "distance.pgm"); io::ppm::save(out, "output.pgm"); } -- 1.6.1.2

1 0

3786: Add some code to extend the work of Etienne and Fred.
by Thierry Geraud 12 May '09

12 May '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add some code to extend the work of Etienne and Fred. * theo/experimental/histo_image.cc: New. histo_image.cc | 421 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 421 insertions(+) Index: theo/experimental/histo_image.cc --- theo/experimental/histo_image.cc (revision 0) +++ theo/experimental/histo_image.cc (revision 0) @@ -0,0 +1,421 @@ +#include <mln/value/int_u8.hh> +#include <mln/value/int_s.hh> +#include <mln/value/rgb8.hh> +#include <mln/trait/value/comp.hh> + +#include <mln/core/alias/box1d.hh> +#include <mln/core/image/image1d.hh> +#include <mln/core/image/image3d.hh> + +#include <mln/core/concept/function.hh> +#include <mln/metal/ands.hh> + + + +namespace mln +{ + + + // -------------------------------------------------- fun + + + namespace fun + { + + // . . . . . . . . . . . . . . . v2v:: value <-> index + + // This is a revamp of mln/value/internal/convert.hh. It remains + // to be updated with Fred's new function writting. Then we'll be + // able to make it better, i.e., to handle the different cases + // properly. Precisely a case for scalars with low quantization + // (with a special encoding like quantized float, or not), a case + // for vectors with low quant, etc. + + namespace v2v + { + + // value -> index + + template <typename T> + struct index_of_value : Function_v2v< index_of_value<T> >, + private metal::bool_<(mln_dim(T) == 1)>::check_t + { + typedef unsigned result; + unsigned operator()(const T& v) const + { + return unsigned( int(v) - int(mln_min(T)) ); + } + }; + + template <> + struct index_of_value<bool> : Function_v2v< index_of_value<bool> > + { + typedef unsigned result; + unsigned operator()(bool b) const + { + return b ? 1u : 0u; + } + }; + + template <typename T> + unsigned + meta_index_of_value(const T& v) + { + index_of_value<T> f; + return f(v); + } + + // index -> value + + template <typename T> + struct value_at_index : Function_v2v< value_at_index<T> >, + private metal::bool_<(mln_dim(T) == 1)>::check_t + { + typedef T result; + T operator()(unsigned i) const + { + return T( int(mln_min(T)) + int(i) ); + } + }; + + template <> + struct value_at_index<bool> : Function_v2v< value_at_index<bool> > + { + typedef bool result; + bool operator()(unsigned i) const + { + mln_precondition(i < 2); + return i == 1u ? true : false; + } + }; + + + // . . . . . . . . . . . . . . . value -> point n-D + + + namespace internal + { + + // FIXME: It can be straightforwardly written using + // fun::ith_component. Yet there is no test file for this + // function. + + template <unsigned dim, typename T> + struct point_from_value; + + template <typename T> + struct point_from_value< 1, T > + { + static point1d run(const T& v) + { + return point1d(meta_index_of_value(v)); + } + }; + + template <typename T> + struct point_from_value< 2, T > + { + static point2d run(const T& v) + { + return point2d(meta_index_of_value(v[0]), + meta_index_of_value(v[1])); + } + }; + + template <typename T> + struct point_from_value< 3, T > + { + static point3d run(const T& v) + { + return point3d(meta_index_of_value(v[0]), + meta_index_of_value(v[1]), + meta_index_of_value(v[2])); + } + }; + + } // mln::fun::v2v::internal + + + template <typename T> + struct point_from_value : Function_v2v< point_from_value<T> > + { + enum { d = mln_dim(T) }; + typedef mln_regular_grid_from_dim(d) G; + typedef mln::point<G, def::coord> result; + + result operator()(const T& v) const + { + return internal::point_from_value<d,T>::run(v); + } + + index_of_value<T> f_; + }; + + template <typename T> + mln_result(point_from_value<T>) + meta_point_from_value(const T& v) + { + point_from_value<T> f; + return f(v); + } + + } // mln::fun::v2v + + + + + // . . . . . . . . . . . . . . . p2p::fold* + + namespace p2p + { + + struct fold1d : Function_p2p< fold1d > + { + typedef point1d result; + result operator()(const point1d& p) const + { + point1d tmp(p[0] % b.len(0)); + return tmp; + } + box1d b; + }; + + template <bool along_0, bool along_1> + struct fold2d : Function_p2p< fold2d<along_0,along_1> > + { + typedef point2d result; + result operator()(const point2d& p) const + { + point2d tmp(along_0 ? p[0] % b.len(0) : p[0], + along_1 ? p[1] % b.len(1) : p[1]); + return tmp; + } + box2d b; + }; + + template <bool along_0, bool along_1, bool along_2> + struct fold3d : Function_p2p< fold3d<along_0,along_1,along_2> > + { + typedef point3d result; + result operator()(const point3d& p) const + { + point3d tmp(along_0 ? p[0] % b.len(0) : p[0], + along_1 ? p[1] % b.len(1) : p[1], + along_2 ? p[2] % b.len(2) : p[2]); + return tmp; + } + box3d b; + }; + + } // mln::fun::p2p + + + } // mln::fun + + + // -------------------------------------------------- value + + + namespace value + { + + template <unsigned n, int inf, int sup> + struct circular + { + }; + + + namespace internal + { + template <typename T> + struct is_circular_helper : metal::false_ + {}; + + template <unsigned n, int inf, int sup> + struct is_circular_helper< circular<n,inf,sup> > : metal::true_ + {}; + + template <typename T> + struct is_circular : is_circular_helper<T>::eval + { + }; + + } // mln::value::internal + + } // mln::value + + + namespace trait + { + + template <unsigned n, int inf, int sup> + struct value_< mln::value::circular<n, inf, sup> > + { + enum { + dim = 1, + nbits = n, + card = mln_value_card_from_(n) + }; + // ... + }; + + } // end of namespace trait + + + // -------------------------------------------------- histo + + + namespace histo + { + + namespace internal + { + + template <int dim, typename T> + struct image_from_value_helper + { + }; + + // dim = 1 + + template <typename T, bool is_c> + struct image_from_value_helper_1; + + template <typename T> + struct image_from_value_helper_1< T, false > + { + typedef image1d<unsigned> ret; + + static ret get_image() + { + ret tmp(mln_card(T)); + return tmp; + } + }; + + template <typename T> + struct image_from_value_helper_1< T, true > + { + typedef void ret; + }; + + template <typename T> + struct image_from_value_helper< 1, T > + { + enum { is_c = value::internal::is_circular<T>::value }; + typedef image_from_value_helper_1< T, is_c > helper; + }; + + // dim = 3 + + template <typename C0, bool is_c0, + typename C1, bool is_c1, + typename C2, bool is_c2, + typename T> + struct image_from_value_helper_3; + + template <typename C0, typename C1, typename C2, + typename T> + struct image_from_value_helper_3< C0, false, + C1, false, + C2, false, + T > + { + typedef image3d<unsigned> ret; + static ret get_image() + { + ret tmp(mln_card(C0), mln_card(C1), mln_card(C2)); + return tmp; + } + }; + + template <typename C0, typename C1, typename C2, + typename T> + struct image_from_value_helper_3< C0, true, + C1, false, + C2, false, + T > + { + typedef void ret; + }; + + template <typename T> + struct image_from_value_helper< 3, T > + { + typedef mln_trait_value_comp(T, 0) C0; + typedef mln_trait_value_comp(T, 1) C1; + typedef mln_trait_value_comp(T, 2) C2; + typedef image_from_value_helper_3< C0, value::internal::is_circular<C0>::value, + C1, value::internal::is_circular<C1>::value, + C2, value::internal::is_circular<C2>::value, + T > helper; + }; + + template <typename T> + struct image_from_value_ // Entry point. + { + typedef typename image_from_value_helper<mln_dim(T), T>::helper helper; + }; + + + } // mln::histo::internal + + template <typename T> + struct image_from_value : internal::image_from_value_<T>::helper + { + }; + + + + // First code: the result of this function shall be replaced by + // an histo::image<T> where T is mln_value(I). As a consequence, + // we will not have to call meta_point_from_value... + + template <typename I> + typename image_from_value<mln_value(I)>::ret + compute_image(const Image& input_) + { + const I& input = exact(input_); + typedef image_from_value<mln_value(I)> helper; + typename helper::ret h = helper::get_image(); + + mln_piter(I) p(input.domain()); + for_all(p) + ++h( fun::v2v::meta_point_from_value(input(p)) ); + + return h; + } + + } // mln::histo + +} // mln + + +int main() +{ + using namespace mln; + + { + typedef bool T; + std::cout << histo::image_from_value<T>::get_image().domain() << std::endl; + } + + { + typedef unsigned char T; + std::cout << histo::image_from_value<T>::get_image().domain() << std::endl; + } + + { + typedef value::int_s<3> T; + std::cout << histo::image_from_value<T>::get_image().domain() << std::endl; + } + + { + typedef value::rgb8 T; + std::cout << histo::image_from_value<T>::get_image().domain() << std::endl; + } + + { + // typedef value::circular<8,0,9> T; + } +}

1 0