- Olena-patches

milena r1375: Update fllt
by Simon Nivault 22 Oct '07

22 Oct '07

URL: https://svn.lrde.org/svn/oln/trunk/milena ChangeLog: 2007-10-22 Simon Nivault <simon.nivault(a)lrde.epita.fr> Update fllt. * sandbox/garrigues/fllt.hh: Update. --- fllt.hh | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) Index: trunk/milena/sandbox/garrigues/fllt.hh =================================================================== --- trunk/milena/sandbox/garrigues/fllt.hh (revision 1374) +++ trunk/milena/sandbox/garrigues/fllt.hh (revision 1375) @@ -54,6 +54,7 @@ # include <mln/set/uni.hh> # include <mln/set/diff.hh> +# include <mln/set/inter.hh> # include <mln/labeling/regional_minima.hh> # include <mln/labeling/level.hh> @@ -137,7 +138,7 @@ template <typename V, typename P> - void step3 (const image2d<V>& ima, + void step3 (const image2d<V>& u, image2d<bool>& tagged, set_p& A, set_p& R, @@ -147,27 +148,26 @@ std::cout << "entering step 3" << std::endl; // N <- N union {x neighbor of a pixel in a\R} mln_piter(set_p) qa(A); - for_all(qa) { mln_niter(neighb2d) n(c4(), qa); for_all (n) - if (ima.has(n) && !R.has (n)) + if (!R.has (n)) N.insert (n); } std::cout << "A :" << std::endl; if (A.npoints()) - debug::println(ima | A); + debug::println(u | A); std::cout << "N :" << std::endl; if (N.npoints()) - debug::println(ima | N); + debug::println(u | N); std::cout << "R :" << std::endl; if (R.npoints()) - debug::println(ima | R); + debug::println(u | R); // gn <- min u(x) x belongs to N. - gn = level::compute<accu::min>(ima | N); + gn = level::compute<accu::min>(u | set::inter(N, u.domain())); std::cout << std::endl << "gN = " << gn << std::endl; // R <- R union A @@ -193,8 +193,8 @@ { std::cout << "entering step 4_1" << std::endl; // Count the number of conected components of the border of R. - image2d<int> tmp(u.domain()); - image2d<bool> border_ima(u.domain()); + image2d<int> tmp(u.domain().to_larger(1)); + image2d<bool> border_ima(u.domain().to_larger(1)); level::fill(border_ima, false); level::fill(inplace(border_ima | N), true); unsigned n; @@ -218,6 +218,7 @@ g = gn; // A <- {x belongs to N / u(x) == g} + A.clear(); A = set::uni(A, N | pw::value(u) == pw::cst(g)); // N <- N\{x belongs to N / u(x) == g} N = set::diff(N, N | pw::value(u) == pw::cst(g)); @@ -247,6 +248,13 @@ // N <- N\{x belongs to N / u(x) == g} N = set::diff(N, N | pw::value(u) == pw::cst(g)); + std::cout << "A :" << std::endl; + if (A.npoints()) + debug::println(u | A); + std::cout << "N :" << std::endl; + if (N.npoints()) + debug::println(u | N); + std::cout << "exiting step 4_2" << std::endl; } @@ -316,7 +324,8 @@ step2(A, R, N, x0); while (1) { - step3(ima, tagged, A, R, N, gn); + std::cout << "g = " << g << std::endl; + step3(u, tagged, A, R, N, gn); /// step4. if (g < gn) {

1 0

milena r1374: Update fllt
by Matthieu Garrigues 22 Oct '07

22 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-22 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Update fllt. * sandbox/garrigues/fllt.hh: Update. --- fllt.hh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Index: trunk/milena/sandbox/garrigues/fllt.hh =================================================================== --- trunk/milena/sandbox/garrigues/fllt.hh (revision 1373) +++ trunk/milena/sandbox/garrigues/fllt.hh (revision 1374) @@ -152,7 +152,7 @@ { mln_niter(neighb2d) n(c4(), qa); for_all (n) - if (!R.has (n)) + if (ima.has(n) && !R.has (n)) N.insert (n); } @@ -253,9 +253,9 @@ /// IF g > gn. template <typename V, typename P> void step4_3 (image2d<V>& u, - image2d<bool>& tagged, - set_p& R, - V& g) + const image2d<bool>& tagged, + const set_p& R, + const V& g) { std::cout << "entering step 4_3" << std::endl;

1 0

milena r1373: Update fllt and add conversion and set_p routines
by Simon Nivault 22 Oct '07

22 Oct '07

URL: https://svn.lrde.org/svn/oln/trunk/milena ChangeLog: 2007-10-22 Simon Nivault <simon.nivault(a)lrde.epita.fr> Update fllt and add conversion and set_p routines. * mln/convert/to_set_p.hh: New. * mln/convert/to_std_set.hh: Update. * mln/core/concept/point_set.hh: Add todo. * mln/set/diff.hh, * mln/set/inter.hh, * mln/set/sym_diff.hh: Work for mln::Point_Set. * mln/set/union.hh: Like above and rename as... * mln/set/uni.hh: ...this. * sandbox/garrigues/fllt.hh: Update. --- mln/convert/to_set_p.hh | 129 ++++++++++++++++++++++++++++++++++++++++++ mln/convert/to_std_set.hh | 13 ++++ mln/core/concept/point_set.hh | 3 mln/set/diff.hh | 25 ++++++++ mln/set/inter.hh | 24 +++++++ mln/set/sym_diff.hh | 21 ++++++ mln/set/uni.hh | 107 ++++++++++++++++++++++++++++++++++ sandbox/garrigues/fllt.hh | 41 +++++++------ 8 files changed, 345 insertions(+), 18 deletions(-) Index: trunk/milena/mln/core/concept/point_set.hh =================================================================== --- trunk/milena/mln/core/concept/point_set.hh (revision 1372) +++ trunk/milena/mln/core/concept/point_set.hh (revision 1373) @@ -31,6 +31,9 @@ /*! \file mln/core/concept/point_set.hh * * \brief Definition of the concept of mln::Point_Set. + * + * \todo Think about adding an 'insert' method (not os easy because of + * pset_if...) */ # include <mln/core/concept/point.hh> Index: trunk/milena/mln/convert/to_std_set.hh =================================================================== --- trunk/milena/mln/convert/to_std_set.hh (revision 1372) +++ trunk/milena/mln/convert/to_std_set.hh (revision 1373) @@ -50,6 +50,9 @@ template <typename W> std::set<mln_dpoint(W)> to_std_set(const Window<W>& win); + /// Convert a point set \p pset into a std::set of points. + template <typename W> + std::set<mln_point(W)> to_std_set(const Point_Set<W>& setp); # ifndef MLN_INCLUDE_ONLY @@ -65,6 +68,16 @@ return s; } + template <typename W> + std::set<mln_point(W)> to_std_set(const Point_Set<W>& setp) + { + typedef mln_point(W) P; + std::set s; + mln_piter(W) p(exact(setp)); + for_all(p) + s.insert(p); + return s; + } # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::convert Index: trunk/milena/mln/convert/to_set_p.hh =================================================================== --- trunk/milena/mln/convert/to_set_p.hh (revision 0) +++ trunk/milena/mln/convert/to_set_p.hh (revision 1373) @@ -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_CONVERT_TO_SET_P_HH +# define MLN_CONVERT_TO_SET_P_HH + +/*! \file mln/convert/to_set_p.hh + * + * \brief Conversions to mln::set_p. + */ + +# include <set> + +# include <mln/core/concept/dpoint.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/core/set_p.hh> +# include <mln/pw/image.hh> +# include <mln/pw/cst.hh> +# include <mln/metal/is_a.hh> + + +namespace mln +{ + + namespace convert + { + + /// Convert a neighborhood \p nbh into a point set. + template <typename N> + set_p<mln_point(N)> to_window(const Neighborhood<N>& nbh); + + /// Convert a binary image \p ima into a point set. + template <typename I> + set_p<mln_point(I)> to_set_p(const Image& ima); + + /// Convert a Window \p win into a point set. + template <typename P> + set_p to_set_p(const Window<mln_dpoint(P)> win); + + /// Convert an std::set \p s of points into a point set. + template <typename D> + set_p<D> to_set_p(const std::set<D>& s); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename N> + set_p<mln_point(N)> to_set_p(const Neighborhood<N>& nbh_) + { + const N& nbh = exact(nbh_); + typedef mln_dpoint(N) D; + typedef mln_point(N) P; + set_p pset; + mln_niter(N) n(nbh, P::origin); + for_all(n) + pset.insert(n - P::origin); + return pset; + } + + template <typename I> + set_p<mln_point(I)> to_set_p(const Image& ima_) + { + const I& ima = exact(ima_); + mln_precondition(ima.has_data()); + // FIXME: Check that ima is binary! + typedef mln_dpoint(I) D; + typedef mln_point(I) P; + set_p pset; + mln_piter(I) p(ima.domain()); + for_all(p) + if (ima(p)) + pset.insert(p - P::origin); + return pset; + } + + template <typename P> + set_p to_set_p(const Window<mln_dpoint(P)>& win) + { + typedef mln_dpoint(P) D; + set_p pset; + mln_qiter(D) q(exact(win), P::origin); + for_all(q) + pset.insert(q - P::origin); + return pset; + } + + template <typename P> + set_p to_set_p(const std::set& s) + { + mln::metal::is_a<P, Point>::check(); + set_p pset; + for (typename std::set::const_iterator i = s.begin(); + i != s.end(); ++i) + pset.insert(*i); + return pset; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::convert + +} // end of namespace mln + + +#endif // ! MLN_CONVERT_TO_SET_P_HH Index: trunk/milena/mln/set/union.hh (deleted) =================================================================== Index: trunk/milena/mln/set/inter.hh =================================================================== --- trunk/milena/mln/set/inter.hh (revision 1372) +++ trunk/milena/mln/set/inter.hh (revision 1373) @@ -36,6 +36,7 @@ # include <mln/convert/to_std_set.hh> # include <mln/convert/to_window.hh> +# include <mln/convert/to_set_p.hh> # include <mln/metal/equal.hh> @@ -54,6 +55,13 @@ window<mln_dpoint(Wl)> inter(const Window<Wl>& lhs, const Window<Wr>& rhs); + /*! \brief Intersection between a couple of point sets. + * + * \relates mln::Point_Set + */ + template <typename Wl, typename Wr> + set_p<mln_point(Wl)> + inter(const Point_Set<Wl>& lhs, const Point_Set<Wr>& rhs); # ifndef MLN_INCLUDE_ONLY @@ -73,6 +81,22 @@ return convert::to_window(s); } + template <typename Wl, typename Wr> + set_p<mln_point(Wl)> + inter(const Point_Set<Wl>& lhs, const Point_Set<Wr>& rhs) + { + mln::metal::equal<mln_point(Wl), mln_point(Wr)>::check(); + typedef mln_point(Wl) P; + std::set + sl = convert::to_std_set(lhs), + sr = convert::to_std_set(rhs), + s; + std::set_intersection(sl.begin(), sl.end(), + sr.begin(), sr.end(), + std::inserter(s, s.begin())); + return convert::to_set_p(s); + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::set Index: trunk/milena/mln/set/diff.hh =================================================================== --- trunk/milena/mln/set/diff.hh (revision 1372) +++ trunk/milena/mln/set/diff.hh (revision 1373) @@ -32,10 +32,13 @@ * * \brief Set theoretic difference (non-symmetrical) of a couple of * sets. + * + * \todo Add a diff(Point_Set& in_place, Function_p2b). */ # include <mln/convert/to_std_set.hh> # include <mln/convert/to_window.hh> +# include <mln/convert/to_set_p.hh> # include <mln/metal/equal.hh> @@ -51,6 +54,11 @@ window<mln_dpoint(Wl)> diff(const Window<Wl>& lhs, const Window<Wr>& rhs); + /// Set theoretic difference of \p lhs and \p rhs. + template <typename Wl, typename Wr> + set_p<mln_point(Wl)> + diff(const Point_Set<Wl>& lhs, const Point_Set<Wr>& rhs); + # ifndef MLN_INCLUDE_ONLY @@ -70,6 +78,23 @@ return convert::to_window(s); } + /// Set theoretic difference of \p lhs and \p rhs. + template <typename Wl, typename Wr> + set_p<mln_point(Wl)> + diff(const Point_Set<Wl>& lhs, const Point_Set<Wr>& rhs) + { + mln::metal::equal<mln_point(Wl), mln_point(Wr)>::check(); + typedef mln_point(Wl) P; + std::set + sl = convert::to_std_set(lhs), + sr = convert::to_std_set(rhs), + s; + std::set_difference(sl.begin(), sl.end(), + sr.begin(), sr.end(), + std::inserter(s, s.begin())); + return convert::to_set_p(s); + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::set Index: trunk/milena/mln/set/uni.hh =================================================================== --- trunk/milena/mln/set/uni.hh (revision 0) +++ trunk/milena/mln/set/uni.hh (revision 1373) @@ -0,0 +1,107 @@ +// 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_SET_UNI_HH +# define MLN_SET_UNI_HH + +/*! \file mln/set/uni.hh + * + * \brief Several routines to compute the union of a couple of sets. + */ + +# include <mln/convert/to_std_set.hh> +# include <mln/convert/to_window.hh> +# include <mln/convert/to_set_p.hh> +# include <mln/metal/equal.hh> + + + +namespace mln +{ + + namespace set + { + + /*! \brief Union of a couple of windows. + * + * \relates mln::Window + */ + template <typename Wl, typename Wr> + window<mln_dpoint(Wl)> + uni(const Window<Wl>& lhs, const Window<Wr>& rhs); + + /*! \brief Union of a couple of point sets. + * + * \relates mln::Point_Set + */ + template <typename Wl, typename Wr> + set_p<mln_point(Wl)> + uni(const Point_Set<Wl>& lhs, const Point_Set<Wr>& rhs); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename Wl, typename Wr> + window<mln_dpoint(Wl)> + uni(const Window<Wl>& lhs, const Window<Wr>& rhs) + { + mln::metal::equal<mln_dpoint(Wl), mln_dpoint(Wr)>::check(); + typedef mln_dpoint(Wl) D; + std::set<D> + sl = convert::to_std_set(lhs), + sr = convert::to_std_set(rhs), + s; + std::set_union(sl.begin(), sl.end(), + sr.begin(), sr.end(), + std::inserter(s, s.begin())); + return convert::to_window(s); + } + + template <typename Wl, typename Wr> + set_p<mln_point(Wl)> + uni(const Point_Set<Wl>& lhs, const Point_Set<Wr>& rhs) + { + mln::metal::equal<mln_point(Wl), mln_point(Wr)>::check(); + typedef mln_point(Wl) P; + std::set + sl = convert::to_std_set(lhs), + sr = convert::to_std_set(rhs), + s; + std::set_union(sl.begin(), sl.end(), + sr.begin(), sr.end(), + std::inserter(s, s.begin())); + return convert::to_set_p(s); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::set + +} // end of namespace mln + + +#endif // ! MLN_SET_UNI_HH Index: trunk/milena/mln/set/sym_diff.hh =================================================================== --- trunk/milena/mln/set/sym_diff.hh (revision 1372) +++ trunk/milena/mln/set/sym_diff.hh (revision 1373) @@ -35,6 +35,7 @@ # include <mln/convert/to_std_set.hh> # include <mln/convert/to_window.hh> +# include <mln/convert/to_set_p.hh> # include <mln/metal/equal.hh> @@ -50,6 +51,10 @@ window<mln_dpoint(Wl)> sym_diff(const Window<Wl>& lhs, const Window<Wr>& rhs); + /// Set theoretic symmetrical difference of \p lhs and \p rhs. + template <typename Wl, typename Wr> + set_p<mln_point(Wl)> + sym_diff(const Point_Set<Wl>& lhs, const Point_Set<Wr>& rhs); # ifndef MLN_INCLUDE_ONLY @@ -69,6 +74,22 @@ return convert::to_window(s); } + template <typename Wl, typename Wr> + set_p<mln_point(Wl)> + sym_diff(const Point_Set<Wl>& lhs, const Point_Set<Wr>& rhs) + { + mln::metal::equal<mln_point(Wl), mln_point(Wr)>::check(); + typedef mln_point(Wl) P; + std::set + sl = convert::to_std_set(lhs), + sr = convert::to_std_set(rhs), + s; + std::set_symmetric_difference(sl.begin(), sl.end(), + sr.begin(), sr.end(), + std::inserter(s, s.begin())); + return convert::to_set_p(s); + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::set Index: trunk/milena/sandbox/garrigues/fllt.hh =================================================================== --- trunk/milena/sandbox/garrigues/fllt.hh (revision 1372) +++ trunk/milena/sandbox/garrigues/fllt.hh (revision 1373) @@ -52,6 +52,9 @@ # include <mln/level/fill.hh> # include <mln/accu/min.hh> +# include <mln/set/uni.hh> +# include <mln/set/diff.hh> + # include <mln/labeling/regional_minima.hh> # include <mln/labeling/level.hh> @@ -153,8 +156,15 @@ N.insert (n); } + std::cout << "A :" << std::endl; + if (A.npoints()) + debug::println(ima | A); std::cout << "N :" << std::endl; + if (N.npoints()) debug::println(ima | N); + std::cout << "R :" << std::endl; + if (R.npoints()) + debug::println(ima | R); // gn <- min u(x) x belongs to N. gn = level::compute<accu::min>(ima | N); @@ -208,9 +218,16 @@ g = gn; // A <- {x belongs to N / u(x) == g} - A.clear(); -// A += N | (pw::value(u) == pw::cst(g)); + A = set::uni(A, N | pw::value(u) == pw::cst(g)); // N <- N\{x belongs to N / u(x) == g} + N = set::diff(N, N | pw::value(u) == pw::cst(g)); + + std::cout << "A :" << std::endl; + if (A.npoints()) + debug::println(u | A); + std::cout << "N :" << std::endl; + if (N.npoints()) + debug::println(u | N); std::cout << "exiting step 4_1" << std::endl; } @@ -218,7 +235,7 @@ /// IF g == gn. template <typename V, typename P> - void step4_2 (const image2d<V>& ima, + void step4_2 (const image2d<V>& u, set_p& A, set_p& N, V& g) @@ -226,21 +243,9 @@ std::cout << "entering step 4_2" << std::endl; // A <- {x belongs to N / u(x) == g} + A = set::uni(A, N | pw::value(u) == pw::cst(g)); // N <- N\{x belongs to N / u(x) == g} - - set_p N_tmp (N); - - A.clear(); - N.clear(); - mln_piter(set_p) p(N_tmp); - for_all(p) - { - if (ima (p) == g) - { - A.insert(p); - N.insert(p); - } - } + N = set::diff(N, N | pw::value(u) == pw::cst(g)); std::cout << "exiting step 4_2" << std::endl; } @@ -323,7 +328,7 @@ if (g == gn) { - step4_2(ima, A, N, g); + step4_2(u, A, N, g); // GO TO 3) continue; }

1 0

milena r1372: Try to add remove to set_of, Update fllt
by Matthieu Garrigues 22 Oct '07

22 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-22 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Try to add remove to set_of, Update fllt. * mln/core/internal/set_of.hh: (set_of::remove) New. * mln/core/set_p.hh: (set_p::remove) New. * sandbox/garrigues/fllt.hh: Update. --- mln/core/internal/set_of.hh | 23 +++++++++++++++++++++++ mln/core/set_p.hh | 16 ++++++++++++++++ sandbox/garrigues/fllt.hh | 23 ++++++++++++++++------- 3 files changed, 55 insertions(+), 7 deletions(-) Index: trunk/milena/mln/core/internal/set_of.hh =================================================================== --- trunk/milena/mln/core/internal/set_of.hh (revision 1371) +++ trunk/milena/mln/core/internal/set_of.hh (revision 1372) @@ -36,6 +36,7 @@ # include <vector> # include <set> # include <iterator> +# include <algorithm> # include <mln/core/internal/force_exact.hh> @@ -79,6 +80,17 @@ set_of_<E>& insert(const E& elt); + /*! \brief Remove an element \p elt into the set. + * + * \param[in] elt The element to be inserted. + * + * If \p elt is already in the set, this method is a no-op. + * + * \return The set itself after suppression. + */ + set_of_<E>& remove(const E& elt); + + /*! \brief Return the i-th element of the set. * * \param[in] i Index of the element to retrieve. @@ -193,6 +205,17 @@ } template <typename E> + set_of_<E>& + set_of_<E>::remove(const E& elt) + { + // FIXME : doesn't compile + std::remove(s_.begin(), s_.end(), elt); + if (needs_update_ == false) + needs_update_ = true; + return internal::force_exact< set_of_<E> >(*this); + } + + template <typename E> const E& set_of_<E>::element(unsigned i) const { Index: trunk/milena/mln/core/set_p.hh =================================================================== --- trunk/milena/mln/core/set_p.hh (revision 1371) +++ trunk/milena/mln/core/set_p.hh (revision 1372) @@ -78,6 +78,10 @@ /// Insert a point \p p. set_p& insert(const P& p); + // FIXME : doesn't compile + // /// Remove a point \p p. + // set_p& remove(P& p); + /// Return the \p i-th point. const P& operator[](unsigned i) const; @@ -124,6 +128,18 @@ return *this; } + + // FIXME : finish it. + // template <typename P> + // set_p& + // set_p::remove(P& p) + // { + // this->super_::remove(p); + // // FIXME: need to rebuild bb_ ? + // //bb_.untake(p); + // return *this; + // } + template <typename P> const P& set_p::operator[](unsigned i) const Index: trunk/milena/sandbox/garrigues/fllt.hh =================================================================== --- trunk/milena/sandbox/garrigues/fllt.hh (revision 1371) +++ trunk/milena/sandbox/garrigues/fllt.hh (revision 1372) @@ -26,8 +26,8 @@ // Public License. -#ifndef MLN_LEVEL_MEDIAN_HH -# define MLN_LEVEL_MEDIAN_HH +#ifndef MLN_FIXME_FLLT_HH +# define MLN_FIXME_FLLT_HH /*! \file fllt.hh * @@ -202,7 +202,7 @@ // follow each border to find which is the exterior border // and which are the holes. Keep one pixel of each holes. -// Remove from N border of holes. +// Remove from N border of holes???. // Recompute gn <- min u(x) x belongs to A } @@ -223,6 +223,7 @@ set_p& N, V& g) { + std::cout << "entering step 4_2" << std::endl; // A <- {x belongs to N / u(x) == g} // N <- N\{x belongs to N / u(x) == g} @@ -240,14 +241,19 @@ N.insert(p); } } + + std::cout << "exiting step 4_2" << std::endl; } /// IF g > gn. template <typename V, typename P> void step4_3 (image2d<V>& u, + image2d<bool>& tagged, set_p& R, V& g) { + std::cout << "entering step 4_3" << std::endl; + // set the gray-level of the pixels of R to g. mln_piter(set_p) p(R); for_all(p) @@ -255,6 +261,9 @@ mln_assertion (tagged(p)); u (p) = g; } + + std::cout << "exiting step 4_3" << std::endl; + } @@ -288,7 +297,8 @@ /// Algorithm. { - mln_piter(I_IF) p((min_locals | (pw::value(min_locals) > pw::cst(0))).domain()); + I_IF min_locals_list(min_locals | (pw::value(min_locals) > pw::cst(0))); + mln_piter(I_IF) p(min_locals_list.domain()); for_all(p) { if (tagged(p)) @@ -321,8 +331,7 @@ if (g > gn) { - /// FIXME ima -> u - // step4_3(u, R, g); + step4_3(u, tagged, R, g); // GO TO 1) break; } @@ -335,4 +344,4 @@ -#endif // ! MLN_LEVEL_MEDIAN_HH +#endif // ! MLN_FIXME_FLLT_HH

1 0

milena r1371: Update of abr
by Guillaume Duhamel 22 Oct '07

22 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-22 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update of abr. * mln/util/abr.hh: Update with better coding style. * tests/abr.cc: Add assertion in this test. Sandbox. * sandbox/duhamel/abr.hh: Update. --- mln/util/abr.hh | 72 ++++++++++++++----------------------------------- sandbox/duhamel/abr.hh | 44 ++++++++++++++--------------- tests/abr.cc | 21 ++++++++------ 3 files changed, 56 insertions(+), 81 deletions(-) Index: trunk/milena/tests/abr.cc =================================================================== --- trunk/milena/tests/abr.cc (revision 1370) +++ trunk/milena/tests/abr.cc (revision 1371) @@ -33,22 +33,27 @@ */ #include <mln/util/abr.hh> +#include <mln/core/contract.hh> int main (void) { using namespace mln; + unsigned elt1 = 1; unsigned elt2 = 2; unsigned elt3 = 3; unsigned elt4 = 4; unsigned elt5 = 5; - util::s_abr<unsigned> abr (elt1); - abr.add_son (elt2); - abr.add_son (elt3); - abr.print (); - util::s_abr<unsigned>* abr2 = abr.search (elt2); - abr2->add_son (elt4); - abr2->add_son (elt5); - abr.print (); + util::abr<unsigned> abr(elt1); + abr.add_child(elt2); + abr.add_child(elt3); + util::abr<unsigned>* abr2 = abr.search(elt2); + mln_assertion(abr2); + abr2->add_child(elt4); + abr2->add_child(elt5); + util::abr<unsigned>* abr3 = abr.search(elt4); + mln_assertion(abr3); + abr3 = abr2->search(elt1); + mln_assertion(!abr3); } Index: trunk/milena/mln/util/abr.hh =================================================================== --- trunk/milena/mln/util/abr.hh (revision 1370) +++ trunk/milena/mln/util/abr.hh (revision 1371) @@ -29,17 +29,14 @@ # define MLN_UTIL_ABR_HH # include <vector> -# include <iostream> /*! * \file mln/util/abr.hh * * \brief Definition of a generic general tree. * - * */ - namespace mln { @@ -47,76 +44,52 @@ { template <typename T> - struct s_abr + struct abr { - s_abr (); - s_abr (T& elt); + abr(); + abr(T& elt); - void add_son (T& elt); + void add_child(T& elt); void print_rec (int n) const; void print (void) const; - int search_rec(s_abr<T>** res, T& elt); - s_abr<T>* search(T& elt); + int search_rec(abr<T>** res, T& elt); + abr<T>* search(T& elt); T& elt_; - s_abr<T>* father_; - std::vector< s_abr<T>* > sons_; + abr<T>* parent_; + std::vector< abr<T>* > child_; }; # ifndef MLN_INCLUDE_ONLY template <typename T> - s_abr<T>::s_abr () + abr<T>::abr() : elt_ (0), - father_ (0) + parent_ (0) { } template <typename T> - s_abr<T>::s_abr (T& elt) + abr<T>::abr(T& elt) : elt_ (elt), - father_ (0) - { - } - - - template <typename T> - void - s_abr<T>::add_son (T& elt) + parent_ (0) { - - s_abr<T>* s = new s_abr<T> (elt); - - s->father_ = this; - this->sons_.push_back (s); } template <typename T> void - s_abr<T>::print_rec (int n) const + abr<T>::add_child(T& elt) { - std::cout << this->elt_ << std::endl; - typename std::vector<s_abr<T>* >::const_iterator it = this->sons_.begin (); - for (; it != this->sons_.end (); ++it) - { - for (int i = 0; i < n; ++i) - std::cout << " "; - (**it).print_rec (n + 1); - } - } + abr<T>* s = new abr<T>(elt); - template <typename T> - void - s_abr<T>::print (void) const - { - this->print_rec(1); + s->parent_ = this; + this->child_.push_back(s); } - template <typename T> int - s_abr<T>::search_rec(s_abr<T>** res, T& elt) + abr<T>::search_rec(abr<T>** res, T& elt) { if (elt == this->elt_) { @@ -125,8 +98,8 @@ } else { - typename std::vector<s_abr<T>* >::iterator it = this->sons_.begin (); - for (; it != this->sons_.end (); ++it) + for (typename std::vector<abr<T>* >::iterator it = this->child_.begin(); + it != this->child_.end(); ++it) { if ((**it).search_rec (res, elt)) return 1; @@ -136,14 +109,13 @@ } template <typename T> - s_abr<T>* - s_abr<T>::search(T& elt) + abr<T>* + abr<T>::search(T& elt) { - s_abr<T>* res = 0; + abr<T>* res = 0; if (search_rec (&res, elt)) return res; - std::cerr << elt << " not found" << std::endl; return 0; } Index: trunk/milena/sandbox/duhamel/abr.hh =================================================================== --- trunk/milena/sandbox/duhamel/abr.hh (revision 1370) +++ trunk/milena/sandbox/duhamel/abr.hh (revision 1371) @@ -39,7 +39,6 @@ * */ - namespace mln { @@ -93,28 +92,6 @@ } template <typename T> - void - s_abr<T>::print_rec (int n) const - { - std::cout << this->elt_ << std::endl; - typename std::list<s_abr<T>* >::const_iterator it = this->sons_.begin (); - for (; it != this->sons_.end (); ++it) - { - for (int i = 0; i < n; ++i) - std::cout << " "; - (**it).print_rec (n + 1); - } - } - - template <typename T> - void - s_abr<T>::print (void) const - { - this->print_rec(1); - } - - - template <typename T> int s_abr<T>::search_rec(s_abr<T>** res, T& elt) { @@ -147,6 +124,27 @@ return 0; } +// template <typename T> +// void +// abr<T>::print_rec(int n) const +// { +// std::cout << this->elt_ << std::endl; +// typename std::vector<abr<T>* >::const_iterator it = this->child_.begin(); +// for (; it != this->child_.end(); ++it) +// { +// for (int i = 0; i < n; ++i) +// std::cout << " "; +// (**it).print_rec(n + 1); +// } +// } + +// template <typename T> +// void +// abr<T>::print(void) const +// { +// this->print_rec(1); +// } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::util

1 0

Re: [Olena-patches] milena r1344: Fix in fi_adaptor
by Thierry GERAUD 22 Oct '07

22 Oct '07

Matthieu Garrigues wrote: > URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena > > ChangeLog: > 2007-10-16 Matthieu Garrigues <garrigues(a)lrde.epita.fr> > > Fix in fi_adaptor. > * mln/core/fi_adaptor.hh: Fix > * tests/fi_adaptor.cc: Fix > ... Please add a guard so that this file can compile even if the third library is not available

2 1

milena r1370: Update fllt
by Simon Nivault 22 Oct '07

22 Oct '07

URL: https://svn.lrde.org/svn/oln/trunk/milena ChangeLog: 2007-10-22 Simon Nivault <simon.nivault(a)lrde.epita.fr> Update fllt. * sandbox/garrigues/fllt.hh: Update. --- fllt.hh | 48 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-) Index: trunk/milena/sandbox/garrigues/fllt.hh =================================================================== --- trunk/milena/sandbox/garrigues/fllt.hh (revision 1369) +++ trunk/milena/sandbox/garrigues/fllt.hh (revision 1370) @@ -40,13 +40,16 @@ # include <mln/core/inplace.hh> # include <mln/core/neighb2d.hh> # include <mln/core/pset_if_piter.hh> +# include <mln/core/pset_if.hh> # include <mln/core/sub_image.hh> # include <mln/core/image_if.hh> +# include <mln/core/clone.hh> # include <mln/debug/println.hh> # include <mln/convert/to_image.hh> # include <mln/level/compute.hh> +# include <mln/level/fill.hh> # include <mln/accu/min.hh> # include <mln/labeling/regional_minima.hh> @@ -55,7 +58,6 @@ # include <mln/fun/ops.hh> # include <mln/pw/value.hh> # include <mln/pw/cst.hh> -# include <mln/fun/p2b/chess.hh> namespace mln { @@ -104,10 +106,13 @@ V& g, point2d& x0) { + std::cout << "entering step 1" << std::endl; // x0 <- a not tagged local mininum of ima. x0 = p; // g <- u(x0) g = ima(x0); + std::cout << "g = " << g << std::endl; + std::cout << "exiting step 1" << std::endl; } template <typename P> @@ -116,6 +121,7 @@ set_p& N, point2d& x0) { + std::cout << "entering step 2" << std::endl; // A <- {x0} A.clear(); A.insert(x0); @@ -123,6 +129,7 @@ R.clear(); // N <- {} N.clear(); + std::cout << "exiting step 2" << std::endl; } @@ -134,6 +141,7 @@ set_p& N, V& gn) { + std::cout << "entering step 3" << std::endl; // N <- N union {x neighbor of a pixel in a\R} mln_piter(set_p) qa(A); @@ -145,9 +153,13 @@ N.insert (n); } + std::cout << "N :" << std::endl; + debug::println(ima | N); + // gn <- min u(x) x belongs to N. gn = level::compute<accu::min>(ima | N); + std::cout << std::endl << "gN = " << gn << std::endl; // R <- R union A // tag the pixels of A. @@ -156,25 +168,35 @@ R.insert(qa); tagged(qa) = true; } + std::cout << "exiting step 3" << std::endl; } /// IF g < gn. template <typename V, typename P> - void step4_1 (const image2d<V>& ima, - image2d<bool>& tagged, + void step4_1 (image2d<V>& u, set_p& A, - set_p& R, +// set_p& R, set_p& N, + V& g, V& gn) { + std::cout << "entering step 4_1" << std::endl; // Count the number of conected components of the border of R. - image2d<int> tmp; + image2d<int> tmp(u.domain()); + image2d<bool> border_ima(u.domain()); + level::fill(border_ima, false); + level::fill(inplace(border_ima | N), true); unsigned n; - labeling::level(convert::to_image(N), true, c8(), tmp, n); + labeling::level(border_ima, true, c8(), tmp, n); + +// debug::println(border_ima); + std::cout << "nb composantes :" << n << std::endl; + debug::println(tmp); if (n > 1) { + // IF number of conected components of the border > 1 // follow each border to find which is the exterior border @@ -184,10 +206,13 @@ // Recompute gn <- min u(x) x belongs to A } -// g <- gn + g = gn; // A <- {x belongs to N / u(x) == g} + A.clear(); +// A += N | (pw::value(u) == pw::cst(g)); // N <- N\{x belongs to N / u(x) == g} + std::cout << "exiting step 4_1" << std::endl; } @@ -252,7 +277,7 @@ V g, gn; point2d x0; image2d<V> min_locals(ima.domain()); - // image2d<V> u = clone(ima); + image2d<V> u = clone(ima); image2d<bool> tagged(ima.domain()); unsigned nlabels; @@ -269,7 +294,10 @@ if (tagged(p)) continue; + std::cout << "p = " << p << std::endl; + step1(ima, p, g, x0); + step2(A, R, N, x0); while (1) { @@ -277,7 +305,7 @@ /// step4. if (g < gn) { -// step4_1(); + step4_1(u, A, N, g, gn); // GO TO 3) continue; } @@ -294,7 +322,7 @@ if (g > gn) { /// FIXME ima -> u - // step4_3(ima, R, g); + // step4_3(u, R, g); // GO TO 1) break; }

1 0

milena r1369: Fix box resizing
by Matthieu Garrigues 22 Oct '07

22 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-22 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Fix box resizing. * mln/core/box.hh: Fix. * tests/convert_to_image.cc: Update. --- mln/core/box.hh | 8 ++++---- tests/convert_to_image.cc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) Index: trunk/milena/tests/convert_to_image.cc =================================================================== --- trunk/milena/tests/convert_to_image.cc (revision 1368) +++ trunk/milena/tests/convert_to_image.cc (revision 1369) @@ -57,7 +57,7 @@ 0, 1, 0, // < center point 1, 0, 1 }; - image2d<bool> ima_X = convert::to_image(box_3x3 | fun::p2b::chess); + image2d<bool> ima_X = convert::to_image(box_3x3 | fun::p2b::chess, 0); window2d win_X = make::window2d(X); mln_assertion(convert::to_image(win_X) == ima_X); Index: trunk/milena/mln/core/box.hh =================================================================== --- trunk/milena/mln/core/box.hh (revision 1368) +++ trunk/milena/mln/core/box.hh (revision 1369) @@ -214,8 +214,8 @@ { for (unsigned i = 0; i < P::dim; ++i) { - pmin[i] -= b; - pmax[i] += b; + pmin_[i] -= b; + pmax_[i] += b; } } @@ -228,8 +228,8 @@ for (unsigned i = 0; i < P::dim; ++i) { - tmp.pmin[i] -= b; - tmp.pmax[i] += b; + tmp.pmin_[i] -= b; + tmp.pmax_[i] += b; } return tmp; }

1 0

milena r1368: Enlarge for boxes
by Matthieu Garrigues 22 Oct '07

22 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-22 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Enlarge for boxes. * mln/convert/to_image.hh: Update convert::to_image(pset). * mln/core/box.hh: (box_::to_larger) New, (box_::enlarge) New. --- convert/to_image.hh | 9 +++++---- core/box.hh | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) Index: trunk/milena/mln/core/box.hh =================================================================== --- trunk/milena/mln/core/box.hh (revision 1367) +++ trunk/milena/mln/core/box.hh (revision 1368) @@ -107,6 +107,12 @@ */ bool has(const P& p) const; + /// Enlarge the box with a border \p b. + void enlarge(unsigned b); + + /// Give a larger box. + box_ to_larger(unsigned b) const; + protected: P pmin_, pmax_; }; @@ -203,6 +209,32 @@ } template <typename P> + void + box_::enlarge(unsigned b) + { + for (unsigned i = 0; i < P::dim; ++i) + { + pmin[i] -= b; + pmax[i] += b; + } + } + + + template <typename P> + box_ + box_::to_larger(unsigned b) const + { + box_ tmp = *this; + + for (unsigned i = 0; i < P::dim; ++i) + { + tmp.pmin[i] -= b; + tmp.pmax[i] += b; + } + return tmp; + } + + template <typename P> std::ostream& operator<<(std::ostream& ostr, const box_& b) { return ostr << "[" << b.pmin() << ".." << b.pmax() << ']'; Index: trunk/milena/mln/convert/to_image.hh =================================================================== --- trunk/milena/mln/convert/to_image.hh (revision 1367) +++ trunk/milena/mln/convert/to_image.hh (revision 1368) @@ -103,9 +103,10 @@ { - /// Convert a point set \p pset into a binary image. + /// Convert a point set \p pset into a binary image. Width of the + /// converted image will be pset.bbox + 2 * \p border. template <typename S> - mln_image_from(S, bool) to_image(const Point_Set<S>& pset); + mln_image_from(S, bool) to_image(const Point_Set<S>& pset, unsigned border = 1); /// Convert a window \p win into a binary image. template <typename W> @@ -126,10 +127,10 @@ # ifndef MLN_INCLUDE_ONLY template <typename S> - mln_image_from(S, bool) to_image(const Point_Set<S>& pset_) + mln_image_from(S, bool) to_image(const Point_Set<S>& pset_, unsigned border) { const S& pset = exact(pset_); - mln_image_from(S, bool) ima(pset.bbox()); + mln_image_from(S, bool) ima(pset.bbox().to_larger(border)); level::fill(ima, false); mln_piter(S) p(pset); for_all(p)

1 0

milena r1367: Replace list by vector
by Guillaume Duhamel 22 Oct '07

22 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-22 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Replace list by vector. * util/abr.hh: Update list into vector. --- abr.hh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Index: trunk/milena/mln/util/abr.hh =================================================================== --- trunk/milena/mln/util/abr.hh (revision 1366) +++ trunk/milena/mln/util/abr.hh (revision 1367) @@ -28,7 +28,7 @@ #ifndef MLN_UTIL_ABR_HH # define MLN_UTIL_ABR_HH -# include <list> +# include <vector> # include <iostream> /*! @@ -60,7 +60,7 @@ T& elt_; s_abr<T>* father_; - std::list< s_abr<T>* > sons_; + std::vector< s_abr<T>* > sons_; }; @@ -97,7 +97,7 @@ s_abr<T>::print_rec (int n) const { std::cout << this->elt_ << std::endl; - typename std::list<s_abr<T>* >::const_iterator it = this->sons_.begin (); + typename std::vector<s_abr<T>* >::const_iterator it = this->sons_.begin (); for (; it != this->sons_.end (); ++it) { for (int i = 0; i < n; ++i) @@ -125,7 +125,7 @@ } else { - typename std::list<s_abr<T>* >::iterator it = this->sons_.begin (); + typename std::vector<s_abr<T>* >::iterator it = this->sons_.begin (); for (; it != this->sons_.end (); ++it) { if ((**it).search_rec (res, elt))

1 0