Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

cleanup-2008 r2224: Fix most of Doxygen's warnings

by Guillaume Lazzara

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-09-11 Guillaume Lazzara <z(a)lrde.epita.fr> Fix most of Doxygen's warnings. * milena/mln/core/image/flat_image.hh, * milena/mln/core/internal/site_relative_iterator_base.hh, * milena/mln/core/site_set/line2d.hh, * milena/mln/core/site_set/p_if_piter.hh, * milena/mln/core/site_set/p_priority.hh, * milena/mln/trait/image/props.hh, * milena/mln/util/internal/boost_graph_structure.hh, * milena/mln/util/internal/graph_base.hh, * milena/tests/algebra/h_vec.cc, * milena/tests/binarization/threshold.cc, * milena/tests/core/image/flat_image.cc, * milena/tests/core/image/tr_image.cc, * milena/tests/core/other/dpoints_pixter.cc, * milena/tests/core/site_set/p_priority_queue.cc, * milena/tests/core/site_set/p_priority_queue_fast.cc, * milena/tests/core/site_set/p_priority_queue_fast_with_array.cc, * milena/tests/core/site_set/pset_array.cc, * milena/tests/core/site_set/pset_if.cc, * milena/tests/level/sort_psites_full.cc, * milena/tests/morpho/line_graph_image_wst.cc, * milena/tests/morpho/meyer_wst.cc, * milena/tests/morpho/meyer_wst_long.cc, * milena/tests/test/positive.cc, * milena/tests/value/builtin/builtin.cc: Fix \file tag with the proper file name. * milena/doc/Doxyfile.in: Add new macro expansions. * milena/doc/Makefile.am: set EXCLUDE_SYMBOLS properly when making the user doc. --- doc/Doxyfile.in | 11 ++++++++++- doc/Makefile.am | 5 ++++- mln/core/image/flat_image.hh | 2 +- mln/core/internal/site_relative_iterator_base.hh | 2 +- mln/core/site_set/line2d.hh | 2 +- mln/core/site_set/p_if_piter.hh | 2 +- mln/core/site_set/p_priority.hh | 2 +- mln/trait/image/props.hh | 4 ++++ mln/util/internal/boost_graph_structure.hh | 2 +- mln/util/internal/graph_base.hh | 2 +- tests/algebra/h_vec.cc | 2 +- tests/binarization/threshold.cc | 2 +- tests/core/image/flat_image.cc | 2 +- tests/core/image/tr_image.cc | 2 +- tests/core/other/dpoints_pixter.cc | 2 +- tests/core/site_set/p_priority_queue.cc | 2 +- tests/core/site_set/p_priority_queue_fast.cc | 2 +- tests/core/site_set/p_priority_queue_fast_with_array.cc | 4 ++-- tests/core/site_set/pset_array.cc | 2 +- tests/core/site_set/pset_if.cc | 2 +- tests/level/sort_psites_full.cc | 2 +- tests/morpho/line_graph_image_wst.cc | 2 +- tests/morpho/meyer_wst.cc | 2 +- tests/morpho/meyer_wst_long.cc | 2 +- tests/test/positive.cc | 2 +- tests/value/builtin/builtin.cc | 2 +- 26 files changed, 42 insertions(+), 26 deletions(-) Index: branches/cleanup-2008/milena/tests/core/site_set/p_priority_queue_fast.cc =================================================================== --- branches/cleanup-2008/milena/tests/core/site_set/p_priority_queue_fast.cc (revision 2223) +++ branches/cleanup-2008/milena/tests/core/site_set/p_priority_queue_fast.cc (revision 2224) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/site_set/p_priority_fast.cc +/*! \file tests/core/site_set/p_priority_queue_fast.cc * * \brief Tests on mln::p_priority_fast. */ Index: branches/cleanup-2008/milena/tests/core/site_set/p_priority_queue.cc =================================================================== --- branches/cleanup-2008/milena/tests/core/site_set/p_priority_queue.cc (revision 2223) +++ branches/cleanup-2008/milena/tests/core/site_set/p_priority_queue.cc (revision 2224) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/site_set/p_priority.cc +/*! \file tests/core/site_set/p_priority_queue.cc * * \brief Tests on mln::p_priority. */ Index: branches/cleanup-2008/milena/tests/core/site_set/pset_array.cc =================================================================== --- branches/cleanup-2008/milena/tests/core/site_set/pset_array.cc (revision 2223) +++ branches/cleanup-2008/milena/tests/core/site_set/pset_array.cc (revision 2224) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file mln/core/pset_array.hh +/*! \file tests/core/site_set/pset_array.cc * * \brief Tests for the pset array. */ Index: branches/cleanup-2008/milena/tests/core/site_set/pset_if.cc =================================================================== --- branches/cleanup-2008/milena/tests/core/site_set/pset_if.cc (revision 2223) +++ branches/cleanup-2008/milena/tests/core/site_set/pset_if.cc (revision 2224) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/site_set/p_if.cc +/*! \file tests/core/site_set/pset_if.cc * * \brief Tests on mln::p_if. */ Index: branches/cleanup-2008/milena/tests/core/site_set/p_priority_queue_fast_with_array.cc =================================================================== --- branches/cleanup-2008/milena/tests/core/site_set/p_priority_queue_fast_with_array.cc (revision 2223) +++ branches/cleanup-2008/milena/tests/core/site_set/p_priority_queue_fast_with_array.cc (revision 2224) @@ -25,13 +25,13 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/site_set/p_priority_fast_with_array.cc +/*! \file tests/core/site_set/p_priority_queue_fast_with_array.cc * * \brief Tests on mln::p_priority_fast_with_array. */ #include <mln/core/alias/point2d.hh> -#include <mln/core/p_priority_fast_with_array.hh> +#include <mln/core/p_priority_queue_fast_with_array.hh> int main () { Index: branches/cleanup-2008/milena/tests/core/other/dpoints_pixter.cc =================================================================== --- branches/cleanup-2008/milena/tests/core/other/dpoints_pixter.cc (revision 2223) +++ branches/cleanup-2008/milena/tests/core/other/dpoints_pixter.cc (revision 2224) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/dpoints_pixter.cc +/// \file tests/core/other/dpoints_pixter.cc /// \brief Test on mln::dpoints_fwd_pixter and mln::dpoints_bkd_pixter. #include <mln/core/image/image1d.hh> Index: branches/cleanup-2008/milena/tests/core/image/tr_image.cc =================================================================== --- branches/cleanup-2008/milena/tests/core/image/tr_image.cc (revision 2223) +++ branches/cleanup-2008/milena/tests/core/image/tr_image.cc (revision 2224) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/tr_image.cc +/*! \file tests/core/image/tr_image.cc * * \brief Tests on mln::tr_image. */ Index: branches/cleanup-2008/milena/tests/core/image/flat_image.cc =================================================================== --- branches/cleanup-2008/milena/tests/core/image/flat_image.cc (revision 2223) +++ branches/cleanup-2008/milena/tests/core/image/flat_image.cc (revision 2224) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/core/flat_image.cc +/*! \file tests/core/image/flat_image.cc * * \brief Tests on mln::flat_image. */ Index: branches/cleanup-2008/milena/tests/level/sort_psites_full.cc =================================================================== --- branches/cleanup-2008/milena/tests/level/sort_psites_full.cc (revision 2223) +++ branches/cleanup-2008/milena/tests/level/sort_psites_full.cc (revision 2224) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/level/sort_points_full.cc +/*! \file tests/level/sort_psites_full.cc * * \brief Tests on mln::level::sort_points. */ Index: branches/cleanup-2008/milena/tests/value/builtin/builtin.cc =================================================================== --- branches/cleanup-2008/milena/tests/value/builtin/builtin.cc (revision 2223) +++ branches/cleanup-2008/milena/tests/value/builtin/builtin.cc (revision 2224) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/value/builtin.cc +/*! \file tests/value/builtin/builtin.cc * * \brief Tests on mln::trait::op with a builtin. */ Index: branches/cleanup-2008/milena/tests/test/positive.cc =================================================================== --- branches/cleanup-2008/milena/tests/test/positive.cc (revision 2223) +++ branches/cleanup-2008/milena/tests/test/positive.cc (revision 2224) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/test/test_positive.cc +/*! \file tests/test/positive.cc * * \brief Tests on mln::test::positive. */ Index: branches/cleanup-2008/milena/tests/binarization/threshold.cc =================================================================== --- branches/cleanup-2008/milena/tests/binarization/threshold.cc (revision 2223) +++ branches/cleanup-2008/milena/tests/binarization/threshold.cc (revision 2224) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/binarization/thresholding.cc +/// \file tests/binarization/threshold.cc /// \brief Test on mln::binarization::threshold. #include <mln/core/image/image2d.hh> Index: branches/cleanup-2008/milena/tests/algebra/h_vec.cc =================================================================== --- branches/cleanup-2008/milena/tests/algebra/h_vec.cc (revision 2223) +++ branches/cleanup-2008/milena/tests/algebra/h_vec.cc (revision 2224) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/h_vec.cc +/*! \file tests/algebra/h_vec.cc * * \brief Tests on mln::algebra::h_vec. */ Index: branches/cleanup-2008/milena/tests/morpho/meyer_wst_long.cc =================================================================== --- branches/cleanup-2008/milena/tests/morpho/meyer_wst_long.cc (revision 2223) +++ branches/cleanup-2008/milena/tests/morpho/meyer_wst_long.cc (revision 2224) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/morpho/extrema_components.cc +/// \file tests/morpho/meyer_wst_long.cc // /\brief Test on mln::morpho::extrema_components #include <iostream> Index: branches/cleanup-2008/milena/tests/morpho/line_graph_image_wst.cc =================================================================== --- branches/cleanup-2008/milena/tests/morpho/line_graph_image_wst.cc (revision 2223) +++ branches/cleanup-2008/milena/tests/morpho/line_graph_image_wst.cc (revision 2224) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/core/line_graph_image.cc +/// \file tests/morpho/line_graph_image_wst.cc /// \brief Tests on the Watershed Transform on a mln::line_graph_image. #include <vector> Index: branches/cleanup-2008/milena/tests/morpho/meyer_wst.cc =================================================================== --- branches/cleanup-2008/milena/tests/morpho/meyer_wst.cc (revision 2223) +++ branches/cleanup-2008/milena/tests/morpho/meyer_wst.cc (revision 2224) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/morpho/extrema_components.cc +/// \file tests/morpho/meyer_wst.cc // /\brief Test on mln::morpho::extrema_components #include <iostream> Index: branches/cleanup-2008/milena/doc/Doxyfile.in =================================================================== --- branches/cleanup-2008/milena/doc/Doxyfile.in (revision 2223) +++ branches/cleanup-2008/milena/doc/Doxyfile.in (revision 2224) @@ -82,6 +82,7 @@ EXCLUDE = @top_srcdir@/milena/sandbox EXCLUDE_SYMLINKS = YES EXCLUDE_PATTERNS = *spe.hh +EXCLUDE_SYMBOLS = EXAMPLE_PATH = EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO @@ -210,7 +211,15 @@ "mln_mesh(T)=typename T::mesh" \ "mln_coord(T)=typename T::coord" \ "mln_point(T)=typename T::point" \ - "mln_dpoint(T)=typename T::dpoint" + "mln_dpoint(T)=typename T::dpoint" \ + "mln_accu_with(A, T)=typename A::template with< T >::ret" \ + "mln_trait_op_plus(L, R)=typename mln::trait::op::plus< L , R >::ret" \ + "mln_trait_op_minus(L, R)=typename mln::trait::op::minus< L , R >::ret" \ + "mln_trait_op_times(L, R)=typename mln::trait::op::times< L , R >::ret" \ + "mln_trait_op_div(L, R)=typename mln::trait::op::div< L , R >::ret" \ + "mln_trait_op_mod(L, R)=typename mln::trait::op::mod< L , R >::ret" \ + "mln_trait_op_uminus(T)=typename mln::trait::op::uminus< T >::ret" + EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- Index: branches/cleanup-2008/milena/doc/Makefile.am =================================================================== --- branches/cleanup-2008/milena/doc/Makefile.am (revision 2223) +++ branches/cleanup-2008/milena/doc/Makefile.am (revision 2224) @@ -40,7 +40,10 @@ -e 's,HIDE_IN_BODY_DOCS = NO,HIDE_IN_BODY_DOCS = YES,g' \ -e 's,INTERNAL_DOCS = YES,INTERNAL_DOCS = NO,g' \ -e 's,GENERATE_TODOLIST = YES,GENERATE_TODOLIST = NO,g' \ - -e 's,PROJECT_NUMBER = \",PROJECT_NUMBER = \"User documentation ,g' + -e 's,PROJECT_NUMBER = \",PROJECT_NUMBER = \"User documentation ,g' \ + -e 's,EXCLUDE_SYMBOLS =,EXCLUDE_SYMBOLS = mln::internal::*,g' + + EXTRA_DIST = Doxyfile.in Index: branches/cleanup-2008/milena/mln/trait/image/props.hh =================================================================== --- branches/cleanup-2008/milena/mln/trait/image/props.hh (revision 2223) +++ branches/cleanup-2008/milena/mln/trait/image/props.hh (revision 2224) @@ -104,6 +104,8 @@ // \ | // -- + -- cell_and_value_wise +// * domain values + // value_io: /any/ // | // + -- read_only @@ -152,6 +154,8 @@ // | // + -- extendable +// * extension values + // ext_value: /any/ // | // + -- irrelevant Index: branches/cleanup-2008/milena/mln/core/site_set/p_priority.hh =================================================================== --- branches/cleanup-2008/milena/mln/core/site_set/p_priority.hh (revision 2223) +++ branches/cleanup-2008/milena/mln/core/site_set/p_priority.hh (revision 2224) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_P_PRIORITY_HH # define MLN_CORE_P_PRIORITY_HH -/*! \file mln/core/p_priority.hh +/*! \file mln/core/site_set/p_priority.hh * * \brief Definition of a priority queue of sites. * Index: branches/cleanup-2008/milena/mln/core/site_set/line2d.hh =================================================================== --- branches/cleanup-2008/milena/mln/core/site_set/line2d.hh (revision 2223) +++ branches/cleanup-2008/milena/mln/core/site_set/line2d.hh (revision 2224) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_P_LINE2D_HH # define MLN_CORE_P_LINE2D_HH -/*! \file mln/core/p_line2d.hh +/*! \file mln/core/site_set/line2d.hh * * \brief Definition of a 2D discrete line of points (based on * p_array). Index: branches/cleanup-2008/milena/mln/core/site_set/p_if_piter.hh =================================================================== --- branches/cleanup-2008/milena/mln/core/site_set/p_if_piter.hh (revision 2223) +++ branches/cleanup-2008/milena/mln/core/site_set/p_if_piter.hh (revision 2224) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_SITE_SET_P_IF_PITER_HH # define MLN_CORE_SITE_SET_P_IF_PITER_HH -/*! \file mln/core/p_if_piter.hh +/*! \file mln/core/site_set/p_if_piter.hh * * \brief Definition of iterators on p_if<S,F>. */ Index: branches/cleanup-2008/milena/mln/core/image/flat_image.hh =================================================================== --- branches/cleanup-2008/milena/mln/core/image/flat_image.hh (revision 2223) +++ branches/cleanup-2008/milena/mln/core/image/flat_image.hh (revision 2224) @@ -29,7 +29,7 @@ # define MLN_CORE_FLAT_IMAGE_HH /*! - * \file mln/core/flat_image.hh + * \file mln/core/image/flat_image.hh * * \brief Definition of a image with a signle value. * Index: branches/cleanup-2008/milena/mln/core/internal/site_relative_iterator_base.hh =================================================================== --- branches/cleanup-2008/milena/mln/core/internal/site_relative_iterator_base.hh (revision 2223) +++ branches/cleanup-2008/milena/mln/core/internal/site_relative_iterator_base.hh (revision 2224) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_SITE_RELATIVE_ITERATOR_BASE_HH # define MLN_CORE_SITE_RELATIVE_ITERATOR_BASE_HH -/*! \file mln/core/site_relative_iterator_base.hh +/*! \file mln/core/internal/site_relative_iterator_base.hh * * \brief Definition of forward and backward mln::dpoint_ based * iterators. Index: branches/cleanup-2008/milena/mln/util/internal/boost_graph_structure.hh =================================================================== --- branches/cleanup-2008/milena/mln/util/internal/boost_graph_structure.hh (revision 2223) +++ branches/cleanup-2008/milena/mln/util/internal/boost_graph_structure.hh (revision 2224) @@ -26,7 +26,7 @@ // Public License. -/// \file mln/util/internal/boost_graph_struture.hh +/// \file mln/util/internal/boost_graph_structure.hh /// \brief Operations that interract with the boost_graph structure. #ifndef MLN_UTIL_INTERNAL_BOOST_GRAPH_STRUCTURE_HH_ Index: branches/cleanup-2008/milena/mln/util/internal/graph_base.hh =================================================================== --- branches/cleanup-2008/milena/mln/util/internal/graph_base.hh (revision 2223) +++ branches/cleanup-2008/milena/mln/util/internal/graph_base.hh (revision 2224) @@ -28,7 +28,7 @@ #ifndef MLN_UTIL_INTERNAL_GRAPH_BASE_HH # define MLN_UTIL_INTERNAL_GRAPH_BASE_HH -/// \file mln/util/internal/graph.hh +/// \file mln/util/internal/graph_base.hh /// \brief Factored implementation of undirected graphs. # include <cstddef>

16 years, 4 months

cleanup-2008 r2223: Add missing init_() to pw::image

by Guillaume Lazzara

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-09-11 Guillaume Lazzara <z(a)lrde.epita.fr> Add missing init_() to pw::image. * milena/mln/pw/image.hh: Add missing init_(). --- image.hh | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) Index: branches/cleanup-2008/milena/mln/pw/image.hh =================================================================== --- branches/cleanup-2008/milena/mln/pw/image.hh (revision 2222) +++ branches/cleanup-2008/milena/mln/pw/image.hh (revision 2223) @@ -136,11 +136,15 @@ /// Constructor. image(const Function_p2v<F>& f, const Site_Set<S>& ps); - // No init_ method here since this image type is not "concrete". + /// Initialize an empty image. + void init_(const Function_p2v<F>& f, const Site_Set<S>& ps); /// Give the definition domain. const S& domain() const; + /// Returns the function which compute a site value. + F function() const; + /// Read-only access of pixel value at point site \p p. mln_result(F) operator()(const mln_psite(S)& p) const; @@ -150,10 +154,35 @@ } // end of namespace mln::pw + template <typename F, typename S> + void init_(tag::function_t, Function_p2v<F>& target, + const mln::pw::image<F,S>& model); + + template <typename F, typename S, typename J> + void init_(tag::image_t, mln::pw::image<F,S>& target, const J& model); # ifndef MLN_INCLUDE_ONLY + // init_ + + template <typename F, typename S> + void init_(tag::function_t, Function_p2v<F>& target, + const mln::pw::image<F,S>& model) + { + target = model.function(); + } + + template <typename F, typename S, typename J> + void init_(tag::image_t, mln::pw::image<F,S>& target, const J& model) + { + F f; + init_(tag::function, f, model); + S s; + init_(tag::domain, s, model); + target.init_(f, s); + } + // Operator. template <typename F, typename S> @@ -200,6 +229,14 @@ template <typename F, typename S> inline + void + image<F,S>::init_(const Function_p2v<F>& f, const Site_Set<S>& ps) + { + this->data_ = new internal::data< image<F,S> >(exact(f), exact(ps)); + } + + template <typename F, typename S> + inline const S& image<F,S>::domain() const { @@ -208,6 +245,15 @@ template <typename F, typename S> inline + F + image<F,S>:: function() const + { + return this->data_->f_; + } + + + template <typename F, typename S> + inline mln_result(F) image<F,S>::operator()(const mln_psite(S)& p) const {

16 years, 4 months

milena r2222: Clean morpho::erosion

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-09-11 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Clean morpho::erosion. * mln/morpho/erosion.hh, * mln/morpho/erosion.spe.hh: Clean the specialized versions of erosion. The new versions have the same signature than the facade. Add a new dispatch. * mln/win/rectangle2d.hh: Update an old include --- morpho/erosion.hh | 45 ++---- morpho/erosion.spe.hh | 325 ++++++++++++++------------------------------------ win/rectangle2d.hh | 2 3 files changed, 114 insertions(+), 258 deletions(-) Index: branches/cleanup-2008/milena/mln/win/rectangle2d.hh =================================================================== --- branches/cleanup-2008/milena/mln/win/rectangle2d.hh (revision 2221) +++ branches/cleanup-2008/milena/mln/win/rectangle2d.hh (revision 2222) @@ -35,7 +35,7 @@ * \todo Reactivate includes at EOF. */ -# include <mln/core/window.hh> +# include <mln/core/alias/window2d.hh> namespace mln Index: branches/cleanup-2008/milena/mln/morpho/erosion.spe.hh =================================================================== --- branches/cleanup-2008/milena/mln/morpho/erosion.spe.hh (revision 2221) +++ branches/cleanup-2008/milena/mln/morpho/erosion.spe.hh (revision 2222) @@ -40,31 +40,6 @@ * * \brief Specialization for mln::morpho::erosion. * - * Dispatch of erosion(input, win, output): - * - * If win = rectangle - * -> particular case - * Else If win = octagon - * -> particular case - * Else - * (If win is quite agglomerated (disjonction) - * -> using incremental algorithm - * Else - * -> using conventional algorithm) - * If input value kind = logical - * -> If image is Fast - * -> particular case on sets - * Else - * -> general case on sets - * Else - * If input value are high quantified - * -> using conventional accumulator - * Else - * -> using histogram based accumulator - * If image is Fast - * -> particular case on functions - * Else - * -> general case on functions * */ @@ -82,6 +57,27 @@ erosion(const Image& input, const Window<W>& win); + namespace internal + { + template <typename I, typename W> + mln_concrete(I) + erosion_dispatch(const Image& input, const Window<W>& win) + { + if (mlc_equal(mln_trait_image_kind(I)(), + trait::image::kind::logic)::value == true) + if (mlc_equal(mln_trait_image_speed(I)(), + trait::image::speed::fastest)::value == true) + impl::erosion_on_set_fastest(input, win); + else + impl::generic::erosion_on_set(input, win); + else + if (mlc_equal(mln_trait_image_speed(I)(), + trait::image::speed::fastest)::value == true) + impl::erosion_on_function_fastest(input, win); + else + impl::generic::erosion_on_function(input, win); + } + namespace impl { @@ -91,43 +87,27 @@ // Implementation is in mln/morpho/erosion.hh. template <typename I, typename W> mln_concrete(I) - erosion_on_function_(const I& input, const W& win); + erosion_on_function(const Image& input_, const Window<W>& win_); // Fwd decl. // Implementation is in mln/morpho/erosion.hh. template <typename I, typename W> mln_concrete(I) - erosion_on_set_(const I& input, const W& win); + erosion_on_set(const Image& input_, const Window<W>& win_); } - template <typename I, typename W> - inline mln_concrete(I) - erosion_iterative_(trait::image::kind::any, - trait::image::speed::any, - const I& input, const W& win) + erosion_on_function_fastest(const Image& input_, const Window<W>& win_) { - return generic::erosion_on_function_(input, win); - } - - - template <typename I, typename W> - inline - mln_concrete(I) - erosion_iterative_(trait::image::kind::any, - trait::image::speed::fastest, - const I& input, const W& win) - { - trace::entering("morpho::impl::erosion_iterative_(kind::any, speed::fastest)"); - - border::adjust(input, win.delta()); + trace::entering("morpho::impl::erosion_on_function_fastest"); typedef mln_concrete(I) O; + const I& input = exact(input_); + const W& win = exact(win_); O output; - initialize(output, input); - mln_assertion(border::get(output) == border::get(input)); + initialize(output, input); border::fill(input, mln_max(mln_value(I))); mln_pixter(const I) p(input); @@ -141,230 +121,119 @@ min.take(q.val()); o.val() = min.to_result(); } - trace::exiting("morpho::impl::erosion_iterative_(kind::any, speed::fastest)"); - return output; - } + trace::exiting("morpho::impl::erosion_on_function_fastest"); - template <typename I, typename W> - inline - mln_concrete(I) - erosion_iterative_(trait::image::kind::logic, - trait::image::speed::any, - const I& input, const W& win) - { - return generic::erosion_on_set_(input, win); + return output; } - template <typename I, typename W> - inline mln_concrete(I) - erosion_iterative_(trait::image::kind::logic, - trait::image::speed::fastest, - const I& input, const W& win) + erosion_on_set_fastest(const Image& input_, const Window<W>& win_) { - trace::entering("morpho::impl::erosion_iterative_(kind::logic, speed::fastest)"); + trace::entering("morpho::impl::erosion_on_set_fastest"); - border::adjust(input, win.delta()); - border::fill(input, true); typedef mln_concrete(I) O; + const I& input = exact(input_); + const W& win = exact(win_); O output; - mln_pixter(const I) p(input); - mln_qixter(const I, W) q(p, win); - - if (win.is_centered()) - { - output = clone(input); - - mln_pixter(O) p_out(output); - for_all_2(p, p_out) - // Consider P only if its value is `true' (the erosion - // is anti-extensive). - if (p.val()) - for_all(q) - if (! q.val()) - { - // Assign `false' to the value of P_OUT as soon - // as a `false' value is found in its vicinity. - p_out.val() = false; - break; - } - } - else - { initialize(output, input); - level::fill(output, input); + border::fill(input, true); + mln_pixter(const I) p(input); mln_pixter(O) p_out(output); for_all_2(p, p_out) - for_all(q) { - // Stop as soon as a `false' value is found the - // window. - if (! q.val()) + for_all(q) + if (q.val() == false) break; - // If a `false' value was not found, then Q is now - // invalid (past the end of the window), and vice - // versa. Use this information to assign P_OUT. p_out.val() = ! q.is_valid(); } - } - trace::exiting("morpho::impl::erosion_iterative_(kind::logic, speed::fastest)"); + trace::exiting("morpho::impl::erosion_on_set_fastest"); + return output; } - // Facade. template <typename I, typename W> - inline mln_concrete(I) - erosion_iterative_(const I& input, const W& win) + erosion_on_set_centered(const Image& input_, const Window<W>& win_) { - return erosion_iterative_(mln_trait_image_kind(I)(), - mln_trait_image_speed(I)(), - input, win); - } - + trace::entering("morpho::impl::erosion_on_set_centered"); + typedef mln_concrete(I) O; + const I& input = exact(input_); + const W& win = exact(win_); + O output; + border::fill(input, true); - // // Old code. - - - - // // Stage 5: dispatch w.r.t. fast property - // // | - // // V - - // template <typename I, typename W, typename O> - // void erosion_set_wrt_fast(trait::image::speed::any, const I& input, - // const W& win, O& output) - // { - // generic::erosion_on_set(input, win, output); - // } - - // template <typename I, typename W, typename O> - // void erosion_set_wrt_fast(trait::image::speed::fastest, const I& input, - // const W& win, O& output) - // { - // impl::erosion_on_set_fast(input, win, output); - // } - - // template <typename I, typename W, typename O, typename A> - // void erosion_fun_wrt_fast(trait::image::speed::any, const I& input, - // const W& win, O& output, A& min) - // { - // generic::erosion_on_function(input, win, output, min); - // } - - // template <typename I, typename W, typename O, typename A> - // void erosion_fun_wrt_fast(trait::image::speed::fastest, const I& input, - // const W& win, O& output, A& min) - // { - // impl::erosion_on_function_fast(input, win, output, min); - // } - - // // ^ - // // | - // // end of stage 5 (dispatch w.r.t. fast property) - - // // Stage 4: dispatch w.r.t. data quantification - // // | - // // V - - // template <typename I, typename W, typename O> - // void erosion_wrt_data(trait::image::quant::high, const I& input, - // const W& win, O& output) - // { - // accu::min_<mln_value(I)> min; - // impl::erosion_fun_wrt_fast(mln_trait_image_speed(I)(), input, - // win, output, min); - // } - - // template <typename I, typename W, typename O> - // void erosion_wrt_data(trait::image::quant::low, const I& input, - // const W& win, O& output) - // { - // accu::min_h<mln_vset(I)> min; - // impl::erosion_fun_wrt_fast(mln_trait_image_speed(I)(), input, - // win, output, min); - // } - - // // ^ - // // | - // // end of stage 4 (dispatch w.r.t. the data quantification) - - // // Stage 3: dispatch w.r.t. the value type - // // | - // // V - - // template <typename I, typename W, typename O> - // void erosion_wrt_value(const I& input, const W& win, O& output) - // { - // if (mlc_is(mln_trait_image_kind(I), trait::image::kind::logic)::value) - // impl::erosion_set_wrt_fast(mln_trait_image_speed(I)(), input, - // win, output); - // // | - // // `--> call stage 5: dispatch w.r.t. fast property - // else - // impl::erosion_wrt_data(mln_trait_image_quant(I)(), input, - // win, output); - // // | - // // `--> call stage 4: dispatch w.r.t. the data quantification - // } - - // // ^ - // // | - // // end of stage 3 (dispatch w.r.t. the value type) - - - - // // Stage 2: dispatch w.r.t. the window morphology - // // | - // // V - - // template <typename I, typename W, typename O> - // void erosion_wrt_mor(const I& input, const W& win, O& output) - // { - // // FIXME : Choose the right algorithm between : - // impl::erosion_wrt_value(input, win, output); - // // and : - // // impl::erosion_incr_wrt_value(input, win, output); - // } - - // // ^ - // // | - // // end of stage 2 (dispatch w.r.t. the window morphology) + output = clone(input); + mln_piter(I) p(input.domain()); + mln_qiter(W) q(win, p); + for_all(p) + if (input(p) == true) + for_all(q) if (input.has(q)) + if (input(q) == false) + { + output(p) = false; + break; + } + trace::exiting("morpho::impl::erosion_on_set_centered"); + return output; + } + template <typename I, typename W> + mln_concrete(I) + erosion_on_set_centered_fastest(const Image& input_, const Window<W>& win_) + { + trace::entering("morpho::impl::erosion_on_set_centered_fastest"); + typedef mln_concrete(I) O; + const I& input = exact(input_); + const W& win = exact(win_); + O output; + border::fill(input, true); - template <typename I, typename W> - inline - mln_concrete(I) - erosion_(const I& input, const W& win) + output = clone(input); + mln_pixter(const I) p(input); + mln_qixter(const I, W) q(p, win); + mln_pixter(O) p_out(output); + for_all_2(p, p_out) + if (p.val() == true) + for_all(q) + if (q.val() == false) { - // FIXME - return impl::erosion_iterative_(input, win); + p_out.val() = false; + break; + } + trace::exiting("morpho::impl::erosion_on_set_centered_fastest"); + + return output; } template <typename I> inline mln_concrete(I) - erosion_(const I& input, const win::rectangle2d& win) + erosion_rectangle2d(const Image& input_, const Window<W>& win_) { - trace::entering("morpho::impl::erosion_(win::rectangle2d)"); + mlc_equal(W, win::rectangle2d)::check(); + + trace::entering("morpho::impl::erosion_rectangle2d"); + + const I& input = exact(input_); + const W& win = exact(win_); mln_concrete(I) temp, output; temp = morpho::erosion(input, win::hline2d(win.width())); output = morpho::erosion(temp, win::vline2d(win.height())); - trace::exiting("morpho::impl::erosion_(win::rectangle2d)"); + trace::exiting("morpho::impl::erosion_rectangle2d"); return output; } @@ -372,9 +241,11 @@ template <typename I> inline mln_concrete(I) - erosion_(const I& input, const win::octagon2d& win) + erosion_octagon2d(const I& input, const win::octagon2d& win) { - trace::entering("morpho::impl::erosion_(win::octagon2d)"); + mlc_equal(W, win::octagon2d)::check(); + + trace::entering("morpho::impl::erosion_octagon2d"); const unsigned len = win.length() / 3 + 1; mln_concrete(I) temp_1, temp_2, output; @@ -387,8 +258,6 @@ return output; } - - } // end of namespace mln::morpho::impl } // end of namespace mln::morpho Index: branches/cleanup-2008/milena/mln/morpho/erosion.hh =================================================================== --- branches/cleanup-2008/milena/mln/morpho/erosion.hh (revision 2221) +++ branches/cleanup-2008/milena/mln/morpho/erosion.hh (revision 2222) @@ -63,9 +63,12 @@ template <typename I, typename W> inline mln_concrete(I) - erosion_on_function_(const I& input, const W& win) + erosion_on_function(const Image& input_, const Window<W>& win_); { - trace::entering("morpho::impl::generic::erosion_on_function_"); + trace::entering("morpho::impl::generic::erosion_on_function"); + + const I& input = exact(input_); + const W& win = exact(win_); mln_concrete(I) output; initialize(output, input); @@ -76,12 +79,12 @@ for_all(p) { min.init(); - for_all(q) if (input.owns_(q)) + for_all(q) if (input.has(q)) min.take(input(q)); output(p) = min; } - trace::exiting("morpho::impl::generic::erosion_on_function_"); + trace::exiting("morpho::impl::generic::erosion_on_function"); return output; } @@ -90,41 +93,25 @@ template <typename I, typename W> inline mln_concrete(I) - erosion_on_set_(const I& input, const W& win) + erosion_on_set(const Image& input_, const Window<W>& win_); { - trace::entering("morpho::impl::generic::erosion_on_set_"); + trace::entering("morpho::impl::generic::erosion_on_set"); + + const I& input = exact(input_); + const W& win = exact(win_); mln_piter(I) p(input.domain()); mln_qiter(W) q(win, p); mln_concrete(I) output; - - if (win.is_centered()) - { - output = clone(input); - for_all(p) - if (input(p)) - for_all(q) if (input.owns_(q)) - if (! input(q)) - { - output(p) = false; - break; - } - } - else - { - initialize(output, input); for_all(p) { - for_all(q) if (input.owns_(q)) - if (! input(q)) + for_all(q) if (input.has(q)) + if (input(q) == false) break; - // If there was no break (so q is not valid) then - // output(p) <- true; otherwise, output(p) <- false. output(p) = ! q.is_valid(); } - } - trace::exiting("morpho::impl::generic::erosion_on_set_"); + trace::exiting("morpho::impl::generic::erosion_on_set"); return output; } @@ -145,7 +132,7 @@ mln_precondition(exact(input).has_data()); mln_precondition(! exact(win).is_empty()); - mln_concrete(I) output = impl::erosion_(exact(input), exact(win)); + mln_concrete(I) output = internal::erosion_dispatch(input, win); if (exact(win).is_centered()) mln_postcondition(output <= input);

16 years, 4 months

cleanup-2008 2221: Add a window-to-neighborhood adapter.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008 Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add a window-to-neighborhood adapter. * milena/mln/core/internal/window_base.hh (is_neighbable_): New. * milena/mln/core/neighb.hh: Revamp. internal/window_base.hh | 12 ++++ neighb.hh | 116 ++++++++++++++++++++++++++++++------------------ 2 files changed, 86 insertions(+), 42 deletions(-) Index: milena/mln/core/internal/window_base.hh --- milena/mln/core/internal/window_base.hh (revision 2220) +++ milena/mln/core/internal/window_base.hh (working copy) @@ -60,6 +60,10 @@ /// Site associated type. typedef mln_site(D) site; + /// Test if this window can be a neighborhood. + // This method is used in the neighborhood window-adapter. + bool is_neighbable_() const; + protected: window_base(); }; @@ -73,6 +77,14 @@ { } + template <typename D, typename E> + inline + bool + window_base<D,E>::is_neighbable_() const + { + return exact(this)->is_symmetric() && ! exact(this)->is_centered(); + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::internal Index: milena/mln/core/neighb.hh --- milena/mln/core/neighb.hh (revision 2220) +++ milena/mln/core/neighb.hh (working copy) @@ -30,75 +30,107 @@ /*! \file mln/core/neighb.hh * - * \brief Definition of the generic neighborhood class mln::neighb. + * \brief Definition of a window-to-neighborhood adapter. */ # include <mln/core/internal/neighborhood_base.hh> -# include <mln/core/internal/basic_window_impl.hh> -# include <mln/core/internal/neighborhood_impl_mixin.hh> -# include <mln/core/window.hh> -# include <mln/literal/zero.hh> namespace mln { - /*! \brief Generic neighborhood class. - * - * This neighborhood of window is just like a set of delta-points. - * The parameter is \c D, type of delta-point. + /*! \brief Adapter class from window to neighborhood. */ - template <typename D> - struct neighb : internal::neighborhood_base< D, neighb<D> >, - internal::neighborhood_impl_mixin< internal::basic_window_impl< D, neighb<D> >, - neighb<D> > + template <typename W> + class neighb : public internal::neighborhood_base< mln_dpsite(W), neighb<D> >, + private mlc_is_a(W, Window)::check_t { - /*! \brief Constructor without argument. - * - * The constructed neighborhood is empty. You have to use insert() - * to proceed to the neighborhood definition. - */ + public: + + /// Forward site iterator associated type. + typedef mln_fwd_qiter(W) fwd_niter; + + /// Backward site iterator associated type. + typedef mln_bkd_qiter(W) bkd_niter; + + /// Site iterator associated type. + typedef mln_qiter(W) niter; + + + /// Constructor without argument. neighb(); - // Overridden from internal::basic_window_impl so that it also - // inserts \a -dp. - neighb<D>& insert_(const D& dp); - - typedef mln::window<D> window; - - window to_window() const - { - window tmp(this->dps_); - D zero = literal::zero; - tmp.insert(zero); - return tmp; - } + /// Constructor from a window \p win. + neighb(const W& win); + + /// Get the corresponding window. + const W& win() const; + + private: + W win_; }; + + namespace convert + { + namespace impl + { + + template <typename W> + void + from_to_(const mln::neighb<W>& from, W& to); + + } // end of namespace convert::impl + + } // end of namespace convert + + + # ifndef MLN_INCLUDE_ONLY - template <typename D> + template <typename W> inline - neighb<D>::neighb() + neighb<W>::neighb() { } - template <typename D> + template <typename W> inline - neighb<D>& - neighb<D>::insert_(const D& dp) + neighb<W>::neighb(const W& win) { - typedef neighb<D> self; - typedef internal::basic_window_impl< D, neighb<D> > win_impl; - typedef internal::neighborhood_impl_mixin< win_impl, neighb<D> > super_; - this->super_::insert_( dp); - this->super_::insert_(-dp); - return *this; + mln_precondition(win.is_neighbable_()); + win_ = win; } + template <typename W> + inline + const W& + neighb<W>::win() const + { + return win_; + } + + + namespace convert + { + namespace impl + { + + template <typename W> + void + from_to_(const mln::neighb<W>& from, W& to) + { + to = from.win(); + } + + } // end of namespace convert::impl + + } // end of namespace convert + + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln

16 years, 4 months

r2220: Factor iterators on p_complexes with iterator on complexes.

by Roland Levillain

* mln/core/p_complex_piter.hh (mln::p_complex_fwd_piter_<D, P>::iter) (mln::p_complex_bkd_piter_<D, P>::iter): New typedef. (mln::p_complex_fwd_piter_<D, P>::face_) (mln::p_complex_bkd_piter_<D, P>::face_): Remove member. (mln::p_complex_fwd_piter_<D, P>::iter_) (mln::p_complex_bkd_piter_<D, P>::iter_): New member. (mln::p_complex_fwd_piter_<D, P>::p_complex_fwd_piter_) (mln::p_complex_bkd_piter_<D, P>::p_complex_bkd_piter_): Adjust ctors. (mln::p_complex_fwd_piter_<D, P>::is_valid) (mln::p_complex_fwd_piter_<D, P>::invalidate) (mln::p_complex_fwd_piter_<D, P>::start) (mln::p_complex_fwd_piter_<D, P>::next) (mln::p_complex_fwd_piter_<D, P>::update): Adjust. (mln::p_complex_fwd_piter_<D, P>::invalid_unsigned_) (mln::p_complex_bkd_piter_<D, P>::invalid_unsigned_): Remove, useless. --- milena/ChangeLog | 27 ++++++ milena/mln/core/p_complex_piter.hh | 157 ++++++++---------------------------- 2 files changed, 61 insertions(+), 123 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b40e272..cd60428 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,32 @@ 2008-09-11 Roland Levillain <roland(a)lrde.epita.fr> + Factor iterators on p_complexes with iterator on complexes. + + * mln/core/p_complex_piter.hh + (mln::p_complex_fwd_piter_<D, P>::iter) + (mln::p_complex_bkd_piter_<D, P>::iter): + New typedef. + (mln::p_complex_fwd_piter_<D, P>::face_) + (mln::p_complex_bkd_piter_<D, P>::face_): + Remove member. + (mln::p_complex_fwd_piter_<D, P>::iter_) + (mln::p_complex_bkd_piter_<D, P>::iter_): + New member. + (mln::p_complex_fwd_piter_<D, P>::p_complex_fwd_piter_) + (mln::p_complex_bkd_piter_<D, P>::p_complex_bkd_piter_): + Adjust ctors. + (mln::p_complex_fwd_piter_<D, P>::is_valid) + (mln::p_complex_fwd_piter_<D, P>::invalidate) + (mln::p_complex_fwd_piter_<D, P>::start) + (mln::p_complex_fwd_piter_<D, P>::next) + (mln::p_complex_fwd_piter_<D, P>::update): + Adjust. + (mln::p_complex_fwd_piter_<D, P>::invalid_unsigned_) + (mln::p_complex_bkd_piter_<D, P>::invalid_unsigned_): + Remove, useless. + +2008-09-11 Roland Levillain <roland(a)lrde.epita.fr> + Add default constructors to complexes on iterators. * mln/core/complex_iter.hh diff --git a/milena/mln/core/p_complex_piter.hh b/milena/mln/core/p_complex_piter.hh index 98efc11..d9ce17a 100644 --- a/milena/mln/core/p_complex_piter.hh +++ b/milena/mln/core/p_complex_piter.hh @@ -21,7 +21,7 @@ // 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. +// License. // reasons why the executable file might be covered by the GNU General // Public License. @@ -36,6 +36,7 @@ # include <mln/core/internal/point_iterator_base.hh> # include <mln/core/p_complex.hh> # include <mln/core/complex_psite.hh> +# include <mln/core/complex_iter.hh> // Factor p_complex_fwd_piter_<D, P> and p_complex_bkd_piter_<D, P>. @@ -60,6 +61,9 @@ namespace mln typedef p_complex_fwd_piter_<D, P> self_; typedef internal::point_iterator_base_< P, self_ > super_; + /// The type of the underlying complex iterator. + typedef complex_fwd_iter_<D> iter; + public: // Make definitions from super class available. // FIXME: Is it still meaningful for a complex? @@ -107,27 +111,13 @@ namespace mln /// \} private: - /// The face handle this iterator is pointing to. - any_face_handle<D> face_; + /// The underlying complex iterator. + iter iter_; /// The psite corresponding to this iterator. psite psite_; /// \brief The point associated to this psite. // FIXME: Actually, this is a dummy value! point p_; - - /// \brief An invalid value for both the dimension and the id of - /// the face. - /// - /// Use a function instead of a static constant, since `static' - /// variables needs to be compiled once, which requires a compiled - /// library to avoid duplicate symbols, which is something that - /// was not really planned in Milena. A function tagged `inlined' - /// can appear multiple times in a program, and solves this - /// problem. We rely on the compiler to inline this call. - /// - /// Of course, we could have used UINT_MAX, but it is not very - /// C++. - unsigned invalid_unsigned_() const; }; @@ -153,6 +143,9 @@ namespace mln typedef p_complex_bkd_piter_<D, P> self_; typedef internal::point_iterator_base_< P, self_ > super_; + /// The type of the underlying complex iterator. + typedef complex_bkd_iter_<D> iter; + public: // Make definitions from super class available. // FIXME: Is it still meaningful for a complex? @@ -200,27 +193,13 @@ namespace mln /// \} private: - /// The face handle this iterator is pointing to. - any_face_handle<D> face_; + /// The underlying complex iterator. + iter iter_; /// The psite corresponding to this iterator. psite psite_; /// \brief The point associated to this psite. // FIXME: Actually, this is a dummy value! point p_; - - /// \brief An invalid value for both the dimension and the id of - /// the face. - /// - /// Use a function instead of a static constant, since `static' - /// variables needs to be compiled once, which requires a compiled - /// library to avoid duplicate symbols, which is something that - /// was not really planned in Milena. A function tagged `inlined' - /// can appear multiple times in a program, and solves this - /// problem. We rely on the compiler to inline this call. - /// - /// Of course, we could have used UINT_MAX, but it is not very - /// C++. - unsigned invalid_unsigned_() const; }; @@ -248,15 +227,14 @@ namespace mln : psite_(), p_() { - face_.set_cplx(pc.cplx()); - // Invalidate face_. - invalidate(); + iter_.set_cplx(pc.cplx()); + mln_postcondition(!is_valid()); } template <unsigned D, typename P> inline p_complex_fwd_piter_<D, P>::p_complex_fwd_piter_(const p_complex_fwd_piter_<D, P>& rhs) - : face_(rhs.face_), + : iter_(rhs.iter_), psite_(rhs.psite_), // Dummy value. p_() @@ -270,7 +248,7 @@ namespace mln { if (&rhs == this) return *this; - face_ = rhs.face_; + iter_ = rhs.iter_; psite_ = rhs.psite_; return *this; } @@ -289,7 +267,7 @@ namespace mln bool p_complex_fwd_piter_<D, P>::is_valid() const { - return face_.is_valid(); + return iter_.is_valid(); } template <unsigned D, typename P> @@ -297,50 +275,24 @@ namespace mln void p_complex_fwd_piter_<D, P>::invalidate() { - face_.set_n(invalid_unsigned_()); - face_.set_face_id(invalid_unsigned_()); + iter_.invalidate(); } template <unsigned D, typename P> inline - void + void p_complex_fwd_piter_<D, P>::start() { - face_.set_n(0u); - face_.set_face_id(0u); + iter_.start(); update_(); } template <unsigned D, typename P> inline - void + void p_complex_fwd_piter_<D, P>::next_() { - if (is_valid()) - { - unsigned n = face_.n(); - unsigned face_id = face_.face_id(); - - if (face_id + 1 < face_.cplx().nfaces(n)) - /* FIXME: Provide accessor any_face_handle::n() returning - a mutable reference? This way, we could just write - - ++face_.face_id(); - - instead of the following. */ - face_.set_face_id(face_id + 1); - else - // Start to iterate on the faces of the next dimension if - // possible. - if (n <= D) - { - // FIXME: Same remark as above. - face_.set_n(n + 1); - face_.set_face_id(0u); - } - else - invalidate(); - } + iter_.next_(); if (is_valid()) update_(); } @@ -351,7 +303,7 @@ namespace mln p_complex_fwd_piter_<D, P>::update_() { // Update psite_. - psite_ = complex_psite<D, P>(face_); + psite_ = complex_psite<D, P>(iter_); } template <unsigned D, typename P> @@ -390,13 +342,6 @@ namespace mln return psite_; } - template <unsigned D, typename P> - unsigned - p_complex_fwd_piter_<D, P>::invalid_unsigned_() const - { - return std::numeric_limits<unsigned>::max(); - } - template <unsigned D, typename P> inline @@ -431,15 +376,14 @@ namespace mln : psite_(), p_() { - face_.set_cplx(pc.cplx()); - // Invalidate face_. - invalidate(); + iter_.set_cplx(pc.cplx()); + mln_postcondition(!is_valid()); } template <unsigned D, typename P> inline p_complex_bkd_piter_<D, P>::p_complex_bkd_piter_(const p_complex_bkd_piter_<D, P>& rhs) - : face_(rhs.face_), + : iter_(rhs.iter_), psite_(rhs.psite_), // Dummy value. p_() @@ -453,7 +397,7 @@ namespace mln { if (&rhs == this) return *this; - face_ = rhs.face_; + iter_ = rhs.iter_; psite_ = rhs.psite_; return *this; } @@ -472,7 +416,7 @@ namespace mln bool p_complex_bkd_piter_<D, P>::is_valid() const { - return face_.is_valid(); + return iter_.is_valid(); } template <unsigned D, typename P> @@ -480,50 +424,24 @@ namespace mln void p_complex_bkd_piter_<D, P>::invalidate() { - face_.set_n(invalid_unsigned_()); - face_.set_face_id(invalid_unsigned_()); + iter_.invalidate(); } template <unsigned D, typename P> inline - void + void p_complex_bkd_piter_<D, P>::start() { - face_.set_n(D); - face_.set_face_id(face_.cplx().template nfaces<D>() - 1); + iter_.start(); update_(); } template <unsigned D, typename P> inline - void + void p_complex_bkd_piter_<D, P>::next_() { - if (is_valid()) - { - unsigned n = face_.n(); - unsigned face_id = face_.face_id(); - - if (face_id > 0) - /* FIXME: Provide accessor any_face_handle::n() returning - a mutable reference? This way, we could just write - - ++face_.face_id(); - - instead of the following. */ - face_.set_face_id(face_id - 1); - else - // Start to iterate on the faces of the previous dimension - // if it exists. - if (n > 0) - { - // FIXME: Same remark as above. - face_.set_n(n - 1); - face_.set_face_id(face_.cplx().nfaces(n - 1) - 1); - } - else - invalidate(); - } + iter_.next_(); if (is_valid()) update_(); } @@ -534,7 +452,7 @@ namespace mln p_complex_bkd_piter_<D, P>::update_() { // Update psite_. - psite_ = complex_psite<D, P>(face_); + psite_ = complex_psite<D, P>(iter_); } template <unsigned D, typename P> @@ -573,13 +491,6 @@ namespace mln return psite_; } - template <unsigned D, typename P> - unsigned - p_complex_bkd_piter_<D, P>::invalid_unsigned_() const - { - return std::numeric_limits<unsigned>::max(); - } - template <unsigned D, typename P> inline -- 1.5.6.5

16 years, 4 months

r2219: Add default constructors to complexes on iterators.

by Roland Levillain

* mln/core/complex_iter.hh (mln::complex_fwd_iter_<D>::complex_fwd_iter_) (mln::complex_bkd_iter_<D>::complex_bkd_iter_): New ctors. --- milena/ChangeLog | 9 +++++++++ milena/mln/core/complex_iter.hh | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4033236..b40e272 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2008-09-11 Roland Levillain <roland(a)lrde.epita.fr> + Add default constructors to complexes on iterators. + + * mln/core/complex_iter.hh + (mln::complex_fwd_iter_<D>::complex_fwd_iter_) + (mln::complex_bkd_iter_<D>::complex_bkd_iter_): + New ctors. + +2008-09-11 Roland Levillain <roland(a)lrde.epita.fr> + Use set_cplx() in ctors of complexes on iterators. * mln/core/complex_iter.hh diff --git a/milena/mln/core/complex_iter.hh b/milena/mln/core/complex_iter.hh index b96d309..7588a32 100644 --- a/milena/mln/core/complex_iter.hh +++ b/milena/mln/core/complex_iter.hh @@ -62,6 +62,7 @@ namespace mln /// Construction and assignment. /// \{ + complex_fwd_iter_(); /* FIXME: Keep this non-const? See a (big) comment about this in milena/tests/complex_image.cc. */ complex_fwd_iter_(complex<D>& c); @@ -139,6 +140,7 @@ namespace mln /// Construction and assignment. /// \{ + complex_bkd_iter_(); /* FIXME: Keep this non-const? See a (big) comment about this in milena/tests/complex_image.cc. */ complex_bkd_iter_(complex<D>& c); @@ -210,6 +212,13 @@ namespace mln template <unsigned D> inline + complex_fwd_iter_<D>::complex_fwd_iter_() + { + invalidate(); + } + + template <unsigned D> + inline complex_fwd_iter_<D>::complex_fwd_iter_(complex<D>& c) { set_cplx(c); @@ -342,6 +351,13 @@ namespace mln template <unsigned D> inline + complex_bkd_iter_<D>::complex_bkd_iter_() + { + invalidate(); + } + + template <unsigned D> + inline complex_bkd_iter_<D>::complex_bkd_iter_(complex<D>& c) { set_cplx(c); -- 1.5.6.5

16 years, 4 months

r2218: Fix ChangeLog.

by Roland Levillain

--- milena/ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3dcecf7..4033236 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -2,7 +2,7 @@ Use set_cplx() in ctors of complexes on iterators. - * mln/core/complex_iter.hh (mln): + * mln/core/complex_iter.hh (mln::complex_fwd_iter_<D>::complex_fwd_iter_(complex<D>)) (mln::complex_bkd_iter_<D>::complex_bkd_iter_(complex<D>)): Do it. -- 1.5.6.5

16 years, 4 months

r2217: Use set_cplx() in ctors of complexes on iterators.

by Roland Levillain

* mln/core/complex_iter.hh (mln): (mln::complex_fwd_iter_<D>::complex_fwd_iter_(complex<D>)) (mln::complex_bkd_iter_<D>::complex_bkd_iter_(complex<D>)): Do it. --- milena/ChangeLog | 9 +++++++++ milena/mln/core/complex_iter.hh | 10 ++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e167fe7..3dcecf7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2008-09-11 Roland Levillain <roland(a)lrde.epita.fr> + Use set_cplx() in ctors of complexes on iterators. + + * mln/core/complex_iter.hh (mln): + (mln::complex_fwd_iter_<D>::complex_fwd_iter_(complex<D>)) + (mln::complex_bkd_iter_<D>::complex_bkd_iter_(complex<D>)): + Do it. + +2008-09-11 Roland Levillain <roland(a)lrde.epita.fr> + Allow iterators on complexes to change their target. * mln/core/complex_iter.hh diff --git a/milena/mln/core/complex_iter.hh b/milena/mln/core/complex_iter.hh index 07181c0..b96d309 100644 --- a/milena/mln/core/complex_iter.hh +++ b/milena/mln/core/complex_iter.hh @@ -212,9 +212,8 @@ namespace mln inline complex_fwd_iter_<D>::complex_fwd_iter_(complex<D>& c) { - face_.set_cplx(c); - // Invalidate face_. - invalidate(); + set_cplx(c); + mln_postcondition(!is_valid()); } template <unsigned D> @@ -345,9 +344,8 @@ namespace mln inline complex_bkd_iter_<D>::complex_bkd_iter_(complex<D>& c) { - face_.set_cplx(c); - // Invalidate face_. - invalidate(); + set_cplx(c); + mln_postcondition(!is_valid()); } template <unsigned D> -- 1.5.6.5

16 years, 4 months

r2216: Allow iterators on complexes to change their target.

by Roland Levillain

* mln/core/complex_iter.hh (mln::complex_fwd_iter_<D>::set_cplx) (mln::complex_bkd_iter_<D>::set_cplx): New. --- milena/ChangeLog | 9 +++++++++ milena/mln/core/complex_iter.hh | 28 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 957f2e9..e167fe7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2008-09-11 Roland Levillain <roland(a)lrde.epita.fr> + + Allow iterators on complexes to change their target. + + * mln/core/complex_iter.hh + (mln::complex_fwd_iter_<D>::set_cplx) + (mln::complex_bkd_iter_<D>::set_cplx): + New. + 2008-09-10 Roland Levillain <roland(a)lrde.epita.fr> * tests/core/complex_image.cc: Fix comment about complex windows. diff --git a/milena/mln/core/complex_iter.hh b/milena/mln/core/complex_iter.hh index f2701e3..07181c0 100644 --- a/milena/mln/core/complex_iter.hh +++ b/milena/mln/core/complex_iter.hh @@ -71,6 +71,10 @@ namespace mln /// Manipulation. /// \{ + /// Change the target complex. + // FIXME: Same comment as the ctor above. + void set_cplx(complex<D>& c); + /// Test if the iterator is valid. bool is_valid() const; /// Invalidate the iterator. @@ -144,6 +148,10 @@ namespace mln /// Manipulation. /// \{ + /// Change the target complex. + // FIXME: Same comment as the ctor above. + void set_cplx(complex<D>& c); + /// Test if the iterator is valid. bool is_valid() const; /// Invalidate the iterator. @@ -229,6 +237,16 @@ namespace mln template <unsigned D> inline + void + complex_fwd_iter_<D>::set_cplx(complex<D>& c) + { + face_.set_cplx(c); + // Invalidate face_. + invalidate(); + } + + template <unsigned D> + inline bool complex_fwd_iter_<D>::is_valid() const { @@ -352,6 +370,16 @@ namespace mln template <unsigned D> inline + void + complex_bkd_iter_<D>::set_cplx(complex<D>& c) + { + face_.set_cplx(c); + // Invalidate face_. + invalidate(); + } + + template <unsigned D> + inline bool complex_bkd_iter_<D>::is_valid() const { -- 1.5.6.5

16 years, 4 months

cleanup-2008 r2215: Add a section about graph images in tutorial

by Guillaume Lazzara

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008 ChangeLog: 2008-09-11 Guillaume Lazzara <z(a)lrde.epita.fr> Add a section about graph images in tutorial. * milena/doc/tutorial/tutorial.tex: Add a section about graph images and fix few mistakes all along the tutorial. --- tutorial.tex | 281 ++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 239 insertions(+), 42 deletions(-) Index: branches/cleanup-2008/milena/doc/tutorial/tutorial.tex =================================================================== --- branches/cleanup-2008/milena/doc/tutorial/tutorial.tex (revision 2214) +++ branches/cleanup-2008/milena/doc/tutorial/tutorial.tex (revision 2215) @@ -144,17 +144,26 @@ The previous methods are available depending on the site set. A box will have the bbox() method since it can be retrived in constant time: a box -is it's own bounding box (see \ref{fig:box_bbox}). A p\_array does not have this +is it's own bounding box (see \ref{fig:box_bbox}). + +\begin{lstlisting}[frame=single] + box2d b(2,3); + + // The bbox can be retrived in constant time. + std::cout << b.bbox() << std::endl; + + // nsites can be retrieved in constant time. + std::cout << "nsites = " << b.nsites() << std::endl; +\end{lstlisting} + +A p\_array does not have this method since sites do not have to be adjacent. Maintaining such information, in order to keep getting the bbox in constant time, would be time and memory consuming. Instead of providing a method directly in p\_array, an algorithm is -available if this information needed (see \ref{fig:parray_bbox}). +available if this information is needed. P\_array and box both have a nsites method since the internal structure allow a constant time retrieval. -\subsubsection*{Sample code} - -\begin{figure}[ht!] \begin{lstlisting}[frame=single] p_array<point2d> arr; @@ -166,21 +175,9 @@ // it can be retrieved in constant time. std::cout << "nsites = " << arr.nsites() << std::endl; \end{lstlisting} - \caption{How to retrieve information from a p\_array.\label{fig:parray_bbox}} -\end{figure} -\begin{figure}[ht!] - \begin{lstlisting}[frame=single] - box2d b(2,3); - // The bbox can be retrived in constant time. - std::cout << b.bbox() << std::endl; - // nsites can be retrieved in constant time. - std::cout << "nsites = " << b.nsites() << std::endl; - \end{lstlisting} - \caption{How to retrieve information from a box.\label{fig:box_bbox}} -\end{figure} \clearpage \newpage @@ -199,8 +196,8 @@ \item A site set, also called the "domain". \end{itemize} -Every image type is defined on a specific site type. An image2d will always -have a domain defined by a box2d. +An image2d will always have its bouding box defined by a box2d whatever the +site set used to define its domain. The Value set, which includes all the possible values a site can have, is also called "destination" set. @@ -208,7 +205,7 @@ border is virtual since the image can have an extended domain as well. That one is optional, it defines sites outside the virtual border which is useful in algorithms when working with sites being part of the domain but close -to the borders. The virtual border can be defined thanks to a function, an +to the borders. The extended domain can be defined thanks to a function, an image or a site set. //FIXME: remove this line @@ -373,7 +370,6 @@ \chapter{Iterators} -Every objects Each container object in Olena like site sets or images have iterators. There are usually three kinds: \begin{itemize} @@ -413,14 +409,11 @@ Example of different forward iterations: \begin{itemize} \item box2d: from top to bottom then from left to right. - \item p\_array<point2d>: from left to right. + \item p\_array$<$point2d$>$: from left to right. \end{itemize} -A for\_all() macro is available to iterate over all the sites -(Fig. \ref{fig:for_all}). \\ +A for\_all() macro is available to iterate over all the sites: \\ - -\begin{figure}[ht!] \begin{lstlisting}[frame=single] box2d b(3, 2); mln_piter(box2d) p(b); @@ -428,16 +421,12 @@ for_all(p) std::cout << p; //prints every site coordinates. \end{lstlisting} - \caption{Use of the for\_all() macro.\label{fig:for_all}} -\end{figure} Note that when you declare an iterator, prefer using the "mln\_*iter" macros. They resolve the iterator type automatically from the given container type passed as parameter. These macros can be used with any container like images or site sets. -(\ref{fig:iter_allcontainers}). -\begin{figure}[ht!] \begin{lstlisting}[frame=single] image2d<int> ima(box2d(2, 3)); @@ -449,23 +438,28 @@ for_all(v) std::cout << v << std::endl; \end{lstlisting} - \caption{mln\_*iter macros can be used with any -containers.\label{fig:iter_allcontainers}} -\end{figure} \chapter{Basic operations} //FIXME : illustrer -\begin{itemize} - \item level::clone(), creates a deep copy of an object. Any shared data is -duplicated. - \item level::fill(), fill an object with a value (fig. \ref{fig:fill_impl}). - \item level::paste(), paste object data to another object (fig. -\ref{fig:paste_impl}) - \item labeling::blobs(), find and label the different components of an image. -\end{itemize} +\section{Basic routines} +\begin{tabular}{|l|p{8cm}|} +\hline +Routine name & Description \\ \hline +level::clone() & creates a deep copy of an object. Any shared data is +duplicated. \\ \hline + +level::fill() & fill an object with a value. \\ \hline + +level::paste() & paste object data to another object. \\ \hline +labeling::blobs() & find and label the different components of an image. \\ +\hline +\end{tabular} \\ + + +\section{Examples} First, create an image: \begin{lstlisting}[frame=single] image2d<char> imga(0, 0, 20, 20); @@ -572,7 +566,7 @@ \caption{Implementation of the paste routine.\label{fig:paste_impl}} \end{figure} - +\newpage \section{Working with parts of an image} Sometime it may be interesting to work only on some part of the image or to @@ -604,6 +598,21 @@ by a function\_p2v to another Value. The following sample code illustrates this feature. +In order to use C functions as predicate, they must have one of the following +prototype if you work on 2D images: +\begin{lstlisting}[frame=single] +//function_p2b +bool my_function_p2b(mln::point2d p); + +//function_p2v +//V is the value type used in the image. +V my_function_p2v(mln::point2d p); +\end{lstlisting} +Of course, you just need to change the point type if you use another image +type. For instance, you would use point3d with 3D images. +The returned value type V for function\_p2v depends on the image value type. +With image2d<int>, V would be int. + In this section, all along the examples, the image "ima" will refer to the following declaration: \begin{lstlisting}[frame=single] @@ -675,9 +684,197 @@ fill(inplace(lab.domain(2)), color::red); \end{lstlisting} +Here is an example using a C function: +\begin{lstlisting}[frame=single] +bool row_oddity(mln::point2d p) +{ + return p.row() % 2; +} + +void my_function() +{ + ... + //Prints only sites which are on odd lines. + debug::println(ima | row_oddity}; + ... +} +\end{lstlisting} \chapter{Graphes and images} +\section{Description} +Olena enables the possibility of using graphes with images. +Graphes can help you to handle directly parts of an image and represent their +relationship. +Specific data can be associated to each vertex and/or edges. + +//FIXME: Add more explanations? + +\section{Example} + +First, create a graph which looks like the following: +\begin{lstlisting}[frame=single] + 0 1 2 3 4 + .----------- + 0 | 0 2 + 1 | \ / | + 2 | 1 | + 3 | \ | + 4 | 3-4 +\end{lstlisting} + +To do so, we need to create a site set containing the sites we are going to use +as vertices: + +\begin{lstlisting} +std::vector<point2d> sites; + +// Site associated to... +sites.push_back(point2d(0,0)); // ... vertex 0. +sites.push_back(point2d(2,2)); // ... vertex 1. +sites.push_back(point2d(0,4)); // ... vertex 2. +sites.push_back(point2d(4,3)); // ... vertex 3. +sites.push_back(point2d(4,4)); // ... vertex 4. +\end{lstlisting} + +Then populate the graph with vertices: +\begin{lstlisting} +util::graph<point2d> g; + +for (unsigned i = 0; i < points.size(); ++i) + g.add_vertex (points[i]); +\end{lstlisting} + +Finally, populate the graph with edges: +\begin{lstlisting} +g.add_edge(0, 1); // Associated to edge 0. +g.add_edge(1, 2); // Associated to edge 1. +g.add_edge(1, 3); // Associated to edge 2. +g.add_edge(3, 4); // Associated to edge 3. +g.add_edge(4, 2); // Associated to edge 4. +\end{lstlisting} + +Now, a graph structure is created but contains only site relationship +information. We may like to map data to it. Vertices and edges are mapped to +indexes. Indexes start from 0 and respect the insertion order. +Therefore, the idea is to provide a function which returns the associated data +according to the index given as parameter. Combining this function and the +graph, which is actually a sort of site set, we get an image. Since this is an +image, you can use it with algorithms and for\_all loops. + +\begin{lstlisting}[frame=single] + +Value my_data_fun(vertex_index_t index) +{ + if (index == 0) + return value1; + else if (index > 1 && < 4) + return value2; + return value3; +} + +Value my_data_fun(edge_index_t index) +{ + if (index == 0) + return value1; + else if (index > 1 && < 4) + return value2; + return value3; +} + +void my_fun() +{ + ... + // Constructs an image which associates + // data and edges. A site is actually an edge. + mln_VAR(graph_edge_ima, my_data_fun | g.edges()); + + //Prints each edge. + mln_piter p(graph_edge_ima); + for_all(p) + std::cout << p << std::endl; + + // Constructs an image which associates + // data and vertices. A site is actually a vertex. + mln_VAR(graph_vertices_ima, my_data_fun2 | g.vertices()); + + //Prints each vertex + mln_piter p(graph_vertices_ima); + for_all(p) + std::Cout << p << std::endl; + ... +} +\end{lstlisting} + +Note that like any image in Olena, graph images share their data. Therefore, +while constructing a graph image from a graph and a function, the graph is not +copied and this is NOT a costly operation. + +Like other images, graph images also have an overloaded operator() to access the +data associated to a vertex or an edge. +\begin{lstlisting} + //Prints each edge's associated value. + mln_piter p(graph_edge_ima); + for_all(p) + std::cout << graph_edge_ima(p) << std::endl; + + //Prints each vertex's associated value. + mln_piter p(graph_vertex_ima); + for_all(p) + std::cout << graph_vertex_ima(p) << std::endl; +\end{lstlisting} + +Of course, creating a graph image is not necessary and you can work directly +with the graph and container/function mapping indexes and data. + +\begin{lstlisting} +// Iterator on vertices. +mln_Viter V(g); + +// Prints each vertex and its associated value. +for_all(V) +{ + std::cout << V << " : " << my_data_fun(V) << std::endl; +} +\end{lstlisting} + +Graphes have iterators like any other site sets and also provide +specific iterators in order to iterate over graphes in a more intuitive way. + +\begin{lstlisting} +// Iterator on vertices. +mln_Viter V(g); + +// Iterator on V's edges. +mln_Eiter n(g, V); + +// Prints the graph +// List all edges for each vertex. +for_all(V) +{ + std::cout << V << " : "; + for_all(n) + std::cout << n << " "; + std::cout << std::endl; +} + +// Iterator on edges. +mln_Eiter E(g); + +// Iterator on vertices adjacent to E. +mln_Viter n(g, E); + +// Prints the graph +// List all adjacent vertices for each edge. +for_all(E) +{ + std::cout << E << " : "; + for_all(n) + std::cout << n << " "; + std::cout << std::endl; +} +\end{lstlisting} +//FIXME talk about p_vertices and p_edges. \end{document} \ No newline at end of file

16 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches