- Olena-patches

olena-2.0-142-gefea70d configure.ac: Configure milena/tests/world/kn/border/Makefile.am.
by Guillaume Lazzara 26 Oct '12

26 Oct '12

--- ChangeLog | 4 ++++ configure.ac | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2ce7020..8ec77ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Configure milena/tests/world/kn/border/Makefile.am. + +2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Configure milena/tests/world/kn/accu/Makefile.am. 2012-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/configure.ac b/configure.ac index 70ada91..4ee63f1 100644 --- a/configure.ac +++ b/configure.ac @@ -540,6 +540,7 @@ AC_CONFIG_FILES([ milena/tests/world/k2/Makefile milena/tests/world/kn/Makefile milena/tests/world/kn/accu/Makefile + milena/tests/world/kn/border/Makefile ]) dnl<<lrde -- 1.7.2.5

1 0

branch exp/khalimsky updated: olena-2.0-141-g42e50d9
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 42e50d9744a45238055e9a2723b257382100e738 (commit) via 38aa07e7ca583edcf3012f0f725df829333fa018 (commit) from c25ed6a187c7d75585f80250fa3a6c83f1b8d9c7 (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 ----------------------------------------------------------------- 42e50d9 Add new overloads of fill routines in k1. 38aa07e Do not read outside images in fill functions with accumulators. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 19 ++++++++++ milena/mln/world/k1/fill_0_from_1_faces.hh | 34 +++++++++++++++++- milena/mln/world/k1/fill_1_from_2_faces.hh | 38 +++++++++++++++++++- .../k2/fill_non_primary_from_primary_2_faces.hh | 34 +++++++++++------ milena/mln/world/kn/fill_0_from_1_faces.hh | 15 +++++--- milena/mln/world/kn/fill_0_from_2_faces.hh | 15 +++++--- milena/mln/world/kn/fill_1_from_2_faces.hh | 17 ++++++--- milena/mln/world/kn/fill_1_from_aux_2_faces.hh | 17 ++++++--- milena/mln/world/kn/fill_2_from_1_faces.hh | 15 +++++--- 9 files changed, 163 insertions(+), 41 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-141-g42e50d9 Add new overloads of fill routines in k1.
by Guillaume Lazzara 26 Oct '12

26 Oct '12

* mln/world/k1/fill_0_from_1_faces.hh, * mln/world/k1/fill_1_from_2_faces.hh: New overloads. --- milena/ChangeLog | 7 +++++ milena/mln/world/k1/fill_0_from_1_faces.hh | 34 ++++++++++++++++++++++++- milena/mln/world/k1/fill_1_from_2_faces.hh | 38 +++++++++++++++++++++++++++- 3 files changed, 77 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d7d8e1e..0095a12 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Add new overloads of fill routines in k1. + + * mln/world/k1/fill_0_from_1_faces.hh, + * mln/world/k1/fill_1_from_2_faces.hh: New overloads. + +2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Do not read outside images in fill functions with accumulators. * mln/world/k2/fill_non_primary_from_primary_2_faces.hh, 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 c0f6eb7..0568220 100644 --- a/milena/mln/world/k1/fill_0_from_1_faces.hh +++ b/milena/mln/world/k1/fill_0_from_1_faces.hh @@ -70,11 +70,15 @@ namespace mln template <typename I, typename F> void fill_0_from_1_faces(Image& inout, const Function_vvvv2v<F>& f); + /// \overload + template <typename I, typename A> + void fill_0_from_1_faces(Image& inout, const Accumulator<A>& accu); + # ifndef MLN_INCLUDE_ONLY - // Facade + // Facades template <typename I, typename F> @@ -95,6 +99,34 @@ namespace mln trace::exiting("mln::world::k1::fill_0_from_1_faces"); } + template <typename I, typename A> + void fill_0_from_1_faces(Image& inout_, const Accumulator<A>& accu_) + { + trace::entering("mln::world::k1::fill_0_from_1_faces"); + + mln_precondition(exact(inout_).is_valid()); + I& inout = exact(inout_); + + A accu(exact(accu_)); + + mln_box(I) b = inout.domain(); + mln_piter(I) p(b); + for_all(p) + if (kn::is_0_face(p)) + { + if (inout.domain().has(p + up)) + accu.take(inout(p + up)); + if (inout.domain().has(p + left)) + accu.take(inout(p + left)); + if (inout.domain().has(p + right)) + accu.take(inout(p + right)); + if (inout.domain().has(p + down)) + accu.take(inout(p + down)); + inout(p) = accu.to_result(); + } + + trace::exiting("mln::world::k1::fill_0_from_1_faces"); + } # endif // ! MLN_INCLUDE_ONLY 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 74e6b25..b8bf9cd 100644 --- a/milena/mln/world/k1/fill_1_from_2_faces.hh +++ b/milena/mln/world/k1/fill_1_from_2_faces.hh @@ -69,11 +69,15 @@ namespace mln template <typename I, typename F> void fill_1_from_2_faces(Image& inout, const Function_vv2v<F>& f); + /// \overload + template <typename I, typename A> + void fill_1_from_2_faces(Image& inout, const Accumulator<A>& accu); + # ifndef MLN_INCLUDE_ONLY - // Facade + // Facades template <typename I, typename F> @@ -95,6 +99,38 @@ namespace mln trace::exiting("mln::world::k1::fill_1_from_2_faces"); } + template <typename I, typename A> + void fill_1_from_2_faces(Image& inout_, const Accumulator<A>& accu_) + { + trace::entering("mln::world::k1::fill_1_from_2_faces"); + + mln_precondition(exact(inout_).is_valid()); + I& inout = exact(inout_); + A accu(accu_); + + mln_box(I) b = inout.domain(); + mln_piter(I) p(b); + for_all(p) + if (kn::is_1_face_vertical(p)) + { + if (inout.domain().has(p + left)) + accu.take(inout(p + left)); + if (inout.domain().has(p + right)) + accu.take(inout(p + right)); + inout(p) = accu.to_result(); + } + else if (kn::is_1_face_horizontal(p)) + { + if (inout.domain().has(p + up)) + accu.take(inout(p + up)); + if (inout.domain().has(p + down)) + accu.take(inout(p + down)); + inout(p) = accu.to_result(); + } + + trace::exiting("mln::world::k1::fill_1_from_2_faces"); + } + # endif // ! MLN_INCLUDE_ONLY -- 1.7.2.5

1 0

olena-2.0-140-g38aa07e Do not read outside images in fill functions with accumulators.
by Guillaume Lazzara 26 Oct '12

26 Oct '12

* mln/world/k2/fill_non_primary_from_primary_2_faces.hh, * mln/world/kn/fill_0_from_1_faces.hh, * mln/world/kn/fill_0_from_2_faces.hh, * mln/world/kn/fill_1_from_2_faces.hh, * mln/world/kn/fill_1_from_aux_2_faces.hh, * mln/world/kn/fill_2_from_1_faces.hh: Check if neighbor site is in the domain. --- milena/ChangeLog | 12 +++++++ .../k2/fill_non_primary_from_primary_2_faces.hh | 34 +++++++++++++------- milena/mln/world/kn/fill_0_from_1_faces.hh | 15 ++++++--- milena/mln/world/kn/fill_0_from_2_faces.hh | 15 ++++++--- milena/mln/world/kn/fill_1_from_2_faces.hh | 17 ++++++--- milena/mln/world/kn/fill_1_from_aux_2_faces.hh | 17 ++++++--- milena/mln/world/kn/fill_2_from_1_faces.hh | 15 ++++++--- 7 files changed, 86 insertions(+), 39 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3b898e8..d7d8e1e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Do not read outside images in fill functions with accumulators. + + * mln/world/k2/fill_non_primary_from_primary_2_faces.hh, + * mln/world/kn/fill_0_from_1_faces.hh, + * mln/world/kn/fill_0_from_2_faces.hh, + * mln/world/kn/fill_1_from_2_faces.hh, + * mln/world/kn/fill_1_from_aux_2_faces.hh, + * mln/world/kn/fill_2_from_1_faces.hh: Check if neighbor site is + in the domain. + +2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Various fixes. * mln/util/hqueue.hh: Add a precondition. 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 b97a645..8bf7f84 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 @@ -155,31 +155,41 @@ namespace mln I& ima = exact(ima_); A accu = exact(accu_); + typedef mln_value(I) VI; typedef mln_argument(A) V; - 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)) { accu.init(); - accu.take(kn::safe_cast_to<V>(ima(p + 2 * left))); - accu.take(kn::safe_cast_to<V>(ima(p + 2 * right))); - ima(p) = kn::safe_cast(accu.to_result()); + if (ima.domain().has(p + 2 * left)) + accu.take(kn::safe_cast_to<V>(ima(p + 2 * left))); + if (ima.domain().has(p + 2 * right)) + accu.take(kn::safe_cast_to<V>(ima(p + 2 * right))); + ima(p) = kn::safe_cast_to<VI>(accu.to_result()); } else if (is_non_primary_2_face_horizontal(p)) { accu.init(); - accu.take(kn::safe_cast_to<V>(ima(p + 2 * up))); - accu.take(kn::safe_cast_to<V>(ima(p + 2 * down))); - ima(p) = kn::safe_cast(accu.to_result()); + if (ima.domain().has(p + 2 * up)) + accu.take(kn::safe_cast_to<V>(ima(p + 2 * up))); + if (ima.domain().has(p + 2 * down)) + accu.take(kn::safe_cast_to<V>(ima(p + 2 * down))); + ima(p) = kn::safe_cast_to<VI>(accu.to_result()); } else if (is_non_primary_2_face_center(p)) { accu.init(); - accu.take(kn::safe_cast_to<V>(ima(p + 2 * up_left))); - accu.take(kn::safe_cast_to<V>(ima(p + 2 * up_right))); - accu.take(kn::safe_cast_to<V>(ima(p + 2 * down_left))); - accu.take(kn::safe_cast_to<V>(ima(p + 2 * down_right))); - ima(p) = kn::safe_cast(accu.to_result()); + if (ima.domain().has(p + 2 * up_left)) + accu.take(kn::safe_cast_to<V>(ima(p + 2 * up_left))); + if (ima.domain().has(p + 2 * up_right)) + accu.take(kn::safe_cast_to<V>(ima(p + 2 * up_right))); + if (ima.domain().has(p + 2 * down_left)) + accu.take(kn::safe_cast_to<V>(ima(p + 2 * down_left))); + if (ima.domain().has(p + 2 * down_right)) + accu.take(kn::safe_cast_to<V>(ima(p + 2 * down_right))); + ima(p) = kn::safe_cast_to<VI>(accu.to_result()); } trace::exiting("mln::world::k2::fill_non_primary_from_primary_2_faces"); 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 43b5096..3d1548d 100644 --- a/milena/mln/world/kn/fill_0_from_1_faces.hh +++ b/milena/mln/world/kn/fill_0_from_1_faces.hh @@ -87,15 +87,20 @@ namespace mln (void) accu_; A accu = A(); - mln_piter(I) p(inout.domain()); + mln_box(I) b = inout.domain(); + mln_piter(I) p(b); for_all(p) if (is_0_face(p)) { accu.init(); - accu.take(inout(p + left)); - accu.take(inout(p + right)); - accu.take(inout(p + up)); - accu.take(inout(p + down)); + if (inout.domain().has(p + left)) + accu.take(inout(p + left)); + if (inout.domain().has(p + right)) + accu.take(inout(p + right)); + if (inout.domain().has(p + up)) + accu.take(inout(p + up)); + if (inout.domain().has(p + down)) + accu.take(inout(p + down)); inout(p) = accu.to_result(); } 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 47fb230..798bed3 100644 --- a/milena/mln/world/kn/fill_0_from_2_faces.hh +++ b/milena/mln/world/kn/fill_0_from_2_faces.hh @@ -100,15 +100,20 @@ namespace mln (void) accu_; A accu = A(); - mln_piter(I) p(inout.domain()); + mln_box(I) b = inout.domain(); + mln_piter(I) p(b); for_all(p) if (kn::is_0_face(p)) { accu.init(); - accu.take(inout(p + up_left)); - accu.take(inout(p + up_right)); - accu.take(inout(p + down_left)); - accu.take(inout(p + down_right)); + if (inout.domain().has(p + up_left)) + accu.take(inout(p + up_left)); + if (inout.domain().has(p + up_right)) + accu.take(inout(p + up_right)); + if (inout.domain().has(p + down_left)) + accu.take(inout(p + down_left)); + if (inout.domain().has(p + down_right)) + accu.take(inout(p + down_right)); inout(p) = accu.to_result(); } 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 b638e81..3a8b93c 100644 --- a/milena/mln/world/kn/fill_1_from_2_faces.hh +++ b/milena/mln/world/kn/fill_1_from_2_faces.hh @@ -73,7 +73,7 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - // Facade + // Facades template <typename I, typename A> @@ -86,20 +86,25 @@ namespace mln (void) accu_; A accu = A(); - 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)) { accu.init(); - accu.take(inout(p + left)); - accu.take(inout(p + right)); + if (inout.domain().has(p + left)) + accu.take(inout(p + left)); + if (inout.domain().has(p + right)) + accu.take(inout(p + right)); inout(p) = accu.to_result(); } else if (is_1_face_horizontal(p)) { accu.init(); - accu.take(inout(p + up)); - accu.take(inout(p + down)); + if (inout.domain().has(p + up)) + accu.take(inout(p + up)); + if (inout.domain().has(p + down)) + accu.take(inout(p + down)); inout(p) = accu.to_result(); } 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 eb999cf..b9cbffe 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 @@ -76,7 +76,7 @@ namespace mln /// \overload 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); # ifndef MLN_INCLUDE_ONLY @@ -123,20 +123,25 @@ namespace mln (void) accu_; A accu = A(); - 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)) { accu.init(); - accu.take(aux(p + left)); - accu.take(aux(p + right)); + if (aux.domain().has(p + left)) + accu.take(aux(p + left)); + if (aux.domain().has(p + right)) + accu.take(aux(p + right)); inout(p) = accu.to_result(); } else if (kn::is_1_face_horizontal(p)) { accu.init(); - accu.take(aux(p + up)); - accu.take(aux(p + down)); + if (aux.domain().has(p + up)) + accu.take(aux(p + up)); + if (aux.domain().has(p + down)) + accu.take(aux(p + down)); inout(p) = accu.to_result(); } 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 5887572..f3c7c7e 100644 --- a/milena/mln/world/kn/fill_2_from_1_faces.hh +++ b/milena/mln/world/kn/fill_2_from_1_faces.hh @@ -100,15 +100,20 @@ namespace mln (void) accu_; A accu = A(); - mln_piter(I) p(inout.domain()); + mln_box(I) b = inout.domain(); + mln_piter(I) p(b); for_all(p) if (kn::is_2_face(p)) { accu.init(); - accu.take(inout(p + up)); - accu.take(inout(p + left)); - accu.take(inout(p + right)); - accu.take(inout(p + down)); + if (inout.domain().has(p + up)) + accu.take(inout(p + up)); + if (inout.domain().has(p + left)) + accu.take(inout(p + left)); + if (inout.domain().has(p + right)) + accu.take(inout(p + right)); + if (inout.domain().has(p + down)) + accu.take(inout(p + down)); inout(p) = accu.to_result(); } -- 1.7.2.5

1 0

branch exp/khalimsky updated: olena-2.0-139-gc25ed6a
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 c25ed6a187c7d75585f80250fa3a6c83f1b8d9c7 (commit) via 5ce0f97d66852e3b437f08832b88373a6c1b15cd (commit) via 5905ba6ba6a33fdc38d465b37262d39681b6fa38 (commit) from 6d6224d4a0f67f17038744b587f1c8491a7c6549 (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 ----------------------------------------------------------------- c25ed6a Various fixes. 5ce0f97 Add specific accumulators to work in kn. 5905ba6 configure.ac: Configure milena/tests/world/kn/accu/Makefile.am. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 + configure.ac | 5 +- milena/ChangeLog | 37 ++++ milena/mln/accu/stat/median_h_interval.hh | 170 ----------------- milena/mln/util/hqueue.hh | 1 + milena/mln/value/interval.hh | 35 +--- milena/mln/value/intsub.hh | 11 - milena/mln/world/kn/accu/max_interval.hh | 223 +++++++++++++++++++++++ milena/mln/world/kn/accu/median_h_interval.hh | 192 +++++++++++++++++++ milena/mln/world/kn/accu/min_interval.hh | 210 +++++++++++++++++++++ milena/mln/world/kn/compute_tree_of_shapes.hh | 84 +++++---- milena/tests/accu/stat/Makefile.am | 2 - milena/tests/accu/stat/median_h_interval.cc | 96 ---------- milena/tests/value/interval.cc | 18 ++ milena/tests/value/intsub.cc | 11 +- milena/tests/world/kn/Makefile.am | 2 + milena/tests/world/kn/accu/Makefile.am | 28 +++ milena/tests/world/kn/accu/max_interval.cc | 108 +++++++++++ milena/tests/world/kn/accu/median_h_interval.cc | 96 ++++++++++ milena/tests/world/kn/accu/min_interval.cc | 108 +++++++++++ 20 files changed, 1097 insertions(+), 344 deletions(-) delete mode 100644 milena/mln/accu/stat/median_h_interval.hh create mode 100644 milena/mln/world/kn/accu/max_interval.hh create mode 100644 milena/mln/world/kn/accu/median_h_interval.hh create mode 100644 milena/mln/world/kn/accu/min_interval.hh delete mode 100644 milena/tests/accu/stat/median_h_interval.cc create mode 100644 milena/tests/world/kn/accu/Makefile.am create mode 100644 milena/tests/world/kn/accu/max_interval.cc create mode 100644 milena/tests/world/kn/accu/median_h_interval.cc create mode 100644 milena/tests/world/kn/accu/min_interval.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-139-gc25ed6a Various fixes.
by Guillaume Lazzara 26 Oct '12

26 Oct '12

* mln/util/hqueue.hh: Add a precondition. * mln/value/interval.hh: Relax types of the constructor arguments and the counting of elements. * mln/value/intsub.hh: Remove constructor from int_u8 and min/max traits. * mln/world/kn/compute_tree_of_shapes.hh: Pass interval of values as argument and fix overlow issues. * tests/value/interval.cc: Add more tests. * tests/value/intsub.cc: Use math::mean and math::median. --- milena/ChangeLog | 19 ++++++ milena/mln/util/hqueue.hh | 1 + milena/mln/value/interval.hh | 35 +++------- milena/mln/value/intsub.hh | 11 --- milena/mln/world/kn/compute_tree_of_shapes.hh | 84 +++++++++++++++---------- milena/tests/value/interval.cc | 18 +++++ milena/tests/value/intsub.cc | 11 ++-- 7 files changed, 105 insertions(+), 74 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 41719b9..3b898e8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,24 @@ 2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Various fixes. + + * mln/util/hqueue.hh: Add a precondition. + + * mln/value/interval.hh: Relax types of the constructor arguments + and the counting of elements. + + * mln/value/intsub.hh: Remove constructor from int_u8 and min/max + traits. + + * mln/world/kn/compute_tree_of_shapes.hh: Pass interval of values + as argument and fix overlow issues. + + * tests/value/interval.cc: Add more tests. + + * tests/value/intsub.cc: Use math::mean and math::median. + +2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Add specific accumulators to work in kn. * mln/accu/stat/median_h_interval.hh, diff --git a/milena/mln/util/hqueue.hh b/milena/mln/util/hqueue.hh index 3a68b5c..3d28b30 100644 --- a/milena/mln/util/hqueue.hh +++ b/milena/mln/util/hqueue.hh @@ -135,6 +135,7 @@ namespace mln hqueue<T,P>::pop(const P& priority) { mln_precondition(!is_empty()); + mln_precondition(priority < v_.size()); T front = v_[priority].front(); v_[priority].pop(); return front; diff --git a/milena/mln/value/interval.hh b/milena/mln/value/interval.hh index b40f989..e835630 100644 --- a/milena/mln/value/interval.hh +++ b/milena/mln/value/interval.hh @@ -55,12 +55,12 @@ namespace mln interval(); template <typename U> - interval(U single); + interval(const U& single); - template <typename U> - interval(U first, U last); + template <typename U, typename V> + interval(const U& first, const V& last); - interval& operator=(const interval& rhs); + // interval& operator=(const interval& rhs); /// Return True if a value is within this interval. bool has(const T& v) const; @@ -228,7 +228,7 @@ namespace mln template <typename T> template <typename U> - interval<T>::interval(U single) + interval<T>::interval(const U& single) { mlc_converts_to(U,T)::check(); first_ = single; @@ -237,33 +237,18 @@ namespace mln nelements_ = 1; } - template <typename T> - template <typename U> - interval<T>::interval(U first, U last) + template <typename U, typename V> + interval<T>::interval(const U& first, const V& last) { mlc_converts_to(U,T)::check(); + mlc_converts_to(V,T)::check(); mln_precondition(last >= first); first_ = first; last_ = last; - nelements_ = 1; - // The second condition in the for-loop is required in case of - // overflow... - if (first != last) - { - for (T v = value::succ(first_); v <= last_ && v > first_; value::inc(v)) - ++nelements_; - } - } - - template <typename T> - interval<T>& - interval<T>::operator=(const interval& rhs) - { - first_ = rhs.first_; - last_ = rhs.last_; - return *this; + nelements_ = (last_ - first_) + / static_cast<float>(iota<T>::value()) + 1.f; } template <typename T> diff --git a/milena/mln/value/intsub.hh b/milena/mln/value/intsub.hh index 9fc7007..0a1dabc 100644 --- a/milena/mln/value/intsub.hh +++ b/milena/mln/value/intsub.hh @@ -83,8 +83,6 @@ namespace mln typedef trait::value::kind::data kind; typedef mln_value_quant_from_(card) quant; - static const self_ max() { return mln::value::internal::limits<int>::max() / n; } - static const self_ min() { return - max(); } static const self_ epsilon() { return 0; } typedef mln::value::intsub<n> comp; @@ -139,9 +137,6 @@ namespace mln template <unsigned m> intsub(const intsub<m>& rhs); - // FIXME: Really ? - intsub(const value::int_u<8>& rhs); - /// Construct an intsub with value : \p int_part + 1 / \p denominator. intsub(int int_part, unsigned denominator); intsub(const literal::zero_t&); @@ -304,12 +299,6 @@ namespace mln } template <unsigned n> - intsub<n>::intsub(const value::int_u<8>& rhs) - { - this->v_ = n * rhs.to_equiv(); - } - - template <unsigned n> intsub<n>::intsub(const literal::zero_t&) { this->v_ = 0; diff --git a/milena/mln/world/kn/compute_tree_of_shapes.hh b/milena/mln/world/kn/compute_tree_of_shapes.hh index 63cf1a5..e503d66 100644 --- a/milena/mln/world/kn/compute_tree_of_shapes.hh +++ b/milena/mln/world/kn/compute_tree_of_shapes.hh @@ -36,12 +36,9 @@ # include <mln/core/alias/neighb2d.hh> -# include <mln/data/compute.hh> - -# include <mln/accu/math/span.hh> - # include <mln/value/dec.hh> # include <mln/value/inc.hh> +# include <mln/value/interval.hh> # include <mln/util/hqueue.hh> # include <mln/util/tree_of_shapes.hh> @@ -62,9 +59,16 @@ namespace mln { /// \brief Compute the tree of shape from a Kn 2D image. + /*! + + \param[in] F A 2D image in Kn. It's values are considered of + type value::interval<>. + \param[in] inter Interval of the possible values in \p F. + + */ template <typename I> util::tree_of_shapes - compute_tree_of_shapes(const Image& F); + compute_tree_of_shapes(const Image& F, const mln_value(I)& inter); # ifndef MLN_INCLUDE_ONLY @@ -87,7 +91,8 @@ namespace mln compute_tree_of_shapes_t(); - util::tree_of_shapes operator()(const I& F_); + util::tree_of_shapes operator()(const I& F_, + const mln_value(I)& inter); void do_union(P p_, P r_, T& zpar, U& rank, U& last); @@ -104,7 +109,8 @@ namespace mln EV level_next_to_lcur(q_type& q); - void sort(const Image& F_, util::tree_of_shapes& t, display& dsp); + void sort(const Image& F_, util::tree_of_shapes& t, + display& dsp); void canonicalize_tree(util::tree_of_shapes& t); @@ -117,8 +123,7 @@ namespace mln unsigned N; box2d D; - - V vspan_; + mln_value(I) inter_; }; @@ -207,18 +212,6 @@ namespace mln } - - // std::ostream& - // operator<<(std::ostream& ostr, const q_type& q) - // { - // ostr << "q = "; - // for (unsigned i = 0; i < q.size(); ++i) - // if (! q[i].empty()) - // ostr < void compute_tree_of_shapes_t::priority_push(q_type& q, const P& p, const I& F) @@ -242,12 +235,25 @@ namespace mln typename compute_tree_of_shapes_t::EV compute_tree_of_shapes_t::upper_level_next_to_lcur(q_type& q, bool& found) { - for (EV l_ = lcur; l_ <= vspan_.last(); value::inc(l_)) + EV l_ = lcur; + + for (; l_ < inter_.last(); value::inc(l_)) + { if (! q[l_].empty()) { found = true; return l_; } + } + + // Avoid overflow on last element. + if (l_ == inter_.last()) + if (! q[l_].empty()) + { + found = true; + return l_; + } + found = false; return EV(); } @@ -256,12 +262,23 @@ namespace mln typename compute_tree_of_shapes_t::EV compute_tree_of_shapes_t::lower_level_next_to_lcur(q_type& q, bool& found) { - for (EV l_ = lcur; l_ >= vspan_.first(); value::dec(l_)) + EV l_ = lcur; + + for (; l_ > inter_.first(); value::dec(l_)) + if (! q[l_].empty()) + { + found = true; + return l_; + } + + // Avoid overflow on first element. + if (l_ == inter_.first()) if (! q[l_].empty()) { found = true; return l_; } + found = false; return EV(); } @@ -341,7 +358,7 @@ namespace mln mln_ch_value(I,bool) deja_vu(D), done(D); mln_piter(B) p(D); - q_type q(vspan_); + q_type q(inter_); for_all(p) { @@ -445,19 +462,15 @@ namespace mln template <typename I> util::tree_of_shapes - compute_tree_of_shapes_t::operator()(const I& F) + compute_tree_of_shapes_t::operator()(const I& F, + const mln_value(I)& inter) { trace::entering("mln::world::kn::compute_tree_of_shapes"); mln_precondition(F.is_valid()); - /// FIXME: Really ? - /// Useful while sorting sites and constructing the hqueue. - accu::math::span<V> accu; - vspan_ = data::compute(accu, F | kn::is_2_face); - /// End of FIXME - N = F.nsites(); D = F.domain(); + inter_ = inter; util::tree_of_shapes t; @@ -474,20 +487,25 @@ namespace mln + template <typename I> util::tree_of_shapes - compute_tree_of_shapes(const Image& F) + compute_tree_of_shapes(const Image& F, + const mln_value(I)& inter) { trace::entering("mln::world::kn::compute_tree_of_shapes"); mln_precondition(exact(F).is_valid()); + typedef mln_value(I) V; + mlc_is_a(V, value::interval)::check(); util::tree_of_shapes - t = internal::compute_tree_of_shapes_t()(exact(F)); + t = internal::compute_tree_of_shapes_t()(exact(F), inter); trace::exiting("mln::world::kn::compute_tree_of_shapes"); return t; } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::world::kn diff --git a/milena/tests/value/interval.cc b/milena/tests/value/interval.cc index fe5a183..43b5c26 100644 --- a/milena/tests/value/interval.cc +++ b/milena/tests/value/interval.cc @@ -107,4 +107,22 @@ int main() mln_assertion(r1.ith_element(4) == 4); } + + // Check of nelements() + { + interval<intsub<1> > r(0, 255); + mln_assertion(r.nelements() == 256); + } + { + interval<intsub<2> > r(0, 255); + mln_assertion(r.nelements() == 511); + } + { + interval<intsub<2> > r(3.5, 4.5); + mln_assertion(r.nelements() == 3); + } + { + interval<intsub<4> > r(2.25, 10.50); + mln_assertion(r.nelements() == 34); + } } diff --git a/milena/tests/value/intsub.cc b/milena/tests/value/intsub.cc index 82a87fb..06b8f1a 100644 --- a/milena/tests/value/intsub.cc +++ b/milena/tests/value/intsub.cc @@ -33,6 +33,7 @@ #include <mln/value/succ.hh> #include <mln/value/prev.hh> #include <mln/math/mean.hh> +#include <mln/math/median.hh> #include <mln/math/min.hh> #include <mln/math/ceil.hh> #include <mln/math/floor.hh> @@ -50,10 +51,10 @@ int main() mln_assertion(i == half + 2); // (2.5 + 0.5) / 2 == 1.5 - mln_assertion(mean(i, half) == 1 + half); + mln_assertion(math::mean(i, half) == 1 + half); // (2.5 + 2) / 2 = 2.25 - intsub<4> res = mean(i, intsub<2>(2)); + intsub<4> res = math::mean(i, intsub<2>(2)); mln_assertion(res == 2.25); // i == 3 @@ -95,15 +96,15 @@ int main() mln_assertion(mln::math::min(i, l) == 2.5); // mean(6,2,2.5,3) = 3.375 - mln_assertion(mean(i, intsub<2>(2), l, intsub<2>(3)) == 3.375); + mln_assertion(math::mean(i, intsub<2>(2), l, intsub<2>(3)) == 3.375); // ceil(2.5) mln_assertion(math::ceil(l) == 3); mln_assertion(math::floor(l) == 2); // median(6,2,2.5,3) = 2.75 - mln_assertion(median(i, intsub<2>(2), l, intsub<2>(3)) == 2.75); + mln_assertion(math::median(i, intsub<2>(2), l, intsub<2>(3)) == 2.75); // median(6,2) = 4 - mln_assertion(median(i, intsub<2>(2)) == 4); + mln_assertion(math::median(i, intsub<2>(2)) == 4); } -- 1.7.2.5

1 0

olena-2.0-138-g5ce0f97 Add specific accumulators to work in kn.
by Guillaume Lazzara 26 Oct '12

26 Oct '12

* mln/accu/stat/median_h_interval.hh, * tests/accu/stat/median_h_interval.cc: Move... * mln/world/kn/accu/median_h_interval.hh, * tests/world/kn/accu/median_h_interval.cc: ... Here. * mln/world/kn/accu/max_interval.hh, * mln/world/kn/accu/min_interval.hh, * tests/world/kn/accu/Makefile.am, * tests/world/kn/accu/max_interval.cc, * tests/world/kn/accu/min_interval.cc: New. * tests/accu/stat/Makefile.am, * tests/world/kn/Makefile.am: Update targets. --- milena/ChangeLog | 18 ++ milena/mln/accu/stat/median_h_interval.hh | 170 ----------------- milena/mln/world/kn/accu/max_interval.hh | 223 +++++++++++++++++++++++ milena/mln/world/kn/accu/median_h_interval.hh | 192 +++++++++++++++++++ milena/mln/world/kn/accu/min_interval.hh | 210 +++++++++++++++++++++ milena/tests/accu/stat/Makefile.am | 2 - milena/tests/accu/stat/median_h_interval.cc | 96 ---------- milena/tests/world/kn/Makefile.am | 2 + milena/tests/world/kn/accu/Makefile.am | 28 +++ milena/tests/world/kn/accu/max_interval.cc | 108 +++++++++++ milena/tests/world/kn/accu/median_h_interval.cc | 96 ++++++++++ milena/tests/world/kn/accu/min_interval.cc | 108 +++++++++++ 12 files changed, 985 insertions(+), 268 deletions(-) delete mode 100644 milena/mln/accu/stat/median_h_interval.hh create mode 100644 milena/mln/world/kn/accu/max_interval.hh create mode 100644 milena/mln/world/kn/accu/median_h_interval.hh create mode 100644 milena/mln/world/kn/accu/min_interval.hh delete mode 100644 milena/tests/accu/stat/median_h_interval.cc create mode 100644 milena/tests/world/kn/accu/Makefile.am create mode 100644 milena/tests/world/kn/accu/max_interval.cc create mode 100644 milena/tests/world/kn/accu/median_h_interval.cc create mode 100644 milena/tests/world/kn/accu/min_interval.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 45480d5..41719b9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,23 @@ 2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Add specific accumulators to work in kn. + + * mln/accu/stat/median_h_interval.hh, + * tests/accu/stat/median_h_interval.cc: Move... + * mln/world/kn/accu/median_h_interval.hh, + * tests/world/kn/accu/median_h_interval.cc: ... Here. + + * mln/world/kn/accu/max_interval.hh, + * mln/world/kn/accu/min_interval.hh, + * tests/world/kn/accu/Makefile.am, + * tests/world/kn/accu/max_interval.cc, + * tests/world/kn/accu/min_interval.cc: New. + + * tests/accu/stat/Makefile.am, + * tests/world/kn/Makefile.am: Update targets. + +2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Add kn::holes() and kn::saturate(). * mln/world/kn/holes.hh, diff --git a/milena/mln/accu/stat/median_h_interval.hh b/milena/mln/accu/stat/median_h_interval.hh deleted file mode 100644 index ebe6b8d..0000000 --- a/milena/mln/accu/stat/median_h_interval.hh +++ /dev/null @@ -1,170 +0,0 @@ -// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) -// -// This file is part of Olena. -// -// Olena is free software: you can redistribute it and/or modify it under -// the terms of the GNU General Public License as published by the Free -// Software Foundation, version 2 of the License. -// -// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// software project 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_ACCU_STAT_MEDIAN_H_INTERVAL_HH -# define MLN_ACCU_STAT_MEDIAN_H_INTERVAL_HH - -/// \file -/// -/// \brief Define a median accumulator class based on a histogram and -/// working on a specific interval. - -# include <vector> -# include <mln/accu/internal/base.hh> -# include <mln/value/interval.hh> -# include <mln/trait/routine/mean.hh> - - - -namespace mln -{ - - namespace accu - { - - namespace stat - { - - /// \brief Define a median accumulator class based on a histogram and - /// working on a specific interval. - template <typename T, - typename R = mln_trait_routine_mean(2,T) > - struct median_h_interval - : public mln::accu::internal::base< R, median_h_interval<T,R> > - { - typedef T argument; - typedef R result; - - median_h_interval(const value::interval<argument>& inter); - median_h_interval(const argument& first, const argument& last); - - void init(); - - void take(const argument& v); - void take(const median_h_interval<T,R>& v); - - // nota bene: no untake with this accumulator - - result to_result() const; - - bool is_valid() const; - - protected: - - value::interval<argument> inter_; - std::vector<unsigned> h_; - unsigned nitems_; - }; - -# ifndef MLN_INCLUDE_ONLY - - template <typename T, typename R> - median_h_interval<T,R>::median_h_interval(const value::interval<argument>& inter) - : inter_(inter) - { - h_.resize(inter_.nelements()); - init(); - } - - template <typename T, typename R> - median_h_interval<T,R>::median_h_interval(const argument& first, - const argument& last) - : inter_(first, last) - { - h_.resize(inter_.nelements()); - init(); - } - - template <typename T, typename R> - void - median_h_interval<T,R>::init() - { - std::fill(h_.begin(), h_.end(), 0u); - nitems_ = 0; - } - - template <typename T, typename R> - void - median_h_interval<T,R>::take(const argument& v) - { - h_[inter_.index_of(v)] += 1; - nitems_ += 1; - } - - template <typename T, typename R> - void - median_h_interval<T,R>::take(const median_h_interval<T,R>& other) - { - mln_precondition(other.inter_ == inter_); - for (unsigned i = 0; i < other.h_.size(); ++i) - h_[i] += other.h_[i]; - nitems_ += other.nitems_; - } - - template <typename T, typename R> - typename median_h_interval<T,R>::result - median_h_interval<T,R>::to_result() const - { - mln_precondition(is_valid()); - unsigned i = 0, n = h_.size(); - unsigned sum = h_[0], mid = (nitems_ + 1) / 2; - while (i < n && sum < mid) - { - ++i; - sum += h_[i]; - } - if (nitems_ % 2) // nitems_ is odd. - return inter_.ith_element(i); - - // nitems_ is even. - if (sum > mid) - return inter_.ith_element(i); - // looking for next non null value - unsigned i_memo = i; - do - ++i; - while (h_[i] == 0); - return (result(inter_.ith_element(i_memo)) - + result(inter_.ith_element(i))) / 2; - } - - template <typename T, typename R> - bool - median_h_interval<T,R>::is_valid() const - { - return nitems_ != 0; - } - - -# endif // ! MLN_INCLUDE_ONLY - - } // end of namespace mln::accu::stat - - } // end of namespace mln::accu - -} // end of namespace mln - - -#endif // ! MLN_ACCU_STAT_MEDIAN_H_INTERVAL_HH diff --git a/milena/mln/world/kn/accu/max_interval.hh b/milena/mln/world/kn/accu/max_interval.hh new file mode 100644 index 0000000..8d49932 --- /dev/null +++ b/milena/mln/world/kn/accu/max_interval.hh @@ -0,0 +1,223 @@ +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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_WORLD_KN_ACCU_MAX_INTERVAL_HH +# define MLN_WORLD_KN_ACCU_MAX_INTERVAL_HH + +/// \file +/// +/// \brief Define an accumulator that computes a max on a specific +/// interval. + +# include <mln/core/concept/meta_accumulator.hh> +# include <mln/accu/internal/base.hh> +# include <mln/trait/value_.hh> +# include <mln/util/pix.hh> +# include <mln/value/interval.hh> + + +namespace mln +{ + + + // Forward declaration. + namespace world { + namespace kn { + namespace accu { + template <typename T> struct max_interval; + } + } + } + + + // Traits. + + namespace trait + { + + template <typename T> + struct accumulator_< world::kn::accu::max_interval<T> > + { + typedef accumulator::has_untake::no has_untake; + typedef accumulator::has_set_value::yes has_set_value; + typedef accumulator::has_stop::no has_stop; + typedef accumulator::when_pix::use_v when_pix; + }; + + } // end of namespace mln::trait + + + namespace world + { + + namespace kn + { + + namespace accu + { + + /// \brief Minimum accumulator restricted to a specific + /// interval. + /// + /// The parameter \c T is the type of values. + /// + /// \ingroup modaccuvalues + template <typename T> + struct max_interval + : public mln::accu::internal::base< const T& , max_interval<T> > + { + typedef T argument; + + max_interval(); + max_interval(const value::interval<T>& inter); + template <typename U, typename V> + max_interval(const U& first, const V& last); + + /// Manipulators. + /// \{ + void init(); + void take_as_init_(const argument& t); + void take(const argument& t); + void take(const max_interval<T>& other); + /// \} + + /// Force the value of the min to \a t. + void set_value(const T& t); + + /// Get the value of the accumulator. + const T& to_result() const; + + /// Check whether this accu is able to return a result. + /// Always true here. + bool is_valid() const; + + protected: + + T t_; + value::interval<T> inter_; + }; + + + template <typename I> struct max_interval< util::pix >; + + +# ifndef MLN_INCLUDE_ONLY + + template <typename T> + inline + max_interval<T>::max_interval() + { + inter_ = value::interval<T>(mln_min(T), mln_max(T)); + init(); + } + + template <typename T> + inline + max_interval<T>::max_interval(const value::interval<T>& inter) + { + inter_ = inter; + init(); + } + + template <typename T> + template <typename U, typename V> + max_interval<T>::max_interval(const U& first, const V& last) + { + mlc_converts_to(U,T)::check(); + mlc_converts_to(V,T)::check(); + inter_ = value::interval<T>(first, last); + init(); + } + + template <typename T> + inline + void + max_interval<T>::init() + { + t_ = inter_.first(); + } + + template <typename T> + inline + void + max_interval<T>::take_as_init_(const argument& t) + { + t_ = t; + } + + template <typename T> + inline + void + max_interval<T>::take(const argument& t) + { + if (t > t_) + t_ = t; + } + + template <typename T> + inline + void + max_interval<T>::take(const max_interval<T>& other) + { + if (other.t_ > t_) + t_ = other.t_; + } + + template <typename T> + inline + void + max_interval<T>::set_value(const T& t) + { + t_ = t; + } + + template <typename T> + inline + const T& + max_interval<T>::to_result() const + { + return t_; + } + + template <typename T> + inline + bool + max_interval<T>::is_valid() const + { + return true; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::world::kn::accu + + } // end of namespace mln::world::kn + + } // end of namespace mln::world + +} // end of namespace mln + + +#endif // ! MLN_WORLD_KN_ACCU_MAX_INTERVAL_HH diff --git a/milena/mln/world/kn/accu/median_h_interval.hh b/milena/mln/world/kn/accu/median_h_interval.hh new file mode 100644 index 0000000..1d81339 --- /dev/null +++ b/milena/mln/world/kn/accu/median_h_interval.hh @@ -0,0 +1,192 @@ +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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_WORLD_KN_ACCU_MEDIAN_H_INTERVAL_HH +# define MLN_WORLD_KN_ACCU_MEDIAN_H_INTERVAL_HH + +/// \file +/// +/// \brief Define a median accumulator class based on a histogram and +/// working on a specific interval. + +# include <vector> +# include <mln/accu/internal/base.hh> +# include <mln/value/interval.hh> +# include <mln/trait/routine/mean.hh> +# include <mln/math/mean.hh> + + +namespace mln +{ + + namespace world + { + + namespace kn + { + + namespace accu + { + + /// \brief Define a median accumulator class based on a histogram and + /// working on a specific interval. + template <typename T, + typename R = mln_trait_routine_mean(2,T) > + struct median_h_interval + : public mln::accu::internal::base< R, median_h_interval<T,R> > + { + typedef T argument; + typedef R result; + + median_h_interval(const value::interval<argument>& inter); + median_h_interval(const argument& first, const argument& last); + template <typename U, typename V> + median_h_interval(const U& first, const V& last); + + void init(); + + void take(const argument& v); + void take(const median_h_interval<T,R>& v); + + // nota bene: no untake with this accumulator + + result to_result() const; + + bool is_valid() const; + + protected: + + value::interval<argument> inter_; + std::vector<unsigned> h_; + unsigned nitems_; + }; + +# ifndef MLN_INCLUDE_ONLY + + template <typename T, typename R> + median_h_interval<T,R>::median_h_interval(const value::interval<argument>& inter) + : inter_(inter) + { + h_.resize(inter_.nelements()); + init(); + } + + template <typename T, typename R> + median_h_interval<T,R>::median_h_interval(const argument& first, + const argument& last) + : inter_(first, last) + { + h_.resize(inter_.nelements()); + init(); + } + + template <typename T, typename R> + template <typename U, typename V> + median_h_interval<T,R>::median_h_interval(const U& first, + const V& last) + { + mlc_converts_to(U,T)::check(); + mlc_converts_to(V,T)::check(); + + inter_ = value::interval<T>(first, last); + h_.resize(inter_.nelements()); + init(); + } + + template <typename T, typename R> + void + median_h_interval<T,R>::init() + { + std::fill(h_.begin(), h_.end(), 0u); + nitems_ = 0; + } + + template <typename T, typename R> + void + median_h_interval<T,R>::take(const argument& v) + { + h_[inter_.index_of(v)] += 1; + nitems_ += 1; + } + + template <typename T, typename R> + void + median_h_interval<T,R>::take(const median_h_interval<T,R>& other) + { + mln_precondition(other.inter_ == inter_); + for (unsigned i = 0; i < other.h_.size(); ++i) + h_[i] += other.h_[i]; + nitems_ += other.nitems_; + } + + template <typename T, typename R> + typename median_h_interval<T,R>::result + median_h_interval<T,R>::to_result() const + { + if (!nitems_) + return result(math::mean(inter_.first(), inter_.last())); + + mln_precondition(is_valid()); + unsigned i = 0, n = h_.size(); + unsigned sum = h_[0], mid = (nitems_ + 1) / 2; + while (i < n && sum < mid) + { + ++i; + sum += h_[i]; + } + if (nitems_ % 2) // nitems_ is odd. + return inter_.ith_element(i); + + // nitems_ is even. + if (sum > mid) + return inter_.ith_element(i); + // looking for next non null value + unsigned i_memo = i; + do + ++i; + while (h_[i] == 0); + return (result(inter_.ith_element(i_memo)) + + result(inter_.ith_element(i))) / 2; + } + + template <typename T, typename R> + bool + median_h_interval<T,R>::is_valid() const + { + return nitems_ != 0; + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::world::kn::accu + + } // end of namespace mln::world::kn + + } // end of namespace mln::world + +} // end of namespace mln + +#endif // ! MLN_WORLD_KN_ACCU_MEDIAN_H_INTERVAL_HH diff --git a/milena/mln/world/kn/accu/min_interval.hh b/milena/mln/world/kn/accu/min_interval.hh new file mode 100644 index 0000000..df6120d --- /dev/null +++ b/milena/mln/world/kn/accu/min_interval.hh @@ -0,0 +1,210 @@ +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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_WORLD_KN_ACCU_MIN_INTERVAL_HH +# define MLN_WORLD_KN_ACCU_MIN_INTERVAL_HH + +/// \file +/// +/// Define an accumulator that computes a min on a specific interval. + +# include <mln/accu/internal/base.hh> +# include <mln/core/concept/meta_accumulator.hh> +# include <mln/trait/value_.hh> +# include <mln/util/pix.hh> +# include <mln/value/interval.hh> + +namespace mln +{ + + + // Forward declaration. + namespace world { + namespace kn { + namespace accu { + template <typename T> struct min_interval; + } + } + } + + + // Traits. + + namespace trait + { + + template <typename T> + struct accumulator_< world::kn::accu::min_interval<T> > + { + typedef accumulator::has_untake::no has_untake; + typedef accumulator::has_set_value::yes has_set_value; + typedef accumulator::has_stop::no has_stop; + typedef accumulator::when_pix::use_v when_pix; + }; + + } // end of namespace mln::trait + + + namespace world + { + + namespace kn + { + + namespace accu + { + + /// \brief Minimum accumulator restricted to a specific + /// interval. + /*! + * The parameter \c T is the type of values. + * + * \ingroup modaccuvalues + */ + template <typename T> + struct min_interval + : public mln::accu::internal::base< const T&, min_interval<T> > + { + typedef T argument; + + min_interval(); + min_interval(const value::interval<T>& inter); + template <typename U, typename V> + min_interval(const U& first, const V& last); + + /// Manipulators. + /// \{ + void init(); + void take_as_init_(const argument& t); + void take(const argument& t); + void take(const min_interval<T>& other); + /// \} + + /// Get the value of the accumulator. + const T& to_result() const; + + /// Check whether this accu is able to return a result. + /// Always true here. + bool is_valid() const; + + protected: + + T t_; + value::interval<T> inter_; + }; + + + template <typename I> struct min_interval< util::pix >; + + +# ifndef MLN_INCLUDE_ONLY + + template <typename T> + inline + min_interval<T>::min_interval() + { + inter_ = value::interval<T>(mln_min(T), mln_max(T)); + init(); + } + + template <typename T> + inline + min_interval<T>::min_interval(const value::interval<T>& inter) + { + inter_ = inter; + init(); + } + + template <typename T> + template <typename U, typename V> + inline + min_interval<T>::min_interval(const U& first, const V& last) + { + mlc_converts_to(U,T)::check(); + mlc_converts_to(V,T)::check(); + inter_ = value::interval<T>(first, last); + init(); + } + + template <typename T> + inline + void + min_interval<T>::init() + { + t_ = inter_.last(); + } + + template <typename T> + inline + void min_interval<T>::take_as_init_(const argument& t) + { + t_ = t; + } + + template <typename T> + inline + void min_interval<T>::take(const argument& t) + { + if (t < t_) + t_ = t; + } + + template <typename T> + inline + void + min_interval<T>::take(const min_interval<T>& other) + { + if (other.t_ < t_) + t_ = other.t_; + } + + template <typename T> + inline + const T& + min_interval<T>::to_result() const + { + return t_; + } + + template <typename T> + inline + bool + min_interval<T>::is_valid() const + { + return true; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::world::kn::accu + + } // end of namespace mln::world::kn + + } // end of namespace mln::world + +} // end of namespace mln + + +#endif // ! MLN_WORLD_KN_ACCU_MIN_INTERVAL_HH diff --git a/milena/tests/accu/stat/Makefile.am b/milena/tests/accu/stat/Makefile.am index f86dd88..cb647d2 100644 --- a/milena/tests/accu/stat/Makefile.am +++ b/milena/tests/accu/stat/Makefile.am @@ -27,7 +27,6 @@ check_PROGRAMS = \ max_h \ median_few \ median_h \ - median_h_interval \ mean \ rank @@ -36,7 +35,6 @@ var_SOURCES = var.cc mean_SOURCES = mean.cc median_h_SOURCES = median_h.cc median_few_SOURCES = median_few.cc -median_h_interval_SOURCES = median_h_interval.cc min_SOURCES = min.cc min_h_SOURCES = min_h.cc max_SOURCES = max.cc diff --git a/milena/tests/accu/stat/median_h_interval.cc b/milena/tests/accu/stat/median_h_interval.cc deleted file mode 100644 index b20489d..0000000 --- a/milena/tests/accu/stat/median_h_interval.cc +++ /dev/null @@ -1,96 +0,0 @@ -// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) -// -// This file is part of Olena. -// -// Olena is free software: you can redistribute it and/or modify it under -// the terms of the GNU General Public License as published by the Free -// Software Foundation, version 2 of the License. -// -// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. -// -// As a special exception, you may use this file as part of a free -// software project 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. - -#include <mln/value/interval.hh> -#include <mln/value/intsub.hh> -#include <mln/accu/stat/median_h_interval.hh> - - -template <typename T> -void doit(const mln::value::interval<T>& inter) -{ - typedef mln::accu::stat::median_h_interval<T> M; - - { - M m(inter); - m.init(); - m.take(6); - mln_postcondition(m.to_result() == 6); - } - - { - M m(inter); - m.init(); - m.take(6); - m.take(6); - mln_postcondition(m.to_result() == 6); - } - - { - M m(inter); - m.init(); - m.take(6); - m.take(6); - m.take(0); - mln_postcondition(m.to_result() == 6); - } - - { - M m(inter); - m.init(); - m.take(12); - m.take(0); - m.take(0); - m.take(24); - mln_postcondition(m.to_result() == 6); - } - - { - M m(inter); - m.init(); - m.take(1); - m.take(0); - mln_postcondition(m.to_result() == 0.5); - } -} - - -int main() -{ - using namespace mln; - - { - typedef int T; - value::interval<T> inter(0, 30); - doit(inter); - } - - { - typedef value::intsub<2> T; - value::interval<T> inter(0, 30); - doit(inter); - } - -} diff --git a/milena/tests/world/kn/Makefile.am b/milena/tests/world/kn/Makefile.am index 2a89e48a..5147ad9 100644 --- a/milena/tests/world/kn/Makefile.am +++ b/milena/tests/world/kn/Makefile.am @@ -16,6 +16,8 @@ include $(top_srcdir)/milena/tests/tests.mk +SUBDIRS = accu + check_PROGRAMS = \ fill_0_1_faces_internal_border \ fill_0_from_1_faces \ diff --git a/milena/tests/world/kn/accu/Makefile.am b/milena/tests/world/kn/accu/Makefile.am new file mode 100644 index 0000000..98651eb --- /dev/null +++ b/milena/tests/world/kn/accu/Makefile.am @@ -0,0 +1,28 @@ +# Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE). +# +# This file is part of Olena. +# +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. + +include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + max_interval \ + median_h_interval \ + min_interval + +max_interval_SOURCES = max_interval.cc +median_h_interval_SOURCES = median_h_interval.cc +min_interval_SOURCES = min_interval.cc + +TESTS = $(check_PROGRAMS) diff --git a/milena/tests/world/kn/accu/max_interval.cc b/milena/tests/world/kn/accu/max_interval.cc new file mode 100644 index 0000000..9686ad7 --- /dev/null +++ b/milena/tests/world/kn/accu/max_interval.cc @@ -0,0 +1,108 @@ +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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. + +#include <mln/value/interval.hh> +#include <mln/value/intsub.hh> +#include <mln/world/kn/accu/max_interval.hh> + + +template <typename T> +void doit(const mln::value::interval<T>& inter) +{ + typedef mln::world::kn::accu::max_interval<T> M; + + { + M m(inter); + m.init(); + mln_assertion(m.to_result() == inter.first()); + } + + { + M m; + m.init(); + mln_assertion(m.to_result() == mln_min(T)); + } + + { + M m(inter); + m.init(); + m.take(6); + mln_assertion(m.to_result() == 6); + } + + { + M m(inter); + m.init(); + m.take(6); + m.take(6); + mln_assertion(m.to_result() == 6); + } + + { + M m(inter); + m.init(); + m.take(6); + m.take(6); + m.take(0); + mln_assertion(m.to_result() == 6); + } + + { + M m(inter); + m.init(); + m.take(12); + m.take(0); + m.take(0); + m.take(24); + mln_assertion(m.to_result() == 24); + } + + { + M m(inter); + m.init(); + m.take(1); + m.take(0); + mln_assertion(m.to_result() == 1); + } +} + + +int main() +{ + using namespace mln; + + { + typedef int T; + value::interval<T> inter(0, 30); + doit(inter); + } + + { + typedef value::intsub<2> T; + value::interval<T> inter(0, 30); + doit(inter); + } + +} diff --git a/milena/tests/world/kn/accu/median_h_interval.cc b/milena/tests/world/kn/accu/median_h_interval.cc new file mode 100644 index 0000000..509bec4 --- /dev/null +++ b/milena/tests/world/kn/accu/median_h_interval.cc @@ -0,0 +1,96 @@ +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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. + +#include <mln/value/interval.hh> +#include <mln/value/intsub.hh> +#include <mln/world/kn/accu/median_h_interval.hh> + + +template <typename T> +void doit(const mln::value::interval<T>& inter) +{ + typedef mln::world::kn::accu::median_h_interval<T> M; + + { + M m(inter); + m.init(); + m.take(6); + mln_postcondition(m.to_result() == 6); + } + + { + M m(inter); + m.init(); + m.take(6); + m.take(6); + mln_postcondition(m.to_result() == 6); + } + + { + M m(inter); + m.init(); + m.take(6); + m.take(6); + m.take(0); + mln_postcondition(m.to_result() == 6); + } + + { + M m(inter); + m.init(); + m.take(12); + m.take(0); + m.take(0); + m.take(24); + mln_postcondition(m.to_result() == 6); + } + + { + M m(inter); + m.init(); + m.take(1); + m.take(0); + mln_postcondition(m.to_result() == 0.5); + } +} + + +int main() +{ + using namespace mln; + + { + typedef int T; + value::interval<T> inter(0, 30); + doit(inter); + } + + { + typedef value::intsub<2> T; + value::interval<T> inter(0, 30); + doit(inter); + } + +} diff --git a/milena/tests/world/kn/accu/min_interval.cc b/milena/tests/world/kn/accu/min_interval.cc new file mode 100644 index 0000000..7b5a0e2 --- /dev/null +++ b/milena/tests/world/kn/accu/min_interval.cc @@ -0,0 +1,108 @@ +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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. + +#include <mln/value/interval.hh> +#include <mln/value/intsub.hh> +#include <mln/world/kn/accu/min_interval.hh> + + +template <typename T> +void doit(const mln::value::interval<T>& inter) +{ + typedef mln::world::kn::accu::min_interval<T> M; + + { + M m(inter); + m.init(); + mln_assertion(m.to_result() == inter.last()); + } + + { + M m; + m.init(); + mln_assertion(m.to_result() == mln_max(T)); + } + + { + M m(inter); + m.init(); + m.take(6); + mln_assertion(m.to_result() == 6); + } + + { + M m(inter); + m.init(); + m.take(6); + m.take(6); + mln_assertion(m.to_result() == 6); + } + + { + M m(inter); + m.init(); + m.take(6); + m.take(6); + m.take(0); + mln_assertion(m.to_result() == 0); + } + + { + M m(inter); + m.init(); + m.take(12); + m.take(0); + m.take(0); + m.take(24); + mln_assertion(m.to_result() == 0); + } + + { + M m(inter); + m.init(); + m.take(1); + m.take(0); + mln_assertion(m.to_result() == 0); + } +} + + +int main() +{ + using namespace mln; + + { + typedef int T; + value::interval<T> inter(0, 30); + doit(inter); + } + + { + typedef value::intsub<2> T; + value::interval<T> inter(0, 30); + doit(inter); + } + +} -- 1.7.2.5

1 0

olena-2.0-137-g5905ba6 configure.ac: Configure milena/tests/world/kn/accu/Makefile.am.
by Guillaume Lazzara 26 Oct '12

26 Oct '12

--- ChangeLog | 4 ++++ configure.ac | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6178343..2ce7020 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Configure milena/tests/world/kn/accu/Makefile.am. + 2012-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> * configure.ac: Configure milena/tests/inner_border/Makefile.am. diff --git a/configure.ac b/configure.ac index 75d50cd..70ada91 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ -# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 EPITA Research and -# Development Laboratory (LRDE). +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 EPITA +# Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -539,6 +539,7 @@ AC_CONFIG_FILES([ milena/tests/world/k1/Makefile milena/tests/world/k2/Makefile milena/tests/world/kn/Makefile + milena/tests/world/kn/accu/Makefile ]) dnl<<lrde -- 1.7.2.5

1 0

branch exp/khalimsky updated: olena-2.0-136-g6d6224d
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 6d6224d4a0f67f17038744b587f1c8491a7c6549 (commit) from 104c7b7044973cc4da49295f06294ddc2aa552ea (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 ----------------------------------------------------------------- 6d6224d Add kn::holes() and kn::saturate(). ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 12 ++ ...{fill_0_1_faces_internal_border.hh => holes.hh} | 68 ++++++----- .../mln/world/kn/internal/get_background_label.hh | 122 ++++++++++++++++++++ ...ll_0_1_faces_internal_border.hh => saturate.hh} | 70 ++++++----- milena/tests/world/kn/Makefile.am | 4 + .../{k1/fill_1_from_2_faces.cc => kn/holes.cc} | 88 +++++++-------- .../{k1/fill_1_from_2_faces.cc => kn/saturate.cc} | 89 +++++++-------- 7 files changed, 295 insertions(+), 158 deletions(-) copy milena/mln/world/kn/{fill_0_1_faces_internal_border.hh => holes.hh} (58%) create mode 100644 milena/mln/world/kn/internal/get_background_label.hh copy milena/mln/world/kn/{fill_0_1_faces_internal_border.hh => saturate.hh} (57%) copy milena/tests/world/{k1/fill_1_from_2_faces.cc => kn/holes.cc} (59%) copy milena/tests/world/{k1/fill_1_from_2_faces.cc => kn/saturate.cc} (58%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-136-g6d6224d Add kn::holes() and kn::saturate().
by Guillaume Lazzara 26 Oct '12

26 Oct '12

* mln/world/kn/holes.hh, * mln/world/kn/internal/get_background_label.hh, * mln/world/kn/saturate.hh, * tests/world/kn/holes.cc, * tests/world/kn/saturate.cc: New. * tests/world/kn/Makefile.am: New targets. --- milena/ChangeLog | 12 ++ ...{fill_0_1_faces_internal_border.hh => holes.hh} | 68 ++++++----- .../mln/world/kn/internal/get_background_label.hh | 122 ++++++++++++++++++++ ...ll_0_1_faces_internal_border.hh => saturate.hh} | 70 ++++++----- milena/tests/world/kn/Makefile.am | 4 + .../{k1/fill_1_from_2_faces.cc => kn/holes.cc} | 88 +++++++-------- .../{k1/fill_1_from_2_faces.cc => kn/saturate.cc} | 89 +++++++-------- 7 files changed, 295 insertions(+), 158 deletions(-) copy milena/mln/world/kn/{fill_0_1_faces_internal_border.hh => holes.hh} (58%) create mode 100644 milena/mln/world/kn/internal/get_background_label.hh copy milena/mln/world/kn/{fill_0_1_faces_internal_border.hh => saturate.hh} (57%) copy milena/tests/world/{k1/fill_1_from_2_faces.cc => kn/holes.cc} (59%) copy milena/tests/world/{k1/fill_1_from_2_faces.cc => kn/saturate.cc} (58%) diff --git a/milena/ChangeLog b/milena/ChangeLog index cc55293..45480d5 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,15 @@ +2012-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add kn::holes() and kn::saturate(). + + * mln/world/kn/holes.hh, + * mln/world/kn/internal/get_background_label.hh, + * mln/world/kn/saturate.hh, + * tests/world/kn/holes.cc, + * tests/world/kn/saturate.cc: New. + + * tests/world/kn/Makefile.am: New targets. + 2012-10-25 Guillaume Lazzara <z(a)lrde.epita.fr> Fix preconditions. diff --git a/milena/mln/world/kn/fill_0_1_faces_internal_border.hh b/milena/mln/world/kn/holes.hh similarity index 58% copy from milena/mln/world/kn/fill_0_1_faces_internal_border.hh copy to milena/mln/world/kn/holes.hh index 915a69a..dad04cd 100644 --- a/milena/mln/world/kn/fill_0_1_faces_internal_border.hh +++ b/milena/mln/world/kn/holes.hh @@ -25,12 +25,17 @@ /// \file /// -/// \brief Fill 0 and 1 faces border with a value in a KN 2D image. +/// \brief -#ifndef MLN_WORLD_KN_FILL_0_1_FACES_INTERNAL_BORDER_HH -# define MLN_WORLD_KN_FILL_0_1_FACES_INTERNAL_BORDER_HH +#ifndef MLN_WORLD_KN_SATURATE_HH +# define MLN_WORLD_KN_SATURATE_HH -# include <mln/inner_border/fill.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/labeling/background.hh> +# include <mln/data/fill.hh> +# include <mln/pw/all.hh> +# include <mln/world/kn/internal/get_background_label.hh> namespace mln @@ -42,44 +47,45 @@ namespace mln namespace kn { - /*! \brief Fill 0 and 1 faces border with a value in a KN 2D image. - \param[in,out] inout A 2D image immersed in KN. - \param[in] v The border value. - - Example with \p v=1: - - . - . - . 1 1 1 1 1 - | o | o | 1 o | o 1 - . - . - . -> 1 - . - 1 - | o | o | 1 o | o 1 - . - . - . 1 1 1 1 1 - - */ template <typename I> - void fill_0_1_faces_internal_border(Image& inout, - const mln_value(I)& v); - + mln_concrete(I) + holes(const Image& input); # ifndef MLN_INCLUDE_ONLY + template <typename I> + mln_concrete(I) + holes(const Image& input_) + { + trace::entering("mln::world::kn::holes"); + mlc_equal(mln_trait_image_kind(I), + mln::trait::image::kind::binary)::check(); + mln_precondition(exact(input_).is_valid()); - // Facade + const I& input = exact(input_); + unsigned n_labels; + mln_ch_value(I,unsigned) + lab = labeling::background(input, c4(), n_labels); - template <typename I> - void fill_0_1_faces_internal_border(Image& inout_, - const mln_value(I)& v) - { - trace::entering("mln::world::kn::fill_0_1_faces_internal_border"); + bool has_bg_label; + unsigned bg = internal::get_background_label(lab, has_bg_label); + + mln_concrete(I) output(input.domain()); - mln_precondition(exact(inout_).is_valid()); - I& inout = exact(inout_); + if (! has_bg_label) + { + data::fill(output, false); + return output; + } - inner_border::fill(inout, v); + data::fill(output, pw::value(lab) != pw::cst(bg) + && pw::value(lab) != pw::cst(literal::zero)); - trace::exiting("mln::world::kn::fill_0_1_faces_internal_border"); + trace::exiting("mln::world::kn::holes"); + return output; } # endif // ! MLN_INCLUDE_ONLY @@ -90,4 +96,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_WORLD_KN_FILL_0_1_FACES_INTERNAL_BORDER_HH +#endif // ! MLN_WORLD_KN_SATURATE_HH diff --git a/milena/mln/world/kn/internal/get_background_label.hh b/milena/mln/world/kn/internal/get_background_label.hh new file mode 100644 index 0000000..a993b5a --- /dev/null +++ b/milena/mln/world/kn/internal/get_background_label.hh @@ -0,0 +1,122 @@ +// Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project 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. + +/// \file +/// +/// \brief Look for background label in the borders of a labeled +/// image. + +#ifndef MLN_WORLD_KN_INTERNAL_GET_BACKGROUND_LABEL_HH +# define MLN_WORLD_KN_INTERNAL_GET_BACKGROUND_LABEL_HH + +# include <mln/core/concept/image.hh> + +namespace mln +{ + + namespace world + { + + namespace kn + { + + namespace internal + { + + /// \brief Look for background label in the borders of a + /// labeled image. + template <typename I> + mln_value(I) + get_background_label(const Image& lab, bool& has_bg_label); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename I> + mln_value(I) + get_background_label(const Image& lab_, bool& has_bg_label) + { + trace::entering("mln::world::kn::internal::get_background_label"); + mln_precondition(exact(lab_).is_valid()); + + 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(); + + has_bg_label = false; + for (def::coord col = min_col; col <= max_col; ++col) + { + // first row + if (lab.at_(min_row, col) != 0) + { + has_bg_label = true; + return lab.at_(min_row, col); + } + // last row + if (lab.at_(max_row, col) != 0) + { + has_bg_label = true; + return lab.at_(max_row, col); + } + } + if (! has_bg_label) + { + for (def::coord row = min_row; row <= max_row; ++row) + { + // first col + if (lab.at_(row, min_col) != 0) + { + has_bg_label = true; + return lab.at_(row, min_col); + } + // last col + if (lab.at_(row, max_col) != 0) + { + has_bg_label = true; + return lab.at_(row, max_col); + } + } + } + + trace::exiting("mln::world::kn::internal::get_background_label"); + return 0; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::world::kn::internal + + } // end of namespace mln::world::kn + + } // end of namespace mln::world + +} // end of namespace mln + +#endif // ! MLN_WORLD_KN_INTERNAL_GET_BACKGROUND_LABEL_HH diff --git a/milena/mln/world/kn/fill_0_1_faces_internal_border.hh b/milena/mln/world/kn/saturate.hh similarity index 57% copy from milena/mln/world/kn/fill_0_1_faces_internal_border.hh copy to milena/mln/world/kn/saturate.hh index 915a69a..3677333 100644 --- a/milena/mln/world/kn/fill_0_1_faces_internal_border.hh +++ b/milena/mln/world/kn/saturate.hh @@ -25,12 +25,17 @@ /// \file /// -/// \brief Fill 0 and 1 faces border with a value in a KN 2D image. +/// \brief Saturate a cut of an image. -#ifndef MLN_WORLD_KN_FILL_0_1_FACES_INTERNAL_BORDER_HH -# define MLN_WORLD_KN_FILL_0_1_FACES_INTERNAL_BORDER_HH +#ifndef MLN_WORLD_KN_SATURATE_HH +# define MLN_WORLD_KN_SATURATE_HH -# include <mln/inner_border/fill.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/labeling/background.hh> +# include <mln/data/fill.hh> +# include <mln/pw/all.hh> +# include <mln/world/kn/internal/get_background_label.hh> namespace mln @@ -42,44 +47,45 @@ namespace mln namespace kn { - /*! \brief Fill 0 and 1 faces border with a value in a KN 2D image. - - \param[in,out] inout A 2D image immersed in KN. - \param[in] v The border value. - - Example with \p v=1: - - . - . - . 1 1 1 1 1 - | o | o | 1 o | o 1 - . - . - . -> 1 - . - 1 - | o | o | 1 o | o 1 - . - . - . 1 1 1 1 1 - - */ + /// \brief Saturate a cut of an image. template <typename I> - void fill_0_1_faces_internal_border(Image& inout, - const mln_value(I)& v); - + mln_concrete(I) + saturate(const Image& input); # ifndef MLN_INCLUDE_ONLY + template <typename I> + mln_concrete(I) + saturate(const Image& input_) + { + trace::entering("mln::world::kn::saturate"); + mlc_equal(mln_trait_image_kind(I), + mln::trait::image::kind::binary)::check(); + mln_precondition(exact(input_).is_valid()); - // Facade + const I& input = exact(input_); + unsigned n_labels; + mln_ch_value(I,unsigned) + lab = labeling::background(input, c4(), n_labels); - template <typename I> - void fill_0_1_faces_internal_border(Image& inout_, - const mln_value(I)& v) - { - trace::entering("mln::world::kn::fill_0_1_faces_internal_border"); + bool has_bg_label; + unsigned bg = internal::get_background_label(lab, has_bg_label); + + mln_concrete(I) output; + initialize(output, input); - mln_precondition(exact(inout_).is_valid()); - I& inout = exact(inout_); + if (! has_bg_label) + { + data::fill(output, true); + return output; + } - inner_border::fill(inout, v); + data::fill(output, pw::value(lab) != pw::cst(bg)); - trace::exiting("mln::world::kn::fill_0_1_faces_internal_border"); + trace::exiting("mln::world::kn::saturate"); + return output; } # endif // ! MLN_INCLUDE_ONLY @@ -90,4 +96,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_WORLD_KN_FILL_0_1_FACES_INTERNAL_BORDER_HH +#endif // ! MLN_WORLD_KN_SATURATE_HH diff --git a/milena/tests/world/kn/Makefile.am b/milena/tests/world/kn/Makefile.am index 866ae00..2a89e48a 100644 --- a/milena/tests/world/kn/Makefile.am +++ b/milena/tests/world/kn/Makefile.am @@ -23,6 +23,7 @@ check_PROGRAMS = \ fill_1_from_2_faces \ fill_1_from_aux_2_faces \ fill_2_from_1_faces \ + holes \ immerse \ immerse_with_inner_border \ is_0_face \ @@ -32,6 +33,7 @@ check_PROGRAMS = \ is_1_face_horizontal \ is_2_face \ level \ + saturate \ un_immerse fill_0_1_faces_internal_border_SOURCES = fill_0_1_faces_internal_border.cc @@ -40,6 +42,7 @@ fill_0_from_2_faces_SOURCES = fill_0_from_2_faces.cc fill_1_from_2_faces_SOURCES = fill_1_from_2_faces.cc fill_1_from_aux_2_faces_SOURCES = fill_1_from_aux_2_faces.cc fill_2_from_1_faces_SOURCES = fill_2_from_1_faces.cc +holes_SOURCES = holes.cc immerse_SOURCES = immerse.cc immerse_with_inner_border_SOURCES = immerse_with_inner_border.cc is_0_face_SOURCES = is_0_face.cc @@ -49,6 +52,7 @@ is_1_face_vertical_SOURCES = is_1_face_vertical.cc is_1_face_horizontal_SOURCES = is_1_face_horizontal.cc is_2_face_SOURCES = is_2_face.cc level_SOURCES = level.cc +saturate_SOURCES = saturate.cc un_immerse_SOURCES = un_immerse.cc diff --git a/milena/tests/world/k1/fill_1_from_2_faces.cc b/milena/tests/world/kn/holes.cc similarity index 59% copy from milena/tests/world/k1/fill_1_from_2_faces.cc copy to milena/tests/world/kn/holes.cc index 4045674..9bba24f 100644 --- a/milena/tests/world/k1/fill_1_from_2_faces.cc +++ b/milena/tests/world/kn/holes.cc @@ -26,61 +26,55 @@ /// \file #include <mln/core/image/image2d.hh> -#include <mln/make/box2d.hh> +#include <mln/world/kn/holes.hh> #include <mln/data/compare.hh> -#include <mln/accu/math/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; - } - - }; - -} - - 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 } - }; - image2d<int> imakn = make::image(vals, point2d(-1, -1)); + { + bool vals[][5] = { + {0, 0, 1, 1, 1}, + {1, 0, 1, 0, 1}, + {1, 1, 1, 1, 1}, + {1, 1, 1, 1, 1}, + {1, 1, 1, 1, 1} + }; + image2d<bool> ima = make::image(vals); + bool refvals[][5] = { + {0, 0, 0, 0, 0}, + {0, 0, 0, 1, 0}, + {0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0} + }; + image2d<bool> ref = make::image(refvals); + + image2d<bool> out = world::kn::holes(ima); + mln_assertion(out == ref); + } - /// Make sure the border is set to 0 to get deterministic results. - border::fill(imakn, 0); - // Overload with function { - sum_t f; - world::k1::fill_1_from_2_faces(imakn, f); - mln_assertion(ref == imakn); + bool vals[][5] = { + {1, 1, 1, 1, 1}, + {1, 0, 1, 0, 1}, + {1, 1, 1, 1, 1}, + {1, 1, 1, 1, 1}, + {1, 1, 1, 1, 1} + }; + image2d<bool> ima = make::image(vals); + bool refvals[][5] = { + {0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0}, + {0, 0, 0, 0, 0} + }; + image2d<bool> ref = make::image(refvals); + + image2d<bool> out = world::kn::holes(ima); + mln_assertion(out == ref); } - } diff --git a/milena/tests/world/k1/fill_1_from_2_faces.cc b/milena/tests/world/kn/saturate.cc similarity index 58% copy from milena/tests/world/k1/fill_1_from_2_faces.cc copy to milena/tests/world/kn/saturate.cc index 4045674..33b0f79 100644 --- a/milena/tests/world/k1/fill_1_from_2_faces.cc +++ b/milena/tests/world/kn/saturate.cc @@ -26,61 +26,54 @@ /// \file #include <mln/core/image/image2d.hh> -#include <mln/make/box2d.hh> +#include <mln/world/kn/saturate.hh> #include <mln/data/compare.hh> -#include <mln/accu/math/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; - } - - }; - -} - - 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 } - }; - 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 function { - sum_t f; - world::k1::fill_1_from_2_faces(imakn, f); - mln_assertion(ref == imakn); + bool vals[][5] = { + {0, 0, 1, 1, 1}, + {1, 0, 1, 0, 1}, + {1, 1, 1, 1, 1}, + {1, 1, 1, 1, 1}, + {1, 1, 1, 1, 1} + }; + image2d<bool> ima = make::image(vals); + bool refvals[][5] = { + {0, 0, 1, 1, 1}, + {1, 0, 1, 1, 1}, + {1, 1, 1, 1, 1}, + {1, 1, 1, 1, 1}, + {1, 1, 1, 1, 1} + }; + image2d<bool> ref = make::image(refvals); + + image2d<bool> out = world::kn::saturate(ima); + mln_assertion(out == ref); } + { + bool vals[][5] = { + {1, 1, 1, 1, 1}, + {1, 0, 1, 0, 1}, + {1, 1, 1, 1, 1}, + {1, 1, 1, 1, 1}, + {1, 1, 1, 1, 1} + }; + image2d<bool> ima = make::image(vals); + bool refvals[][5] = { + {1, 1, 1, 1, 1}, + {1, 1, 1, 1, 1}, + {1, 1, 1, 1, 1}, + {1, 1, 1, 1, 1}, + {1, 1, 1, 1, 1} + }; + image2d<bool> ref = make::image(refvals); + + image2d<bool> out = world::kn::saturate(ima); + mln_assertion(out == ref); + } } -- 1.7.2.5

1 0