June 2009 - Olena-patches

4223: tests/preprocessing/unskew.cc: fix test.
by Guillaume Lazzara 30 Jun '09

30 Jun '09

--- scribo/ChangeLog | 4 ++++ scribo/tests/preprocessing/unskew.cc | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 71d982b..f11cfa1 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2009-06-39 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * tests/preprocessing/unskew.cc: fix test. + +2009-06-39 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * preprocessing/unskew.hh: Fix an ambiguity. 2009-06-39 Guillaume Lazzara <lazzara(a)lrde.epita.fr> diff --git a/scribo/tests/preprocessing/unskew.cc b/scribo/tests/preprocessing/unskew.cc index 832ae3d..9c84951 100644 --- a/scribo/tests/preprocessing/unskew.cc +++ b/scribo/tests/preprocessing/unskew.cc @@ -40,5 +40,5 @@ int main(int argc, char *argv[]) image2d<bool> ima; io::pbm::load(ima, SCRIBO_IMG_DIR "/text_to_group.pbm"); - io::pbm::save(scribo::preprocessing::unskew(ima), "unskew.pbm"); + io::pbm::save(scribo::preprocessing::unskew(ima).first(), "unskew.pbm"); } -- 1.5.6.5

1 0

4222: preprocessing/unskew.hh: Fix an ambiguity.
by Guillaume Lazzara 30 Jun '09

30 Jun '09

--- scribo/ChangeLog | 4 ++++ scribo/preprocessing/unskew.hh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 6f2d735..71d982b 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2009-06-39 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * preprocessing/unskew.hh: Fix an ambiguity. + +2009-06-39 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Update calls to geom::rotate. * src/preprocess.cc, diff --git a/scribo/preprocessing/unskew.hh b/scribo/preprocessing/unskew.hh index ae31a07..3b90d8a 100644 --- a/scribo/preprocessing/unskew.hh +++ b/scribo/preprocessing/unskew.hh @@ -103,7 +103,7 @@ namespace scribo mln_concrete(I) output = geom::rotate(input, angle); trace::exiting("scribo::preprocessing::unskew"); - return make::couple(output, angle); + return mln::make::couple(output, angle); } # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5

1 0

4221: Update calls to geom::rotate.
by Guillaume Lazzara 30 Jun '09

30 Jun '09

* src/preprocess.cc, * src/preprocessing/unskew.cc: update call to geom::rotate. --- scribo/ChangeLog | 9 ++++++++- scribo/src/preprocess.cc | 2 +- scribo/src/preprocessing/unskew.cc | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1467d33..6f2d735 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,4 +1,11 @@ -2009-06-23 Guillaume Lazzara <lazzara(a)lrde.epita.fr> +2009-06-39 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Update calls to geom::rotate. + + * src/preprocess.cc, + * src/preprocessing/unskew.cc: update call to geom::rotate. + +2009-06-30 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * preprocessing/unskew.hh: rename transformation:: to geom::. diff --git a/scribo/src/preprocess.cc b/scribo/src/preprocess.cc index c9f74c7..57a0fb7 100644 --- a/scribo/src/preprocess.cc +++ b/scribo/src/preprocess.cc @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) input_bw = scribo::filter::small_objects(input_bw, c8(), value::label_16(), 3); input_bw = scribo::filter::thin_objects(input_bw, c8(), value::label_16(), 1); - input_bw = scribo::preprocessing::unskew(input_bw); + input_bw = scribo::preprocessing::unskew(input_bw).first(); logical::not_inplace(input_bw); io::pbm::save(input_bw, argv[2]); diff --git a/scribo/src/preprocessing/unskew.cc b/scribo/src/preprocessing/unskew.cc index bdd9035..b8c1979 100644 --- a/scribo/src/preprocessing/unskew.cc +++ b/scribo/src/preprocessing/unskew.cc @@ -52,7 +52,7 @@ int main(int argc, char *argv[]) image2d<bool> input; io::pbm::load(input, argv[1]); - io::pbm::save(scribo::preprocessing::unskew(input), argv[2]); + io::pbm::save(scribo::preprocessing::unskew(input).first(), argv[2]); mln::trace::exiting("main"); } -- 1.5.6.5

1 0

4220: preprocessing/unskew.hh: rename transformation:: to geom::.
by Guillaume Lazzara 30 Jun '09

30 Jun '09

--- scribo/ChangeLog | 4 ++++ scribo/preprocessing/unskew.hh | 24 +++++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 625f471..1467d33 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2009-06-23 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + * preprocessing/unskew.hh: rename transformation:: to geom::. + 2009-06-26 Roland Levillain <roland(a)lrde.epita.fr> * headers.mk, tests/unit_test/unit-tests.mk: Regen. diff --git a/scribo/preprocessing/unskew.hh b/scribo/preprocessing/unskew.hh index aa82f44..ae31a07 100644 --- a/scribo/preprocessing/unskew.hh +++ b/scribo/preprocessing/unskew.hh @@ -36,7 +36,13 @@ # include <mln/accu/max_site.hh> # include <mln/transform/hough.hh> -# include <mln/transformation/rotate.hh> +# include <mln/geom/rotate.hh> + +# include <mln/io/pgm/save.hh> +# include <mln/core/image/vmorph/cast_image.hh> +# include <mln/value/int_u8.hh> + +# include <mln/util/couple.hh> namespace scribo { @@ -55,7 +61,7 @@ namespace scribo /// \return A binary image. // template <typename I> - mln_concrete(I) + mln::util::couple<mln_concrete(I), double> unskew(const Image& input_); @@ -64,7 +70,7 @@ namespace scribo template <typename I> - mln_concrete(I) + mln::util::couple<mln_concrete(I), double> unskew(const Image& input_) { trace::entering("scribo::preprocessing::unskew"); @@ -78,14 +84,14 @@ namespace scribo point2d max_p = accu::compute(accu::max_site<image2d<float> >(), hough_ima); double angle = 0; - int max_angle = max_p.col(); + int max_angle = max_p.row(); - std::cout << "max_angle = " << max_angle << std::endl; +// std::cout << "max_angle = " << max_angle << std::endl; if (max_angle > 180) max_angle = - max_angle % 180; if (max_angle < 90 && max_angle > 0) - angle = 90 - max_angle; + angle = - max_angle; else if (max_angle < 0 && max_angle > -90) angle = max_angle; else if (max_angle < 180 && max_angle > 90) @@ -93,11 +99,11 @@ namespace scribo else if (max_angle < -90 && max_angle > -180) angle = 180 + max_angle; - std::cout << "effective angle = " << angle << std::endl; - mln_concrete(I) output = transformation::rotate(input, angle); +// std::cout << "effective angle = " << angle << std::endl; + mln_concrete(I) output = geom::rotate(input, angle); trace::exiting("scribo::preprocessing::unskew"); - return output; + return make::couple(output, angle); } # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5

1 0

4219: Regen headers.mk and unit-tests.mk.
by Guillaume Lazzara 30 Jun '09

30 Jun '09

* milena/headers.mk, * milena/tests/unit_test/unit-tests.mk: regen. --- milena/ChangeLog | 7 +++++++ milena/headers.mk | 5 +---- milena/tests/unit_test/unit-tests.mk | 8 ++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 68068a4..a8e29fe 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2009-06-30 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Regen headers.mk and unit-tests.mk. + + * milena/headers.mk, + * milena/tests/unit_test/unit-tests.mk: regen. + +2009-06-30 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Move transformation::rotate to geom::rotate. * mln/geom/all.hh: Include rotate.hh. diff --git a/milena/headers.mk b/milena/headers.mk index 37a59a1..23c2368 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -478,7 +478,6 @@ mln/extension/duplicate.hh \ mln/extension/essential.hh \ mln/extension/fill.hh \ mln/fun/all.hh \ -mln/fun/binary.hh \ mln/fun/c.hh \ mln/fun/cast.hh \ mln/fun/essential.hh \ @@ -590,6 +589,7 @@ mln/geom/nrows.hh \ mln/geom/nsites.hh \ mln/geom/nslis.hh \ mln/geom/pmin_pmax.hh \ +mln/geom/rotate.hh \ mln/geom/seeds2tiling.hh \ mln/geom/seeds2tiling_roundness.hh \ mln/geom/size1d.hh \ @@ -1063,9 +1063,6 @@ mln/transform/internal/all.hh \ mln/transform/internal/closest_point_functor.hh \ mln/transform/internal/distance_functor.hh \ mln/transform/internal/influence_zone_functor.hh \ -mln/transformation/all.hh \ -mln/transformation/essential.hh \ -mln/transformation/rotate.hh \ mln/util/adjacency_matrix.hh \ mln/util/all.hh \ mln/util/array.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 7a4b95c..9751e03 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -615,6 +615,7 @@ mln_geom_nrows \ mln_geom_nsites \ mln_geom_nslis \ mln_geom_pmin_pmax \ +mln_geom_rotate \ mln_geom_seeds2tiling \ mln_geom_seeds2tiling_roundness \ mln_geom_size1d \ @@ -1097,9 +1098,6 @@ mln_transform_internal_all \ mln_transform_internal_closest_point_functor \ mln_transform_internal_distance_functor \ mln_transform_internal_influence_zone_functor \ -mln_transformation_all \ -mln_transformation_essential \ -mln_transformation_rotate \ mln_util_adjacency_matrix \ mln_util_all \ mln_util_array \ @@ -1877,6 +1875,7 @@ mln_geom_nrows_SOURCES = mln_geom_nrows.cc mln_geom_nsites_SOURCES = mln_geom_nsites.cc mln_geom_nslis_SOURCES = mln_geom_nslis.cc mln_geom_pmin_pmax_SOURCES = mln_geom_pmin_pmax.cc +mln_geom_rotate_SOURCES = mln_geom_rotate.cc mln_geom_seeds2tiling_SOURCES = mln_geom_seeds2tiling.cc mln_geom_seeds2tiling_roundness_SOURCES = mln_geom_seeds2tiling_roundness.cc mln_geom_size1d_SOURCES = mln_geom_size1d.cc @@ -2359,9 +2358,6 @@ mln_transform_internal_all_SOURCES = mln_transform_internal_all.cc mln_transform_internal_closest_point_functor_SOURCES = mln_transform_internal_closest_point_functor.cc mln_transform_internal_distance_functor_SOURCES = mln_transform_internal_distance_functor.cc mln_transform_internal_influence_zone_functor_SOURCES = mln_transform_internal_influence_zone_functor.cc -mln_transformation_all_SOURCES = mln_transformation_all.cc -mln_transformation_essential_SOURCES = mln_transformation_essential.cc -mln_transformation_rotate_SOURCES = mln_transformation_rotate.cc mln_util_adjacency_matrix_SOURCES = mln_util_adjacency_matrix.cc mln_util_all_SOURCES = mln_util_all.cc mln_util_array_SOURCES = mln_util_array.cc -- 1.5.6.5

1 0

4218: configure.ac: do not configure tests/transformation.
by Guillaume Lazzara 30 Jun '09

30 Jun '09

--- ChangeLog | 4 ++++ configure.ac | 1 - 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c1c61be..4569441 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-06-30 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + * configure.ac: do not configure tests/transformation. + 2009-06-29 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * configure.ac: move tests/extract/Makefile in the list of stripped diff --git a/configure.ac b/configure.ac index 30c8e59..a13a61f 100644 --- a/configure.ac +++ b/configure.ac @@ -344,7 +344,6 @@ AC_CONFIG_FILES([ milena/tests/trait/op/Makefile milena/tests/trait/value/Makefile milena/tests/transform/Makefile - milena/tests/transformation/Makefile milena/tests/unit_test/Makefile milena/tests/util/Makefile milena/tests/value/Makefile -- 1.5.6.5

1 0

4217: Move transformation::rotate to geom::rotate.
by Guillaume Lazzara 30 Jun '09

30 Jun '09

* mln/geom/all.hh: Include rotate.hh. * tests/transformation/rotate.cc, * mln/transformation/rotate.hh: Move... * tests/geom/rotate.cc, * mln/geom/rotate.hh: ... here. * mln/transformation/all.hh, * mln/transformation/essential.hh, * tests/transformation/Makefile.am: Remove. * tests/geom/Makefile.am: add rotate. --- milena/ChangeLog | 17 ++++++ milena/mln/geom/all.hh | 4 +- milena/mln/{transformation => geom}/rotate.hh | 61 ++++++++++++++++------ milena/mln/transformation/all.hh | 43 ---------------- milena/mln/transformation/essential.hh | 31 ------------ milena/tests/geom/Makefile.am | 2 + milena/tests/{transformation => geom}/rotate.cc | 4 +- milena/tests/transformation/Makefile.am | 27 ---------- 8 files changed, 68 insertions(+), 121 deletions(-) rename milena/mln/{transformation => geom}/rotate.hh (65%) delete mode 100644 milena/mln/transformation/all.hh delete mode 100644 milena/mln/transformation/essential.hh rename milena/tests/{transformation => geom}/rotate.cc (95%) delete mode 100644 milena/tests/transformation/Makefile.am diff --git a/milena/ChangeLog b/milena/ChangeLog index 1b6acde..68068a4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,20 @@ +2009-06-30 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + + Move transformation::rotate to geom::rotate. + + * mln/geom/all.hh: Include rotate.hh. + + * tests/transformation/rotate.cc, + * mln/transformation/rotate.hh: Move... + * tests/geom/rotate.cc, + * mln/geom/rotate.hh: ... here. + + * mln/transformation/all.hh, + * mln/transformation/essential.hh, + * tests/transformation/Makefile.am: Remove. + + * tests/geom/Makefile.am: add rotate. + 2009-06-29 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> * tests/geom/Makefile.am: remove rotate from test list. diff --git a/milena/mln/geom/all.hh b/milena/mln/geom/all.hh index 628401c..f2d1fd3 100644 --- a/milena/mln/geom/all.hh +++ b/milena/mln/geom/all.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -61,6 +62,7 @@ namespace mln # include <mln/geom/nsites.hh> # include <mln/geom/nslis.hh> # include <mln/geom/pmin_pmax.hh> +# include <mln/geom/rotate.hh> # include <mln/geom/seeds2tiling.hh> # include <mln/geom/seeds2tiling_roundness.hh> # include <mln/geom/size1d.hh> diff --git a/milena/mln/transformation/rotate.hh b/milena/mln/geom/rotate.hh similarity index 65% rename from milena/mln/transformation/rotate.hh rename to milena/mln/geom/rotate.hh index 0e1b698..e3a5094 100644 --- a/milena/mln/transformation/rotate.hh +++ b/milena/mln/geom/rotate.hh @@ -23,8 +23,15 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_TRANSFORMATION_ROTATE_HH -# define MLN_TRANSFORMATION_ROTATE_HH +/// \file +/// +/// Rotate an image. + +#ifndef MLN_GEOM_ROTATE_HH +# define MLN_GEOM_ROTATE_HH + +# include <mln/core/concept/image.hh> +# include <mln/core/concept/site_set.hh> # include <mln/core/routine/extend.hh> @@ -46,23 +53,31 @@ namespace mln { - namespace transformation + namespace geom { /// Perform a rotation from the center of an image. /// - /// \param[in] input_ An image. - /// \param[in] angle An angle in degrees. - /// \param[in] extension_ Function, image or value which will be used as - /// extension. This extension allows to map values - /// to sites which where not part of the domain - /// before the rotation. + /// \param[in] input_ An image. + /// \param[in] angle An angle in degrees. + /// \param[in] extension_ Function, image or value which will be used + /// as extension. This extension allows to map + /// values to sites which where not part + /// of the domain before the rotation. + /// \param[in] output_domain_ The domain of the output image. /// /// \return An image with the same domain as \p input_. // + template <typename I, typename Ext, typename S> + mln_concrete(I) + rotate(const Image& input_, double angle, + const Ext& extension_, const Site_Set<S>& output_domain); + + + /// \overload template <typename I, typename Ext> mln_concrete(I) - rotate(const Image& input_, double angle, const Ext& extension_); + rotate(const Image& input, double angle, const Ext& extension); /// \overload @@ -75,16 +90,19 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - template <typename I, typename Ext> + template <typename I, typename Ext, typename S> mln_concrete(I) - rotate(const Image& input_, double angle, const Ext& extension_) + rotate(const Image& input_, double angle, + const Ext& extension_, const Site_Set<S>& output_domain_) { - trace::entering("transformation::rotate"); + trace::entering("geom::rotate"); const I& input = exact(input_); + const S& output_domain = exact(output_domain_); mln_precondition(input.is_valid()); mln_precondition(angle >= -360.0f && angle <= 360.0f); + mlc_converts_to(Ext, mln_value(I))::check(); /// FIXME: A precondition is probably missing for the extension value. mln_site(I) c = geom::bbox(input).center(); @@ -97,16 +115,25 @@ namespace mln mln_concrete(I) output; initialize(output, input); - data::paste(transposed_image(input.domain(), + + data::paste(transposed_image(output_domain_, extend(input, extension_), compose(t_1, compose(rot, t))), output); - trace::exiting("transformation::rotate"); + trace::exiting("geom::rotate"); return output; } + template <typename I, typename Ext> + mln_concrete(I) + rotate(const Image& input, double angle, const Ext& extension) + { + return rotate(input, angle, extension, exact(input).domain()); + } + + template <typename I> mln_concrete(I) rotate(const Image& input, double angle) @@ -118,9 +145,9 @@ namespace mln # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::transformation + } // end of namespace mln::geom } // end of namespace mln -#endif // ! MLN_TRANSFORMATION_ROTATE_HH +#endif // ! MLN_GEOM_ROTATE_HH diff --git a/milena/mln/transformation/all.hh b/milena/mln/transformation/all.hh deleted file mode 100644 index 0b2cfa1..0000000 --- a/milena/mln/transformation/all.hh +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (C) 2009 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_TRANSFORMATION_ALL_HH -# define MLN_TRANSFORMATION_ALL_HH - -namespace mln -{ - - /// Namespace of transformation routines. - namespace transformation - { - - } // end of namespace mln::transformation - -} // end of namespace mln - - -# include <mln/transformation/rotate.hh> - -#endif // ! MLN_TRANSFORMATION_ALL_HH diff --git a/milena/mln/transformation/essential.hh b/milena/mln/transformation/essential.hh deleted file mode 100644 index 7058302..0000000 --- a/milena/mln/transformation/essential.hh +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (C) 2009 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_TRANSFORMATION_ESSENTIAL_HH -# define MLN_TRANSFORMATION_ESSENTIAL_HH - -// None. - -#endif // ! MLN_TRANSFORMATION_ESSENTIAL_HH diff --git a/milena/tests/geom/Makefile.am b/milena/tests/geom/Makefile.am index fae2c31..8572a6b 100644 --- a/milena/tests/geom/Makefile.am +++ b/milena/tests/geom/Makefile.am @@ -35,6 +35,7 @@ nrows \ nsites \ nslis \ pmin_pmax \ +rotate \ seed2tiling \ seed2tiling_roundness @@ -54,6 +55,7 @@ nrows_SOURCES = nrows.cc nsites_SOURCES = nsites.cc nslis_SOURCES = nslis.cc pmin_pmax_SOURCES = pmin_pmax.cc +rotate_SOURCES = rotate.cc seed2tiling_SOURCES = seed2tiling.cc seed2tiling_roundness_SOURCES = seed2tiling_roundness.cc diff --git a/milena/tests/transformation/rotate.cc b/milena/tests/geom/rotate.cc similarity index 95% rename from milena/tests/transformation/rotate.cc rename to milena/tests/geom/rotate.cc index b8f8283..bd2e1f0 100644 --- a/milena/tests/transformation/rotate.cc +++ b/milena/tests/geom/rotate.cc @@ -24,7 +24,7 @@ // executable file might be covered by the GNU General Public License. # include <mln/core/image/image2d.hh> -# include <mln/transformation/rotate.hh> +# include <mln/geom/rotate.hh> # include <mln/make/image.hh> # include <mln/data/compare.hh> @@ -47,7 +47,7 @@ int main() image2d<bool> ima = make::image(values); image2d<bool> ref = make::image(ref_values); - image2d<bool> ima_rot = transformation::rotate(ima, 45); + image2d<bool> ima_rot = geom::rotate(ima, 45); mln_assertion(ima_rot == ref); } diff --git a/milena/tests/transformation/Makefile.am b/milena/tests/transformation/Makefile.am deleted file mode 100644 index 4293f2c..0000000 --- a/milena/tests/transformation/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (C) 2009 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/>. -# - -## Process this file through Automake to create Makefile.in. - -include $(top_srcdir)/milena/tests/tests.mk - -check_PROGRAMS = \ - rotate - -rotate_SOURCES = rotate.cc - -TESTS = $(check_PROGRAMS) -- 1.5.6.5

1 0

4216: tests/geom/Makefile.am: remove rotate from test list.
by Guillaume Lazzara 29 Jun '09

29 Jun '09

--- milena/ChangeLog | 4 ++++ milena/tests/geom/Makefile.am | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f2529bb..1b6acde 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2009-06-29 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + + * tests/geom/Makefile.am: remove rotate from test list. + 2009-06-29 Edwin Carlinet <carlinet(a)lrde.epita.fr> Enable attribute computation from an external source of values. diff --git a/milena/tests/geom/Makefile.am b/milena/tests/geom/Makefile.am index 9149ca2..fae2c31 100644 --- a/milena/tests/geom/Makefile.am +++ b/milena/tests/geom/Makefile.am @@ -35,7 +35,6 @@ nrows \ nsites \ nslis \ pmin_pmax \ -rotate \ seed2tiling \ seed2tiling_roundness @@ -55,7 +54,6 @@ nrows_SOURCES = nrows.cc nsites_SOURCES = nsites.cc nslis_SOURCES = nslis.cc pmin_pmax_SOURCES = pmin_pmax.cc -rotate_SOURCES = rotate.cc seed2tiling_SOURCES = seed2tiling.cc seed2tiling_roundness_SOURCES = seed2tiling_roundness.cc -- 1.5.6.5

1 0

milena r4215: Enable attribute computation from an external source of values
by Edwin Carlinet 29 Jun '09

29 Jun '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-06-29 Edwin Carlinet <carlinet(a)lrde.epita.fr> Enable attribute computation from an external source of values. * mln/morpho/tree/compute_attribute_image.hh: Add compute_attribute_image_from routine. * tests/morpho/tree/compute_attribute_image.cc: Add some tests. --- mln/morpho/tree/compute_attribute_image.hh | 82 +++++++++++++++++++++++---- tests/morpho/tree/compute_attribute_image.cc | 5 + 2 files changed, 77 insertions(+), 10 deletions(-) Index: trunk/milena/mln/morpho/tree/compute_attribute_image.hh =================================================================== --- trunk/milena/mln/morpho/tree/compute_attribute_image.hh (revision 4214) +++ trunk/milena/mln/morpho/tree/compute_attribute_image.hh (revision 4215) @@ -74,7 +74,7 @@ ** \param[out] accu_image Optional argument used to store image ** of attribute accumulator. ** - ** @return The attribute image. + ** \return The attribute image. */ template <typename A, typename T> mln_ch_value(typename T::function, mln_result(A)) @@ -84,10 +84,30 @@ + /** The same as compute_attribute_image but uses the values + ** stored by \p values image instead. + ** + ** \param[in] a Attribute. + ** \param[in] t Component tree. + ** \param[in] values Value image. + ** \param[out] accu_image Optional argument used to store image. + ** + ** \return + */ + template <typename A, typename T, typename V> + mln_ch_value(typename T::function, mln_result(A)) + compute_attribute_image_from(const Accumulator<A>& a, + const T& t, + const Image<V>& values, + mln_ch_value(typename T::function, A)* accu_image = 0); + + + # ifndef MLN_INCLUDE_ONLY // Take_as_init specialization - + namespace internal + { template <typename A, typename I, typename P> void take_as_init (trait::accumulator::when_pix::use_none, A& accu, const I& input, const P& p) @@ -126,16 +146,14 @@ } - // Facade. - - template <typename A, typename T> + template <typename A, typename T, typename V> inline mln_ch_value(typename T::function, mln_result(A)) - compute_attribute_image(const Accumulator<A>& a_, + compute_attribute_image(const A& a, const T& t, + const V& values, mln_ch_value(typename T::function, A)* accu_image = 0) { - trace::entering("morpho::tree::compute_attribute_image"); typedef typename T::function I; mln_ch_value(I, A) acc; @@ -146,21 +164,23 @@ // 'acc'. It is usually a no-op (so useless) except for a // few accumulators, e.g., for accu::stat::rank which has the 'k' // attribute. - A a = exact(a_); mln::data::fill(acc, a); } + { // Initialize every attribute with the corresponding pixel. - mln_piter(I) p(t.f().domain()); + mln_site_piter(T) p(t); for_all(p) - take_as_init(acc(p), t.f(), p); + take_as_init(acc(p), values, p); } + { mln_up_site_piter(T) p(t); // Propagate attribute from a site to its parent. for_all(p) if (! t.is_root(p)) acc(t.parent(p)).take(acc(p)); + // Back-propagate attribute from a node to sites of its // component. Below, p is a non-node component site and // parent(p) is a node, that is, the site representative of @@ -173,6 +193,7 @@ } } + // Store accumulator image. if (accu_image) *accu_image = duplicate(acc); @@ -182,10 +203,51 @@ initialize(output, acc); mln::data::fill(output, acc); + return output; + } + } + + // Facade. + + template <typename A, typename T> + inline + mln_ch_value(typename T::function, mln_result(A)) + compute_attribute_image(const Accumulator<A>& a_, + const T& t, + mln_ch_value(typename T::function, A)* accu_image = 0) + { + trace::entering("morpho::tree::compute_attribute_image"); + + mln_ch_value(typename T::function, mln_result(A)) output; + output = internal::compute_attribute_image(exact(a_), t, t.f(), + accu_image); + trace::exiting("morpho::tree::compute_attribute_image"); + return (output); + } + + template <typename A, typename T, typename V> + inline + mln_ch_value(typename T::function, mln_result(A)) + compute_attribute_image_from(const Accumulator<A>& a_, + const T& t, + const Image<V>& values, + mln_ch_value(typename T::function, A)* accu_image = 0) + { + trace::entering("morpho::tree::compute_attribute_image_from"); + + + mln_ch_value(typename T::function, mln_result(A)) output; + output = internal::compute_attribute_image(exact(a_), t, exact(values), + accu_image); + + trace::exiting("morpho::tree::compute_attribute_image_from"); return output; } + + + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::morpho::tree Index: trunk/milena/tests/morpho/tree/compute_attribute_image.cc =================================================================== --- trunk/milena/tests/morpho/tree/compute_attribute_image.cc (revision 4214) +++ trunk/milena/tests/morpho/tree/compute_attribute_image.cc (revision 4215) @@ -27,6 +27,7 @@ #include <mln/core/alias/neighb2d.hh> #include <mln/core/site_set/p_array.hh> #include <mln/data/sort_psites.hh> +#include <mln/data/compare.hh> #include <mln/debug/println.hh> #include <mln/core/var.hh> @@ -60,13 +61,17 @@ { morpho::attribute::card a; image2d<unsigned> area = morpho::tree::compute_attribute_image(a, t); + image2d<unsigned> area_bis = morpho::tree::compute_attribute_image_from(a, t, f); debug::println(area); + mln_assertion(area == area_bis); } { morpho::attribute::volume v; image2d<unsigned> volume = morpho::tree::compute_attribute_image(v, t); + image2d<unsigned> volume_bis = morpho::tree::compute_attribute_image_from(v, t, f); debug::println(volume); + mln_assertion(volume == volume_bis); } }

1 0

4214: Remove trace output in few tests.
by Guillaume Lazzara 29 Jun '09

29 Jun '09

* tests/morpho/closing/leveling.cc, * tests/morpho/opening/leveling.cc: disable trace. --- milena/ChangeLog | 7 +++++++ milena/tests/morpho/closing/leveling.cc | 2 -- milena/tests/morpho/opening/leveling.cc | 2 -- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8cec4fb..cbf17dc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2009-06-29 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Remove trace output in few tests. + + * tests/morpho/closing/leveling.cc, + * tests/morpho/opening/leveling.cc: disable trace. + +2009-06-29 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Cleanup test output files during distclean. * tests/labeling/fill_holes.cc: do not save output. diff --git a/milena/tests/morpho/closing/leveling.cc b/milena/tests/morpho/closing/leveling.cc index d6e847b..409a6ba 100644 --- a/milena/tests/morpho/closing/leveling.cc +++ b/milena/tests/morpho/closing/leveling.cc @@ -42,8 +42,6 @@ int main() using namespace mln; using value::int_u8; - trace::quiet = false; - typedef image2d<int_u8> I; I lena; io::pgm::load(lena, MLN_IMG_DIR "/tiny.pgm"); diff --git a/milena/tests/morpho/opening/leveling.cc b/milena/tests/morpho/opening/leveling.cc index b1cf99d..1454b48 100644 --- a/milena/tests/morpho/opening/leveling.cc +++ b/milena/tests/morpho/opening/leveling.cc @@ -42,8 +42,6 @@ int main() using namespace mln; using value::int_u8; - trace::quiet = false; - typedef image2d<int_u8> I; I lena; io::pgm::load(lena, MLN_IMG_DIR "/tiny.pgm"); -- 1.5.6.5

1 0