- Olena-patches

milena r1239: Add best canvas and make median_dir use it
by Simon Nivault 04 Oct '07

04 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-04 Simon Nivault <simon.nivault(a)lrde.epita.fr> Add best canvas and make median_dir use it. * mln/canvas/browsing/dir_ricard51.hh: New canvas. * mln/canvas/browsing/directional.hh: Fix some names. * mln/level/median.hh: Use new canvas. * tests/level_median_dir.cc: New. --- mln/canvas/browsing/dir_ricard51.hh | 173 ++++++++++++++++++++++++++++++++++++ mln/canvas/browsing/directional.hh | 8 - mln/level/median.hh | 63 +++---------- tests/level_median_dir.cc | 55 +++++++++++ 4 files changed, 248 insertions(+), 51 deletions(-) Index: trunk/milena/tests/level_median_dir.cc =================================================================== --- trunk/milena/tests/level_median_dir.cc (revision 0) +++ trunk/milena/tests/level_median_dir.cc (revision 1239) @@ -0,0 +1,55 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/level_median.cc + * + * \brief Test on mln::level::median. + */ + +#include <mln/core/image2d_b.hh> + +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/value/int_u8.hh> +#include <mln/level/median.hh> + + +int main() +{ + using namespace mln; + using value::int_u8; + + border::thickness = 7; + + image2d_b<int_u8> + lena = io::pgm::load("../img/lena.pgm"), + out(lena.domain()); + + level::median_dir(lena, 1, 15, out); + io::pgm::save(out, "out.pgm"); +} Index: trunk/milena/mln/level/median.hh =================================================================== --- trunk/milena/mln/level/median.hh (revision 1238) +++ trunk/milena/mln/level/median.hh (revision 1239) @@ -41,7 +41,7 @@ # include <mln/set/diff.hh> # include <mln/canvas/browsing/snake_fwd.hh> -# include <mln/canvas/browsing/directional.hh> +# include <mln/canvas/browsing/dir_ricard51.hh> # include <mln/accu/median.hh> @@ -190,11 +190,6 @@ // aux data mln_point(I) p; - const mln_point(I) - pmin, pmax; - const mln_coord(I) - pmin_dir, pmax_dir, - pmin_dir_plus, pmax_dir_minus; accu::median<mln_vset(I)> med; // ctor @@ -206,12 +201,6 @@ output(exact(output)), // aux data p(), - pmin(input.domain().pmin()), - pmax(input.domain().pmax()), - pmin_dir(pmin[dir]), - pmax_dir(pmax[dir]), - pmin_dir_plus (pmin[dir] + length / 2), - pmax_dir_minus(pmax[dir] - length / 2), med(input.values()) { } @@ -220,55 +209,26 @@ { } - void next() + void init_line() { - mln_point(I) - p = this->p, - pt = p, - pu = p; - - typedef mln_coord(I)& coord_ref; - coord_ref - ct = pt[dir], - cu = pu[dir], - p_dir = p[dir]; - - // initialization (before first point of the row) med.init(); - for (ct = pmin_dir; ct < pmin_dir_plus; ++ct) - if (input.has(pt)) - med.take(input(pt)); + } - // left columns (just take new points) - for (p_dir = pmin_dir; p_dir <= pmin_dir_plus; ++p_dir, ++ct) + void add_point(mln_point(I) pt) { - if (input.has(pt)) med.take(input(pt)); - if (output.has(p)) - output(p) = med.to_result(); } - // middle columns (both take and untake) - cu = pmin[dir]; - for (; p_dir <= pmax_dir_minus; ++cu, ++p_dir, ++ct) + void remove_point(mln_point(I) pu) { - if (input.has(pt)) - med.take(input(pt)); - if (input.has(pu)) med.untake(input(pu)); - if (output.has(p)) - output(p) = med.to_result(); } - // right columns (now just untake old points) - for (; p_dir <= pmax_dir; ++cu, ++p_dir) + void next() { - if (input.has(pu)) - med.untake(input(pu)); if (output.has(p)) output(p) = med.to_result(); } - } void final() { @@ -282,7 +242,7 @@ void median_dir_(const Image& input, unsigned dir, unsigned length, O& output) { median_dir_t<I,O> f(exact(input), dir, length, output); - canvas::browsing::directional(f); + canvas::browsing::dir_ricard51(f); } @@ -330,11 +290,20 @@ void median_dir(const Image& input, unsigned dir, unsigned length, Image<O>& output) { + trace::entering("level::median_dir"); + + mlc_is(mln_trait_image_io(O), trait::io::write)::check(); + mlc_is(mln_trait_image_support(I), trait::support::aligned)::check(); + mlc_converts_to(mln_value(I), mln_value(O))::check(); + mln_precondition(exact(output).domain() == exact(input).domain()); typedef mln_point(I) P; mln_precondition(dir < P::dim); mln_precondition(length % 2 == 1); + impl::median_dir_(exact(input), dir, length, exact(output)); + + trace::exiting("level::median_dir"); } # endif // ! MLN_INCLUDE_ONLY Index: trunk/milena/mln/canvas/browsing/dir_ricard51.hh =================================================================== --- trunk/milena/mln/canvas/browsing/dir_ricard51.hh (revision 0) +++ trunk/milena/mln/canvas/browsing/dir_ricard51.hh (revision 1239) @@ -0,0 +1,173 @@ +// Copyright (C) 2007 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_CANVAS_DIR_RICARD51_HH +# define MLN_CANVAS_DIR_RICARD51_HH + +/*! \file mln/canvas/dir_ricard51.hh + * + * \brief Dir_Ricard51 browsing of an image. + */ + +# include <mln/core/concept/browsing.hh> +# include <mln/core/concept/image.hh> + +namespace mln +{ + + namespace canvas + { + + namespace browsing + { + + /*! FIXME : DOC + * F shall features : \n + * { \n + * --- as types: \n + * I; \n + * --- as attributes: \n + * dim; \n + * dir; // and test dir < dim \n + * input; \n + * p; \n + * length; \n + * --- as methods: \n + * void init(); \n + * void init_line(); \n + * void add_point(p) \n + * void remove_point(p) \n + * void next(); \n + * void final(); \n + * } \n + * + */ + struct dir_ricard51_t : public Browsing< dir_ricard51_t > + { + template <typename F> + void operator()(F& f) const; + } + + dir_ricard51; + +# ifndef MLN_INCLUDE_ONLY + + template <typename F> + void + dir_ricard51_t::operator()(F& f) const + { + mln_precondition(f.dir < f.dim); + typedef typename F::I I; + + const mln_point(I) + pmin = f.input.domain().pmin(), + pmax = f.input.domain().pmax(); + + const mln_coord(I) + pmin_dir = pmin[f.dir], + pmax_dir = pmax[f.dir], + pmin_dir_plus_half_length = pmin_dir + f.length / 2, + pmax_dir_minus_half_length = pmax_dir - f.length / 2; + + mln_point(I) pt, pu; + + typedef mln_coord(I)& coord_ref; + coord_ref + ct = pt[f.dir], + cu = pu[f.dir], + p_dir = f.p[f.dir]; + + f.p = pmin; + + f.init(); + + do + { + pt = f.p; + pu = f.p; + + f.init_line(); + + // initialization (before first point of the line) + for (ct = pmin_dir; ct < pmin_dir_plus_half_length; ++ ct) + if (f.input.has(pt)) + f.add_point(pt); + + // left columns (just take new points) + for (p_dir = pmin_dir; p_dir <= pmin_dir_plus_half_length; ++p_dir, ++ct) + { + if (f.input.has(pt)) + f.add_point(pt); + f.next(); + } + + // middle columns (both take and untake) + cu = pmin_dir; + for (; p_dir <= pmax_dir_minus_half_length; ++cu, ++p_dir, ++ct) + { + if (f.input.has(pt)) + f.add_point(pt); + if (f.input.has(pu)) + f.remove_point(pu); + f.next(); + } + + // right columns (now just untake old points) + for (; p_dir <= pmax_dir; ++cu, ++p_dir) + { + if (f.input.has(pu)) + f.remove_point(pu); + f.next(); + } + + p_dir = pmin_dir; + + for (int c = F::dim - 1; c >= 0; --c) + { + if (c == int(f.dir)) + continue; + if (f.p[c] != pmax[c]) + { + ++f.p[c]; + break; + } + f.p[c] = pmin[c]; + } + } while (f.p != pmin); + + f.final(); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::canvas::browsing + + } // end of namespace mln::canvas + +} // end of namespace mln + +#endif // ! MLN_CANVAS_DIR_RICARD51_HH Index: trunk/milena/mln/canvas/browsing/directional.hh =================================================================== --- trunk/milena/mln/canvas/browsing/directional.hh (revision 1238) +++ trunk/milena/mln/canvas/browsing/directional.hh (revision 1239) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CANVAS_DIRBROWSING_HH -# define MLN_CANVAS_DIRBROWSING_HH +#ifndef MLN_CANVAS_DIRECTIONAL_HH +# define MLN_CANVAS_DIRECTIONAL_HH -/*! \file mln/canvas/dirbrowsing.hh +/*! \file mln/canvas/browsing/directional.hh * * \brief Directional browsing of an image. */ @@ -115,4 +115,4 @@ } // end of namespace mln -#endif // ! MLN_CANVAS_DIRBROWSING_HH +#endif // ! MLN_CANVAS_DIRECTIONAL_HH

1 0

milena r1238: Remove convertion method in median_alt
by Matthieu Garrigues 04 Oct '07

04 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-04 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Remove convertion method in median_alt. * mln/accu/median_alt.hh: Move convertion method to the super class accu::internal::base_ * mln/accu/nil.hh, * mln/accu/p.hh: Clean old includes. --- median_alt.hh | 10 ++-------- nil.hh | 1 - p.hh | 1 - 3 files changed, 2 insertions(+), 10 deletions(-) Index: trunk/milena/mln/accu/nil.hh =================================================================== --- trunk/milena/mln/accu/nil.hh (revision 1237) +++ trunk/milena/mln/accu/nil.hh (revision 1238) @@ -36,7 +36,6 @@ */ # include <mln/core/concept/meta_accumulator.hh> -# include <mln/core/concept/accumulator.hh> # include <mln/accu/internal/base.hh> # include <mln/util/eat.hh> # include <mln/util/ignore.hh> Index: trunk/milena/mln/accu/median_alt.hh =================================================================== --- trunk/milena/mln/accu/median_alt.hh (revision 1237) +++ trunk/milena/mln/accu/median_alt.hh (revision 1238) @@ -33,6 +33,7 @@ * \brief Define FIXME */ +# include <mln/accu/internal/base.hh> # include <mln/accu/histo.hh> @@ -47,7 +48,7 @@ * with type \c S. */ template <typename S> - struct median_alt + struct median_alt : : public mln::accu::internal::base_< mln_value(S), median_alt<S> > { typedef mln_value(S) value; @@ -57,7 +58,6 @@ void untake(const value& v); void init(); - operator mln_value(S) () const; value to_result() const; // FIXME: remove @@ -249,12 +249,6 @@ } template <typename S> - median_alt<S>::operator mln_value(S) () const - { - return v_; - } - - template <typename S> typename median_alt<S>::value median_alt<S>::to_result() const { Index: trunk/milena/mln/accu/p.hh =================================================================== --- trunk/milena/mln/accu/p.hh (revision 1237) +++ trunk/milena/mln/accu/p.hh (revision 1238) @@ -34,7 +34,6 @@ */ # include <mln/core/concept/meta_accumulator.hh> -# include <mln/core/concept/accumulator.hh> # include <mln/accu/internal/base.hh> # include <mln/metal/is_a.hh>

1 0

milena r1237: Change accumulators inheritance
by Matthieu Garrigues 04 Oct '07

04 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-04 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Change accumulators inheritance. * mln/accu/bbox.hh, * mln/accu/count.hh, * mln/accu/histo.hh, * mln/accu/max.hh, * mln/accu/max_h.hh, * mln/accu/mean.hh, * mln/accu/min.hh, * mln/accu/min_h.hh, * mln/accu/nil.hh, * mln/accu/p.hh, * mln/accu/pair.hh, * mln/accu/sum.hh, * mln/accu/v.hh: Update inheritances (from Accumulator to base_). --- bbox.hh | 4 ++-- count.hh | 3 ++- histo.hh | 4 ++-- max.hh | 2 +- max_h.hh | 4 ++-- mean.hh | 3 ++- min.hh | 3 ++- min_h.hh | 4 ++-- nil.hh | 3 ++- p.hh | 4 +++- pair.hh | 4 +++- sum.hh | 4 +++- v.hh | 4 ++-- 13 files changed, 28 insertions(+), 18 deletions(-) Index: trunk/milena/mln/accu/nil.hh =================================================================== --- trunk/milena/mln/accu/nil.hh (revision 1236) +++ trunk/milena/mln/accu/nil.hh (revision 1237) @@ -37,6 +37,7 @@ # include <mln/core/concept/meta_accumulator.hh> # include <mln/core/concept/accumulator.hh> +# include <mln/accu/internal/base.hh> # include <mln/util/eat.hh> # include <mln/util/ignore.hh> @@ -50,7 +51,7 @@ /*! Define an accumulator that does nothing. */ template <typename T> - struct nil_ : public Accumulator< nil_<T> > + struct nil_ : public mln::accu::internal::base_< util::ignore , nil_<T> > { typedef util::eat value; typedef util::ignore result; Index: trunk/milena/mln/accu/min.hh =================================================================== --- trunk/milena/mln/accu/min.hh (revision 1236) +++ trunk/milena/mln/accu/min.hh (revision 1237) @@ -33,6 +33,7 @@ * \brief Define an accumulator that computes a min. */ +# include <mln/accu/internal/base.hh> # include <mln/core/concept/meta_accumulator.hh> # include <mln/value/props.hh> # include <mln/util/pix.hh> @@ -50,7 +51,7 @@ * The parameter \c V is the type of values. */ template <typename V> - struct min_ : public Accumulator< min_<V> > + struct min_ : public mln::accu::internal::base_< V, min_<V> > { typedef V value; typedef V result; Index: trunk/milena/mln/accu/max.hh =================================================================== --- trunk/milena/mln/accu/max.hh (revision 1236) +++ trunk/milena/mln/accu/max.hh (revision 1237) @@ -50,7 +50,7 @@ * The parameter \c V is the type of values. */ template <typename V> - struct max_ : public Accumulator< max_<V> > + struct max_ : public mln::accu::internal::base_< V , max_<V> > { typedef V value; typedef V result; Index: trunk/milena/mln/accu/histo.hh =================================================================== --- trunk/milena/mln/accu/histo.hh (revision 1236) +++ trunk/milena/mln/accu/histo.hh (revision 1237) @@ -39,7 +39,7 @@ # include <algorithm> # include <mln/core/concept/value_set.hh> -# include <mln/core/concept/accumulator.hh> +# include <mln/accu/internal/base.hh> # include <mln/value/set.hh> @@ -53,7 +53,7 @@ /*! Generic histogram class over a value set with type \c S. */ template <typename S> - struct histo : public Accumulator< histo<S> > + struct histo : public mln::accu::internal::base_< const std::vector<std::size_t>& , histo<S> > { histo(const Value_Set<S>& s); histo(); Index: trunk/milena/mln/accu/count.hh =================================================================== --- trunk/milena/mln/accu/count.hh (revision 1236) +++ trunk/milena/mln/accu/count.hh (revision 1237) @@ -33,6 +33,7 @@ * \brief Define an accumulator that counts. */ +# include <mln/accu/internal/base.hh> # include <mln/core/concept/meta_accumulator.hh> @@ -46,7 +47,7 @@ /*! Generic counter accumulator class. */ template <typename V> - struct count_ : public Accumulator< count_<V> > + struct count_ : public mln::accu::internal::base_< std::size_t , count_<V> > { typedef V value; typedef std::size_t result; // FIXME: Up in Accumulator. Index: trunk/milena/mln/accu/bbox.hh =================================================================== --- trunk/milena/mln/accu/bbox.hh (revision 1236) +++ trunk/milena/mln/accu/bbox.hh (revision 1237) @@ -33,7 +33,7 @@ * \brief Define an accumulator that computes a bbox. */ -# include <mln/core/concept/accumulator.hh> +# include <mln/accu/internal/base.hh> # include <mln/core/box.hh> @@ -49,7 +49,7 @@ * The parameter \c P is the type of points. */ template <typename P> - struct bbox : public Accumulator< bbox > + struct bbox : public mln::accu::internal::base_< const box_& , bbox > { typedef P value; typedef const box_& result; Index: trunk/milena/mln/accu/min_h.hh =================================================================== --- trunk/milena/mln/accu/min_h.hh (revision 1236) +++ trunk/milena/mln/accu/min_h.hh (revision 1237) @@ -33,7 +33,7 @@ * \brief Define a generic min accumulator class based on histogram. */ -# include <mln/core/concept/accumulator.hh> +# include <mln/accu/internal/base.hh> # include <mln/accu/histo.hh> @@ -48,7 +48,7 @@ * type \c S. */ template <typename S> - struct min_h : public Accumulator< min_h<S> > + struct min_h : public mln::accu::internal::base_< mln_value(S) , min_h<S> > { typedef mln_value(S) value; typedef value result; Index: trunk/milena/mln/accu/pair.hh =================================================================== --- trunk/milena/mln/accu/pair.hh (revision 1236) +++ trunk/milena/mln/accu/pair.hh (revision 1237) @@ -36,6 +36,8 @@ # include <utility> # include <mln/core/concept/meta_accumulator.hh> + +# include <mln/accu/internal/base.hh> # include <mln/metal/is_a.hh> # include <mln/metal/unqualif.hh> @@ -54,7 +56,7 @@ * \todo Check that, when V is not provided, A1 and A2 have the same value. */ template <typename A1, typename A2, typename V = mln_value(A1)> - struct pair_ : public Accumulator< pair_<A1,A2,V> > + struct pair_ : public mln::accu::internal::base_< std::pair< mlc_unqualif(mln_result(A1)) , mlc_unqualif(mln_result(A2)) > , pair_<A1,A2,V> > { typedef V value; Index: trunk/milena/mln/accu/max_h.hh =================================================================== --- trunk/milena/mln/accu/max_h.hh (revision 1236) +++ trunk/milena/mln/accu/max_h.hh (revision 1237) @@ -33,7 +33,7 @@ * \brief Define a generic max accumulator class based on histogram. */ -# include <mln/core/concept/accumulator.hh> +# include <mln/accu/internal/base.hh> # include <mln/accu/histo.hh> @@ -48,7 +48,7 @@ * type \c S. */ template <typename S> - struct max_h : public Accumulator< max_h<S> > + struct max_h : public mln::accu::internal::base_< mln_value(S) , max_h<S> > { typedef mln_value(S) value; typedef value result; Index: trunk/milena/mln/accu/p.hh =================================================================== --- trunk/milena/mln/accu/p.hh (revision 1236) +++ trunk/milena/mln/accu/p.hh (revision 1237) @@ -35,6 +35,8 @@ # include <mln/core/concept/meta_accumulator.hh> # include <mln/core/concept/accumulator.hh> + +# include <mln/accu/internal/base.hh> # include <mln/metal/is_a.hh> @@ -50,7 +52,7 @@ * The parameter \c V is the type of values. */ template <typename A> - struct p_ : public Accumulator< p_<A> > + struct p_ : public mln::accu::internal::base_< mln_result(A) , p_<A> > { typedef mln_value(A) value; typedef mln_result(A) result; Index: trunk/milena/mln/accu/sum.hh =================================================================== --- trunk/milena/mln/accu/sum.hh (revision 1236) +++ trunk/milena/mln/accu/sum.hh (revision 1237) @@ -34,6 +34,8 @@ */ # include <mln/core/concept/meta_accumulator.hh> + +# include <mln/accu/internal/base.hh> # include <mln/value/props.hh> # include <mln/util/pix.hh> # include <mln/literal/zero.hh> @@ -53,7 +55,7 @@ * \c S is the summation type (property) of \c V. */ template <typename V, typename S = mln_sum(V)> - struct sum_ : public Accumulator< sum_<V,S> > + struct sum_ : public mln::accu::internal::base_< S, sum_<V,S> > { typedef V value; typedef S result; Index: trunk/milena/mln/accu/v.hh =================================================================== --- trunk/milena/mln/accu/v.hh (revision 1236) +++ trunk/milena/mln/accu/v.hh (revision 1237) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/meta_accumulator.hh> -# include <mln/core/concept/accumulator.hh> +# include <mln/accu/internal/base.hh> # include <mln/metal/is_a.hh> @@ -48,7 +48,7 @@ /*! Generic v of accumulators. */ template <typename A> - struct val_ : public Accumulator< val_<A> > + struct val_ : public mln::accu::internal::base_< mln_result(A) , val_<A> > { typedef mln_value(A) value; typedef mln_result(A) result; Index: trunk/milena/mln/accu/mean.hh =================================================================== --- trunk/milena/mln/accu/mean.hh (revision 1236) +++ trunk/milena/mln/accu/mean.hh (revision 1237) @@ -35,6 +35,7 @@ * \todo Use accu::pair just like in accu::min_max. */ +# include <mln/accu/internal/base.hh> # include <mln/accu/count.hh> # include <mln/accu/sum.hh> @@ -57,7 +58,7 @@ template <typename V, typename S = mln_sum(V), typename M = S> - struct mean_ : public Accumulator< mean_<V,S,M> > + struct mean_ : public mln::accu::internal::base_< M , mean_<V,S,M> > { typedef V value; typedef M result;

1 0

1236: Introduce the notion of literals.
by Thierry Geraud 04 Oct '07

04 Oct '07

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Introduce the notion of literals. Introduce literal zero. * mln/core/concept/literal.hh: New. * mln/literal: New directory. * mln/literal/zero.hh: New. * tests/literal_zero.cc: New. * mln/accu/sum.hh: Update. * mln/core/concept/object.hh: Include zero. * mln/metal/vec.hh (vec): Split ctor. (vec): Overload ctor for literal zero. Minor update for traits. * mln/trait/images.hh: Precise includes. * mln/trait/ch_value.hh: Prefer fwd decl for vec. * mln/trait/op_minus.hh, * mln/trait/op_times.hh (set_binary_): Use category. * mln/core/trait/op_minus.hh: Remove; obsolete. * mln/core/trait/op_uminus.hh: Remove. * mln/core/trait/all.hh: Update. Misc. * mln/core/dpoint1d.hh: Layout. * mln/core/point.hh: Sort includes. * mln/core/h_vec.hh (FIXME): New. * mln/core/image2d_b.hh: Sort includes. * mln/trace/exiting.hh, * mln/trace/entering.hh: Fix missing include. * tests/t_image.cc: Rename as... * tests/t_image.cxx: ...this; deactivate. * TODO: Update. TODO | 54 ++++++++++++++++---------- mln/accu/sum.hh | 3 - mln/core/concept/literal.hh | 91 ++++++++++++++++++++++++++++++++++++++++++++ mln/core/concept/object.hh | 3 - mln/core/h_vec.hh | 3 - mln/core/image2d_b.hh | 2 mln/core/point.hh | 4 - mln/core/trait/all.hh | 5 -- mln/literal/zero.hh | 77 +++++++++++++++++++++++++++++++++++++ mln/metal/vec.hh | 18 +++++++- mln/trace/entering.hh | 2 mln/trace/exiting.hh | 2 mln/trait/ch_value.hh | 7 ++- mln/trait/images.hh | 6 ++ mln/trait/op_minus.hh | 5 -- mln/trait/op_times.hh | 5 -- tests/literal_zero.cc | 46 ++++++++++++++++++++++ 17 files changed, 291 insertions(+), 42 deletions(-) Index: tests/literal_zero.cc --- tests/literal_zero.cc (revision 0) +++ tests/literal_zero.cc (revision 0) @@ -0,0 +1,46 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/literal_zero.cc + * + * \brief Tests on mln::literal::zero. + */ + +#include <mln/literal/zero.hh> +// #include <mln/core/concept/object.hh> + + +int main() +{ + using namespace mln; + + unsigned char c; + c = literal::zero; + + double d; + d = literal::zero; +} Index: TODO --- TODO (revision 1235) +++ TODO (working copy) @@ -1,7 +1,8 @@ -*- outline -*- -* URGENT + +* mathieu ** accu @@ -17,46 +18,61 @@ tests ? +* guillaume + +** chamfer + +Cf. vieilles versions +algo avec front + + +* simon + +** lines + +ajouter win::line<Mesh, dir> +hline2d et vline2d deviennent des aliases +retoucher les routines avec {h,v}line en argument + -* large changes +* theo -introduce grids +hiérarchie de concepts sous Value +maj trait solver +virer is_fast -> changer le meta-plug +virer core/trait -* adds-on -** abstractions +* misc -Function_i2i -Weighted_Window +** big change -** types +** add + +*** abstraction + +*** type value::proxy to dispatch read/write + the corresponding image type a mean_value object { sum; count } and operator+ -** extensions +*** other in Fast_Image: memcpy and memset-like methods (?) .offset() into GenPixel built-in op objects -> reverse lhs/rhs +** rename -* renaming - - +value::cast(something) -> mln::cast_image or mln::fun::casted<F> etc. -* clean-up +** clean-up select_function in fun::internal::selector_p2? etc. -value::cast(something) -> mln::cast_image or mln::fun::casted<F> etc. - -* processing routines +** processing routines reconstructions + their canvases -fast versions of level::fill and level::paste sorting points w.r.t. their value (array of offsets, psites, points) -arith::inplace_plus et al. -linear:: for convolutions Index: mln/trait/images.hh --- mln/trait/images.hh (revision 1235) +++ mln/trait/images.hh (working copy) @@ -39,7 +39,11 @@ # include <string> # include <mln/value/props.hh> -# include <mln/metal/all.hh> + +# include <mln/metal/bexpr.hh> +# include <mln/metal/equal.hh> +# include <mln/metal/if.hh> +# include <mln/metal/is_const.hh> # define mln_trait_image_category(I) typename mln::trait::image_::category Index: mln/trait/ch_value.hh --- mln/trait/ch_value.hh (revision 1235) +++ mln/trait/ch_value.hh (working copy) @@ -35,7 +35,6 @@ # include <mln/tag/skeleton.hh> # include <mln/trait/image_from_mesh.hh> -# include <mln/metal/vec.hh> # define mln_ch_value(I, V) typename mln::trait::ch_value< I, V >::ret @@ -45,6 +44,12 @@ namespace mln { + // Fwd decl. + namespace metal { template <unsigned n, typename T> class vec; } + + + + namespace trait { Index: mln/trait/op_minus.hh --- mln/trait/op_minus.hh (revision 1235) +++ mln/trait/op_minus.hh (working copy) @@ -50,9 +50,8 @@ /// Default definition of op_minus is given by the promote trait. - template <template <class> class Category_L, typename L, - template <class> class Category_R, typename R> - struct set_binary_< op_minus, Category_L, L, Category_R, R > + template <typename L, typename R> + struct set_binary_< op_minus, Object, L, Object, R > : public promote< L, R > { Index: mln/trait/op_times.hh --- mln/trait/op_times.hh (revision 1235) +++ mln/trait/op_times.hh (working copy) @@ -50,9 +50,8 @@ /// Default definition of op_times is given by the promote trait. - template <template <class> class Category_L, typename L, - template <class> class Category_R, typename R> - struct set_binary_< op_times, Category_L, L, Category_R, R > + template <typename L, typename R> + struct set_binary_< op_times, Object, L, Object, R > : public promote< L, R > { Index: mln/core/dpoint1d.hh Index: mln/core/point.hh --- mln/core/point.hh (revision 1235) +++ mln/core/point.hh (working copy) @@ -35,8 +35,8 @@ # include <mln/core/concept/point.hh> # include <mln/core/internal/coord_impl.hh> -# include <mln/core/h_vec.hh> # include <mln/fun/i2v/all.hh> + # include <mln/metal/vec.hh> # include <mln/core/h_vec.hh> @@ -207,8 +207,6 @@ return coord_; } - - # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln Index: mln/core/h_vec.hh --- mln/core/h_vec.hh (revision 1235) +++ mln/core/h_vec.hh (working copy) @@ -46,7 +46,7 @@ { h_vec() : metal::vec<dim + 1, T>(make::vec<dim + 1, T>(0)) - { + { // FIXME: Move in MLN_INCLUDE_ONLY this->data_[dim] = 1; } @@ -55,6 +55,7 @@ operator metal::vec<dim, T>() const; }; + # ifndef MLN_INCLUDE_ONLY template <unsigned dim, typename T> Index: mln/core/image2d_b.hh --- mln/core/image2d_b.hh (revision 1235) +++ mln/core/image2d_b.hh (working copy) @@ -33,8 +33,8 @@ * \brief Definition of the basic mln::image2d_b class. */ -# include <mln/core/internal/fixme.hh> # include <mln/core/internal/image_primary.hh> +# include <mln/core/internal/fixme.hh> # include <mln/core/box2d.hh> # include <mln/border/thickness.hh> Index: mln/core/trait/all.hh --- mln/core/trait/all.hh (revision 1235) +++ mln/core/trait/all.hh (working copy) @@ -46,11 +46,6 @@ # include <mln/core/trait/is_fast.hh> # include <mln/core/trait/pixter.hh> -# include <mln/core/trait/op_mult.hh> -// FIXME # include <mln/core/trait/op_plus.hh> -# include <mln/core/trait/op_minus.hh> -# include <mln/core/trait/op_uminus.hh> -// FIXME # include <mln/core/trait/promote.hh> #endif // ! MLN_CORE_TRAIT_ALL_HH Index: mln/core/concept/literal.hh --- mln/core/concept/literal.hh (revision 0) +++ mln/core/concept/literal.hh (revision 0) @@ -0,0 +1,91 @@ +// Copyright (C) 2007 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_CORE_CONCEPT_LITERAL_HH +# define MLN_CORE_CONCEPT_LITERAL_HH + +/*! \file mln/core/concept/literal.hh + * \brief Definition of the concept of mln::literal. + */ + +# include <mln/core/concept/object.hh> + + +namespace mln +{ + + // Fwd decl. + template <typename E> struct Literal; + + // Literal category flag type. + template <> + struct Literal<void> + { + typedef Object<void> super; + }; + + + /*! \brief Base class for implementation classes of literals. + * + * \see mln::doc::Literal for a complete documentation of this class + * contents. + */ + template <typename E> + struct Literal : public Object<E> + { + typedef Literal<void> category; + + static const E& the(); + + protected: + Literal(); + }; + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename E> + Literal<E>::Literal() + { + } + + template <typename E> + const E& + Literal<E>::the() + { + static E the_; + return the_; + } + +# endif // ! MLN_INCLUDE_ONLY + + +} // end of namespace mln + + +#endif // ! MLN_CORE_CONCEPT_LITERAL_HH Index: mln/core/concept/object.hh --- mln/core/concept/object.hh (revision 1235) +++ mln/core/concept/object.hh (working copy) @@ -42,6 +42,7 @@ # include <mln/core/internal/fixme.hh> # include <mln/trace/all.hh> # include <mln/metal/is_a.hh> +# include <mln/metal/is.hh> /*! \namespace mln @@ -98,7 +99,7 @@ # include <mln/core/exact.hh> -# include <mln/metal/all.hh> +# include <mln/literal/zero.hh> # include <mln/core/ops.hh> // FIXME: Read FIXME in mln/metal/binary_arith_trait.hh! Index: mln/literal/zero.hh --- mln/literal/zero.hh (revision 0) +++ mln/literal/zero.hh (revision 0) @@ -0,0 +1,77 @@ +// Copyright (C) 2007 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_LITERAL_ZERO_HH +# define MLN_LITERAL_ZERO_HH + +/*! \file mln/literal/zero.hh + * \brief Definition of the literal of mln::zero. + * + * \todo Macro-ification of similar code (when no trivial conversion ops are involved). + */ + +# include <mln/core/concept/literal.hh> +# include <mln/metal/converts_to.hh> + + +namespace mln +{ + + namespace literal + { + + /// Type of literal zero. + struct zero_t : public Literal<zero_t> + { + // FIXME: (for the record) Add "friend class Literal<zero_t>;" and a protected ctor. + + template <typename T> + operator T () const; + }; + + + /// Literal zero. + static zero_t zero = zero_t(); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename T> + zero_t::operator T () const + { + mlc_converts_to(int, T)::check(); + return 0; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::literal + +} // end of namespace mln + + +#endif // ! MLN_LITERAL_ZERO_HH Index: mln/metal/vec.hh --- mln/metal/vec.hh (revision 1235) +++ mln/metal/vec.hh (working copy) @@ -35,6 +35,7 @@ # include <mln/trait/all.hh> # include <mln/value/props.hh> # include <mln/fun/i2v/all.hh> +# include <mln/literal/zero.hh> // FIXME: Document. @@ -132,9 +133,9 @@ typedef T value_type; enum { dim = n }; - vec() - { - } + vec(); + + vec(mln::literal::zero_t); vec(const vec<n, T>& rhs); @@ -313,6 +314,17 @@ # ifndef MLN_INCLUDE_ONLY template <unsigned n, typename T> + vec<n,T>::vec() + { + } + + template <unsigned n, typename T> + vec<n,T>::vec(mln::literal::zero_t) + { + this->set_all( mln::literal::zero ); + } + + template <unsigned n, typename T> vec<n,T>::vec(const vec<n,T>& rhs) : super_() { Index: mln/accu/sum.hh --- mln/accu/sum.hh (revision 1235) +++ mln/accu/sum.hh (working copy) @@ -36,6 +36,7 @@ # include <mln/core/concept/meta_accumulator.hh> # include <mln/value/props.hh> # include <mln/util/pix.hh> +# include <mln/literal/zero.hh> namespace mln @@ -99,7 +100,7 @@ void sum_<V,S>::init() { - s_ = S::zero; // FIXME + s_ = literal::zero; } template <typename V, typename S> Index: mln/trace/exiting.hh --- mln/trace/exiting.hh (revision 1235) +++ mln/trace/exiting.hh (working copy) @@ -34,6 +34,8 @@ */ # include <string> +# include <iostream> + # include <mln/trace/quiet.hh> Index: mln/trace/entering.hh --- mln/trace/entering.hh (revision 1235) +++ mln/trace/entering.hh (working copy) @@ -34,6 +34,8 @@ */ # include <string> +# include <iostream> + # include <mln/trace/quiet.hh>

1 0

milena r1235: Add test for fast labeling
by Guillaume Duhamel 03 Oct '07

03 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-03 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add test for fast labeling. * labeling_level_fast.cc: New test. --- labeling_level_fast.cc | 63 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) Index: trunk/milena/tests/labeling_level_fast.cc =================================================================== --- trunk/milena/tests/labeling_level_fast.cc (revision 0) +++ trunk/milena/tests/labeling_level_fast.cc (revision 1235) @@ -0,0 +1,63 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/labeling_foreground.cc + * + * \brief Test on mln::labeling::foreground. + */ + +#include <mln/core/image2d_b.hh> +#include <mln/core/image1d_b.hh> +#include <mln/core/neighb2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/pw/all.hh> + +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> +#include <mln/labeling/level.hh> +#include <mln/debug/iota.hh> +#include <mln/debug/println.hh> + +int main() +{ + using namespace mln; + using value::int_u8; + + unsigned border = 1; + + image2d_b<value::int_u8> i1(5, 5, border); + debug::iota(i1); + i1[10] = i1[17] = i1[18] = i1[25] = i1[26] = i1[22] = i1[29] = 2; + debug::println(i1); + + unsigned n; + image2d_b<value::int_u8> out(i1.domain(), border); + labeling::level_fast(i1, 2, c4(), out, n); + + std::cout << "n = " << n << std::endl; + debug::println(out); +}

1 0

milena r1234: Add labeling_fast in mln
by Guillaume Duhamel 03 Oct '07

03 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-03 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add labeling_fast in mln. * canvas/labeling.hh: New canvas for labeling fast. * convert/to_window.hh: New function to_upper_window. * labeling/level.hh: Add level_fast. --- canvas/labeling.hh | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++- convert/to_window.hh | 20 ++++++++- labeling/level.hh | 47 ++++++++++++++++++++++ 3 files changed, 171 insertions(+), 3 deletions(-) Index: trunk/milena/mln/convert/to_window.hh =================================================================== --- trunk/milena/mln/convert/to_window.hh (revision 1233) +++ trunk/milena/mln/convert/to_window.hh (revision 1234) @@ -53,6 +53,10 @@ template <typename N> window<mln_dpoint(N)> to_window(const Neighborhood<N>& nbh); + /// Convert a neighborhood \p nbh into an upper window. + template <typename N> + window<mln_dpoint(N)> to_upper_window(const Neighborhood<N>& nbh); + /// Convert a binary image \p ima into a window. template <typename I> window<mln_dpoint(I)> to_window(const Image& ima); @@ -77,8 +81,20 @@ window<D> win; mln_niter(N) n(nbh, P::zero); for_all(n) -// FIXME: pour Guillaume -// if (n < P::zero) + win.insert(n - P::zero); + return win; + } + + template <typename N> + window<mln_dpoint(N)> to_upper_window(const Neighborhood<N>& nbh_) + { + const N& nbh = exact(nbh_); + typedef mln_dpoint(N) D; + typedef mln_point(D) P; + window<D> win; + mln_niter(N) n(nbh, P::zero); + for_all(n) + if (n > P::zero) win.insert(n - P::zero); return win; } Index: trunk/milena/mln/canvas/labeling.hh =================================================================== --- trunk/milena/mln/canvas/labeling.hh (revision 1233) +++ trunk/milena/mln/canvas/labeling.hh (revision 1234) @@ -36,7 +36,7 @@ # include <mln/level/fill.hh> # include <mln/level/sort_points.hh> - +# include <mln/convert/to_window.hh> namespace mln { @@ -154,6 +154,111 @@ // FIXME: Fast version. + template <typename F> + struct labeling_fast + { + F& f; + + typedef typename F::I I; + typedef typename F::N N; + typedef typename F::O O; + + // aux: + mln_ch_value(O, unsigned) parent; + + labeling_fast(F& f) + : f(f), + parent(f.output.domain(), f.input.border()) + { + run(); + } + + void run() + { + + // init + { + f.nlabels = 0; + f.init(); + } + + // first pass + { + mln_bkd_pixter(const I) p(f.input); + // mln_nixter(const I, N) n(p, f.nbh); + + typedef window<mln_dpoint(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)) + { + make_set(p); + for_all(n) + if (f.equiv(n, p)) + do_union(n, p); + else + f.do_no_union(n, p); + } + } + + // second pass + { + mln_fwd_pixter(const I) p(f.input); + for_all(p) if (f.handles(p)) + { + if (is_root(p)) + { + if (f.labels(p)) + { + if (f.nlabels == mln_max(mln_value(O))) + { + f.status = false; + return; + } + f.output[p] = ++f.nlabels; + } + } + else + f.output[p] = f.output[parent[p]]; + } + f.status = true; + } + + } // end of run() + + void make_set(unsigned p) + { + parent[p] = p; + f.init_attr(p); + } + + bool is_root(unsigned p) const + { + return parent[p] == p; + } + + unsigned find_root(unsigned x) + { + if (parent[x] == x) + return x; + else + return parent[x] = find_root(parent[x]); + } + + void do_union(unsigned n, unsigned p) + { + unsigned r = find_root(n); + if (r != p) + { + parent[r] = p; + f.merge_attr(r, p); + } + } + + }; + + } // end of namespace mln::canvas } // end of namespace mln Index: trunk/milena/mln/labeling/level.hh =================================================================== --- trunk/milena/mln/labeling/level.hh (revision 1233) +++ trunk/milena/mln/labeling/level.hh (revision 1234) @@ -34,10 +34,12 @@ * level. */ +# include <mln/core/concept/fast_image.hh> # include <mln/labeling/base.hh> # include <mln/level/fill.hh> + namespace mln { @@ -59,6 +61,9 @@ bool level(const Image& input, const mln_value(I)& val, const Neighborhood<N>& nbh, Image<O>& output, unsigned& nlabels); + template <typename I, typename N, typename O> + bool level_fast(const Fast_Image& input, const mln_value(I)& val, const Neighborhood<N>& nbh, + Fast_Image<O>& output, unsigned& nlabels); # ifndef MLN_INCLUDE_ONLY @@ -108,6 +113,40 @@ // FIXME: Add fast versions. + template <typename I_, typename N_, typename O_> + struct level_fast_t : labeling::impl::base_fast_<I_,N_,O_> + { + typedef mln_point(I_) P; + + // typedef mln_pset(I_) S; + // const S& s; + + void init() { level::fill(this->output, 0); } + bool handles(unsigned p) const { return this->input[p] == val; } + bool equiv(unsigned n, unsigned) const { return this->input[n] == val; } + + const mln_value(I_)& val; + + level_fast_t(const I_& input, const mln_value(I_)& val, const N_& nbh, O_& output) + : labeling::impl::base_fast_<I_,N_,O_>(input, nbh, output), + // s(input.domain()), + val(val) + {} + }; + + + template <typename I, typename N, typename O> + bool level_fast_(const Fast_Image& input, const mln_value(I)& val, const Neighborhood<N>& nbh, + Fast_Image<O>& output, unsigned& nlabels) + { + typedef level_fast_t<I,N,O> F; + F f(exact(input), val, exact(nbh), exact(output)); + canvas::labeling_fast<F> run(f); + nlabels = f.nlabels; + return f.status; + } + + } // end of namespace mln::labeling::impl @@ -121,6 +160,14 @@ return impl::level_(exact(input), val, nbh, output, nlabels); } + template <typename I, typename N, typename O> + bool level_fast(const Fast_Image& input, const mln_value(I)& val, const Neighborhood<N>& nbh, + Fast_Image<O>& output, unsigned& nlabels) + { + mln_precondition(exact(output).domain() == exact(input).domain()); + return impl::level_fast_(exact(input), val, nbh, output, nlabels); + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::labeling

1 0

milena r1233: Add test for voronoi algorithm
by Guillaume Duhamel 03 Oct '07

03 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-03 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add test for voronoi algorithm. * labeling_algo.cc: New. --- labeling_algo.cc | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) Index: trunk/milena/tests/labeling_algo.cc =================================================================== --- trunk/milena/tests/labeling_algo.cc (revision 0) +++ trunk/milena/tests/labeling_algo.cc (revision 1233) @@ -0,0 +1,82 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/labeling_foreground.cc + * + * \brief Test on mln::labeling::foreground. + */ + +# include <mln/core/image2d_b.hh> +# include <mln/core/sub_image.hh> +# include <mln/core/neighb2d.hh> +# include <mln/value/int_u8.hh> +# include <mln/level/fill.hh> +# include <mln/level/stretch.hh> +# include <mln/border/fill.hh> +# include <mln/io/pbm/load.hh> +# include <mln/io/pgm/save.hh> +# include <mln/labeling/foreground.hh> +# include <mln/debug/println.hh> +# include <mln/draw/mesh.hh> +# include <mln/geom/seeds2tiling.hh> +# include <mln/make/voronoi.hh> + +int main() +{ + using namespace mln; + using value::int_u8; + + image2d_b<bool> in = io::pbm::load("../img/toto.pbm"); + + image2d_b<int_u8> lab(in.domain()); + image2d_b<int_u8> inte(in.domain()); + image2d_b<int_u8> out(in.domain()); + + unsigned n; + labeling::foreground(in, c8(), lab, n); + std::cout << "number of labels = " << n << std::endl; + std::vector<int_u8> vec; + + image2d_b<int> input(in.domain()); + level::fill(input, lab); + lab(make::point2d (0,0)) = 0; + + inte = geom::seeds2tiling(lab, c4 ()); + border::fill (inte, 0); + + image2d_b<int_u8> inte2(inte.domain()); + + level::stretch (inte, inte2); + + io::pgm::save(inte2, "inte.pgm"); + + mesh_p<point2d> m = make::voronoi(inte, lab, c4()); + std::cout << "OK : generate inte.pgm and out.pgm" << std::endl; + draw::mesh (out, m, 255, 128); + + io::pgm::save(out, "out.pgm"); +}

1 0

milena r1232: Add voronoi algorithm
by Guillaume Duhamel 03 Oct '07

03 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-03 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add voronoi algorithm. * voronoi.hh: New. --- voronoi.hh | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) Index: trunk/milena/mln/make/voronoi.hh =================================================================== --- trunk/milena/mln/make/voronoi.hh (revision 0) +++ trunk/milena/mln/make/voronoi.hh (revision 1232) @@ -0,0 +1,129 @@ +// Copyright (C) 2007 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_MAKE_VORONOI_HH +# define MLN_MAKE_VORONOI_HH + +/*! \file mln/make/voronoi.hh + * + * \brief Routine to construct an mln::make::voronoi. + */ + +# include <vector> +# include <map> + +# include <mln/core/mesh_p.hh> +# include <mln/accu/mean.hh> +# include <mln/estim/min_max.hh> + +namespace mln +{ + + namespace make + { + + template <typename I, typename N> + mesh_p<mln_psite(I)> + voronoi (Image& ima_, + Image& orig_, + const Neighborhood<N>& nbh); + +# ifndef MLN_INCLUDE_ONLY + + template <typename I, typename N> + mesh_p<mln_psite(I)> + voronoi (Image& ima_, + Image& orig_, + const Neighborhood<N>& nbh) + { + typedef metal::vec<2,float> X; + typedef mln_value(I) V; + typedef mln_psite(I) P; + + I& ima = exact(ima_); + I& orig = exact(orig_); + util::graph<void> gr; + V min, max; + estim::min_max (ima, min, max); + unsigned nb = max - min + 1; + std::vector v(nb); + std::vector< accu::mean_< X > > tab_mean (nb); + std::map<std::pair<V, V>, bool> m; + + /// Take original point. + { + mln_piter(I) p(orig.domain()); + + for_all(p) + { + if (orig(p) != 0) + { + X x = mln_point(I)(p); + tab_mean[orig(p) - min].take(x); + } + } + } + + /// Compute links between link. + { + mln_piter(I) p(ima.domain()); + mln_niter(N) n(nbh, p); + + for_all(p) + { + for_all (n) if (ima.has(n)) + if (ima(p) != ima(n)) + m[std::pair<V, V>(ima(p) - min, ima(n) - min)] = true; + } + } + + /// Compute the center of label. + for (unsigned i = 0; i < nb; ++i) + { + gr.add_node (); + + /// FIXME + v[i] = make::point2d ((unsigned)tab_mean[i].to_result ()[0], + (unsigned)tab_mean[i].to_result ()[1]); + } + + typename std::map<std::pair<V, V>, bool>::const_iterator it = m.begin (); + for (; it != m.end (); ++it) + gr.add_edge((*it).first.first, (*it).first.second); + + mesh_p res(gr, v); + return res; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::make + +} // end of namespace mln + + +#endif // ! MLN_MAKE_VORONOI_HH

1 0

milena r1231: Add seeds2tiling.hh
by Guillaume Duhamel 03 Oct '07

03 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-03 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add seeds2tiling.hh. * seeds2tiling.hh: New. --- seeds2tiling.hh | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) Index: trunk/milena/mln/geom/seeds2tiling.hh =================================================================== --- trunk/milena/mln/geom/seeds2tiling.hh (revision 0) +++ trunk/milena/mln/geom/seeds2tiling.hh (revision 1231) @@ -0,0 +1,126 @@ +// Copyright (C) 2007 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_GEOM_SEEDS2TILING_HH +# define MLN_GEOM_SEEDS2TILING_HH + +/*! \file mln/geom/seeds2tiling.hh + * + * \brief . + */ + +# include <map> + +# include <mln/core/queue_p.hh> +# include <mln/core/clone.hh> +# include <mln/accu/mean.hh> +# include <mln/estim/min_max.hh> +# include <mln/metal/vec.hh> + + +namespace mln +{ + namespace geom + { + + template <typename I, typename N> + I seeds2tiling (Image& ima_, const Neighborhood<N>& nbh); + +# ifndef MLN_INCLUDE_ONLY + + + template <typename I, typename N> + I + seeds2tiling (Image& ima_, + const Neighborhood<N>& nbh) + { + I& ima = exact(ima_); + I out = clone(ima_); + queue_p<mln_psite(I)> q; + + // Init. + { + mln_piter(I) p(ima.domain()); + mln_niter(N) n(nbh, p); + + for_all(p) if (ima(p) == 0) + for_all(n) if (ima(n) != 0) + { + q.push(p); + break; + } + } + +// // Body. +// { +// while (! q.empty()) +// { +// mln_psite(I) p = q.front(); +// q.pop(); +// mln_invariant(ima(p) == 0); + +// mln_niter(N) n(nbh, p); +// for_all(n) if (ima.has(n)) +// if (out(n) != 0) +// out(p) = out(n); +// else +// if (! q.has(n)) +// q.push(n); +// } +// } + + // Body: alternative version. + { + while (! q.empty()) + { + mln_psite(I) p = q.front(); + q.pop(); + if (out(p) != 0) // p has already been processed so ignore + continue; + + mln_niter(N) n(nbh, p); + for_all(n) if (ima.has(n)) + if (out(n) != 0) + out(p) = out(n); + else + q.push_force(n); // n may already be in the queue, + // yet we then queue again this psite + } + } + + return out; + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::geom + +} // end of namespace mln + + +#endif // ! MLN_GEOM_SEEDS2TILING_HH

1 0

milena r1230: Add color sub_image in sandbox
by Guillaume Duhamel 03 Oct '07

03 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-03 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add color sub_image in sandbox. * color_sub.cc: New. Update * labeling_algo.cc, * labeling_level_fast.cc: Update. --- color_sub.cc | 83 +++++++++++++++++++++++++++++++++++++++++++++++++ labeling_algo.cc | 2 - labeling_level_fast.cc | 2 - 3 files changed, 85 insertions(+), 2 deletions(-) Index: trunk/milena/sandbox/duhamel/labeling_algo.cc =================================================================== --- trunk/milena/sandbox/duhamel/labeling_algo.cc (revision 1229) +++ trunk/milena/sandbox/duhamel/labeling_algo.cc (revision 1230) @@ -52,7 +52,7 @@ using value::int_u8; // image2d_b<bool> in = io::pbm::load("../../img/toto.pbm"); - image2d_b<bool> in = io::pbm::load("../../img/toto.pbm"); + image2d_b<bool> in = io::pbm::load("test.pbm"); image2d_b<int_u8> lab(in.domain()); image2d_b<int_u8> inte(in.domain()); Index: trunk/milena/sandbox/duhamel/color_sub.cc =================================================================== --- trunk/milena/sandbox/duhamel/color_sub.cc (revision 0) +++ trunk/milena/sandbox/duhamel/color_sub.cc (revision 1230) @@ -0,0 +1,83 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/sub_image.cc + * + * \brief Tests on mln::sub_image. + */ + +#include <mln/core/image2d_b.hh> +#include <mln/core/sub_image.hh> +#include <mln/core/inplace.hh> +#include <mln/value/int_u8.hh> +#include <mln/value/rgb8.hh> +#include <mln/level/fill.hh> +#include <mln/debug/println.hh> + +#include <mln/core/image2d_b.hh> +#include <mln/core/point2d.hh> +#include <mln/debug/println.hh> +#include <mln/util/graph.hh> +#include <mln/io/ppm/save.hh> +#include <mln/fun/p2b/chess.hh> + +#include <mln/core/image_if_value.hh> +#include <mln/debug/iota.hh> + +namespace mln +{ + template <typename I, typename J> + void + color (Image& ima_, Image<J>& out_) + { + I& ima = exact (ima_); + J& out = exact (out_); + + level::fill (out, value::rgb8(255, 0, 0)); + + { + mln_piter(I) p (ima.domain ()); + for_all (p) + { + out(p) = value::rgb8(ima(p)); + } + } + } +} + +int main() +{ + using namespace mln; + + image2d_b<value::int_u8> ima(3,3); + debug::iota(ima); + image2d_b<value::rgb8> out(ima.domain ().bbox ()); + std::cout << ima.domain() << std::endl; + color(inplace (ima | 6), out); + io::ppm::save(out, "out.ppm"); + debug::println(out); +} Index: trunk/milena/sandbox/duhamel/labeling_level_fast.cc =================================================================== --- trunk/milena/sandbox/duhamel/labeling_level_fast.cc (revision 1229) +++ trunk/milena/sandbox/duhamel/labeling_level_fast.cc (revision 1230) @@ -38,7 +38,7 @@ #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> -#include "labeling_level.hh" +#include <mln/labeling/level.hh> #include <mln/debug/iota.hh> #include <mln/debug/println_with_border.hh>

1 0