October 2007 - Olena-patches

milena r1365: Fix for handle non-const
by Guillaume Duhamel 22 Oct '07

22 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-22 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Fix for handle non-const. * abr.cc: Update. * abr.hh: Fix. --- abr.cc | 17 +++++++++++------ abr.hh | 18 +++++++++--------- 2 files changed, 20 insertions(+), 15 deletions(-) Index: trunk/milena/sandbox/duhamel/abr.hh =================================================================== --- trunk/milena/sandbox/duhamel/abr.hh (revision 1364) +++ trunk/milena/sandbox/duhamel/abr.hh (revision 1365) @@ -50,15 +50,15 @@ struct s_abr { s_abr (); - s_abr (const T& elt); + s_abr (T& elt); - void add_son (const T& elt); + void add_son (T& elt); void print_rec (int n) const; void print (void) const; - int search_rec(s_abr<T>** res, const T& elt); - s_abr<T>* search(const T& elt); + int search_rec(s_abr<T>** res, T& elt); + s_abr<T>* search(T& elt); - const T& elt_; + T& elt_; s_abr<T>* father_; std::list< s_abr<T>* > sons_; }; @@ -74,7 +74,7 @@ } template <typename T> - s_abr<T>::s_abr (const T& elt) + s_abr<T>::s_abr (T& elt) : elt_ (elt), father_ (0) { @@ -83,7 +83,7 @@ template <typename T> void - s_abr<T>::add_son (const T& elt) + s_abr<T>::add_son (T& elt) { s_abr<T>* s = new s_abr<T> (elt); @@ -116,7 +116,7 @@ template <typename T> int - s_abr<T>::search_rec(s_abr<T>** res, const T& elt) + s_abr<T>::search_rec(s_abr<T>** res, T& elt) { if (elt == this->elt_) { @@ -137,7 +137,7 @@ template <typename T> s_abr<T>* - s_abr<T>::search(const T& elt) + s_abr<T>::search(T& elt) { s_abr<T>* res = 0; Index: trunk/milena/sandbox/duhamel/abr.cc =================================================================== --- trunk/milena/sandbox/duhamel/abr.cc (revision 1364) +++ trunk/milena/sandbox/duhamel/abr.cc (revision 1365) @@ -37,13 +37,18 @@ int main (void) { using namespace mln; - util::s_abr<unsigned> abr (1); + unsigned elt1 = 1; + unsigned elt2 = 2; + unsigned elt3 = 3; + unsigned elt4 = 4; + unsigned elt5 = 5; + util::s_abr<unsigned> abr (elt1); - abr.add_son (2); - abr.add_son (3); + abr.add_son (elt2); + abr.add_son (elt3); abr.print (); - util::s_abr<unsigned>* abr2 = abr.search (2); - abr2->add_son (4); - abr2->add_son (5); + util::s_abr<unsigned>* abr2 = abr.search (elt2); + abr2->add_son (elt4); + abr2->add_son (elt5); abr.print (); }

1 0

1363: Add support for the FreeImage library.
by Roland Levillain 22 Oct '07

22 Oct '07

https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add support for the FreeImage library. * configure.ac: Check for headers and libraries of FreeImage. Configure milena/tests/Makefile. configure.ac | 11 +++++++++++ 1 file changed, 11 insertions(+) Index: configure.ac --- configure.ac (revision 1363) +++ configure.ac (working copy) @@ -54,6 +54,16 @@ AC_CHECK_PROGS([CONCEPTCXX], [conceptg++ conceptc++]) +## -------------- ## +## Dependencies. ## +## -------------- ## + +# FreeImage library. +AC_CHECK_HEADERS([FreeImagePlus.h], + [AM_CONDITIONAL([FREE_IMAGE_PLUS], [true])]) +AC_CHECK_LIB([freeimageplus], [main]) + + ## ------- ## ## Tests. ## ## ------- ## @@ -97,6 +107,7 @@ ]) # FIXME: Should be performed through oln.m4 macros. AC_CONFIG_FILES([ + milena/tests/Makefile olena/tests/algorithms/Makefile olena/tests/check/Makefile olena/tests/check/defs

1 0

1363: Automate the tests in Milena.
by Roland Levillain 22 Oct '07

22 Oct '07

https://svn.lrde.epita.fr/svn/oln/trunk/milena As of now, you can run the whole test suite from the directory tests/ using the command make check from the top-level directory of Milena (not Olena). To run all the tests, even when one fails, add the `-k' option to make: make -k check A second patch on `configure.ac' follows. Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Automate the tests in Milena. * tests/fi_adaptor.cc: Remove useless preprocessor directives on `FREEIMAGE_LIB'. * tests/Makefile.am: New. * Makefile.am (SUBDIRS): Add tests. Makefile.am | 2 tests/Makefile.am | 364 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/fi_adaptor.cc | 5 3 files changed, 365 insertions(+), 6 deletions(-) Index: tests/Makefile.am --- tests/Makefile.am (revision 0) +++ tests/Makefile.am (revision 0) @@ -0,0 +1,364 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +## FIXME: Revamp (see Olena 0.11's test suite). + +AM_CPPFLAGS = -I$(top_srcdir)/milena + +# FIXME: Add +# +# AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) +# +# when oln.m4 is available in the distribution, instead of using the +# set-by-hand TESTS_CXXFLAGS. +TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ +AM_CXXFLAGS = $(TESTS_CXXFLAGS) + + +check_PROGRAMS = \ + accu_all \ + accu_min \ + accu_nil \ + border_get \ + border_resize_image1d_1 \ + border_resize_image1d_2 \ + border_resize_image1d_3 \ + border_resize_image2d_1 \ + border_resize_image2d_2 \ + border_resize_image2d_3 \ + border_resize_image3d_1 \ + border_resize_image3d_2 \ + border_resize_image3d_3 \ + border_resize_image_if \ + border_resize_sub_image \ + box1d \ + box2d \ + box3d \ + canvas_browsing_fwd \ + cast_image \ + chamfer \ + color_pretty \ + convert_to_image \ + convert_to_tiles \ + convert_to_vec_p \ + core_category \ + core_clone \ + core_exact \ + core_initialize \ + debug_println \ + debug_println_with_border \ + decorated_image \ + dpoint1d \ + dpoint2d \ + dpoint3d \ + dpoints_pixter \ + estim_mean \ + fi_adaptor \ + fun_x2x_composed \ + fun_x2x_rotation \ + fun_x2x_translation \ + hexa \ + histo_compute \ + histo_to_image1d \ + h_vec \ + image1d \ + image2d \ + image2d_h \ + image3d \ + image_if \ + image_if_interval \ + image_if_value \ + interpolated \ + io_pbm \ + io_pgm16 \ + io_pgm19 \ + io_pgm27 \ + io_pgm \ + io_ppm16 \ + io_ppm23 \ + io_ppm \ + labeling_algo \ + labeling_estimate \ + labeling_foreground \ + labeling_level_fast \ + labeling_regional_maxima \ + level_approx_median \ + level_assign \ + level_fill \ + level_median \ + level_median_dir \ + level_median_fast \ + level_median_hline2d \ + level_memcpy_ \ + level_memset_ \ + level_naive_median \ + level_paste \ + level_sort_points \ + level_transform \ + line2d \ + linear_convolve \ + linear_gaussian \ + linear_lap \ + linear_log \ + line_convolve \ + line_piter \ + literal_medium_gray \ + literal_zero \ + local_convolve \ + main \ + mat \ + mesh_image \ + metal_converts_to \ + metal_is \ + metal_mat \ + metal_pow \ + metal_unconst \ + metal_vec \ + morpho_contrast \ + morpho_dilation \ + morpho_dilation_max_h \ + morpho_erosion \ + morpho_erosion_min_h \ + morpho_gradient \ + morpho_hit_or_miss \ + morpho_laplacian \ + morpho_opening_area \ + morpho_thinning \ + new_io_pgm \ + norm_l2 \ + pixel \ + pixter1d \ + pixter2d \ + pixter3d \ + plain \ + point1d \ + point2d \ + point3d \ + pset_if \ + pw_image \ + pw_value \ + queue_p \ + queue_p_fast \ + queue_p_fast_priority \ + queue_p_priority \ + rle_image \ + run_pset \ + safe_image \ + seed2tiling \ + set_p \ + show \ + sparse_image \ + stack \ + sub_image \ + test_positive \ + trait_ch_value \ + trait_images \ + trait_op_plus \ + trait_op_uminus \ + trait_super \ + trait_value \ + translate_image \ + tr_image \ + value_float01_bis \ + value_float01 \ + value_float01_f \ + value_graylevel \ + value_interop \ + value_int_s16 \ + value_int_s \ + value_int_u8 \ + value_label \ + value_quat \ + value_rgb8 \ + value_scalar \ + value_set \ + vec \ + win_backdiag2d \ + win_diag2d \ + win_disk2d \ + window1d \ + window2d \ + window3d \ + win_hline2d \ + win_octagon2d \ + win_rectangle2d \ + w_window1d_int \ + w_window2d_int \ + w_window3d_int + +accu_all_SOURCES = accu_all.cc +accu_min_SOURCES = accu_min.cc +accu_nil_SOURCES = accu_nil.cc +border_get_SOURCES = border_get.cc +border_resize_image1d_1_SOURCES = border_resize_image1d_1.cc +border_resize_image1d_2_SOURCES = border_resize_image1d_2.cc +border_resize_image1d_3_SOURCES = border_resize_image1d_3.cc +border_resize_image2d_1_SOURCES = border_resize_image2d_1.cc +border_resize_image2d_2_SOURCES = border_resize_image2d_2.cc +border_resize_image2d_3_SOURCES = border_resize_image2d_3.cc +border_resize_image3d_1_SOURCES = border_resize_image3d_1.cc +border_resize_image3d_2_SOURCES = border_resize_image3d_2.cc +border_resize_image3d_3_SOURCES = border_resize_image3d_3.cc +border_resize_image_if_SOURCES = border_resize_image_if.cc +border_resize_sub_image_SOURCES = border_resize_sub_image.cc +box1d_SOURCES = box1d.cc +box2d_SOURCES = box2d.cc +box3d_SOURCES = box3d.cc +canvas_browsing_fwd_SOURCES = canvas_browsing_fwd.cc +cast_image_SOURCES = cast_image.cc +chamfer_SOURCES = chamfer.cc +color_pretty_SOURCES = color_pretty.cc +convert_to_image_SOURCES = convert_to_image.cc +convert_to_tiles_SOURCES = convert_to_tiles.cc +convert_to_vec_p_SOURCES = convert_to_vec_p.cc +core_category_SOURCES = core_category.cc +core_clone_SOURCES = core_clone.cc +core_exact_SOURCES = core_exact.cc +core_initialize_SOURCES = core_initialize.cc +debug_println_SOURCES = debug_println.cc +debug_println_with_border_SOURCES = debug_println_with_border.cc +decorated_image_SOURCES = decorated_image.cc +dpoint1d_SOURCES = dpoint1d.cc +dpoint2d_SOURCES = dpoint2d.cc +dpoint3d_SOURCES = dpoint3d.cc +dpoints_pixter_SOURCES = dpoints_pixter.cc +estim_mean_SOURCES = estim_mean.cc +fun_x2x_composed_SOURCES = fun_x2x_composed.cc +fun_x2x_rotation_SOURCES = fun_x2x_rotation.cc +fun_x2x_translation_SOURCES = fun_x2x_translation.cc +hexa_SOURCES = hexa.cc +histo_compute_SOURCES = histo_compute.cc +histo_to_image1d_SOURCES = histo_to_image1d.cc +h_vec_SOURCES = h_vec.cc +image1d_SOURCES = image1d.cc +image2d_SOURCES = image2d.cc +image2d_h_SOURCES = image2d_h.cc +image3d_SOURCES = image3d.cc +image_if_SOURCES = image_if.cc +image_if_interval_SOURCES = image_if_interval.cc +image_if_value_SOURCES = image_if_value.cc +interpolated_SOURCES = interpolated.cc +io_pbm_SOURCES = io_pbm.cc +io_pgm16_SOURCES = io_pgm16.cc +io_pgm19_SOURCES = io_pgm19.cc +io_pgm27_SOURCES = io_pgm27.cc +io_pgm_SOURCES = io_pgm.cc +io_ppm16_SOURCES = io_ppm16.cc +io_ppm23_SOURCES = io_ppm23.cc +io_ppm_SOURCES = io_ppm.cc +labeling_algo_SOURCES = labeling_algo.cc +labeling_estimate_SOURCES = labeling_estimate.cc +labeling_foreground_SOURCES = labeling_foreground.cc +labeling_level_fast_SOURCES = labeling_level_fast.cc +labeling_regional_maxima_SOURCES = labeling_regional_maxima.cc +level_approx_median_SOURCES = level_approx_median.cc +level_assign_SOURCES = level_assign.cc +level_fill_SOURCES = level_fill.cc +level_median_SOURCES = level_median.cc +level_median_dir_SOURCES = level_median_dir.cc +level_median_fast_SOURCES = level_median_fast.cc +level_median_hline2d_SOURCES = level_median_hline2d.cc +level_memcpy__SOURCES = level_memcpy_.cc +level_memset__SOURCES = level_memset_.cc +level_naive_median_SOURCES = level_naive_median.cc +level_paste_SOURCES = level_paste.cc +level_sort_points_SOURCES = level_sort_points.cc +level_transform_SOURCES = level_transform.cc +line2d_SOURCES = line2d.cc +linear_convolve_SOURCES = linear_convolve.cc +linear_gaussian_SOURCES = linear_gaussian.cc +linear_lap_SOURCES = linear_lap.cc +linear_log_SOURCES = linear_log.cc +line_convolve_SOURCES = line_convolve.cc +line_piter_SOURCES = line_piter.cc +literal_medium_gray_SOURCES = literal_medium_gray.cc +literal_zero_SOURCES = literal_zero.cc +local_convolve_SOURCES = local_convolve.cc +main_SOURCES = main.cc +mat_SOURCES = mat.cc +mesh_image_SOURCES = mesh_image.cc +metal_converts_to_SOURCES = metal_converts_to.cc +metal_is_SOURCES = metal_is.cc +metal_mat_SOURCES = metal_mat.cc +metal_pow_SOURCES = metal_pow.cc +metal_unconst_SOURCES = metal_unconst.cc +metal_vec_SOURCES = metal_vec.cc +morpho_contrast_SOURCES = morpho_contrast.cc +morpho_dilation_SOURCES = morpho_dilation.cc +morpho_dilation_max_h_SOURCES = morpho_dilation_max_h.cc +morpho_erosion_SOURCES = morpho_erosion.cc +morpho_erosion_min_h_SOURCES = morpho_erosion_min_h.cc +morpho_gradient_SOURCES = morpho_gradient.cc +morpho_hit_or_miss_SOURCES = morpho_hit_or_miss.cc +morpho_laplacian_SOURCES = morpho_laplacian.cc +morpho_opening_area_SOURCES = morpho_opening_area.cc +morpho_thinning_SOURCES = morpho_thinning.cc +new_io_pgm_SOURCES = new_io_pgm.cc +norm_l2_SOURCES = norm_l2.cc +pixel_SOURCES = pixel.cc +pixter1d_SOURCES = pixter1d.cc +pixter2d_SOURCES = pixter2d.cc +pixter3d_SOURCES = pixter3d.cc +plain_SOURCES = plain.cc +point1d_SOURCES = point1d.cc +point2d_SOURCES = point2d.cc +point3d_SOURCES = point3d.cc +pset_if_SOURCES = pset_if.cc +pw_image_SOURCES = pw_image.cc +pw_value_SOURCES = pw_value.cc +queue_p_SOURCES = queue_p.cc +queue_p_fast_SOURCES = queue_p_fast.cc +queue_p_fast_priority_SOURCES = queue_p_fast_priority.cc +queue_p_priority_SOURCES = queue_p_priority.cc +rle_image_SOURCES = rle_image.cc +run_pset_SOURCES = run_pset.cc +safe_image_SOURCES = safe_image.cc +seed2tiling_SOURCES = seed2tiling.cc +set_p_SOURCES = set_p.cc +show_SOURCES = show.cc +sparse_image_SOURCES = sparse_image.cc +stack_SOURCES = stack.cc +sub_image_SOURCES = sub_image.cc +test_positive_SOURCES = test_positive.cc +trait_ch_value_SOURCES = trait_ch_value.cc +trait_images_SOURCES = trait_images.cc +trait_op_plus_SOURCES = trait_op_plus.cc +trait_op_uminus_SOURCES = trait_op_uminus.cc +trait_super_SOURCES = trait_super.cc +trait_value_SOURCES = trait_value.cc +translate_image_SOURCES = translate_image.cc +tr_image_SOURCES = tr_image.cc +value_float01_bis_SOURCES = value_float01_bis.cc +value_float01_SOURCES = value_float01.cc +value_float01_f_SOURCES = value_float01_f.cc +value_graylevel_SOURCES = value_graylevel.cc +value_interop_SOURCES = value_interop.cc +value_int_s16_SOURCES = value_int_s16.cc +value_int_s_SOURCES = value_int_s.cc +value_int_u8_SOURCES = value_int_u8.cc +value_label_SOURCES = value_label.cc +value_quat_SOURCES = value_quat.cc +value_rgb8_SOURCES = value_rgb8.cc +value_scalar_SOURCES = value_scalar.cc +value_set_SOURCES = value_set.cc +vec_SOURCES = vec.cc +win_backdiag2d_SOURCES = win_backdiag2d.cc +win_diag2d_SOURCES = win_diag2d.cc +win_disk2d_SOURCES = win_disk2d.cc +window1d_SOURCES = window1d.cc +window2d_SOURCES = window2d.cc +window3d_SOURCES = window3d.cc +win_hline2d_SOURCES = win_hline2d.cc +win_octagon2d_SOURCES = win_octagon2d.cc +win_rectangle2d_SOURCES = win_rectangle2d.cc +w_window1d_int_SOURCES = w_window1d_int.cc +w_window2d_int_SOURCES = w_window2d_int.cc +w_window3d_int_SOURCES = w_window3d_int.cc + +# Tests depending on the FreeImage library. +if FREE_IMAGE_PLUS + check_PROGRAMS += fi_adaptor + fi_adaptor_SOURCES = fi_adaptor.cc + fi_adaptor_LDADD = $(FREEIMAGELIB) +endif + +TESTS = $(check_PROGRAMS) Index: tests/fi_adaptor.cc --- tests/fi_adaptor.cc (revision 1362) +++ tests/fi_adaptor.cc (working copy) @@ -53,10 +53,8 @@ using typename value::int_u8; using typename value::rgb8; -#ifdef FREEIMAGE_LIB //FIXME : is it necessary?? FreeImage_Initialise(); -#endif // FREEIMAGE_LIB win::rectangle2d rect(51, 51); @@ -74,8 +72,5 @@ display::show (adaptor, "xv"); // call this ONLY when linking with FreeImage as a static library -#ifdef FREEIMAGE_LIB FreeImage_DeInitialise(); -#endif // FREEIMAGE_LIB - } Index: Makefile.am --- Makefile.am (revision 1362) +++ Makefile.am (working copy) @@ -1,6 +1,6 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- -SUBDIRS = doc +SUBDIRS = doc tests .PHONY: doc doc:

1 0

milena r1361: Update fllt
by Guillaume Duhamel 19 Oct '07

19 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-19 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update fllt. * fllt.hh: Update. --- fllt.hh | 5 +++++ 1 file changed, 5 insertions(+) Index: trunk/milena/sandbox/garrigues/fllt.hh =================================================================== --- trunk/milena/sandbox/garrigues/fllt.hh (revision 1360) +++ trunk/milena/sandbox/garrigues/fllt.hh (revision 1361) @@ -168,16 +168,21 @@ set_p& N, V& gn) { + // Count the number of conected components of the border of R. image2d<int> tmp; unsigned n; labeling::level(convert::to_image(N), true, c8(), tmp, n); + if (n > 1) + { // IF number of conected components of the border > 1 + // follow each border to find which is the exterior border // and which are the holes. Keep one pixel of each holes. // Remove from N border of holes. // Recompute gn <- min u(x) x belongs to A + } // g <- gn // A <- {x belongs to N / u(x) == g}

1 0

milena r1360: Update fllt
by Guillaume Duhamel 19 Oct '07

19 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-19 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update fllt. * fllt.hh: Update. --- fllt.hh | 184 +++++++++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 142 insertions(+), 42 deletions(-) Index: trunk/milena/sandbox/garrigues/fllt.hh =================================================================== --- trunk/milena/sandbox/garrigues/fllt.hh (revision 1359) +++ trunk/milena/sandbox/garrigues/fllt.hh (revision 1360) @@ -44,11 +44,13 @@ # include <mln/core/image_if.hh> # include <mln/debug/println.hh> +# include <mln/convert/to_image.hh> # include <mln/level/compute.hh> # include <mln/accu/min.hh> # include <mln/labeling/regional_minima.hh> +# include <mln/labeling/level.hh> # include <mln/fun/ops.hh> # include <mln/pw/value.hh> @@ -57,6 +59,8 @@ namespace mln { +// LOWER LEVEL SET : region = c4, border = c8 +// UPPER LEVEL SET : region = c8, border = c4 // 1) // x0 <- a not tagged local mininum of ima. @@ -94,44 +98,24 @@ // set the gray-level of the pixels of R to g. // GO TO 1) - template <typename V> - void compute_level_set(image2d<V>& ima) - { - typedef point2d P; - typedef image2d<V> I; - typedef mln::image_if< - mln::image2d<V>, - mln::fun::greater_p2b_expr_<mln::pw::value_<mln::image2d<V> >, - mln::pw::cst_<V> > - > I_IF; - - - set_p R, N, A; - V g, gn; - point2d x0; - image2d<V> min_locals(ima.domain()); - image2d<bool> tagged(ima.domain()); - - unsigned nlabels; - labeling::regional_minima(ima, c4(), min_locals, nlabels); - - debug::println(min_locals); - debug::println(min_locals | (pw::value(min_locals) > pw::cst(0))); - - mln_piter(I_IF) p((min_locals | (pw::value(min_locals) > pw::cst(0))).domain()); - for_all(p) + void step1 (const image2d<V>& ima, + point2d p, + V& g, + point2d& x0) { - if (tagged(p)) - continue; - - // 1) // x0 <- a not tagged local mininum of ima. x0 = p; // g <- u(x0) g = ima(x0); + } - // 2) + template <typename P> + void step2 (set_p& A, + set_p& R, + set_p& N, + point2d& x0) + { // A <- {x0} A.clear(); A.insert(x0); @@ -139,10 +123,20 @@ R.clear(); // N <- {} N.clear(); + } - // 3) + + template <typename V, typename P> + void step3 (const image2d<V>& ima, + image2d<bool>& tagged, + set_p& A, + set_p& R, + set_p& N, + V& gn) + { // N <- N union {x neighbor of a pixel in a\R} mln_piter(set_p) qa(A); + for_all(qa) { mln_niter(neighb2d) n(c4(), qa); @@ -162,38 +156,144 @@ R.insert(qa); tagged(qa) = true; } + } - // 4) - // IF g < gn - if (g < gn) + /// IF g < gn. + template <typename V, typename P> + void step4_1 (const image2d<V>& ima, + image2d<bool>& tagged, + set_p& A, + set_p& R, + set_p& N, + V& gn) { + image2d<int> tmp; + unsigned n; + labeling::level(convert::to_image(N), true, c8(), tmp, n); + // IF number of conected components of the border > 1 // follow each border to find which is the exterior border // and which are the holes. Keep one pixel of each holes. - // + // Remove from N border of holes. // Recompute gn <- min u(x) x belongs to A - // + // g <- gn // A <- {x belongs to N / u(x) == g} // N <- N\{x belongs to N / u(x) == g} - // GO TO 3) + } - // IF g == gn - if (g == gn) + + /// IF g == gn. + template <typename V, typename P> + void step4_2 (const image2d<V>& ima, + set_p& A, + set_p& N, + V& g) { + // A <- {x belongs to N / u(x) == g} // N <- N\{x belongs to N / u(x) == g} + + set_p N_tmp (N); + + A.clear(); + N.clear(); + mln_piter(set_p) p(N_tmp); + for_all(p) + { + if (ima (p) == g) + { + A.insert(p); + N.insert(p); + } + } + } + + /// IF g > gn. + template <typename V, typename P> + void step4_3 (image2d<V>& u, + set_p& R, + V& g) + { + // set the gray-level of the pixels of R to g. + mln_piter(set_p) p(R); + for_all(p) + { + mln_assertion (tagged(p)); + u (p) = g; + } + } + + + + + + template <typename V> + void compute_level_set(const image2d<V>& ima) + { + typedef point2d P; + typedef image2d<V> I; + typedef mln::image_if< + mln::image2d<V>, + mln::fun::greater_p2b_expr_<mln::pw::value_<mln::image2d<V> >, + mln::pw::cst_<V> > + > I_IF; + + + set_p R, N, A; + V g, gn; + point2d x0; + image2d<V> min_locals(ima.domain()); + // image2d<V> u = clone(ima); + image2d<bool> tagged(ima.domain()); + + unsigned nlabels; + labeling::regional_minima(ima, c4(), min_locals, nlabels); + + debug::println(min_locals); + debug::println(min_locals | (pw::value(min_locals) > pw::cst(0))); + + /// Algorithm. + { + mln_piter(I_IF) p((min_locals | (pw::value(min_locals) > pw::cst(0))).domain()); + for_all(p) + { + if (tagged(p)) + continue; + + step1(ima, p, g, x0); + step2(A, R, N, x0); + while (1) + { + step3(ima, tagged, A, R, N, gn); + /// step4. + if (g < gn) + { +// step4_1(); // GO TO 3) + continue; } - // IF g > gn + + if (g == gn) + { + step4_2(ima, A, N, g); + // GO TO 3) + continue; + } + + if (g > gn) { - // set the gray-level of the pixels of R to g. + /// FIXME ima -> u + // step4_3(ima, R, g); // GO TO 1) + break; + } + } } } }

1 0

milena r1359: Update fllt
by Matthieu Garrigues 19 Oct '07

19 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-19 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Update fllt. * sandbox/garrigues/fllt.hh: Update. --- fllt.hh | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) Index: trunk/milena/sandbox/garrigues/fllt.hh =================================================================== --- trunk/milena/sandbox/garrigues/fllt.hh (revision 1358) +++ trunk/milena/sandbox/garrigues/fllt.hh (revision 1359) @@ -163,6 +163,38 @@ tagged(qa) = true; } + // 4) + + // IF g < gn + if (g < gn) + { + // IF number of conected components of the border > 1 + // follow each border to find which is the exterior border + // and which are the holes. Keep one pixel of each holes. + // + // Remove from N border of holes. + // Recompute gn <- min u(x) x belongs to A + // + // g <- gn + // A <- {x belongs to N / u(x) == g} + // N <- N\{x belongs to N / u(x) == g} + // GO TO 3) + } + + // IF g == gn + if (g == gn) + { + // A <- {x belongs to N / u(x) == g} + // N <- N\{x belongs to N / u(x) == g} + // GO TO 3) + } + + // IF g > gn + if (g > gn) + { + // set the gray-level of the pixels of R to g. + // GO TO 1) + } } }

1 0

milena r1358: Update fllt
by Matthieu Garrigues 19 Oct '07

19 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-19 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Update fllt. * sandbox/garrigues/fllt.hh: Update. --- fllt.hh | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) Index: trunk/milena/sandbox/garrigues/fllt.hh =================================================================== --- trunk/milena/sandbox/garrigues/fllt.hh (revision 1357) +++ trunk/milena/sandbox/garrigues/fllt.hh (revision 1358) @@ -40,6 +40,8 @@ # include <mln/core/inplace.hh> # include <mln/core/neighb2d.hh> # include <mln/core/pset_if_piter.hh> +# include <mln/core/sub_image.hh> +# include <mln/core/image_if.hh> # include <mln/debug/println.hh> @@ -48,7 +50,6 @@ # include <mln/labeling/regional_minima.hh> -# include <mln/core/image_if.hh> # include <mln/fun/ops.hh> # include <mln/pw/value.hh> # include <mln/pw/cst.hh> @@ -100,16 +101,16 @@ typedef point2d P; typedef image2d<V> I; typedef mln::image_if< - mln::image2d<int>, - mln::fun::greater_p2b_expr_<mln::pw::value_<mln::image2d<int> >, - mln::pw::cst_<int> > + mln::image2d<V>, + mln::fun::greater_p2b_expr_<mln::pw::value_<mln::image2d<V> >, + mln::pw::cst_<V> > > I_IF; set_p R, N, A; V g, gn; point2d x0; - image2d<int> min_locals(ima.domain()); + image2d<V> min_locals(ima.domain()); image2d<bool> tagged(ima.domain()); unsigned nlabels; @@ -151,16 +152,11 @@ } // gn <- min u(x) x belongs to N. - // FIXME : how can I do that? - //gn = level::compute<accu::min>(ima | N); - mln_piter(set_p) qn(N); - accu::min_<V> min; - for_all(qn) - min.take(ima(qn)); - gn = min; + gn = level::compute<accu::min>(ima | N); // R <- R union A // tag the pixels of A. + for_all(qa) { R.insert(qa);

1 0

milena r1357: Starts with FLLT
by Matthieu Garrigues 18 Oct '07

18 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-18 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Starts with FLLT. * mln/core/image_if.hh: Add fixme for theo. * sandbox/garrigues/fllt.hh: Try to implement FLLT. * sandbox/garrigues/test_fllt.cc: a test for FLLT. --- mln/core/image_if.hh | 2 sandbox/garrigues/fllt.hh | 177 +++++++++++++++++++++++++++++++++++++++++ sandbox/garrigues/test_fllt.cc | 29 ++++++ 3 files changed, 208 insertions(+) Index: trunk/milena/mln/core/image_if.hh =================================================================== --- trunk/milena/mln/core/image_if.hh (revision 1356) +++ trunk/milena/mln/core/image_if.hh (revision 1357) @@ -32,6 +32,8 @@ * * \brief Definition of a image which domain is restricted by a * function. + * + * \todo FIXME for theo : add image_if_great_than / less_than */ # include <mln/core/internal/image_if_base.hh> Index: trunk/milena/sandbox/garrigues/fllt.hh =================================================================== --- trunk/milena/sandbox/garrigues/fllt.hh (revision 0) +++ trunk/milena/sandbox/garrigues/fllt.hh (revision 1357) @@ -0,0 +1,177 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + + +#ifndef MLN_LEVEL_MEDIAN_HH +# define MLN_LEVEL_MEDIAN_HH + +/*! \file fllt.hh + * + * \brief Fast level line transform of an image. + * + */ + +# include <mln/core/image2d.hh> +# include <mln/core/set_p.hh> +# include <mln/core/inplace.hh> +# include <mln/core/neighb2d.hh> +# include <mln/core/pset_if_piter.hh> + +# include <mln/debug/println.hh> + +# include <mln/level/compute.hh> +# include <mln/accu/min.hh> + +# include <mln/labeling/regional_minima.hh> + +# include <mln/core/image_if.hh> +# include <mln/fun/ops.hh> +# include <mln/pw/value.hh> +# include <mln/pw/cst.hh> +# include <mln/fun/p2b/chess.hh> + +namespace mln +{ + + // 1) + // x0 <- a not tagged local mininum of ima. + // g <- u(x0) + + // 2) + // A <- {x0} + // R <- {} + // N <- {} + + // 3) + // N <- N union {x neighbor of a pixel in a} + // gn <- min u(x) x belongs to N. + // R <- R union A + // tag the pixels of A. + + // 4) + // IF g < gn + // IF number of conected components of the border > 1 + // follow each border to find which is the exterior border + // and which are the holes. Keep one pixel of each holes. + // + // Remove from N border of holes. + // Recompute gn <- min u(x) x belongs to A + // + // g <- gn + // A <- {x belongs to N / u(x) == g} + // N <- N\{x belongs to N / u(x) == g} + // GO TO 3) + // IF g == gn + // A <- {x belongs to N / u(x) == g} + // N <- N\{x belongs to N / u(x) == g} + // GO TO 3) + // IF g > gn + // set the gray-level of the pixels of R to g. + // GO TO 1) + + + template <typename V> + void compute_level_set(image2d<V>& ima) + { + typedef point2d P; + typedef image2d<V> I; + typedef mln::image_if< + mln::image2d<int>, + mln::fun::greater_p2b_expr_<mln::pw::value_<mln::image2d<int> >, + mln::pw::cst_<int> > + > I_IF; + + + set_p R, N, A; + V g, gn; + point2d x0; + image2d<int> min_locals(ima.domain()); + image2d<bool> tagged(ima.domain()); + + unsigned nlabels; + labeling::regional_minima(ima, c4(), min_locals, nlabels); + + debug::println(min_locals); + debug::println(min_locals | (pw::value(min_locals) > pw::cst(0))); + + mln_piter(I_IF) p((min_locals | (pw::value(min_locals) > pw::cst(0))).domain()); + for_all(p) + { + if (tagged(p)) + continue; + + // 1) + // x0 <- a not tagged local mininum of ima. + x0 = p; + // g <- u(x0) + g = ima(x0); + + // 2) + // A <- {x0} + A.clear(); + A.insert(x0); + // R <- {} + R.clear(); + // N <- {} + N.clear(); + + // 3) + // N <- N union {x neighbor of a pixel in a\R} + mln_piter(set_p) qa(A); + for_all(qa) + { + mln_niter(neighb2d) n(c4(), qa); + for_all (n) + if (!R.has(n)) + N.insert(n); + } + + // gn <- min u(x) x belongs to N. + // FIXME : how can I do that? + //gn = level::compute<accu::min>(ima | N); + mln_piter(set_p) qn(N); + accu::min_<V> min; + for_all(qn) + min.take(ima(qn)); + gn = min; + + // R <- R union A + // tag the pixels of A. + for_all(qa) + { + R.insert(qa); + tagged(qa) = true; + } + + } + } + +} // end of namespace mln + + + +#endif // ! MLN_LEVEL_MEDIAN_HH Index: trunk/milena/sandbox/garrigues/test_fllt.cc =================================================================== --- trunk/milena/sandbox/garrigues/test_fllt.cc (revision 0) +++ trunk/milena/sandbox/garrigues/test_fllt.cc (revision 1357) @@ -0,0 +1,29 @@ +# include <mln/core/image2d.hh> +# include "fllt.hh" +# include <mln/debug/println.hh> +# include <mln/convert/to_w_window.hh> +# include <mln/core/w_window2d_int.hh> +# include <mln/convert/to_image.hh> + +int main() +{ + + using namespace mln; + + int ws[81] = {3,2,3,3,5,5,5,5,5, + 2,1,3,4,4,4,4,5,5, + 2,3,4,2,3,3,2,4,4, + 1,4,2,1,1,2,1,2,2, + 1,2,4,2,1,2,1,1,1, + 1,3,3,4,2,3,2,1,1, + 1,3,3,4,2,3,2,1,1, + 1,3,3,4,2,3,2,1,1, + 1,3,3,4,2,3,2,1,1}; + + w_window2d_int w_win = make::w_window2d(ws); + + image2d<int> ima = convert::to_image(w_win); + + debug::println(ima); + compute_level_set(ima); +}

1 0

milena r1356: Update typo and win_chamfer
by Guillaume Duhamel 17 Oct '07

17 Oct '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-10-17 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update typo and win_chamfer. Update win_chamfer. * mln/make/win_chamfer.hh, * tests/chamfer.cc, * tests/color_pretty.cc, * tests/seed2tiling.cc, * tests/show.cc: Update win_chamfer. Upudate typo. * mln/value/internal/all.hh: New typo. --- mln/make/win_chamfer.hh | 7 ++++--- mln/value/internal/all.hh | 41 +++++++++++++++++++++++++++++++++++++++++ tests/chamfer.cc | 6 +++--- tests/color_pretty.cc | 2 +- tests/seed2tiling.cc | 2 +- tests/show.cc | 2 +- 6 files changed, 51 insertions(+), 9 deletions(-) Index: trunk/milena/tests/chamfer.cc =================================================================== --- trunk/milena/tests/chamfer.cc (revision 1355) +++ trunk/milena/tests/chamfer.cc (revision 1356) @@ -54,7 +54,7 @@ { level::fill(ima, false); ima.at(4,4) = true; - const w_window2d_int& w_win = win_chamfer::mk_chamfer_3x3_int<2, 0> (); + const w_window2d_int& w_win = make::mk_chamfer_3x3_int<2, 0> (); image2d<unsigned> out = geom::chamfer(ima, w_win, max); debug::println(out | value::interval(0, 8)); } @@ -62,7 +62,7 @@ { level::fill(ima, false); ima.at(4,4) = true; - const w_window2d_int& w_win = win_chamfer::mk_chamfer_3x3_int<2, 3> (); + const w_window2d_int& w_win = make::mk_chamfer_3x3_int<2, 3> (); image2d<unsigned> out = geom::chamfer(ima, w_win, max); debug::println(out | value::interval(0, 8)); } @@ -70,7 +70,7 @@ { level::fill(ima, false); ima.at(4,4) = true; - const w_window2d_int& w_win = win_chamfer::mk_chamfer_5x5_int<4, 6, 9> (); + const w_window2d_int& w_win = make::mk_chamfer_5x5_int<4, 6, 9> (); image2d<unsigned> out = geom::chamfer(ima, w_win, max); image2d<unsigned>::fwd_piter p(out.domain()); for_all(p) Index: trunk/milena/tests/seed2tiling.cc =================================================================== --- trunk/milena/tests/seed2tiling.cc (revision 1355) +++ trunk/milena/tests/seed2tiling.cc (revision 1356) @@ -75,7 +75,7 @@ image2d<int_u8> inte2(input.domain()); image2d<int_u8> out(input.domain()); - const w_window2d_int& w_win = win_chamfer::mk_chamfer_3x3_int<2,3> (); + const w_window2d_int& w_win = make::mk_chamfer_3x3_int<2,3> (); unsigned n; labeling::foreground(input, c4(), lab, n); Index: trunk/milena/tests/show.cc =================================================================== --- trunk/milena/tests/show.cc (revision 1355) +++ trunk/milena/tests/show.cc (revision 1356) @@ -58,7 +58,7 @@ // 0 2 0 // 2 p 2 // 0 2 0 - const w_window2d_int& w_win = win_chamfer::mk_chamfer_3x3_int<2, 0> (); + const w_window2d_int& w_win = make::mk_chamfer_3x3_int<2, 0> (); // Call chamfer for a distance image. image2d<unsigned> tmp = geom::chamfer(input, w_win, max); Index: trunk/milena/tests/color_pretty.cc =================================================================== --- trunk/milena/tests/color_pretty.cc (revision 1355) +++ trunk/milena/tests/color_pretty.cc (revision 1356) @@ -56,7 +56,7 @@ // 0 2 0 // 2 p 2 // 0 2 0 - const w_window2d_int& w_win = win_chamfer::mk_chamfer_3x3_int<2, 0> (); + const w_window2d_int& w_win = make::mk_chamfer_3x3_int<2, 0> (); // Call chamfer for a distance image. image2d<unsigned> tmp = geom::chamfer(input, w_win, max); Index: trunk/milena/mln/value/internal/all.hh =================================================================== --- trunk/milena/mln/value/internal/all.hh (revision 0) +++ trunk/milena/mln/value/internal/all.hh (revision 1356) @@ -0,0 +1,41 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_VALUE_INTERNAL_ALL_HH +# define MLN_VALUE_INTERNAL_ALL_HH + +/*! \file mln/value/internal/all.hh + * + * \brief FIXME + */ + +# include <mln/value/internal/encoding.hh> +# include <mln/value/internal/integer.hh> +# include <mln/value/internal/iterable_set.hh> +# include <mln/value/internal/value_like.hh> + +#endif // ! MLN_VALUE_INTERNAL_ALL_HH Index: trunk/milena/mln/make/win_chamfer.hh =================================================================== --- trunk/milena/mln/make/win_chamfer.hh (revision 1355) +++ trunk/milena/mln/make/win_chamfer.hh (revision 1356) @@ -43,7 +43,8 @@ namespace mln { - namespace win_chamfer + + namespace make { template<int d10, int d11> @@ -103,8 +104,8 @@ return (make::w_window2d(ws)); } - } // end of mln::win_chamfer + } // end of namespace mln::make -} // end of mln +} // end of namespace mln #endif // ! MLN_MAKE_WIN_CHAMFER_HH

1 0

milena r1355: Somes fixes due to a previous refactoring of mln::fun::i2v::all
by Simon Nivault 17 Oct '07

17 Oct '07

URL: https://svn.lrde.org/svn/oln/trunk/milena ChangeLog: 2007-10-17 Simon Nivault <simon.nivault(a)lrde.epita.fr> Somes fixes due to a previous refactoring of mln::fun::i2v::all. * mln/core/image1d.hh, * mln/core/image2d.hh, * mln/core/image3d.hh, * mln/core/internal/dpoints_base.hh, * mln/core/point.hh, * mln/metal/vec.hh, * mln/morpho/all.hh, * tests/fun_x2x_composed.cc, * tests/fun_x2x_translation.cc, * tests/mat.cc, * tests/vec.cc: Fix. --- mln/core/image1d.hh | 6 +++--- mln/core/image2d.hh | 6 +++--- mln/core/image3d.hh | 6 +++--- mln/core/internal/dpoints_base.hh | 4 ++-- mln/core/point.hh | 4 ++-- mln/metal/vec.hh | 6 +++--- mln/morpho/all.hh | 14 ++++++++++---- tests/fun_x2x_composed.cc | 4 ++-- tests/fun_x2x_translation.cc | 4 ++-- tests/mat.cc | 6 +++--- tests/vec.cc | 6 +++--- 11 files changed, 36 insertions(+), 30 deletions(-) Index: trunk/milena/tests/fun_x2x_translation.cc =================================================================== --- trunk/milena/tests/fun_x2x_translation.cc (revision 1354) +++ trunk/milena/tests/fun_x2x_translation.cc (revision 1355) @@ -33,7 +33,7 @@ #include <iostream> #include <mln/fun/x2x/translation.hh> -#include <mln/fun/i2v/all.hh> +#include <mln/fun/i2v/all_to.hh> @@ -47,7 +47,7 @@ c = 2.9; metal::vec<3,float> vec1 = make::vec(a, b, c); - fun::x2x::translation<3,float> tr1(all(1.6)); + fun::x2x::translation<3,float> tr1(all_to(1.6)); std::cout << vec1 << std::endl; std::cout << tr1(vec1) << std::endl; Index: trunk/milena/tests/mat.cc =================================================================== --- trunk/milena/tests/mat.cc (revision 1354) +++ trunk/milena/tests/mat.cc (revision 1355) @@ -32,7 +32,7 @@ #include <iostream> -#include <mln/fun/i2v/all.hh> +#include <mln/fun/i2v/all_to.hh> #include <mln/metal/mat.hh> #include <mln/core/h_mat.hh> @@ -42,12 +42,12 @@ { using namespace mln; - metal::mat<1,3,float> m1(all(4.)); + metal::mat<1,3,float> m1(all_to(4.)); metal::mat<2,2,float> m2 = metal::mat<2,2,float>::Id; h_mat<1,float> hm1(m2); h_mat<2,float> hm2; - h_mat<3,float> hm3(all(1.5)); + h_mat<3,float> hm3(all_to(1.5)); metal::mat<4,4,float> m4 = hm3; Index: trunk/milena/tests/fun_x2x_composed.cc =================================================================== --- trunk/milena/tests/fun_x2x_composed.cc (revision 1354) +++ trunk/milena/tests/fun_x2x_composed.cc (revision 1355) @@ -35,7 +35,7 @@ #include <mln/fun/x2x/translation.hh> #include <mln/fun/x2x/rotation.hh> #include <mln/fun/x2x/composed.hh> -#include <mln/fun/i2v/all.hh> +#include <mln/fun/i2v/all_to.hh> @@ -49,7 +49,7 @@ c = 2.9; metal::vec<3,float> vec1 = make::vec(a, b, c); - fun::x2x::translation<3,float> tr(all(1.6)); + fun::x2x::translation<3,float> tr(all_to(1.6)); fun::x2x::rotation<3,float> rot(0.3, 1); std::cout << "vec : " << vec1 << std::endl; Index: trunk/milena/tests/vec.cc =================================================================== --- trunk/milena/tests/vec.cc (revision 1354) +++ trunk/milena/tests/vec.cc (revision 1355) @@ -32,7 +32,7 @@ #include <iostream> -#include <mln/fun/i2v/all.hh> +#include <mln/fun/i2v/all_to.hh> #include <mln/metal/vec.hh> #include <mln/core/h_vec.hh> @@ -42,13 +42,13 @@ { using namespace mln; - metal::vec<1,float> v1(all(4.)); + metal::vec<1,float> v1(all_to(4.)); metal::vec<2,float> v2 = make::vec(6., 2.8); h_vec<1,float> hv1; h_vec<2,float> hv2 = v2.to_h_vec(); // Immersion into homogeneous. - h_vec<3,float> hv3(all(1.5)); + h_vec<3,float> hv3(all_to(1.5)); hv3 += make::vec(0., 0., 0., 0.5); Index: trunk/milena/mln/core/point.hh =================================================================== --- trunk/milena/mln/core/point.hh (revision 1354) +++ trunk/milena/mln/core/point.hh (revision 1355) @@ -35,7 +35,7 @@ # include <mln/core/concept/point.hh> # include <mln/core/internal/coord_impl.hh> -# include <mln/fun/i2v/all.hh> +# include <mln/fun/i2v/all_to.hh> # include <mln/metal/bool.hh> # include <mln/metal/vec.hh> @@ -267,7 +267,7 @@ } template <typename M, typename C> - const point_<M,C> point_<M,C>::origin = all(0); + const point_<M,C> point_<M,C>::origin = all_to(0); template <typename M, typename C> point_<M,C>& Index: trunk/milena/mln/core/internal/dpoints_base.hh =================================================================== --- trunk/milena/mln/core/internal/dpoints_base.hh (revision 1354) +++ trunk/milena/mln/core/internal/dpoints_base.hh (revision 1355) @@ -34,7 +34,7 @@ */ # include <mln/core/internal/set_of.hh> -# include <mln/fun/i2v/all.hh> +# include <mln/fun/i2v/all_to.hh> # include <mln/norm/infty.hh> @@ -103,7 +103,7 @@ template <typename D, typename E> bool dpoints_base_<D,E>::is_centered() const { - static const D origin = all(0); + static const D origin = all_to(0); return this->super_::has(origin); } Index: trunk/milena/mln/core/image1d.hh =================================================================== --- trunk/milena/mln/core/image1d.hh (revision 1354) +++ trunk/milena/mln/core/image1d.hh (revision 1355) @@ -39,7 +39,7 @@ # include <mln/border/thickness.hh> # include <mln/value/set.hh> -# include <mln/fun/i2v/all.hh> +# include <mln/fun/i2v/all_to.hh> # include <mln/core/line_piter.hh> @@ -262,8 +262,8 @@ void data_< image1d<T> >::update_vb_() { - vb_.pmin() = b_.pmin() - dpoint1d(all(bdr_)); - vb_.pmax() = b_.pmax() + dpoint1d(all(bdr_)); + vb_.pmin() = b_.pmin() - dpoint1d(all_to(bdr_)); + vb_.pmax() = b_.pmax() + dpoint1d(all_to(bdr_)); } template <typename T> Index: trunk/milena/mln/core/image2d.hh =================================================================== --- trunk/milena/mln/core/image2d.hh (revision 1354) +++ trunk/milena/mln/core/image2d.hh (revision 1355) @@ -39,7 +39,7 @@ # include <mln/border/thickness.hh> # include <mln/value/set.hh> -# include <mln/fun/i2v/all.hh> +# include <mln/fun/i2v/all_to.hh> # include <mln/core/line_piter.hh> @@ -272,8 +272,8 @@ void data_< image2d<T> >::update_vb_() { - vb_.pmin() = b_.pmin() - dpoint2d(all(bdr_)); - vb_.pmax() = b_.pmax() + dpoint2d(all(bdr_)); + vb_.pmin() = b_.pmin() - dpoint2d(all_to(bdr_)); + vb_.pmax() = b_.pmax() + dpoint2d(all_to(bdr_)); } template <typename T> Index: trunk/milena/mln/core/image3d.hh =================================================================== --- trunk/milena/mln/core/image3d.hh (revision 1354) +++ trunk/milena/mln/core/image3d.hh (revision 1355) @@ -39,7 +39,7 @@ # include <mln/border/thickness.hh> # include <mln/value/set.hh> -# include <mln/fun/i2v/all.hh> +# include <mln/fun/i2v/all_to.hh> # include <mln/core/line_piter.hh> @@ -273,8 +273,8 @@ void data_< image3d<T> >::update_vb_() { - vb_.pmin() = b_.pmin() - dpoint3d(all(bdr_)); - vb_.pmax() = b_.pmax() + dpoint3d(all(bdr_)); + vb_.pmin() = b_.pmin() - dpoint3d(all_to(bdr_)); + vb_.pmax() = b_.pmax() + dpoint3d(all_to(bdr_)); } template <typename T> Index: trunk/milena/mln/metal/vec.hh =================================================================== --- trunk/milena/mln/metal/vec.hh (revision 1354) +++ trunk/milena/mln/metal/vec.hh (revision 1355) @@ -40,7 +40,7 @@ # include <mln/core/concept/object.hh> # include <mln/trait/all.hh> # include <mln/value/props.hh> -# include <mln/fun/i2v/all.hh> +# include <mln/fun/i2v/all_to.hh> # include <mln/value/concept/all.hh> @@ -434,10 +434,10 @@ } template <unsigned n, typename T> - const vec<n, T> vec<n, T>::zero = all(0); + const vec<n, T> vec<n, T>::zero = all_to(0); template <unsigned n, typename T> - const vec<n, T> vec<n, T>::origin = all(0); + const vec<n, T> vec<n, T>::origin = all_to(0); // eq Index: trunk/milena/mln/morpho/all.hh =================================================================== --- trunk/milena/mln/morpho/all.hh (revision 1354) +++ trunk/milena/mln/morpho/all.hh (revision 1355) @@ -41,13 +41,19 @@ namespace morpho { - /// Namespace of morphological image processing routines - /// implementation details. + /*! \namespace impl + * + * \brief Namespace of morphological image processing routines + * implementation details. + */ namespace impl { - /// Namespace of morphological image processing routines generic - /// implementations. + /*! \namespace generic + * + * \brief Namespace of morphological image processing routines + * generic implementations. + */ namespace generic { }

1 0