November 2010 - Olena-patches

last-svn-commit-676-gcf721d5 Fix disabled unit tests in Milena.
by Guillaume Lazzara 18 Nov '10

18 Nov '10

* tests/unit_test/disabled_tests: Add a missing new line at end of file. * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 9 +++++++++ milena/tests/unit_test/disabled_tests | 2 +- milena/tests/unit_test/unit-tests.mk | 6 +++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7491b8a..1a2ea7a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix disabled unit tests in Milena. + + * tests/unit_test/disabled_tests: Add a missing new line at end of + file. + + * tests/unit_test/unit-tests.mk: Regen. + 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> * tests/unit_test/disabled_tests: Disable mln_world_rgb_invert.spe diff --git a/milena/tests/unit_test/disabled_tests b/milena/tests/unit_test/disabled_tests index b86f257..8a189a5 100644 --- a/milena/tests/unit_test/disabled_tests +++ b/milena/tests/unit_test/disabled_tests @@ -31,4 +31,4 @@ mln/histo/compute.spe.hh mln/labeling/value.spe.hh mln/logical/not.spe.hh mln/morpho/general.spe.hh -mln/world/rgb/invert.spe.hh \ No newline at end of file +mln/world/rgb/invert.spe.hh diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 5baced7..f4cfae7 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -142,6 +142,7 @@ mln_accu_site_set_rectangularity \ mln_accu_stat_all \ mln_accu_stat_deviation \ mln_accu_stat_essential \ +mln_accu_stat_histo3d_rgb \ mln_accu_stat_max \ mln_accu_stat_max_h \ mln_accu_stat_mean \ @@ -1413,8 +1414,7 @@ mln_world_inter_pixel_is_pixel \ mln_world_inter_pixel_is_separator \ mln_world_inter_pixel_neighb2d \ mln_world_inter_pixel_separator_to_pixels \ -mln_world_rgb_invert \ -mln_world_rgb_invert_spe +mln_world_rgb_invert mln_accu_all_SOURCES = mln_accu_all.cc mln_accu_center_SOURCES = mln_accu_center.cc @@ -1466,6 +1466,7 @@ mln_accu_site_set_rectangularity_SOURCES = mln_accu_site_set_rectangularity.cc mln_accu_stat_all_SOURCES = mln_accu_stat_all.cc mln_accu_stat_deviation_SOURCES = mln_accu_stat_deviation.cc mln_accu_stat_essential_SOURCES = mln_accu_stat_essential.cc +mln_accu_stat_histo3d_rgb_SOURCES = mln_accu_stat_histo3d_rgb.cc mln_accu_stat_max_SOURCES = mln_accu_stat_max.cc mln_accu_stat_max_h_SOURCES = mln_accu_stat_max_h.cc mln_accu_stat_mean_SOURCES = mln_accu_stat_mean.cc @@ -2738,5 +2739,4 @@ mln_world_inter_pixel_is_separator_SOURCES = mln_world_inter_pixel_is_separator. mln_world_inter_pixel_neighb2d_SOURCES = mln_world_inter_pixel_neighb2d.cc mln_world_inter_pixel_separator_to_pixels_SOURCES = mln_world_inter_pixel_separator_to_pixels.cc mln_world_rgb_invert_SOURCES = mln_world_rgb_invert.cc -mln_world_rgb_invert_spe_SOURCES = mln_world_rgb_invert_spe.cc -- 1.5.6.5

1 0

branch next-build-test updated: last-svn-commit-675-g5fc9c32
by lazzara＠lrde.epita.fr 16 Nov '10

16 Nov '10

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 next-build-test has been updated via 5fc9c32351bd3eef4749095a1948eeb2735c379c (commit) from 557ac2f43b73eb2fc3a49d1d34975559873fabee (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 ----------------------------------------------------------------- 5fc9c32 tests/unit_test/disabled_tests: Disable mln_world_rgb_invert.spe test. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 5 +++++ milena/tests/unit_test/disabled_tests | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-673-g270711a tests/unit_test/disabled_tests: Disable mln_world_rgb_invert.spe test.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

--- milena/ChangeLog | 5 +++++ milena/tests/unit_test/disabled_tests | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0b6247e..55aabce 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/unit_test/disabled_tests: Disable mln_world_rgb_invert.spe + test. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new test for accu::stat:deviation. * tests/accu/stat/Makefile.am: Add a new target. diff --git a/milena/tests/unit_test/disabled_tests b/milena/tests/unit_test/disabled_tests index 5fd991c..b86f257 100644 --- a/milena/tests/unit_test/disabled_tests +++ b/milena/tests/unit_test/disabled_tests @@ -31,3 +31,4 @@ mln/histo/compute.spe.hh mln/labeling/value.spe.hh mln/logical/not.spe.hh mln/morpho/general.spe.hh +mln/world/rgb/invert.spe.hh \ No newline at end of file -- 1.5.6.5

1 0

last-svn-commit-675-g5fc9c32 tests/unit_test/disabled_tests: Disable mln_world_rgb_invert.spe test.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

--- milena/ChangeLog | 5 +++++ milena/tests/unit_test/disabled_tests | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index af606bd..7491b8a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/unit_test/disabled_tests: Disable mln_world_rgb_invert.spe + test. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new test for accu::stat:deviation. * tests/accu/stat/Makefile.am: Add a new target. diff --git a/milena/tests/unit_test/disabled_tests b/milena/tests/unit_test/disabled_tests index 5fd991c..b86f257 100644 --- a/milena/tests/unit_test/disabled_tests +++ b/milena/tests/unit_test/disabled_tests @@ -31,3 +31,4 @@ mln/histo/compute.spe.hh mln/labeling/value.spe.hh mln/logical/not.spe.hh mln/morpho/general.spe.hh +mln/world/rgb/invert.spe.hh \ No newline at end of file -- 1.5.6.5

1 0

branch next-build-test updated: last-svn-commit-674-g557ac2f
by lazzara＠lrde.epita.fr 16 Nov '10

16 Nov '10

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 next-build-test has been updated via 557ac2f43b73eb2fc3a49d1d34975559873fabee (commit) via 236e8722e83acffc95360eba6b190b90519ef23d (commit) via 0ce764d574dff94e89d7c5d1f1d0e9c010a84707 (commit) via 8f3101526bd99273d1b71d467b044a07a8479d70 (commit) from 63c3277770ffaa3b4e398d55abda8c5d20dc9457 (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 ----------------------------------------------------------------- 557ac2f Add a new test for accu::stat:deviation. 236e872 scribo/primitive/extract/separators_nonvisible.hh: Fix warnings. 0ce764d mln/accu/stat/deviation.hh: Fix type of constructor argument. 8f31015 Remove a useless from_to overload. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 20 ++++++++++++++++ milena/mln/accu/stat/deviation.hh | 8 ++++-- milena/mln/convert/from_to.hxx | 4 --- milena/mln/convert/impl/from_unsigned_to_value.hh | 12 +-------- milena/tests/accu/stat/Makefile.am | 5 +++- .../qt_rgb_to_int_u.cc => accu/stat/deviation.cc} | 25 +++++++++++++------ scribo/ChangeLog | 4 +++ .../primitive/extract/separators_nonvisible.hh | 8 ++++- 8 files changed, 58 insertions(+), 28 deletions(-) copy milena/tests/{fun/v2v/qt_rgb_to_int_u.cc => accu/stat/deviation.cc} (75%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-672-gc03272f Add a new test for accu::stat:deviation.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

* tests/accu/stat/Makefile.am: Add a new target. * tests/accu/stat/deviation.cc: New. --- milena/ChangeLog | 8 ++++++ milena/tests/accu/stat/Makefile.am | 5 +++- .../qt_rgb_to_int_u.cc => accu/stat/deviation.cc} | 25 +++++++++++++------ 3 files changed, 29 insertions(+), 9 deletions(-) copy milena/tests/{fun/v2v/qt_rgb_to_int_u.cc => accu/stat/deviation.cc} (75%) diff --git a/milena/ChangeLog b/milena/ChangeLog index f97ab68..0b6247e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new test for accu::stat:deviation. + + * tests/accu/stat/Makefile.am: Add a new target. + + * tests/accu/stat/deviation.cc: New. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Remove a useless from_to overload. * mln/convert/from_to.hxx, diff --git a/milena/tests/accu/stat/Makefile.am b/milena/tests/accu/stat/Makefile.am index c331db0..47197c0 100644 --- a/milena/tests/accu/stat/Makefile.am +++ b/milena/tests/accu/stat/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +# (LRDE). # # This file is part of Olena. # @@ -17,6 +18,7 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ + deviation \ var \ min \ min_h \ @@ -27,6 +29,7 @@ check_PROGRAMS = \ mean \ rank +deviation_SOURCES = deviation.cc var_SOURCES = var.cc mean_SOURCES = mean.cc median_h_SOURCES = median_h.cc diff --git a/milena/tests/fun/v2v/qt_rgb_to_int_u.cc b/milena/tests/accu/stat/deviation.cc similarity index 75% copy from milena/tests/fun/v2v/qt_rgb_to_int_u.cc copy to milena/tests/accu/stat/deviation.cc index 5b55d49..e39359e 100644 --- a/milena/tests/fun/v2v/qt_rgb_to_int_u.cc +++ b/milena/tests/accu/stat/deviation.cc @@ -23,22 +23,31 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/// \file +/// +/// \brief Tests on mln::accu::deviation. + #include <mln/core/image/image2d.hh> +#include <mln/debug/iota.hh> -#include <mln/fun/v2v/qt_rgb_to_int_u.hh> -#include <mln/value/qt/rgb32.hh> -#include <mln/value/int_u8.hh> +#include <mln/accu/stat/deviation.hh> +#include <mln/data/compute.hh> +#include <mln/io/pgm/save.hh> +#include <mln/data/convert.hh> +#include <mln/value/int_u8.hh> int main() { using namespace mln; + image2d<short> ima(3, 3); + debug::iota(ima); - fun::v2v::qt_rgb_to_int_u<8> f; - - value::qt::rgb32 vcolor(100, 200, 30); + accu::stat::deviation<int> dev(5); - value::int_u8 vgl = f(vcolor); + volatile float + ref = 2.5819f, + trunc_val = (unsigned(data::compute(dev, ima) * 10000.f) / 10000.f); - mln_assertion(vgl == 110); + mln_assertion(trunc_val == ref); } -- 1.5.6.5

1 0

last-svn-commit-674-g557ac2f Add a new test for accu::stat:deviation.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

* tests/accu/stat/Makefile.am: Add a new target. * tests/accu/stat/deviation.cc: New. --- milena/ChangeLog | 8 ++++++ milena/tests/accu/stat/Makefile.am | 5 +++- .../qt_rgb_to_int_u.cc => accu/stat/deviation.cc} | 25 +++++++++++++------ 3 files changed, 29 insertions(+), 9 deletions(-) copy milena/tests/{fun/v2v/qt_rgb_to_int_u.cc => accu/stat/deviation.cc} (75%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5ecbfb8..af606bd 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new test for accu::stat:deviation. + + * tests/accu/stat/Makefile.am: Add a new target. + + * tests/accu/stat/deviation.cc: New. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/accu/stat/deviation.hh: Fix type of constructor argument. 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/tests/accu/stat/Makefile.am b/milena/tests/accu/stat/Makefile.am index c331db0..47197c0 100644 --- a/milena/tests/accu/stat/Makefile.am +++ b/milena/tests/accu/stat/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +# (LRDE). # # This file is part of Olena. # @@ -17,6 +18,7 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ + deviation \ var \ min \ min_h \ @@ -27,6 +29,7 @@ check_PROGRAMS = \ mean \ rank +deviation_SOURCES = deviation.cc var_SOURCES = var.cc mean_SOURCES = mean.cc median_h_SOURCES = median_h.cc diff --git a/milena/tests/fun/v2v/qt_rgb_to_int_u.cc b/milena/tests/accu/stat/deviation.cc similarity index 75% copy from milena/tests/fun/v2v/qt_rgb_to_int_u.cc copy to milena/tests/accu/stat/deviation.cc index 5b55d49..e39359e 100644 --- a/milena/tests/fun/v2v/qt_rgb_to_int_u.cc +++ b/milena/tests/accu/stat/deviation.cc @@ -23,22 +23,31 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/// \file +/// +/// \brief Tests on mln::accu::deviation. + #include <mln/core/image/image2d.hh> +#include <mln/debug/iota.hh> -#include <mln/fun/v2v/qt_rgb_to_int_u.hh> -#include <mln/value/qt/rgb32.hh> -#include <mln/value/int_u8.hh> +#include <mln/accu/stat/deviation.hh> +#include <mln/data/compute.hh> +#include <mln/io/pgm/save.hh> +#include <mln/data/convert.hh> +#include <mln/value/int_u8.hh> int main() { using namespace mln; + image2d<short> ima(3, 3); + debug::iota(ima); - fun::v2v::qt_rgb_to_int_u<8> f; - - value::qt::rgb32 vcolor(100, 200, 30); + accu::stat::deviation<int> dev(5); - value::int_u8 vgl = f(vcolor); + volatile float + ref = 2.5819f, + trunc_val = (unsigned(data::compute(dev, ima) * 10000.f) / 10000.f); - mln_assertion(vgl == 110); + mln_assertion(trunc_val == ref); } -- 1.5.6.5

1 0

last-svn-commit-671-g9bd5d46 scribo/primitive/extract/separators_nonvisible.hh: Fix warnings.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

--- scribo/ChangeLog | 4 ++++ .../primitive/extract/separators_nonvisible.hh | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index be2365e..d3b3a65 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/extract/separators_nonvisible.hh: Fix warnings. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen .mk files in Scribo. * headers.mk, diff --git a/scribo/scribo/primitive/extract/separators_nonvisible.hh b/scribo/scribo/primitive/extract/separators_nonvisible.hh index 460d10e..8aaeeec 100644 --- a/scribo/scribo/primitive/extract/separators_nonvisible.hh +++ b/scribo/scribo/primitive/extract/separators_nonvisible.hh @@ -322,7 +322,9 @@ namespace scribo angle = (angle * 180.0f) / math::pi; angle = angle * 20.0f + 1.0f; mln::draw::line(debug_angle_, p1, p2, - value::rgb8(angle, angle, angle)); + value::rgb8(unsigned(angle), + unsigned(angle), + unsigned(angle))); } } @@ -355,7 +357,9 @@ namespace scribo angle = (angle * 180.0f) / math::pi; angle = angle * 20.0f + 1.0f; mln::draw::line(debug_angle_, p1, p2, - value::rgb8(angle, angle, angle)); + value::rgb8(unsigned(angle), + unsigned(angle), + unsigned(angle))); } } } -- 1.5.6.5

1 0

last-svn-commit-673-g236e872 scribo/primitive/extract/separators_nonvisible.hh: Fix warnings.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

--- scribo/ChangeLog | 4 ++++ .../primitive/extract/separators_nonvisible.hh | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 6c4d48d..bfda4bd 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/extract/separators_nonvisible.hh: Fix warnings. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen .mk files in Scribo. * headers.mk, diff --git a/scribo/scribo/primitive/extract/separators_nonvisible.hh b/scribo/scribo/primitive/extract/separators_nonvisible.hh index 460d10e..8aaeeec 100644 --- a/scribo/scribo/primitive/extract/separators_nonvisible.hh +++ b/scribo/scribo/primitive/extract/separators_nonvisible.hh @@ -322,7 +322,9 @@ namespace scribo angle = (angle * 180.0f) / math::pi; angle = angle * 20.0f + 1.0f; mln::draw::line(debug_angle_, p1, p2, - value::rgb8(angle, angle, angle)); + value::rgb8(unsigned(angle), + unsigned(angle), + unsigned(angle))); } } @@ -355,7 +357,9 @@ namespace scribo angle = (angle * 180.0f) / math::pi; angle = angle * 20.0f + 1.0f; mln::draw::line(debug_angle_, p1, p2, - value::rgb8(angle, angle, angle)); + value::rgb8(unsigned(angle), + unsigned(angle), + unsigned(angle))); } } } -- 1.5.6.5

1 0

last-svn-commit-672-g0ce764d mln/accu/stat/deviation.hh: Fix type of constructor argument.
by Guillaume Lazzara 16 Nov '10

16 Nov '10

--- milena/ChangeLog | 4 ++++ milena/mln/accu/stat/deviation.hh | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f97ab68..5ecbfb8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/accu/stat/deviation.hh: Fix type of constructor argument. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Remove a useless from_to overload. * mln/convert/from_to.hxx, diff --git a/milena/mln/accu/stat/deviation.hh b/milena/mln/accu/stat/deviation.hh index 1f15100..ca57f23 100644 --- a/milena/mln/accu/stat/deviation.hh +++ b/milena/mln/accu/stat/deviation.hh @@ -64,7 +64,9 @@ namespace mln typedef T argument; typedef M result; - deviation(const T mean); + // Note: We may like to have an initial mean as precise as the + // sum type. So type S is prefered to type T here. + deviation(const S& mean); /// Manipulators. /// \{ @@ -89,7 +91,7 @@ namespace mln // parameter since in the core of the deviation::take method, // this accumulator takes data of type mln_sum(T). accu::math::sum<mln_sum(T),S> sum_; - T mean_; + S mean_; }; @@ -120,7 +122,7 @@ namespace mln template <typename T, typename S, typename M> inline - deviation<T,S,M>::deviation(const T mean) + deviation<T,S,M>::deviation(const S& mean) { init(); mean_ = mean; -- 1.5.6.5

1 0