October 2012 - Olena-patches

branch exp/khalimsky updated: olena-2.0-151-g5ee0431
by git＠lrde.epita.fr 29 Oct '12

29 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/khalimsky has been updated via 5ee0431581d8905678c4823763e8c929f9cbe1d2 (commit) via 1900032a893ee9b05c63d3f0bf4a2708dd71f80a (commit) via e9f27f7cb1ea8838b14cb139485867936c1a8d9b (commit) from 79013f593d29d76f1cedd81e2b82b592456bb16e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 5ee0431 mln/world/kn/fill_0_from_1_faces.hh: Add an overload with functions. 1900032 Cleanup code. e9f27f7 Add kn::border::compute_1_faces. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 27 ++++++ milena/mln/world/k1/fill_0_from_1_faces.hh | 6 +- milena/mln/world/k1/fill_1_from_2_faces.hh | 3 + .../{duplicate_2_faces.hh => compute_1_faces.hh} | 85 ++++++++------------ milena/mln/world/kn/border/duplicate_2_faces.hh | 2 +- milena/mln/world/kn/fill_0_from_1_faces.hh | 25 ++++++- milena/mln/world/kn/fill_0_from_2_faces.hh | 7 +- milena/mln/world/kn/fill_1_from_2_faces.hh | 3 + milena/mln/world/kn/fill_1_from_aux_2_faces.hh | 3 + milena/mln/world/kn/fill_2_from_1_faces.hh | 7 +- 10 files changed, 103 insertions(+), 65 deletions(-) copy milena/mln/world/kn/border/{duplicate_2_faces.hh => compute_1_faces.hh} (57%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-151-g5ee0431 mln/world/kn/fill_0_from_1_faces.hh: Add an overload with functions.
by Guillaume Lazzara 29 Oct '12

29 Oct '12

--- milena/ChangeLog | 5 +++++ milena/mln/world/kn/fill_0_from_1_faces.hh | 25 ++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9393cd2..9c34521 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/world/kn/fill_0_from_1_faces.hh: Add an overload with + functions. + +2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + Cleanup code. * mln/world/k1/fill_0_from_1_faces.hh, diff --git a/milena/mln/world/kn/fill_0_from_1_faces.hh b/milena/mln/world/kn/fill_0_from_1_faces.hh index 3d1548d..adcea78 100644 --- a/milena/mln/world/kn/fill_0_from_1_faces.hh +++ b/milena/mln/world/kn/fill_0_from_1_faces.hh @@ -33,7 +33,6 @@ # include <mln/core/alias/point2d.hh> # include <mln/world/kn/is_0_face.hh> - namespace mln { @@ -69,6 +68,10 @@ namespace mln void fill_0_from_1_faces(Image& inout, const Accumulator<A>& accu); + template <typename I, typename F> + void fill_0_from_1_faces(Image& inout, + const Function_vvvv2v<F>& f); + # ifndef MLN_INCLUDE_ONLY @@ -108,6 +111,26 @@ namespace mln } + template <typename I, typename F> + void fill_0_from_1_faces(Image& inout_, + const Function_vvvv2v<F>& f_) + { + trace::entering("mln::world::kn::fill_0_from_1_faces"); + + mln_precondition(exact(inout_).is_valid()); + I& inout = exact(inout_); + const F& f = exact(f_); + + mln_piter(I) p(inout.domain()); + for_all(p) + if (is_0_face(p)) + inout(p) = f(inout(p + left), inout(p + right), + inout(p + up), inout(p + down)); + + trace::exiting("mln::world::kn::fill_0_from_1_faces"); + } + + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::world::kn -- 1.7.2.5

1 0

olena-2.0-150-g1900032 Cleanup code.
by Guillaume Lazzara 29 Oct '12

29 Oct '12

* mln/world/k1/fill_0_from_1_faces.hh, * mln/world/kn/fill_0_from_2_faces.hh, * mln/world/kn/fill_2_from_1_faces.hh: Do not use temporary variable. * mln/world/kn/border/duplicate_2_faces.hh: Fix a precondition. --- milena/ChangeLog | 11 +++++++++++ milena/mln/world/k1/fill_0_from_1_faces.hh | 6 ++---- milena/mln/world/kn/border/duplicate_2_faces.hh | 2 +- milena/mln/world/kn/fill_0_from_2_faces.hh | 7 +++---- milena/mln/world/kn/fill_2_from_1_faces.hh | 7 +++---- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 31adb4c..9393cd2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + Cleanup code. + + * mln/world/k1/fill_0_from_1_faces.hh, + * mln/world/kn/fill_0_from_2_faces.hh, + * mln/world/kn/fill_2_from_1_faces.hh: Do not use temporary + variable. + + * mln/world/kn/border/duplicate_2_faces.hh: Fix a precondition. + +2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + Add kn::border::compute_1_faces. * mln/world/kn/border/compute_1_faces.hh: New. diff --git a/milena/mln/world/k1/fill_0_from_1_faces.hh b/milena/mln/world/k1/fill_0_from_1_faces.hh index 0568220..c906461 100644 --- a/milena/mln/world/k1/fill_0_from_1_faces.hh +++ b/milena/mln/world/k1/fill_0_from_1_faces.hh @@ -35,7 +35,6 @@ # include <mln/world/kn/is_1_face_vertical.hh> # include <mln/world/kn/is_1_face_horizontal.hh> - namespace mln { @@ -45,7 +44,7 @@ namespace mln namespace k1 { - /*! \brief Fill 1 faces in a K1 2D image using its 2 faces. + /*! \brief Fill 0 faces in a K1 2D image using its 1 faces. \param[in,out] inout A 2D image immersed in K1. \param[in,out] f A functor computing a result from two values. @@ -109,8 +108,7 @@ namespace mln A accu(exact(accu_)); - mln_box(I) b = inout.domain(); - mln_piter(I) p(b); + mln_piter(I) p(inout.domain()); for_all(p) if (kn::is_0_face(p)) { diff --git a/milena/mln/world/kn/border/duplicate_2_faces.hh b/milena/mln/world/kn/border/duplicate_2_faces.hh index 2d1c89f..b8ff7d3 100644 --- a/milena/mln/world/kn/border/duplicate_2_faces.hh +++ b/milena/mln/world/kn/border/duplicate_2_faces.hh @@ -69,7 +69,7 @@ namespace mln trace::entering("mln::world::kn::duplicate_2_faces"); mln_precondition(exact(inout_).is_valid()); - mln_precondition(exact(inout_).border() > 0); + mln_precondition(exact(inout_).border() >= 1); I& inout = exact(inout_); def::coord diff --git a/milena/mln/world/kn/fill_0_from_2_faces.hh b/milena/mln/world/kn/fill_0_from_2_faces.hh index 798bed3..6e6ee82 100644 --- a/milena/mln/world/kn/fill_0_from_2_faces.hh +++ b/milena/mln/world/kn/fill_0_from_2_faces.hh @@ -33,7 +33,6 @@ # include <mln/core/alias/point2d.hh> # include <mln/world/kn/is_0_face.hh> - namespace mln { @@ -84,7 +83,8 @@ namespace mln mln_piter(I) p(inout.domain()); for_all(p) if (kn::is_0_face(p)) - inout(p) = f(inout(p + up_left), inout(p + up_right), inout(p + down_left), inout(p + down_right)); + inout(p) = f(inout(p + up_left), inout(p + up_right), + inout(p + down_left), inout(p + down_right)); trace::exiting("mln::world::kn::fill_0_from_2_faces"); } @@ -100,8 +100,7 @@ namespace mln (void) accu_; A accu = A(); - mln_box(I) b = inout.domain(); - mln_piter(I) p(b); + mln_piter(I) p(inout.domain()); for_all(p) if (kn::is_0_face(p)) { diff --git a/milena/mln/world/kn/fill_2_from_1_faces.hh b/milena/mln/world/kn/fill_2_from_1_faces.hh index f3c7c7e..097e50f 100644 --- a/milena/mln/world/kn/fill_2_from_1_faces.hh +++ b/milena/mln/world/kn/fill_2_from_1_faces.hh @@ -33,7 +33,6 @@ # include <mln/core/alias/point2d.hh> # include <mln/world/kn/is_2_face.hh> - namespace mln { @@ -84,7 +83,8 @@ namespace mln mln_piter(I) p(inout.domain()); for_all(p) if (kn::is_2_face(p)) - inout(p) = f(inout(p + up), inout(p + left), inout(p + right), inout(p + down)); + inout(p) = f(inout(p + up), inout(p + left), + inout(p + right), inout(p + down)); trace::exiting("mln::world::kn::fill_2_from_1_faces"); } @@ -100,8 +100,7 @@ namespace mln (void) accu_; A accu = A(); - mln_box(I) b = inout.domain(); - mln_piter(I) p(b); + mln_piter(I) p(inout.domain()); for_all(p) if (kn::is_2_face(p)) { -- 1.7.2.5

1 0

olena-2.0-149-ge9f27f7 Add kn::border::compute_1_faces.
by Guillaume Lazzara 29 Oct '12

29 Oct '12

* mln/world/kn/border/compute_1_faces.hh: New. * mln/world/k1/fill_1_from_2_faces.hh, * mln/world/kn/fill_1_from_2_faces.hh, * mln/world/kn/fill_1_from_aux_2_faces.hh: Make use of kn::border::compute_1_faces. --- milena/ChangeLog | 11 +++ milena/mln/world/k1/fill_1_from_2_faces.hh | 3 + .../{duplicate_2_faces.hh => compute_1_faces.hh} | 85 ++++++++------------ milena/mln/world/kn/fill_1_from_2_faces.hh | 3 + milena/mln/world/kn/fill_1_from_aux_2_faces.hh | 3 + 5 files changed, 54 insertions(+), 51 deletions(-) copy milena/mln/world/kn/border/{duplicate_2_faces.hh => compute_1_faces.hh} (57%) diff --git a/milena/ChangeLog b/milena/ChangeLog index f93a95b..31adb4c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add kn::border::compute_1_faces. + + * mln/world/kn/border/compute_1_faces.hh: New. + + * mln/world/k1/fill_1_from_2_faces.hh, + * mln/world/kn/fill_1_from_2_faces.hh, + * mln/world/kn/fill_1_from_aux_2_faces.hh: Make use of + kn::border::compute_1_faces. + 2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> Various fixes. diff --git a/milena/mln/world/k1/fill_1_from_2_faces.hh b/milena/mln/world/k1/fill_1_from_2_faces.hh index 3db133f..72922ec 100644 --- a/milena/mln/world/k1/fill_1_from_2_faces.hh +++ b/milena/mln/world/k1/fill_1_from_2_faces.hh @@ -33,6 +33,7 @@ # include <mln/core/alias/point2d.hh> # include <mln/world/kn/is_1_face_vertical.hh> # include <mln/world/kn/is_1_face_horizontal.hh> +# include <mln/world/kn/border/compute_1_faces.hh> namespace mln { @@ -90,6 +91,8 @@ namespace mln I& inout = exact(inout_); const F& f = exact(f_); + kn::border::compute_1_faces(inout, f); + mln_box(I) b = inout.domain(); mln_piter(I) p(b); for_all(p) diff --git a/milena/mln/world/kn/border/duplicate_2_faces.hh b/milena/mln/world/kn/border/compute_1_faces.hh similarity index 57% copy from milena/mln/world/kn/border/duplicate_2_faces.hh copy to milena/mln/world/kn/border/compute_1_faces.hh index 2d1c89f..9788efc 100644 --- a/milena/mln/world/kn/border/duplicate_2_faces.hh +++ b/milena/mln/world/kn/border/compute_1_faces.hh @@ -27,11 +27,13 @@ /// /// \brief Duplicate 2 faces in KN 2D images borders. -#ifndef MLN_WORLD_KN_BORDER_DUPLICATE_2_FACES_HH -# define MLN_WORLD_KN_BORDER_DUPLICATE_2_FACES_HH +#ifndef MLN_WORLD_KN_BORDER_COMPUTE_1_FACES_HH +# define MLN_WORLD_KN_BORDER_COMPUTE_1_FACES_HH # include <mln/core/concept/image.hh> # include <mln/world/kn/is_2_face.hh> +# include <mln/world/kn/is_1_face_horizontal.hh> +# include <mln/world/kn/is_1_face_vertical.hh> # include <mln/geom/min_row.hh> # include <mln/geom/min_col.hh> # include <mln/geom/max_row.hh> @@ -50,84 +52,65 @@ namespace mln namespace border { - /*! \brief Duplicate 2 faces in Kn 2D images borders. + /*! \brief Compute 1 faces in Kn 2D images borders. \param[in,out] inout A 2D image immersed in KN. + \param[in,out] f A function computing 1-faces values from 2 + 2-faces values. */ - template <typename I> - void duplicate_2_faces(Image& inout); + template <typename I, typename F> + void compute_1_faces(Image& inout, const Function_vv2v<F>& f); # ifndef MLN_INCLUDE_ONLY - template <typename I> - void duplicate_2_faces(Image& inout_) + template <typename I, typename F> + void compute_1_faces(Image& inout_, const Function_vv2v<F>& f_) { - trace::entering("mln::world::kn::duplicate_2_faces"); + trace::entering("mln::world::kn::compute_1_faces"); mln_precondition(exact(inout_).is_valid()); - mln_precondition(exact(inout_).border() > 0); + mln_precondition(exact(inout_).border() >= 1); I& inout = exact(inout_); + const F& f = exact(f_); def::coord - min_row_1 = geom::min_row(inout) + 1, - max_row_1 = geom::max_row(inout) - 1, - min_col_1 = geom::min_col(inout) + 1, - max_col_1 = geom::max_col(inout) - 1; - - /* Fill horizontal border - - a b - . - . - . - | a | b | - . - . - . - a b - */ + min_row_1 = geom::min_row(inout) - 1, + max_row_1 = geom::max_row(inout) + 1, + min_col_1 = geom::min_col(inout) - 1, + max_col_1 = geom::max_col(inout) + 1; + + // Fill horizontal border for (def::coord col = min_col_1; col <= max_col_1; ++col) { - if (is_2_face(min_row_1, col)) + std::cout << min_row_1 << "," << col << std::endl; + if (is_1_face_vertical(min_row_1, col)) { // First row - inout.at_(min_row_1 - 2, col) = inout.at_(min_row_1, col); + inout.at_(min_row_1, col) = f(inout.at_(min_row_1, col - 1), + inout.at_(min_row_1, col + 1)); // Last row - inout.at_(max_row_1 + 2, col) = inout.at_(max_row_1, col); + inout.at_(max_row_1, col) = f(inout.at_(max_row_1, col - 1), + inout.at_(max_row_1, col + 1)); } } - /* Fill vertical border - - - . - . - . - a | a | b | b - . - . - . - - */ + // Fill vertical border for (def::coord row = min_row_1; row <= max_row_1; ++row) - if (is_2_face(row, min_col_1)) + if (is_1_face_horizontal(row, min_col_1)) { // First col - inout.at_(row, min_col_1 - 2) = inout.at_(row, min_col_1); + inout.at_(row, min_col_1) = f(inout.at_(row - 1, min_col_1), + inout.at_(row + 1, min_col_1)); // Last col - inout.at_(row, max_col_1 + 2) = inout.at_(row, max_col_1); + inout.at_(row, max_col_1) = f(inout.at_(row - 1, max_col_1), + inout.at_(row + 1, max_col_1)); } - /* Handle the four corners - - a | | b - - . - . - . - - | a | b | - - . - . - . - - a | | b - */ - inout.at_(min_row_1 - 2, min_col_1 - 2) = inout.at_(min_row_1, min_col_1); - inout.at_(min_row_1 - 2, max_col_1 + 2) = inout.at_(min_row_1, max_col_1); - inout.at_(max_row_1 + 2, min_col_1 - 2) = inout.at_(max_row_1, min_col_1); - inout.at_(max_row_1 + 2, max_col_1 + 2) = inout.at_(max_row_1, max_col_1); - - trace::exiting("mln::world::kn::duplicate_2_faces"); + trace::exiting("mln::world::kn::compute_1_faces"); } @@ -141,4 +124,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_WORLD_KN_BORDER_DUPLICATE_2_FACES_HH +#endif // ! MLN_WORLD_KN_BORDER_COMPUTE_1_FACES_HH diff --git a/milena/mln/world/kn/fill_1_from_2_faces.hh b/milena/mln/world/kn/fill_1_from_2_faces.hh index 0c024b3..2177f48 100644 --- a/milena/mln/world/kn/fill_1_from_2_faces.hh +++ b/milena/mln/world/kn/fill_1_from_2_faces.hh @@ -33,6 +33,7 @@ # include <mln/core/alias/point2d.hh> # include <mln/world/kn/is_1_face_vertical.hh> # include <mln/world/kn/is_1_face_horizontal.hh> +# include <mln/world/kn/border/compute_1_faces.hh> namespace mln { @@ -124,6 +125,8 @@ namespace mln I& inout = exact(inout_); const F& f = exact(f_); + kn::border::compute_1_faces(inout, f); + mln_piter(I) p(inout.domain()); for_all(p) if (kn::is_1_face_vertical(p)) diff --git a/milena/mln/world/kn/fill_1_from_aux_2_faces.hh b/milena/mln/world/kn/fill_1_from_aux_2_faces.hh index 987e3b7..820e78f 100644 --- a/milena/mln/world/kn/fill_1_from_aux_2_faces.hh +++ b/milena/mln/world/kn/fill_1_from_aux_2_faces.hh @@ -34,6 +34,7 @@ # include <mln/core/alias/point2d.hh> # include <mln/world/kn/is_1_face_vertical.hh> # include <mln/world/kn/is_1_face_horizontal.hh> +# include <mln/world/kn/border/compute_1_faces.hh> namespace mln { @@ -102,6 +103,8 @@ namespace mln const J& aux = exact(aux_); F& f = exact(f_); + kn::border::compute_1_faces(inout, f); + mln_piter(I) p(inout.domain()); for_all(p) if (kn::is_1_face_vertical(p)) -- 1.7.2.5

1 0

branch exp/khalimsky updated: olena-2.0-148-g79013f5
by git＠lrde.epita.fr 26 Oct '12

26 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/khalimsky has been updated via 79013f593d29d76f1cedd81e2b82b592456bb16e (commit) via f8e75ed57ad6a572e0b4840f6308e4579f3a5fdc (commit) via bf7a3ece9d5dcba15c4dd028df9a2d1195e7817f (commit) via e4b6a470fe55600ead95980046bfb96a29e01ca9 (commit) via be9340afeac8315e35e9a92a2b264342e5e1fe1d (commit) via 1c7f750c08192f7f837f2b7e1c5244851642c9fb (commit) via efea70de81a2ac0c3a940016a22acb11adcb8670 (commit) from 42e50d9744a45238055e9a2723b257382100e738 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 79013f5 Various fixes. f8e75ed Handle border effects while computing 1-faces values. bf7a3ec Improve interface of hqueues. e4b6a47 Add missing typedef in functions. be9340a Add sum functions. 1c7f750 Add kn::border routines working on 2-faces. efea70d configure.ac: Configure milena/tests/world/kn/border/Makefile.am. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 + configure.ac | 1 + milena/ChangeLog | 74 ++++++++++ milena/mln/fun/vv2v/sum.hh | 75 ++++++++++ milena/mln/fun/vvvv2v/max.hh | 7 +- milena/mln/fun/vvvv2v/mean.hh | 7 +- milena/mln/fun/vvvv2v/median.hh | 6 +- milena/mln/fun/vvvv2v/min.hh | 7 +- milena/mln/fun/vvvv2v/sum.hh | 76 ++++++++++ milena/mln/util/hqueue.hh | 28 ++-- milena/mln/world/k1/fill_1_from_2_faces.hh | 13 +- milena/mln/world/k1/immerse_with.hh | 40 ++++++ .../k2/fill_non_primary_from_primary_2_faces.hh | 10 +- .../world/kn/border/adjust_duplicate_2_faces.hh | 95 +++++++++++++ milena/mln/world/kn/border/duplicate_2_faces.hh | 144 ++++++++++++++++++++ milena/mln/world/kn/compute_tree_of_shapes.hh | 14 +- milena/mln/world/kn/fill_1_from_2_faces.hh | 33 ++++- milena/mln/world/kn/fill_1_from_aux_2_faces.hh | 15 ++- .../kn/internal/fill_primary_2_faces_from_input.hh | 3 + .../mln/world/kn/internal/get_background_label.hh | 13 +- milena/tests/world/k1/fill_1_from_2_faces.cc | 82 ++++++------ milena/tests/world/k1/immerse_with.cc | 25 ++-- .../k2/fill_non_primary_from_primary_2_faces.cc | 37 +----- milena/tests/world/kn/Makefile.am | 4 +- milena/tests/world/kn/accu/max_interval.cc | 13 +- milena/tests/world/kn/accu/min_interval.cc | 13 +- milena/tests/world/kn/border/Makefile.am | 26 ++++ .../world/kn/border/adjust_duplicate_2_faces.cc | 68 +++++++++ milena/tests/world/kn/border/duplicate_2_faces.cc | 66 +++++++++ milena/tests/world/kn/fill_1_from_2_faces.cc | 59 ++++----- milena/tests/world/kn/fill_1_from_aux_2_faces.cc | 61 ++++----- 31 files changed, 893 insertions(+), 226 deletions(-) create mode 100644 milena/mln/fun/vv2v/sum.hh create mode 100644 milena/mln/fun/vvvv2v/sum.hh create mode 100644 milena/mln/world/kn/border/adjust_duplicate_2_faces.hh create mode 100644 milena/mln/world/kn/border/duplicate_2_faces.hh create mode 100644 milena/tests/world/kn/border/Makefile.am create mode 100644 milena/tests/world/kn/border/adjust_duplicate_2_faces.cc create mode 100644 milena/tests/world/kn/border/duplicate_2_faces.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-148-g79013f5 Various fixes.
by Guillaume Lazzara 26 Oct '12

26 Oct '12

* mln/world/k1/fill_1_from_2_faces.hh: Fix initialization of the accumulator. * mln/world/k1/immerse_with.hh, * mln/world/kn/fill_1_from_2_faces.hh: Add an overload with functions. * mln/world/k2/fill_non_primary_from_primary_2_faces.hh: Cast to a specific type. * mln/world/kn/fill_1_from_aux_2_faces.hh: Initialize the accumulator. * mln/world/kn/internal/get_background_label.hh: Use mln::geom routines. * tests/world/k1/immerse_with.cc: Improve test. * tests/world/k2/fill_non_primary_from_primary_2_faces.cc: Make use of new functions. * tests/world/kn/accu/max_interval.cc, * tests/world/kn/accu/min_interval.cc: Fix test. --- milena/ChangeLog | 26 +++++++++++++ milena/mln/world/k1/fill_1_from_2_faces.hh | 13 ++++-- milena/mln/world/k1/immerse_with.hh | 40 ++++++++++++++++++++ .../k2/fill_non_primary_from_primary_2_faces.hh | 10 +++-- milena/mln/world/kn/fill_1_from_2_faces.hh | 33 ++++++++++++++-- milena/mln/world/kn/fill_1_from_aux_2_faces.hh | 15 ++++--- .../mln/world/kn/internal/get_background_label.hh | 13 ++++-- milena/tests/world/k1/immerse_with.cc | 25 +++++++----- .../k2/fill_non_primary_from_primary_2_faces.cc | 37 ++---------------- milena/tests/world/kn/accu/max_interval.cc | 13 +++--- milena/tests/world/kn/accu/min_interval.cc | 13 +++--- 11 files changed, 158 insertions(+), 80 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6c1f276..f93a95b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,31 @@ 2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Various fixes. + + * mln/world/k1/fill_1_from_2_faces.hh: Fix initialization of the + accumulator. + + * mln/world/k1/immerse_with.hh, + * mln/world/kn/fill_1_from_2_faces.hh: Add an overload with functions. + + * mln/world/k2/fill_non_primary_from_primary_2_faces.hh: Cast to a + specific type. + + * mln/world/kn/fill_1_from_aux_2_faces.hh: Initialize the accumulator. + + * mln/world/kn/internal/get_background_label.hh: Use mln::geom + routines. + + * tests/world/k1/immerse_with.cc: Improve test. + + * tests/world/k2/fill_non_primary_from_primary_2_faces.cc: Make + use of new functions. + + * tests/world/kn/accu/max_interval.cc, + * tests/world/kn/accu/min_interval.cc: Fix test. + +2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Handle border effects while computing 1-faces values. * mln/world/kn/internal/fill_primary_2_faces_from_input.hh: diff --git a/milena/mln/world/k1/fill_1_from_2_faces.hh b/milena/mln/world/k1/fill_1_from_2_faces.hh index b8bf9cd..3db133f 100644 --- a/milena/mln/world/k1/fill_1_from_2_faces.hh +++ b/milena/mln/world/k1/fill_1_from_2_faces.hh @@ -34,7 +34,6 @@ # include <mln/world/kn/is_1_face_vertical.hh> # include <mln/world/kn/is_1_face_horizontal.hh> - namespace mln { @@ -70,6 +69,8 @@ namespace mln void fill_1_from_2_faces(Image& inout, const Function_vv2v<F>& f); /// \overload + /// This implementation do not read values outside of the image + /// domain. template <typename I, typename A> void fill_1_from_2_faces(Image& inout, const Accumulator<A>& accu); @@ -89,7 +90,8 @@ namespace mln I& inout = exact(inout_); const F& f = exact(f_); - mln_piter(I) p(inout.domain()); + mln_box(I) b = inout.domain(); + mln_piter(I) p(b); for_all(p) if (kn::is_1_face_vertical(p)) inout(p) = f(inout(p + left), inout(p + right)); @@ -106,13 +108,13 @@ namespace mln mln_precondition(exact(inout_).is_valid()); I& inout = exact(inout_); - A accu(accu_); + A accu(exact(accu_)); - mln_box(I) b = inout.domain(); - mln_piter(I) p(b); + mln_piter(I) p(inout.domain()); for_all(p) if (kn::is_1_face_vertical(p)) { + accu.init(); if (inout.domain().has(p + left)) accu.take(inout(p + left)); if (inout.domain().has(p + right)) @@ -121,6 +123,7 @@ namespace mln } else if (kn::is_1_face_horizontal(p)) { + accu.init(); if (inout.domain().has(p + up)) accu.take(inout(p + up)); if (inout.domain().has(p + down)) diff --git a/milena/mln/world/k1/immerse_with.hh b/milena/mln/world/k1/immerse_with.hh index d52bbe7..aa9658b 100644 --- a/milena/mln/world/k1/immerse_with.hh +++ b/milena/mln/world/k1/immerse_with.hh @@ -67,10 +67,21 @@ namespace mln 0-faces are valued with function \p f4, considering a 4-connexity with its 1-face neighbors. + Inner-border 0 and 1 faces are initialized with \p + default_value. */ template <typename I, typename V, typename F2, typename F4> mln_ch_value(I, V) immerse_with(const Image& ima, const V& new_value_type, + const V& default_value, + const Function_vv2v<F2>& f_1faces, + const Function_vvvv2v<F4>& f_0faces); + + /// \overload + /// 0 and 1 faces in the inner border are not initialized. + template <typename I, typename V, typename F2, typename F4> + mln_ch_value(I, V) + immerse_with(const Image& ima, const V& new_value_type, const Function_vv2v<F2>& f_1faces, const Function_vvvv2v<F4>& f_0faces); @@ -106,6 +117,35 @@ namespace mln return output; } + template <typename I, typename V, typename F2, typename F4> + mln_ch_value(I, V) + immerse_with(const Image& ima_, const V& new_value_type, + const V& default_value, + const Function_vv2v<F2>& f_1faces_, + const Function_vvvv2v<F4>& f_0faces_) + { + trace::entering("mln::world::k1::immerse_with"); + mln_precondition(exact(ima_).is_valid()); + + // FIXME: we cannot write that test because we rely on + // safe_convert. So, even though some types may not + // have conversions available by default, conversion + // may work... + //mlc_converts_to(mln_result(F2), V)::check(); + //mlc_converts_to(mln_result(F4), V)::check(); + + const I& ima = exact(ima_); + const F2& f_1faces = exact(f_1faces_); + const F4& f_0faces = exact(f_0faces_); + + mln_ch_value(I,V) output = k1::immerse(ima, new_value_type, default_value); + k1::fill_1_from_2_faces(output, f_1faces); + k1::fill_0_from_1_faces(output, f_0faces); + + trace::exiting("mln::world::k1::immerse_with"); + return output; + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::world::k1 diff --git a/milena/mln/world/k2/fill_non_primary_from_primary_2_faces.hh b/milena/mln/world/k2/fill_non_primary_from_primary_2_faces.hh index 8bf7f84..0f8d71c 100644 --- a/milena/mln/world/k2/fill_non_primary_from_primary_2_faces.hh +++ b/milena/mln/world/k2/fill_non_primary_from_primary_2_faces.hh @@ -116,25 +116,27 @@ namespace mln const F2& f_intermediate = exact(f_intermediate_); const F4& f_center = exact(f_center_); + typedef mln_value(I) VI; typedef mln_argument(F2) V2; typedef mln_argument(F4) V4; - mln_piter(I) p(ima.domain()); + mln_box(I) b = ima.domain(); + mln_piter(I) p(b); for_all(p) if (is_non_primary_2_face_vertical(p)) { - ima(p) = kn::safe_cast( + ima(p) = kn::safe_cast_to<VI>( f_intermediate(kn::safe_cast_to<V2>(ima(p + 2 * left)), kn::safe_cast_to<V2>(ima(p + 2 * right)))); } else if (is_non_primary_2_face_horizontal(p)) { - ima(p) = kn::safe_cast( + ima(p) = kn::safe_cast_to<VI>( f_intermediate(kn::safe_cast_to<V2>(ima(p + 2 * up)), kn::safe_cast_to<V2>(ima(p + 2 * down)))); } else if (is_non_primary_2_face_center(p)) { - ima(p) = kn::safe_cast( + ima(p) = kn::safe_cast_to<VI>( f_center(kn::safe_cast_to<V4>(ima(p + 2 * up_left)), kn::safe_cast_to<V4>(ima(p + 2 * up_right)), kn::safe_cast_to<V4>(ima(p + 2 * down_left)), diff --git a/milena/mln/world/kn/fill_1_from_2_faces.hh b/milena/mln/world/kn/fill_1_from_2_faces.hh index 3a8b93c..0c024b3 100644 --- a/milena/mln/world/kn/fill_1_from_2_faces.hh +++ b/milena/mln/world/kn/fill_1_from_2_faces.hh @@ -34,7 +34,6 @@ # include <mln/world/kn/is_1_face_vertical.hh> # include <mln/world/kn/is_1_face_horizontal.hh> - namespace mln { @@ -69,6 +68,12 @@ namespace mln template <typename I, typename A> void fill_1_from_2_faces(Image& inout, const Accumulator<A>& accu); + /// \overload + /// This implementation duplicate 2-faces in border in order to + /// be able to read values outside of the image domain. + template <typename I, typename F> + void fill_1_from_2_faces(Image& inout, const Function_vv2v<F>& f); + # ifndef MLN_INCLUDE_ONLY @@ -83,11 +88,9 @@ namespace mln mln_precondition(exact(inout_).is_valid()); I& inout = exact(inout_); - (void) accu_; - A accu = A(); - mln_box(I) b = inout.domain(); - mln_piter(I) p(b); + A accu(exact(accu_)); + mln_piter(I) p(inout.domain()); for_all(p) if (kn::is_1_face_vertical(p)) { @@ -112,6 +115,26 @@ namespace mln } + template <typename I, typename F> + void fill_1_from_2_faces(Image& inout_, const Function_vv2v<F>& f_) + { + trace::entering("mln::world::kn::fill_1_from_2_faces"); + + mln_precondition(exact(inout_).is_valid()); + I& inout = exact(inout_); + const F& f = exact(f_); + + mln_piter(I) p(inout.domain()); + for_all(p) + if (kn::is_1_face_vertical(p)) + inout(p) = f(inout(p + left), inout(p + right)); + else if (is_1_face_horizontal(p)) + inout(p) = f(inout(p + up), inout(p + down)); + + trace::exiting("mln::world::kn::fill_1_from_2_faces"); + } + + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::world::kn diff --git a/milena/mln/world/kn/fill_1_from_aux_2_faces.hh b/milena/mln/world/kn/fill_1_from_aux_2_faces.hh index b9cbffe..987e3b7 100644 --- a/milena/mln/world/kn/fill_1_from_aux_2_faces.hh +++ b/milena/mln/world/kn/fill_1_from_aux_2_faces.hh @@ -35,7 +35,6 @@ # include <mln/world/kn/is_1_face_vertical.hh> # include <mln/world/kn/is_1_face_horizontal.hh> - namespace mln { @@ -52,6 +51,11 @@ namespace mln \param[in] aux A 2D image with the same domain as \p inout. \param[in,out] f A functor computing a result from two values. + Warning: \p aux borders must have been initialized with + kn::border::duplicate_2_faces or have been immersed in Kn in + order to get valid values for 1-faces located in the + inner-border. + This function use the following neighborhoods: * In case of vertical 1 faces: @@ -71,7 +75,7 @@ namespace mln */ template <typename I, typename J, typename F> void fill_1_from_aux_2_faces(Image& inout, const Image<J>& aux, - Function_vv2v<F>& f); + Function_vv2v<F>& f); /// \overload template <typename I, typename J, typename A> @@ -87,7 +91,7 @@ namespace mln template <typename I, typename J, typename F> void fill_1_from_aux_2_faces(Image& inout_, const Image<J>& aux_, - Function_vv2v<F>& f_) + Function_vv2v<F>& f_) { trace::entering("mln::world::kn::fill_1_from_aux_2_faces"); @@ -111,7 +115,7 @@ namespace mln template <typename I, typename J, typename A> void fill_1_from_aux_2_faces(Image& inout_, const Image<J>& aux_, - const Accumulator<A>& accu_) + const Accumulator<A>& accu_) { trace::entering("mln::world::kn::fill_1_from_aux_2_faces"); @@ -120,9 +124,8 @@ namespace mln mln_precondition(exact(inout_).domain() == exact(aux_).domain()); I& inout = exact(inout_); const J& aux = exact(aux_); - (void) accu_; - A accu = A(); + A accu(exact(accu_)); mln_box(I) b = inout.domain(); mln_piter(I) p(b); for_all(p) diff --git a/milena/mln/world/kn/internal/get_background_label.hh b/milena/mln/world/kn/internal/get_background_label.hh index a993b5a..bdd2bf0 100644 --- a/milena/mln/world/kn/internal/get_background_label.hh +++ b/milena/mln/world/kn/internal/get_background_label.hh @@ -32,6 +32,10 @@ # define MLN_WORLD_KN_INTERNAL_GET_BACKGROUND_LABEL_HH # include <mln/core/concept/image.hh> +# include <mln/geom/min_row.hh> +# include <mln/geom/min_col.hh> +# include <mln/geom/max_row.hh> +# include <mln/geom/max_col.hh> namespace mln { @@ -63,12 +67,11 @@ namespace mln const I& lab = exact(lab_); - mln_box(I) dom = lab.domain(); def::coord - min_row = dom.pmin().row(), - max_row = dom.pmax().row(), - min_col = dom.pmin().col(), - max_col = dom.pmax().col(); + min_row = geom::min_row(lab), + max_row = geom::max_row(lab), + min_col = geom::min_col(lab), + max_col = geom::max_col(lab); has_bg_label = false; for (def::coord col = min_col; col <= max_col; ++col) diff --git a/milena/tests/world/k1/immerse_with.cc b/milena/tests/world/k1/immerse_with.cc index 3b7e8fc..c6d4af7 100644 --- a/milena/tests/world/k1/immerse_with.cc +++ b/milena/tests/world/k1/immerse_with.cc @@ -29,8 +29,8 @@ #include <mln/world/k1/immerse_with.hh> #include <mln/data/compare.hh> #include <mln/border/fill.hh> -#include <mln/fun/vv2v/max.hh> -#include <mln/fun/vvvv2v/max.hh> +#include <mln/fun/vv2v/sum.hh> +#include <mln/fun/vvvv2v/sum.hh> int main() { @@ -41,22 +41,25 @@ int main() {3, 4} }; image2d<int> ima = make::image(ivals); - border::fill(ima, 0); // Make sure there is not border effect. + border::fill(ima, 0); // FIXME: to be removed when 0-face + // computation will handle borders. int fvals[][5] = { - {1, 1, 2, 2, 2}, - {1, 1, 2, 2, 2}, - {3, 3, 4, 4, 4}, - {3, 3, 4, 4, 4}, - {3, 3, 4, 4, 4} + {0, 2, 0, 4, 0}, + {2, 1, 3, 2, 4}, + {0, 4, 20, 6, 0}, + {6, 3, 7, 4, 8}, + {0, 6, 0, 8, 0} }; image2d<int> ref = make::image(fvals, point2d(-1,-1)); + { image2d<long> - immersed = world::k1::immerse_with(ima, long(), - fun::vv2v::max<long>(), - fun::vvvv2v::max<long>()); + immersed = world::k1::immerse_with(ima, long(), 0l, + fun::vv2v::sum<long>(), + fun::vvvv2v::sum<long>()); + mln_assertion(immersed == ref); } diff --git a/milena/tests/world/k2/fill_non_primary_from_primary_2_faces.cc b/milena/tests/world/k2/fill_non_primary_from_primary_2_faces.cc index c83a613..7a17f80 100644 --- a/milena/tests/world/k2/fill_non_primary_from_primary_2_faces.cc +++ b/milena/tests/world/k2/fill_non_primary_from_primary_2_faces.cc @@ -26,41 +26,12 @@ /// \file #include <mln/core/image/image2d.hh> -#include <mln/make/box2d.hh> #include <mln/data/compare.hh> #include <mln/accu/math/sum.hh> +#include <mln/fun/vv2v/sum.hh> +#include <mln/fun/vvvv2v/sum.hh> #include <mln/world/k2/fill_non_primary_from_primary_2_faces.hh> -namespace mln -{ - - struct sum4_t : Function_vvvv2v<sum4_t> - { - typedef int argument; - typedef int result; - - int operator()(const int& v1, const int& v2, const int& v3, const int& v4) const - { - return v1 + v2 + v3 + v4; - } - - }; - - struct sum2_t : Function_vv2v<sum2_t> - { - typedef int argument; - typedef int result; - - int operator()(const int& v1, const int& v2) const - { - return v1 + v2; - } - - }; - -} - - int main() { @@ -98,7 +69,9 @@ int main() // Overload with function { image2d<int> ima = make::image(vals, point2d(-1,-1)); - world::k2::fill_non_primary_from_primary_2_faces(ima, sum2_t(), sum4_t()); + fun::vv2v::sum<int> f2; + fun::vvvv2v::sum<int> f4; + world::k2::fill_non_primary_from_primary_2_faces(ima, f2, f4); mln_assertion(ref == ima); } diff --git a/milena/tests/world/kn/accu/max_interval.cc b/milena/tests/world/kn/accu/max_interval.cc index 9686ad7..304266a 100644 --- a/milena/tests/world/kn/accu/max_interval.cc +++ b/milena/tests/world/kn/accu/max_interval.cc @@ -40,12 +40,6 @@ void doit(const mln::value::interval<T>& inter) } { - M m; - m.init(); - mln_assertion(m.to_result() == mln_min(T)); - } - - { M m(inter); m.init(); m.take(6); @@ -105,4 +99,11 @@ int main() doit(inter); } + // Checking default return value. + { + mln::world::kn::accu::max_interval<int> m; + m.init(); + mln_assertion(m.to_result() == mln_min(int)); + } + } diff --git a/milena/tests/world/kn/accu/min_interval.cc b/milena/tests/world/kn/accu/min_interval.cc index 7b5a0e2..84c5bd5 100644 --- a/milena/tests/world/kn/accu/min_interval.cc +++ b/milena/tests/world/kn/accu/min_interval.cc @@ -40,12 +40,6 @@ void doit(const mln::value::interval<T>& inter) } { - M m; - m.init(); - mln_assertion(m.to_result() == mln_max(T)); - } - - { M m(inter); m.init(); m.take(6); @@ -105,4 +99,11 @@ int main() doit(inter); } + // Checking default return value. + { + mln::world::kn::accu::min_interval<int> m; + m.init(); + mln_assertion(m.to_result() == mln_max(int)); + } + } -- 1.7.2.5

1 0

olena-2.0-147-gf8e75ed Handle border effects while computing 1-faces values.
by Guillaume Lazzara 26 Oct '12

26 Oct '12

* mln/world/kn/internal/fill_primary_2_faces_from_input.hh: Duplicate 2-faces values in border. * tests/world/k1/fill_1_from_2_faces.cc, * tests/world/kn/fill_1_from_2_faces.cc, * tests/world/kn/fill_1_from_aux_2_faces.cc: Update tests. --- milena/ChangeLog | 11 +++ .../kn/internal/fill_primary_2_faces_from_input.hh | 3 + milena/tests/world/k1/fill_1_from_2_faces.cc | 82 ++++++++++--------- milena/tests/world/kn/fill_1_from_2_faces.cc | 59 +++++++-------- milena/tests/world/kn/fill_1_from_aux_2_faces.cc | 61 ++++++--------- 5 files changed, 108 insertions(+), 108 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e6c6d2e..6c1f276 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Handle border effects while computing 1-faces values. + + * mln/world/kn/internal/fill_primary_2_faces_from_input.hh: + Duplicate 2-faces values in border. + + * tests/world/k1/fill_1_from_2_faces.cc, + * tests/world/kn/fill_1_from_2_faces.cc, + * tests/world/kn/fill_1_from_aux_2_faces.cc: Update tests. + +2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve interface of hqueues. * mln/util/hqueue.hh: Do not return queues directly. diff --git a/milena/mln/world/kn/internal/fill_primary_2_faces_from_input.hh b/milena/mln/world/kn/internal/fill_primary_2_faces_from_input.hh index 04baddc..6a6e31e 100644 --- a/milena/mln/world/kn/internal/fill_primary_2_faces_from_input.hh +++ b/milena/mln/world/kn/internal/fill_primary_2_faces_from_input.hh @@ -33,6 +33,7 @@ # include <mln/world/kn/internal/immerse_point.hh> # include <mln/world/kn/safe_cast.hh> +# include <mln/world/kn/border/adjust_duplicate_2_faces.hh> namespace mln { @@ -91,6 +92,8 @@ namespace mln ima_kn(pout) = safe_cast_to<V>(ima(p)); } + kn::border::adjust_duplicate_2_faces(ima_kn, 1); + trace::exiting("mln::world::kn::internal::fill_primary_2_faces_from_input"); } diff --git a/milena/tests/world/k1/fill_1_from_2_faces.cc b/milena/tests/world/k1/fill_1_from_2_faces.cc index 4045674..45f821e 100644 --- a/milena/tests/world/k1/fill_1_from_2_faces.cc +++ b/milena/tests/world/k1/fill_1_from_2_faces.cc @@ -26,28 +26,11 @@ /// \file #include <mln/core/image/image2d.hh> -#include <mln/make/box2d.hh> #include <mln/data/compare.hh> #include <mln/accu/math/sum.hh> +#include <mln/fun/vv2v/sum.hh> #include <mln/world/k1/fill_1_from_2_faces.hh> -#include <mln/border/fill.hh> - - -namespace mln -{ - - struct sum_t : Function_vv2v<sum_t> - { - typedef int result; - - int operator()(const int& v1, const int& v2) const - { - return v1 + v2; - } - - }; - -} +#include <mln/world/kn/border/duplicate_2_faces.hh> @@ -55,31 +38,52 @@ int main() { using namespace mln; - int refvals[5][5] = { - {1, 3, 1, 3, 1}, - {3, 3, 6, 3, 3}, - {1, 6, 1, 6, 1}, - {3, 3, 6, 3, 3}, - {1, 3, 1, 3, 1} - }; - image2d<int> ref = make::image(refvals, point2d(-1, -1)); - - int vals[5][5] = { - {1, 0, 1, 0, 1 }, - {0, 3, 0, 3, 0 }, - {1, 0, 1, 0, 1 }, - {0, 3, 0, 3, 0 }, - {1, 0, 1, 0, 1 } + int vals[7][7] = { + {1, 0, 1, 0, 1, 0, 1 }, + {0, 3, 0, 3, 0, 3, 0 }, + {1, 0, 1, 0, 1, 0, 1 }, + {0, 3, 0, 3, 0, 3, 0 }, + {1, 0, 1, 0, 1, 0, 1 }, + {0, 3, 0, 3, 0, 3, 0 }, + {1, 0, 1, 0, 1, 0, 1 }, }; image2d<int> imakn = make::image(vals, point2d(-1, -1)); - - /// Make sure the border is set to 0 to get deterministic results. - border::fill(imakn, 0); + world::kn::border::duplicate_2_faces(imakn); // Overload with function { - sum_t f; - world::k1::fill_1_from_2_faces(imakn, f); + int refvals[7][7] = { + {1, 6, 1, 6, 1, 6, 1 }, + {6, 3, 6, 3, 6, 3, 6 }, + {1, 6, 1, 6, 1, 6, 1 }, + {6, 3, 6, 3, 6, 3, 6 }, + {1, 6, 1, 6, 1, 6, 1 }, + {6, 3, 6, 3, 6, 3, 6 }, + {1, 6, 1, 6, 1, 6, 1 }, + }; + + image2d<int> ref = make::image(refvals, point2d(-1, -1)); + + world::k1::fill_1_from_2_faces(imakn, fun::vv2v::sum<int>()); + mln_assertion(ref == imakn); + } + + // Overload with accumulator + { + int refvals[7][7] = { + {1, 3, 1, 3, 1, 3, 1 }, + {3, 3, 6, 3, 6, 3, 3 }, + {1, 6, 1, 6, 1, 6, 1 }, + {3, 3, 6, 3, 6, 3, 3 }, + {1, 6, 1, 6, 1, 6, 1 }, + {3, 3, 6, 3, 6, 3, 3 }, + {1, 3, 1, 3, 1, 3, 1 }, + }; + + image2d<int> ref = make::image(refvals, point2d(-1, -1)); + + accu::math::sum<int> accu;; + world::k1::fill_1_from_2_faces(imakn, accu); mln_assertion(ref == imakn); } diff --git a/milena/tests/world/kn/fill_1_from_2_faces.cc b/milena/tests/world/kn/fill_1_from_2_faces.cc index bd14ace..dafb63c 100644 --- a/milena/tests/world/kn/fill_1_from_2_faces.cc +++ b/milena/tests/world/kn/fill_1_from_2_faces.cc @@ -29,41 +29,15 @@ #include <mln/make/box2d.hh> #include <mln/data/compare.hh> #include <mln/accu/math/sum.hh> +#include <mln/fun/vv2v/sum.hh> #include <mln/world/kn/fill_1_from_2_faces.hh> -#include <mln/border/fill.hh> - - -namespace mln -{ - - struct sum_t : Function_vv2v<sum_t> - { - typedef int result; - - int operator()(const int& v1, const int& v2) const - { - return v1 + v2; - } - - }; - -} - +#include <mln/world/kn/border/duplicate_2_faces.hh> int main() { using namespace mln; - int refvals[5][5] = { - {1, 3, 1, 3, 1}, - {3, 3, 6, 3, 3}, - {1, 6, 1, 6, 1}, - {3, 3, 6, 3, 3}, - {1, 3, 1, 3, 1} - }; - image2d<int> ref = make::image(refvals, point2d(-1, -1)); - int vals[5][5] = { {1, 0, 1, 0, 1 }, {0, 3, 0, 3, 0 }, @@ -72,16 +46,37 @@ int main() {1, 0, 1, 0, 1 } }; image2d<int> imakn = make::image(vals, point2d(-1, -1)); - - /// Make sure the border is set to 0 to get deterministic results. - border::fill(imakn, 0); - + world::kn::border::duplicate_2_faces(imakn); // Overload with accumulator { + int refvals[5][5] = { + {1, 3, 1, 3, 1}, + {3, 3, 6, 3, 3}, + {1, 6, 1, 6, 1}, + {3, 3, 6, 3, 3}, + {1, 3, 1, 3, 1} + }; + image2d<int> ref = make::image(refvals, point2d(-1, -1)); + accu::math::sum<int> accu; world::kn::fill_1_from_2_faces(imakn, accu); mln_assertion(ref == imakn); } + // Overload with Functions + { + int refvals[5][5] = { + {1, 6, 1, 6, 1}, + {6, 3, 6, 3, 6}, + {1, 6, 1, 6, 1}, + {6, 3, 6, 3, 6}, + {1, 6, 1, 6, 1} + }; + image2d<int> ref = make::image(refvals, point2d(-1, -1)); + + world::kn::fill_1_from_2_faces(imakn, fun::vv2v::sum<int>()); + mln_assertion(ref == imakn); + } + } diff --git a/milena/tests/world/kn/fill_1_from_aux_2_faces.cc b/milena/tests/world/kn/fill_1_from_aux_2_faces.cc index 1475f75..20e1c2a 100644 --- a/milena/tests/world/kn/fill_1_from_aux_2_faces.cc +++ b/milena/tests/world/kn/fill_1_from_aux_2_faces.cc @@ -26,53 +26,25 @@ /// \file #include <mln/core/image/image2d.hh> -#include <mln/make/box2d.hh> #include <mln/data/compare.hh> #include <mln/accu/math/sum.hh> +#include <mln/fun/vv2v/sum.hh> #include <mln/world/kn/fill_1_from_aux_2_faces.hh> -#include <mln/border/fill.hh> - - -namespace mln -{ - - struct sum_t : Function_vv2v<sum_t> - { - typedef int result; - - int operator()(const int& v1, const int& v2) const - { - return v1 + v2; - } - - }; - -} - - +#include <mln/world/kn/border/duplicate_2_faces.hh> int main() { using namespace mln; - int refvals[5][5] = { - {1, 1, 1, 4, 1}, - {1, 3, 5, 3, 4}, - {1, 5, 1, 5, 1}, - {4, 3, 5, 3, 1}, - {1, 4, 1, 1, 1} - }; - image2d<int> ref = make::image(refvals, point2d(-1, -1)); - int auxvals[5][5] = { {0, 0, 0, 0, 0 }, {0, 1, 0, 4, 0 }, {0, 0, 0, 0, 0 }, {0, 4, 0, 1, 0 }, - {0, 0, 0, 0, 1 } + {0, 0, 0, 0, 0 } }; image2d<int> aux = make::image(auxvals, point2d(-1, -1)); - + world::kn::border::duplicate_2_faces(aux); int vals[5][5] = { {1, 0, 1, 0, 1 }, @@ -83,12 +55,17 @@ int main() }; image2d<int> imakn = make::image(vals, point2d(-1, -1)); - /// Make sure the border is set to 0 to get deterministic results. - border::fill(imakn, 0); - - // Overload with accumulator { + int refvals[5][5] = { + {1, 1, 1, 4, 1}, + {1, 3, 5, 3, 4}, + {1, 5, 1, 5, 1}, + {4, 3, 5, 3, 1}, + {1, 4, 1, 1, 1} + }; + image2d<int> ref = make::image(refvals, point2d(-1, -1)); + accu::math::sum<int> accu; world::kn::fill_1_from_aux_2_faces(imakn, aux, accu); mln_assertion(ref == imakn); @@ -96,8 +73,18 @@ int main() // Overload with function { - sum_t f; + int refvals[5][5] = { + {1, 2, 1, 8, 1}, + {2, 3, 5, 3, 8}, + {1, 5, 1, 5, 1}, + {8, 3, 5, 3, 2}, + {1, 8, 1, 2, 1} + }; + image2d<int> ref = make::image(refvals, point2d(-1, -1)); + + fun::vv2v::sum<int> f; world::kn::fill_1_from_aux_2_faces(imakn, aux, f); + mln_assertion(ref == imakn); } -- 1.7.2.5

1 0

olena-2.0-146-gbf7a3ec Improve interface of hqueues.
by Guillaume Lazzara 26 Oct '12

26 Oct '12

* mln/util/hqueue.hh: Do not return queues directly. * mln/world/kn/compute_tree_of_shapes.hh: Update the use of hqueue. --- milena/ChangeLog | 9 ++++++++ milena/mln/util/hqueue.hh | 28 ++++++++++++------------ milena/mln/world/kn/compute_tree_of_shapes.hh | 14 ++++++------ 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 678fb09..e6c6d2e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve interface of hqueues. + + * mln/util/hqueue.hh: Do not return queues directly. + + * mln/world/kn/compute_tree_of_shapes.hh: Update the use of + hqueue. + +2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Add missing typedef in functions. * mln/fun/vvvv2v/max.hh, diff --git a/milena/mln/util/hqueue.hh b/milena/mln/util/hqueue.hh index 3d28b30..ab7660c 100644 --- a/milena/mln/util/hqueue.hh +++ b/milena/mln/util/hqueue.hh @@ -53,10 +53,10 @@ namespace mln unsigned size() const; - bool is_empty() const; - bool is_not_empty() const; + bool is_empty(const P& priority) const; + bool is_not_empty(const P& priority) const; - const std::queue<T>& operator[](const P& priority) const; +// const std::queue<T>& operator[](const P& priority) const; void push(const T& t, const P& priority); T pop(const P& priority); @@ -103,25 +103,25 @@ namespace mln template <typename T, typename P> bool - hqueue<T,P>::is_empty() const + hqueue<T,P>::is_empty(const P& priority) const { - return this->size() == 0; + return v_[inter_.index_of(priority)].empty() == 0; } template <typename T, typename P> bool - hqueue<T,P>::is_not_empty() const + hqueue<T,P>::is_not_empty(const P& priority) const { - return ! this->is_empty(); + return ! is_empty(priority); } - template <typename T, typename P> - const std::queue<T>& - hqueue<T,P>::operator[](const P& i) const - { - mln_precondition(i < this->size()); - return v_[head_ + i]; - } + // template <typename T, typename P> + // const std::queue<T>& + // hqueue<T,P>::operator[](const P& i) const + // { + // mln_precondition(i < this->size()); + // return v_[head_ + i]; + // } template <typename T, typename P> void diff --git a/milena/mln/world/kn/compute_tree_of_shapes.hh b/milena/mln/world/kn/compute_tree_of_shapes.hh index e503d66..6726259 100644 --- a/milena/mln/world/kn/compute_tree_of_shapes.hh +++ b/milena/mln/world/kn/compute_tree_of_shapes.hh @@ -239,7 +239,7 @@ namespace mln for (; l_ < inter_.last(); value::inc(l_)) { - if (! q[l_].empty()) + if (q.is_not_empty(l_)) { found = true; return l_; @@ -248,7 +248,7 @@ namespace mln // Avoid overflow on last element. if (l_ == inter_.last()) - if (! q[l_].empty()) + if (q.is_not_empty(l_)) { found = true; return l_; @@ -265,7 +265,7 @@ namespace mln EV l_ = lcur; for (; l_ > inter_.first(); value::dec(l_)) - if (! q[l_].empty()) + if (q.is_not_empty(l_))) { found = true; return l_; @@ -273,7 +273,7 @@ namespace mln // Avoid overflow on first element. if (l_ == inter_.first()) - if (! q[l_].empty()) + if (q.is_not_empty(l_)) { found = true; return l_; @@ -326,10 +326,10 @@ namespace mln compute_tree_of_shapes_t::priority_pop(q_type& q) // modify q, and sometimes l { - if (q[lcur].empty()) + if (q.is_empty(lcur)) { EV lcur_ = level_next_to_lcur(q); // such as q[lcur_] is not empty - if (q[lcur_].empty()) + if (q.is_empty(lcur_)) std::abort(); lcur = lcur_; } @@ -385,7 +385,7 @@ namespace mln i = i + 1; done(p) = true; - if (q[lcur].empty()) + if (q.is_empty(lcur)) { std::cout << "sort: done with level " << lcur << std::endl; dsp.show(done); -- 1.7.2.5

1 0

olena-2.0-145-ge4b6a47 Add missing typedef in functions.
by Guillaume Lazzara 26 Oct '12

26 Oct '12

* mln/fun/vvvv2v/max.hh, * mln/fun/vvvv2v/mean.hh, * mln/fun/vvvv2v/median.hh, * mln/fun/vvvv2v/min.hh: Here. --- milena/ChangeLog | 9 +++++++++ milena/mln/fun/vvvv2v/max.hh | 7 +++---- milena/mln/fun/vvvv2v/mean.hh | 7 +++---- milena/mln/fun/vvvv2v/median.hh | 6 ++---- milena/mln/fun/vvvv2v/min.hh | 7 +++---- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 15a9193..678fb09 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Add missing typedef in functions. + + * mln/fun/vvvv2v/max.hh, + * mln/fun/vvvv2v/mean.hh, + * mln/fun/vvvv2v/median.hh, + * mln/fun/vvvv2v/min.hh: Here. + +2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Add sum functions. * mln/fun/vv2v/sum.hh, diff --git a/milena/mln/fun/vvvv2v/max.hh b/milena/mln/fun/vvvv2v/max.hh index 311bcfe..cf315c7 100644 --- a/milena/mln/fun/vvvv2v/max.hh +++ b/milena/mln/fun/vvvv2v/max.hh @@ -28,7 +28,7 @@ /// \file /// -/// Functor that computes the max of two values. +/// Functor that computes the max of four values. # include <mln/core/concept/function.hh> # include <mln/math/max.hh> @@ -43,13 +43,12 @@ namespace mln namespace vvvv2v { - // FIXME: Doc. - - /// \brief A functor computing the max of two values. + /// \brief A functor computing the max of four values. template <typename T, typename R=T> struct max : public Function_vvvv2v< max<T> > { typedef R result; + typedef T argument; R operator()(const T& v1, const T& v2, const T& v3, const T& v4) const; }; diff --git a/milena/mln/fun/vvvv2v/mean.hh b/milena/mln/fun/vvvv2v/mean.hh index 7cc14e9..1016d47 100644 --- a/milena/mln/fun/vvvv2v/mean.hh +++ b/milena/mln/fun/vvvv2v/mean.hh @@ -28,7 +28,7 @@ /// \file /// -/// Functor that computes the mean of two values. +/// Functor that computes the mean of four values. # include <mln/core/concept/function.hh> # include <mln/trait/routine/mean.hh> @@ -44,13 +44,12 @@ namespace mln namespace vvvv2v { - // FIXME: Doc. - - /// \brief A functor computing the mean of two values. + /// \brief A functor computing the mean of four values. template <typename T, typename R = mln_trait_routine_mean(4,T) > struct mean : public Function_vvvv2v< mean<T> > { typedef R result; + typedef T argument; R operator()(const T& v1, const T& v2, const T& v3, const T& v4) const; }; diff --git a/milena/mln/fun/vvvv2v/median.hh b/milena/mln/fun/vvvv2v/median.hh index e08dabd..b1c0652 100644 --- a/milena/mln/fun/vvvv2v/median.hh +++ b/milena/mln/fun/vvvv2v/median.hh @@ -28,7 +28,7 @@ /// \file /// -/// Functor that computes the median of two values. +/// Functor that computes the median of four values. # include <mln/core/concept/function.hh> # include <mln/trait/routine/median.hh> @@ -44,9 +44,7 @@ namespace mln namespace vvvv2v { - // FIXME: Doc. - - /// \brief A functor computing the median of two values. + /// \brief A functor computing the median of four values. template <typename T, typename R = mln_trait_routine_median(T) > struct median : public Function_vvvv2v< median<T> > { diff --git a/milena/mln/fun/vvvv2v/min.hh b/milena/mln/fun/vvvv2v/min.hh index f0c4b63..2d24be1 100644 --- a/milena/mln/fun/vvvv2v/min.hh +++ b/milena/mln/fun/vvvv2v/min.hh @@ -28,7 +28,7 @@ /// \file /// -/// Functor that computes the min of two values. +/// Functor that computes the min of four values. # include <mln/core/concept/function.hh> # include <mln/math/min.hh> @@ -43,13 +43,12 @@ namespace mln namespace vvvv2v { - // FIXME: Doc. - - /// \brief A functor computing the min of two values. + /// \brief A functor computing the min of four values. template <typename T, typename R=T> struct min : public Function_vvvv2v< min<T> > { typedef R result; + typedef T argument; R operator()(const T& v1, const T& v2, const T& v3, const T& v4) const; }; -- 1.7.2.5

1 0

olena-2.0-144-gbe9340a Add sum functions.
by Guillaume Lazzara 26 Oct '12

26 Oct '12

* mln/fun/vv2v/sum.hh, * mln/fun/vvvv2v/sum.hh: New. --- milena/ChangeLog | 7 +++++++ milena/mln/fun/vv2v/{min.hh => sum.hh} | 20 +++++++++----------- milena/mln/fun/vvvv2v/{min.hh => sum.hh} | 18 +++++++++--------- 3 files changed, 25 insertions(+), 20 deletions(-) copy milena/mln/fun/vv2v/{min.hh => sum.hh} (78%) copy milena/mln/fun/vvvv2v/{min.hh => sum.hh} (82%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 574132f..15a9193 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Add sum functions. + + * mln/fun/vv2v/sum.hh, + * mln/fun/vvvv2v/sum.hh: New. + +2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Add kn::border routines working on 2-faces. * mln/world/kn/border/adjust_duplicate_2_faces.hh, diff --git a/milena/mln/fun/vv2v/min.hh b/milena/mln/fun/vv2v/sum.hh similarity index 78% copy from milena/mln/fun/vv2v/min.hh copy to milena/mln/fun/vv2v/sum.hh index d43981f..8279221 100644 --- a/milena/mln/fun/vv2v/min.hh +++ b/milena/mln/fun/vv2v/sum.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2008, 2009, 2012 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,15 +23,14 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_FUN_VV2V_MIN_HH -# define MLN_FUN_VV2V_MIN_HH +#ifndef MLN_FUN_VV2V_SUM_HH +# define MLN_FUN_VV2V_SUM_HH /// \file /// -/// Functor that computes the minimum of two values. +/// Functor that computes the sum of two values. # include <mln/core/concept/function.hh> -# include <mln/math/min.hh> namespace mln @@ -44,9 +42,9 @@ namespace mln namespace vv2v { - /// \brief A functor computing the minimum of two values. + /// \brief A functor computing the sum of two values. template <typename V, typename R = V> - struct min : public Function_vv2v< min<V,R> >, + struct sum : public Function_vv2v< sum<V,R> >, private mlc_converts_to(R,V)::check_t { typedef R result; @@ -60,9 +58,9 @@ namespace mln template <typename V, typename R> inline R - min<V,R>::operator()(const V& v1, const V& v2) const + sum<V,R>::operator()(const V& v1, const V& v2) const { - return R(mln::math::min(v1, v2)); + return R(v1 + v2); } # endif // ! MLN_INCLUDE_ONLY @@ -74,4 +72,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_FUN_VV2V_MIN_HH +#endif // ! MLN_FUN_VV2V_SUM_HH diff --git a/milena/mln/fun/vvvv2v/min.hh b/milena/mln/fun/vvvv2v/sum.hh similarity index 82% copy from milena/mln/fun/vvvv2v/min.hh copy to milena/mln/fun/vvvv2v/sum.hh index f0c4b63..3455c26 100644 --- a/milena/mln/fun/vvvv2v/min.hh +++ b/milena/mln/fun/vvvv2v/sum.hh @@ -23,15 +23,14 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_FUN_VVVV2V_MIN_HH -# define MLN_FUN_VVVV2V_MIN_HH +#ifndef MLN_FUN_VVVV2V_SUM_HH +# define MLN_FUN_VVVV2V_SUM_HH /// \file /// -/// Functor that computes the min of two values. +/// Functor that computes the sum of four values. # include <mln/core/concept/function.hh> -# include <mln/math/min.hh> namespace mln @@ -45,11 +44,12 @@ namespace mln // FIXME: Doc. - /// \brief A functor computing the min of two values. + /// \brief A functor computing the sum of two values. template <typename T, typename R=T> - struct min : public Function_vvvv2v< min<T> > + struct sum : public Function_vvvv2v< sum<T> > { typedef R result; + typedef T argument; R operator()(const T& v1, const T& v2, const T& v3, const T& v4) const; }; @@ -59,9 +59,9 @@ namespace mln template <typename T, typename R> inline R - min<T,R>::operator()(const T& v1, const T& v2, const T& v3, const T& v4) const + sum<T,R>::operator()(const T& v1, const T& v2, const T& v3, const T& v4) const { - return R(mln::math::min(v1, v2, v3, v4)); + return R(v1 + v2 + v3 + v4); } # endif // ! MLN_INCLUDE_ONLY @@ -73,4 +73,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_FUN_VVVV2V_MIN_HH +#endif // ! MLN_FUN_VVVV2V_SUM_HH -- 1.7.2.5

1 0