May 2009 - Olena-patches

r3783: Plot labels in fixed watershed
by Fabien Freling 11 May '09

11 May '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-05-11 Fabien Freling <fabien.freling(a)lrde.epita.fr> Plot labels in fixed watershed. * fabien/igr/plot_label.hh: Implement plot_label() for fixed segmentation. * fabien/igr/seg_fixed.cc: Add plot_label() calls. --- plot_label.hh | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ seg_fixed.cc | 43 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 94 insertions(+), 7 deletions(-) Index: trunk/milena/sandbox/fabien/igr/seg_fixed.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/seg_fixed.cc (revision 3782) +++ trunk/milena/sandbox/fabien/igr/seg_fixed.cc (revision 3783) @@ -25,7 +25,9 @@ #include <mln/data/paste.hh> #include <mln/debug/quiet.hh> #include <mln/convert/from_to.hh> +#include <mln/labeling/wrap.hh> #include <mln/level/compute.hh> +#include <mln/level/convert.hh> #include <mln/level/stretch.hh> #include <mln/make/image2d.hh> #include <mln/math/diff_abs.hh> @@ -41,11 +43,13 @@ #include <mln/world/inter_pixel/compute.hh> #include <mln/world/inter_pixel/immerse.hh> #include <mln/world/inter_pixel/neighb2d.hh> -#include <mln/world/inter_pixel/is_pixel.hh> +#include <mln/world/inter_pixel/all.hh> #include <mln/labeling/colorize.hh> #include <mln/debug/println.hh> +#include <mln/trace/quiet.hh> +#include "plot_label.hh" using namespace mln; using value::int_u8; @@ -152,7 +156,7 @@ // Dummy. -/////////////////////////////////////////////////////////////////////////////// +//------- template <typename I, typename N> inline image2d<int> @@ -194,13 +198,14 @@ res += std::min(v1[i], v2[i]); image1d<V> tmp_ima; + image1d<V> tmp_ima2; accu::sum<V> accu_sum; convert::from_to(v1, tmp_ima); float sum_v1 = level::compute(accu_sum, tmp_ima); - convert::from_to(v2, tmp_ima); - float sum_v2 = level::compute(accu_sum, tmp_ima); + convert::from_to(v2, tmp_ima2); + float sum_v2 = level::compute(accu_sum, tmp_ima2); res /= std::max(sum_v1, sum_v2); @@ -282,10 +287,34 @@ L nbasins; mln_VAR(wst, morpho::watershed::flooding(clo, world::inter_pixel::e2e(), nbasins)); - mln_VAR(w, wst.unmorph_()); - data::fill((w | (!world::inter_pixel::is_separator())).rw(), nbasins.next()); - io::ppm::save(labeling::colorize(value::rgb8(), w, nbasins.next()), "result.ppm"); + std::cout << "nbasins: " << nbasins << std::endl; + + + mln_VAR(w_all, wst.unmorph_()); + //data::fill((w | (!world::inter_pixel::is_separator())).rw(), nbasins.next()); + mln_VAR(w_pixels, w_all | world::inter_pixel::is_pixel()); + data::paste(morpho::dilation(extend(w_pixels, pw::value(w_all)), c4().win()), w_all); + // edges -> dots + mln_VAR(w_dots, w_all | world::inter_pixel::dim2::is_dot()); + data::paste(morpho::erosion(extend(w_dots, pw::value(w_all)), c4().win()), w_all); + + //io::ppm::save(labeling::colorize(value::rgb8(), w, nbasins.next()), "result.ppm"); + io::pgm::save(labeling::wrap(int_u8(), w_all), "result_labels.pgm"); + + // Plots. + image2d<L> w_simple = world::inter_pixel::full2image(w_all); + plot_label(input, w_simple, 166u); + plot_label(input, w_simple, 182u); + plot_label(input, w_simple, 188u); + plot_label(input, w_simple, 189u); + plot_label(input, w_simple, 193u); + plot_label(input, w_simple, 195u); + plot_label(input, w_simple, 196u); + plot_label(input, w_simple, 198u); + plot_label(input, w_simple, 199u); + plot_label(input, w_simple, 200u); + plot_label(input, w_simple, 201u); Index: trunk/milena/sandbox/fabien/igr/plot_label.hh =================================================================== --- trunk/milena/sandbox/fabien/igr/plot_label.hh (revision 0) +++ trunk/milena/sandbox/fabien/igr/plot_label.hh (revision 3783) @@ -0,0 +1,58 @@ +#ifndef PLOT_LABEL_HH +# define PLOT_LABEL_HH + +#include <iostream> +#include <sstream> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/image_if.hh> +#include <mln/core/image/slice_image.hh> +#include <mln/core/routine/duplicate.hh> + +#include <mln/geom/bbox.hh> + +#include <mln/io/plot/save.hh> + +#include <mln/accu/mean.hh> +#include <mln/accu/median_h.hh> +#include <mln/level/compute.hh> +#include <mln/pw/all.hh> +#include <mln/util/array.hh> + + +using namespace mln; + + + +template <typename I, typename L, typename V> +inline +void plot_label(image3d& ima, image2d<L>& ima_labels, V lbl) +{ + typedef image_if<image2d<L>, mln::fun::eq_p2b_expr_<pw::value_<image2d<L> >, pw::cst_<V> > > Lx; + Lx ima_label = ima_labels | pw::value(ima_labels) == pw::cst(lbl); + util::array<float> arr; + int sli_min = geom::bbox(ima).pmin().sli(); + int sli_max = geom::bbox(ima).pmax().sli(); + + for (int sli = sli_min; sli <= sli_max; ++sli) + { + image2d slice_ima = duplicate(slice(ima, sli)); + accu::mean accu_mean; + float mean = level::compute(accu_mean, slice_ima | ima_label.domain()); + arr.append(mean); + } + + std::ostringstream slabel; + slabel << "label_"; + if (lbl < 100) + slabel << "0"; + if (lbl < 10) + slabel << "0"; + // FIXME: insert label location + slabel << lbl << ".plot"; + io::plot::save(arr, slabel.str()); +} + + + +#endif // ! PLOT_LABEL_HH

1 0

[PATCH 22/31] Plot labels in fixed watershed.
by Roland Levillain 11 May '09

11 May '09

* fabien/igr/plot_label.hh: Implement plot_label() for fixed segmentation. * fabien/igr/seg_fixed.cc: Add plot_label() calls. --- milena/sandbox/ChangeLog | 7 ++++ milena/sandbox/fabien/igr/plot_label.hh | 58 +++++++++++++++++++++++++++++++ milena/sandbox/fabien/igr/seg_fixed.cc | 45 +++++++++++++++++++---- 3 files changed, 102 insertions(+), 8 deletions(-) create mode 100644 milena/sandbox/fabien/igr/plot_label.hh diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 3cffc50..880ff36 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,10 @@ +2009-05-11 Fabien Freling <fabien.freling(a)lrde.epita.fr> + + Plot labels in fixed watershed. + * fabien/igr/plot_label.hh: Implement plot_label() for + fixed segmentation. + * fabien/igr/seg_fixed.cc: Add plot_label() calls. + 2009-05-10 Edwin Carlinet <carlinet(a)lrde.epita.fr> Make clean in tree files and procedures. diff --git a/milena/sandbox/fabien/igr/plot_label.hh b/milena/sandbox/fabien/igr/plot_label.hh new file mode 100644 index 0000000..47fefdb --- /dev/null +++ b/milena/sandbox/fabien/igr/plot_label.hh @@ -0,0 +1,58 @@ +#ifndef PLOT_LABEL_HH +# define PLOT_LABEL_HH + +#include <iostream> +#include <sstream> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/image_if.hh> +#include <mln/core/image/slice_image.hh> +#include <mln/core/routine/duplicate.hh> + +#include <mln/geom/bbox.hh> + +#include <mln/io/plot/save.hh> + +#include <mln/accu/mean.hh> +#include <mln/accu/median_h.hh> +#include <mln/level/compute.hh> +#include <mln/pw/all.hh> +#include <mln/util/array.hh> + + +using namespace mln; + + + +template <typename I, typename L, typename V> +inline +void plot_label(image3d& ima, image2d<L>& ima_labels, V lbl) +{ + typedef image_if<image2d<L>, mln::fun::eq_p2b_expr_<pw::value_<image2d<L> >, pw::cst_<V> > > Lx; + Lx ima_label = ima_labels | pw::value(ima_labels) == pw::cst(lbl); + util::array<float> arr; + int sli_min = geom::bbox(ima).pmin().sli(); + int sli_max = geom::bbox(ima).pmax().sli(); + + for (int sli = sli_min; sli <= sli_max; ++sli) + { + image2d slice_ima = duplicate(slice(ima, sli)); + accu::mean accu_mean; + float mean = level::compute(accu_mean, slice_ima | ima_label.domain()); + arr.append(mean); + } + + std::ostringstream slabel; + slabel << "label_"; + if (lbl < 100) + slabel << "0"; + if (lbl < 10) + slabel << "0"; + // FIXME: insert label location + slabel << lbl << ".plot"; + io::plot::save(arr, slabel.str()); +} + + + +#endif // ! PLOT_LABEL_HH diff --git a/milena/sandbox/fabien/igr/seg_fixed.cc b/milena/sandbox/fabien/igr/seg_fixed.cc index 2f2acbe..ca89c84 100644 --- a/milena/sandbox/fabien/igr/seg_fixed.cc +++ b/milena/sandbox/fabien/igr/seg_fixed.cc @@ -25,7 +25,9 @@ #include <mln/data/paste.hh> #include <mln/debug/quiet.hh> #include <mln/convert/from_to.hh> +#include <mln/labeling/wrap.hh> #include <mln/level/compute.hh> +#include <mln/level/convert.hh> #include <mln/level/stretch.hh> #include <mln/make/image2d.hh> #include <mln/math/diff_abs.hh> @@ -41,11 +43,13 @@ #include <mln/world/inter_pixel/compute.hh> #include <mln/world/inter_pixel/immerse.hh> #include <mln/world/inter_pixel/neighb2d.hh> -#include <mln/world/inter_pixel/is_pixel.hh> +#include <mln/world/inter_pixel/all.hh> #include <mln/labeling/colorize.hh> #include <mln/debug/println.hh> +#include <mln/trace/quiet.hh> +#include "plot_label.hh" using namespace mln; using value::int_u8; @@ -152,7 +156,7 @@ dist_on_edges(image2d<util::array >& ima_arr) // Dummy. -/////////////////////////////////////////////////////////////////////////////// +//------- template <typename I, typename N> inline image2d<int> @@ -194,13 +198,14 @@ struct dist_t : Function_vv2v<dist_t> res += std::min(v1[i], v2[i]); image1d<V> tmp_ima; + image1d<V> tmp_ima2; accu::sum<V> accu_sum; convert::from_to(v1, tmp_ima); float sum_v1 = level::compute(accu_sum, tmp_ima); - convert::from_to(v2, tmp_ima); - float sum_v2 = level::compute(accu_sum, tmp_ima); + convert::from_to(v2, tmp_ima2); + float sum_v2 = level::compute(accu_sum, tmp_ima2); res /= std::max(sum_v1, sum_v2); @@ -282,10 +287,34 @@ int main(int argc, char* argv[]) L nbasins; mln_VAR(wst, morpho::watershed::flooding(clo, world::inter_pixel::e2e(), nbasins)); - mln_VAR(w, wst.unmorph_()); - data::fill((w | (!world::inter_pixel::is_separator())).rw(), nbasins.next()); - io::ppm::save(labeling::colorize(value::rgb8(), w, nbasins.next()), "result.ppm"); + std::cout << "nbasins: " << nbasins << std::endl; + + + mln_VAR(w_all, wst.unmorph_()); + //data::fill((w | (!world::inter_pixel::is_separator())).rw(), nbasins.next()); + mln_VAR(w_pixels, w_all | world::inter_pixel::is_pixel()); + data::paste(morpho::dilation(extend(w_pixels, pw::value(w_all)), c4().win()), w_all); + // edges -> dots + mln_VAR(w_dots, w_all | world::inter_pixel::dim2::is_dot()); + data::paste(morpho::erosion(extend(w_dots, pw::value(w_all)), c4().win()), w_all); + //io::ppm::save(labeling::colorize(value::rgb8(), w, nbasins.next()), "result.ppm"); + io::pgm::save(labeling::wrap(int_u8(), w_all), "result_labels.pgm"); + + + // Plots. + image2d<L> w_simple = world::inter_pixel::full2image(w_all); + plot_label(input, w_simple, 166u); + plot_label(input, w_simple, 182u); + plot_label(input, w_simple, 188u); + plot_label(input, w_simple, 189u); + plot_label(input, w_simple, 193u); + plot_label(input, w_simple, 195u); + plot_label(input, w_simple, 196u); + plot_label(input, w_simple, 198u); + plot_label(input, w_simple, 199u); + plot_label(input, w_simple, 200u); + plot_label(input, w_simple, 201u); -- 1.6.1.2

1 0

3782: configure.ac: configure new directories in milena/tests/.
by Guillaume Lazzara 11 May '09

11 May '09

--- ChangeLog | 4 ++++ configure.ac | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index faa0325..50179ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-05-11 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + * configure.ac: configure new directories in milena/tests/. + 2009-05-06 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * AUTHORS: First draft. diff --git a/configure.ac b/configure.ac index ada07fa..d08aec7 100644 --- a/configure.ac +++ b/configure.ac @@ -186,6 +186,7 @@ AC_CONFIG_FILES([ milena/tests/accu/Makefile milena/tests/accu/image/Makefile milena/tests/accu/site_set/Makefile + milena/tests/accu/stat/Makefile milena/tests/algebra/Makefile milena/tests/arith/Makefile milena/tests/binarization/Makefile @@ -213,6 +214,7 @@ AC_CONFIG_FILES([ milena/tests/fun/p2b/Makefile milena/tests/fun/p2p/Makefile milena/tests/fun/p2v/Makefile + milena/tests/fun/stat/Makefile milena/tests/fun/v2v/Makefile milena/tests/fun/vv2v/Makefile milena/tests/fun/x2x/Makefile @@ -221,8 +223,10 @@ AC_CONFIG_FILES([ milena/tests/graph/attribute/Makefile milena/tests/histo/Makefile milena/tests/io/Makefile + milena/tests/io/dicom/Makefile milena/tests/io/dump/Makefile milena/tests/io/fits/Makefile + milena/tests/io/magick/Makefile milena/tests/io/off/Makefile milena/tests/io/pbm/Makefile milena/tests/io/pfm/Makefile -- 1.5.6.5

1 0

[PATCH 21/31] configure.ac: configure new directories in milena/tests/.
by Roland Levillain 11 May '09

11 May '09

--- ChangeLog | 4 ++++ configure.ac | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index faa0325..50179ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-05-11 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + * configure.ac: configure new directories in milena/tests/. + 2009-05-06 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * AUTHORS: First draft. diff --git a/configure.ac b/configure.ac index ada07fa..d08aec7 100644 --- a/configure.ac +++ b/configure.ac @@ -186,6 +186,7 @@ AC_CONFIG_FILES([ milena/tests/accu/Makefile milena/tests/accu/image/Makefile milena/tests/accu/site_set/Makefile + milena/tests/accu/stat/Makefile milena/tests/algebra/Makefile milena/tests/arith/Makefile milena/tests/binarization/Makefile @@ -213,6 +214,7 @@ AC_CONFIG_FILES([ milena/tests/fun/p2b/Makefile milena/tests/fun/p2p/Makefile milena/tests/fun/p2v/Makefile + milena/tests/fun/stat/Makefile milena/tests/fun/v2v/Makefile milena/tests/fun/vv2v/Makefile milena/tests/fun/x2x/Makefile @@ -221,8 +223,10 @@ AC_CONFIG_FILES([ milena/tests/graph/attribute/Makefile milena/tests/histo/Makefile milena/tests/io/Makefile + milena/tests/io/dicom/Makefile milena/tests/io/dump/Makefile milena/tests/io/fits/Makefile + milena/tests/io/magick/Makefile milena/tests/io/off/Makefile milena/tests/io/pbm/Makefile milena/tests/io/pfm/Makefile -- 1.6.1.2

1 0

3781: Small fixes.
by Guillaume Lazzara 11 May '09

11 May '09

* milena/headers.mk: update distributed files list. * milena/mln/core/image/edge_image.hh, * milena/mln/core/image/vertex_image.hh: fix a wrong image type. * milena/mln/fun/math/sup.hh: fix wrong template parameters. * milena/mln/value/rgb.hh, * milena/mln/util/essential.hh, * milena/mln/util/all.hh, * milena/mln/labeling/all.hh, * milena/mln/debug/all.hh, * milena/mln/fun/v2v/all.hh: fix includes. * milena/mln/fun/v2v/rgb_to_hsi.hh: fix duplicate declarations. * milena/mln/make/influence_zone_adjacency_graph.hh: add missing const references. * milena/mln/morpho/opening/area_on_vertices.hh: update according new graph image types. * milena/mln/registration/icp.hh: fix use of random_color. * milena/mln/util/adjacency_matrix.hh: fix wrong ifndef. * milena/mln/util/object_id.hh, * milena/mln/util/vertex.hh, * milena/mln/util/edge.hh: fix operator< and operator==. * milena/mln/util/graph.hh: add preconditions. * milena/mln/world/binary_2d/all.hh: new. * milena/tests/morpho/closing/Makefile.am, * milena/tests/morpho/closing/area_on_vertices.cc, * milena/tests/morpho/opening/Makefile.am, * milena/tests/morpho/opening/area_on_vertices.cc: new tests. * milena/tests/unit_test/unit-tests.mk: update unit test list. * milena/tests/util/Makefile.am, * milena/tests/util/tree_fast_to_image.cc, * milena/tests/util/tree_to_image.cc: remove tests. --- milena/ChangeLog | 49 +++++++++++++ milena/headers.mk | 27 +++++--- milena/mln/core/image/edge_image.hh | 3 +- milena/mln/core/image/vertex_image.hh | 3 +- milena/mln/debug/all.hh | 3 +- milena/mln/fun/math/sup.hh | 4 +- milena/mln/fun/v2v/all.hh | 3 + milena/mln/fun/v2v/rgb_to_hsi.hh | 53 -------------- milena/mln/labeling/all.hh | 1 + milena/mln/make/influence_zone_adjacency_graph.hh | 13 ++-- milena/mln/morpho/opening/area_on_vertices.hh | 37 ++++++----- milena/mln/registration/icp.hh | 3 +- milena/mln/util/adjacency_matrix.hh | 4 +- milena/mln/util/all.hh | 2 - milena/mln/util/edge.hh | 8 ++- milena/mln/util/essential.hh | 2 +- milena/mln/util/graph.hh | 5 +- milena/mln/util/object_id.hh | 7 ++ milena/mln/util/vertex.hh | 4 +- milena/mln/value/rgb.hh | 1 + .../{util/essential.hh => world/binary_2d/all.hh} | 26 +++---- milena/tests/morpho/closing/Makefile.am | 2 + .../morpho/closing/area_on_vertices.cc} | 65 +++++++++--------- milena/tests/morpho/opening/Makefile.am | 2 + .../morpho/opening/area_on_vertices.cc} | 65 +++++++++--------- milena/tests/unit_test/unit-tests.mk | 72 ++++++++++++++------ milena/tests/util/Makefile.am | 6 +-- 27 files changed, 259 insertions(+), 211 deletions(-) copy milena/mln/{util/essential.hh => world/binary_2d/all.hh} (70%) copy milena/{mln/fun/math/sup.hh => tests/morpho/closing/area_on_vertices.cc} (58%) copy milena/{mln/fun/math/sup.hh => tests/morpho/opening/area_on_vertices.cc} (58%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2fda128..e0e1cee 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,54 @@ 2009-05-11 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Small fixes. + + * milena/headers.mk: update distributed files list. + + * milena/mln/core/image/edge_image.hh, + * milena/mln/core/image/vertex_image.hh: fix a wrong image type. + + * milena/mln/fun/math/sup.hh: fix wrong template parameters. + + * milena/mln/value/rgb.hh, + * milena/mln/util/essential.hh, + * milena/mln/util/all.hh, + * milena/mln/labeling/all.hh, + * milena/mln/debug/all.hh, + * milena/mln/fun/v2v/all.hh: fix includes. + + * milena/mln/fun/v2v/rgb_to_hsi.hh: fix duplicate declarations. + + * milena/mln/make/influence_zone_adjacency_graph.hh: add missing const + references. + + * milena/mln/morpho/opening/area_on_vertices.hh: update according new + graph image types. + + * milena/mln/registration/icp.hh: fix use of random_color. + + * milena/mln/util/adjacency_matrix.hh: fix wrong ifndef. + + * milena/mln/util/object_id.hh, + * milena/mln/util/vertex.hh, + * milena/mln/util/edge.hh: fix operator< and operator==. + + * milena/mln/util/graph.hh: add preconditions. + + * milena/mln/world/binary_2d/all.hh: new. + + * milena/tests/morpho/closing/Makefile.am, + * milena/tests/morpho/closing/area_on_vertices.cc, + * milena/tests/morpho/opening/Makefile.am, + * milena/tests/morpho/opening/area_on_vertices.cc: new tests. + + * milena/tests/unit_test/unit-tests.mk: update unit test list. + + * milena/tests/util/Makefile.am, + * milena/tests/util/tree_fast_to_image.cc, + * milena/tests/util/tree_to_image.cc: remove tests. + +2009-05-11 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Fix documentation. * doc/Doxyfile.in: add macro definitions. diff --git a/milena/headers.mk b/milena/headers.mk index 34e4823..d241629 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -57,11 +57,18 @@ mln/literal/one.hh \ mln/literal/min.hh \ mln/literal/white.hh \ mln/literal/essential.hh \ +mln/world/all.hh \ mln/world/binary_2d/subsample.hh \ +mln/world/binary_2d/all.hh \ mln/world/binary_2d/projected_histo.hh \ +mln/world/inter_pixel/is_pixel.hh \ +mln/world/inter_pixel/all.hh \ mln/world/inter_pixel/neighb2d.hh \ -mln/world/inter_pixel/image2full.hh \ +mln/world/inter_pixel/is_separator.hh \ +mln/world/inter_pixel/immerse.hh \ +mln/world/inter_pixel/separator_to_pixels.hh \ mln/world/inter_pixel/display_edge.hh \ +mln/world/inter_pixel/compute.hh \ mln/world/inter_pixel/dim2/is_pixel.hh \ mln/world/inter_pixel/dim2/all.hh \ mln/world/inter_pixel/dim2/is_edge.hh \ @@ -82,7 +89,6 @@ mln/util/max.hh \ mln/util/lazy_set.hh \ mln/util/soft_heap.hh \ mln/util/set.hh \ -mln/util/tree_to_image.hh \ mln/util/lemmings.hh \ mln/util/greater_point.hh \ mln/util/internal/graph_iter_base.hh \ @@ -109,18 +115,13 @@ mln/util/yes.hh \ mln/util/line_graph.hh \ mln/util/ord.hh \ mln/util/adjacency_matrix.hh \ -mln/util/tree_fast_to_image.hh \ -mln/util/tree.hh \ mln/util/couple.hh \ mln/util/index.hh \ mln/util/multi_site.hh \ -mln/util/branch_iter.hh \ -mln/util/branch_iter_ind.hh \ -mln/util/tree_to_fast.hh \ mln/util/array.hh \ mln/util/vertex.hh \ mln/util/pix.hh \ -mln/util/tree_fast.hh \ +mln/util/object_id.hh \ mln/util/site_pair.hh \ mln/util/nil.hh \ mln/util/graph_ids.hh \ @@ -128,6 +129,7 @@ mln/util/eat.hh \ mln/util/essential.hh \ mln/data/memset_.hh \ mln/data/paste.spe.hh \ +mln/data/paste_without_localization.hh \ mln/data/memcpy_.hh \ mln/data/all.hh \ mln/data/paste.hh \ @@ -218,6 +220,8 @@ mln/fun/p2p/all.hh \ mln/fun/p2p/translation.hh \ mln/fun/p2p/mirror.hh \ mln/fun/accu_result.hh \ +mln/fun/stat/mahalanobis.hh \ +mln/fun/stat/all.hh \ mln/fun/binary_param.hh \ mln/fun/x2p/closest_point.hh \ mln/fun/x2p/all.hh \ @@ -295,6 +299,8 @@ mln/fun/vv2b/lt.hh \ mln/fun/vv2b/eq.hh \ mln/fun/cast.hh \ mln/fun/composition.hh \ +mln/fun/access/all.hh \ +mln/fun/access/mean.hh \ mln/fun/i2v/all.hh \ mln/fun/i2v/array.hh \ mln/fun/i2v/all_to.hh \ @@ -435,6 +441,7 @@ mln/accu/site_set/all.hh \ mln/accu/site_set/essential.hh \ mln/accu/stat/variance.hh \ mln/accu/stat/deviation.hh \ +mln/accu/stat/all.hh \ mln/accu/stat/var.hh \ mln/accu/max.hh \ mln/accu/lor.hh \ @@ -1026,7 +1033,6 @@ mln/core/concept/window.hh \ mln/core/concept/value.hh \ mln/core/concept/accumulator.hh \ mln/core/concept/site_set.hh \ -mln/core/concept/object_id.hh \ mln/core/concept/object.hh \ mln/core/concept/meta_fun.hh \ mln/core/concept/delta_point_site.hh \ @@ -1109,6 +1115,7 @@ mln/labeling/all.hh \ mln/labeling/level.hh \ mln/labeling/flat_zones.hh \ mln/labeling/foreground.hh \ +mln/labeling/colorize.hh \ mln/labeling/regional_maxima.hh \ mln/labeling/wrap.hh \ mln/labeling/compute.hh \ @@ -1207,7 +1214,6 @@ mln/debug/iota.hh \ mln/debug/all.hh \ mln/debug/println_with_border.hh \ mln/debug/println.spe.hh \ -mln/debug/colorize.hh \ mln/debug/slices_2d.hh \ mln/debug/draw_graph.hh \ mln/debug/filename.hh \ @@ -1233,6 +1239,7 @@ mln/graph/attribute/card.hh \ mln/graph/compute.hh \ mln/graph/essential.hh \ mln/set/uni.hh \ +mln/set/compute_with_weights.hh \ mln/set/unique.hh \ mln/set/inter.hh \ mln/set/all.hh \ diff --git a/milena/mln/core/image/edge_image.hh b/milena/mln/core/image/edge_image.hh index 76d7fe0..3c71bb8 100644 --- a/milena/mln/core/image/edge_image.hh +++ b/milena/mln/core/image/edge_image.hh @@ -146,6 +146,7 @@ namespace mln /// Function mapping graph elements to sites. typedef typename internal::efsite_selector<P,G>::site_function_t site_function_t; + typedef mln_result(site_function_t) function_result_t; /// Window type typedef graph_elt_window<G,p_edges<G,site_function_t> > win_t; @@ -193,7 +194,7 @@ namespace mln { fun::i2v::array<V> f; init_(tag::function, f, exact(model)); - p_edges<G,fun::i2v::array > s; + p_edges<G, typename edge_image<P,V,G>::site_function_t> s; init_(tag::domain, s, exact(model)); target.init_(f, s); } diff --git a/milena/mln/core/image/vertex_image.hh b/milena/mln/core/image/vertex_image.hh index 3498ec7..0d62991 100644 --- a/milena/mln/core/image/vertex_image.hh +++ b/milena/mln/core/image/vertex_image.hh @@ -144,6 +144,7 @@ namespace mln /// Function mapping graph elements to sites. typedef typename internal::vfsite_selector<P,G>::site_function_t site_function_t; + typedef mln_result(site_function_t) function_result_t; /// Skeleton type. @@ -187,7 +188,7 @@ namespace mln { fun::i2v::array<V> f; init_(tag::function, f, exact(model)); - p_vertices<G,fun::i2v::array > s; + p_vertices<G,typename edge_image<P,V,G>::site_function_t> s; init_(tag::domain, s, exact(model)); target.init_(f, s); } diff --git a/milena/mln/debug/all.hh b/milena/mln/debug/all.hh index 814c95b..e65e907 100644 --- a/milena/mln/debug/all.hh +++ b/milena/mln/debug/all.hh @@ -48,8 +48,8 @@ namespace mln } -# include <mln/debug/format.hh> # include <mln/debug/draw_graph.hh> +# include <mln/debug/format.hh> # include <mln/debug/histo.hh> # include <mln/debug/iota.hh> # include <mln/debug/println.hh> @@ -58,5 +58,4 @@ namespace mln # include <mln/debug/quiet.hh> # include <mln/debug/slices_2d.hh> - #endif // ! MLN_DEBUG_ALL_HH diff --git a/milena/mln/fun/math/sup.hh b/milena/mln/fun/math/sup.hh index 20e19bf..d76b4b2 100644 --- a/milena/mln/fun/math/sup.hh +++ b/milena/mln/fun/math/sup.hh @@ -46,7 +46,7 @@ namespace mln namespace next { - template <typename T> + template <typename T1, typename T2> struct set_binary_<mln::fun::sup, mln::Object, T1, mln::Object, T2> { typedef set_binary_ ret; @@ -66,5 +66,5 @@ namespace mln } // end of namespace mln -#endif /* ! MLN_FUN_MATH_SUP_HH */ +#endif // ! MLN_FUN_MATH_SUP_HH diff --git a/milena/mln/fun/v2v/all.hh b/milena/mln/fun/v2v/all.hh index 2d14054..65de5ca 100644 --- a/milena/mln/fun/v2v/all.hh +++ b/milena/mln/fun/v2v/all.hh @@ -54,11 +54,14 @@ namespace mln # include <mln/fun/v2v/convert.hh> # include <mln/fun/v2v/dec.hh> # include <mln/fun/v2v/enc.hh> +# include <mln/fun/v2v/hsi_to_rgb.hh> +# include <mln/fun/v2v/hsl_to_rgb.hh> # include <mln/fun/v2v/id.hh> # include <mln/fun/v2v/linear.hh> # include <mln/fun/v2v/norm.hh> # include <mln/fun/v2v/projection.hh> # include <mln/fun/v2v/rgb_to_hsi.hh> +# include <mln/fun/v2v/rgb_to_hsl.hh> # include <mln/fun/v2v/saturate.hh> # include <mln/fun/v2v/wrap.hh> diff --git a/milena/mln/fun/v2v/rgb_to_hsi.hh b/milena/mln/fun/v2v/rgb_to_hsi.hh index bf9bd5d..c344343 100644 --- a/milena/mln/fun/v2v/rgb_to_hsi.hh +++ b/milena/mln/fun/v2v/rgb_to_hsi.hh @@ -61,28 +61,11 @@ namespace mln extern f_rgb_to_hsi_f_t f_rgb_to_hsi_f; - template <typename T_rgb> - struct f_hsi_to_rgb_ : public Function_v2v< f_hsi_to_rgb_<T_rgb> > - { - typedef T_rgb result; - - template <typename T_hsi> - T_rgb operator()(const T_hsi& hsi) const; - - }; - - typedef f_hsi_to_rgb_<value::rgb8> f_hsi_to_rgb_3x8_t; - - extern f_hsi_to_rgb_3x8_t f_hsi_to_rgb_3x8; - - # ifndef MLN_INCLUDE_ONLY /// Global variables. /// \{ f_rgb_to_hsi_f_t f_rgb_to_hsi_f; - - f_hsi_to_rgb_3x8_t f_hsi_to_rgb_3x8; /// \} @@ -120,42 +103,6 @@ namespace mln } - template <typename T_rgb> - template <typename T_hsi> - inline - T_rgb - f_hsi_to_rgb_<T_rgb>::operator()(const T_hsi& hsi) const - { - typedef typename T_rgb::red_t red_t; - typedef typename T_rgb::green_t green_t; - typedef typename T_rgb::blue_t blue_t; - - static math::round<red_t> to_r; - static math::round<green_t> to_g; - static math::round<blue_t> to_b; - - static const float - sqrt3_3 = std::sqrt(3) / 3, - inv_sqrt6 = 1 / std::sqrt(6), - inv_sqrt2 = 1 / std::sqrt(2); - - float - h = hsi.hue() / 180.0 * 3.1415, - alpha = hsi.sat() * std::cos(h), - beta = hsi.sat() * std::sin(h); - - - red_t r = to_r(sqrt3_3 * hsi.inty() + 2 * inv_sqrt6 * beta); - green_t g = - to_g(sqrt3_3 * hsi.inty() + inv_sqrt2 * alpha - inv_sqrt6 * beta); - blue_t b = - to_b(sqrt3_3 * hsi.inty() - inv_sqrt2 * alpha - inv_sqrt6 * beta); - - T_rgb rgb(r, g, b); - - return rgb; - } - # endif // !MLN_INCLUDE_ONLY } // end of namespace fun::v2v diff --git a/milena/mln/labeling/all.hh b/milena/mln/labeling/all.hh index 2931427..e90633b 100644 --- a/milena/mln/labeling/all.hh +++ b/milena/mln/labeling/all.hh @@ -55,6 +55,7 @@ namespace mln # include <mln/labeling/background.hh> # include <mln/labeling/blobs.hh> +# include <mln/labeling/colorize.hh> # include <mln/labeling/compute.hh> # include <mln/labeling/fill_holes.hh> # include <mln/labeling/flat_zones.hh> diff --git a/milena/mln/make/influence_zone_adjacency_graph.hh b/milena/mln/make/influence_zone_adjacency_graph.hh index 6cbaa4c..a5c3462 100644 --- a/milena/mln/make/influence_zone_adjacency_graph.hh +++ b/milena/mln/make/influence_zone_adjacency_graph.hh @@ -56,14 +56,16 @@ namespace mln /// Create a graph from an influence zone image. /// /// \param[in] iz influence zone image. + /// \param[in] nbh A neighborhood. /// \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, typename N> util::graph influence_zone_adjacency_graph(const Image& iz_, const Neighborhood<N>& nbh, - mln_value(I) nlabels); + const mln_value(I)& nlabels); @@ -77,7 +79,7 @@ namespace mln void influence_zone_adjacency_graph_tests(const Image& iz, const Neighborhood<N>& nbh, - mln_value(I)) + const mln_value(I)&) { mln_precondition(exact(iz).is_valid()); mln_precondition(exact(nbh).is_valid()); @@ -94,11 +96,12 @@ namespace mln namespace generic { + /// Generic implementation of make::influence_zone_adjacency_graph. template <typename I, typename N> util::graph influence_zone_adjacency_graph(const Image& iz_, const Neighborhood<N>& nbh_, - mln_value(I) nlabels) + const mln_value(I)& nlabels) { trace::entering("make::impl::generic::influence_zone_adjacency_graph"); @@ -151,7 +154,7 @@ namespace mln util::graph influence_zone_adjacency_graph_dispatch(const Image& iz, const Neighborhood<N>& nbh, - mln_value(I) nlabels) + const mln_value(I)& nlabels) { return make::impl::generic::influence_zone_adjacency_graph(iz, nbh, nlabels); } @@ -167,7 +170,7 @@ namespace mln util::graph influence_zone_adjacency_graph(const Image& iz, const Neighborhood<N>& nbh, - mln_value(I) nlabels) + const mln_value(I)& nlabels) { trace::entering("make::influence_zone_adjacency_graph"); diff --git a/milena/mln/morpho/opening/area_on_vertices.hh b/milena/mln/morpho/opening/area_on_vertices.hh index cb69d7f..f0ccd34 100644 --- a/milena/mln/morpho/opening/area_on_vertices.hh +++ b/milena/mln/morpho/opening/area_on_vertices.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -34,8 +34,7 @@ /// Morphological area opening on a line graph image computing /// the area in terms of adjacent vertices. -# include <mln/pw/image.hh> -# include <mln/core/site_set/p_edges.hh> +# include <mln/core/image/edge_image.hh> # include <mln/morpho/opening/algebraic.hh> # include <mln/morpho/attribute/count_adjacent_vertices.hh> @@ -49,32 +48,38 @@ namespace mln namespace opening { - /// Morphological area opening on a mln::line_graph_image computing - /// the area in terms of adjacent vertices. - template <typename P2V, typename G, typename V2P, typename N> - pw::image<P2V, p_edges<G, V2P> > - area_on_vertices(const pw::image<P2V, p_edges<G, V2P> >& input, + /// Morphological area opening on a mln::line_graph_image computing + /// the area in terms of adjacent vertices. + /// + /// \param[in] input An edge image. + /// \param[in] nbh A graph neighborhood. + /// \param[in] lambda Closing parameter. + /// + /// \return An edge image. + // + template <typename P, typename V, typename G, typename N> + edge_image<P,V,G> + area_on_vertices(const edge_image<P,V,G>& input, const Neighborhood<N>& nbh, unsigned lambda); # ifndef MLN_INCLUDE_ONLY - template <typename P2V, typename G, typename V2P, typename N> + template <typename P, typename V, typename G, typename N> inline - pw::image<P2V, p_edges<G, V2P> > - area_on_vertices(const pw::image<P2V, p_edges<G, V2P> >& input, + edge_image<P,V,G> + area_on_vertices(const edge_image<P,V,G>& input, const Neighborhood<N>& nbh, unsigned lambda) { trace::entering("morpho::opening::area_on_vertices"); mln_precondition(exact(input).is_valid()); - typedef p_edges<G, V2P> pe_t; - typedef attribute::count_adjacent_vertices< pw::image<P2V, pe_t> > attribute_t; + typedef attribute::count_adjacent_vertices< edge_image<P,V,G> > attribute_t; - pw::image<P2V, p_edges<G, V2P> > output; - output = opening::algebraic(input, nbh, attribute_t(), lambda); + edge_image<P,V,G> + output = opening::algebraic(input, nbh, attribute_t(), lambda); trace::exiting("morpho::opening::area_on_vertices"); return output; diff --git a/milena/mln/registration/icp.hh b/milena/mln/registration/icp.hh index a2bee09..25edf96 100644 --- a/milena/mln/registration/icp.hh +++ b/milena/mln/registration/icp.hh @@ -62,6 +62,7 @@ # include <mln/io/ppm/save.hh> # include <mln/io/pbm/save.hh> +# include <mln/labeling/colorize.hh> # include <mln/debug/histo.hh> # include <mln/accu/histo.hh> @@ -200,7 +201,7 @@ namespace mln mln_piter(p_array) p(X); for_all(p) { - debug(p) = debug::internal::random_color(value::rgb8()); + debug(p) = labeling::internal::random_color(value::rgb8()); debug2(p) = true; } io::pbm::save(slice(debug2,0), "debug2-a.ppm"); diff --git a/milena/mln/util/adjacency_matrix.hh b/milena/mln/util/adjacency_matrix.hh index dfda26f..9a60c94 100644 --- a/milena/mln/util/adjacency_matrix.hh +++ b/milena/mln/util/adjacency_matrix.hh @@ -250,9 +250,9 @@ namespace mln ::adjacency_matrix_impl_selector(const V& nelements) { (void) nelements; -# ifndef DNDEBUG +# ifndef NDEBUG nelements_ = nelements; -# endif // ! DNDEBUG +# endif // ! NDEBUG } template <typename V> diff --git a/milena/mln/util/all.hh b/milena/mln/util/all.hh index 180b8a1..c6d9864 100644 --- a/milena/mln/util/all.hh +++ b/milena/mln/util/all.hh @@ -72,9 +72,7 @@ namespace mln # include <mln/util/tracked_ptr.hh> # include <mln/util/tree.hh> # include <mln/util/tree_fast.hh> -# include <mln/util/tree_fast_to_image.hh> # include <mln/util/tree_to_fast.hh> -//# include <mln/util/tree_to_image.hh> # include <mln/util/vertex.hh> # include <mln/util/yes.hh> diff --git a/milena/mln/util/edge.hh b/milena/mln/util/edge.hh index 0c759db..1de3648 100644 --- a/milena/mln/util/edge.hh +++ b/milena/mln/util/edge.hh @@ -359,15 +359,17 @@ namespace mln bool operator==(const edge<G>& lhs, const edge<G>& rhs) { - return lhs.pair_vertex_ == rhs.pair_vertex_; + return lhs.id() == rhs.id() + && (lhs.graph().is_subgraph_of(rhs.graph()) + || rhs.graph().is_subgraph_of(lhs.graph())); } template <typename G> inline bool - operator< (const edge<G>& lhs, const edge<G>& rhs) + operator<(const edge<G>& lhs, const edge<G>& rhs) { - return lhs.pair_vertex_ < rhs.pair_vertex_; + return lhs.id() < rhs.id(); } } // end of namespace mln::util diff --git a/milena/mln/util/essential.hh b/milena/mln/util/essential.hh index 3c9b74f..d5eab8a 100644 --- a/milena/mln/util/essential.hh +++ b/milena/mln/util/essential.hh @@ -1,4 +1,5 @@ // Copyright (C) 2008, 2009 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 @@ -40,6 +41,5 @@ # include <mln/util/ord_pair.hh> # include <mln/util/set.hh> # include <mln/util/site_pair.hh> -# include <mln/util/tree.hh> #endif // ! MLN_UTIL_ESSENTIAL_HH diff --git a/milena/mln/util/graph.hh b/milena/mln/util/graph.hh index 83c0e8c..3ebd62d 100644 --- a/milena/mln/util/graph.hh +++ b/milena/mln/util/graph.hh @@ -385,7 +385,10 @@ namespace mln edge_id_t graph::add_edge(const vertex_id_t& id_v1, const vertex_id_t& id_v2) { - //FIXME: to be removed! We should not check that, except in without NDEBUG. + mln_precondition(id_v1 != id_v2); + mln_precondition(has_v(id_v1)); + mln_precondition(has_v(id_v2)); + // Does this edge already exist in the graph? edge_data_t edge(id_v1, id_v2); # ifndef NDEBUG diff --git a/milena/mln/util/object_id.hh b/milena/mln/util/object_id.hh index b3ea879..b50f2a5 100644 --- a/milena/mln/util/object_id.hh +++ b/milena/mln/util/object_id.hh @@ -185,6 +185,13 @@ namespace mln + template <typename Tag, typename V, typename V2> + inline + bool + operator==(const object_id<Tag,V>& lhs, const Value<V2>& rhs) + { + return lhs.value() == exact(rhs).to_equiv(); + } template <typename Tag, typename V> inline diff --git a/milena/mln/util/vertex.hh b/milena/mln/util/vertex.hh index 4f0c5ad..6d5af65 100644 --- a/milena/mln/util/vertex.hh +++ b/milena/mln/util/vertex.hh @@ -378,7 +378,9 @@ namespace mln bool operator==(const vertex<G>& v1, const vertex<G>& v2) { - return v1.id() == v2.id(); + return v1.id() == v2.id() + && (v1.graph().is_subgraph_of(v2.graph()) + || v2.graph().is_subgraph_of(v1.graph())); } template<typename G> diff --git a/milena/mln/value/rgb.hh b/milena/mln/value/rgb.hh index ebeeb5e..54e6b76 100644 --- a/milena/mln/value/rgb.hh +++ b/milena/mln/value/rgb.hh @@ -42,6 +42,7 @@ # include <mln/value/ops.hh> +# include <mln/fun/v2v/hsl_to_rgb.hh> # include <mln/value/concept/vectorial.hh> # include <mln/value/int_u.hh> # include <mln/algebra/vec.hh> diff --git a/milena/mln/util/essential.hh b/milena/mln/world/binary_2d/all.hh similarity index 70% copy from milena/mln/util/essential.hh copy to milena/mln/world/binary_2d/all.hh index 3c9b74f..cf94381 100644 --- a/milena/mln/util/essential.hh +++ b/milena/mln/world/binary_2d/all.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// Copyright (C) 2009 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,21 +25,17 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_UTIL_ESSENTIAL_HH -# define MLN_UTIL_ESSENTIAL_HH +#ifndef MLN_WORLD_BINARY_2D_ALL_HH +# define MLN_WORLD_BINARY_2D_ALL_HH -/// \file mln/util/essential.hh +/// \file mln/world/all.hh /// -/// File that includes essential util-related routines. +/// File that includes all the world routines. -# include <mln/util/array.hh> -# include <mln/util/couple.hh> -# include <mln/util/lazy_set.hh> -# include <mln/util/lemmings.hh> -# include <mln/util/ord.hh> -# include <mln/util/ord_pair.hh> -# include <mln/util/set.hh> -# include <mln/util/site_pair.hh> -# include <mln/util/tree.hh> -#endif // ! MLN_UTIL_ESSENTIAL_HH +// Sub-directories. +# include <mln/world/binary_2d/projected_histo.hh> +# include <mln/world/binary_2d/subsample.hh> + + +#endif // ! MLN_WORLD_BINARY_2D_ALL_HH diff --git a/milena/tests/morpho/closing/Makefile.am b/milena/tests/morpho/closing/Makefile.am index 6d5ee0a..696cd14 100644 --- a/milena/tests/morpho/closing/Makefile.am +++ b/milena/tests/morpho/closing/Makefile.am @@ -6,6 +6,7 @@ SUBDIRS = \ approx check_PROGRAMS = \ + area_on_vertices \ leveling \ algebraic \ height \ @@ -14,6 +15,7 @@ check_PROGRAMS = \ structural \ sum +area_on_vertices_SOURCES = area_on_vertices.cc leveling_SOURCES = leveling.cc algebraic_SOURCES = algebraic.cc height_SOURCES = height.cc diff --git a/milena/mln/fun/math/sup.hh b/milena/tests/morpho/closing/area_on_vertices.cc similarity index 58% copy from milena/mln/fun/math/sup.hh copy to milena/tests/morpho/closing/area_on_vertices.cc index 20e19bf..4d8db2d 100644 --- a/milena/mln/fun/math/sup.hh +++ b/milena/tests/morpho/closing/area_on_vertices.cc @@ -7,7 +7,7 @@ // // 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 F PARTICULAR PURPOSE. See the GNU +// 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 @@ -25,46 +25,43 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_FUN_MATH_SUP_HH -# define MLN_FUN_MATH_SUP_HH +/// \file tests/morpho/closing/area_on_vertices.cc +/// +/// Test on mln::morpho::closing::area_on_vertices. -# include <mln/fun/binary.hh> -# include <mln/math/max.hh> +#include <mln/core/image/edge_image.hh> +#include <mln/morpho/closing/area_on_vertices.hh> +#include <mln/util/graph.hh> +#include <mln/fun/i2v/array.hh> -namespace mln -{ - - // Cosinus, bijective - namespace fun - { - struct sup : binary {}; - } +#include "tests/data.hh" - namespace trait - { - namespace next - { +const unsigned result[] = { 101, 101, 102 }; - template <typename T> - struct set_binary_<mln::fun::sup, mln::Object, T1, mln::Object, T2> - { - typedef set_binary_ ret; - typedef mln_trait_promote(T1, T2) result; - typedef T1 argument1; - typedef T2 argument2; - - static result read(const argument1& a, const argument1& b) - { - return math::max(a, b); - } - }; +int main() +{ + using namespace mln; - } // end of namespace mln::trait::next + util::graph gr; + gr.add_vertices(5); + gr.add_edge(1, 3); + gr.add_edge(1, 2); + gr.add_edge(2 ,4); - } // end of namespace mln::trait + fun::i2v::array<unsigned> f(5); + for (unsigned i = 0; i < 5; ++i) + f(i) = 100 + i; + typedef edge_image<void,unsigned> e_ima_t; + e_ima_t e_ima(gr, f); + typedef e_ima_t::nbh_t nbh_t; + nbh_t nbh; -} // end of namespace mln + e_ima_t clo = morpho::closing::area_on_vertices(e_ima, nbh, 3); -#endif /* ! MLN_FUN_MATH_SUP_HH */ + unsigned i = 0; + mln_piter_(e_ima_t) p(clo.domain()); + for_all(p) + mln_assertion(result[i++] == clo(p)); +} diff --git a/milena/tests/morpho/opening/Makefile.am b/milena/tests/morpho/opening/Makefile.am index f0abae0..5f7e44a 100644 --- a/milena/tests/morpho/opening/Makefile.am +++ b/milena/tests/morpho/opening/Makefile.am @@ -6,6 +6,7 @@ SUBDIRS = \ approx check_PROGRAMS = \ + area_on_vertices \ leveling \ algebraic \ height \ @@ -14,6 +15,7 @@ check_PROGRAMS = \ structural \ sum +area_on_vertices_SOURCES = area_on_vertices.cc leveling_SOURCES = leveling.cc algebraic_SOURCES = algebraic.cc height_SOURCES = height.cc diff --git a/milena/mln/fun/math/sup.hh b/milena/tests/morpho/opening/area_on_vertices.cc similarity index 58% copy from milena/mln/fun/math/sup.hh copy to milena/tests/morpho/opening/area_on_vertices.cc index 20e19bf..f259770 100644 --- a/milena/mln/fun/math/sup.hh +++ b/milena/tests/morpho/opening/area_on_vertices.cc @@ -7,7 +7,7 @@ // // 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 F PARTICULAR PURPOSE. See the GNU +// 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 @@ -25,46 +25,43 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_FUN_MATH_SUP_HH -# define MLN_FUN_MATH_SUP_HH +/// \file tests/morpho/opening/area_on_vertices.cc +/// +/// Test on mln::morpho::opening::area_on_vertices. -# include <mln/fun/binary.hh> -# include <mln/math/max.hh> +#include <mln/core/image/edge_image.hh> +#include <mln/morpho/opening/area_on_vertices.hh> +#include <mln/util/graph.hh> +#include <mln/fun/i2v/array.hh> -namespace mln -{ - - // Cosinus, bijective - namespace fun - { - struct sup : binary {}; - } +#include "tests/data.hh" - namespace trait - { - namespace next - { +const unsigned result[] = { 100, 101, 101 }; - template <typename T> - struct set_binary_<mln::fun::sup, mln::Object, T1, mln::Object, T2> - { - typedef set_binary_ ret; - typedef mln_trait_promote(T1, T2) result; - typedef T1 argument1; - typedef T2 argument2; - - static result read(const argument1& a, const argument1& b) - { - return math::max(a, b); - } - }; +int main() +{ + using namespace mln; - } // end of namespace mln::trait::next + util::graph gr; + gr.add_vertices(5); + gr.add_edge(1, 3); + gr.add_edge(1, 2); + gr.add_edge(2 ,4); - } // end of namespace mln::trait + fun::i2v::array<unsigned> f(5); + for (unsigned i = 0; i < 5; ++i) + f(i) = 100 + i; + typedef edge_image<void,unsigned> e_ima_t; + e_ima_t e_ima(gr, f); + typedef e_ima_t::nbh_t nbh_t; + nbh_t nbh; -} // end of namespace mln + e_ima_t clo = morpho::opening::area_on_vertices(e_ima, nbh, 3); -#endif /* ! MLN_FUN_MATH_SUP_HH */ + unsigned i = 0; + mln_piter_(e_ima_t) p(clo.domain()); + for_all(p) + mln_assertion(result[i++] == clo(p)); +} diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 6869395..37f1d72 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -55,16 +55,25 @@ mln_literal_one \ mln_literal_min \ mln_literal_white \ mln_literal_essential \ +mln_world_all \ mln_world_binary_2d_subsample \ +mln_world_binary_2d_all \ mln_world_binary_2d_projected_histo \ +mln_world_inter_pixel_is_pixel \ +mln_world_inter_pixel_all \ mln_world_inter_pixel_neighb2d \ -mln_world_inter_pixel_full \ +mln_world_inter_pixel_is_separator \ +mln_world_inter_pixel_immerse \ +mln_world_inter_pixel_separator_to_pixels \ mln_world_inter_pixel_display_edge \ +mln_world_inter_pixel_compute \ mln_world_inter_pixel_dim2_is_pixel \ mln_world_inter_pixel_dim2_all \ mln_world_inter_pixel_dim2_is_edge \ +mln_world_inter_pixel_dim2_make_edge_image \ mln_world_inter_pixel_dim2_is_dot \ mln_world_inter_pixel_dim2_is_row_odd \ +mln_world_inter_pixel_full2image \ mln_registration_get_rtransf \ mln_registration_internal_rms \ mln_registration_get_rot \ @@ -78,7 +87,6 @@ mln_util_max \ mln_util_lazy_set \ mln_util_soft_heap \ mln_util_set \ -mln_util_tree_to_image \ mln_util_lemmings \ mln_util_greater_point \ mln_util_internal_graph_iter_base \ @@ -104,24 +112,21 @@ mln_util_timer \ mln_util_yes \ mln_util_line_graph \ mln_util_ord \ -mln_util_tree_fast_to_image \ -mln_util_tree \ +mln_util_adjacency_matrix \ mln_util_couple \ mln_util_index \ mln_util_multi_site \ -mln_util_branch_iter \ -mln_util_branch_iter_ind \ -mln_util_tree_to_fast \ mln_util_array \ mln_util_vertex \ mln_util_pix \ -mln_util_tree_fast \ +mln_util_object_id \ mln_util_site_pair \ mln_util_nil \ mln_util_graph_ids \ mln_util_eat \ mln_util_essential \ mln_data_memset_ \ +mln_data_paste_without_localization \ mln_data_memcpy_ \ mln_data_all \ mln_data_paste \ @@ -210,6 +215,8 @@ mln_fun_p2p_all \ mln_fun_p2p_translation \ mln_fun_p2p_mirror \ mln_fun_accu_result \ +mln_fun_stat_mahalanobis \ +mln_fun_stat_all \ mln_fun_binary_param \ mln_fun_x2p_closest_point \ mln_fun_x2p_all \ @@ -287,6 +294,8 @@ mln_fun_vv2b_lt \ mln_fun_vv2b_eq \ mln_fun_cast \ mln_fun_composition \ +mln_fun_access_all \ +mln_fun_access_mean \ mln_fun_i2v_all \ mln_fun_i2v_array \ mln_fun_i2v_all_to \ @@ -297,10 +306,13 @@ mln_fun_x2x_translation \ mln_fun_x2x_rotation \ mln_fun_x2x_essential \ mln_fun_component_red \ +mln_fun_component_comp_count \ +mln_fun_component_scomp \ mln_fun_component_green \ mln_fun_component_comp \ mln_fun_component_blue \ mln_fun_component_rgb \ +mln_fun_component_ithcomp \ mln_fun_compose \ mln_fun_meta_red \ mln_fun_meta_hue \ @@ -424,6 +436,7 @@ mln_accu_site_set_all \ mln_accu_site_set_essential \ mln_accu_stat_variance \ mln_accu_stat_deviation \ +mln_accu_stat_all \ mln_accu_stat_var \ mln_accu_max \ mln_accu_lor \ @@ -471,6 +484,7 @@ mln_accu_image_init \ mln_accu_image_to_result \ mln_accu_image_all \ mln_accu_image_set_value \ +mln_accu_image_untake \ mln_accu_image_take \ mln_accu_image_take_as_init \ mln_accu_image_take_n_times \ @@ -559,7 +573,6 @@ mln_trait_ch_function_value \ mln_trait_ch_value \ mln_trait_solve \ mln_trait_solve_unary \ -mln_trait_fun \ mln_trait_op_postdec \ mln_trait_op_mod \ mln_trait_op_lor \ @@ -587,6 +600,7 @@ mln_trait_op_uplus \ mln_trait_op_essential \ mln_trait_op_eq \ mln_trait_concrete \ +mln_trait_functions \ mln_trait_windows \ mln_trait_site_sets \ mln_trait_image_from_grid \ @@ -994,7 +1008,6 @@ mln_core_concept_window \ mln_core_concept_value \ mln_core_concept_accumulator \ mln_core_concept_site_set \ -mln_core_concept_object_id \ mln_core_concept_object \ mln_core_concept_meta_fun \ mln_core_concept_delta_point_site \ @@ -1076,6 +1089,7 @@ mln_labeling_all \ mln_labeling_level \ mln_labeling_flat_zones \ mln_labeling_foreground \ +mln_labeling_colorize \ mln_labeling_regional_maxima \ mln_labeling_wrap \ mln_labeling_compute \ @@ -1168,7 +1182,6 @@ mln_norm_essential \ mln_debug_iota \ mln_debug_all \ mln_debug_println_with_border \ -mln_debug_colorize \ mln_debug_slices_2d \ mln_debug_draw_graph \ mln_debug_filename \ @@ -1192,6 +1205,7 @@ mln_graph_attribute_card \ mln_graph_compute \ mln_graph_essential \ mln_set_uni \ +mln_set_compute_with_weights \ mln_set_unique \ mln_set_inter \ mln_set_all \ @@ -1273,16 +1287,25 @@ mln_literal_one_SOURCES = mln_literal_one.cc mln_literal_min_SOURCES = mln_literal_min.cc mln_literal_white_SOURCES = mln_literal_white.cc mln_literal_essential_SOURCES = mln_literal_essential.cc +mln_world_all_SOURCES = mln_world_all.cc mln_world_binary_2d_subsample_SOURCES = mln_world_binary_2d_subsample.cc +mln_world_binary_2d_all_SOURCES = mln_world_binary_2d_all.cc mln_world_binary_2d_projected_histo_SOURCES = mln_world_binary_2d_projected_histo.cc +mln_world_inter_pixel_is_pixel_SOURCES = mln_world_inter_pixel_is_pixel.cc +mln_world_inter_pixel_all_SOURCES = mln_world_inter_pixel_all.cc mln_world_inter_pixel_neighb2d_SOURCES = mln_world_inter_pixel_neighb2d.cc -mln_world_inter_pixel_full_SOURCES = mln_world_inter_pixel_full.cc +mln_world_inter_pixel_is_separator_SOURCES = mln_world_inter_pixel_is_separator.cc +mln_world_inter_pixel_immerse_SOURCES = mln_world_inter_pixel_immerse.cc +mln_world_inter_pixel_separator_to_pixels_SOURCES = mln_world_inter_pixel_separator_to_pixels.cc mln_world_inter_pixel_display_edge_SOURCES = mln_world_inter_pixel_display_edge.cc +mln_world_inter_pixel_compute_SOURCES = mln_world_inter_pixel_compute.cc mln_world_inter_pixel_dim2_is_pixel_SOURCES = mln_world_inter_pixel_dim2_is_pixel.cc mln_world_inter_pixel_dim2_all_SOURCES = mln_world_inter_pixel_dim2_all.cc mln_world_inter_pixel_dim2_is_edge_SOURCES = mln_world_inter_pixel_dim2_is_edge.cc +mln_world_inter_pixel_dim2_make_edge_image_SOURCES = mln_world_inter_pixel_dim2_make_edge_image.cc mln_world_inter_pixel_dim2_is_dot_SOURCES = mln_world_inter_pixel_dim2_is_dot.cc mln_world_inter_pixel_dim2_is_row_odd_SOURCES = mln_world_inter_pixel_dim2_is_row_odd.cc +mln_world_inter_pixel_full2image_SOURCES = mln_world_inter_pixel_full2image.cc mln_registration_get_rtransf_SOURCES = mln_registration_get_rtransf.cc mln_registration_internal_rms_SOURCES = mln_registration_internal_rms.cc mln_registration_get_rot_SOURCES = mln_registration_get_rot.cc @@ -1296,7 +1319,6 @@ mln_util_max_SOURCES = mln_util_max.cc mln_util_lazy_set_SOURCES = mln_util_lazy_set.cc mln_util_soft_heap_SOURCES = mln_util_soft_heap.cc mln_util_set_SOURCES = mln_util_set.cc -mln_util_tree_to_image_SOURCES = mln_util_tree_to_image.cc mln_util_lemmings_SOURCES = mln_util_lemmings.cc mln_util_greater_point_SOURCES = mln_util_greater_point.cc mln_util_internal_graph_iter_base_SOURCES = mln_util_internal_graph_iter_base.cc @@ -1322,24 +1344,21 @@ mln_util_timer_SOURCES = mln_util_timer.cc mln_util_yes_SOURCES = mln_util_yes.cc mln_util_line_graph_SOURCES = mln_util_line_graph.cc mln_util_ord_SOURCES = mln_util_ord.cc -mln_util_tree_fast_to_image_SOURCES = mln_util_tree_fast_to_image.cc -mln_util_tree_SOURCES = mln_util_tree.cc +mln_util_adjacency_matrix_SOURCES = mln_util_adjacency_matrix.cc mln_util_couple_SOURCES = mln_util_couple.cc mln_util_index_SOURCES = mln_util_index.cc mln_util_multi_site_SOURCES = mln_util_multi_site.cc -mln_util_branch_iter_SOURCES = mln_util_branch_iter.cc -mln_util_branch_iter_ind_SOURCES = mln_util_branch_iter_ind.cc -mln_util_tree_to_fast_SOURCES = mln_util_tree_to_fast.cc mln_util_array_SOURCES = mln_util_array.cc mln_util_vertex_SOURCES = mln_util_vertex.cc mln_util_pix_SOURCES = mln_util_pix.cc -mln_util_tree_fast_SOURCES = mln_util_tree_fast.cc +mln_util_object_id_SOURCES = mln_util_object_id.cc mln_util_site_pair_SOURCES = mln_util_site_pair.cc mln_util_nil_SOURCES = mln_util_nil.cc mln_util_graph_ids_SOURCES = mln_util_graph_ids.cc mln_util_eat_SOURCES = mln_util_eat.cc mln_util_essential_SOURCES = mln_util_essential.cc mln_data_memset__SOURCES = mln_data_memset_.cc +mln_data_paste_without_localization_SOURCES = mln_data_paste_without_localization.cc mln_data_memcpy__SOURCES = mln_data_memcpy_.cc mln_data_all_SOURCES = mln_data_all.cc mln_data_paste_SOURCES = mln_data_paste.cc @@ -1428,6 +1447,8 @@ mln_fun_p2p_all_SOURCES = mln_fun_p2p_all.cc mln_fun_p2p_translation_SOURCES = mln_fun_p2p_translation.cc mln_fun_p2p_mirror_SOURCES = mln_fun_p2p_mirror.cc mln_fun_accu_result_SOURCES = mln_fun_accu_result.cc +mln_fun_stat_mahalanobis_SOURCES = mln_fun_stat_mahalanobis.cc +mln_fun_stat_all_SOURCES = mln_fun_stat_all.cc mln_fun_binary_param_SOURCES = mln_fun_binary_param.cc mln_fun_x2p_closest_point_SOURCES = mln_fun_x2p_closest_point.cc mln_fun_x2p_all_SOURCES = mln_fun_x2p_all.cc @@ -1505,6 +1526,8 @@ mln_fun_vv2b_lt_SOURCES = mln_fun_vv2b_lt.cc mln_fun_vv2b_eq_SOURCES = mln_fun_vv2b_eq.cc mln_fun_cast_SOURCES = mln_fun_cast.cc mln_fun_composition_SOURCES = mln_fun_composition.cc +mln_fun_access_all_SOURCES = mln_fun_access_all.cc +mln_fun_access_mean_SOURCES = mln_fun_access_mean.cc mln_fun_i2v_all_SOURCES = mln_fun_i2v_all.cc mln_fun_i2v_array_SOURCES = mln_fun_i2v_array.cc mln_fun_i2v_all_to_SOURCES = mln_fun_i2v_all_to.cc @@ -1515,10 +1538,13 @@ mln_fun_x2x_translation_SOURCES = mln_fun_x2x_translation.cc mln_fun_x2x_rotation_SOURCES = mln_fun_x2x_rotation.cc mln_fun_x2x_essential_SOURCES = mln_fun_x2x_essential.cc mln_fun_component_red_SOURCES = mln_fun_component_red.cc +mln_fun_component_comp_count_SOURCES = mln_fun_component_comp_count.cc +mln_fun_component_scomp_SOURCES = mln_fun_component_scomp.cc mln_fun_component_green_SOURCES = mln_fun_component_green.cc mln_fun_component_comp_SOURCES = mln_fun_component_comp.cc mln_fun_component_blue_SOURCES = mln_fun_component_blue.cc mln_fun_component_rgb_SOURCES = mln_fun_component_rgb.cc +mln_fun_component_ithcomp_SOURCES = mln_fun_component_ithcomp.cc mln_fun_compose_SOURCES = mln_fun_compose.cc mln_fun_meta_red_SOURCES = mln_fun_meta_red.cc mln_fun_meta_hue_SOURCES = mln_fun_meta_hue.cc @@ -1642,6 +1668,7 @@ mln_accu_site_set_all_SOURCES = mln_accu_site_set_all.cc mln_accu_site_set_essential_SOURCES = mln_accu_site_set_essential.cc mln_accu_stat_variance_SOURCES = mln_accu_stat_variance.cc mln_accu_stat_deviation_SOURCES = mln_accu_stat_deviation.cc +mln_accu_stat_all_SOURCES = mln_accu_stat_all.cc mln_accu_stat_var_SOURCES = mln_accu_stat_var.cc mln_accu_max_SOURCES = mln_accu_max.cc mln_accu_lor_SOURCES = mln_accu_lor.cc @@ -1689,6 +1716,7 @@ mln_accu_image_init_SOURCES = mln_accu_image_init.cc mln_accu_image_to_result_SOURCES = mln_accu_image_to_result.cc mln_accu_image_all_SOURCES = mln_accu_image_all.cc mln_accu_image_set_value_SOURCES = mln_accu_image_set_value.cc +mln_accu_image_untake_SOURCES = mln_accu_image_untake.cc mln_accu_image_take_SOURCES = mln_accu_image_take.cc mln_accu_image_take_as_init_SOURCES = mln_accu_image_take_as_init.cc mln_accu_image_take_n_times_SOURCES = mln_accu_image_take_n_times.cc @@ -1777,7 +1805,6 @@ mln_trait_ch_function_value_SOURCES = mln_trait_ch_function_value.cc mln_trait_ch_value_SOURCES = mln_trait_ch_value.cc mln_trait_solve_SOURCES = mln_trait_solve.cc mln_trait_solve_unary_SOURCES = mln_trait_solve_unary.cc -mln_trait_fun_SOURCES = mln_trait_fun.cc mln_trait_op_postdec_SOURCES = mln_trait_op_postdec.cc mln_trait_op_mod_SOURCES = mln_trait_op_mod.cc mln_trait_op_lor_SOURCES = mln_trait_op_lor.cc @@ -1805,6 +1832,7 @@ mln_trait_op_uplus_SOURCES = mln_trait_op_uplus.cc mln_trait_op_essential_SOURCES = mln_trait_op_essential.cc mln_trait_op_eq_SOURCES = mln_trait_op_eq.cc mln_trait_concrete_SOURCES = mln_trait_concrete.cc +mln_trait_functions_SOURCES = mln_trait_functions.cc mln_trait_windows_SOURCES = mln_trait_windows.cc mln_trait_site_sets_SOURCES = mln_trait_site_sets.cc mln_trait_image_from_grid_SOURCES = mln_trait_image_from_grid.cc @@ -2212,7 +2240,6 @@ mln_core_concept_window_SOURCES = mln_core_concept_window.cc mln_core_concept_value_SOURCES = mln_core_concept_value.cc mln_core_concept_accumulator_SOURCES = mln_core_concept_accumulator.cc mln_core_concept_site_set_SOURCES = mln_core_concept_site_set.cc -mln_core_concept_object_id_SOURCES = mln_core_concept_object_id.cc mln_core_concept_object_SOURCES = mln_core_concept_object.cc mln_core_concept_meta_fun_SOURCES = mln_core_concept_meta_fun.cc mln_core_concept_delta_point_site_SOURCES = mln_core_concept_delta_point_site.cc @@ -2294,6 +2321,7 @@ mln_labeling_all_SOURCES = mln_labeling_all.cc mln_labeling_level_SOURCES = mln_labeling_level.cc mln_labeling_flat_zones_SOURCES = mln_labeling_flat_zones.cc mln_labeling_foreground_SOURCES = mln_labeling_foreground.cc +mln_labeling_colorize_SOURCES = mln_labeling_colorize.cc mln_labeling_regional_maxima_SOURCES = mln_labeling_regional_maxima.cc mln_labeling_wrap_SOURCES = mln_labeling_wrap.cc mln_labeling_compute_SOURCES = mln_labeling_compute.cc @@ -2386,7 +2414,6 @@ mln_norm_essential_SOURCES = mln_norm_essential.cc mln_debug_iota_SOURCES = mln_debug_iota.cc mln_debug_all_SOURCES = mln_debug_all.cc mln_debug_println_with_border_SOURCES = mln_debug_println_with_border.cc -mln_debug_colorize_SOURCES = mln_debug_colorize.cc mln_debug_slices_2d_SOURCES = mln_debug_slices_2d.cc mln_debug_draw_graph_SOURCES = mln_debug_draw_graph.cc mln_debug_filename_SOURCES = mln_debug_filename.cc @@ -2410,6 +2437,7 @@ mln_graph_attribute_card_SOURCES = mln_graph_attribute_card.cc mln_graph_compute_SOURCES = mln_graph_compute.cc mln_graph_essential_SOURCES = mln_graph_essential.cc mln_set_uni_SOURCES = mln_set_uni.cc +mln_set_compute_with_weights_SOURCES = mln_set_compute_with_weights.cc mln_set_unique_SOURCES = mln_set_unique.cc mln_set_inter_SOURCES = mln_set_inter.cc mln_set_all_SOURCES = mln_set_all.cc diff --git a/milena/tests/util/Makefile.am b/milena/tests/util/Makefile.am index 07b6018..a808683 100644 --- a/milena/tests/util/Makefile.am +++ b/milena/tests/util/Makefile.am @@ -19,9 +19,7 @@ check_PROGRAMS = \ tree \ tree_fast \ tree_fast_to_image \ - tree_to_fast \ - tree_to_image - + tree_to_fast adjacency_matrix_SOURCES = adjacency_matrix.cc branch_iter_SOURCES = branch_iter.cc @@ -37,9 +35,7 @@ set_SOURCES = set.cc soft_heap_SOURCES = soft_heap.cc tree_SOURCES = tree.cc tree_fast_SOURCES = tree_fast.cc -tree_fast_to_image_SOURCES = tree_to_image.cc tree_to_fast_SOURCES = tree_to_fast.cc -tree_to_image_SOURCES = tree_to_image.cc TESTS = $(check_PROGRAMS) -- 1.5.6.5

1 0

[PATCH 20/31] Small fixes.
by Roland Levillain 11 May '09

11 May '09

* milena/headers.mk: update distributed files list. * milena/mln/core/image/edge_image.hh, * milena/mln/core/image/vertex_image.hh: fix a wrong image type. * milena/mln/fun/math/sup.hh: fix wrong template parameters. * milena/mln/value/rgb.hh, * milena/mln/util/essential.hh, * milena/mln/util/all.hh, * milena/mln/labeling/all.hh, * milena/mln/debug/all.hh, * milena/mln/fun/v2v/all.hh: fix includes. * milena/mln/fun/v2v/rgb_to_hsi.hh: fix duplicate declarations. * milena/mln/make/influence_zone_adjacency_graph.hh: add missing const references. * milena/mln/morpho/opening/area_on_vertices.hh: update according new graph image types. * milena/mln/registration/icp.hh: fix use of random_color. * milena/mln/util/adjacency_matrix.hh: fix wrong ifndef. * milena/mln/util/object_id.hh, * milena/mln/util/vertex.hh, * milena/mln/util/edge.hh: fix operator< and operator==. * milena/mln/util/graph.hh: add preconditions. * milena/mln/world/binary_2d/all.hh: new. * milena/tests/morpho/closing/Makefile.am, * milena/tests/morpho/closing/area_on_vertices.cc, * milena/tests/morpho/opening/Makefile.am, * milena/tests/morpho/opening/area_on_vertices.cc: new tests. * milena/tests/unit_test/unit-tests.mk: update unit test list. * milena/tests/util/Makefile.am, * milena/tests/util/tree_fast_to_image.cc, * milena/tests/util/tree_to_image.cc: remove tests. --- milena/ChangeLog | 49 +++++++++++++ milena/headers.mk | 27 +++++--- milena/mln/core/image/edge_image.hh | 3 +- milena/mln/core/image/vertex_image.hh | 3 +- milena/mln/debug/all.hh | 3 +- milena/mln/fun/math/sup.hh | 4 +- milena/mln/fun/v2v/all.hh | 3 + milena/mln/fun/v2v/rgb_to_hsi.hh | 53 -------------- milena/mln/labeling/all.hh | 1 + milena/mln/make/influence_zone_adjacency_graph.hh | 13 ++-- milena/mln/morpho/opening/area_on_vertices.hh | 37 ++++++----- milena/mln/registration/icp.hh | 3 +- milena/mln/util/adjacency_matrix.hh | 4 +- milena/mln/util/all.hh | 2 - milena/mln/util/edge.hh | 8 ++- milena/mln/util/essential.hh | 2 +- milena/mln/util/graph.hh | 5 +- milena/mln/util/object_id.hh | 7 ++ milena/mln/util/vertex.hh | 4 +- milena/mln/value/rgb.hh | 1 + .../{util/essential.hh => world/binary_2d/all.hh} | 26 +++---- milena/tests/morpho/closing/Makefile.am | 2 + .../morpho/closing/area_on_vertices.cc} | 65 +++++++++--------- milena/tests/morpho/opening/Makefile.am | 2 + .../morpho/opening/area_on_vertices.cc} | 65 +++++++++--------- milena/tests/unit_test/unit-tests.mk | 72 ++++++++++++++------ milena/tests/util/Makefile.am | 6 +-- 27 files changed, 259 insertions(+), 211 deletions(-) copy milena/mln/{util/essential.hh => world/binary_2d/all.hh} (70%) copy milena/{mln/fun/math/sup.hh => tests/morpho/closing/area_on_vertices.cc} (58%) copy milena/{mln/fun/math/sup.hh => tests/morpho/opening/area_on_vertices.cc} (58%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2fda128..e0e1cee 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,54 @@ 2009-05-11 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Small fixes. + + * milena/headers.mk: update distributed files list. + + * milena/mln/core/image/edge_image.hh, + * milena/mln/core/image/vertex_image.hh: fix a wrong image type. + + * milena/mln/fun/math/sup.hh: fix wrong template parameters. + + * milena/mln/value/rgb.hh, + * milena/mln/util/essential.hh, + * milena/mln/util/all.hh, + * milena/mln/labeling/all.hh, + * milena/mln/debug/all.hh, + * milena/mln/fun/v2v/all.hh: fix includes. + + * milena/mln/fun/v2v/rgb_to_hsi.hh: fix duplicate declarations. + + * milena/mln/make/influence_zone_adjacency_graph.hh: add missing const + references. + + * milena/mln/morpho/opening/area_on_vertices.hh: update according new + graph image types. + + * milena/mln/registration/icp.hh: fix use of random_color. + + * milena/mln/util/adjacency_matrix.hh: fix wrong ifndef. + + * milena/mln/util/object_id.hh, + * milena/mln/util/vertex.hh, + * milena/mln/util/edge.hh: fix operator< and operator==. + + * milena/mln/util/graph.hh: add preconditions. + + * milena/mln/world/binary_2d/all.hh: new. + + * milena/tests/morpho/closing/Makefile.am, + * milena/tests/morpho/closing/area_on_vertices.cc, + * milena/tests/morpho/opening/Makefile.am, + * milena/tests/morpho/opening/area_on_vertices.cc: new tests. + + * milena/tests/unit_test/unit-tests.mk: update unit test list. + + * milena/tests/util/Makefile.am, + * milena/tests/util/tree_fast_to_image.cc, + * milena/tests/util/tree_to_image.cc: remove tests. + +2009-05-11 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Fix documentation. * doc/Doxyfile.in: add macro definitions. diff --git a/milena/headers.mk b/milena/headers.mk index 34e4823..d241629 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -57,11 +57,18 @@ mln/literal/one.hh \ mln/literal/min.hh \ mln/literal/white.hh \ mln/literal/essential.hh \ +mln/world/all.hh \ mln/world/binary_2d/subsample.hh \ +mln/world/binary_2d/all.hh \ mln/world/binary_2d/projected_histo.hh \ +mln/world/inter_pixel/is_pixel.hh \ +mln/world/inter_pixel/all.hh \ mln/world/inter_pixel/neighb2d.hh \ -mln/world/inter_pixel/image2full.hh \ +mln/world/inter_pixel/is_separator.hh \ +mln/world/inter_pixel/immerse.hh \ +mln/world/inter_pixel/separator_to_pixels.hh \ mln/world/inter_pixel/display_edge.hh \ +mln/world/inter_pixel/compute.hh \ mln/world/inter_pixel/dim2/is_pixel.hh \ mln/world/inter_pixel/dim2/all.hh \ mln/world/inter_pixel/dim2/is_edge.hh \ @@ -82,7 +89,6 @@ mln/util/max.hh \ mln/util/lazy_set.hh \ mln/util/soft_heap.hh \ mln/util/set.hh \ -mln/util/tree_to_image.hh \ mln/util/lemmings.hh \ mln/util/greater_point.hh \ mln/util/internal/graph_iter_base.hh \ @@ -109,18 +115,13 @@ mln/util/yes.hh \ mln/util/line_graph.hh \ mln/util/ord.hh \ mln/util/adjacency_matrix.hh \ -mln/util/tree_fast_to_image.hh \ -mln/util/tree.hh \ mln/util/couple.hh \ mln/util/index.hh \ mln/util/multi_site.hh \ -mln/util/branch_iter.hh \ -mln/util/branch_iter_ind.hh \ -mln/util/tree_to_fast.hh \ mln/util/array.hh \ mln/util/vertex.hh \ mln/util/pix.hh \ -mln/util/tree_fast.hh \ +mln/util/object_id.hh \ mln/util/site_pair.hh \ mln/util/nil.hh \ mln/util/graph_ids.hh \ @@ -128,6 +129,7 @@ mln/util/eat.hh \ mln/util/essential.hh \ mln/data/memset_.hh \ mln/data/paste.spe.hh \ +mln/data/paste_without_localization.hh \ mln/data/memcpy_.hh \ mln/data/all.hh \ mln/data/paste.hh \ @@ -218,6 +220,8 @@ mln/fun/p2p/all.hh \ mln/fun/p2p/translation.hh \ mln/fun/p2p/mirror.hh \ mln/fun/accu_result.hh \ +mln/fun/stat/mahalanobis.hh \ +mln/fun/stat/all.hh \ mln/fun/binary_param.hh \ mln/fun/x2p/closest_point.hh \ mln/fun/x2p/all.hh \ @@ -295,6 +299,8 @@ mln/fun/vv2b/lt.hh \ mln/fun/vv2b/eq.hh \ mln/fun/cast.hh \ mln/fun/composition.hh \ +mln/fun/access/all.hh \ +mln/fun/access/mean.hh \ mln/fun/i2v/all.hh \ mln/fun/i2v/array.hh \ mln/fun/i2v/all_to.hh \ @@ -435,6 +441,7 @@ mln/accu/site_set/all.hh \ mln/accu/site_set/essential.hh \ mln/accu/stat/variance.hh \ mln/accu/stat/deviation.hh \ +mln/accu/stat/all.hh \ mln/accu/stat/var.hh \ mln/accu/max.hh \ mln/accu/lor.hh \ @@ -1026,7 +1033,6 @@ mln/core/concept/window.hh \ mln/core/concept/value.hh \ mln/core/concept/accumulator.hh \ mln/core/concept/site_set.hh \ -mln/core/concept/object_id.hh \ mln/core/concept/object.hh \ mln/core/concept/meta_fun.hh \ mln/core/concept/delta_point_site.hh \ @@ -1109,6 +1115,7 @@ mln/labeling/all.hh \ mln/labeling/level.hh \ mln/labeling/flat_zones.hh \ mln/labeling/foreground.hh \ +mln/labeling/colorize.hh \ mln/labeling/regional_maxima.hh \ mln/labeling/wrap.hh \ mln/labeling/compute.hh \ @@ -1207,7 +1214,6 @@ mln/debug/iota.hh \ mln/debug/all.hh \ mln/debug/println_with_border.hh \ mln/debug/println.spe.hh \ -mln/debug/colorize.hh \ mln/debug/slices_2d.hh \ mln/debug/draw_graph.hh \ mln/debug/filename.hh \ @@ -1233,6 +1239,7 @@ mln/graph/attribute/card.hh \ mln/graph/compute.hh \ mln/graph/essential.hh \ mln/set/uni.hh \ +mln/set/compute_with_weights.hh \ mln/set/unique.hh \ mln/set/inter.hh \ mln/set/all.hh \ diff --git a/milena/mln/core/image/edge_image.hh b/milena/mln/core/image/edge_image.hh index 76d7fe0..3c71bb8 100644 --- a/milena/mln/core/image/edge_image.hh +++ b/milena/mln/core/image/edge_image.hh @@ -146,6 +146,7 @@ namespace mln /// Function mapping graph elements to sites. typedef typename internal::efsite_selector<P,G>::site_function_t site_function_t; + typedef mln_result(site_function_t) function_result_t; /// Window type typedef graph_elt_window<G,p_edges<G,site_function_t> > win_t; @@ -193,7 +194,7 @@ namespace mln { fun::i2v::array<V> f; init_(tag::function, f, exact(model)); - p_edges<G,fun::i2v::array > s; + p_edges<G, typename edge_image<P,V,G>::site_function_t> s; init_(tag::domain, s, exact(model)); target.init_(f, s); } diff --git a/milena/mln/core/image/vertex_image.hh b/milena/mln/core/image/vertex_image.hh index 3498ec7..0d62991 100644 --- a/milena/mln/core/image/vertex_image.hh +++ b/milena/mln/core/image/vertex_image.hh @@ -144,6 +144,7 @@ namespace mln /// Function mapping graph elements to sites. typedef typename internal::vfsite_selector<P,G>::site_function_t site_function_t; + typedef mln_result(site_function_t) function_result_t; /// Skeleton type. @@ -187,7 +188,7 @@ namespace mln { fun::i2v::array<V> f; init_(tag::function, f, exact(model)); - p_vertices<G,fun::i2v::array > s; + p_vertices<G,typename edge_image<P,V,G>::site_function_t> s; init_(tag::domain, s, exact(model)); target.init_(f, s); } diff --git a/milena/mln/debug/all.hh b/milena/mln/debug/all.hh index 814c95b..e65e907 100644 --- a/milena/mln/debug/all.hh +++ b/milena/mln/debug/all.hh @@ -48,8 +48,8 @@ namespace mln } -# include <mln/debug/format.hh> # include <mln/debug/draw_graph.hh> +# include <mln/debug/format.hh> # include <mln/debug/histo.hh> # include <mln/debug/iota.hh> # include <mln/debug/println.hh> @@ -58,5 +58,4 @@ namespace mln # include <mln/debug/quiet.hh> # include <mln/debug/slices_2d.hh> - #endif // ! MLN_DEBUG_ALL_HH diff --git a/milena/mln/fun/math/sup.hh b/milena/mln/fun/math/sup.hh index 20e19bf..d76b4b2 100644 --- a/milena/mln/fun/math/sup.hh +++ b/milena/mln/fun/math/sup.hh @@ -46,7 +46,7 @@ namespace mln namespace next { - template <typename T> + template <typename T1, typename T2> struct set_binary_<mln::fun::sup, mln::Object, T1, mln::Object, T2> { typedef set_binary_ ret; @@ -66,5 +66,5 @@ namespace mln } // end of namespace mln -#endif /* ! MLN_FUN_MATH_SUP_HH */ +#endif // ! MLN_FUN_MATH_SUP_HH diff --git a/milena/mln/fun/v2v/all.hh b/milena/mln/fun/v2v/all.hh index 2d14054..65de5ca 100644 --- a/milena/mln/fun/v2v/all.hh +++ b/milena/mln/fun/v2v/all.hh @@ -54,11 +54,14 @@ namespace mln # include <mln/fun/v2v/convert.hh> # include <mln/fun/v2v/dec.hh> # include <mln/fun/v2v/enc.hh> +# include <mln/fun/v2v/hsi_to_rgb.hh> +# include <mln/fun/v2v/hsl_to_rgb.hh> # include <mln/fun/v2v/id.hh> # include <mln/fun/v2v/linear.hh> # include <mln/fun/v2v/norm.hh> # include <mln/fun/v2v/projection.hh> # include <mln/fun/v2v/rgb_to_hsi.hh> +# include <mln/fun/v2v/rgb_to_hsl.hh> # include <mln/fun/v2v/saturate.hh> # include <mln/fun/v2v/wrap.hh> diff --git a/milena/mln/fun/v2v/rgb_to_hsi.hh b/milena/mln/fun/v2v/rgb_to_hsi.hh index bf9bd5d..c344343 100644 --- a/milena/mln/fun/v2v/rgb_to_hsi.hh +++ b/milena/mln/fun/v2v/rgb_to_hsi.hh @@ -61,28 +61,11 @@ namespace mln extern f_rgb_to_hsi_f_t f_rgb_to_hsi_f; - template <typename T_rgb> - struct f_hsi_to_rgb_ : public Function_v2v< f_hsi_to_rgb_<T_rgb> > - { - typedef T_rgb result; - - template <typename T_hsi> - T_rgb operator()(const T_hsi& hsi) const; - - }; - - typedef f_hsi_to_rgb_<value::rgb8> f_hsi_to_rgb_3x8_t; - - extern f_hsi_to_rgb_3x8_t f_hsi_to_rgb_3x8; - - # ifndef MLN_INCLUDE_ONLY /// Global variables. /// \{ f_rgb_to_hsi_f_t f_rgb_to_hsi_f; - - f_hsi_to_rgb_3x8_t f_hsi_to_rgb_3x8; /// \} @@ -120,42 +103,6 @@ namespace mln } - template <typename T_rgb> - template <typename T_hsi> - inline - T_rgb - f_hsi_to_rgb_<T_rgb>::operator()(const T_hsi& hsi) const - { - typedef typename T_rgb::red_t red_t; - typedef typename T_rgb::green_t green_t; - typedef typename T_rgb::blue_t blue_t; - - static math::round<red_t> to_r; - static math::round<green_t> to_g; - static math::round<blue_t> to_b; - - static const float - sqrt3_3 = std::sqrt(3) / 3, - inv_sqrt6 = 1 / std::sqrt(6), - inv_sqrt2 = 1 / std::sqrt(2); - - float - h = hsi.hue() / 180.0 * 3.1415, - alpha = hsi.sat() * std::cos(h), - beta = hsi.sat() * std::sin(h); - - - red_t r = to_r(sqrt3_3 * hsi.inty() + 2 * inv_sqrt6 * beta); - green_t g = - to_g(sqrt3_3 * hsi.inty() + inv_sqrt2 * alpha - inv_sqrt6 * beta); - blue_t b = - to_b(sqrt3_3 * hsi.inty() - inv_sqrt2 * alpha - inv_sqrt6 * beta); - - T_rgb rgb(r, g, b); - - return rgb; - } - # endif // !MLN_INCLUDE_ONLY } // end of namespace fun::v2v diff --git a/milena/mln/labeling/all.hh b/milena/mln/labeling/all.hh index 2931427..e90633b 100644 --- a/milena/mln/labeling/all.hh +++ b/milena/mln/labeling/all.hh @@ -55,6 +55,7 @@ namespace mln # include <mln/labeling/background.hh> # include <mln/labeling/blobs.hh> +# include <mln/labeling/colorize.hh> # include <mln/labeling/compute.hh> # include <mln/labeling/fill_holes.hh> # include <mln/labeling/flat_zones.hh> diff --git a/milena/mln/make/influence_zone_adjacency_graph.hh b/milena/mln/make/influence_zone_adjacency_graph.hh index 6cbaa4c..a5c3462 100644 --- a/milena/mln/make/influence_zone_adjacency_graph.hh +++ b/milena/mln/make/influence_zone_adjacency_graph.hh @@ -56,14 +56,16 @@ namespace mln /// Create a graph from an influence zone image. /// /// \param[in] iz influence zone image. + /// \param[in] nbh A neighborhood. /// \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, typename N> util::graph influence_zone_adjacency_graph(const Image& iz_, const Neighborhood<N>& nbh, - mln_value(I) nlabels); + const mln_value(I)& nlabels); @@ -77,7 +79,7 @@ namespace mln void influence_zone_adjacency_graph_tests(const Image& iz, const Neighborhood<N>& nbh, - mln_value(I)) + const mln_value(I)&) { mln_precondition(exact(iz).is_valid()); mln_precondition(exact(nbh).is_valid()); @@ -94,11 +96,12 @@ namespace mln namespace generic { + /// Generic implementation of make::influence_zone_adjacency_graph. template <typename I, typename N> util::graph influence_zone_adjacency_graph(const Image& iz_, const Neighborhood<N>& nbh_, - mln_value(I) nlabels) + const mln_value(I)& nlabels) { trace::entering("make::impl::generic::influence_zone_adjacency_graph"); @@ -151,7 +154,7 @@ namespace mln util::graph influence_zone_adjacency_graph_dispatch(const Image& iz, const Neighborhood<N>& nbh, - mln_value(I) nlabels) + const mln_value(I)& nlabels) { return make::impl::generic::influence_zone_adjacency_graph(iz, nbh, nlabels); } @@ -167,7 +170,7 @@ namespace mln util::graph influence_zone_adjacency_graph(const Image& iz, const Neighborhood<N>& nbh, - mln_value(I) nlabels) + const mln_value(I)& nlabels) { trace::entering("make::influence_zone_adjacency_graph"); diff --git a/milena/mln/morpho/opening/area_on_vertices.hh b/milena/mln/morpho/opening/area_on_vertices.hh index cb69d7f..f0ccd34 100644 --- a/milena/mln/morpho/opening/area_on_vertices.hh +++ b/milena/mln/morpho/opening/area_on_vertices.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -34,8 +34,7 @@ /// Morphological area opening on a line graph image computing /// the area in terms of adjacent vertices. -# include <mln/pw/image.hh> -# include <mln/core/site_set/p_edges.hh> +# include <mln/core/image/edge_image.hh> # include <mln/morpho/opening/algebraic.hh> # include <mln/morpho/attribute/count_adjacent_vertices.hh> @@ -49,32 +48,38 @@ namespace mln namespace opening { - /// Morphological area opening on a mln::line_graph_image computing - /// the area in terms of adjacent vertices. - template <typename P2V, typename G, typename V2P, typename N> - pw::image<P2V, p_edges<G, V2P> > - area_on_vertices(const pw::image<P2V, p_edges<G, V2P> >& input, + /// Morphological area opening on a mln::line_graph_image computing + /// the area in terms of adjacent vertices. + /// + /// \param[in] input An edge image. + /// \param[in] nbh A graph neighborhood. + /// \param[in] lambda Closing parameter. + /// + /// \return An edge image. + // + template <typename P, typename V, typename G, typename N> + edge_image<P,V,G> + area_on_vertices(const edge_image<P,V,G>& input, const Neighborhood<N>& nbh, unsigned lambda); # ifndef MLN_INCLUDE_ONLY - template <typename P2V, typename G, typename V2P, typename N> + template <typename P, typename V, typename G, typename N> inline - pw::image<P2V, p_edges<G, V2P> > - area_on_vertices(const pw::image<P2V, p_edges<G, V2P> >& input, + edge_image<P,V,G> + area_on_vertices(const edge_image<P,V,G>& input, const Neighborhood<N>& nbh, unsigned lambda) { trace::entering("morpho::opening::area_on_vertices"); mln_precondition(exact(input).is_valid()); - typedef p_edges<G, V2P> pe_t; - typedef attribute::count_adjacent_vertices< pw::image<P2V, pe_t> > attribute_t; + typedef attribute::count_adjacent_vertices< edge_image<P,V,G> > attribute_t; - pw::image<P2V, p_edges<G, V2P> > output; - output = opening::algebraic(input, nbh, attribute_t(), lambda); + edge_image<P,V,G> + output = opening::algebraic(input, nbh, attribute_t(), lambda); trace::exiting("morpho::opening::area_on_vertices"); return output; diff --git a/milena/mln/registration/icp.hh b/milena/mln/registration/icp.hh index a2bee09..25edf96 100644 --- a/milena/mln/registration/icp.hh +++ b/milena/mln/registration/icp.hh @@ -62,6 +62,7 @@ # include <mln/io/ppm/save.hh> # include <mln/io/pbm/save.hh> +# include <mln/labeling/colorize.hh> # include <mln/debug/histo.hh> # include <mln/accu/histo.hh> @@ -200,7 +201,7 @@ namespace mln mln_piter(p_array) p(X); for_all(p) { - debug(p) = debug::internal::random_color(value::rgb8()); + debug(p) = labeling::internal::random_color(value::rgb8()); debug2(p) = true; } io::pbm::save(slice(debug2,0), "debug2-a.ppm"); diff --git a/milena/mln/util/adjacency_matrix.hh b/milena/mln/util/adjacency_matrix.hh index dfda26f..9a60c94 100644 --- a/milena/mln/util/adjacency_matrix.hh +++ b/milena/mln/util/adjacency_matrix.hh @@ -250,9 +250,9 @@ namespace mln ::adjacency_matrix_impl_selector(const V& nelements) { (void) nelements; -# ifndef DNDEBUG +# ifndef NDEBUG nelements_ = nelements; -# endif // ! DNDEBUG +# endif // ! NDEBUG } template <typename V> diff --git a/milena/mln/util/all.hh b/milena/mln/util/all.hh index 180b8a1..c6d9864 100644 --- a/milena/mln/util/all.hh +++ b/milena/mln/util/all.hh @@ -72,9 +72,7 @@ namespace mln # include <mln/util/tracked_ptr.hh> # include <mln/util/tree.hh> # include <mln/util/tree_fast.hh> -# include <mln/util/tree_fast_to_image.hh> # include <mln/util/tree_to_fast.hh> -//# include <mln/util/tree_to_image.hh> # include <mln/util/vertex.hh> # include <mln/util/yes.hh> diff --git a/milena/mln/util/edge.hh b/milena/mln/util/edge.hh index 0c759db..1de3648 100644 --- a/milena/mln/util/edge.hh +++ b/milena/mln/util/edge.hh @@ -359,15 +359,17 @@ namespace mln bool operator==(const edge<G>& lhs, const edge<G>& rhs) { - return lhs.pair_vertex_ == rhs.pair_vertex_; + return lhs.id() == rhs.id() + && (lhs.graph().is_subgraph_of(rhs.graph()) + || rhs.graph().is_subgraph_of(lhs.graph())); } template <typename G> inline bool - operator< (const edge<G>& lhs, const edge<G>& rhs) + operator<(const edge<G>& lhs, const edge<G>& rhs) { - return lhs.pair_vertex_ < rhs.pair_vertex_; + return lhs.id() < rhs.id(); } } // end of namespace mln::util diff --git a/milena/mln/util/essential.hh b/milena/mln/util/essential.hh index 3c9b74f..d5eab8a 100644 --- a/milena/mln/util/essential.hh +++ b/milena/mln/util/essential.hh @@ -1,4 +1,5 @@ // Copyright (C) 2008, 2009 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 @@ -40,6 +41,5 @@ # include <mln/util/ord_pair.hh> # include <mln/util/set.hh> # include <mln/util/site_pair.hh> -# include <mln/util/tree.hh> #endif // ! MLN_UTIL_ESSENTIAL_HH diff --git a/milena/mln/util/graph.hh b/milena/mln/util/graph.hh index 83c0e8c..3ebd62d 100644 --- a/milena/mln/util/graph.hh +++ b/milena/mln/util/graph.hh @@ -385,7 +385,10 @@ namespace mln edge_id_t graph::add_edge(const vertex_id_t& id_v1, const vertex_id_t& id_v2) { - //FIXME: to be removed! We should not check that, except in without NDEBUG. + mln_precondition(id_v1 != id_v2); + mln_precondition(has_v(id_v1)); + mln_precondition(has_v(id_v2)); + // Does this edge already exist in the graph? edge_data_t edge(id_v1, id_v2); # ifndef NDEBUG diff --git a/milena/mln/util/object_id.hh b/milena/mln/util/object_id.hh index b3ea879..b50f2a5 100644 --- a/milena/mln/util/object_id.hh +++ b/milena/mln/util/object_id.hh @@ -185,6 +185,13 @@ namespace mln + template <typename Tag, typename V, typename V2> + inline + bool + operator==(const object_id<Tag,V>& lhs, const Value<V2>& rhs) + { + return lhs.value() == exact(rhs).to_equiv(); + } template <typename Tag, typename V> inline diff --git a/milena/mln/util/vertex.hh b/milena/mln/util/vertex.hh index 4f0c5ad..6d5af65 100644 --- a/milena/mln/util/vertex.hh +++ b/milena/mln/util/vertex.hh @@ -378,7 +378,9 @@ namespace mln bool operator==(const vertex<G>& v1, const vertex<G>& v2) { - return v1.id() == v2.id(); + return v1.id() == v2.id() + && (v1.graph().is_subgraph_of(v2.graph()) + || v2.graph().is_subgraph_of(v1.graph())); } template<typename G> diff --git a/milena/mln/value/rgb.hh b/milena/mln/value/rgb.hh index ebeeb5e..54e6b76 100644 --- a/milena/mln/value/rgb.hh +++ b/milena/mln/value/rgb.hh @@ -42,6 +42,7 @@ # include <mln/value/ops.hh> +# include <mln/fun/v2v/hsl_to_rgb.hh> # include <mln/value/concept/vectorial.hh> # include <mln/value/int_u.hh> # include <mln/algebra/vec.hh> diff --git a/milena/mln/util/essential.hh b/milena/mln/world/binary_2d/all.hh similarity index 70% copy from milena/mln/util/essential.hh copy to milena/mln/world/binary_2d/all.hh index 3c9b74f..cf94381 100644 --- a/milena/mln/util/essential.hh +++ b/milena/mln/world/binary_2d/all.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// Copyright (C) 2009 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,21 +25,17 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_UTIL_ESSENTIAL_HH -# define MLN_UTIL_ESSENTIAL_HH +#ifndef MLN_WORLD_BINARY_2D_ALL_HH +# define MLN_WORLD_BINARY_2D_ALL_HH -/// \file mln/util/essential.hh +/// \file mln/world/all.hh /// -/// File that includes essential util-related routines. +/// File that includes all the world routines. -# include <mln/util/array.hh> -# include <mln/util/couple.hh> -# include <mln/util/lazy_set.hh> -# include <mln/util/lemmings.hh> -# include <mln/util/ord.hh> -# include <mln/util/ord_pair.hh> -# include <mln/util/set.hh> -# include <mln/util/site_pair.hh> -# include <mln/util/tree.hh> -#endif // ! MLN_UTIL_ESSENTIAL_HH +// Sub-directories. +# include <mln/world/binary_2d/projected_histo.hh> +# include <mln/world/binary_2d/subsample.hh> + + +#endif // ! MLN_WORLD_BINARY_2D_ALL_HH diff --git a/milena/tests/morpho/closing/Makefile.am b/milena/tests/morpho/closing/Makefile.am index 6d5ee0a..696cd14 100644 --- a/milena/tests/morpho/closing/Makefile.am +++ b/milena/tests/morpho/closing/Makefile.am @@ -6,6 +6,7 @@ SUBDIRS = \ approx check_PROGRAMS = \ + area_on_vertices \ leveling \ algebraic \ height \ @@ -14,6 +15,7 @@ check_PROGRAMS = \ structural \ sum +area_on_vertices_SOURCES = area_on_vertices.cc leveling_SOURCES = leveling.cc algebraic_SOURCES = algebraic.cc height_SOURCES = height.cc diff --git a/milena/mln/fun/math/sup.hh b/milena/tests/morpho/closing/area_on_vertices.cc similarity index 58% copy from milena/mln/fun/math/sup.hh copy to milena/tests/morpho/closing/area_on_vertices.cc index 20e19bf..4d8db2d 100644 --- a/milena/mln/fun/math/sup.hh +++ b/milena/tests/morpho/closing/area_on_vertices.cc @@ -7,7 +7,7 @@ // // 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 F PARTICULAR PURPOSE. See the GNU +// 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 @@ -25,46 +25,43 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_FUN_MATH_SUP_HH -# define MLN_FUN_MATH_SUP_HH +/// \file tests/morpho/closing/area_on_vertices.cc +/// +/// Test on mln::morpho::closing::area_on_vertices. -# include <mln/fun/binary.hh> -# include <mln/math/max.hh> +#include <mln/core/image/edge_image.hh> +#include <mln/morpho/closing/area_on_vertices.hh> +#include <mln/util/graph.hh> +#include <mln/fun/i2v/array.hh> -namespace mln -{ - - // Cosinus, bijective - namespace fun - { - struct sup : binary {}; - } +#include "tests/data.hh" - namespace trait - { - namespace next - { +const unsigned result[] = { 101, 101, 102 }; - template <typename T> - struct set_binary_<mln::fun::sup, mln::Object, T1, mln::Object, T2> - { - typedef set_binary_ ret; - typedef mln_trait_promote(T1, T2) result; - typedef T1 argument1; - typedef T2 argument2; - - static result read(const argument1& a, const argument1& b) - { - return math::max(a, b); - } - }; +int main() +{ + using namespace mln; - } // end of namespace mln::trait::next + util::graph gr; + gr.add_vertices(5); + gr.add_edge(1, 3); + gr.add_edge(1, 2); + gr.add_edge(2 ,4); - } // end of namespace mln::trait + fun::i2v::array<unsigned> f(5); + for (unsigned i = 0; i < 5; ++i) + f(i) = 100 + i; + typedef edge_image<void,unsigned> e_ima_t; + e_ima_t e_ima(gr, f); + typedef e_ima_t::nbh_t nbh_t; + nbh_t nbh; -} // end of namespace mln + e_ima_t clo = morpho::closing::area_on_vertices(e_ima, nbh, 3); -#endif /* ! MLN_FUN_MATH_SUP_HH */ + unsigned i = 0; + mln_piter_(e_ima_t) p(clo.domain()); + for_all(p) + mln_assertion(result[i++] == clo(p)); +} diff --git a/milena/tests/morpho/opening/Makefile.am b/milena/tests/morpho/opening/Makefile.am index f0abae0..5f7e44a 100644 --- a/milena/tests/morpho/opening/Makefile.am +++ b/milena/tests/morpho/opening/Makefile.am @@ -6,6 +6,7 @@ SUBDIRS = \ approx check_PROGRAMS = \ + area_on_vertices \ leveling \ algebraic \ height \ @@ -14,6 +15,7 @@ check_PROGRAMS = \ structural \ sum +area_on_vertices_SOURCES = area_on_vertices.cc leveling_SOURCES = leveling.cc algebraic_SOURCES = algebraic.cc height_SOURCES = height.cc diff --git a/milena/mln/fun/math/sup.hh b/milena/tests/morpho/opening/area_on_vertices.cc similarity index 58% copy from milena/mln/fun/math/sup.hh copy to milena/tests/morpho/opening/area_on_vertices.cc index 20e19bf..f259770 100644 --- a/milena/mln/fun/math/sup.hh +++ b/milena/tests/morpho/opening/area_on_vertices.cc @@ -7,7 +7,7 @@ // // 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 F PARTICULAR PURPOSE. See the GNU +// 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 @@ -25,46 +25,43 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_FUN_MATH_SUP_HH -# define MLN_FUN_MATH_SUP_HH +/// \file tests/morpho/opening/area_on_vertices.cc +/// +/// Test on mln::morpho::opening::area_on_vertices. -# include <mln/fun/binary.hh> -# include <mln/math/max.hh> +#include <mln/core/image/edge_image.hh> +#include <mln/morpho/opening/area_on_vertices.hh> +#include <mln/util/graph.hh> +#include <mln/fun/i2v/array.hh> -namespace mln -{ - - // Cosinus, bijective - namespace fun - { - struct sup : binary {}; - } +#include "tests/data.hh" - namespace trait - { - namespace next - { +const unsigned result[] = { 100, 101, 101 }; - template <typename T> - struct set_binary_<mln::fun::sup, mln::Object, T1, mln::Object, T2> - { - typedef set_binary_ ret; - typedef mln_trait_promote(T1, T2) result; - typedef T1 argument1; - typedef T2 argument2; - - static result read(const argument1& a, const argument1& b) - { - return math::max(a, b); - } - }; +int main() +{ + using namespace mln; - } // end of namespace mln::trait::next + util::graph gr; + gr.add_vertices(5); + gr.add_edge(1, 3); + gr.add_edge(1, 2); + gr.add_edge(2 ,4); - } // end of namespace mln::trait + fun::i2v::array<unsigned> f(5); + for (unsigned i = 0; i < 5; ++i) + f(i) = 100 + i; + typedef edge_image<void,unsigned> e_ima_t; + e_ima_t e_ima(gr, f); + typedef e_ima_t::nbh_t nbh_t; + nbh_t nbh; -} // end of namespace mln + e_ima_t clo = morpho::opening::area_on_vertices(e_ima, nbh, 3); -#endif /* ! MLN_FUN_MATH_SUP_HH */ + unsigned i = 0; + mln_piter_(e_ima_t) p(clo.domain()); + for_all(p) + mln_assertion(result[i++] == clo(p)); +} diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 6869395..37f1d72 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -55,16 +55,25 @@ mln_literal_one \ mln_literal_min \ mln_literal_white \ mln_literal_essential \ +mln_world_all \ mln_world_binary_2d_subsample \ +mln_world_binary_2d_all \ mln_world_binary_2d_projected_histo \ +mln_world_inter_pixel_is_pixel \ +mln_world_inter_pixel_all \ mln_world_inter_pixel_neighb2d \ -mln_world_inter_pixel_full \ +mln_world_inter_pixel_is_separator \ +mln_world_inter_pixel_immerse \ +mln_world_inter_pixel_separator_to_pixels \ mln_world_inter_pixel_display_edge \ +mln_world_inter_pixel_compute \ mln_world_inter_pixel_dim2_is_pixel \ mln_world_inter_pixel_dim2_all \ mln_world_inter_pixel_dim2_is_edge \ +mln_world_inter_pixel_dim2_make_edge_image \ mln_world_inter_pixel_dim2_is_dot \ mln_world_inter_pixel_dim2_is_row_odd \ +mln_world_inter_pixel_full2image \ mln_registration_get_rtransf \ mln_registration_internal_rms \ mln_registration_get_rot \ @@ -78,7 +87,6 @@ mln_util_max \ mln_util_lazy_set \ mln_util_soft_heap \ mln_util_set \ -mln_util_tree_to_image \ mln_util_lemmings \ mln_util_greater_point \ mln_util_internal_graph_iter_base \ @@ -104,24 +112,21 @@ mln_util_timer \ mln_util_yes \ mln_util_line_graph \ mln_util_ord \ -mln_util_tree_fast_to_image \ -mln_util_tree \ +mln_util_adjacency_matrix \ mln_util_couple \ mln_util_index \ mln_util_multi_site \ -mln_util_branch_iter \ -mln_util_branch_iter_ind \ -mln_util_tree_to_fast \ mln_util_array \ mln_util_vertex \ mln_util_pix \ -mln_util_tree_fast \ +mln_util_object_id \ mln_util_site_pair \ mln_util_nil \ mln_util_graph_ids \ mln_util_eat \ mln_util_essential \ mln_data_memset_ \ +mln_data_paste_without_localization \ mln_data_memcpy_ \ mln_data_all \ mln_data_paste \ @@ -210,6 +215,8 @@ mln_fun_p2p_all \ mln_fun_p2p_translation \ mln_fun_p2p_mirror \ mln_fun_accu_result \ +mln_fun_stat_mahalanobis \ +mln_fun_stat_all \ mln_fun_binary_param \ mln_fun_x2p_closest_point \ mln_fun_x2p_all \ @@ -287,6 +294,8 @@ mln_fun_vv2b_lt \ mln_fun_vv2b_eq \ mln_fun_cast \ mln_fun_composition \ +mln_fun_access_all \ +mln_fun_access_mean \ mln_fun_i2v_all \ mln_fun_i2v_array \ mln_fun_i2v_all_to \ @@ -297,10 +306,13 @@ mln_fun_x2x_translation \ mln_fun_x2x_rotation \ mln_fun_x2x_essential \ mln_fun_component_red \ +mln_fun_component_comp_count \ +mln_fun_component_scomp \ mln_fun_component_green \ mln_fun_component_comp \ mln_fun_component_blue \ mln_fun_component_rgb \ +mln_fun_component_ithcomp \ mln_fun_compose \ mln_fun_meta_red \ mln_fun_meta_hue \ @@ -424,6 +436,7 @@ mln_accu_site_set_all \ mln_accu_site_set_essential \ mln_accu_stat_variance \ mln_accu_stat_deviation \ +mln_accu_stat_all \ mln_accu_stat_var \ mln_accu_max \ mln_accu_lor \ @@ -471,6 +484,7 @@ mln_accu_image_init \ mln_accu_image_to_result \ mln_accu_image_all \ mln_accu_image_set_value \ +mln_accu_image_untake \ mln_accu_image_take \ mln_accu_image_take_as_init \ mln_accu_image_take_n_times \ @@ -559,7 +573,6 @@ mln_trait_ch_function_value \ mln_trait_ch_value \ mln_trait_solve \ mln_trait_solve_unary \ -mln_trait_fun \ mln_trait_op_postdec \ mln_trait_op_mod \ mln_trait_op_lor \ @@ -587,6 +600,7 @@ mln_trait_op_uplus \ mln_trait_op_essential \ mln_trait_op_eq \ mln_trait_concrete \ +mln_trait_functions \ mln_trait_windows \ mln_trait_site_sets \ mln_trait_image_from_grid \ @@ -994,7 +1008,6 @@ mln_core_concept_window \ mln_core_concept_value \ mln_core_concept_accumulator \ mln_core_concept_site_set \ -mln_core_concept_object_id \ mln_core_concept_object \ mln_core_concept_meta_fun \ mln_core_concept_delta_point_site \ @@ -1076,6 +1089,7 @@ mln_labeling_all \ mln_labeling_level \ mln_labeling_flat_zones \ mln_labeling_foreground \ +mln_labeling_colorize \ mln_labeling_regional_maxima \ mln_labeling_wrap \ mln_labeling_compute \ @@ -1168,7 +1182,6 @@ mln_norm_essential \ mln_debug_iota \ mln_debug_all \ mln_debug_println_with_border \ -mln_debug_colorize \ mln_debug_slices_2d \ mln_debug_draw_graph \ mln_debug_filename \ @@ -1192,6 +1205,7 @@ mln_graph_attribute_card \ mln_graph_compute \ mln_graph_essential \ mln_set_uni \ +mln_set_compute_with_weights \ mln_set_unique \ mln_set_inter \ mln_set_all \ @@ -1273,16 +1287,25 @@ mln_literal_one_SOURCES = mln_literal_one.cc mln_literal_min_SOURCES = mln_literal_min.cc mln_literal_white_SOURCES = mln_literal_white.cc mln_literal_essential_SOURCES = mln_literal_essential.cc +mln_world_all_SOURCES = mln_world_all.cc mln_world_binary_2d_subsample_SOURCES = mln_world_binary_2d_subsample.cc +mln_world_binary_2d_all_SOURCES = mln_world_binary_2d_all.cc mln_world_binary_2d_projected_histo_SOURCES = mln_world_binary_2d_projected_histo.cc +mln_world_inter_pixel_is_pixel_SOURCES = mln_world_inter_pixel_is_pixel.cc +mln_world_inter_pixel_all_SOURCES = mln_world_inter_pixel_all.cc mln_world_inter_pixel_neighb2d_SOURCES = mln_world_inter_pixel_neighb2d.cc -mln_world_inter_pixel_full_SOURCES = mln_world_inter_pixel_full.cc +mln_world_inter_pixel_is_separator_SOURCES = mln_world_inter_pixel_is_separator.cc +mln_world_inter_pixel_immerse_SOURCES = mln_world_inter_pixel_immerse.cc +mln_world_inter_pixel_separator_to_pixels_SOURCES = mln_world_inter_pixel_separator_to_pixels.cc mln_world_inter_pixel_display_edge_SOURCES = mln_world_inter_pixel_display_edge.cc +mln_world_inter_pixel_compute_SOURCES = mln_world_inter_pixel_compute.cc mln_world_inter_pixel_dim2_is_pixel_SOURCES = mln_world_inter_pixel_dim2_is_pixel.cc mln_world_inter_pixel_dim2_all_SOURCES = mln_world_inter_pixel_dim2_all.cc mln_world_inter_pixel_dim2_is_edge_SOURCES = mln_world_inter_pixel_dim2_is_edge.cc +mln_world_inter_pixel_dim2_make_edge_image_SOURCES = mln_world_inter_pixel_dim2_make_edge_image.cc mln_world_inter_pixel_dim2_is_dot_SOURCES = mln_world_inter_pixel_dim2_is_dot.cc mln_world_inter_pixel_dim2_is_row_odd_SOURCES = mln_world_inter_pixel_dim2_is_row_odd.cc +mln_world_inter_pixel_full2image_SOURCES = mln_world_inter_pixel_full2image.cc mln_registration_get_rtransf_SOURCES = mln_registration_get_rtransf.cc mln_registration_internal_rms_SOURCES = mln_registration_internal_rms.cc mln_registration_get_rot_SOURCES = mln_registration_get_rot.cc @@ -1296,7 +1319,6 @@ mln_util_max_SOURCES = mln_util_max.cc mln_util_lazy_set_SOURCES = mln_util_lazy_set.cc mln_util_soft_heap_SOURCES = mln_util_soft_heap.cc mln_util_set_SOURCES = mln_util_set.cc -mln_util_tree_to_image_SOURCES = mln_util_tree_to_image.cc mln_util_lemmings_SOURCES = mln_util_lemmings.cc mln_util_greater_point_SOURCES = mln_util_greater_point.cc mln_util_internal_graph_iter_base_SOURCES = mln_util_internal_graph_iter_base.cc @@ -1322,24 +1344,21 @@ mln_util_timer_SOURCES = mln_util_timer.cc mln_util_yes_SOURCES = mln_util_yes.cc mln_util_line_graph_SOURCES = mln_util_line_graph.cc mln_util_ord_SOURCES = mln_util_ord.cc -mln_util_tree_fast_to_image_SOURCES = mln_util_tree_fast_to_image.cc -mln_util_tree_SOURCES = mln_util_tree.cc +mln_util_adjacency_matrix_SOURCES = mln_util_adjacency_matrix.cc mln_util_couple_SOURCES = mln_util_couple.cc mln_util_index_SOURCES = mln_util_index.cc mln_util_multi_site_SOURCES = mln_util_multi_site.cc -mln_util_branch_iter_SOURCES = mln_util_branch_iter.cc -mln_util_branch_iter_ind_SOURCES = mln_util_branch_iter_ind.cc -mln_util_tree_to_fast_SOURCES = mln_util_tree_to_fast.cc mln_util_array_SOURCES = mln_util_array.cc mln_util_vertex_SOURCES = mln_util_vertex.cc mln_util_pix_SOURCES = mln_util_pix.cc -mln_util_tree_fast_SOURCES = mln_util_tree_fast.cc +mln_util_object_id_SOURCES = mln_util_object_id.cc mln_util_site_pair_SOURCES = mln_util_site_pair.cc mln_util_nil_SOURCES = mln_util_nil.cc mln_util_graph_ids_SOURCES = mln_util_graph_ids.cc mln_util_eat_SOURCES = mln_util_eat.cc mln_util_essential_SOURCES = mln_util_essential.cc mln_data_memset__SOURCES = mln_data_memset_.cc +mln_data_paste_without_localization_SOURCES = mln_data_paste_without_localization.cc mln_data_memcpy__SOURCES = mln_data_memcpy_.cc mln_data_all_SOURCES = mln_data_all.cc mln_data_paste_SOURCES = mln_data_paste.cc @@ -1428,6 +1447,8 @@ mln_fun_p2p_all_SOURCES = mln_fun_p2p_all.cc mln_fun_p2p_translation_SOURCES = mln_fun_p2p_translation.cc mln_fun_p2p_mirror_SOURCES = mln_fun_p2p_mirror.cc mln_fun_accu_result_SOURCES = mln_fun_accu_result.cc +mln_fun_stat_mahalanobis_SOURCES = mln_fun_stat_mahalanobis.cc +mln_fun_stat_all_SOURCES = mln_fun_stat_all.cc mln_fun_binary_param_SOURCES = mln_fun_binary_param.cc mln_fun_x2p_closest_point_SOURCES = mln_fun_x2p_closest_point.cc mln_fun_x2p_all_SOURCES = mln_fun_x2p_all.cc @@ -1505,6 +1526,8 @@ mln_fun_vv2b_lt_SOURCES = mln_fun_vv2b_lt.cc mln_fun_vv2b_eq_SOURCES = mln_fun_vv2b_eq.cc mln_fun_cast_SOURCES = mln_fun_cast.cc mln_fun_composition_SOURCES = mln_fun_composition.cc +mln_fun_access_all_SOURCES = mln_fun_access_all.cc +mln_fun_access_mean_SOURCES = mln_fun_access_mean.cc mln_fun_i2v_all_SOURCES = mln_fun_i2v_all.cc mln_fun_i2v_array_SOURCES = mln_fun_i2v_array.cc mln_fun_i2v_all_to_SOURCES = mln_fun_i2v_all_to.cc @@ -1515,10 +1538,13 @@ mln_fun_x2x_translation_SOURCES = mln_fun_x2x_translation.cc mln_fun_x2x_rotation_SOURCES = mln_fun_x2x_rotation.cc mln_fun_x2x_essential_SOURCES = mln_fun_x2x_essential.cc mln_fun_component_red_SOURCES = mln_fun_component_red.cc +mln_fun_component_comp_count_SOURCES = mln_fun_component_comp_count.cc +mln_fun_component_scomp_SOURCES = mln_fun_component_scomp.cc mln_fun_component_green_SOURCES = mln_fun_component_green.cc mln_fun_component_comp_SOURCES = mln_fun_component_comp.cc mln_fun_component_blue_SOURCES = mln_fun_component_blue.cc mln_fun_component_rgb_SOURCES = mln_fun_component_rgb.cc +mln_fun_component_ithcomp_SOURCES = mln_fun_component_ithcomp.cc mln_fun_compose_SOURCES = mln_fun_compose.cc mln_fun_meta_red_SOURCES = mln_fun_meta_red.cc mln_fun_meta_hue_SOURCES = mln_fun_meta_hue.cc @@ -1642,6 +1668,7 @@ mln_accu_site_set_all_SOURCES = mln_accu_site_set_all.cc mln_accu_site_set_essential_SOURCES = mln_accu_site_set_essential.cc mln_accu_stat_variance_SOURCES = mln_accu_stat_variance.cc mln_accu_stat_deviation_SOURCES = mln_accu_stat_deviation.cc +mln_accu_stat_all_SOURCES = mln_accu_stat_all.cc mln_accu_stat_var_SOURCES = mln_accu_stat_var.cc mln_accu_max_SOURCES = mln_accu_max.cc mln_accu_lor_SOURCES = mln_accu_lor.cc @@ -1689,6 +1716,7 @@ mln_accu_image_init_SOURCES = mln_accu_image_init.cc mln_accu_image_to_result_SOURCES = mln_accu_image_to_result.cc mln_accu_image_all_SOURCES = mln_accu_image_all.cc mln_accu_image_set_value_SOURCES = mln_accu_image_set_value.cc +mln_accu_image_untake_SOURCES = mln_accu_image_untake.cc mln_accu_image_take_SOURCES = mln_accu_image_take.cc mln_accu_image_take_as_init_SOURCES = mln_accu_image_take_as_init.cc mln_accu_image_take_n_times_SOURCES = mln_accu_image_take_n_times.cc @@ -1777,7 +1805,6 @@ mln_trait_ch_function_value_SOURCES = mln_trait_ch_function_value.cc mln_trait_ch_value_SOURCES = mln_trait_ch_value.cc mln_trait_solve_SOURCES = mln_trait_solve.cc mln_trait_solve_unary_SOURCES = mln_trait_solve_unary.cc -mln_trait_fun_SOURCES = mln_trait_fun.cc mln_trait_op_postdec_SOURCES = mln_trait_op_postdec.cc mln_trait_op_mod_SOURCES = mln_trait_op_mod.cc mln_trait_op_lor_SOURCES = mln_trait_op_lor.cc @@ -1805,6 +1832,7 @@ mln_trait_op_uplus_SOURCES = mln_trait_op_uplus.cc mln_trait_op_essential_SOURCES = mln_trait_op_essential.cc mln_trait_op_eq_SOURCES = mln_trait_op_eq.cc mln_trait_concrete_SOURCES = mln_trait_concrete.cc +mln_trait_functions_SOURCES = mln_trait_functions.cc mln_trait_windows_SOURCES = mln_trait_windows.cc mln_trait_site_sets_SOURCES = mln_trait_site_sets.cc mln_trait_image_from_grid_SOURCES = mln_trait_image_from_grid.cc @@ -2212,7 +2240,6 @@ mln_core_concept_window_SOURCES = mln_core_concept_window.cc mln_core_concept_value_SOURCES = mln_core_concept_value.cc mln_core_concept_accumulator_SOURCES = mln_core_concept_accumulator.cc mln_core_concept_site_set_SOURCES = mln_core_concept_site_set.cc -mln_core_concept_object_id_SOURCES = mln_core_concept_object_id.cc mln_core_concept_object_SOURCES = mln_core_concept_object.cc mln_core_concept_meta_fun_SOURCES = mln_core_concept_meta_fun.cc mln_core_concept_delta_point_site_SOURCES = mln_core_concept_delta_point_site.cc @@ -2294,6 +2321,7 @@ mln_labeling_all_SOURCES = mln_labeling_all.cc mln_labeling_level_SOURCES = mln_labeling_level.cc mln_labeling_flat_zones_SOURCES = mln_labeling_flat_zones.cc mln_labeling_foreground_SOURCES = mln_labeling_foreground.cc +mln_labeling_colorize_SOURCES = mln_labeling_colorize.cc mln_labeling_regional_maxima_SOURCES = mln_labeling_regional_maxima.cc mln_labeling_wrap_SOURCES = mln_labeling_wrap.cc mln_labeling_compute_SOURCES = mln_labeling_compute.cc @@ -2386,7 +2414,6 @@ mln_norm_essential_SOURCES = mln_norm_essential.cc mln_debug_iota_SOURCES = mln_debug_iota.cc mln_debug_all_SOURCES = mln_debug_all.cc mln_debug_println_with_border_SOURCES = mln_debug_println_with_border.cc -mln_debug_colorize_SOURCES = mln_debug_colorize.cc mln_debug_slices_2d_SOURCES = mln_debug_slices_2d.cc mln_debug_draw_graph_SOURCES = mln_debug_draw_graph.cc mln_debug_filename_SOURCES = mln_debug_filename.cc @@ -2410,6 +2437,7 @@ mln_graph_attribute_card_SOURCES = mln_graph_attribute_card.cc mln_graph_compute_SOURCES = mln_graph_compute.cc mln_graph_essential_SOURCES = mln_graph_essential.cc mln_set_uni_SOURCES = mln_set_uni.cc +mln_set_compute_with_weights_SOURCES = mln_set_compute_with_weights.cc mln_set_unique_SOURCES = mln_set_unique.cc mln_set_inter_SOURCES = mln_set_inter.cc mln_set_all_SOURCES = mln_set_all.cc diff --git a/milena/tests/util/Makefile.am b/milena/tests/util/Makefile.am index 07b6018..a808683 100644 --- a/milena/tests/util/Makefile.am +++ b/milena/tests/util/Makefile.am @@ -19,9 +19,7 @@ check_PROGRAMS = \ tree \ tree_fast \ tree_fast_to_image \ - tree_to_fast \ - tree_to_image - + tree_to_fast adjacency_matrix_SOURCES = adjacency_matrix.cc branch_iter_SOURCES = branch_iter.cc @@ -37,9 +35,7 @@ set_SOURCES = set.cc soft_heap_SOURCES = soft_heap.cc tree_SOURCES = tree.cc tree_fast_SOURCES = tree_fast.cc -tree_fast_to_image_SOURCES = tree_to_image.cc tree_to_fast_SOURCES = tree_to_fast.cc -tree_to_image_SOURCES = tree_to_image.cc TESTS = $(check_PROGRAMS) -- 1.6.1.2

1 0

3780: Fix documentation.
by Guillaume Lazzara 11 May '09

11 May '09

* doc/Doxyfile.in: add macro definitions. * doc/outputs/outputs.mk: update output reference files list. * headers.mk: update distributed files list. * apps/statues/trimesh/misc.hh, * doc/examples/tuto3/first_routine.cc, * mln/accu/compute.hh, * mln/accu/line.hh, * mln/core/image/graph_elt_window_if.hh, * mln/data/fill_with_image.hh, * mln/data/paste.hh, * mln/fun/x2x/composed.hh, * mln/geom/pmin_pmax.hh, * mln/geom/seeds2tiling.hh, * mln/io/dump/save.hh, * mln/io/txt/save.hh, * mln/labeling/compute.hh, * mln/labeling/pack.hh, * mln/labeling/relabel.hh, * mln/util/internal/id2element.hh, * mln/world/inter_pixel/dim2/is_dot.hh, * mln/world/inter_pixel/dim2/is_edge.hh, * mln/world/inter_pixel/dim2/is_pixel.hh, * mln/world/inter_pixel/dim2/is_row_odd.hh, * mln/world/inter_pixel/full2image.hh, * tests/accu/site_set/rectangularity.cc, * tests/make/region_adjacency_graph.cc, * mln/level/median.hh, * mln/level/stretch.hh, * mln/level/transform.hh, * mln/level/transform_inplace.hh, * mln/level/update.hh, * mln/make/dummy_p_edges.hh, * mln/make/dummy_p_vertices.hh, * mln/make/edge_image.hh, * mln/make/rag_and_labeled_wsl.hh, * mln/make/region_adjacency_graph.hh, * mln/make/relabelfun.hh, * mln/morpho/closing/area_on_vertices.hh, * mln/registration/icp.hh, * tests/morpho/Rd.cc: Fix documentation issues/missing documentation. --- milena/ChangeLog | 48 +++++++++++++++++++++++ milena/apps/statues/trimesh/misc.hh | 5 +- milena/doc/Doxyfile.in | 11 ++++- milena/doc/examples/tuto3/first_routine.cc | 2 +- milena/doc/outputs/outputs.mk | 1 + milena/headers.mk | 11 ++++- milena/mln/accu/compute.hh | 6 ++- milena/mln/accu/line.hh | 6 ++- milena/mln/core/image/graph_elt_window_if.hh | 2 +- milena/mln/data/fill_with_image.hh | 5 ++ milena/mln/data/paste.hh | 12 ++++++ milena/mln/fun/x2x/composed.hh | 4 +- milena/mln/geom/pmin_pmax.hh | 12 +++--- milena/mln/geom/seeds2tiling.hh | 26 ++++++++----- milena/mln/io/dump/save.hh | 8 ++++ milena/mln/io/txt/save.hh | 7 ++- milena/mln/labeling/pack.hh | 10 +++-- milena/mln/labeling/relabel.hh | 26 ++++++------ milena/mln/level/median.hh | 3 +- milena/mln/level/stretch.hh | 13 ++++++- milena/mln/level/transform.hh | 5 +- milena/mln/level/transform_inplace.hh | 7 ++- milena/mln/level/update.hh | 10 +++-- milena/mln/make/dummy_p_edges.hh | 2 +- milena/mln/make/dummy_p_vertices.hh | 2 +- milena/mln/make/edge_image.hh | 6 +- milena/mln/make/rag_and_labeled_wsl.hh | 4 +- milena/mln/make/region_adjacency_graph.hh | 13 +++--- milena/mln/make/relabelfun.hh | 11 ++++- milena/mln/morpho/closing/area_on_vertices.hh | 8 +++- milena/mln/registration/icp.hh | 14 ++++++- milena/mln/util/internal/id2element.hh | 2 +- milena/mln/world/inter_pixel/dim2/is_dot.hh | 2 +- milena/mln/world/inter_pixel/dim2/is_edge.hh | 2 +- milena/mln/world/inter_pixel/dim2/is_pixel.hh | 2 +- milena/mln/world/inter_pixel/dim2/is_row_odd.hh | 2 +- milena/mln/world/inter_pixel/full2image.hh | 8 ++-- milena/tests/accu/site_set/rectangularity.cc | 2 +- milena/tests/make/region_adjacency_graph.cc | 2 +- milena/tests/morpho/Rd.cc | 2 +- 40 files changed, 231 insertions(+), 93 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f9eea0c..2fda128 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,51 @@ +2009-05-11 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Fix documentation. + + * doc/Doxyfile.in: add macro definitions. + + * doc/outputs/outputs.mk: update output reference files list. + + * headers.mk: update distributed files list. + + * apps/statues/trimesh/misc.hh, + * doc/examples/tuto3/first_routine.cc, + * mln/accu/compute.hh, + * mln/accu/line.hh, + * mln/core/image/graph_elt_window_if.hh, + * mln/data/fill_with_image.hh, + * mln/data/paste.hh, + * mln/fun/x2x/composed.hh, + * mln/geom/pmin_pmax.hh, + * mln/geom/seeds2tiling.hh, + * mln/io/dump/save.hh, + * mln/io/txt/save.hh, + * mln/labeling/compute.hh, + * mln/labeling/pack.hh, + * mln/labeling/relabel.hh, + * mln/util/internal/id2element.hh, + * mln/world/inter_pixel/dim2/is_dot.hh, + * mln/world/inter_pixel/dim2/is_edge.hh, + * mln/world/inter_pixel/dim2/is_pixel.hh, + * mln/world/inter_pixel/dim2/is_row_odd.hh, + * mln/world/inter_pixel/full2image.hh, + * tests/accu/site_set/rectangularity.cc, + * tests/make/region_adjacency_graph.cc, + * mln/level/median.hh, + * mln/level/stretch.hh, + * mln/level/transform.hh, + * mln/level/transform_inplace.hh, + * mln/level/update.hh, + * mln/make/dummy_p_edges.hh, + * mln/make/dummy_p_vertices.hh, + * mln/make/edge_image.hh, + * mln/make/rag_and_labeled_wsl.hh, + * mln/make/region_adjacency_graph.hh, + * mln/make/relabelfun.hh, + * mln/morpho/closing/area_on_vertices.hh, + * mln/registration/icp.hh, + * tests/morpho/Rd.cc: Fix documentation issues/missing documentation. + 2009-05-07 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix missing updates about debug colorize. diff --git a/milena/apps/statues/trimesh/misc.hh b/milena/apps/statues/trimesh/misc.hh index a9f0fce..d72477d 100644 --- a/milena/apps/statues/trimesh/misc.hh +++ b/milena/apps/statues/trimesh/misc.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 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 @@ -474,7 +475,7 @@ namespace mln Jean Cousty. Artwork 3D Model Database Indexing and Classification. - \param[in] ima The surface (triangle mesh) on which the + \param[in] mesh The surface (triangle mesh) on which the curvature is to be computed. */ /* FIXME: We should restrict attached data to vertices in return value. */ diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index f088755..cedcbc1 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -215,7 +215,7 @@ PREDEFINED = "mlc_unqualif(T)=typename mln::metal::unqualif<T>::ret" "mln_enc(T)=typename T::enc" \ "mln_value(T)=typename T::value" \ "mln_qlf_value(T)=typename T::qlf_value" \ - "mln_pset(T)=typename T::pset" \ + "mln_domain(T)=typename T::domain_t" \ "mln_sum(T)=typename mln::value::props<T>::sum" \ "mln_vset(T)=typename T::vset" \ "mln_rvalue(T)=typename T::rvalue" \ @@ -250,7 +250,7 @@ PREDEFINED = "mlc_unqualif(T)=typename mln::metal::unqualif<T>::ret" "mln_enc_(T)=T::enc" \ "mln_value_(T)=T::value" \ "mln_qlf_value_(T)=T::qlf_value" \ - "mln_pset_(T)=T::pset" \ + "mln_domain_(T)=T::domain_t" \ "mln_sum_(T)=mln::value::props<T>::sum" \ "mln_vset_(T)=T::vset" \ "mln_rvalue_(T)=T::rvalue" \ @@ -286,7 +286,12 @@ PREDEFINED = "mlc_unqualif(T)=typename mln::metal::unqualif<T>::ret" "mln_gradient(I)=mln::value::stack_image< I::point::dim, mln::trait::ch_value< I, mln::value::props< typename I::value >::sum >::ret >" \ "mln_trait_value_sum_product(T, U)=typename mln::trait::value_< mln_trait_op_times(T,U) >::sum" \ "mln_sum_product(T, U)=typename mln::trait::value_< mln_trait_op_times(T,U) >::sum" \ - "mln_deduce(T, A1, A2)=typename T::A1::A2" + "mln_deduce(T, A1, A2)=typename T::A1::A2" \ + "mln_graph_element(T)=typename T::graph_element" \ + "mln_graph_element_(T)=T::graph_element" + "mln_fun_vv2v(F, L, R)=mln::fun::vv2v::F< mln_value(L), mln_value(R) >" \ + "mln_fun_vv2v_result(F, L, R)=typename mln_fun_vv2v(F, L, R)::result" \ + "mln_ch_fun_vv2v(F, L, R)=typename mln::trait::ch_value< L, typename mln_fun_vv2v(F, L, R)::result >::ret" diff --git a/milena/doc/examples/tuto3/first_routine.cc b/milena/doc/examples/tuto3/first_routine.cc index b4d3b58..5ed5919 100644 --- a/milena/doc/examples/tuto3/first_routine.cc +++ b/milena/doc/examples/tuto3/first_routine.cc @@ -1,4 +1,4 @@ -/// \file doc/examples/first_routine.cc +/// \file doc/examples/tuto3/first_routine.cc #include <mln/essential/2d.hh> #include <tests/data.hh> diff --git a/milena/doc/outputs/outputs.mk b/milena/doc/outputs/outputs.mk index ac10062..5b9de7c 100644 --- a/milena/doc/outputs/outputs.mk +++ b/milena/doc/outputs/outputs.mk @@ -21,6 +21,7 @@ outputs/box2d-bbox.txt \ outputs/graph-iter.txt \ outputs/graph-output-1.txt \ outputs/fill-call-1.txt \ +outputs/site_set_create.txt \ outputs/ima2d-rot.txt \ outputs/paste-call-1.txt \ outputs/fun-p2v-1.txt \ diff --git a/milena/headers.mk b/milena/headers.mk index 7d75826..34e4823 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -60,13 +60,15 @@ mln/literal/essential.hh \ mln/world/binary_2d/subsample.hh \ mln/world/binary_2d/projected_histo.hh \ mln/world/inter_pixel/neighb2d.hh \ -mln/world/inter_pixel/full.hh \ +mln/world/inter_pixel/image2full.hh \ mln/world/inter_pixel/display_edge.hh \ mln/world/inter_pixel/dim2/is_pixel.hh \ mln/world/inter_pixel/dim2/all.hh \ mln/world/inter_pixel/dim2/is_edge.hh \ +mln/world/inter_pixel/dim2/make_edge_image.hh \ mln/world/inter_pixel/dim2/is_dot.hh \ mln/world/inter_pixel/dim2/is_row_odd.hh \ +mln/world/inter_pixel/full2image.hh \ mln/registration/get_rtransf.hh \ mln/registration/internal/rms.hh \ mln/registration/get_rot.hh \ @@ -106,6 +108,7 @@ mln/util/timer.hh \ mln/util/yes.hh \ mln/util/line_graph.hh \ mln/util/ord.hh \ +mln/util/adjacency_matrix.hh \ mln/util/tree_fast_to_image.hh \ mln/util/tree.hh \ mln/util/couple.hh \ @@ -302,10 +305,13 @@ mln/fun/x2x/translation.hh \ mln/fun/x2x/rotation.hh \ mln/fun/x2x/essential.hh \ mln/fun/component/red.hh \ +mln/fun/component/comp_count.hh \ +mln/fun/component/scomp.hh \ mln/fun/component/green.hh \ mln/fun/component/comp.hh \ mln/fun/component/blue.hh \ mln/fun/component/rgb.hh \ +mln/fun/component/ithcomp.hh \ mln/fun/compose.hh \ mln/fun/meta/red.hh \ mln/fun/meta/hue.hh \ @@ -476,6 +482,7 @@ mln/accu/image/init.hh \ mln/accu/image/to_result.hh \ mln/accu/image/all.hh \ mln/accu/image/set_value.hh \ +mln/accu/image/untake.hh \ mln/accu/image/take.hh \ mln/accu/image/take_as_init.hh \ mln/accu/image/take_n_times.hh \ @@ -566,7 +573,6 @@ mln/trait/ch_function_value.hh \ mln/trait/ch_value.hh \ mln/trait/solve.hh \ mln/trait/solve_unary.hh \ -mln/trait/fun.hh \ mln/trait/op/postdec.hh \ mln/trait/op/mod.hh \ mln/trait/op/lor.hh \ @@ -594,6 +600,7 @@ mln/trait/op/uplus.hh \ mln/trait/op/essential.hh \ mln/trait/op/eq.hh \ mln/trait/concrete.hh \ +mln/trait/functions.hh \ mln/trait/windows.hh \ mln/trait/site_sets.hh \ mln/trait/image_from_grid.hh \ diff --git a/milena/mln/accu/compute.hh b/milena/mln/accu/compute.hh index a632fa8..f78c6ec 100644 --- a/milena/mln/accu/compute.hh +++ b/milena/mln/accu/compute.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -50,6 +50,7 @@ namespace mln /// Make an accumulator compute the pixels of the image \p input. /// /// \param[in] input The input image. + /// \param[in] a An accumulator. /// /// This routine runs: \n /// a.take(make::pix(input, p)); @@ -65,6 +66,7 @@ namespace mln /// Make an accumulator compute the pixels of the image \p input. /// /// \param[in] input The input image. + /// \param[in] a A meta accumulator. /// /// This routine runs: \n /// a.take(make::pix(input, p)); diff --git a/milena/mln/accu/line.hh b/milena/mln/accu/line.hh index b4f30a7..4fec281 100644 --- a/milena/mln/accu/line.hh +++ b/milena/mln/accu/line.hh @@ -51,8 +51,10 @@ namespace mln /*! Line an accumulator onto the pixel values of the image \p input. * * \param[in] input The input image. - * \param[in] a The accumulator. - * \return The accumulator result. + * \param[in] p_start The starting site of the line. + * \param[in] len The line length. + * \param[in] half_length The half length of the line. + * \param[in,out] output The resulting image. * * This routine runs: \n * tmp = \p a \n diff --git a/milena/mln/core/image/graph_elt_window_if.hh b/milena/mln/core/image/graph_elt_window_if.hh index dd4f6d9..c03ac79 100644 --- a/milena/mln/core/image/graph_elt_window_if.hh +++ b/milena/mln/core/image/graph_elt_window_if.hh @@ -125,7 +125,7 @@ namespace mln /// Default. Construct an invalid window. graph_elt_window_if(); - /// \param[in] graph_image A graph image. + /// \param[in] mask A graph image of bool. /// /// \sa vertex_image, edge_image. graph_elt_window_if(const Image& mask); diff --git a/milena/mln/data/fill_with_image.hh b/milena/mln/data/fill_with_image.hh index 3b79e72..df67089 100644 --- a/milena/mln/data/fill_with_image.hh +++ b/milena/mln/data/fill_with_image.hh @@ -95,6 +95,11 @@ namespace mln namespace generic { + /// Generic implementation. + /// + /// \param[in,out] ima The image to be filled. + /// \param[in] data The image. + // template <typename I, typename J> void fill_with_image(Image& ima_, const Image<J>& data_) { diff --git a/milena/mln/data/paste.hh b/milena/mln/data/paste.hh index ef3911d..740a2a1 100644 --- a/milena/mln/data/paste.hh +++ b/milena/mln/data/paste.hh @@ -72,6 +72,12 @@ namespace mln namespace internal { + /// Internal tests for data::paste. + /// + /// \param[in] input The input image providing pixels values. + /// \param[in,out] output The image in which values are + /// assigned. + // template <typename I, typename J> inline void paste_tests(const Image& input, Image<J>& output) @@ -97,6 +103,12 @@ namespace mln namespace generic { + /// Generic implementation of data::paste. + /// + /// \param[in] input The input image providing pixels values. + /// \param[in,out] output The image in which values are + /// assigned. + // template <typename I, typename J> inline void paste(const Image& input_, Image<J>& output_) diff --git a/milena/mln/fun/x2x/composed.hh b/milena/mln/fun/x2x/composed.hh index 0bc20b3..49d74f2 100644 --- a/milena/mln/fun/x2x/composed.hh +++ b/milena/mln/fun/x2x/composed.hh @@ -153,9 +153,9 @@ namespace mln mlc_is(T2, Bijection_x2x<T2>)::value && mlc_is(T1, Bijection_x2x<T1>)::value>(f, g) {} -}; + }; -} // end of namespace mln::fun::x2x + } // end of namespace mln::fun::x2x } // end of namespace mln::fun diff --git a/milena/mln/geom/pmin_pmax.hh b/milena/mln/geom/pmin_pmax.hh index 3f28fe9..12e3ea7 100644 --- a/milena/mln/geom/pmin_pmax.hh +++ b/milena/mln/geom/pmin_pmax.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2009 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 +29,10 @@ #ifndef MLN_GEOM_PMIN_PMAX_HH # define MLN_GEOM_PMIN_PMAX_HH -/*! \file mln/geom/pmin_pmax.hh - * - * \brief Several routines to compute the minimum point and/or maximum - * point. - */ +/// \file mln/geom/pmin_pmax.hh +/// +/// Several routines to compute the minimum point and/or maximum +/// point. # include <utility> diff --git a/milena/mln/geom/seeds2tiling.hh b/milena/mln/geom/seeds2tiling.hh index 0dc8eef..85fb3ce 100644 --- a/milena/mln/geom/seeds2tiling.hh +++ b/milena/mln/geom/seeds2tiling.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -29,10 +29,9 @@ #ifndef MLN_GEOM_SEEDS2TILING_HH # define MLN_GEOM_SEEDS2TILING_HH -/*! \file mln/geom/seeds2tiling.hh - * - * \brief Convert a binary image with seeds into a labeled image. - */ +/// \file mln/geom/seeds2tiling.hh +/// +/// Convert a binary image with seeds into a labeled image. # include <map> @@ -46,27 +45,34 @@ namespace mln { + namespace geom { - /// \brief Take a labeled image \p ima_ with seeds and extend them + /// Take a labeled image \p ima_ with seeds and extend them /// until creating tiles. /// /// \param[in,out] ima_ The labeled image with seed. /// \param[in] nbh The neighborhood to use on this algorithm. /// - /// \pre \p ima_ has to be initialized. + /// \return A tiled image. /// - /// \{ + /// \pre \p ima_ has to be initialized. + // template <typename I, typename N> I seeds2tiling (Image& ima_, const Neighborhood<N>& nbh); - /// \} + # ifndef MLN_INCLUDE_ONLY namespace impl { + /// Generic implementation of geom::seed2tiling. + /// + /// \param[in,out] ima_ The labeled image with seed. + /// \param[in] nbh The neighborhood to use on this algorithm. + // template <typename I, typename N> inline I diff --git a/milena/mln/io/dump/save.hh b/milena/mln/io/dump/save.hh index 41d4571..5056dc6 100644 --- a/milena/mln/io/dump/save.hh +++ b/milena/mln/io/dump/save.hh @@ -31,6 +31,7 @@ /// \file mln/io/dump/save.hh /// /// Save a Milena image by dumping its data to a file. +/// /// \todo handle endianness. # include <iostream> @@ -42,6 +43,7 @@ # include <mln/data/memcpy_.hh> # include <mln/trait/value_.hh> + namespace mln { @@ -55,12 +57,15 @@ namespace mln /// /// \param[in] ima_ The image to save. /// \param[in] filename the destination. + // template <typename I> void save(const Image& ima_, const std::string& filename); + # ifndef MLN_INCLUDE_ONLY + namespace internal { @@ -121,6 +126,9 @@ namespace mln } // end of namespace mln::io::dump::internal + + // Facade + template <typename I> void save(const Image& ima_, const std::string& filename) { diff --git a/milena/mln/io/txt/save.hh b/milena/mln/io/txt/save.hh index 4cc4e39..db0d423 100644 --- a/milena/mln/io/txt/save.hh +++ b/milena/mln/io/txt/save.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory // (LRDE) // // This file is part of the Olena Library. This library is free @@ -31,7 +31,7 @@ /// \file mln/io/txt/save.hh /// -/// \brief Save an image as txt file. +/// Save an image as txt file. # include <iostream> # include <fstream> @@ -52,8 +52,9 @@ namespace mln /// Save an image as txt file. /// - /// \param[in] ima_ The image to save. Must be an image of char. + /// \param[in] ima The image to save. Must be an image of char. /// \param[in] filename the destination. + // void save(const image2d<char>& ima, const std::string& filename); diff --git a/milena/mln/labeling/pack.hh b/milena/mln/labeling/pack.hh index 5235cd3..29ef2c2 100644 --- a/milena/mln/labeling/pack.hh +++ b/milena/mln/labeling/pack.hh @@ -52,8 +52,9 @@ namespace mln { /// Relabel a labeled image in order to have a contiguous labeling. - /// \input[in] label The labeled image. - /// \input[out] new_nlabels The number of labels after relabeling. + /// + /// \param[in] label The labeled image. + /// \param[out] new_nlabels The number of labels after relabeling. /// /// \return The relabeled image. // @@ -65,8 +66,9 @@ namespace mln /// Relabel inplace a labeled image in order to have a contiguous /// labeling. - /// \input[in] label The labeled image. - /// \input[out] new_nlabels The number of labels after relabeling. + /// + /// \param[in] label The labeled image. + /// \param[out] new_nlabels The number of labels after relabeling. // template <typename I> void diff --git a/milena/mln/labeling/relabel.hh b/milena/mln/labeling/relabel.hh index a775bfa..60b150f 100644 --- a/milena/mln/labeling/relabel.hh +++ b/milena/mln/labeling/relabel.hh @@ -52,10 +52,10 @@ namespace mln { /// Remove components and relabel a labeled image. - /// \input[in] label the labeled image. - /// \input[in] nlabels the number of labels in \p label. - /// \input[out] new_nlabels the number of labels after relabeling. - /// \input[in] f function returning whether a label must be replaced + /// \param[in] label the labeled image. + /// \param[in] nlabels the number of labels in \p label. + /// \param[out] new_nlabels the number of labels after relabeling. + /// \param[in] fv2b function returning whether a label must be replaced /// by the background. /// /// \return the relabeled image. @@ -69,9 +69,9 @@ namespace mln /// Remove components and relabel a labeled image. - /// \input[in] label the labeled image. - /// \input[in] nlabels the number of labels in \p label. - /// \input[in] f function returning the new component id for each pixel + /// \param[in] label the labeled image. + /// \param[in] nlabels the number of labels in \p label. + /// \param[in] fv2v function returning the new component id for each pixel /// value. /// /// \return the relabeled image. @@ -84,9 +84,9 @@ namespace mln /// Remove components and relabel a labeled image inplace. - /// \input[in, out] label the labeled image. - /// \input[in, out] nlabels the number of labels in \p label. - /// \input[in] f function returning whether a label must be replaced + /// \param[in, out] label the labeled image. + /// \param[in, out] nlabels the number of labels in \p label. + /// \param[in] fv2b function returning whether a label must be replaced /// by the background. // template <typename I, typename F> @@ -97,9 +97,9 @@ namespace mln /// Remove components and relabel a labeled image inplace. - /// \input[in, out] label the labeled image. - /// \input[in, out] nlabels the number of labels in \p label. - /// \input[in] f function returning the new component id for each + /// \param[in, out] label the labeled image. + /// \param[in, out] nlabels the number of labels in \p label. + /// \param[in] fv2v function returning the new component id for each /// pixel value. // template <typename I, typename F> diff --git a/milena/mln/level/median.hh b/milena/mln/level/median.hh index 4a5c3cd..f62c7e5 100644 --- a/milena/mln/level/median.hh +++ b/milena/mln/level/median.hh @@ -59,9 +59,8 @@ namespace mln * * \param[in] input The image to be filtered. * \param[in] win The window. - * \param[out] output The output image. * - * \pre \p input and \p output have to be initialized. + * \pre \p input have to be initialized. */ template <typename I, typename W> mln_concrete(I) diff --git a/milena/mln/level/stretch.hh b/milena/mln/level/stretch.hh index 63bac49..f10f4e3 100644 --- a/milena/mln/level/stretch.hh +++ b/milena/mln/level/stretch.hh @@ -57,7 +57,8 @@ namespace mln * * \param[in] v A value to set the output value type. * \param[in] input The input image. - * \param[out] output The result image. + * + * \return A stretch image with values of the same type as \p v. * * \pre input.is_valid */ @@ -71,6 +72,13 @@ namespace mln namespace impl { + /// Generic implementation of level::stretch. + /// + /// \param[in] v A value to set the output value type. + /// \param[in] input The input image. + /// + /// \return A stretch image with values of the same type as \p v. + // template <typename V, typename I> inline mln_ch_value(I, V) @@ -112,6 +120,9 @@ namespace mln } // end of namespace mln::level::impl + + // Facade + template <typename V, typename I> inline mln_ch_value(I, V) diff --git a/milena/mln/level/transform.hh b/milena/mln/level/transform.hh index 07ed377..f61fbc9 100644 --- a/milena/mln/level/transform.hh +++ b/milena/mln/level/transform.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -130,6 +130,7 @@ namespace mln namespace generic { + /// Generic implementation of level::transform. template <typename I, typename F> mln_ch_value(I, mln_result(F)) transform(const Image& input_, const Function_v2v<F>& f_) diff --git a/milena/mln/level/transform_inplace.hh b/milena/mln/level/transform_inplace.hh index ca85b28..dc632e2 100644 --- a/milena/mln/level/transform_inplace.hh +++ b/milena/mln/level/transform_inplace.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 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 @@ -8,7 +9,7 @@ // 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. +// 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 @@ -64,7 +65,7 @@ namespace mln /*! Transform inplace the image \p ima with the image \p aux through a function \p f. * - * \param[in] ima1 The image to be transformed. + * \param[in] ima The image to be transformed. * \param[in] aux The auxiliary image. * \param[in] f The function. * diff --git a/milena/mln/level/update.hh b/milena/mln/level/update.hh index 10632a5..306d1ad 100644 --- a/milena/mln/level/update.hh +++ b/milena/mln/level/update.hh @@ -90,6 +90,7 @@ namespace mln namespace generic { + /// Generic implementation of level::update. template <typename A, typename I> inline mln_result(A) @@ -112,21 +113,22 @@ namespace mln } // end of namespace mln::level::impl::generic + /// Fastest implementation of level::update. template <typename A, typename I> inline mln_result(A) update_fastest(Accumulator<A>& a_, const Image& input_) { trace::entering("level::impl::update_fastest"); - + A& a = exact(a_); const I& input = exact(input_); level::internal::update_tests(a, input); - + mln_pixter(const I) pxl(input); for_all(pxl) a.take(pxl.val()); - + trace::exiting("level::impl::update_fastest"); return a.to_result(); } @@ -134,7 +136,7 @@ namespace mln } // end of namespace mln::level::impl - + // Dispatch. diff --git a/milena/mln/make/dummy_p_edges.hh b/milena/mln/make/dummy_p_edges.hh index 7c17aec..aaf17f8 100644 --- a/milena/mln/make/dummy_p_edges.hh +++ b/milena/mln/make/dummy_p_edges.hh @@ -62,7 +62,7 @@ namespace mln /// Create a p_edges which associate a graph element to a constant site. /// \c 0 (int) is used as dummy site. /// - /// \param[in] g_ A graph. + /// \param[in] g A graph. /// /// \return A p_edges. // diff --git a/milena/mln/make/dummy_p_vertices.hh b/milena/mln/make/dummy_p_vertices.hh index c9c643d..462473a 100644 --- a/milena/mln/make/dummy_p_vertices.hh +++ b/milena/mln/make/dummy_p_vertices.hh @@ -62,7 +62,7 @@ namespace mln /// Create a p_vertices which associate a graph element to a constant site. /// \c 0 (int) is used as dummy site. /// - /// \param[in] g_ A graph. + /// \param[in] g A graph. /// /// \return A p_vertices. // diff --git a/milena/mln/make/edge_image.hh b/milena/mln/make/edge_image.hh index bd03162..0c2deff 100644 --- a/milena/mln/make/edge_image.hh +++ b/milena/mln/make/edge_image.hh @@ -60,7 +60,7 @@ namespace mln /// Construct an edge image. /// - /// \param[in] g A graph + /// \param[in] g_ A graph /// \param[in] fp A function mapping edge ids to sites. /// \param[in] fv A function mapping edge ids to values. /// @@ -78,7 +78,7 @@ namespace mln /// /// \param[in] v_ima_ A vertex image. /// \param[in] pe A p_edges mapping graph element to sites . - /// \param[in] fv A function mapping two vertex ids to a value. + /// \param[in] fv_ A function mapping two vertex ids to a value. /// The result is associated to the corresponding edge. /// /// \return an edge image. @@ -94,7 +94,7 @@ namespace mln /// Construct an edge image. /// /// \param[in] v_ima_ A vertex image. - /// \param[in] fv A function mapping two vertex ids to a value. + /// \param[in] fv_ A function mapping two vertex ids to a value. /// The result is associated to the corresponding edge. /// /// \return an edge image without localization information mapped to diff --git a/milena/mln/make/rag_and_labeled_wsl.hh b/milena/mln/make/rag_and_labeled_wsl.hh index 60f2824..c170d18 100644 --- a/milena/mln/make/rag_and_labeled_wsl.hh +++ b/milena/mln/make/rag_and_labeled_wsl.hh @@ -57,8 +57,8 @@ namespace mln /// Create a region adjacency graph and a label image of the watershed line /// from a watershed image. /// - /// \param[in] wshd Watershed image. - /// \param[in] nbh Neighborhood + /// \param[in] wshd_ Watershed image. + /// \param[in] nbh_ Neighborhood /// \param[in] nbasins Number of influence zone in \p wshd. /// /// \return A couple. First element is the graph, second element is an diff --git a/milena/mln/make/region_adjacency_graph.hh b/milena/mln/make/region_adjacency_graph.hh index b930367..ba2e177 100644 --- a/milena/mln/make/region_adjacency_graph.hh +++ b/milena/mln/make/region_adjacency_graph.hh @@ -53,7 +53,8 @@ namespace mln /// Create a region adjacency graph from a watershed image. /// - /// \param[in] wshd watershed image. + /// \param[in] wshd_ watershed image. + /// \param[in] nbh A neighborhood. /// \param[in] nbasins number of influence zone in \p wshd. /// /// \return util::graph Graph based on the adjacency of the influence zones. @@ -61,7 +62,7 @@ namespace mln util::graph region_adjacency_graph(const Image& wshd_, const Neighborhood<N>& nbh, - mln_value(I) nbasins); + const mln_value(I)& nbasins); @@ -75,7 +76,7 @@ namespace mln void region_adjacency_graph_tests(const Image& wshd, const Neighborhood<N>& nbh, - mln_value(I)) + const mln_value(I)&) { mln_precondition(exact(wshd).is_valid()); mln_precondition(exact(nbh).is_valid()); @@ -96,7 +97,7 @@ namespace mln util::graph region_adjacency_graph(const Image& wshd_, const Neighborhood<N>& nbh_, - mln_value(I) nbasins) + const mln_value(I)& nbasins) { trace::entering("make::impl::generic::region_adjacency_graph"); @@ -163,7 +164,7 @@ namespace mln util::graph region_adjacency_graph_dispatch(const Image& wshd, const Neighborhood<N>& nbh, - mln_value(I) nbasins) + const mln_value(I)& nbasins) { return make::impl::generic::region_adjacency_graph(wshd, nbh, nbasins); } @@ -179,7 +180,7 @@ namespace mln util::graph region_adjacency_graph(const Image& wshd, const Neighborhood<N>& nbh, - mln_value(I) nbasins) + const mln_value(I)& nbasins) { trace::entering("make::region_adjacency_graph"); diff --git a/milena/mln/make/relabelfun.hh b/milena/mln/make/relabelfun.hh index 19b072d..11fe1fe 100644 --- a/milena/mln/make/relabelfun.hh +++ b/milena/mln/make/relabelfun.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 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 @@ -45,7 +46,9 @@ namespace mln /// Create a i2v function from a v2b function. /// This function can be used to relabel a labeled image. /// - /// \param[in] f a v2b function. + /// \param[in] fv2b A v2b function. + /// \param[in] nlabels The number of labels. + /// \param[in] new_nlabels The number of labels after relabeling. /// /// \return a i2v function. /// @@ -59,7 +62,9 @@ namespace mln /// Create a i2v function from a v2v function. /// This function can be used to relabel a labeled image. /// - /// \param[in] f a v2v function. + /// \param[in] fv2v A v2v function. + /// \param[in] nlabels The number of labels. + /// \param[in] new_nlabels The number of labels after relabeling. /// /// \return a i2v function. /// diff --git a/milena/mln/morpho/closing/area_on_vertices.hh b/milena/mln/morpho/closing/area_on_vertices.hh index 099e473..46c6774 100644 --- a/milena/mln/morpho/closing/area_on_vertices.hh +++ b/milena/mln/morpho/closing/area_on_vertices.hh @@ -34,7 +34,6 @@ /// Morphological area closing on a line graph image computing /// the area in terms of adjacent vertices. -# include <mln/pw/image.hh> # include <mln/core/image/edge_image.hh> # include <mln/morpho/closing/algebraic.hh> # include <mln/morpho/attribute/count_adjacent_vertices.hh> @@ -51,6 +50,13 @@ namespace mln /// Morphological area closing on a mln::line_graph_image computing /// the area in terms of adjacent vertices. + /// + /// \param[in] input An edge image. + /// \param[in] nbh A graph neighborhood. + /// \param[in] lambda Closing parameter. + /// + /// \return An edge image. + // template <typename P, typename V, typename G, typename N> edge_image<P,V,G> area_on_vertices(const edge_image<P,V,G>& input, diff --git a/milena/mln/registration/icp.hh b/milena/mln/registration/icp.hh index 540efba..a2bee09 100644 --- a/milena/mln/registration/icp.hh +++ b/milena/mln/registration/icp.hh @@ -90,11 +90,13 @@ namespace mln /*! Register point in \p c using a function of closest points * \p closest_point. + * This overload allows to specify initial transformations. * * \param[in] P_ The cloud of points. * \param[in] X the reference surface. * \param[in] closest_point The function of closest points. - * \param[out] qk The rigid transformation obtained. + * \param[in] initial_rot An initial rotation. + * \param[in] initial_translation An initial translation. * * \return the rigid transformation which may be use later to create * a registered image. @@ -118,6 +120,16 @@ namespace mln const mln_vec(P)& initial_translation); + /*! Register point in \p c using a function of closest points + * \p closest_point. + * + * \param[in] P_ The cloud of points. + * \param[in] X the reference surface. + * \param[in] closest_point The function of closest points. + * + * \return the rigid transformation which may be use later to create + * a registered image. + */ template <typename P, typename F> composed< translation<P::dim,float>,rotation<P::dim,float> > icp(const p_array& P_, diff --git a/milena/mln/util/internal/id2element.hh b/milena/mln/util/internal/id2element.hh index 48550da..34aac26 100644 --- a/milena/mln/util/internal/id2element.hh +++ b/milena/mln/util/internal/id2element.hh @@ -29,7 +29,7 @@ #ifndef MLN_UTIL_INTERNAL_ID2VERTEX_HH # define MLN_UTIL_INTERNAL_ID2VERTEX_HH -/// \file mln/util/id2element.hh +/// \file mln/util/internal/id2element.hh /// /// Function constructing a element from an id. diff --git a/milena/mln/world/inter_pixel/dim2/is_dot.hh b/milena/mln/world/inter_pixel/dim2/is_dot.hh index da41552..74c7732 100644 --- a/milena/mln/world/inter_pixel/dim2/is_dot.hh +++ b/milena/mln/world/inter_pixel/dim2/is_dot.hh @@ -28,7 +28,7 @@ #ifndef MLN_WORLD_INTER_PIXEL_DIM2_IS_DOT_HH # define MLN_WORLD_INTER_PIXEL_DIM2_IS_DOT_HH -/// \file mln/world/inter_pixel/dim2d/is_dot.hh +/// \file mln/world/inter_pixel/dim2/is_dot.hh /// /// FIXME: insert comment. diff --git a/milena/mln/world/inter_pixel/dim2/is_edge.hh b/milena/mln/world/inter_pixel/dim2/is_edge.hh index c5ef485..383bb85 100644 --- a/milena/mln/world/inter_pixel/dim2/is_edge.hh +++ b/milena/mln/world/inter_pixel/dim2/is_edge.hh @@ -28,7 +28,7 @@ #ifndef MLN_WORLD_INTER_PIXEL_DIM2_IS_EDGE_HH # define MLN_WORLD_INTER_PIXEL_DIM2_IS_EDGE_HH -/// \file mln/world/inter_pixel/dim2d/is_edge.hh +/// \file mln/world/inter_pixel/dim2/is_edge.hh /// /// FIXME: insert comment. diff --git a/milena/mln/world/inter_pixel/dim2/is_pixel.hh b/milena/mln/world/inter_pixel/dim2/is_pixel.hh index 1aa866d..c9cc4e9 100644 --- a/milena/mln/world/inter_pixel/dim2/is_pixel.hh +++ b/milena/mln/world/inter_pixel/dim2/is_pixel.hh @@ -28,7 +28,7 @@ #ifndef MLN_WORLD_INTER_PIXEL_DIM2_IS_PIXEL_HH # define MLN_WORLD_INTER_PIXEL_DIM2_IS_PIXEL_HH -/// \file mln/world/inter_pixel/dim2d/is_pixel.hh +/// \file mln/world/inter_pixel/dim2/is_pixel.hh /// /// FIXME: insert comment. diff --git a/milena/mln/world/inter_pixel/dim2/is_row_odd.hh b/milena/mln/world/inter_pixel/dim2/is_row_odd.hh index 24cdb29..6bf4905 100644 --- a/milena/mln/world/inter_pixel/dim2/is_row_odd.hh +++ b/milena/mln/world/inter_pixel/dim2/is_row_odd.hh @@ -28,7 +28,7 @@ #ifndef MLN_WORLD_INTER_PIXEL_DIM2_IS_ROW_ODD_HH # define MLN_WORLD_INTER_PIXEL_DIM2_IS_ROW_ODD_HH -/// \file mln/world/inter_pixel/dim2d/is_row_odd.hh +/// \file mln/world/inter_pixel/dim2/is_row_odd.hh /// /// FIXME: insert comment. diff --git a/milena/mln/world/inter_pixel/full2image.hh b/milena/mln/world/inter_pixel/full2image.hh index c116964..50f6b28 100644 --- a/milena/mln/world/inter_pixel/full2image.hh +++ b/milena/mln/world/inter_pixel/full2image.hh @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_WORLD_INTER_PIXEL_FULL_HH -# define MLN_WORLD_INTER_PIXEL_FULL_HH +#ifndef MLN_WORLD_INTER_PIXEL_FULL2IMAGE_HH +# define MLN_WORLD_INTER_PIXEL_FULL2IMAGE_HH -/// \file mln/world/inter_pixel/full.hh +/// \file mln/world/inter_pixel/full2image.hh /// /// Convert an inter-pixel image to a classical image. /// @@ -92,4 +92,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_WORLD_INTER_PIXEL_FULL +#endif // ! MLN_WORLD_INTER_PIXEL_FULL2IMAGE diff --git a/milena/tests/accu/site_set/rectangularity.cc b/milena/tests/accu/site_set/rectangularity.cc index ee6b6d1..9efef9b 100644 --- a/milena/tests/accu/site_set/rectangularity.cc +++ b/milena/tests/accu/site_set/rectangularity.cc @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/accu/site_set/rectangularity.hh +/// \file tests/accu/site_set/rectangularity.cc /// /// Tests on mln::accu::site_set::rectangularity. diff --git a/milena/tests/make/region_adjacency_graph.cc b/milena/tests/make/region_adjacency_graph.cc index 7f8cb12..641626b 100644 --- a/milena/tests/make/region_adjacency_graph.cc +++ b/milena/tests/make/region_adjacency_graph.cc @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/make/graph.cc +/// \file tests/make/region_adjacency_graph.cc /// /// Tests on mln::make::region_adjacency_graph. diff --git a/milena/tests/morpho/Rd.cc b/milena/tests/morpho/Rd.cc index 48bc5bb..8b4ec21 100644 --- a/milena/tests/morpho/Rd.cc +++ b/milena/tests/morpho/Rd.cc @@ -26,7 +26,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/morpho/combined.cc +/// \file tests/morpho/rd.cc /// /// Test on mln::morpho::Rd. -- 1.5.6.5

1 0

[PATCH 19/31] Fix documentation.
by Roland Levillain 11 May '09

11 May '09

* doc/Doxyfile.in: add macro definitions. * doc/outputs/outputs.mk: update output reference files list. * headers.mk: update distributed files list. * apps/statues/trimesh/misc.hh, * doc/examples/tuto3/first_routine.cc, * mln/accu/compute.hh, * mln/accu/line.hh, * mln/core/image/graph_elt_window_if.hh, * mln/data/fill_with_image.hh, * mln/data/paste.hh, * mln/fun/x2x/composed.hh, * mln/geom/pmin_pmax.hh, * mln/geom/seeds2tiling.hh, * mln/io/dump/save.hh, * mln/io/txt/save.hh, * mln/labeling/compute.hh, * mln/labeling/pack.hh, * mln/labeling/relabel.hh, * mln/util/internal/id2element.hh, * mln/world/inter_pixel/dim2/is_dot.hh, * mln/world/inter_pixel/dim2/is_edge.hh, * mln/world/inter_pixel/dim2/is_pixel.hh, * mln/world/inter_pixel/dim2/is_row_odd.hh, * mln/world/inter_pixel/full2image.hh, * tests/accu/site_set/rectangularity.cc, * tests/make/region_adjacency_graph.cc, * mln/level/median.hh, * mln/level/stretch.hh, * mln/level/transform.hh, * mln/level/transform_inplace.hh, * mln/level/update.hh, * mln/make/dummy_p_edges.hh, * mln/make/dummy_p_vertices.hh, * mln/make/edge_image.hh, * mln/make/rag_and_labeled_wsl.hh, * mln/make/region_adjacency_graph.hh, * mln/make/relabelfun.hh, * mln/morpho/closing/area_on_vertices.hh, * mln/registration/icp.hh, * tests/morpho/Rd.cc: Fix documentation issues/missing documentation. --- milena/ChangeLog | 48 +++++++++++++++++++++++ milena/apps/statues/trimesh/misc.hh | 5 +- milena/doc/Doxyfile.in | 11 ++++- milena/doc/examples/tuto3/first_routine.cc | 2 +- milena/doc/outputs/outputs.mk | 1 + milena/headers.mk | 11 ++++- milena/mln/accu/compute.hh | 6 ++- milena/mln/accu/line.hh | 6 ++- milena/mln/core/image/graph_elt_window_if.hh | 2 +- milena/mln/data/fill_with_image.hh | 5 ++ milena/mln/data/paste.hh | 12 ++++++ milena/mln/fun/x2x/composed.hh | 4 +- milena/mln/geom/pmin_pmax.hh | 12 +++--- milena/mln/geom/seeds2tiling.hh | 26 ++++++++----- milena/mln/io/dump/save.hh | 8 ++++ milena/mln/io/txt/save.hh | 7 ++- milena/mln/labeling/pack.hh | 10 +++-- milena/mln/labeling/relabel.hh | 26 ++++++------ milena/mln/level/median.hh | 3 +- milena/mln/level/stretch.hh | 13 ++++++- milena/mln/level/transform.hh | 5 +- milena/mln/level/transform_inplace.hh | 7 ++- milena/mln/level/update.hh | 10 +++-- milena/mln/make/dummy_p_edges.hh | 2 +- milena/mln/make/dummy_p_vertices.hh | 2 +- milena/mln/make/edge_image.hh | 6 +- milena/mln/make/rag_and_labeled_wsl.hh | 4 +- milena/mln/make/region_adjacency_graph.hh | 13 +++--- milena/mln/make/relabelfun.hh | 11 ++++- milena/mln/morpho/closing/area_on_vertices.hh | 8 +++- milena/mln/registration/icp.hh | 14 ++++++- milena/mln/util/internal/id2element.hh | 2 +- milena/mln/world/inter_pixel/dim2/is_dot.hh | 2 +- milena/mln/world/inter_pixel/dim2/is_edge.hh | 2 +- milena/mln/world/inter_pixel/dim2/is_pixel.hh | 2 +- milena/mln/world/inter_pixel/dim2/is_row_odd.hh | 2 +- milena/mln/world/inter_pixel/full2image.hh | 8 ++-- milena/tests/accu/site_set/rectangularity.cc | 2 +- milena/tests/make/region_adjacency_graph.cc | 2 +- milena/tests/morpho/Rd.cc | 2 +- 40 files changed, 231 insertions(+), 93 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f9eea0c..2fda128 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,51 @@ +2009-05-11 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Fix documentation. + + * doc/Doxyfile.in: add macro definitions. + + * doc/outputs/outputs.mk: update output reference files list. + + * headers.mk: update distributed files list. + + * apps/statues/trimesh/misc.hh, + * doc/examples/tuto3/first_routine.cc, + * mln/accu/compute.hh, + * mln/accu/line.hh, + * mln/core/image/graph_elt_window_if.hh, + * mln/data/fill_with_image.hh, + * mln/data/paste.hh, + * mln/fun/x2x/composed.hh, + * mln/geom/pmin_pmax.hh, + * mln/geom/seeds2tiling.hh, + * mln/io/dump/save.hh, + * mln/io/txt/save.hh, + * mln/labeling/compute.hh, + * mln/labeling/pack.hh, + * mln/labeling/relabel.hh, + * mln/util/internal/id2element.hh, + * mln/world/inter_pixel/dim2/is_dot.hh, + * mln/world/inter_pixel/dim2/is_edge.hh, + * mln/world/inter_pixel/dim2/is_pixel.hh, + * mln/world/inter_pixel/dim2/is_row_odd.hh, + * mln/world/inter_pixel/full2image.hh, + * tests/accu/site_set/rectangularity.cc, + * tests/make/region_adjacency_graph.cc, + * mln/level/median.hh, + * mln/level/stretch.hh, + * mln/level/transform.hh, + * mln/level/transform_inplace.hh, + * mln/level/update.hh, + * mln/make/dummy_p_edges.hh, + * mln/make/dummy_p_vertices.hh, + * mln/make/edge_image.hh, + * mln/make/rag_and_labeled_wsl.hh, + * mln/make/region_adjacency_graph.hh, + * mln/make/relabelfun.hh, + * mln/morpho/closing/area_on_vertices.hh, + * mln/registration/icp.hh, + * tests/morpho/Rd.cc: Fix documentation issues/missing documentation. + 2009-05-07 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix missing updates about debug colorize. diff --git a/milena/apps/statues/trimesh/misc.hh b/milena/apps/statues/trimesh/misc.hh index a9f0fce..d72477d 100644 --- a/milena/apps/statues/trimesh/misc.hh +++ b/milena/apps/statues/trimesh/misc.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 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 @@ -474,7 +475,7 @@ namespace mln Jean Cousty. Artwork 3D Model Database Indexing and Classification. - \param[in] ima The surface (triangle mesh) on which the + \param[in] mesh The surface (triangle mesh) on which the curvature is to be computed. */ /* FIXME: We should restrict attached data to vertices in return value. */ diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index f088755..cedcbc1 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -215,7 +215,7 @@ PREDEFINED = "mlc_unqualif(T)=typename mln::metal::unqualif<T>::ret" "mln_enc(T)=typename T::enc" \ "mln_value(T)=typename T::value" \ "mln_qlf_value(T)=typename T::qlf_value" \ - "mln_pset(T)=typename T::pset" \ + "mln_domain(T)=typename T::domain_t" \ "mln_sum(T)=typename mln::value::props<T>::sum" \ "mln_vset(T)=typename T::vset" \ "mln_rvalue(T)=typename T::rvalue" \ @@ -250,7 +250,7 @@ PREDEFINED = "mlc_unqualif(T)=typename mln::metal::unqualif<T>::ret" "mln_enc_(T)=T::enc" \ "mln_value_(T)=T::value" \ "mln_qlf_value_(T)=T::qlf_value" \ - "mln_pset_(T)=T::pset" \ + "mln_domain_(T)=T::domain_t" \ "mln_sum_(T)=mln::value::props<T>::sum" \ "mln_vset_(T)=T::vset" \ "mln_rvalue_(T)=T::rvalue" \ @@ -286,7 +286,12 @@ PREDEFINED = "mlc_unqualif(T)=typename mln::metal::unqualif<T>::ret" "mln_gradient(I)=mln::value::stack_image< I::point::dim, mln::trait::ch_value< I, mln::value::props< typename I::value >::sum >::ret >" \ "mln_trait_value_sum_product(T, U)=typename mln::trait::value_< mln_trait_op_times(T,U) >::sum" \ "mln_sum_product(T, U)=typename mln::trait::value_< mln_trait_op_times(T,U) >::sum" \ - "mln_deduce(T, A1, A2)=typename T::A1::A2" + "mln_deduce(T, A1, A2)=typename T::A1::A2" \ + "mln_graph_element(T)=typename T::graph_element" \ + "mln_graph_element_(T)=T::graph_element" + "mln_fun_vv2v(F, L, R)=mln::fun::vv2v::F< mln_value(L), mln_value(R) >" \ + "mln_fun_vv2v_result(F, L, R)=typename mln_fun_vv2v(F, L, R)::result" \ + "mln_ch_fun_vv2v(F, L, R)=typename mln::trait::ch_value< L, typename mln_fun_vv2v(F, L, R)::result >::ret" diff --git a/milena/doc/examples/tuto3/first_routine.cc b/milena/doc/examples/tuto3/first_routine.cc index b4d3b58..5ed5919 100644 --- a/milena/doc/examples/tuto3/first_routine.cc +++ b/milena/doc/examples/tuto3/first_routine.cc @@ -1,4 +1,4 @@ -/// \file doc/examples/first_routine.cc +/// \file doc/examples/tuto3/first_routine.cc #include <mln/essential/2d.hh> #include <tests/data.hh> diff --git a/milena/doc/outputs/outputs.mk b/milena/doc/outputs/outputs.mk index ac10062..5b9de7c 100644 --- a/milena/doc/outputs/outputs.mk +++ b/milena/doc/outputs/outputs.mk @@ -21,6 +21,7 @@ outputs/box2d-bbox.txt \ outputs/graph-iter.txt \ outputs/graph-output-1.txt \ outputs/fill-call-1.txt \ +outputs/site_set_create.txt \ outputs/ima2d-rot.txt \ outputs/paste-call-1.txt \ outputs/fun-p2v-1.txt \ diff --git a/milena/headers.mk b/milena/headers.mk index 7d75826..34e4823 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -60,13 +60,15 @@ mln/literal/essential.hh \ mln/world/binary_2d/subsample.hh \ mln/world/binary_2d/projected_histo.hh \ mln/world/inter_pixel/neighb2d.hh \ -mln/world/inter_pixel/full.hh \ +mln/world/inter_pixel/image2full.hh \ mln/world/inter_pixel/display_edge.hh \ mln/world/inter_pixel/dim2/is_pixel.hh \ mln/world/inter_pixel/dim2/all.hh \ mln/world/inter_pixel/dim2/is_edge.hh \ +mln/world/inter_pixel/dim2/make_edge_image.hh \ mln/world/inter_pixel/dim2/is_dot.hh \ mln/world/inter_pixel/dim2/is_row_odd.hh \ +mln/world/inter_pixel/full2image.hh \ mln/registration/get_rtransf.hh \ mln/registration/internal/rms.hh \ mln/registration/get_rot.hh \ @@ -106,6 +108,7 @@ mln/util/timer.hh \ mln/util/yes.hh \ mln/util/line_graph.hh \ mln/util/ord.hh \ +mln/util/adjacency_matrix.hh \ mln/util/tree_fast_to_image.hh \ mln/util/tree.hh \ mln/util/couple.hh \ @@ -302,10 +305,13 @@ mln/fun/x2x/translation.hh \ mln/fun/x2x/rotation.hh \ mln/fun/x2x/essential.hh \ mln/fun/component/red.hh \ +mln/fun/component/comp_count.hh \ +mln/fun/component/scomp.hh \ mln/fun/component/green.hh \ mln/fun/component/comp.hh \ mln/fun/component/blue.hh \ mln/fun/component/rgb.hh \ +mln/fun/component/ithcomp.hh \ mln/fun/compose.hh \ mln/fun/meta/red.hh \ mln/fun/meta/hue.hh \ @@ -476,6 +482,7 @@ mln/accu/image/init.hh \ mln/accu/image/to_result.hh \ mln/accu/image/all.hh \ mln/accu/image/set_value.hh \ +mln/accu/image/untake.hh \ mln/accu/image/take.hh \ mln/accu/image/take_as_init.hh \ mln/accu/image/take_n_times.hh \ @@ -566,7 +573,6 @@ mln/trait/ch_function_value.hh \ mln/trait/ch_value.hh \ mln/trait/solve.hh \ mln/trait/solve_unary.hh \ -mln/trait/fun.hh \ mln/trait/op/postdec.hh \ mln/trait/op/mod.hh \ mln/trait/op/lor.hh \ @@ -594,6 +600,7 @@ mln/trait/op/uplus.hh \ mln/trait/op/essential.hh \ mln/trait/op/eq.hh \ mln/trait/concrete.hh \ +mln/trait/functions.hh \ mln/trait/windows.hh \ mln/trait/site_sets.hh \ mln/trait/image_from_grid.hh \ diff --git a/milena/mln/accu/compute.hh b/milena/mln/accu/compute.hh index a632fa8..f78c6ec 100644 --- a/milena/mln/accu/compute.hh +++ b/milena/mln/accu/compute.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -50,6 +50,7 @@ namespace mln /// Make an accumulator compute the pixels of the image \p input. /// /// \param[in] input The input image. + /// \param[in] a An accumulator. /// /// This routine runs: \n /// a.take(make::pix(input, p)); @@ -65,6 +66,7 @@ namespace mln /// Make an accumulator compute the pixels of the image \p input. /// /// \param[in] input The input image. + /// \param[in] a A meta accumulator. /// /// This routine runs: \n /// a.take(make::pix(input, p)); diff --git a/milena/mln/accu/line.hh b/milena/mln/accu/line.hh index b4f30a7..4fec281 100644 --- a/milena/mln/accu/line.hh +++ b/milena/mln/accu/line.hh @@ -51,8 +51,10 @@ namespace mln /*! Line an accumulator onto the pixel values of the image \p input. * * \param[in] input The input image. - * \param[in] a The accumulator. - * \return The accumulator result. + * \param[in] p_start The starting site of the line. + * \param[in] len The line length. + * \param[in] half_length The half length of the line. + * \param[in,out] output The resulting image. * * This routine runs: \n * tmp = \p a \n diff --git a/milena/mln/core/image/graph_elt_window_if.hh b/milena/mln/core/image/graph_elt_window_if.hh index dd4f6d9..c03ac79 100644 --- a/milena/mln/core/image/graph_elt_window_if.hh +++ b/milena/mln/core/image/graph_elt_window_if.hh @@ -125,7 +125,7 @@ namespace mln /// Default. Construct an invalid window. graph_elt_window_if(); - /// \param[in] graph_image A graph image. + /// \param[in] mask A graph image of bool. /// /// \sa vertex_image, edge_image. graph_elt_window_if(const Image& mask); diff --git a/milena/mln/data/fill_with_image.hh b/milena/mln/data/fill_with_image.hh index 3b79e72..df67089 100644 --- a/milena/mln/data/fill_with_image.hh +++ b/milena/mln/data/fill_with_image.hh @@ -95,6 +95,11 @@ namespace mln namespace generic { + /// Generic implementation. + /// + /// \param[in,out] ima The image to be filled. + /// \param[in] data The image. + // template <typename I, typename J> void fill_with_image(Image& ima_, const Image<J>& data_) { diff --git a/milena/mln/data/paste.hh b/milena/mln/data/paste.hh index ef3911d..740a2a1 100644 --- a/milena/mln/data/paste.hh +++ b/milena/mln/data/paste.hh @@ -72,6 +72,12 @@ namespace mln namespace internal { + /// Internal tests for data::paste. + /// + /// \param[in] input The input image providing pixels values. + /// \param[in,out] output The image in which values are + /// assigned. + // template <typename I, typename J> inline void paste_tests(const Image& input, Image<J>& output) @@ -97,6 +103,12 @@ namespace mln namespace generic { + /// Generic implementation of data::paste. + /// + /// \param[in] input The input image providing pixels values. + /// \param[in,out] output The image in which values are + /// assigned. + // template <typename I, typename J> inline void paste(const Image& input_, Image<J>& output_) diff --git a/milena/mln/fun/x2x/composed.hh b/milena/mln/fun/x2x/composed.hh index 0bc20b3..49d74f2 100644 --- a/milena/mln/fun/x2x/composed.hh +++ b/milena/mln/fun/x2x/composed.hh @@ -153,9 +153,9 @@ namespace mln mlc_is(T2, Bijection_x2x<T2>)::value && mlc_is(T1, Bijection_x2x<T1>)::value>(f, g) {} -}; + }; -} // end of namespace mln::fun::x2x + } // end of namespace mln::fun::x2x } // end of namespace mln::fun diff --git a/milena/mln/geom/pmin_pmax.hh b/milena/mln/geom/pmin_pmax.hh index 3f28fe9..12e3ea7 100644 --- a/milena/mln/geom/pmin_pmax.hh +++ b/milena/mln/geom/pmin_pmax.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2009 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 +29,10 @@ #ifndef MLN_GEOM_PMIN_PMAX_HH # define MLN_GEOM_PMIN_PMAX_HH -/*! \file mln/geom/pmin_pmax.hh - * - * \brief Several routines to compute the minimum point and/or maximum - * point. - */ +/// \file mln/geom/pmin_pmax.hh +/// +/// Several routines to compute the minimum point and/or maximum +/// point. # include <utility> diff --git a/milena/mln/geom/seeds2tiling.hh b/milena/mln/geom/seeds2tiling.hh index 0dc8eef..85fb3ce 100644 --- a/milena/mln/geom/seeds2tiling.hh +++ b/milena/mln/geom/seeds2tiling.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -29,10 +29,9 @@ #ifndef MLN_GEOM_SEEDS2TILING_HH # define MLN_GEOM_SEEDS2TILING_HH -/*! \file mln/geom/seeds2tiling.hh - * - * \brief Convert a binary image with seeds into a labeled image. - */ +/// \file mln/geom/seeds2tiling.hh +/// +/// Convert a binary image with seeds into a labeled image. # include <map> @@ -46,27 +45,34 @@ namespace mln { + namespace geom { - /// \brief Take a labeled image \p ima_ with seeds and extend them + /// Take a labeled image \p ima_ with seeds and extend them /// until creating tiles. /// /// \param[in,out] ima_ The labeled image with seed. /// \param[in] nbh The neighborhood to use on this algorithm. /// - /// \pre \p ima_ has to be initialized. + /// \return A tiled image. /// - /// \{ + /// \pre \p ima_ has to be initialized. + // template <typename I, typename N> I seeds2tiling (Image& ima_, const Neighborhood<N>& nbh); - /// \} + # ifndef MLN_INCLUDE_ONLY namespace impl { + /// Generic implementation of geom::seed2tiling. + /// + /// \param[in,out] ima_ The labeled image with seed. + /// \param[in] nbh The neighborhood to use on this algorithm. + // template <typename I, typename N> inline I diff --git a/milena/mln/io/dump/save.hh b/milena/mln/io/dump/save.hh index 41d4571..5056dc6 100644 --- a/milena/mln/io/dump/save.hh +++ b/milena/mln/io/dump/save.hh @@ -31,6 +31,7 @@ /// \file mln/io/dump/save.hh /// /// Save a Milena image by dumping its data to a file. +/// /// \todo handle endianness. # include <iostream> @@ -42,6 +43,7 @@ # include <mln/data/memcpy_.hh> # include <mln/trait/value_.hh> + namespace mln { @@ -55,12 +57,15 @@ namespace mln /// /// \param[in] ima_ The image to save. /// \param[in] filename the destination. + // template <typename I> void save(const Image& ima_, const std::string& filename); + # ifndef MLN_INCLUDE_ONLY + namespace internal { @@ -121,6 +126,9 @@ namespace mln } // end of namespace mln::io::dump::internal + + // Facade + template <typename I> void save(const Image& ima_, const std::string& filename) { diff --git a/milena/mln/io/txt/save.hh b/milena/mln/io/txt/save.hh index 4cc4e39..db0d423 100644 --- a/milena/mln/io/txt/save.hh +++ b/milena/mln/io/txt/save.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory // (LRDE) // // This file is part of the Olena Library. This library is free @@ -31,7 +31,7 @@ /// \file mln/io/txt/save.hh /// -/// \brief Save an image as txt file. +/// Save an image as txt file. # include <iostream> # include <fstream> @@ -52,8 +52,9 @@ namespace mln /// Save an image as txt file. /// - /// \param[in] ima_ The image to save. Must be an image of char. + /// \param[in] ima The image to save. Must be an image of char. /// \param[in] filename the destination. + // void save(const image2d<char>& ima, const std::string& filename); diff --git a/milena/mln/labeling/pack.hh b/milena/mln/labeling/pack.hh index 5235cd3..29ef2c2 100644 --- a/milena/mln/labeling/pack.hh +++ b/milena/mln/labeling/pack.hh @@ -52,8 +52,9 @@ namespace mln { /// Relabel a labeled image in order to have a contiguous labeling. - /// \input[in] label The labeled image. - /// \input[out] new_nlabels The number of labels after relabeling. + /// + /// \param[in] label The labeled image. + /// \param[out] new_nlabels The number of labels after relabeling. /// /// \return The relabeled image. // @@ -65,8 +66,9 @@ namespace mln /// Relabel inplace a labeled image in order to have a contiguous /// labeling. - /// \input[in] label The labeled image. - /// \input[out] new_nlabels The number of labels after relabeling. + /// + /// \param[in] label The labeled image. + /// \param[out] new_nlabels The number of labels after relabeling. // template <typename I> void diff --git a/milena/mln/labeling/relabel.hh b/milena/mln/labeling/relabel.hh index a775bfa..60b150f 100644 --- a/milena/mln/labeling/relabel.hh +++ b/milena/mln/labeling/relabel.hh @@ -52,10 +52,10 @@ namespace mln { /// Remove components and relabel a labeled image. - /// \input[in] label the labeled image. - /// \input[in] nlabels the number of labels in \p label. - /// \input[out] new_nlabels the number of labels after relabeling. - /// \input[in] f function returning whether a label must be replaced + /// \param[in] label the labeled image. + /// \param[in] nlabels the number of labels in \p label. + /// \param[out] new_nlabels the number of labels after relabeling. + /// \param[in] fv2b function returning whether a label must be replaced /// by the background. /// /// \return the relabeled image. @@ -69,9 +69,9 @@ namespace mln /// Remove components and relabel a labeled image. - /// \input[in] label the labeled image. - /// \input[in] nlabels the number of labels in \p label. - /// \input[in] f function returning the new component id for each pixel + /// \param[in] label the labeled image. + /// \param[in] nlabels the number of labels in \p label. + /// \param[in] fv2v function returning the new component id for each pixel /// value. /// /// \return the relabeled image. @@ -84,9 +84,9 @@ namespace mln /// Remove components and relabel a labeled image inplace. - /// \input[in, out] label the labeled image. - /// \input[in, out] nlabels the number of labels in \p label. - /// \input[in] f function returning whether a label must be replaced + /// \param[in, out] label the labeled image. + /// \param[in, out] nlabels the number of labels in \p label. + /// \param[in] fv2b function returning whether a label must be replaced /// by the background. // template <typename I, typename F> @@ -97,9 +97,9 @@ namespace mln /// Remove components and relabel a labeled image inplace. - /// \input[in, out] label the labeled image. - /// \input[in, out] nlabels the number of labels in \p label. - /// \input[in] f function returning the new component id for each + /// \param[in, out] label the labeled image. + /// \param[in, out] nlabels the number of labels in \p label. + /// \param[in] fv2v function returning the new component id for each /// pixel value. // template <typename I, typename F> diff --git a/milena/mln/level/median.hh b/milena/mln/level/median.hh index 4a5c3cd..f62c7e5 100644 --- a/milena/mln/level/median.hh +++ b/milena/mln/level/median.hh @@ -59,9 +59,8 @@ namespace mln * * \param[in] input The image to be filtered. * \param[in] win The window. - * \param[out] output The output image. * - * \pre \p input and \p output have to be initialized. + * \pre \p input have to be initialized. */ template <typename I, typename W> mln_concrete(I) diff --git a/milena/mln/level/stretch.hh b/milena/mln/level/stretch.hh index 63bac49..f10f4e3 100644 --- a/milena/mln/level/stretch.hh +++ b/milena/mln/level/stretch.hh @@ -57,7 +57,8 @@ namespace mln * * \param[in] v A value to set the output value type. * \param[in] input The input image. - * \param[out] output The result image. + * + * \return A stretch image with values of the same type as \p v. * * \pre input.is_valid */ @@ -71,6 +72,13 @@ namespace mln namespace impl { + /// Generic implementation of level::stretch. + /// + /// \param[in] v A value to set the output value type. + /// \param[in] input The input image. + /// + /// \return A stretch image with values of the same type as \p v. + // template <typename V, typename I> inline mln_ch_value(I, V) @@ -112,6 +120,9 @@ namespace mln } // end of namespace mln::level::impl + + // Facade + template <typename V, typename I> inline mln_ch_value(I, V) diff --git a/milena/mln/level/transform.hh b/milena/mln/level/transform.hh index 07ed377..f61fbc9 100644 --- a/milena/mln/level/transform.hh +++ b/milena/mln/level/transform.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -130,6 +130,7 @@ namespace mln namespace generic { + /// Generic implementation of level::transform. template <typename I, typename F> mln_ch_value(I, mln_result(F)) transform(const Image& input_, const Function_v2v<F>& f_) diff --git a/milena/mln/level/transform_inplace.hh b/milena/mln/level/transform_inplace.hh index ca85b28..dc632e2 100644 --- a/milena/mln/level/transform_inplace.hh +++ b/milena/mln/level/transform_inplace.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 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 @@ -8,7 +9,7 @@ // 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. +// 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 @@ -64,7 +65,7 @@ namespace mln /*! Transform inplace the image \p ima with the image \p aux through a function \p f. * - * \param[in] ima1 The image to be transformed. + * \param[in] ima The image to be transformed. * \param[in] aux The auxiliary image. * \param[in] f The function. * diff --git a/milena/mln/level/update.hh b/milena/mln/level/update.hh index 10632a5..306d1ad 100644 --- a/milena/mln/level/update.hh +++ b/milena/mln/level/update.hh @@ -90,6 +90,7 @@ namespace mln namespace generic { + /// Generic implementation of level::update. template <typename A, typename I> inline mln_result(A) @@ -112,21 +113,22 @@ namespace mln } // end of namespace mln::level::impl::generic + /// Fastest implementation of level::update. template <typename A, typename I> inline mln_result(A) update_fastest(Accumulator<A>& a_, const Image& input_) { trace::entering("level::impl::update_fastest"); - + A& a = exact(a_); const I& input = exact(input_); level::internal::update_tests(a, input); - + mln_pixter(const I) pxl(input); for_all(pxl) a.take(pxl.val()); - + trace::exiting("level::impl::update_fastest"); return a.to_result(); } @@ -134,7 +136,7 @@ namespace mln } // end of namespace mln::level::impl - + // Dispatch. diff --git a/milena/mln/make/dummy_p_edges.hh b/milena/mln/make/dummy_p_edges.hh index 7c17aec..aaf17f8 100644 --- a/milena/mln/make/dummy_p_edges.hh +++ b/milena/mln/make/dummy_p_edges.hh @@ -62,7 +62,7 @@ namespace mln /// Create a p_edges which associate a graph element to a constant site. /// \c 0 (int) is used as dummy site. /// - /// \param[in] g_ A graph. + /// \param[in] g A graph. /// /// \return A p_edges. // diff --git a/milena/mln/make/dummy_p_vertices.hh b/milena/mln/make/dummy_p_vertices.hh index c9c643d..462473a 100644 --- a/milena/mln/make/dummy_p_vertices.hh +++ b/milena/mln/make/dummy_p_vertices.hh @@ -62,7 +62,7 @@ namespace mln /// Create a p_vertices which associate a graph element to a constant site. /// \c 0 (int) is used as dummy site. /// - /// \param[in] g_ A graph. + /// \param[in] g A graph. /// /// \return A p_vertices. // diff --git a/milena/mln/make/edge_image.hh b/milena/mln/make/edge_image.hh index bd03162..0c2deff 100644 --- a/milena/mln/make/edge_image.hh +++ b/milena/mln/make/edge_image.hh @@ -60,7 +60,7 @@ namespace mln /// Construct an edge image. /// - /// \param[in] g A graph + /// \param[in] g_ A graph /// \param[in] fp A function mapping edge ids to sites. /// \param[in] fv A function mapping edge ids to values. /// @@ -78,7 +78,7 @@ namespace mln /// /// \param[in] v_ima_ A vertex image. /// \param[in] pe A p_edges mapping graph element to sites . - /// \param[in] fv A function mapping two vertex ids to a value. + /// \param[in] fv_ A function mapping two vertex ids to a value. /// The result is associated to the corresponding edge. /// /// \return an edge image. @@ -94,7 +94,7 @@ namespace mln /// Construct an edge image. /// /// \param[in] v_ima_ A vertex image. - /// \param[in] fv A function mapping two vertex ids to a value. + /// \param[in] fv_ A function mapping two vertex ids to a value. /// The result is associated to the corresponding edge. /// /// \return an edge image without localization information mapped to diff --git a/milena/mln/make/rag_and_labeled_wsl.hh b/milena/mln/make/rag_and_labeled_wsl.hh index 60f2824..c170d18 100644 --- a/milena/mln/make/rag_and_labeled_wsl.hh +++ b/milena/mln/make/rag_and_labeled_wsl.hh @@ -57,8 +57,8 @@ namespace mln /// Create a region adjacency graph and a label image of the watershed line /// from a watershed image. /// - /// \param[in] wshd Watershed image. - /// \param[in] nbh Neighborhood + /// \param[in] wshd_ Watershed image. + /// \param[in] nbh_ Neighborhood /// \param[in] nbasins Number of influence zone in \p wshd. /// /// \return A couple. First element is the graph, second element is an diff --git a/milena/mln/make/region_adjacency_graph.hh b/milena/mln/make/region_adjacency_graph.hh index b930367..ba2e177 100644 --- a/milena/mln/make/region_adjacency_graph.hh +++ b/milena/mln/make/region_adjacency_graph.hh @@ -53,7 +53,8 @@ namespace mln /// Create a region adjacency graph from a watershed image. /// - /// \param[in] wshd watershed image. + /// \param[in] wshd_ watershed image. + /// \param[in] nbh A neighborhood. /// \param[in] nbasins number of influence zone in \p wshd. /// /// \return util::graph Graph based on the adjacency of the influence zones. @@ -61,7 +62,7 @@ namespace mln util::graph region_adjacency_graph(const Image& wshd_, const Neighborhood<N>& nbh, - mln_value(I) nbasins); + const mln_value(I)& nbasins); @@ -75,7 +76,7 @@ namespace mln void region_adjacency_graph_tests(const Image& wshd, const Neighborhood<N>& nbh, - mln_value(I)) + const mln_value(I)&) { mln_precondition(exact(wshd).is_valid()); mln_precondition(exact(nbh).is_valid()); @@ -96,7 +97,7 @@ namespace mln util::graph region_adjacency_graph(const Image& wshd_, const Neighborhood<N>& nbh_, - mln_value(I) nbasins) + const mln_value(I)& nbasins) { trace::entering("make::impl::generic::region_adjacency_graph"); @@ -163,7 +164,7 @@ namespace mln util::graph region_adjacency_graph_dispatch(const Image& wshd, const Neighborhood<N>& nbh, - mln_value(I) nbasins) + const mln_value(I)& nbasins) { return make::impl::generic::region_adjacency_graph(wshd, nbh, nbasins); } @@ -179,7 +180,7 @@ namespace mln util::graph region_adjacency_graph(const Image& wshd, const Neighborhood<N>& nbh, - mln_value(I) nbasins) + const mln_value(I)& nbasins) { trace::entering("make::region_adjacency_graph"); diff --git a/milena/mln/make/relabelfun.hh b/milena/mln/make/relabelfun.hh index 19b072d..11fe1fe 100644 --- a/milena/mln/make/relabelfun.hh +++ b/milena/mln/make/relabelfun.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 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 @@ -45,7 +46,9 @@ namespace mln /// Create a i2v function from a v2b function. /// This function can be used to relabel a labeled image. /// - /// \param[in] f a v2b function. + /// \param[in] fv2b A v2b function. + /// \param[in] nlabels The number of labels. + /// \param[in] new_nlabels The number of labels after relabeling. /// /// \return a i2v function. /// @@ -59,7 +62,9 @@ namespace mln /// Create a i2v function from a v2v function. /// This function can be used to relabel a labeled image. /// - /// \param[in] f a v2v function. + /// \param[in] fv2v A v2v function. + /// \param[in] nlabels The number of labels. + /// \param[in] new_nlabels The number of labels after relabeling. /// /// \return a i2v function. /// diff --git a/milena/mln/morpho/closing/area_on_vertices.hh b/milena/mln/morpho/closing/area_on_vertices.hh index 099e473..46c6774 100644 --- a/milena/mln/morpho/closing/area_on_vertices.hh +++ b/milena/mln/morpho/closing/area_on_vertices.hh @@ -34,7 +34,6 @@ /// Morphological area closing on a line graph image computing /// the area in terms of adjacent vertices. -# include <mln/pw/image.hh> # include <mln/core/image/edge_image.hh> # include <mln/morpho/closing/algebraic.hh> # include <mln/morpho/attribute/count_adjacent_vertices.hh> @@ -51,6 +50,13 @@ namespace mln /// Morphological area closing on a mln::line_graph_image computing /// the area in terms of adjacent vertices. + /// + /// \param[in] input An edge image. + /// \param[in] nbh A graph neighborhood. + /// \param[in] lambda Closing parameter. + /// + /// \return An edge image. + // template <typename P, typename V, typename G, typename N> edge_image<P,V,G> area_on_vertices(const edge_image<P,V,G>& input, diff --git a/milena/mln/registration/icp.hh b/milena/mln/registration/icp.hh index 540efba..a2bee09 100644 --- a/milena/mln/registration/icp.hh +++ b/milena/mln/registration/icp.hh @@ -90,11 +90,13 @@ namespace mln /*! Register point in \p c using a function of closest points * \p closest_point. + * This overload allows to specify initial transformations. * * \param[in] P_ The cloud of points. * \param[in] X the reference surface. * \param[in] closest_point The function of closest points. - * \param[out] qk The rigid transformation obtained. + * \param[in] initial_rot An initial rotation. + * \param[in] initial_translation An initial translation. * * \return the rigid transformation which may be use later to create * a registered image. @@ -118,6 +120,16 @@ namespace mln const mln_vec(P)& initial_translation); + /*! Register point in \p c using a function of closest points + * \p closest_point. + * + * \param[in] P_ The cloud of points. + * \param[in] X the reference surface. + * \param[in] closest_point The function of closest points. + * + * \return the rigid transformation which may be use later to create + * a registered image. + */ template <typename P, typename F> composed< translation<P::dim,float>,rotation<P::dim,float> > icp(const p_array& P_, diff --git a/milena/mln/util/internal/id2element.hh b/milena/mln/util/internal/id2element.hh index 48550da..34aac26 100644 --- a/milena/mln/util/internal/id2element.hh +++ b/milena/mln/util/internal/id2element.hh @@ -29,7 +29,7 @@ #ifndef MLN_UTIL_INTERNAL_ID2VERTEX_HH # define MLN_UTIL_INTERNAL_ID2VERTEX_HH -/// \file mln/util/id2element.hh +/// \file mln/util/internal/id2element.hh /// /// Function constructing a element from an id. diff --git a/milena/mln/world/inter_pixel/dim2/is_dot.hh b/milena/mln/world/inter_pixel/dim2/is_dot.hh index da41552..74c7732 100644 --- a/milena/mln/world/inter_pixel/dim2/is_dot.hh +++ b/milena/mln/world/inter_pixel/dim2/is_dot.hh @@ -28,7 +28,7 @@ #ifndef MLN_WORLD_INTER_PIXEL_DIM2_IS_DOT_HH # define MLN_WORLD_INTER_PIXEL_DIM2_IS_DOT_HH -/// \file mln/world/inter_pixel/dim2d/is_dot.hh +/// \file mln/world/inter_pixel/dim2/is_dot.hh /// /// FIXME: insert comment. diff --git a/milena/mln/world/inter_pixel/dim2/is_edge.hh b/milena/mln/world/inter_pixel/dim2/is_edge.hh index c5ef485..383bb85 100644 --- a/milena/mln/world/inter_pixel/dim2/is_edge.hh +++ b/milena/mln/world/inter_pixel/dim2/is_edge.hh @@ -28,7 +28,7 @@ #ifndef MLN_WORLD_INTER_PIXEL_DIM2_IS_EDGE_HH # define MLN_WORLD_INTER_PIXEL_DIM2_IS_EDGE_HH -/// \file mln/world/inter_pixel/dim2d/is_edge.hh +/// \file mln/world/inter_pixel/dim2/is_edge.hh /// /// FIXME: insert comment. diff --git a/milena/mln/world/inter_pixel/dim2/is_pixel.hh b/milena/mln/world/inter_pixel/dim2/is_pixel.hh index 1aa866d..c9cc4e9 100644 --- a/milena/mln/world/inter_pixel/dim2/is_pixel.hh +++ b/milena/mln/world/inter_pixel/dim2/is_pixel.hh @@ -28,7 +28,7 @@ #ifndef MLN_WORLD_INTER_PIXEL_DIM2_IS_PIXEL_HH # define MLN_WORLD_INTER_PIXEL_DIM2_IS_PIXEL_HH -/// \file mln/world/inter_pixel/dim2d/is_pixel.hh +/// \file mln/world/inter_pixel/dim2/is_pixel.hh /// /// FIXME: insert comment. diff --git a/milena/mln/world/inter_pixel/dim2/is_row_odd.hh b/milena/mln/world/inter_pixel/dim2/is_row_odd.hh index 24cdb29..6bf4905 100644 --- a/milena/mln/world/inter_pixel/dim2/is_row_odd.hh +++ b/milena/mln/world/inter_pixel/dim2/is_row_odd.hh @@ -28,7 +28,7 @@ #ifndef MLN_WORLD_INTER_PIXEL_DIM2_IS_ROW_ODD_HH # define MLN_WORLD_INTER_PIXEL_DIM2_IS_ROW_ODD_HH -/// \file mln/world/inter_pixel/dim2d/is_row_odd.hh +/// \file mln/world/inter_pixel/dim2/is_row_odd.hh /// /// FIXME: insert comment. diff --git a/milena/mln/world/inter_pixel/full2image.hh b/milena/mln/world/inter_pixel/full2image.hh index c116964..50f6b28 100644 --- a/milena/mln/world/inter_pixel/full2image.hh +++ b/milena/mln/world/inter_pixel/full2image.hh @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_WORLD_INTER_PIXEL_FULL_HH -# define MLN_WORLD_INTER_PIXEL_FULL_HH +#ifndef MLN_WORLD_INTER_PIXEL_FULL2IMAGE_HH +# define MLN_WORLD_INTER_PIXEL_FULL2IMAGE_HH -/// \file mln/world/inter_pixel/full.hh +/// \file mln/world/inter_pixel/full2image.hh /// /// Convert an inter-pixel image to a classical image. /// @@ -92,4 +92,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_WORLD_INTER_PIXEL_FULL +#endif // ! MLN_WORLD_INTER_PIXEL_FULL2IMAGE diff --git a/milena/tests/accu/site_set/rectangularity.cc b/milena/tests/accu/site_set/rectangularity.cc index ee6b6d1..9efef9b 100644 --- a/milena/tests/accu/site_set/rectangularity.cc +++ b/milena/tests/accu/site_set/rectangularity.cc @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/accu/site_set/rectangularity.hh +/// \file tests/accu/site_set/rectangularity.cc /// /// Tests on mln::accu::site_set::rectangularity. diff --git a/milena/tests/make/region_adjacency_graph.cc b/milena/tests/make/region_adjacency_graph.cc index 7f8cb12..641626b 100644 --- a/milena/tests/make/region_adjacency_graph.cc +++ b/milena/tests/make/region_adjacency_graph.cc @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/make/graph.cc +/// \file tests/make/region_adjacency_graph.cc /// /// Tests on mln::make::region_adjacency_graph. diff --git a/milena/tests/morpho/Rd.cc b/milena/tests/morpho/Rd.cc index 48bc5bb..8b4ec21 100644 --- a/milena/tests/morpho/Rd.cc +++ b/milena/tests/morpho/Rd.cc @@ -26,7 +26,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/morpho/combined.cc +/// \file tests/morpho/rd.cc /// /// Test on mln::morpho::Rd. -- 1.6.1.2

1 0

r3779: Make clean in tree files and procedures
by Edwin Carlinet 10 May '09

10 May '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-05-10 Edwin Carlinet <carlinet(a)lrde.epita.fr> Make clean in tree files and procedures. * edwin/mln/morpho/tree/filter.hh: group strategies for non-increasing attribute filtering. * edwin/attributes/bbox.hh, * edwin/attributes/occupation.hh, * edwin/attributes, * edwin/mln/morpho/attribute, * edwin/mln/morpho/tree/components.hh, * edwin/mln/morpho/tree/propagate.hh, * edwin/mln/morpho/tree/propagate_if.hh, * edwin/mln/morpho/tree/propagate_node.hh, * edwin/mln/morpho/tree, * edwin/mln/morpho, * edwin/mln, * edwin/rush/exo2/test.cc, * edwin/tests, * edwin/tree/components.hh, * edwin/tree/propagate.hh, * edwin/tree/propagate_if.hh, * edwin/tree/propagate_node.hh, move all tree materials in edwin/mln/morpho/tree. --- mln/morpho/attribute/bbox.hh | 203 ++++++++++++++++++++++ mln/morpho/attribute/occupation.hh | 252 ++++++++++++++++++++++++++++ mln/morpho/tree/components.hh | 319 ++++++++++++++++++++++++++++++++++++ mln/morpho/tree/filter.hh | 205 +++++++++++++++++++++++ mln/morpho/tree/propagate.hh | 124 ++++++++++++++ mln/morpho/tree/propagate_if.hh | 327 +++++++++++++++++++++++++++++++++++++ mln/morpho/tree/propagate_node.hh | 209 +++++++++++++++++++++++ rush/exo2/test.cc | 1 8 files changed, 1640 insertions(+) Index: trunk/milena/sandbox/edwin/tree/propagate.hh (deleted) =================================================================== Index: trunk/milena/sandbox/edwin/tree/components.hh (deleted) =================================================================== Index: trunk/milena/sandbox/edwin/tree/propagate_node.hh (deleted) =================================================================== Index: trunk/milena/sandbox/edwin/tree/propagate_if.hh (deleted) =================================================================== Index: trunk/milena/sandbox/edwin/rush/exo2/test.cc =================================================================== --- trunk/milena/sandbox/edwin/rush/exo2/test.cc (revision 3778) +++ trunk/milena/sandbox/edwin/rush/exo2/test.cc (revision 3779) @@ -18,6 +18,7 @@ #include <mln/fun/p2v/ternary.hh> #include <mln/pw/all.hh> + namespace mln { // Sharpness Attribute -> Height Attribute Index: trunk/milena/sandbox/edwin/mln/morpho/tree/propagate.hh =================================================================== --- trunk/milena/sandbox/edwin/mln/morpho/tree/propagate.hh (revision 0) +++ trunk/milena/sandbox/edwin/mln/morpho/tree/propagate.hh (revision 3779) @@ -0,0 +1,124 @@ +// Copyright (C) 2008, 2009 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_MORPHO_TREE_PROPAGATE_HH_ +# define MLN_MORPHO_TREE_PROPAGATE_HH_ + +/// \file mln/morpho/tree/propagate.hh +/// +/// Functions to propagate a node value in the tree. + +# include <mln/morpho/tree/data.hh> +# include <mln/morpho/tree/propagate_node.hh> + +namespace mln { + namespace morpho { + namespace tree { + + + /// Propagate the representative point's value to + /// non-representative node points. + template <typename T, typename A> + void + propagate_representative(const T& t, Image<A>& a_) + { + A a = exact(a_); + mln_up_site_piter(T) p(t); + for_all(p) + if (! t.is_a_node(p)) + { + mln_assertion(t.is_a_node(t.parent(p))); + a(p) = a(t.parent(p)); + } + } + + /** + ** For each component in the list \p component_list, it + ** propagates the representant value to the remaining nodes of the + ** component. The value of a node that doesn't belong to a component is + ** set to \p null. + ** + ** @param attr_image The attribute image. + ** @param tree The component tree used to propagate value. + ** @param component_list The list of components. + ** @param null The nodes that don't belong to components will be set + ** with this value. + ** + ** @return The resulting component image. + */ + template <typename A, typename T> + inline + A propagate_components(const Image<A>& attr_image, + const T& tree, + const p_array< mln_psite(A) >& component_list, + const mln_value(A)& null) + { + const A& a = exact(attr_image); + A out; + initialize(out, a); + mln::data::fill(out, null); + + mln_piter(p_array<mln_psite(A)>) p(component_list); + for_all(p) + { + out(p) = a(p); + morpho::tree::propagate_node_to_descendants(p, tree, out, a(p)); + } + morpho::tree::propagate_representative(tree, out); + return out; + } + + + template <typename T, typename V> + inline + mln_ch_value(typename T::function, V) + set_value_to_components(const T& tree, + const p_array< mln_psite(T) >& component_list, + const V& value, + const V& null) + { + mln_ch_value(typename T::function, V) out; + initialize(out, tree.f()); + mln::data::fill(out, null); + + mln_piter(p_array< mln_psite(T) >) p(component_list); + for_all(p) + { + out(p) = value; + morpho::tree::propagate_node_to_descendants(p, tree, out); + } + morpho::tree::propagate_representative(tree, out); + return out; + } + + } // end of namespace mln::morpho::tree + } // end of namespace mln::morpho +} // end of namespace mln + +#endif /* !MLN_MORPHO_TREE_PROPAGATE_HH_ */ + + Property changes on: trunk/milena/sandbox/edwin/mln/morpho/tree/propagate.hh ___________________________________________________________________ Added: svn:mergeinfo Index: trunk/milena/sandbox/edwin/mln/morpho/tree/components.hh =================================================================== --- trunk/milena/sandbox/edwin/mln/morpho/tree/components.hh (revision 0) +++ trunk/milena/sandbox/edwin/mln/morpho/tree/components.hh (revision 3779) @@ -0,0 +1,319 @@ +// Copyright (C) 2007, 2008, 2009 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_MORPHO_TREE_COMPONENTS_HH_ +# define MLN_MORPHO_TREE_COMPONENTS_HH_ + +# include <mln/core/concept/image.hh> +# include <mln/core/concept/function.hh> +# include <mln/data/fill.hh> + +# include <mln/morpho/tree/data.hh> +# include "propagate_node.hh" + +# include <mln/trace/entering.hh> +# include <mln/trace/exiting.hh> + + +/** +** \file mln/morpho/tree/components.hh +** +** Routines that offers different way of retrieving tree components. +** Tree components are nodes maximising the attribute. +*/ + + +namespace mln { + namespace morpho { + namespace tree { + + /** + ** Retrieve components from the tree until all leaves belong to + ** components. + ** + ** @param tree Component tree. + ** @param attr_image Attribute image. + ** + ** @return Array of components. + */ + template <typename T, typename A> + p_array< mln_psite(A) > + get_components(const T& tree, const Image<A>& attr_image); + + /** + ** Retrieve the \p n most important components from the tree. n + ** should be lesser than the maximum number of components. If + ** not, the functions stops when there's no more components. + ** + ** @param tree Component tree. + ** @param attr_image Attribute image. + ** @param n Number of components to get. + ** + ** @return Array of components. + */ + template <typename T, typename A> + p_array< mln_psite(A) > + get_components(const T& tree, const Image<A>& attr_image, unsigned n); + + /** + ** Retrieve the most important components that check + ** predicate \p pred. + ** + ** @param tree Component tree. + ** @param attr_image Attribute image. + ** @param pred Predicate that components must check. + ** + ** @return Array of components. + */ + template <typename T, typename A, typename P2B> + p_array< mln_psite(A) > + get_components(const T& tree, const Image<A>& attr_image, const Function_p2b<P2B>& pred); + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + template <typename P, typename I> + struct desc_sort + { + bool operator()(const P& p1, const P& p2) const + { + return ima(p1) > ima(p2); + } + const I& ima; + + desc_sort(const I& ima) : ima(ima) {} + }; + + template <typename P, typename I> + inline + void + sort(p_array& arr, const I& ima_) + { + mlc_converts_to(P, mln_psite(I))::check(); + + const I& ima = exact(ima_); + std::vector& v = arr.hook_std_vector_(); + std::sort(v.begin(), v.end(), desc_sort<P,I>(ima)); + } + + template <typename A> + inline + bool + get_max(const p_array< mln_psite(A) >& arr, const A& activity, unsigned& pos) + { + while (pos < arr.nsites() && !activity(arr[pos])) + ++pos; + return (pos < arr.nsites()); + } + + + ////////////////////////// + // Predifined predicate // + ////////////////////////// + + /// Predicate used to gets components until tree leaves last. + template <typename T> + class pred_tree_leaves_last + { + public: + pred_tree_leaves_last(const T& tree) : + n_ (tree.leaves().nsites()) + { + } + + template <typename P> + bool operator() (const P& p, unsigned n, unsigned* nb_leaves) const + { + (void)p; + (void)n; + mln_assertion(nb_leaves != 0); + + return (*nb_leaves < n_); + } + + + private: + unsigned n_; + }; + + /// Predicate used to get n components. + class pred_n_components + { + public: + pred_n_components(unsigned n) : + n_(n) + { + } + + template <typename P> + bool operator() (const P& p, unsigned n, unsigned* nb_leaves) const + { + (void)p; + (void)nb_leaves; + + return (n < n_); + } + + + private: + unsigned n_; + }; + + /// Predicate used to get components that check a p2b function predicate. + template <typename P2B> + class pred_p2b + { + public: + pred_p2b(const P2B& f) : + f_ (f) + { + } + + template <typename P> + bool operator() (const P& p, unsigned n, unsigned* nb_leaves) const + { + (void)n; + (void)nb_leaves; + + return (f_(p)); + } + + + private: + const P2B& f_; + }; + + + + + template <typename T, typename A, class P> + p_array< mln_psite(A) > + get_components(const T& tree, const A& a, const P& pred, bool uses_leaves = 0) + { + + mln_psite(A) p; + p_array< mln_psite(A) > components; + mln_ch_value(A, bool) activity; + p_array< mln_psite(A) > max_arr = tree.nodes(); + unsigned arr_pos = 0; //position in max_array + unsigned n = 0; + unsigned* nb_leaves = uses_leaves ? new unsigned(0) : 0; + + initialize(activity, a); + mln::data::fill(activity, true); + internal::sort(max_arr, a); + + do + { + if (!internal::get_max(max_arr, activity, arr_pos)) + break; + p = max_arr[arr_pos]; + if (a(p) == 0) + break; + std::cout << p << " " << a(p) << std::endl; + components.insert(p); + morpho::tree::propagate_node_to_descendants(p, tree, activity, false, nb_leaves); + morpho::tree::propagate_node_to_ancestors(p, tree, activity, false); + activity(p) = false; + n++; + mln_assertion(nb_leaves == 0 || *nb_leaves < mln_max(unsigned)); + } + while (pred(p, n, nb_leaves)); + + if (uses_leaves) + delete nb_leaves; + return components; + } + + } // end of namespace mln::morpho::tree::internal + + + template <typename T, typename A> + p_array< mln_psite(A) > + get_components(const T& tree, const Image<A>& attr_image) + { + trace::entering("mln::morpho::tree::get_components"); + + const A& a = exact(attr_image); + mln_precondition(tree.f().domain() == a.domain()); + mln_precondition(a.is_valid()); + + p_array< mln_psite(A) > components = + internal::get_components<T, A>(tree, a, internal::pred_tree_leaves_last<T>(tree), true); + + trace::exiting("mln::morpho::tree::get_components"); + return components; + } + + + template <typename T, typename A> + p_array< mln_psite(A) > + get_components(const T& tree, const Image<A>& attr_image, unsigned n) + { + trace::entering("mln::morpho::tree::get_components"); + + const A& a = exact(attr_image); + mln_precondition(tree.f().domain() == a.domain()); + mln_precondition(a.is_valid()); + + p_array< mln_psite(A) > components; + + if (n > 0) + components = internal::get_components(tree, a, internal::pred_n_components(n), false); + + trace::exiting("mln::morpho::tree::get_components"); + return components; + } + + template <typename T, typename A, typename P2B> + p_array< mln_psite(A) > + get_components(const T& tree, const Image<A>& attr_image, const Function_p2b<P2B>& pred) + { + trace::entering("mln::morpho::tree::get_components"); + + const A& a = exact(attr_image); + const P2B& predicate = exact(pred); + mln_precondition(tree.f().domain() == a.domain()); + mln_precondition(a.is_valid()); + + p_array< mln_psite(A) > components = + internal::get_components(tree, a, internal::pred_p2b<P2B>(predicate), false); + + trace::exiting("mln::morpho::tree::get_components"); + return components; + } + + } // end of namespace mln::morpho::tree + } // end of namespace mln::morpho +} // end of namespace mln + +# endif /* !MLN_INCLUDE_ONLY */ + +#endif /* !MLN_MORPHO_TREE_COMPONENTS_HH_ */ Property changes on: trunk/milena/sandbox/edwin/mln/morpho/tree/components.hh ___________________________________________________________________ Added: svn:mergeinfo Index: trunk/milena/sandbox/edwin/mln/morpho/tree/filter.hh =================================================================== --- trunk/milena/sandbox/edwin/mln/morpho/tree/filter.hh (revision 0) +++ trunk/milena/sandbox/edwin/mln/morpho/tree/filter.hh (revision 3779) @@ -0,0 +1,205 @@ +// Copyright (C) 2009 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_MORPHO_TREE_FILTER_HH_ +# define MLN_MORPHO_TREE_FILTER_HH_ + +/** +** @file mln/morpho/tree/filter.hh +** +** @brief Methods to handle component tree filtering strategies with +** non-increasing attribute. Nevertheless, it works on increasing +** predicate as well. In this case, all strategies have the same +** result but min filter or direct filter should be used in term +** of performance. If a predicate test is not enough fast, then +** prefer the min filter that minimizes call to predicate. +*/ + +# include <mln/core/concept/function.hh> +# include <mln/morpho/tree/data.hh> +# include <mln/morpho/tree/propagate_if.hh> + +namespace mln { + namespace morpho { + namespace tree { + namespace filter { + + template <typename T, typename F, typename P2B> + inline + void + min(const T& tree, Image<F>& f_, const Function_p2b<P2B>& pred_); + + template <typename T, typename F, typename P2B> + inline + void + max(const T& tree, Image<F>& f_, const Function_p2b<P2B>& pred_); + + template <typename T, typename F, typename P2B> + inline + void + direct(const T& tree, Image<F>& f_, const Function_p2b<P2B>& pred_); + + template <typename T, typename F, typename P2B> + inline + void + subtractive(const T& tree, Image<F>& f_, const Function_p2b<P2B>& pred_); + + +# ifndef MLN_INCLUDE_ONLY + namespace internal + { + + template <typename P2B> + struct not_pred_ : Function_p2b< not_pred_<P2B> > + { + not_pred_(const Function_p2b<P2B>& f) : + f_ (exact(f)) + { + } + + template <typename P> + bool operator() (const P& p) const + { + return !(f_(p)); + } + + private: + const P2B& f_; + }; + + template <typename P2B> + inline + not_pred_<P2B> + not_pred(const Function_p2b<P2B>& f) + { + return not_pred_<P2B>(f); + } + + } + + + template <typename T, typename F, typename P2B> + inline + void + min(const T& tree, Image<F>& f_, const Function_p2b<P2B>& pred_) + { + F& f = exact(f_); + const P2B& pred = exact(pred_); + + //FIXME precondition + mln_ch_value(F, bool) mark; + initialize(mark, f); + mln::data::fill(mark, false); + + mln_dn_node_piter(T) n(tree); + for_all(n) + if (mark(tree.parent(n)) || !pred(n)) + { + f(n) = f(tree.parent(n)); + mark(n) = true; + } + //FIXME postcondition + } + + template <typename T, typename F, typename P2B> + inline + void + max(const T& tree, Image<F>& f_, const Function_p2b<P2B>& pred_) + { + F& f = exact(f_); + const P2B& pred = exact(pred_); + + //FIXME precondition + mln_ch_value(F, bool) mark; + initialize(mark, f); + mln::data::fill(mark, true); + + { + mln_up_node_piter(T) n(tree); + for_all(n) + if (!mark(n)) + mark(tree.parent(n)) = false; + else if (pred(n)) + { + mark(tree.parent(n)) = false; + mark(n) = false; + } + } + + { + mln_dn_node_piter(T) n(tree); + for_all(n) + if (mark(n)) + f(n) = f(tree.parent(n)); + } + } + + template <typename T, typename F, typename P2B> + inline + void + direct(const T& tree, Image<F>& f_, const Function_p2b<P2B>& pred_) + { + F& f = exact(f_); + const P2B& pred = exact(pred_); + + //FIXME precondition + mln_dn_node_piter(T) n(tree); + for_all(n) + if (!pred(n)) + f(n) = f(tree.parent(n)); + //FIXME postcondition + } + + template <typename T, typename F, typename P2B> + inline + void + subtractive(const T& tree, Image<F>& f_, const Function_p2b<P2B>& pred_) + { + F& f = exact(f_); + const P2B& pred = exact(pred_); + + //FIXME precondition + + morpho::tree::propagate_if(tree, f, morpho::tree::desc_propagation (), internal::not_pred(pred)); + + mln_up_node_piter(T) n(tree); + for_all(n) + if (!pred(n)) + f(n) = f(tree.parent(n)); + //FIXME postcondition + } + +# endif /* !MLN_INCLUDE_ONLY */ + + } // end of namespace mln::morpho::tree::filter + } // end of namespace mln::morpho::tree + } // end of namespace mln::morpho +} // end of namespace mln + + +#endif /* !MLN_MORPHO_TREE_FILTER_HH_ */ Index: trunk/milena/sandbox/edwin/mln/morpho/tree/propagate_node.hh =================================================================== --- trunk/milena/sandbox/edwin/mln/morpho/tree/propagate_node.hh (revision 0) +++ trunk/milena/sandbox/edwin/mln/morpho/tree/propagate_node.hh (revision 3779) @@ -0,0 +1,209 @@ +// Copyright (C) 2007, 2008, 2009 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_MORPHO_TREE_PROPAGATE_NODE_HH_ +# define MLN_MORPHO_TREE_PROPAGATE_NODE_HH_ + +# include <mln/core/concept/image.hh> +# include <mln/core/macros.hh> +# include <mln/morpho/tree/data.hh> + +/// \file mln/morpho/tree/propagate_node.hh +/// +/// Functions to propagate node in the tree. + +namespace mln { + namespace morpho { + namespace tree { + + /** + ** Propagate a value \p v from a node \p n to its descendants. + ** + ** @param n[in] Node to propagate. + ** @param t[in] Component tree used for propagation. + ** @param a_[in] Attribute image where values are propagated. + ** @param v[in] Value to propagate. + ** @param nb_leaves[out] Optional. Store the number of leaves in + ** the component. + */ + template <typename T, typename A> + void + propagate_node_to_descendants(mln_psite(A) n, + const T& t, + Image<A>& a_, + const mln_value(A)& v, + unsigned* nb_leaves = 0); + + /** + ** Propagate the node's value to its descendants. + ** + ** @param n[in] Node to propagate. + ** @param t[in] Component tree used for propagation. + ** @param a_[in] Attribute image where values are propagated. + ** @param nb_leaves[out] Optional. Store the number of leaves in + ** the component. + */ + template <typename T, typename A> + inline + void + propagate_node_to_descendants(mln_psite(A)& n, + const T& t, + Image<A>& a_, + unsigned* nb_leaves = 0); + + + /** + ** Propagate a value \v from a node \n to its ancestors. + ** + ** @param n Node to propagate. + ** @param t Component tree used for propagation. + ** @param a_ Attribute image where values are propagated. + ** @param v Value to propagate. + */ + template <typename T, typename A> + void + propagate_node_to_ancestors(mln_psite(A) n, + const T& t, + Image<A>& a_, + const mln_value(A)& v); + + /** + ** Propagate the node's value to its ancestors. + ** + ** @param n Node to propagate. + ** @param t Component tree used for propagation. + ** @param a_ Attribute image where values are propagated. + */ + template <typename T, typename A> + inline + void + propagate_node_to_ancestors(mln_psite(A) n, + const T& t, + Image<A>& a_); + + + # ifndef MLN_INCLUDE_ONLY + + /* Descendants propagation */ + + + template <typename T, typename A> + inline + void + propagate_node_to_descendants(mln_psite(A) n, + const T& t, + Image<A>& a_, + const mln_value(A)& v, + unsigned* nb_leaves = 0) + { + A& a = exact(a_); + mln_precondition(a.is_valid()); + mln_precondition(a.domain() == t.f().domain()); + mln_precondition(a.domain().has(n)); + + + if (!t.is_a_node(n)) // Get the representant. + n = t.parent(n); + mln_assertion(t.is_a_node(n)); + + typename T::preorder_piter pp(t, n); + + pp.start(); // We don't set n to v. + + if (nb_leaves) + *nb_leaves += t.is_a_leaf(pp); + + for (pp.next(); pp.is_valid(); pp.next()) + { + a(pp) = v; + if (nb_leaves && t.is_a_leaf(pp)) + ++(*nb_leaves); + } + } + + + template <typename T, typename A> + inline + void + propagate_node_to_descendants(mln_psite(A) n, + const T& t, + Image<A>& a_, + unsigned* nb_leaves = 0) + + { + A& a = exact(a_); + propagate_node_to_descendants(n, t, a, a(n), nb_leaves); + } + + + /* Ancestors propagation */ + + template <typename T, typename A> + void + propagate_node_to_ancestors(mln_psite(A) n, + const T& t, + Image<A>& a_, + const mln_value(A)& v) + { + A& a = exact(a_); + mln_precondition(a.is_valid()); + mln_precondition(a.domain() == t.f().domain()); + mln_precondition(a.domain().has(n)); + + if (!t.is_a_node(n)) // Get the representant. + n = t.parent(n); + mln_assertion(t.is_a_node(n)); + + if (t.is_root(n)) + return; + + do { + n = t.parent(n); + a(n) = v; + } while (!t.is_root(n)); + + } + + template <typename T, typename A> + inline + void + propagate_node_to_ancestors(mln_psite(A) n, + const T& t, + Image<A>& a_) + { + A& a = exact(a_); + propagate_node_to_ancestors(n, t, a, a(n)); + } + + # endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::morpho::tree + } // end of namespace mln::morpho +} // end of namespace mln + +#endif /* !MLN_MORPHO_TREE_PROPAGATE_NODE_HH_ */ Property changes on: trunk/milena/sandbox/edwin/mln/morpho/tree/propagate_node.hh ___________________________________________________________________ Added: svn:mergeinfo Index: trunk/milena/sandbox/edwin/mln/morpho/tree/propagate_if.hh =================================================================== --- trunk/milena/sandbox/edwin/mln/morpho/tree/propagate_if.hh (revision 0) +++ trunk/milena/sandbox/edwin/mln/morpho/tree/propagate_if.hh (revision 3779) @@ -0,0 +1,327 @@ +// Copyright (C) 2007, 2008, 2009 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_MORPHO_TREE_PROPAGATE_IF_HH_ +# define MLN_MORPHO_TREE_PROPAGATE_IF_HH_ + +/** +** @file mln/morpho/tree/propagate_if.hh +** +** @brief Methods to handle propagation startegies +** in component trees. +** +*/ + +# include <mln/morpho/tree/data.hh> +# include <mln/morpho/tree/propagate_node.hh> + +# include <mln/data/fill.hh> +# include <mln/pw/all.hh> + +namespace mln { + namespace morpho { + namespace tree { + + template <typename WP> + struct way_of_propagation : Object< WP > { protected: way_of_propagation() {}; }; + struct desc_propagation : way_of_propagation <desc_propagation> {}; + struct asc_propagation : way_of_propagation <asc_propagation> {}; + + /** + ** Propagate nodes checking the predicate \p pred in the way + ** defined by \p way_of_propagation. + ** + ** @param tree Component tree used for propagation. + ** @param a_ Attributed image where values are propagated. + ** @param way_of_propagation Propagate node in acsendant or + ** descendant way. + ** @param pred Predicate that node must check to be propagated. + ** @param v Value to be propagated. (By default \p v is the value + ** at the node being propagated). + */ + template <typename T, typename A, typename P2B, typename WP> + inline + void + propagate_if(const T& tree, + Image<A>& a_, + const way_of_propagation<WP>&, + const Function_p2b<P2B>& pred, + const mln_value(A)& v); + + template <typename T, typename A, typename P2B> + inline + void + propagate_if(const T& tree, + Image<A>& a_, + const desc_propagation&, + const Function_p2b<P2B>& pred); + + /** + ** Propagate nodes having the value v in the way + ** defined by \p way_of_propagation. + ** + ** @param tree Component tree used for propagation. + ** @param a_ Attributed image where values are propagated. + ** @param way_of_propagation Propagate node in acsendant or + ** descendant way. + ** @param v Value that node must have to be propagated. + ** @param v_prop Value to propagate (By default it is the value + ** at the node being propagated). + */ + template <typename T, typename A, typename WP> + inline + void + propagate_if_value(const T& tree, + Image<A>& a_, + const way_of_propagation<WP>&, + const mln_value(A)& v, + const mln_value(A)& v_prop); + + template <typename T, typename A, typename WP> + inline + void + propagate_if_value(const T& tree, + Image<A>& a_, + const way_of_propagation<WP>&, + const mln_value(A)& v); + + + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + template <typename T, typename A, typename P2B> + bool check_propagate_if(const T& t, + const A& a, + const asc_propagation& prop, + const P2B& pred, + const mln_value(A)& v) + { + (void) prop; + mln_node_piter(T) n(t); + for_all(n) + if (pred(n) && a(t.parent(n)) != v) + return false; + return true; + } + + template <typename T, typename A, typename P2B> + bool check_propagate_if(const T& t, + const A& a, + const desc_propagation& prop, + const P2B& pred, + const mln_value(A)& v) + { + (void) prop; + mln_node_piter(T) n(t); + for_all(n) + if (a(n) != v && pred(t.parent(n))) + return false; + return true; + } + + template <typename T, typename A, typename P2B> + bool check_propagate_if(const T& t, + const A& a, + const desc_propagation& prop, + const P2B& pred) + { + (void) prop; + mln_node_piter(T) n(t); + for_all(n) + if (a(n) != a(t.parent(n)) && pred(t.parent(n))) + return false; + return true; + } + + template <typename T, typename A, typename P2B> + inline + void + propagate_if(const T& tree, + A& a, + const desc_propagation& prop, + const P2B& pred, + const mln_value(A)& v) + { + (void) prop; + + mln_precondition(a.is_valid()); + mln_precondition(tree.f().domain() == a.domain()); + + mln_ch_value(typename T::function, bool) mark; + initialize(mark, tree.f()); + mln::data::fill(mark, false); + + mln_dn_node_piter(T) n(tree); + for_all(n) + if (mark(tree.parent(n))) + { + a(n) = v; + mark(n) = true; + } + else if (pred(n)) + mark(n) = true; + mln_postcondition(check_propagate_if(tree, a, prop, pred, v)); + } + + template <typename T, typename A, typename P2B> + inline + void + propagate_if(const T& tree, + A& a, + const desc_propagation& prop, + const P2B& pred) + { + (void) prop; + + mln_precondition(a.is_valid()); + mln_precondition(tree.f().domain() == a.domain()); + + mln_ch_value(typename T::function, bool) mark; + initialize(mark, tree.f()); + mln::data::fill(mark, false); + + mln_dn_node_piter(T) n(tree); + for_all(n) + if (mark(tree.parent(n))) + { + a(n) = a(tree.parent(n)); + mark(n) = true; + } + else if (pred(n)) + mark(n) = true; + mln_postcondition(check_propagate_if(tree, a, prop, pred)); + } + + + template <typename T, typename A, typename P2B> + inline + void + propagate_if(const T& tree, + A& a, + const asc_propagation& prop, + const P2B& pred, + const mln_value(A)& v) + { + (void) prop; + + mln_precondition(a.is_valid()); + mln_precondition(tree.f().domain() == a.domain()); + + mln_ch_value(typename T::function, bool) mark; + initialize(mark, tree.f()); + mln::data::fill(mark, false); + + mln_up_node_piter(T) n(tree); + for_all(n) + if (mark(n)) + { + a(n) = v; + mark(tree.parent(n)) = true; + } + else if (pred(n)) + mark(tree.parent(n)) = true; + + mln_postcondition(check_propagate_if(tree, a, prop, pred, v)); + } + + } // end of namespace mln::morpho::tree::internal + + + /* Facades */ + + template <typename T, typename A, typename WP> + inline + void + propagate_if_value(const T& tree, + Image<A>& a_, + const way_of_propagation<WP>& prop_, + const mln_value(A)& v, + const mln_value(A)& v_prop) + { + A& a = exact(a_); + const WP& prop = exact(prop_); + + internal::propagate_if(tree, a, prop, pw::value(a) == pw::cst(v), v_prop); + } + + + template <typename T, typename A, typename WP> + inline + void + propagate_if_value(const T& tree, + Image<A>& a_, + const way_of_propagation<WP>& prop_, + const mln_value(A)& v) + { + A& a = exact(a_); + const WP& prop = exact(prop_); + + internal::propagate_if(tree, a, prop, pw::value(a) == pw::cst(v), v); + } + + template <typename T, typename A, typename P2B, typename WP> + inline + void + propagate_if(const T& tree, + Image<A>& a_, + const way_of_propagation<WP>& prop_, + const Function_p2b<P2B>& pred_, + const mln_value(A)& v) + { + A& a = exact(a_); + const WP& prop = exact(prop_); + const P2B& pred = exact(pred_); + + internal::propagate_if(tree, a, prop, pred, v); + } + + template <typename T, typename A, typename P2B> + inline + void + propagate_if(const T& tree, + Image<A>& a_, + const desc_propagation& prop, + const Function_p2b<P2B>& pred_) + { + A& a = exact(a_); + const P2B& pred = exact(pred_); + + internal::propagate_if(tree, a, prop, pred); + } + +#endif /* !MLN_INCLUDE_ONLY */ + + + } // end of namespace mln::morpho::tree + } // end of namespace mln::morpho +} // end of namespace mln + +#endif /* !MLN_MORPHO_TREE_PROPAGATE_IF_HH_ */ Property changes on: trunk/milena/sandbox/edwin/mln/morpho/tree/propagate_if.hh ___________________________________________________________________ Added: svn:mergeinfo Index: trunk/milena/sandbox/edwin/mln/morpho/attribute/occupation.hh =================================================================== --- trunk/milena/sandbox/edwin/mln/morpho/attribute/occupation.hh (revision 0) +++ trunk/milena/sandbox/edwin/mln/morpho/attribute/occupation.hh (revision 3779) @@ -0,0 +1,252 @@ +// Copyright (C) 2007, 2008, 2009 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_MORPHO_ATTRIBUTE_OCCUPATION_HH +# define MLN_MORPHO_ATTRIBUTE_OCCUPATION_HH + +/// \file mln/morpho/attribute/occupation.hh +/// +/// Define an accumulator that computes the occupation of a +/// component. (occupation = volume of the component / volume of box bounding the component. + +# include <mln/core/concept/accumulator.hh> +# include <mln/accu/internal/base.hh> +# include <mln/morpho/attribute/volume.hh> + + +namespace mln +{ + + // Forward declaration. + namespace morpho { + namespace attribute { + template <typename I> + class occupation; + } + } + + + // Traits. + + namespace trait + { + + template <typename I> + struct accumulator_< morpho::attribute::occupation > + { + typedef accumulator::has_untake::no has_untake; + typedef accumulator::has_set_value::no has_set_value; + typedef accumulator::has_stop::no has_stop; + typedef accumulator::when_pix::use_v when_pix; + }; + + } // end of namespace mln::trait + + + namespace morpho + { + + namespace attribute + { + + /// Occupation accumulator class. + /// + /// The parameter \p I is the image type on which the accumulator + /// of pixels is built. + template <typename I> + struct occupation + : public mln::accu::internal::base< double, occupation > + { + typedef mln_value(I) argument; + + occupation(); + + /// Manipulators. + /// \{ + void init(); + + void take(const mln_value(I)& v); + void take(const util::pix& px); + void take(const occupation& other); + + void take_as_init(const mln_value(I)& v); + void take_as_init(const util::pix& px); + /// \} + + /// Get the value of the accumulator. + double to_result() const; + + /// Check whether this accu is able to return a result. + /// Always true here. + bool is_valid() const; + + /// Give the area of the component. + unsigned area() const; + + /// Give the height. + unsigned height() const; + + /// Give the volume of the component. + unsigned volume() const; + + protected: + /// The min value taken. + unsigned min_; + /// The max value taken. + unsigned max_; + /// The volume of the component. + typename mln::morpho::attribute::volume volume_; + }; + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename I> + inline + occupation::occupation() + { + init(); + } + + template <typename I> + inline + void + occupation::init() + { + min_ = mln_max(unsigned); + max_ = mln_min(unsigned); + volume_.init(); + } + + template <typename I> + inline + void + occupation::take(const mln_value(I)& v) + { + if (! is_valid()) + { + take_as_init(v); + return; + } + volume_.take(v); + if (v < min_) + min_ = v; + if (v > max_) + max_ = v; + } + + template <typename I> + inline + void + occupation::take(const util::pix& px) + { + take(px.v()); + } + + template <typename I> + inline + void + occupation::take(const occupation& other) + { + mln_invariant(is_valid()); + volume_.take(other.volume_); + if (other.min_ < min_) + min_ = other.min_; + if (other.max_ > max_) + max_ = other.max_; + } + + template <typename I> + inline + void + occupation::take_as_init(const mln_value(I)& v) + { + volume_.take_as_init(v); + max_ = v; + min_ = v; + } + + template <typename I> + inline + void + occupation::take_as_init(const util::pix& px) + { + take_as_init(px.v()); + } + + template <typename I> + inline + double + occupation::to_result() const + { + return (double)volume_.to_result() / (double)(volume_.area() * height()); + } + + template <typename I> + inline + unsigned + occupation::area() const + { + return volume_.area(); + } + + template <typename I> + inline + unsigned + occupation::volume() const + { + return volume_.to_result(); + } + + template <typename I> + inline + unsigned + occupation::height() const + { + return (max_ - min_); + } + + template <typename I> + inline + bool + occupation::is_valid() const + { + return volume_.is_valid(); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::morpho::attribute + + } // end of namespace mln::morpho + +} // end of namespace mln + + +#endif // ! MLN_MORPHO_ATTRIBUTE_OCCUPATION_HH Index: trunk/milena/sandbox/edwin/mln/morpho/attribute/bbox.hh =================================================================== --- trunk/milena/sandbox/edwin/mln/morpho/attribute/bbox.hh (revision 0) +++ trunk/milena/sandbox/edwin/mln/morpho/attribute/bbox.hh (revision 3779) @@ -0,0 +1,203 @@ +// Copyright (C) 2007, 2008, 2009 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_MORPHO_ATTRIBUTE_BBOX_HH_ +# define MLN_MORPHO_ATTRIBUTE_BBOX_HH_ + +/// \file mln/morpho/attribute/bbox.hh +/// +/// Define an accumulator that computes bounding box of a +/// component. + +# include <mln/core/concept/box.hh> + + +namespace mln +{ + + // Forward declaration. + + namespace morpho { + namespace attribute { + template <typename I> class bbox; + } + } + + // Traits. + + namespace trait + { + + template <typename I> + struct accumulator_< morpho::attribute::bbox > + { + typedef accumulator::has_untake::no has_untake; + typedef accumulator::has_set_value::no has_set_value; + typedef accumulator::has_stop::no has_stop; + typedef accumulator::when_pix::use_p when_pix; + }; + + } // end of namespace mln::trait + + namespace morpho { + namespace attribute { + + template <typename I> + struct bbox : public mln::accu::internal::base<const box<mln_psite(I)>&, bbox > + { + typedef mln::accu::internal::base<const box<mln_psite(I)>&, bbox > super_; + + public: + typedef mln_psite(I) P; + typedef mln_psite(I) argument; + + bbox(); + + /// Manipulators. + /// \{ + void init(); + void take(const argument& p); + void take(const bbox& other); + void take_as_init(const argument& p); + + /// \} + + /// Get the value of the accumulator. + const box& to_result() const; + + + /// Check whether this accu is able to return a result. + /// Always true here. + bool is_valid() const; + + protected: + + bool is_valid_; + box<mln_psite(I)> b_; + }; + +# ifndef MLN_INCLUDE_ONLY + + template <typename I> + inline + bbox::bbox() + { + init(); + } + + template <typename I> + inline + void + bbox::init() + { + is_valid_ = false; + } + + template <typename I> + inline + void + bbox::take_as_init(const mln_psite(I)& p) + { + b_.pmin() = p; + b_.pmax() = p; + is_valid_ = true; + } + + template <typename I> + inline + void + bbox::take(const mln_psite(I)& p) + { + if (!is_valid_) + { + b_.pmin() = p; + b_.pmax() = p; + is_valid_ = true; + return; + } + for (unsigned i = 0; i < mln_psite_(I)::dim; ++i) + if (p[i] < b_.pmin()[i]) + b_.pmin()[i] = p[i]; + else if (p[i] > b_.pmax()[i]) + b_.pmax()[i] = p[i]; + } + + template <typename I> + inline + void + bbox::take(const bbox& other) + { + if (! other.is_valid_) + { + // no-op + return; + } + if (! this->is_valid_) + { + // 'other' makes '*this' valid + *this = other; + is_valid_ = true; + return; + } + // both are valids so: + const box<mln_psite(I)>& o_b = other.b_; + for (unsigned i = 0; i < mln_psite_(I)::dim; ++i) + { + if (o_b.pmin()[i] < b_.pmin()[i]) + b_.pmin()[i] = o_b.pmin()[i]; + if (o_b.pmax()[i] > b_.pmax()[i]) + b_.pmax()[i] = o_b.pmax()[i]; + } + } + + template <typename I> + inline + const box<mln_psite(I)>& + bbox::to_result() const + { + mln_precondition(is_valid_); + return b_; + } + + template <typename I> + inline + bool + bbox::is_valid() const + { + return is_valid_; + } + + +# endif /* !MLN_INCLUDE_ONLY */ + } // end of namespace mln::morpho::attribute + } // end of namespace mln::morpho +} // end of namespace mln + + + +#endif /* !MLN_MORPHO_ATTRIBUTE_BBOX_HH_ */ Property changes on: trunk/milena/sandbox/edwin/mln/morpho/attribute ___________________________________________________________________ Added: svn:mergeinfo

1 0

[PATCH 18/31] Make clean in tree files and procedures.
by Roland Levillain 10 May '09

10 May '09

* edwin/mln/morpho/tree/filter.hh: group strategies for non-increasing attribute filtering. * edwin/attributes/bbox.hh, * edwin/attributes/occupation.hh, * edwin/attributes, * edwin/mln/morpho/attribute, * edwin/mln/morpho/tree/components.hh, * edwin/mln/morpho/tree/propagate.hh, * edwin/mln/morpho/tree/propagate_if.hh, * edwin/mln/morpho/tree/propagate_node.hh, * edwin/mln/morpho/tree, * edwin/mln/morpho, * edwin/mln, * edwin/rush/exo2/test.cc, * edwin/tests, * edwin/tree/components.hh, * edwin/tree/propagate.hh, * edwin/tree/propagate_if.hh, * edwin/tree/propagate_node.hh, move all tree materials in edwin/mln/morpho/tree. --- milena/sandbox/ChangeLog | 25 +++ .../{attributes => mln/morpho/attribute}/bbox.hh | 0 .../morpho/attribute}/occupation.hh | 0 .../edwin/{ => mln/morpho}/tree/components.hh | 2 +- milena/sandbox/edwin/mln/morpho/tree/filter.hh | 205 ++++++++++++++++++++ .../edwin/{ => mln/morpho}/tree/propagate.hh | 14 +- .../edwin/{ => mln/morpho}/tree/propagate_if.hh | 2 +- .../edwin/{ => mln/morpho}/tree/propagate_node.hh | 0 milena/sandbox/edwin/rush/exo2/test.cc | 1 + 9 files changed, 240 insertions(+), 9 deletions(-) rename milena/sandbox/edwin/{attributes => mln/morpho/attribute}/bbox.hh (100%) rename milena/sandbox/edwin/{attributes => mln/morpho/attribute}/occupation.hh (100%) rename milena/sandbox/edwin/{ => mln/morpho}/tree/components.hh (99%) create mode 100644 milena/sandbox/edwin/mln/morpho/tree/filter.hh rename milena/sandbox/edwin/{ => mln/morpho}/tree/propagate.hh (92%) rename milena/sandbox/edwin/{ => mln/morpho}/tree/propagate_if.hh (99%) rename milena/sandbox/edwin/{ => mln/morpho}/tree/propagate_node.hh (100%) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index be85cde..3cffc50 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,28 @@ +2009-05-10 Edwin Carlinet <carlinet(a)lrde.epita.fr> + + Make clean in tree files and procedures. + * edwin/mln/morpho/tree/filter.hh: + group strategies for non-increasing attribute filtering. + + * edwin/attributes/bbox.hh, + * edwin/attributes/occupation.hh, + * edwin/attributes, + * edwin/mln/morpho/attribute, + * edwin/mln/morpho/tree/components.hh, + * edwin/mln/morpho/tree/propagate.hh, + * edwin/mln/morpho/tree/propagate_if.hh, + * edwin/mln/morpho/tree/propagate_node.hh, + * edwin/mln/morpho/tree, + * edwin/mln/morpho, + * edwin/mln, + * edwin/rush/exo2/test.cc, + * edwin/tests, + * edwin/tree/components.hh, + * edwin/tree/propagate.hh, + * edwin/tree/propagate_if.hh, + * edwin/tree/propagate_node.hh, + move all tree materials in edwin/mln/morpho/tree. + 2009-05-07 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix missing updates about debug colorize. diff --git a/milena/sandbox/edwin/attributes/bbox.hh b/milena/sandbox/edwin/mln/morpho/attribute/bbox.hh similarity index 100% rename from milena/sandbox/edwin/attributes/bbox.hh rename to milena/sandbox/edwin/mln/morpho/attribute/bbox.hh diff --git a/milena/sandbox/edwin/attributes/occupation.hh b/milena/sandbox/edwin/mln/morpho/attribute/occupation.hh similarity index 100% rename from milena/sandbox/edwin/attributes/occupation.hh rename to milena/sandbox/edwin/mln/morpho/attribute/occupation.hh diff --git a/milena/sandbox/edwin/tree/components.hh b/milena/sandbox/edwin/mln/morpho/tree/components.hh similarity index 99% rename from milena/sandbox/edwin/tree/components.hh rename to milena/sandbox/edwin/mln/morpho/tree/components.hh index 2b4cfac..6485241 100644 --- a/milena/sandbox/edwin/tree/components.hh +++ b/milena/sandbox/edwin/mln/morpho/tree/components.hh @@ -227,7 +227,7 @@ namespace mln { unsigned* nb_leaves = uses_leaves ? new unsigned(0) : 0; initialize(activity, a); - data::fill(activity, true); + mln::data::fill(activity, true); internal::sort(max_arr, a); do diff --git a/milena/sandbox/edwin/mln/morpho/tree/filter.hh b/milena/sandbox/edwin/mln/morpho/tree/filter.hh new file mode 100644 index 0000000..26e4f9a --- /dev/null +++ b/milena/sandbox/edwin/mln/morpho/tree/filter.hh @@ -0,0 +1,205 @@ +// Copyright (C) 2009 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_MORPHO_TREE_FILTER_HH_ +# define MLN_MORPHO_TREE_FILTER_HH_ + +/** +** @file mln/morpho/tree/filter.hh +** +** @brief Methods to handle component tree filtering strategies with +** non-increasing attribute. Nevertheless, it works on increasing +** predicate as well. In this case, all strategies have the same +** result but min filter or direct filter should be used in term +** of performance. If a predicate test is not enough fast, then +** prefer the min filter that minimizes call to predicate. +*/ + +# include <mln/core/concept/function.hh> +# include <mln/morpho/tree/data.hh> +# include <mln/morpho/tree/propagate_if.hh> + +namespace mln { + namespace morpho { + namespace tree { + namespace filter { + + template <typename T, typename F, typename P2B> + inline + void + min(const T& tree, Image<F>& f_, const Function_p2b<P2B>& pred_); + + template <typename T, typename F, typename P2B> + inline + void + max(const T& tree, Image<F>& f_, const Function_p2b<P2B>& pred_); + + template <typename T, typename F, typename P2B> + inline + void + direct(const T& tree, Image<F>& f_, const Function_p2b<P2B>& pred_); + + template <typename T, typename F, typename P2B> + inline + void + subtractive(const T& tree, Image<F>& f_, const Function_p2b<P2B>& pred_); + + +# ifndef MLN_INCLUDE_ONLY + namespace internal + { + + template <typename P2B> + struct not_pred_ : Function_p2b< not_pred_<P2B> > + { + not_pred_(const Function_p2b<P2B>& f) : + f_ (exact(f)) + { + } + + template <typename P> + bool operator() (const P& p) const + { + return !(f_(p)); + } + + private: + const P2B& f_; + }; + + template <typename P2B> + inline + not_pred_<P2B> + not_pred(const Function_p2b<P2B>& f) + { + return not_pred_<P2B>(f); + } + + } + + + template <typename T, typename F, typename P2B> + inline + void + min(const T& tree, Image<F>& f_, const Function_p2b<P2B>& pred_) + { + F& f = exact(f_); + const P2B& pred = exact(pred_); + + //FIXME precondition + mln_ch_value(F, bool) mark; + initialize(mark, f); + mln::data::fill(mark, false); + + mln_dn_node_piter(T) n(tree); + for_all(n) + if (mark(tree.parent(n)) || !pred(n)) + { + f(n) = f(tree.parent(n)); + mark(n) = true; + } + //FIXME postcondition + } + + template <typename T, typename F, typename P2B> + inline + void + max(const T& tree, Image<F>& f_, const Function_p2b<P2B>& pred_) + { + F& f = exact(f_); + const P2B& pred = exact(pred_); + + //FIXME precondition + mln_ch_value(F, bool) mark; + initialize(mark, f); + mln::data::fill(mark, true); + + { + mln_up_node_piter(T) n(tree); + for_all(n) + if (!mark(n)) + mark(tree.parent(n)) = false; + else if (pred(n)) + { + mark(tree.parent(n)) = false; + mark(n) = false; + } + } + + { + mln_dn_node_piter(T) n(tree); + for_all(n) + if (mark(n)) + f(n) = f(tree.parent(n)); + } + } + + template <typename T, typename F, typename P2B> + inline + void + direct(const T& tree, Image<F>& f_, const Function_p2b<P2B>& pred_) + { + F& f = exact(f_); + const P2B& pred = exact(pred_); + + //FIXME precondition + mln_dn_node_piter(T) n(tree); + for_all(n) + if (!pred(n)) + f(n) = f(tree.parent(n)); + //FIXME postcondition + } + + template <typename T, typename F, typename P2B> + inline + void + subtractive(const T& tree, Image<F>& f_, const Function_p2b<P2B>& pred_) + { + F& f = exact(f_); + const P2B& pred = exact(pred_); + + //FIXME precondition + + morpho::tree::propagate_if(tree, f, morpho::tree::desc_propagation (), internal::not_pred(pred)); + + mln_up_node_piter(T) n(tree); + for_all(n) + if (!pred(n)) + f(n) = f(tree.parent(n)); + //FIXME postcondition + } + +# endif /* !MLN_INCLUDE_ONLY */ + + } // end of namespace mln::morpho::tree::filter + } // end of namespace mln::morpho::tree + } // end of namespace mln::morpho +} // end of namespace mln + + +#endif /* !MLN_MORPHO_TREE_FILTER_HH_ */ diff --git a/milena/sandbox/edwin/tree/propagate.hh b/milena/sandbox/edwin/mln/morpho/tree/propagate.hh similarity index 92% rename from milena/sandbox/edwin/tree/propagate.hh rename to milena/sandbox/edwin/mln/morpho/tree/propagate.hh index d25f811..58a0e8f 100644 --- a/milena/sandbox/edwin/tree/propagate.hh +++ b/milena/sandbox/edwin/mln/morpho/tree/propagate.hh @@ -33,7 +33,7 @@ /// Functions to propagate a node value in the tree. # include <mln/morpho/tree/data.hh> -# include "propagate_node.hh" +# include <mln/morpho/tree/propagate_node.hh> namespace mln { namespace morpho { @@ -41,10 +41,10 @@ namespace mln { /// Propagate the representative point's value to - /// non-representative points of the same node. + /// non-representative node points. template <typename T, typename A> void - propagate_representant(const T& t, Image<A>& a_) + propagate_representative(const T& t, Image<A>& a_) { A a = exact(a_); mln_up_site_piter(T) p(t); @@ -80,7 +80,7 @@ namespace mln { const A& a = exact(attr_image); A out; initialize(out, a); - data::fill(out, null); + mln::data::fill(out, null); mln_piter(p_array<mln_psite(A)>) p(component_list); for_all(p) @@ -88,7 +88,7 @@ namespace mln { out(p) = a(p); morpho::tree::propagate_node_to_descendants(p, tree, out, a(p)); } - morpho::tree::propagate_representant(tree, out); + morpho::tree::propagate_representative(tree, out); return out; } @@ -103,7 +103,7 @@ namespace mln { { mln_ch_value(typename T::function, V) out; initialize(out, tree.f()); - data::fill(out, null); + mln::data::fill(out, null); mln_piter(p_array< mln_psite(T) >) p(component_list); for_all(p) @@ -111,7 +111,7 @@ namespace mln { out(p) = value; morpho::tree::propagate_node_to_descendants(p, tree, out); } - morpho::tree::propagate_representant(tree, out); + morpho::tree::propagate_representative(tree, out); return out; } diff --git a/milena/sandbox/edwin/tree/propagate_if.hh b/milena/sandbox/edwin/mln/morpho/tree/propagate_if.hh similarity index 99% rename from milena/sandbox/edwin/tree/propagate_if.hh rename to milena/sandbox/edwin/mln/morpho/tree/propagate_if.hh index d8c1b03..c310857 100644 --- a/milena/sandbox/edwin/tree/propagate_if.hh +++ b/milena/sandbox/edwin/mln/morpho/tree/propagate_if.hh @@ -38,7 +38,7 @@ */ # include <mln/morpho/tree/data.hh> -# include "propagate_node.hh" +# include <mln/morpho/tree/propagate_node.hh> # include <mln/data/fill.hh> # include <mln/pw/all.hh> diff --git a/milena/sandbox/edwin/tree/propagate_node.hh b/milena/sandbox/edwin/mln/morpho/tree/propagate_node.hh similarity index 100% rename from milena/sandbox/edwin/tree/propagate_node.hh rename to milena/sandbox/edwin/mln/morpho/tree/propagate_node.hh diff --git a/milena/sandbox/edwin/rush/exo2/test.cc b/milena/sandbox/edwin/rush/exo2/test.cc index eeca8bf..40a0f66 100755 --- a/milena/sandbox/edwin/rush/exo2/test.cc +++ b/milena/sandbox/edwin/rush/exo2/test.cc @@ -18,6 +18,7 @@ #include <mln/fun/p2v/ternary.hh> #include <mln/pw/all.hh> + namespace mln { // Sharpness Attribute -> Height Attribute -- 1.6.1.2

1 0