November 2008 - Olena-patches

2918: Revamp labeling::compute.
by Guillaume Lazzara 19 Nov '08

19 Nov '08

* mln/labeling/compute.hh: Add compute_dispatch and compute_tests. * tests/labeling/compute.cc: Fix comments. --- milena/ChangeLog | 8 + milena/mln/labeling/compute.hh | 270 ++++++++++++++++++++++++++------------ milena/tests/labeling/compute.cc | 8 +- 3 files changed, 200 insertions(+), 86 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ebb4700..9275628 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2008-11-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Revamp labeling::compute. + + * mln/labeling/compute.hh: Add compute_dispatch and compute_tests. + + * tests/labeling/compute.cc: Fix comments. + 2008-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> Add a new from_to for fun::i2v::array. diff --git a/milena/mln/labeling/compute.hh b/milena/mln/labeling/compute.hh index 147843c..5be6dca 100644 --- a/milena/mln/labeling/compute.hh +++ b/milena/mln/labeling/compute.hh @@ -43,69 +43,61 @@ namespace mln namespace labeling { - /*! Compute an accumulator onto the pixel values of the image \p input. - * for each component of the image \p label. - * - * \param[in] a An accumulator. - * \param[in] input The input image. - * \param[in] label The labeled image. - * \param[in] input The number of component in \p label. - * \return A mln::p_array of accumulator result. One result per component in - * \p label. - * - * It fully relies on labeling::update. - */ + /// Compute an accumulator onto the pixel values of the image \p input. + /// for each component of the image \p label. + /// + /// \param[in] a An accumulator. + /// \param[in] input The input image. + /// \param[in] label The labeled image. + /// \param[in] input The number of component in \p label. + /// \return A mln::p_array of accumulator result. One result per component in + /// \p label. + /// template <typename A, typename I, typename J> util::array<mln_result(A)> compute(const Accumulator<A>& a, const Image& input, const Image<J>& label, mln_value(J) nlabels); - /*! Compute an accumulator onto the pixel values of the image \p input. - * for each component of the image \p label. - * - * \param[in] a A meta-accumulator. - * \param[in] input The input image. - * \param[in] label The labeled image. - * \param[in] input The number of component in \p label. - * \return A mln::p_array of accumulator result. One result per component in - * \p label. - * - * It fully relies on labeling::update. - */ + /// Compute an accumulator onto the pixel values of the image \p input. + /// for each component of the image \p label. + /// + /// \param[in] a A meta-accumulator. + /// \param[in] input The input image. + /// \param[in] label The labeled image. + /// \param[in] input The number of component in \p label. + /// \return A mln::p_array of accumulator result. One result per component in + /// \p label. + /// template <typename A, typename I, typename J> util::array<mln_accu_with(A, mln_value(I))::result> compute(const Meta_Accumulator<A>& a, const Image& input, const Image<J>& label, mln_value(J) nlabels); - /*! Compute an accumulator onto the pixel sites of each component domain of - * \p label. - * - * \param[in] a An accumulator. - * \param[in] label The labeled image. - * \param[in] input The number of component in \p label. - * \return A mln::p_array of accumulator result. One result per component in - * \p label. - * - * It fully relies on labeling::update. - */ + /// Compute an accumulator onto the pixel sites of each component domain of + /// \p label. + /// + /// \param[in] a An accumulator. + /// \param[in] label The labeled image. + /// \param[in] input The number of component in \p label. + /// \return A mln::p_array of accumulator result. One result per component in + /// \p label. + /// template <typename A, typename J> util::array<mln_result(A)> compute(const Accumulator<A>& a, const Image<J>& label, mln_value(J) nlabels); - /*! Compute an accumulator onto the pixel sites of each component domain of - * \p label. - * - * \param[in] a A meta-accumulator. - * \param[in] label The labeled image. - * \param[in] input The number of component in \p label. - * \return A mln::p_array of accumulator result. One result per component in - * \p label. - * - * It fully relies on labeling::update. - */ + /// Compute an accumulator onto the pixel sites of each component domain of + /// \p label. + /// + /// \param[in] a A meta-accumulator. + /// \param[in] label The labeled image. + /// \param[in] input The number of component in \p label. + /// \return A mln::p_array of accumulator result. One result per component in + /// \p label. + /// template <typename A, typename J> util::array<mln_accu_with(A, mln_psite(J))::result> compute(const Meta_Accumulator<A>& a, @@ -115,33 +107,159 @@ namespace mln # ifndef MLN_INCLUDE_ONLY + namespace internal + { + + template <typename A, typename J> + inline + void compute_tests(const Accumulator<A>&, + const Image<J>& label, + mln_value(J)) + { + mln_precondition(exact(label).has_data()); + (void) label; + } + + + template <typename A, typename I, typename J> + inline + void compute_tests(const Accumulator<A>&, + const Image& input, + const Image<J>& label, + mln_value(J)) + { + mln_precondition(exact(input).has_data()); + mln_precondition(exact(label).has_data()); + + (void) input; + (void) label; + } + + } + + + + namespace impl + { + + namespace generic + { + + template <typename A, typename J> + inline + util::array<mln_result(A)> + compute(const Accumulator<A>& a, + const Image<J>& label_, + mln_value(J) nlabels) + { + trace::entering("labeling::impl::generic::compute"); + internal::compute_tests(a, label_, nlabels); + + const J& label = exact(label_); + + util::array<A> accus; + for (mln_value(J) i = 0; i <= nlabels; ++i) + accus.append(exact(a)); + + mln_piter(J) p(label.domain()); + mln_value(J) l; + for_all(p) + accus[label(p)].take(p); + + util::array<mln_result(A)> results; + for (unsigned i = 0; i < accus.nelements(); ++i) + if (accus[i].is_valid()) + results.append(accus[i]); + else + results.append(mln_result(A)()); + + trace::exiting("labeling::impl::generic::compute"); + return results; + } + + + template <typename A, typename I, typename J> + inline + util::array<mln_result(A)> + compute(const Accumulator<A>& a, + const Image& input_, + const Image<J>& label_, + mln_value(J) nlabels) + { + trace::entering("labeling::impl::generic::compute"); + internal::compute_tests(a, input_, label_, nlabels); + + const I& input = exact(input_); + const J& label = exact(label_); + + util::array<A> accus; + for (mln_value(J) i = 0; i <= nlabels; ++i) + accus.append(A()); + + mln_piter(I) p(input.domain()); + mln_value(J) l; + for_all(p) + accus[label(p)].take(input(p)); + + util::array<mln_result(A)> results; + for (unsigned i = 0; i < accus.nelements(); ++i) + if (accus[i].is_valid()) + results.append(accus[i]); + else + results.append(mln_result(A)()); + + trace::exiting("labeling::impl::generic::compute"); + return results; + } - // Facades. + } // end of namespace mln::labeling::impl::internal + + } // end of namespace mln::labeling::impl + + + + namespace internal + { + + template <typename A, typename J> + inline + util::array<mln_result(A)> + compute_dispatch(const Accumulator<A>& a, + const Image<J>& label, + mln_value(J) nlabels) + { + return impl::generic::compute(a, label, nlabels); + } + + + template <typename A, typename I, typename J> + inline + util::array<mln_result(A)> + compute_dispatch(const Accumulator<A>& a, + const Image& input, + const Image<J>& label, + mln_value(J) nlabels) + { + return impl::generic::compute(a, input, label, nlabels); + } + + } // end of namespace mln::internal + + + + /// Facades. template <typename A, typename I, typename J> inline util::array<mln_result(A)> - compute(const Accumulator<A>&, - const Image& input_, - const Image<J>& label_, mln_value(J) nlabels) + compute(const Accumulator<A>& a, + const Image& input, + const Image<J>& label, mln_value(J) nlabels) { trace::entering("labeling::compute"); - const I& input = exact(input_); - const J& label = exact(label_); - - util::array<A> accus; - for (mln_value(J) i = 0; i <= nlabels; ++i) - accus.append(A()); - - mln_piter(I) p(input.domain()); - mln_value(J) l; - for_all(p) - accus[label(p)].take(input(p)); - - util::array<mln_result(A)> results; - for (unsigned i = 0; i < accus.nelements(); ++i) - results.append(accus[i]); + util::array<mln_result(A)> results = + internal::compute_dispatch(a, input, label, nlabels); trace::exiting("labeling::compute"); return results; @@ -157,7 +275,7 @@ namespace mln typedef mln_accu_with(A, mln_value(I)) A_; A_ a_ = accu::unmeta(exact(a), mln_value(I)()); - return compute(a_, input, label, nlabels); + return internal::compute_dispatch(a_, input, label, nlabels); } @@ -165,24 +283,12 @@ namespace mln inline util::array<mln_result(A)> compute(const Accumulator<A>& a, - const Image<J>& label_, mln_value(J) nlabels) + const Image<J>& label, mln_value(J) nlabels) { trace::entering("labeling::compute"); - const J& label = exact(label_); - - util::array<A> accus; - for (mln_value(J) i = 0; i <= nlabels; ++i) - accus.append(exact(a)); - - mln_piter(J) p(label.domain()); - mln_value(J) l; - for_all(p) - accus[label(p)].take(p); - - util::array<mln_result(A)> results; - for (unsigned i = 0; i < accus.nelements(); ++i) - results.append(accus[i]); + util::array<mln_result(A)> results = + internal::compute_dispatch(a, label, nlabels); trace::exiting("labeling::compute"); return results; @@ -198,7 +304,7 @@ namespace mln typedef mln_accu_with(A, mln_psite(J)) A_; A_ a_ = accu::unmeta(exact(a), mln_psite(J)()); - return compute(a_, label, nlabels); + return internal::compute_dispatch(a_, label, nlabels); } diff --git a/milena/tests/labeling/compute.cc b/milena/tests/labeling/compute.cc index 8e7f78b..af003a6 100644 --- a/milena/tests/labeling/compute.cc +++ b/milena/tests/labeling/compute.cc @@ -1,4 +1,5 @@ // Copyright (C) 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,10 +26,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/labeling/compute.cc - * - * \brief Tests on mln::labeling::compute. - */ +/// \file tests/labeling/compute.cc +/// +/// Tests on mln::labeling::compute. #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> -- 1.5.6.5

1 0

2917: Add a new from_to for fun::i2v::array.
by Guillaume Lazzara 19 Nov '08

19 Nov '08

* mln/convert/from_to.hxx, * mln/fun/i2v/array.hh: add two from_to; - from_to(util::array, fun::i2v::array) - from_to(std::vector, fun::i2v::array) * mln/convert/to.hh, * doc/examples/labeling_algo.cc: cleanup. --- milena/ChangeLog | 12 ++++ milena/doc/examples/labeling_algo.cc | 9 ++-- milena/mln/convert/from_to.hxx | 24 ++++++++ milena/mln/convert/to.hh | 13 ++--- milena/mln/fun/i2v/array.hh | 100 ++++++++++++++++++++++++++++++++-- 5 files changed, 142 insertions(+), 16 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 428323d..ebb4700 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2008-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new from_to for fun::i2v::array. + + * mln/convert/from_to.hxx, + * mln/fun/i2v/array.hh: add two from_to; + - from_to(util::array, fun::i2v::array) + - from_to(std::vector, fun::i2v::array) + + * mln/convert/to.hh, + * doc/examples/labeling_algo.cc: cleanup. + +2008-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix wrong declaration of global variables. * mln/core/alias/dpoint1d.hh, diff --git a/milena/doc/examples/labeling_algo.cc b/milena/doc/examples/labeling_algo.cc index 9e6deb0..2eafdd6 100644 --- a/milena/doc/examples/labeling_algo.cc +++ b/milena/doc/examples/labeling_algo.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,10 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file doc/examples/labeling_algo.cc - * - * \brief Test on mln::geom::seeds2tiling. - */ +/// \file doc/examples/labeling_algo.cc +/// +/// Test on mln::geom::seeds2tiling. # include <mln/core/image/image2d.hh> # include <mln/core/image/sub_image.hh> diff --git a/milena/mln/convert/from_to.hxx b/milena/mln/convert/from_to.hxx index bb3b39b..1876401 100644 --- a/milena/mln/convert/from_to.hxx +++ b/milena/mln/convert/from_to.hxx @@ -36,6 +36,8 @@ # include <mln/core/def/all.hh> # include <mln/core/grids.hh> +//FIXME: have a forward declaration. +# include <vector> namespace mln { @@ -65,6 +67,16 @@ namespace mln template <unsigned d, typename C> class h_vec; } + namespace fun { + namespace i2v { + template <typename T> class array; + } + } + + namespace util { + template <typename T> class array; + } + namespace value { template <unsigned n> struct rgb; } @@ -206,6 +218,18 @@ namespace mln void from_to(const w_window<D,W>& from, Image& to); + + + // util::array<T> -> fun::i2v::array<T> + template <typename T> + void + from_to(const util::array<T>& from, fun::i2v::array<T>& to); + + // std::vector<T> -> fun::i2v::array<T> + template <typename T> + void + from_to(const std::vector<T>& from, fun::i2v::array<T>& to); + } // end of namespace mln::convert } // end of namespace mln diff --git a/milena/mln/convert/to.hh b/milena/mln/convert/to.hh index ad7bab3..bb67593 100644 --- a/milena/mln/convert/to.hh +++ b/milena/mln/convert/to.hh @@ -1,5 +1,5 @@ // Copyright (C) 2008 EPITA Research and Development Laboratory -// +// (LRDE) // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms // of the GNU General Public License version 2 as published by the @@ -28,12 +28,11 @@ #ifndef MLN_CONVERT_TO_HH # define MLN_CONVERT_TO_HH -/*! \file mln/convert/to.hh - * - * \brief General conversion procedure given the destination type. - * - * \todo Prefer a static check that fails in the "unknown" case. - */ +/// \file mln/convert/to.hh +/// +/// General conversion procedure given the destination type. +/// +/// \todo Prefer a static check that fails in the "unknown" case. # include <mln/core/routine/exact.hh> # include <mln/metal/equal.hh> diff --git a/milena/mln/fun/i2v/array.hh b/milena/mln/fun/i2v/array.hh index a791ec6..a97bf33 100644 --- a/milena/mln/fun/i2v/array.hh +++ b/milena/mln/fun/i2v/array.hh @@ -28,19 +28,53 @@ #ifndef MLN_FUN_I2V_ARRAY_HH # define MLN_FUN_I2V_ARRAY_HH -/*! \file mln/fun/i2v/array.hh - * - * \brief FIXME. - */ +/// \file mln/fun/i2v/array.hh +/// +/// Function mapping an Id i to a value v. # include <vector> # include <algorithm> # include <mln/core/concept/function.hh> +# include <mln/util/array.hh> namespace mln { + + /// Forward declaration. + namespace fun + { + + namespace i2v + { + + template <typename T> + class array; + + } // end of namespace mln::fun::i2v + + } // end of namespace mln::fun + + + + namespace convert + { + + template <typename T> + inline + void + from_to(const util::array<T>& from, fun::i2v::array<T>& to); + + template <typename T> + inline + void + from_to(const std::vector<T>& from, fun::i2v::array<T>& to); + + } // end of namespace mln::convert + + + namespace fun { @@ -54,9 +88,23 @@ namespace mln typedef T result; + /// Constructors + /// \{ + + /// Default. array(); + /// Constructs a function with \p nvalues. array(unsigned n); + /// Used in from_to(). Constructs that function from an util::array. + /// Always prefer using from_to instead of this constructor. + array(const util::array<T>& from); + /// Used in from_to(). Constructs that function from an std::vector. + /// Always prefer using from_to instead of this constructor. + array(const std::vector<T>& from); + + /// \} + void resize(unsigned n); unsigned size() const; @@ -74,6 +122,34 @@ namespace mln # ifndef MLN_INCLUDE_ONLY + + // convert::from_to + + namespace convert + { + + template <typename T> + inline + void + from_to(const util::array<T>& from, fun::i2v::array<T>& to) + { + to = fun::i2v::array<T>(from); + } + + template <typename T> + inline + void + from_to(const std::vector<T>& from, fun::i2v::array<T>& to) + { + to = fun::i2v::array<T>(from); + } + + } // end of namespace mln::convert + + + + /// fun::i2v::array + namespace fun { @@ -95,6 +171,22 @@ namespace mln template <typename T> inline + array<T>::array(const util::array<T>& from) + : v_(from.std_vector()) + { + + } + + template <typename T> + inline + array<T>::array(const std::vector<T>& from) + : v_(from) + { + + } + + template <typename T> + inline void array<T>::resize(unsigned n) { -- 1.5.6.5

1 0

2916: Fix wrong declaration of global variables.
by Guillaume Lazzara 19 Nov '08

19 Nov '08

* mln/core/alias/dpoint1d.hh, * mln/core/alias/dpoint2d.hh, * mln/core/alias/dpoint3d.hh: Split declaration and reference to global variables. * tests/all_headers.cc, * tests/global_vars1.cc, * tests/global_vars2.cc: update tests. Include essential headers. * mln/core/all.hh, * mln/core/site_set/p_line2d.hh, * mln/transform/essential.hh, * mln/transform/influence_zone_geodesic.hh: cleanup. --- milena/ChangeLog | 18 +++++++++++ milena/mln/core/alias/dpoint1d.hh | 36 +++++++++++++-------- milena/mln/core/alias/dpoint2d.hh | 38 +++++++++++++--------- milena/mln/core/alias/dpoint3d.hh | 38 ++++++++++++++--------- milena/mln/core/all.hh | 12 +++---- milena/mln/core/site_set/p_line2d.hh | 14 +++----- milena/mln/transform/essential.hh | 7 ++-- milena/mln/transform/influence_zone_geodesic.hh | 2 +- milena/tests/all_headers.cc | 12 ++++--- milena/tests/global_vars1.cc | 4 ++ milena/tests/global_vars2.cc | 4 ++ 11 files changed, 115 insertions(+), 70 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 813df7d..428323d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,23 @@ 2008-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix wrong declaration of global variables. + + * mln/core/alias/dpoint1d.hh, + * mln/core/alias/dpoint2d.hh, + * mln/core/alias/dpoint3d.hh: Split declaration and reference to + global variables. + + * tests/all_headers.cc, + * tests/global_vars1.cc, + * tests/global_vars2.cc: update tests. Include essential headers. + + * mln/core/all.hh, + * mln/core/site_set/p_line2d.hh, + * mln/transform/essential.hh, + * mln/transform/influence_zone_geodesic.hh: cleanup. + +2008-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Update graph related classes. * mln/accu/center.hh: New accu. diff --git a/milena/mln/core/alias/dpoint1d.hh b/milena/mln/core/alias/dpoint1d.hh index 997fd36..c15967b 100644 --- a/milena/mln/core/alias/dpoint1d.hh +++ b/milena/mln/core/alias/dpoint1d.hh @@ -29,11 +29,10 @@ #ifndef MLN_CORE_ALIAS_DPOINT1D_HH # define MLN_CORE_ALIAS_DPOINT1D_HH -/*! \file mln/core/alias/dpoint1d.hh - * - * \brief Definition of the mln::dpoint1d alias and of its - * construction routine. - */ +/// \file mln/core/alias/dpoint1d.hh +/// +/// Definition of the mln::dpoint1d alias and of its +/// construction routine. # include <mln/core/dpoint.hh> # include <mln/core/grids.hh> @@ -43,9 +42,8 @@ namespace mln { - /*! \brief Type alias for a delta-point defined on the 1D square - * grid with integer coordinates. - */ + /// Type alias for a delta-point defined on the 1D square + /// grid with integer coordinates. typedef dpoint<mln::grid::tick, def::coord> dpoint1d; @@ -58,10 +56,20 @@ namespace mln namespace mln { - /*! - * \brief Definition of a shortcut for delta point in 1d. - * \{ - */ + /// Definition of a shortcut for delta point in 1d. + /// \{ + + extern const dpoint1d before; + extern const dpoint1d after; + + extern const dpoint1d ind_dec; + extern const dpoint1d ind_inc; + + /// \} + + + +# ifndef MLN_INCLUDE_ONLY const dpoint1d before = dpoint1d( -1 ); const dpoint1d after = dpoint1d( +1 ); @@ -69,8 +77,8 @@ namespace mln const dpoint1d ind_dec = before; const dpoint1d ind_inc = after; - /*! \} - */ +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln diff --git a/milena/mln/core/alias/dpoint2d.hh b/milena/mln/core/alias/dpoint2d.hh index c14a8f0..c7dc880 100644 --- a/milena/mln/core/alias/dpoint2d.hh +++ b/milena/mln/core/alias/dpoint2d.hh @@ -29,11 +29,10 @@ #ifndef MLN_CORE_ALIAS_DPOINT2D_HH # define MLN_CORE_ALIAS_DPOINT2D_HH -/*! \file mln/core/alias/dpoint2d.hh - * - * \brief Definition of the mln::dpoint2d alias and of its - * construction routine. - */ +/// \file mln/core/alias/dpoint2d.hh +/// +/// Definition of the mln::dpoint2d alias and of its +/// construction routine. # include <mln/core/dpoint.hh> # include <mln/core/def/coord.hh> @@ -42,9 +41,8 @@ namespace mln { - /*! \brief Type alias for a delta-point defined on the 2D square - * grid with integer coordinates. - */ + /// Type alias for a delta-point defined on the 2D square + /// grid with integer coordinates. typedef dpoint<mln::grid::square, def::coord> dpoint2d; @@ -53,22 +51,30 @@ namespace mln # include <mln/core/alias/point2d.hh> - namespace mln { - /*! - * \brief Definition of a shortcut for delta point in 2d. - * \{ - */ + /// Definition of a shortcut for delta point in 2d. + /// \{ + + extern const dpoint2d up; + extern const dpoint2d down; + extern const dpoint2d left; + extern const dpoint2d right; + + /// \} + + + +# ifndef MLN_INCLUDE_ONLY + const dpoint2d up = dpoint2d( -1, 0 ); const dpoint2d down = dpoint2d( +1, 0 ); const dpoint2d left = dpoint2d( 0, -1 ); const dpoint2d right = dpoint2d( 0, +1 ); - /*! - * \} - */ +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln diff --git a/milena/mln/core/alias/dpoint3d.hh b/milena/mln/core/alias/dpoint3d.hh index b9140ac..b96a8b9 100644 --- a/milena/mln/core/alias/dpoint3d.hh +++ b/milena/mln/core/alias/dpoint3d.hh @@ -29,11 +29,10 @@ #ifndef MLN_CORE_ALIAS_DPOINT3D_HH # define MLN_CORE_ALIAS_DPOINT3D_HH -/*! \file mln/core/alias/dpoint3d.hh - * - * \brief Definition of the mln::dpoint3d alias and of its - * construction routine. - */ +/// \file mln/core/alias/dpoint3d.hh +/// +/// Definition of the mln::dpoint3d alias and of its +/// construction routine. # include <mln/core/dpoint.hh> # include <mln/core/grids.hh> @@ -42,9 +41,8 @@ namespace mln { - /*! \brief Type alias for a delta-point defined on the 3D square - * grid with integer coordinates. - */ + /// Type alias for a delta-point defined on the 3D square + /// grid with integer coordinates. typedef dpoint<mln::grid::cube, def::coord> dpoint3d; @@ -57,10 +55,21 @@ namespace mln namespace mln { - /*! - * \brief Definition of a shortcut for delta point in 3d. - * \{ - */ + /// Definition of a shortcut for delta point in 3d. + /// \{ + + extern const dpoint3d sagittal_dec; + extern const dpoint3d sagittal_inc; + extern const dpoint3d axial_dec; + extern const dpoint3d axial_inc; + extern const dpoint3d coronal_dec; + extern const dpoint3d coronal_inc; + + /// \} + + +# ifndef MLN_INCLUDE_ONLY + const dpoint3d sagittal_dec = dpoint3d( 0, 0, -1); const dpoint3d sagittal_inc = dpoint3d( 0, 0, +1); const dpoint3d axial_dec = dpoint3d( 0, -1, 0); @@ -68,9 +77,8 @@ namespace mln const dpoint3d coronal_dec = dpoint3d(-1, 0, 0); const dpoint3d coronal_inc = dpoint3d(+1, 0, 0); - /*! - * \} - */ +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln diff --git a/milena/mln/core/all.hh b/milena/mln/core/all.hh index a9c177c..f20314a 100644 --- a/milena/mln/core/all.hh +++ b/milena/mln/core/all.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,11 +28,9 @@ #ifndef MLN_CORE_ALL_HH_ # define MLN_CORE_ALL_HH_ -/*! \file mln/core/all.hh - * - * \brief File that includes all the core routines. - * - */ +/// \file mln/core/all.hh +/// +/// File that includes all the core routines. # include <mln/core/a_point_of.hh> # include <mln/core/category.hh> @@ -63,5 +61,5 @@ # include <mln/core/routine/all.hh> # include <mln/core/site_set/all.hh> -#endif // !MLN_CORE_ALL_HH_ +#endif // ! MLN_CORE_ALL_HH_ diff --git a/milena/mln/core/site_set/p_line2d.hh b/milena/mln/core/site_set/p_line2d.hh index 9ad9549..f521e3a 100644 --- a/milena/mln/core/site_set/p_line2d.hh +++ b/milena/mln/core/site_set/p_line2d.hh @@ -28,11 +28,10 @@ #ifndef MLN_CORE_P_LINE2D_HH # define MLN_CORE_P_LINE2D_HH -/*! \file mln/core/site_set/p_line2d.hh - * - * \brief Definition of a 2D discrete line of points (based on - * p_array). - */ +/// \file mln/core/site_set/p_line2d.hh +/// +/// Definition of a 2D discrete line of points (based on +/// p_array). # include <mln/core/site_set/p_array.hh> # include <mln/core/alias/box2d.hh> @@ -70,8 +69,7 @@ namespace mln - /*! \brief 2D line point set class. - */ + /// 2D line point set class. class p_line2d : public internal::site_set_base_< point2d, p_line2d > { typedef p_line2d self_; @@ -136,7 +134,7 @@ namespace mln /// Return the corresponding std::vector of points. const std::vector<point2d>& std_vector() const; - + protected: p_array<point2d> arr_; diff --git a/milena/mln/transform/essential.hh b/milena/mln/transform/essential.hh index c6cc5f1..6d22fba 100644 --- a/milena/mln/transform/essential.hh +++ b/milena/mln/transform/essential.hh @@ -28,10 +28,9 @@ #ifndef MLN_TRANSFORM_ESSENTIAL_HH # define MLN_TRANSFORM_ESSENTIAL_HH -/*! \file mln/transform/essential.hh - * - * \brief File that includes essential "point-wise" expression tools. - */ +/// \file mln/transform/essential.hh +/// +/// File that includes essential "point-wise" expression tools. // NOTHING YET diff --git a/milena/mln/transform/influence_zone_geodesic.hh b/milena/mln/transform/influence_zone_geodesic.hh index c63e1fa..cf3a7df 100644 --- a/milena/mln/transform/influence_zone_geodesic.hh +++ b/milena/mln/transform/influence_zone_geodesic.hh @@ -49,7 +49,7 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - + namespace internal { diff --git a/milena/tests/all_headers.cc b/milena/tests/all_headers.cc index b84a0b8..34da33b 100644 --- a/milena/tests/all_headers.cc +++ b/milena/tests/all_headers.cc @@ -1,4 +1,5 @@ // Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,10 +26,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/all_headers.cc - * - * \brief Tests with all headers. (check norris tests) - */ +/// \file tests/all_headers.cc +/// +/// Tests with all headers. (check norris tests) #include <mln/util/all.hh> #include <mln/fun/p2v/all.hh> @@ -94,7 +94,9 @@ #include <mln/tag/all.hh> #include <mln/labeling/all.hh> - +#include <mln/essential/1d.hh> +#include <mln/essential/2d.hh> +#include <mln/essential/3d.hh> int main () { diff --git a/milena/tests/global_vars1.cc b/milena/tests/global_vars1.cc index f41407d..c36f76f 100644 --- a/milena/tests/global_vars1.cc +++ b/milena/tests/global_vars1.cc @@ -93,6 +93,10 @@ #include <mln/tag/all.hh> #include <mln/labeling/all.hh> +#include <mln/essential/1d.hh> +#include <mln/essential/2d.hh> +#include <mln/essential/3d.hh> + int f1(); int main () diff --git a/milena/tests/global_vars2.cc b/milena/tests/global_vars2.cc index a3b93a6..b9d94eb 100644 --- a/milena/tests/global_vars2.cc +++ b/milena/tests/global_vars2.cc @@ -95,6 +95,10 @@ #include <mln/tag/all.hh> #include <mln/labeling/all.hh> +#include <mln/essential/1d.hh> +#include <mln/essential/2d.hh> +#include <mln/essential/3d.hh> + int f1 () { return 0; -- 1.5.6.5

1 0

2915: Update graph related classes.
by Guillaume Lazzara 19 Nov '08

19 Nov '08

* mln/accu/center.hh: New accu. * mln/accu/all.hh, * mln/accu/essential.hh: add center.hh. * mln/make/all.hh, * mln/make/essential.hh, * mln/debug/essential.hh, * mln/debug/all.hh: update includes. * mln/debug/graph.hh: Rename as... * mln/debug/draw_graph.hh: ...this. * mln/make/graph.hh: Add make::graph(). * mln/util/array.hh: cleanup. * mln/util/edge.hh: cleanup comments. * mln/util/graph.hh: add new constructors. --- milena/ChangeLog | 25 ++++ milena/mln/accu/all.hh | 1 + milena/mln/accu/center.hh | 154 +++++++++++++++++++++++++ milena/mln/accu/essential.hh | 1 + milena/mln/debug/all.hh | 10 +- milena/mln/debug/{graph.hh => draw_graph.hh} | 80 +++++--------- milena/mln/debug/essential.hh | 9 +- milena/mln/make/all.hh | 1 + milena/mln/make/essential.hh | 7 +- milena/mln/make/graph.hh | 159 ++++++++++++++++++++++++++ milena/mln/util/array.hh | 35 +++---- milena/mln/util/edge.hh | 2 +- milena/mln/util/graph.hh | 37 ++++++ 13 files changed, 434 insertions(+), 87 deletions(-) create mode 100644 milena/mln/accu/center.hh rename milena/mln/debug/{graph.hh => draw_graph.hh} (53%) create mode 100644 milena/mln/make/graph.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index f6f62e5..813df7d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,28 @@ +2008-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + Update graph related classes. + + * mln/accu/center.hh: New accu. + + * mln/accu/all.hh, + * mln/accu/essential.hh: add center.hh. + + * mln/make/all.hh, + * mln/make/essential.hh, + * mln/debug/essential.hh, + * mln/debug/all.hh: update includes. + + * mln/debug/graph.hh: Rename as... + * mln/debug/draw_graph.hh: ...this. + + * mln/make/graph.hh: Add make::graph(). + + * mln/util/array.hh: cleanup. + + * mln/util/edge.hh: cleanup comments. + + * mln/util/graph.hh: add new constructors. + 2008-11-19 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Update canvas labelingand labeling level. diff --git a/milena/mln/accu/all.hh b/milena/mln/accu/all.hh index cda8581..1d8b9bc 100644 --- a/milena/mln/accu/all.hh +++ b/milena/mln/accu/all.hh @@ -58,6 +58,7 @@ namespace mln # include <mln/accu/bbox.hh> # include <mln/accu/count.hh> +# include <mln/accu/center.hh> //# include <mln/accu/count_adjacent_vertices.hh> # include <mln/accu/height.hh> # include <mln/accu/histo.hh> diff --git a/milena/mln/accu/center.hh b/milena/mln/accu/center.hh new file mode 100644 index 0000000..2aacfce --- /dev/null +++ b/milena/mln/accu/center.hh @@ -0,0 +1,154 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_ACCU_CENTER_HH +# define MLN_ACCU_CENTER_HH + +/// \file mln/accu/center.hh +/// +/// Define an accumulator that computes the center of a site set. + +# include <mln/accu/internal/base.hh> +# include <mln/accu/bbox.hh> + +namespace mln +{ + + namespace accu + { + + + /// Generic center accumulator class. + template <typename P> + struct center : public mln::accu::internal::base > + { + typedef P argument; + typedef P result; + + center(); + + /// Manipulators. + /// \{ + void init(); + void take(const argument& t); + void take(const center& other); + /// \} + + /// Get the value of the accumulator. + P to_result() const; + operator P () const; + + /// Check whether this accu is able to return a result. + bool is_valid() const; + + protected: + accu::bbox bbox_; + }; + + namespace meta + { + + /// Meta accumulator for center. + struct center : public Meta_Accumulator< center > + { + + template <typename P> + struct with + { + typedef accu::center ret; + }; + + }; + + } // end of namespace mln::accu::meta + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename P> + inline + center::center() + { + init(); + } + + template <typename P> + inline + void + center::init() + { + bbox_.init(); + } + + template <typename P> + inline + void center::take(const argument& t) + { + bbox_.take(t); + } + + template <typename P> + inline + void + center::take(const center& other) + { + bbox_.take(other.bbox_); + } + + template <typename P> + inline + P + center::to_result() const + { + return bbox_.to_result().center(); + } + + template <typename P> + inline + center::operator P() const + { + return P(bbox_.to_result().center()); + } + + template <typename P> + inline + bool + center::is_valid() const + { + return bbox_.is_valid(); + } + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace mln::accu + +} // end of namespace mln + + +#endif // ! MLN_ACCU_CENTER_HH diff --git a/milena/mln/accu/essential.hh b/milena/mln/accu/essential.hh index 18498f2..e8c57cc 100644 --- a/milena/mln/accu/essential.hh +++ b/milena/mln/accu/essential.hh @@ -33,6 +33,7 @@ /// File that includes the most useful accumulator types. # include <mln/accu/bbox.hh> +# include <mln/accu/center.hh> # include <mln/accu/count.hh> # include <mln/accu/histo.hh> # include <mln/accu/max.hh> diff --git a/milena/mln/debug/all.hh b/milena/mln/debug/all.hh index a17fb37..a0a27c6 100644 --- a/milena/mln/debug/all.hh +++ b/milena/mln/debug/all.hh @@ -1,4 +1,5 @@ // Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,10 +29,9 @@ #ifndef MLN_DEBUG_ALL_HH # define MLN_DEBUG_ALL_HH -/*! \file mln/debug/all.hh - * - * \brief File that includes all debug-related routines. - */ +/// \file mln/debug/all.hh +/// +/// File that includes all debug-related routines. namespace mln @@ -48,7 +48,7 @@ namespace mln # include <mln/debug/colorize.hh> # include <mln/debug/format.hh> -//# include <mln/debug/graph.hh> +# include <mln/debug/draw_graph.hh> # include <mln/debug/iota.hh> # include <mln/debug/println.hh> # include <mln/debug/println_with_border.hh> diff --git a/milena/mln/debug/graph.hh b/milena/mln/debug/draw_graph.hh similarity index 53% rename from milena/mln/debug/graph.hh rename to milena/mln/debug/draw_graph.hh index e92b802..159b974 100644 --- a/milena/mln/debug/graph.hh +++ b/milena/mln/debug/draw_graph.hh @@ -30,7 +30,10 @@ # define MLN_DEBUG_DRAW_GRAPH_HH /// \file mln/debug/graph.hh +/// /// \brief Draw an (classical) image from a mln::graph_image. +/// +/// \todo write a version for graph images. # include <mln/pw/image.hh> # include <mln/level/fill.hh> @@ -43,83 +46,56 @@ namespace mln namespace debug { - /*! \brief Draw an image \p ima from a mln::p_graph \p pg, with - * value \p vertex_v for vertices, value \p edge_v for edges and 0 for - * the background. - * - * \param[in,out] ima The image to be drawn. - * \param[in] pv The p_vertices which contains vertices positions. - * \param[in] vertex_v The value to assign to pixels which contains - * vertices. - * \param[in] edge_v The value to assign to pixels which contains - * edges. - */ + /// Draw an image \p ima from a mln::p_graph \p pg, with + /// value \p vertex_v for vertices, value \p edge_v for edges and 0 for + /// the background. + /// + /// \param[in,out] ima The image to be drawn. + /// \param[in] pv The p_vertices which contains vertices positions. + /// \param[in] vertex_v The value to assign to pixels which contains + /// vertices. + /// \param[in] edge_v The value to assign to pixels which contains + /// edges. template <typename I, typename G, typename F> void draw_graph(Image& ima, const p_vertices<G, F>& pv, mln_value(I) vertex_v, mln_value(I) edge_v); - /*! \brief Draw an image \p ima from a mln::graph_image \p gi. - * - * The background is filled with value 0. - * - * \param[in,out] ima The image to be drawn. - * \param[in] gi The graph_image which contains the vertices, - * edges positions and the values of it. - * \param[in] edge_v The value to assign to pixels which contains - * edges, defaulting to 1. - */ - // FIXME: The type of the last argument cannot always been - // constructed from `int'! We should remove this last argument. -// template <typename I, typename P, typename V> -// void -// draw_graph(Image& ima, const graph_image<P, V>& gi, -// mln_value(I) edge_v = 1); + # ifndef MLN_INCLUDE_ONLY + + // FIXME: Add assertions on the size of the image: it must be large // enough to hold the representation of the graph/graph_image. template <typename I, typename G, typename F> inline void - draw_graph(Image& ima, const p_vertices<G, F>& pv, - mln_value(I) vertex_v, mln_value(I) edge_v) + draw_graph(Image& ima, + const p_vertices<G, F>& pv, + mln_value(I) vertex_v, + mln_value(I) edge_v) { - // Debug the background. - level::fill(ima, 0); + // Fill the background. + level::fill(ima, literal::black); - // Debug the lines (edges). + // Draw edges. const G& g = pv.graph(); typedef p_vertices<G, F> pv_t; mln_edge_iter(G) ei(g); for_all(ei) draw::line(exact(ima), pv(ei.v1()), pv(ei.v2()), edge_v); - // Debug the points (vertices). + // Draw vertices. mln_piter(pv_t) p(pv); for_all(p) - exact(ima)(p) = vertex_v; + if (exact(ima).has(p)) + exact(ima)(p) = vertex_v; } -/* - template <typename I, typename P, typename V> - inline - void - draw_graph(Image& ima, const graph_image<P, V>& gi, - mln_value(I) edge_v) - { - // Debug the background. - level::fill(ima, 0); - // Debug the lines (edges). - for (unsigned l = 0; l < gi.domain().nedges(); ++l) - line (exact(ima), gi.vertex1(l), gi.vertex2(l), edge_v); - // Debug the points (vertices). - for (unsigned p = 0; p < gi.domain().nvertices(); ++p) - exact(ima)(gi.domain().point_from_id(p)) = gi.vertex_values()[p]; - } -*/ + # endif // ! MLN_INCLUDE_ONLY @@ -127,4 +103,4 @@ namespace mln } // end of namespace mln -#endif // MLN_DEBUG_DRAW_GRAPH_HH +#endif // ! MLN_DEBUG_DRAW_GRAPH_HH diff --git a/milena/mln/debug/essential.hh b/milena/mln/debug/essential.hh index 122a6c0..a28563b 100644 --- a/milena/mln/debug/essential.hh +++ b/milena/mln/debug/essential.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,10 +28,9 @@ #ifndef MLN_DEBUG_ESSENTIAL_HH # define MLN_DEBUG_ESSENTIAL_HH -/*! \file mln/debug/essential.hh - * - * \brief File that includes essential debug-related routines. - */ +/// \file mln/debug/essential.hh +/// +/// File that includes essential debug-related routines. # include <mln/debug/all.hh> diff --git a/milena/mln/make/all.hh b/milena/mln/make/all.hh index 910d943..5dc232c 100644 --- a/milena/mln/make/all.hh +++ b/milena/mln/make/all.hh @@ -48,6 +48,7 @@ namespace mln # include <mln/make/box3d.hh> # include <mln/make/dpoint2d_h.hh> # include <mln/make/dual_neighb.hh> +# include <mln/make/graph.hh> # include <mln/make/image.hh> # include <mln/make/image2d.hh> # include <mln/make/mat.hh> diff --git a/milena/mln/make/essential.hh b/milena/mln/make/essential.hh index 856e75a..33aa0e7 100644 --- a/milena/mln/make/essential.hh +++ b/milena/mln/make/essential.hh @@ -29,10 +29,9 @@ #ifndef MLN_MAKE_ESSENTIAL_HH # define MLN_MAKE_ESSENTIAL_HH -/*! \file mln/make/essential.hh - * - * \brief File that includes essential make routines. - */ +/// \file mln/make/essential.hh +/// +/// File that includes essential make routines. # include <mln/make/dual_neighb.hh> # include <mln/make/image.hh> diff --git a/milena/mln/make/graph.hh b/milena/mln/make/graph.hh new file mode 100644 index 0000000..c3ae618 --- /dev/null +++ b/milena/mln/make/graph.hh @@ -0,0 +1,159 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_MAKE_GRAPH_HH +# define MLN_MAKE_GRAPH_HH + +/// \file mln/make/graph.hh +/// +/// Create a graph from an influence zone image. +/// +/// \sa transform::influence_zone_geodesic. + +# include <mln/util/graph.hh> + +namespace mln +{ + + namespace make + { + + /// Create a graph from an influence zone image. + /// + /// \param[in] iz influence zone image. + /// \param[in] nlabels number of influence zone in \p iz. + /// + /// \return util::graph Graph based on the adjacency of the influence zones. + template <typename I> + util::graph graph(const Image& iz, mln_value(I) nlabels); + + + +# ifndef MLN_INCLUDE_ONLY + + + namespace internal + { + + template <typename I> + void + graph_tests(const Image& iz, mln_value(I)) + { + mln_precondition(exact(iz).has_data()); + + (void) iz; + } + + } // end of namespace mln::make::internal + + + + namespace impl + { + + namespace generic + { + + template <typename I> + util::graph + graph(const Image& iz_, mln_value(I) nlabels) + { + trace::entering("make::impl::generic::graph"); + + internal::graph_tests(iz_, nlabels); + const I& iz = exact(iz_); + + util::graph g; + g.add_vertices(nlabels + 1); + + mln_piter(I) p(iz.domain()); + for_all(p) + { + // Checking 'forward' neighboors and create an edge if necessary. + for (unsigned dim = 0; dim < mln_site_(I)::dim; ++dim) + { + mln_site(I) n = p; + ++n[dim]; + + // FIXME: check that calling iz.domain().has() is correct + // and that we don't prefer iz.has(). + if (iz.domain().has(n) && iz(p) != iz(n)) + g.add_edge(iz(p), iz(n)); + } + } + + trace::exiting("make::impl::generic::graph"); + return g; + } + + } // end of namespace mln::make::impl::generic + + } // end of namespace mln::make::impl + + + + namespace internal + { + + template <typename I> + util::graph + graph_dispatch(const Image& iz, mln_value(I) nlabels) + { + return make::impl::generic::graph(iz, nlabels); + } + + } // end of namespace mln::make::internal + + + + // Facade + + template <typename I> + inline + util::graph + graph(const Image& iz, mln_value(I) nlabels) + { + trace::entering("make::graph"); + + internal::graph_tests(iz, nlabels); + + util::graph g = internal::graph_dispatch(iz, nlabels); + + trace::exiting("make::graph"); + return g; + } + + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace mln::make + +} // end of namespace mln + + +#endif // ! MLN_MAKE_GRAPH_HH diff --git a/milena/mln/util/array.hh b/milena/mln/util/array.hh index 66b41a8..5f49839 100644 --- a/milena/mln/util/array.hh +++ b/milena/mln/util/array.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,13 +28,12 @@ #ifndef MLN_UTIL_ARRAY_HH # define MLN_UTIL_ARRAY_HH -/*! \file mln/util/array.hh - * - * \brief Definition of mln::util::array. - * - * \todo Zed: Add a lazy removal method (based on an extra attribute - * std::vector<bool> has_). Then add a purge/compress method. - */ +/// \file mln/util/array.hh +/// +/// Definition of mln::util::array. +/// +/// \todo Zed: Add a lazy removal method (based on an extra attribute +/// std::vector<bool> has_). Then add a purge/compress method. # include <vector> # include <iostream> @@ -55,15 +54,12 @@ namespace mln template <typename T> class array_bkd_iter; - /*! \brief A dynamic array class. - * - * - * - * Elements are stored by copy. Implementation is lazy. - * - * The parameter \c T is the element type, which shall not be - * const-qualified. - */ + /// A dynamic array class. + /// + /// Elements are stored by copy. Implementation is lazy. + /// + /// The parameter \c T is the element type, which shall not be + /// const-qualified. template <typename T> class array : public Object< mln::util::array<T> > { @@ -141,7 +137,7 @@ namespace mln /// Operator<<. template <typename T> std::ostream& operator<<(std::ostream& ostr, - const mln::util::array<T>& a); + const mln::util::array<T>& a); @@ -240,7 +236,6 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - // util::array<T> @@ -546,7 +541,7 @@ namespace mln template <typename T> std::ostream& operator<<(std::ostream& ostr, - const mln::util::array<T>& a) + const mln::util::array<T>& a) { ostr << '['; const unsigned n = a.nelements(); diff --git a/milena/mln/util/edge.hh b/milena/mln/util/edge.hh index a6ce803..ba34a12 100644 --- a/milena/mln/util/edge.hh +++ b/milena/mln/util/edge.hh @@ -299,7 +299,7 @@ namespace mln std::ostream& operator<<(std::ostream& ostr, const edge<G>& p) { - return ostr << p.id(); + return ostr << "(" << p.v1() << "," << p.v2() << ")"; } template <typename G> diff --git a/milena/mln/util/graph.hh b/milena/mln/util/graph.hh index 1b22c43..7c003a2 100644 --- a/milena/mln/util/graph.hh +++ b/milena/mln/util/graph.hh @@ -62,6 +62,9 @@ namespace mln typedef std::set<util::ord_pair<unsigned> > edges_set_t; data(); + /// Constructor. + /// Allocate enough space in order to support \p nvertices vertices. + data(unsigned nvertices); ~data(); /// The vertices. @@ -134,19 +137,29 @@ namespace mln /// \} /// \} + /// Constructor. graph(); + /// Construct a graph with \p nvertices vertices. + graph(unsigned nvertices); /// Vertex oriented. /// \{ + /// Shortcuts factoring the insertion of vertices and edges. /// \{ + /// Add a vertex. /// /// \return The id of the new vertex. unsigned add_vertex(); + /// Add \p n vertices to the graph. + /// + /// \return A range of vertex ids. + std::pair<unsigned, unsigned> add_vertices(unsigned n); + /// Return the vertex whose id is \a v. /// \{ vertex_t vertex(unsigned id_v) const; @@ -239,6 +252,12 @@ namespace mln } inline + data<util::graph>::data(unsigned nvertices) + { + vertices_.resize(nvertices); + } + + inline data<util::graph>::~data() { } @@ -254,6 +273,12 @@ namespace mln this->data_ = new mln::internal::data<util::graph>(); } + inline + graph::graph(unsigned nvertices) + { + this->data_ = new mln::internal::data<util::graph>(nvertices); + } + /*---------------. | Vertex related | `---------------*/ @@ -270,6 +295,18 @@ namespace mln } inline + std::pair<unsigned, unsigned> + graph::add_vertices(unsigned n) + { + /* FIXME: This is not thread-proof (these two lines should + form an atomic section). */ + data_->vertices_.resize(data_->vertices_.size() + n); + + return std::make_pair(v_nmax() - n, + v_nmax() - 1); + } + + inline graph::vertex_t graph::vertex(unsigned id_v) const { -- 1.5.6.5

1 0

cleanup-2008 2914: Update canvas labelingand labeling level.
by Thierry Geraud 19 Nov '08

19 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Update canvas labelingand labeling level. * mln/accu/compute.hh: Upgrade doc style. Fix unmeta call with util pix. * mln/canvas/labeling.hh: Update. * mln/util/pix.hh: Upgrade doc style. * mln/labeling/level.hh (labeling_functor_base): New. (level_functor, level): Update. * mln/labeling/level.spe.hh: De-activate code. accu/compute.hh | 40 +++++++++++----------- canvas/labeling.hh | 89 +++++++++++++++++++++++++++++--------------------- labeling/level.hh | 69 ++++++++++++++++++++++++-------------- labeling/level.spe.hh | 5 +- util/pix.hh | 55 ++++++++++++------------------ 5 files changed, 142 insertions(+), 116 deletions(-) Index: mln/accu/compute.hh --- mln/accu/compute.hh (revision 2913) +++ mln/accu/compute.hh (working copy) @@ -48,30 +48,30 @@ { /// Make an accumulator compute the pixels of the image \p input. - /*! - * \param[in] input The input image. - * - * This routine runs: \n - * a.take(make::pix(input, p)); - * on all pixels on the images. - * - * \warning This routine does not perform a.init(). - */ + /// + /// \param[in] input The input image. + /// + /// This routine runs: \n + /// a.take(make::pix(input, p)); + /// on all pixels on the images. + /// + /// \warning This routine does not perform a.init(). + /// template <typename A, typename I> mln_result(A) compute(const Accumulator<A>& a, const Image& input); /// Make an accumulator compute the pixels of the image \p input. - /*! - * \param[in] input The input image. - * - * This routine runs: \n - * a.take(make::pix(input, p)); - * on all pixels on the images. - * - * \warning This routine does not perform a.init(). - */ + /// + /// \param[in] input The input image. + /// + /// This routine runs: \n + /// a.take(make::pix(input, p)); + /// on all pixels on the images. + /// + /// \warning This routine does not perform a.init(). + /// template <typename A, typename I> mln_accu_with(A, util::pix)::result compute(const Meta_Accumulator<A>& a, const Image& input); @@ -149,7 +149,9 @@ mln_precondition(exact(input).has_data()); typedef mln_accu_with(A, util::pix) A_; - A_ a_ = accu::unmeta(exact(a), util::pix()); + util::pix* pix_; // So we can pass a pixel below (pixel has + // no ctor without arg). + A_ a_ = accu::unmeta(exact(a), *pix_); mln_result(A_) output = internal::compute_dispatch(a_, input); Index: mln/canvas/labeling.hh --- mln/canvas/labeling.hh (revision 2913) +++ mln/canvas/labeling.hh (working copy) @@ -48,10 +48,10 @@ { // General version. - template <typename I, typename N, typename F> - mln_ch_value(I, typename F::L) + template <typename I, typename N, typename F, typename L> + mln_ch_value(I, L) labeling(const Image& input, const Neighborhood<N>& nbh, - F& functor, typename F::L& nlabels); + F& functor, L& nlabels); # ifndef MLN_INCLUDE_ONLY @@ -69,63 +69,75 @@ return parent(x) = find_root(parent, parent(x)); } - template <typename I, typename N, typename F> - mln_ch_value(I, typename F::L) - labeling(const Image& input, const Neighborhood<N>& nbh, - F& functor, typename F::L& nlabels) + template <typename I, typename N, typename F, typename L> + mln_ch_value(I, L) + labeling(const Image& input_, const Neighborhood<N>& nbh_, + F& f, L& nlabels) { trace::entering("canvas::labeling"); - typedef typename F::L L; + // FIXME: Test?! + + const I& input = exact(input_); + const N& nbh = exact(nbh_); + typedef typename F::S S; // Local type. - typedef mln_psite(I) psite; + typedef mln_psite(I) P; // Auxiliary data. mln_ch_value(I, bool) deja_vu; - mln_ch_value(I, psite) parent; + mln_ch_value(I, P) parent; // Output. mln_ch_value(I, L) output; bool status; - // Initialization. init(); + // Initialization. + { - initialize(deja_vu, functor.input); + initialize(deja_vu, input); mln::level::fill(deja_vu, false); - initialize(parent, functor.input); - initialize(output, functor.input); + + initialize(parent, input); + + initialize(output, input); mln::level::fill(output, L(literal::zero)); nlabels = 0; - functor.init(); // Client initialization. + + f.init(); // Client initialization. } - // First Pass. pass_1(); + // First Pass. + { - mln_fwd_piter(S) p(functor.s); - mln_niter(N) n(functor.nbh, p); - for_all(p) if (functor.handles(p)) + mln_fwd_piter(S) p(f.s); + mln_niter(N) n(nbh, p); + for_all(p) if (f.handles(p)) + { + + // Make-Set. { - // Make the set with p as root. make_set(p). parent(p) = p; - functor.init_attr(p); + f.init_attr(p); + } for_all(n) - if (functor.input.domain().has(n) && deja_vu(n)) + if (input.domain().has(n) && deja_vu(n)) { - if (functor.equiv(n, p)) + if (f.equiv(n, p)) { - // Put p as root. do_union(n, p); - psite r = find_root(parent, n); + // Do-Union. + P r = find_root(parent, n); if (r != p) { parent(r) = p; - functor.merge_attr(r, p); + f.merge_attr(r, p); } } else - functor.do_no_union(n, p); + f.do_no_union(n, p); } deja_vu(p) = true; } @@ -133,12 +145,12 @@ // Second Pass. pass_2(); { - mln_bkd_piter(S) p(functor.s); - for_all(p) if (functor.handles(p)) + mln_bkd_piter(S) p(f.s); + for_all(p) if (f.handles(p)) { if (parent(p) == p) // if p is root { - if (functor.labels(p)) + if (f.labels(p)) { if (nlabels == mln_max(L)) { @@ -159,7 +171,15 @@ return output; } -# endif // ! MLN_INCLUDE_ONLY + + + + + // ----------------------------------------------------------- + // Old code below. + + + /* // Fastest version. @@ -200,12 +220,6 @@ }; -# ifndef MLN_INCLUDE_ONLY - - /*---------------------------. - | canvas::labeling_fastest. | - `---------------------------*/ - template <typename F> labeling_fastest<F>::labeling_fastest(F& f) : f(f) @@ -308,6 +322,7 @@ } } +*/ # endif // ! MLN_INCLUDE_ONLY Index: mln/util/pix.hh --- mln/util/pix.hh (revision 2913) +++ mln/util/pix.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,10 +29,9 @@ #ifndef MLN_UTIL_PIX_HH # define MLN_UTIL_PIX_HH -/*! \file mln/util/pix.hh - * - * \brief Definition of an instant pix. - */ +/// \file mln/util/pix.hh +/// +/// Definition of an instant pix. # include <mln/core/concept/image.hh> @@ -39,13 +39,11 @@ namespace mln { - /// \brief Select namespace (FIXME doc). + /// Select namespace (FIXME doc). namespace select { - /*! \brief Structure p_of. - * - */ + /// Structure p_of. template <typename P> struct p_of : P { @@ -60,9 +58,9 @@ namespace util { - /*! \brief Structure pix. - * - */ + /// Structure pix. + /// + /// template <typename I> struct pix { @@ -73,32 +71,25 @@ /// Value associated type. typedef mln_value(I) value; - /*! \brief Constructor. - * - * \param[in] ima The image. - * \param[in] p The p_site. - */ + /// Constructor. + /// + /// \param[in] ima The image. + /// \param[in] p The p_site. pix(const Image& ima, const mln_psite(I)& p); - /*! \brief The getter of the image associate to pix structure. - * - * \return The image ima_. - * - */ + /// The getter of the image associate to pix structure. + /// + /// \return The image ima_. const I& ima() const; - /*! \brief The getter of psite associate to pix structure. - * - * \return The psite p_. - * - */ + /// The getter of psite associate to pix structure. + /// + /// \return The psite p_. const mln_psite(I)& p() const; - /*! \brief The getter of value associate to pix structure. - * - * \return The value of pix. - * - */ + /// The getter of value associate to pix structure. + /// + /// \return The value of pix. mln_rvalue(I) v() const; private: Index: mln/labeling/level.hh --- mln/labeling/level.hh (revision 2913) +++ mln/labeling/level.hh (working copy) @@ -96,46 +96,63 @@ namespace impl { - // Generic functor. - template <typename I_, typename N_, typename L_> - struct level_functor + struct labeling_functor_base { - typedef mln_psite(I_) P; + void init() {} - // requirements from mln::canvas::labeling: + template <typename P> + bool handles(const P&) const { return true; } + + template <typename L, typename R> + bool equiv(const L&, const R&) const { return false; } + + template <typename P> + bool labels(const P&) const { return true; } + + template <typename L, typename R> + void do_no_union(const L&, const R&) {} + + template <typename P> + void init_attr(const P&) {} + + template <typename L, typename R> + void merge_attr(const L&, const R&) {} + }; - typedef I_ I; - typedef N_ N; - typedef L_ L; - typedef mln_pset(I) S; + + // Generic functor. + + template <typename I> + struct level_functor : labeling_functor_base + { + typedef mln_psite(I) P; const I& input; - const N& nbh; + const mln_value(I)& val; + + // Requirements from mln::canvas::labeling. + + typedef mln_pset(I) S; const S& s; + void init() {} bool handles(const P& p) const { return input(p) == val; } bool equiv(const P& n, const P&) const { return input(n) == val; } - - void init() {} bool labels(const P&) const { return true; } - void do_no_union(const P&, const P&) {} - void init_attr(const P&) {} - void merge_attr(const P&, const P&) {} - - // end of requirements - const mln_value(I_)& val; + // end of Requirements. - level_functor(const I& input, const mln_value(I)& val, const N& nbh) - : input(input), - nbh(nbh), - s(input.domain()), - val(val) - {} + level_functor(const Image& input_, const mln_value(I)& val) + : input(exact(input_)), + val(val), + s(input.domain()) + { + } }; + // Generic implementation. namespace generic @@ -151,9 +168,9 @@ internal::level_tests(input, val, nbh, nlabels); - typedef level_functor<I,N,L> F; - F f(exact(input), val, exact(nbh)); + level_functor f(input, val); mln_ch_value(I, L) output = canvas::labeling(input, nbh, f, nlabels); + // FIXME: Handle canvas status. trace::exiting("labeling::impl::generic::level"); Index: mln/labeling/level.spe.hh --- mln/labeling/level.spe.hh (revision 2913) +++ mln/labeling/level.spe.hh (working copy) @@ -83,7 +83,7 @@ } // end of namespace mln::labeling::impl::generic - + /* // Fastest functor. @@ -149,8 +149,9 @@ return run.output; } - } // end of namespace mln::labeling::impl + */ + } // end of namespace mln::labeling::impl # endif // ! MLN_INCLUDE_ONLY

1 0

2913: Fix clients of mln::canvas::labeling.
by Roland Levillain 19 Nov '08

19 Nov '08

* mln/labeling/flat_zones.hh (mln::labeling::impl::generic::flat_zones) * mln/labeling/regional_maxima.hh (mln::labeling::impl::generic::regional_maxima) * mln/labeling/regional_minima.hh (mln::labeling::impl::generic::regional_minima): Catch up with the current implementation of mln::canvas::labeling as a routine. --- milena/ChangeLog | 13 +++++++++++++ milena/mln/labeling/flat_zones.hh | 5 ++--- milena/mln/labeling/regional_maxima.hh | 7 +++---- milena/mln/labeling/regional_minima.hh | 7 +++---- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e35b296..1684e97 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,18 @@ 2008-11-19 Roland Levillain <roland(a)lrde.epita.fr> + Fix clients of mln::canvas::labeling. + + * mln/labeling/flat_zones.hh + (mln::labeling::impl::generic::flat_zones) + * mln/labeling/regional_maxima.hh + (mln::labeling::impl::generic::regional_maxima) + * mln/labeling/regional_minima.hh + (mln::labeling::impl::generic::regional_minima): + Catch up with the current implementation of mln::canvas::labeling + as a routine. + +2008-11-19 Roland Levillain <roland(a)lrde.epita.fr> + New application: surface segmentation using complex-based images. * apps/statues/mesh-complex-segm.cc: New. diff --git a/milena/mln/labeling/flat_zones.hh b/milena/mln/labeling/flat_zones.hh index 2552816..7fb32ff 100644 --- a/milena/mln/labeling/flat_zones.hh +++ b/milena/mln/labeling/flat_zones.hh @@ -113,11 +113,10 @@ namespace mln typedef flat_zones_functor<I,N,L> F; F f(exact(input), exact(nbh)); - canvas::labeling<F> run(f); - nlabels = run.nlabels; + mln_ch_value(I, L) output = canvas::labeling(input, nbh, f, nlabels); trace::exiting("labeling::impl::generic::flat_zones"); - return run.output; + return output; } } // end of namespace mln::labeling::impl::generic diff --git a/milena/mln/labeling/regional_maxima.hh b/milena/mln/labeling/regional_maxima.hh index 7ca103c..57acc1b 100644 --- a/milena/mln/labeling/regional_maxima.hh +++ b/milena/mln/labeling/regional_maxima.hh @@ -127,12 +127,11 @@ namespace mln // maxima. typedef impl::regional_maxima_functor<I,N,L> F; - F f(input, nbh); - canvas::labeling<F> run(f); - nlabels = run.nlabels; + F f(exact(input), exact(nbh)); + mln_ch_value(I, L) output = canvas::labeling(input, nbh, f, nlabels); trace::exiting("labeling::impl::generic::regional_maxima"); - return run.output; + return output; } } // end of namespace mln::labeling::impl::generic diff --git a/milena/mln/labeling/regional_minima.hh b/milena/mln/labeling/regional_minima.hh index bf7cd21..07ac158 100644 --- a/milena/mln/labeling/regional_minima.hh +++ b/milena/mln/labeling/regional_minima.hh @@ -132,12 +132,11 @@ namespace mln // minima. typedef impl::regional_minima_functor<I,N,L> F; - F f(input, nbh); - canvas::labeling<F> run(f); - nlabels = run.nlabels; + F f(exact(input), exact(nbh)); + mln_ch_value(I, L) output = canvas::labeling(input, nbh, f, nlabels); trace::exiting("labeling::impl::generic::regional_minima"); - return run.output; + return output; } } // end of namespace mln::labeling::impl::generic -- 1.5.6.5

1 0

cleanup-2008 2912: Little fixes.
by Alexandre Abraham 19 Nov '08

19 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> Little fixes. * markov/markov.hh: . markov.hh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) Index: markov/markov.hh --- markov/markov.hh (revision 2911) +++ markov/markov.hh (working copy) @@ -22,14 +22,19 @@ // u(x) is cst so we don't care double diff_sum = 0; + double coeff = 0; mln_niter(N) n(nbh, p); for_all(n) + if (ima.domain().has(n)) { diff_sum += abs(xi - out(n)); + coeff ++; } - return u + 0.25 * diff_sum; + diff_sum /= coeff; + + return 0.5 * (u + diff_sum); } template <typename I, typename N> // I == int_u8

1 0

cleanup-2008 2911: Fix bad comparison sign.
by Alexandre Abraham 19 Nov '08

19 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> Fix bad comparison sign. * markov/markov.hh: . markov.hh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Index: markov/markov.hh --- markov/markov.hh (revision 2910) +++ markov/markov.hh (working copy) @@ -26,10 +26,10 @@ mln_niter(N) n(nbh, p); for_all(n) { - diff_sum += abs(out(p) - out(n)); + diff_sum += abs(xi - out(n)); } - return u + 100 * diff_sum; + return u + 0.25 * diff_sum; } template <typename I, typename N> // I == int_u8 @@ -66,9 +66,9 @@ double d_u = up - u; double proba = exp(-d_u / temp); - // std::cout << "Difference : " << d_u << std::endl; + // std::cout << "u : " < proba)) { out(p) = v; modifications ++;

1 0

2910: New application: surface segmentation using complex-based images.
by Roland Levillain 18 Nov '08

18 Nov '08

* apps/statues/mesh-complex-segm.cc: New. * apps/statues/Makefile.am (bin_PROGRAMS): Add mesh-complex-segm. (mesh_complex_segm_SOURCES): New. * apps/statues/test.in: Exercise mesh-complex-segm. * mln/core/alias/complex_image.hh (mln::unsigned_2complex_image3df): New typedef. --- milena/ChangeLog | 11 ++ milena/apps/statues/Makefile.am | 8 ++ milena/apps/statues/mesh-complex-segm.cc | 163 ++++++++++++++++++++++++++++++ milena/apps/statues/test.in | 4 + milena/mln/core/alias/complex_image.hh | 11 ++- 5 files changed, 195 insertions(+), 2 deletions(-) create mode 100644 milena/apps/statues/mesh-complex-segm.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 9224c7f..e35b296 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2008-11-19 Roland Levillain <roland(a)lrde.epita.fr> + New application: surface segmentation using complex-based images. + + * apps/statues/mesh-complex-segm.cc: New. + * apps/statues/Makefile.am (bin_PROGRAMS): Add mesh-complex-segm. + (mesh_complex_segm_SOURCES): New. + * apps/statues/test.in: Exercise mesh-complex-segm. + * mln/core/alias/complex_image.hh + (mln::unsigned_2complex_image3df): New typedef. + +2008-11-19 Roland Levillain <roland(a)lrde.epita.fr> + * mln/core/site_set/p_array.hh (nsites): Fix return type. 2008-11-18 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/apps/statues/Makefile.am b/milena/apps/statues/Makefile.am index 971a4ec..d1e65f7 100644 --- a/milena/apps/statues/Makefile.am +++ b/milena/apps/statues/Makefile.am @@ -53,4 +53,12 @@ mesh_max_curv_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_trimesh) mesh_max_curv_LDFLAGS = $(LDFLAGS_trimesh) mesh_max_curv_LDADD = $(LDADD_trimesh) +## ---------------------------------------------------- ## +## Complex-based applications, independent of Trimesh. ## +## ---------------------------------------------------- ## + +bin_PROGRAMS += mesh-complex-segm +mesh_complex_segm_SOURCES = mesh-complex-segm.cc + + TESTS = test diff --git a/milena/apps/statues/mesh-complex-segm.cc b/milena/apps/statues/mesh-complex-segm.cc new file mode 100644 index 0000000..05fffe0 --- /dev/null +++ b/milena/apps/statues/mesh-complex-segm.cc @@ -0,0 +1,163 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// \file apps/statues/mesh-complex-segm.cc +/// \brief A program performing a WST-based segmentation of the +/// surface of the (triangle) mesh of a statue, using a complex-based +/// image. + +#include <cstdlib> +#include <cmath> + +#include <utility> +#include <iostream> + +#include <mln/core/image/complex_image.hh> +#include <mln/core/image/complex_neighborhoods.hh> + +#include <mln/morpho/closing_area.hh> +#include <mln/morpho/meyer_wst.hh> + +#include <mln/literal/white.hh> + +#include <mln/io/off/load.hh> +#include <mln/io/off/save.hh> + + + +int main(int argc, char* argv[]) +{ + if (argc != 4) + { + std::cerr << "usage: " << argv[0] << " input.off lambda output.off" + << std::endl; + exit(1); + } + + std::string input_filename = argv[1]; + unsigned lambda = atoi(argv[2]); + std::string output_filename = argv[3]; + + /*----------------. + | Complex image. | + `----------------*/ + + // Image type. + typedef mln::float_2complex_image3df ima_t; + // Dimension of the image (and therefore of the complex). + static const unsigned D = ima_t::dim; + // Geometry of the image. + typedef mln_geom_(ima_t) G; + + ima_t input; + mln::io::off::load(input, input_filename); + + // Values on edges. + + /* FIXME: To be improved: instead of computing the curvature on + edges from a mean of the curvature on adjacent polygons, compute + it directly from the curvature on vertices. We should probably + integrate Trimesh's curvature computation into Milena. */ + mln::p_n_faces_fwd_piter<D, G> e(input.domain(), 1); + typedef mln::complex_higher_neighborhood<D, G> adj_polygons_nbh_t; + adj_polygons_nbh_t adj_polygons_nbh; + mln_niter_(adj_polygons_nbh_t) p(adj_polygons_nbh, e); + // Iterate on edges (1-faces). + for_all(e) + { + float s = 0.0f; + unsigned n = 0; + for_all(p) + { + s += input(p); + ++n; + } + input(e) = s / n; + // An edge should be adjacent to two polygons at most. + mln_invariant(n <= 2); + } + + /*-----------------. + | Simplification. | + `-----------------*/ + + /// Adjancent edges are connected by shared polygons. + typedef + mln::complex_higher_dim_connected_n_face_neighborhood<D, G> + adj_edges_nbh_t; + adj_edges_nbh_t adj_edges_nbh; + + ima_t closed_input(input.domain()); + mln::morpho::closing_area(input, adj_edges_nbh, lambda, closed_input); + + /*------. + | WST. | + `------*/ + + /* FIXME: Note that the WST is either doing too much work, since we + have not constrained the domain of the image to 1-faces only. + + It would be great if we could use something like this: + + closed_input | mln::p_faces<1, D, G>(closed_input.domain()) + + as input of the WST. */ + + // Compute the WST on edges. + typedef unsigned wst_val_t; + wst_val_t nbasins; + typedef mln::unsigned_2complex_image3df wst_ima_t; + wst_ima_t wshed = + mln::morpho::meyer_wst(closed_input, adj_edges_nbh, nbasins); + std::cout << "nbasins = " << nbasins << std::endl; + + // Label polygons (i.e., propagate labels from edges to polygons). + for_all(e) + if (wshed(e) != 0) + for_all(p) + wshed(p) = wshed(e); + + /*---------. + | Output. | + `---------*/ + + mln::rgb8_2complex_image3df output(wshed.domain()); + mln::level::fill(output, mln::literal::white); + + // FIXME: Use a colorize functor instead. + // Choose random colors for each basin number. + std::vector<mln::value::rgb8> basin_color (nbasins + 1); + for (unsigned i = 0; i <= nbasins; ++i) + basin_color[i] = mln::value::rgb8(random() % 256, + random() % 256, + random() % 256); + mln_piter_(ima_t) f(wshed.domain()); + for_all(f) + output(f) = basin_color[wshed(f)]; + + mln::io::off::save(output, output_filename); +} diff --git a/milena/apps/statues/test.in b/milena/apps/statues/test.in index 181a1fd..92c9d31 100755 --- a/milena/apps/statues/test.in +++ b/milena/apps/statues/test.in @@ -7,3 +7,7 @@ mesh_dir=@top_srcdir@/milena/mesh time ./mesh-segm $mesh_dir/socket.off 25 socket-segm.off time ./mesh-segm $mesh_dir/teapot.off 50 teapot-segm.off time ./mesh-segm $mesh_dir/bunny-holefilled.off 500 bunny-holefilled-segm.off + +time ./mesh-complex-segm $mesh_dir/socket-max-curv.off 25 socket-max-curv-segm.off +time ./mesh-complex-segm $mesh_dir/teapot-max-curv.off 50 teapot-max-curv-segm.off +time ./mesh-complex-segm $mesh_dir/bunny-holefilled-pinv-curv.off 500 bunny-holefilled-pinv-curv-segm.off diff --git a/milena/mln/core/alias/complex_image.hh b/milena/mln/core/alias/complex_image.hh index 9dc5956..6336d6b 100644 --- a/milena/mln/core/alias/complex_image.hh +++ b/milena/mln/core/alias/complex_image.hh @@ -47,12 +47,19 @@ namespace mln mln::complex_image<2, mln::space_2complex_geometry, bool> bin_2complex_image3df; + /// \brief Type alias for an 8-bit grey-level image based on a + /// 2-complex, where 0-faces are located at floating-point + /// 3-dimensional points. + typedef + mln::complex_image<2, mln::space_2complex_geometry, mln::value::int_u8> + int_u8_2complex_image3df; + /// \brief Type alias for a grey-level image based on a 2-complex, /// where 0-faces are located at floating-point 3-dimensional /// points. typedef - mln::complex_image<2, mln::space_2complex_geometry, mln::value::int_u8> - int_u8_2complex_image3df; + mln::complex_image<2, mln::space_2complex_geometry, unsigned> + unsigned_2complex_image3df; /// \brief Type alias for a floating-point image based on a /// 2-complex, where 0-faces are located at floating-point -- 1.6.0.1

1 0

2909: mln/core/site_set/p_array.hh (nsites): Fix return type.
by Roland Levillain 18 Nov '08

18 Nov '08

--- milena/ChangeLog | 4 ++++ milena/mln/core/site_set/p_array.hh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e02b029..9224c7f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2008-11-19 Roland Levillain <roland(a)lrde.epita.fr> + + * mln/core/site_set/p_array.hh (nsites): Fix return type. + 2008-11-18 Roland Levillain <roland(a)lrde.epita.fr> Reorganize apps/statues/Makefile.am. diff --git a/milena/mln/core/site_set/p_array.hh b/milena/mln/core/site_set/p_array.hh index db380bd..f4cb85b 100644 --- a/milena/mln/core/site_set/p_array.hh +++ b/milena/mln/core/site_set/p_array.hh @@ -384,7 +384,7 @@ namespace mln template <typename P> inline - std::size_t + unsigned p_array::nsites() const { return vect_.size(); -- 1.6.0.1

1 0