- Olena-patches

cleanup-2008 r2309: Do not exclude the concept directory from doc generation
by Guillaume Lazzara 17 Sep '08

17 Sep '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-09-17 Guillaume Lazzara <z(a)lrde.epita.fr> Do not exclude the concept directory from doc generation. * milena/doc/Doxyfile.in: do it. --- Doxyfile.in | 1 - 1 file changed, 1 deletion(-) Index: branches/cleanup-2008/milena/doc/Doxyfile.in =================================================================== --- branches/cleanup-2008/milena/doc/Doxyfile.in (revision 2308) +++ branches/cleanup-2008/milena/doc/Doxyfile.in (revision 2309) @@ -80,7 +80,6 @@ *.hcc RECURSIVE = YES EXCLUDE = @top_srcdir@/milena/sandbox \ - @top_srcdir@/milena/mln/core/concept \ @top_srcdir@/milena/mln/core/concept/proxy.hxx EXCLUDE_SYMLINKS = YES EXCLUDE_PATTERNS = *spe.hh

1 0

2308: Fix handling of arguments in mln::morpho::meyer_wst.
by Roland Levillain 17 Sep '08

17 Sep '08

* mln/morpho/meyer_wst.hh (mln::morpho::meyer_wst): Fix duplicate conversion of argument `nbh_' to its exact type. --- milena/ChangeLog | 7 +++++++ milena/mln/morpho/meyer_wst.hh | 7 +++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 16c2b93..90d6159 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Fix handling of arguments in mln::morpho::meyer_wst. + + * mln/morpho/meyer_wst.hh (mln::morpho::meyer_wst): Fix duplicate + conversion of argument `nbh_' to its exact type. + +2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Update tools/area_flooding. * tools/area_flooding.cc (main): s/p.to_psite()/p.unproxy_()/. diff --git a/milena/mln/morpho/meyer_wst.hh b/milena/mln/morpho/meyer_wst.hh index 558c4d3..22021eb 100644 --- a/milena/mln/morpho/meyer_wst.hh +++ b/milena/mln/morpho/meyer_wst.hh @@ -107,11 +107,10 @@ namespace mln meyer_wst(const Image<I>& input_, const Neighborhood<N>& nbh_, L& nbasins) { - I input = exact(input_); - N nbh = exact(nbh_); - /* FIXME: Ensure the input image has scalar values. */ - const N& nbh = exact(nbh_); + + const I input = exact(input_); + const N nbh = exact(nbh_); typedef L marker; const marker unmarked = literal::zero; -- 1.6.0.1

1 1

2307: Update tools/area_flooding.
by Roland Levillain 17 Sep '08

17 Sep '08

* tools/area_flooding.cc (main): s/p.to_psite()/p.unproxy_()/. --- milena/ChangeLog | 6 ++++++ milena/tools/area_flooding.cc | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ad04ece..16c2b93 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Update tools/area_flooding. + + * tools/area_flooding.cc (main): s/p.to_psite()/p.unproxy_()/. + +2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Re-enable some tests on line graph entities. * tests/core/image/line_graph_image.cc: Remove useless #include's. diff --git a/milena/tools/area_flooding.cc b/milena/tools/area_flooding.cc index 1ebef04..f10c7e0 100644 --- a/milena/tools/area_flooding.cc +++ b/milena/tools/area_flooding.cc @@ -110,7 +110,7 @@ int main(int argc, char* argv[]) `-----------*/ /* FIXME: I'm not sure this is the way it should be done. Anyway, - we should implemented this as a canvas. */ + we should implement this as a canvas. */ typedef line_graph_elt_neighborhood<point2d> nbh_t; nbh_t nbh; @@ -163,8 +163,10 @@ int main(int argc, char* argv[]) for_all(p) if (wshed(p) != wshed_label) { - wshed2d(p.to_psite().first()) = wshed(p); - wshed2d(p.to_psite().second()) = wshed(p); + // FIXME: Equip the iterator with first() and second() + // accessors? + wshed2d(p.unproxy_().first()) = wshed(p); + wshed2d(p.unproxy_().second()) = wshed(p); } // For each basin, compute the average gray level. -- 1.6.0.1

1 0

2306: Re-enable some tests on line graph entities.
by Roland Levillain 17 Sep '08

17 Sep '08

* tests/core/image/line_graph_image.cc: Remove useless #include's. Move morpho-related tests... * tests/morpho/line_graph_image_morpho.cc: ...here. * tests/core/image/Makefile.am (check_PROGRAMS): Re-enable line_graph_image. (line_graph_image_SOURCES): Re-enable. * tests/morpho/Makefile.am (check_PROGRAMS): Add line_graph_image_morpho. (line_graph_image_morpho_SOURCES): New. --- milena/ChangeLog | 14 ++++++++ milena/tests/core/image/Makefile.am | 4 +- milena/tests/core/image/line_graph_image.cc | 21 ------------ milena/tests/morpho/Makefile.am | 2 + .../line_graph_image_morpho.cc} | 35 +------------------- 5 files changed, 19 insertions(+), 57 deletions(-) copy milena/tests/{core/image/line_graph_image.cc => morpho/line_graph_image_morpho.cc} (81%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5b9944a..ad04ece 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Re-enable some tests on line graph entities. + + * tests/core/image/line_graph_image.cc: Remove useless #include's. + Move morpho-related tests... + * tests/morpho/line_graph_image_morpho.cc: ...here. + * tests/core/image/Makefile.am (check_PROGRAMS): Re-enable + line_graph_image. + (line_graph_image_SOURCES): Re-enable. + * tests/morpho/Makefile.am (check_PROGRAMS): Add + line_graph_image_morpho. + (line_graph_image_morpho_SOURCES): New. + +2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Update morpho::meyer_wst. * mln/morpho/meyer_wst.hh (mln::morpho::meyer_wst): Work with the diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am index 28024e7..5c7e6ac 100644 --- a/milena/tests/core/image/Makefile.am +++ b/milena/tests/core/image/Makefile.am @@ -17,7 +17,7 @@ check_PROGRAMS = \ image3d \ image_if \ ## interpolated \ -## line_graph_image \ + line_graph_image \ mono_obased_rle_image \ mono_rle_image \ obased_rle_image \ @@ -45,7 +45,7 @@ image2d_SOURCES = image2d.cc image3d_SOURCES = image3d.cc image_if_SOURCES = image_if.cc ##interpolated_SOURCES = interpolated.cc -##line_graph_image_SOURCES = line_graph_image.cc +line_graph_image_SOURCES = line_graph_image.cc mono_obased_rle_image_SOURCES = mono_obased_rle_image.cc mono_rle_image_SOURCES = mono_rle_image.cc obased_rle_image_SOURCES = obased_rle_image.cc diff --git a/milena/tests/core/image/line_graph_image.cc b/milena/tests/core/image/line_graph_image.cc index c57f3ab..2e7fbe4 100644 --- a/milena/tests/core/image/line_graph_image.cc +++ b/milena/tests/core/image/line_graph_image.cc @@ -37,10 +37,6 @@ #include <mln/morpho/dilation.hh> -#include <mln/draw/graph.hh> -#include <mln/debug/iota.hh> -#include <mln/debug/println.hh> - int main() { @@ -137,21 +133,4 @@ int main() << std::endl; } std::cout << std::endl; - - /*--------------------------. - | Processing graph images. | - `--------------------------*/ - - line_graph_image<point2d, int> ima_dil = morpho::dilation(ima, win); - // Manual iteration over the domain of IMA_DIL. - mln_piter_(ima_t) p_dil(ima_dil.domain()); - for_all (p_dil) - std::cout << "ima_dil (" << p_dil << ") = " << ima_dil(p_dil) << std::endl; - std::cout << std::endl; - - line_graph_image<point2d, int> ima_ero = morpho::erosion(ima, win); - // Manual iteration over the domain of IMA_ERO. - mln_piter_(ima_t) p_ero(ima_ero.domain()); - for_all (p_ero) - std::cout << "ima_ero (" << p_ero << ") = " << ima_ero(p_ero) << std::endl; } diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am index b913846..8955692 100644 --- a/milena/tests/morpho/Makefile.am +++ b/milena/tests/morpho/Makefile.am @@ -20,6 +20,7 @@ check_PROGRAMS = \ ## lena_line_graph_image_wst1 \ lena_line_graph_image_wst2 \ ## line_graph_image_wst \ + line_graph_image_morpho \ meyer_wst \ meyer_wst_long \ opening_area \ @@ -51,6 +52,7 @@ hit_or_miss_SOURCES = hit_or_miss.cc laplacian_SOURCES = laplacian.cc thinning_SOURCES = thinning.cc +line_graph_image_morpho_SOURCES = line_graph_image_morpho.cc line_graph_image_wst_SOURCES = line_graph_image_wst.cc meyer_wst_SOURCES = meyer_wst.cc diff --git a/milena/tests/core/image/line_graph_image.cc b/milena/tests/morpho/line_graph_image_morpho.cc similarity index 81% copy from milena/tests/core/image/line_graph_image.cc copy to milena/tests/morpho/line_graph_image_morpho.cc index c57f3ab..2306513 100644 --- a/milena/tests/core/image/line_graph_image.cc +++ b/milena/tests/morpho/line_graph_image_morpho.cc @@ -35,12 +35,9 @@ #include <mln/core/image/line_graph_elt_window.hh> #include <mln/core/image/line_graph_window_piter.hh> +#include <mln/morpho/erosion.hh> #include <mln/morpho/dilation.hh> -#include <mln/draw/graph.hh> -#include <mln/debug/iota.hh> -#include <mln/debug/println.hh> - int main() { @@ -89,13 +86,6 @@ int main() p_line_graph<point2d> plg(g); - // Check adjacencies of edge 1. - mln_assertion( plg.adjacent(1, 0)); - mln_assertion(!plg.adjacent(1, 1)); - mln_assertion( plg.adjacent(1, 2)); - mln_assertion(!plg.adjacent(1, 3)); - mln_assertion( plg.adjacent(1, 4)); - /*-------------------. | Line graph image. | `-------------------*/ @@ -115,29 +105,6 @@ int main() typedef line_graph_image<point2d, int> ima_t; ima_t ima(plg, vertex_values, edge_values); - /*------------. - | Iterators. | - `------------*/ - - // Manual iteration over the domain of IMA. - mln_piter_(ima_t) p(ima.domain()); - for_all (p) - std::cout << "ima (" << p << ") = " << ima(p) << std::endl; - - // Manual iterations over the neighborhoods of each point site of IMA. - typedef line_graph_elt_window<point2d> win_t; - win_t win; - mln_qiter_(win_t) q(win, p); - for_all (p) - { - std::cout << "sites adjacent to " << p << " (" << ima(p) << "), " - << "including the site itself:" << std::endl; - for_all (q) - std::cout << " " << q << " (level = " << ima(q) << ")" - << std::endl; - } - std::cout << std::endl; - /*--------------------------. | Processing graph images. | `--------------------------*/ -- 1.6.0.1

1 0

2305: Update morpho::meyer_wst.
by Roland Levillain 17 Sep '08

17 Sep '08

* mln/morpho/meyer_wst.hh (mln::morpho::meyer_wst): Work with the exact types of the arguments. --- milena/ChangeLog | 7 +++++++ milena/mln/morpho/meyer_wst.hh | 5 ++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e225c93..5b9944a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Update morpho::meyer_wst. + + * mln/morpho/meyer_wst.hh (mln::morpho::meyer_wst): Work with the + exact types of the arguments. + +2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Improve the handling of a possibly unused variable in line_gradient. * mln/morpho/line_gradient.hh (mln::morpho::line_gradient): Here. diff --git a/milena/mln/morpho/meyer_wst.hh b/milena/mln/morpho/meyer_wst.hh index c566a60..558c4d3 100644 --- a/milena/mln/morpho/meyer_wst.hh +++ b/milena/mln/morpho/meyer_wst.hh @@ -104,9 +104,12 @@ namespace mln template <typename L, typename I, typename N> mln_ch_value(I, L) - meyer_wst(const Image<I>& input, const Neighborhood<N>& nbh_, + meyer_wst(const Image<I>& input_, const Neighborhood<N>& nbh_, L& nbasins) { + I input = exact(input_); + N nbh = exact(nbh_); + /* FIXME: Ensure the input image has scalar values. */ const N& nbh = exact(nbh_); -- 1.6.0.1

1 0

2304: Improve the handling of a possibly unused variable in line_gradient.
by Roland Levillain 17 Sep '08

17 Sep '08

* mln/morpho/line_gradient.hh (mln::morpho::line_gradient): Here. --- milena/ChangeLog | 6 ++++++ milena/mln/morpho/line_gradient.hh | 9 +++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 329f88a..e225c93 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Improve the handling of a possibly unused variable in line_gradient. + + * mln/morpho/line_gradient.hh (mln::morpho::line_gradient): Here. + +2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Fix a bug in morpho::line_gradient. * mln/morpho/line_gradient.hh (mln::morpho::line_gradient): diff --git a/milena/mln/morpho/line_gradient.hh b/milena/mln/morpho/line_gradient.hh index c802d9a..f9b32b2 100644 --- a/milena/mln/morpho/line_gradient.hh +++ b/milena/mln/morpho/line_gradient.hh @@ -100,13 +100,10 @@ namespace mln for_all (q) if (ima.domain().has(q)) { - // Avoid a warning about an undefined variable when the - // NDEBUG is not defined. -#ifdef NDEBUG - g.add_edge(points[p], points[q]); -#else // !NDEBUG util::edge_id id = g.add_edge(points[p], points[q]); -#endif //!NDEBUG + // Avoid a warning about an undefined variable when NDEBUG + // is not defined. + (void) id; // The computed value is a norm of the gradient between P and Q. edge_values.push_back(math::abs(ima(p) - ima(q))); mln_assertion(id != mln_max(util::edge_id::equiv)); -- 1.6.0.1

1 0

2303: Fix a bug in morpho::line_gradient.
by Roland Levillain 17 Sep '08

17 Sep '08

* mln/morpho/line_gradient.hh (mln::morpho::line_gradient): Iterate on the domain, not the extensible domain. --- milena/ChangeLog | 7 +++++++ milena/mln/morpho/line_gradient.hh | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0b74ec4..329f88a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Fix a bug in morpho::line_gradient. + + * mln/morpho/line_gradient.hh (mln::morpho::line_gradient): + Iterate on the domain, not the extensible domain. + +2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Use util::ord in morpho::line_gradient instead of ad hoc code. * mln/morpho/line_gradient.hh diff --git a/milena/mln/morpho/line_gradient.hh b/milena/mln/morpho/line_gradient.hh index fb42d13..c802d9a 100644 --- a/milena/mln/morpho/line_gradient.hh +++ b/milena/mln/morpho/line_gradient.hh @@ -98,7 +98,7 @@ namespace mln mln_fwd_qiter_(window2d) q(next_c4_win, p); for_all (p) for_all (q) - if (ima.has(q)) + if (ima.domain().has(q)) { // Avoid a warning about an undefined variable when the // NDEBUG is not defined. -- 1.6.0.1

1 0

2302: Use util::ord in morpho::line_gradient instead of ad hoc code.
by Roland Levillain 17 Sep '08

17 Sep '08

* mln/morpho/line_gradient.hh (mln::morpho::internal::point2_lexicographical_less): Remove. (mln::morpho::line_gradient()::points): Use util::ord<point2d> instead of morpho::internal::point2d_lexicographical_less. --- milena/ChangeLog | 9 +++++++++ milena/mln/morpho/line_gradient.hh | 21 +++------------------ 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2180a84..0b74ec4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Use util::ord in morpho::line_gradient instead of ad hoc code. + + * mln/morpho/line_gradient.hh + (mln::morpho::internal::point2_lexicographical_less): Remove. + (mln::morpho::line_gradient()::points): Use util::ord<point2d> + instead of morpho::internal::point2d_lexicographical_less. + +2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Have morpho::line_gradient compile again * mln/morpho/line_gradient.hh (mln::morpho::line_gradient): diff --git a/milena/mln/morpho/line_gradient.hh b/milena/mln/morpho/line_gradient.hh index 50c66dc..fb42d13 100644 --- a/milena/mln/morpho/line_gradient.hh +++ b/milena/mln/morpho/line_gradient.hh @@ -38,6 +38,8 @@ # include <mln/math/abs.hh> +# include <mln/util/ord.hh> + # include <mln/core/image/image2d.hh> # include <mln/core/alias/window2d.hh> # include <mln/core/image/line_graph_image.hh> @@ -62,22 +64,6 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - // FIXME: We should have mixins to add such a comparison operator. - namespace internal - { - struct point2d_lexicographical_less - : std::binary_function<const point2d&, const point2d&, bool> - { - bool operator()(const point2d& lhs, const point2d& rhs) - { - return - lhs.row() < rhs.row() || - (lhs.row() == rhs.row() && lhs.col() < rhs.col()); - } - }; - } // end of namespace mln::morpho::internal - - template <typename T> mln::line_graph_image<mln::point2d, T> line_gradient(const mln::image2d<T>& ima) @@ -92,8 +78,7 @@ namespace mln exhibits the lack of a service from util::graph (or a another, missing tool) regarding the retrieval of vertices' ids from points. */ - std::map< mln::point2d, util::vertex_id, - morpho::internal::point2d_lexicographical_less > points; + std::map< mln::point2d, util::vertex_id, util::ord<point2d> > points; // Vertices. std::vector<value_t> vertex_values; -- 1.6.0.1

1 0

2300: Update the Doxygen documentation of iterator internal classes.
by Roland Levillain 17 Sep '08

17 Sep '08

* mln/core/internal/site_set_iterator_base.hh * mln/core/internal/site_relative_iterator_base.hh: Do it. --- milena/ChangeLog | 8 ++++++++ .../core/internal/site_relative_iterator_base.hh | 7 ++++--- milena/mln/core/internal/site_set_iterator_base.hh | 3 +++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 18f27e1..f8750e4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Update the Doxygen documentation of iterator internal classes. + + * mln/core/internal/site_set_iterator_base.hh + * mln/core/internal/site_relative_iterator_base.hh: + Do it. + +2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Update the Doxygen documentation of site set internal classes. * mln/core/internal/site_set_base.hh: Do it. diff --git a/milena/mln/core/internal/site_relative_iterator_base.hh b/milena/mln/core/internal/site_relative_iterator_base.hh index f9b582f..b488ee7 100644 --- a/milena/mln/core/internal/site_relative_iterator_base.hh +++ b/milena/mln/core/internal/site_relative_iterator_base.hh @@ -49,14 +49,15 @@ namespace mln namespace internal { - /*! \brief A generic forward iterator on points of windows and of + /*! \brief A generic iterator on points of windows and of * neighborhoods. * * Parameter \c S is the targeted "site set definition" type. It * can be either a Window, or a Neighborhood. * - * IMPORTANT: Sub-classes have to define do_start_, do_next_, and - * compute_p_. They shall define NEITHER start_ NOR next_. + * IMPORTANT: Sub-classes have to define do_start_, do_next_, + * is_valid_, invalidate_ and compute_p_. They shall define + * NEITHER start_ NOR next_. */ template <typename S, typename E> class site_relative_iterator_base : public site_iterator_base< S, E > diff --git a/milena/mln/core/internal/site_set_iterator_base.hh b/milena/mln/core/internal/site_set_iterator_base.hh index 376e5d6..6b76994 100644 --- a/milena/mln/core/internal/site_set_iterator_base.hh +++ b/milena/mln/core/internal/site_set_iterator_base.hh @@ -46,6 +46,9 @@ namespace mln /*! \internal A base class for site iterators. * * Parameter \c S is the targeted site set type. + * + * IMPORTANT: Sub-classes have to define start_, next_, + * is_valid_ and invalidate_. */ template <typename S, typename E> class site_set_iterator_base : public site_iterator_base<S, E> -- 1.6.0.1

1 0

2301: Have morpho::line_gradient compile again
by Roland Levillain 17 Sep '08

17 Sep '08

* mln/morpho/line_gradient.hh (mln::morpho::line_gradient): s/mln_max(util::edge_id))/mln_max(util::edge_id::equiv))/ --- milena/ChangeLog | 7 +++++++ milena/mln/morpho/line_gradient.hh | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f8750e4..2180a84 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Have morpho::line_gradient compile again + + * mln/morpho/line_gradient.hh (mln::morpho::line_gradient): + s/mln_max(util::edge_id))/mln_max(util::edge_id::equiv))/ + +2008-09-17 Roland Levillain <roland(a)lrde.epita.fr> + Update the Doxygen documentation of iterator internal classes. * mln/core/internal/site_set_iterator_base.hh diff --git a/milena/mln/morpho/line_gradient.hh b/milena/mln/morpho/line_gradient.hh index cdd50b5..50c66dc 100644 --- a/milena/mln/morpho/line_gradient.hh +++ b/milena/mln/morpho/line_gradient.hh @@ -124,7 +124,7 @@ namespace mln #endif //!NDEBUG // The computed value is a norm of the gradient between P and Q. edge_values.push_back(math::abs(ima(p) - ima(q))); - mln_assertion(id != mln_max(util::edge_id)); + mln_assertion(id != mln_max(util::edge_id::equiv)); } // Line graph point set. -- 1.6.0.1

1 0