Olena-patches October 2012

olena-patches@lrde.epita.fr

9 participants
221 discussions

olena-2.0-113-gc680fc7 Force abort() on unsafe conversions.

by Guillaume Lazzara

* mln/value/interval.hh, * mln/world/k2/converters.hh: Here. --- milena/ChangeLog | 14 ++++++++++++++ milena/mln/value/interval.hh | 3 ++- milena/mln/world/k2/converters.hh | 9 ++++++--- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b248164..6433185 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2012-10-19 Guillaume Lazzara <z(a)lrde.epita.fr> + Force abort() on unsafe conversions. + + * mln/value/interval.hh, + * mln/world/k2/converters.hh: Here. + +2012-10-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Force abort() on unsafe conversions. + + mln/value/interval.hh, + mln/world/k2/converters.hh: Here. + +2012-10-19 Guillaume Lazzara <z(a)lrde.epita.fr> + Refine util::level operators. * mln/util/level.hh: Add comparison operators with images. diff --git a/milena/mln/value/interval.hh b/milena/mln/value/interval.hh index d3cbbdd..a7cafc7 100644 --- a/milena/mln/value/interval.hh +++ b/milena/mln/value/interval.hh @@ -313,7 +313,8 @@ namespace mln void interval<T>::self_open() { - mln_precondition(! is_degenerated()); + if (is_degenerated()) + abort(); mln_precondition(nvalues_ > 2); first += iota<T>::value(); diff --git a/milena/mln/world/k2/converters.hh b/milena/mln/world/k2/converters.hh index de76087..0988326 100644 --- a/milena/mln/world/k2/converters.hh +++ b/milena/mln/world/k2/converters.hh @@ -166,7 +166,8 @@ namespace mln int interval_intsub_n_to_int<n>::operator()(const interval<intsub<n> >& from) const { - mln_precondition(from.is_degenerated()); + if (!from.is_degenerated()) + abort(); return from.first(); } @@ -181,7 +182,8 @@ namespace mln value::int_u8 interval_intsub_n_to_int_u8<n>::operator()(const interval<intsub<n> >& from) const { - mln_precondition(from.is_degenerated()); + if (!from.is_degenerated()) + abort(); return from.first().to_interop(); } @@ -196,7 +198,8 @@ namespace mln intsub<n/2> interval_intsub_n_to_intsub_n_2<n>::operator()(const interval<intsub<n> >& from) const { - mln_precondition(from.is_degenerated()); + if (!from.is_degenerated()) + abort(); return from.first().to_interop(); } -- 1.7.2.5

12 years, 2 months

olena-2.0-112-g4bae71d Refine util::level operators.

by Guillaume Lazzara

* mln/util/level.hh: Add comparison operators with images. * tests/util/level.cc: New tests. --- milena/ChangeLog | 8 ++++ milena/mln/util/level.hh | 79 ++++++++++++++++++++++++++------------------ milena/tests/util/level.cc | 63 ++++++++++++++++++++++++++++++----- 3 files changed, 109 insertions(+), 41 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index fd1f830..b248164 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2012-10-19 Guillaume Lazzara <z(a)lrde.epita.fr> + + Refine util::level operators. + + * mln/util/level.hh: Add comparison operators with images. + + * tests/util/level.cc: New tests. + 2012-10-18 Guillaume Lazzara <z(a)lrde.epita.fr> Let the user specify conversion functions in K2 immersion. diff --git a/milena/mln/util/level.hh b/milena/mln/util/level.hh index ea7f3f3..3aa6fa0 100644 --- a/milena/mln/util/level.hh +++ b/milena/mln/util/level.hh @@ -28,6 +28,12 @@ # include <mln/core/concept/value.hh> # include <mln/value/scalar.hh> +# include <mln/data/transform.hh> +# include <mln/fun/v2b/threshold_lt.hh> +# include <mln/fun/v2b/threshold_le.hh> +# include <mln/fun/v2b/threshold_gt.hh> +# include <mln/fun/v2b/threshold_ge.hh> +# include <mln/fun/v2b/compare.hh> /// \file /// @@ -55,21 +61,22 @@ namespace mln // Comparison Operators - template <typename T, typename U> - bool - operator<(const Object<T>& i, const level_t& v); + template <typename I, typename U> + mln_ch_value(I,bool) + operator<(const Image& ima, const level_t& v); - template <typename T, typename U> - bool - operator<(const level_t& v, const Object<T>& i); + template <typename I, typename U> + mln_ch_value(I,bool) + operator==(const Image& ima, const level_t& v); - template <typename T, typename U> - bool - operator==(const Object<T>& i, const level_t& v); - template <typename T, typename U> - bool - operator==(const level_t& v, const Object<T>& i); + template <typename I, typename U> + mln_ch_value(I,bool) + operator>(const Image& ima, const level_t& v); + + template <typename I, typename U> + mln_ch_value(I,bool) + operator>=(const Image& ima, const level_t& v); # ifndef MLN_INCLUDE_ONLY @@ -80,6 +87,8 @@ namespace mln { } + // Helpers + template <typename T> inline level_t<T> level(const T& value) @@ -87,36 +96,42 @@ namespace mln return level_t<T>(value); } - template <typename T, typename U> - inline - bool - operator<(const Object<T>& i, const level_t& v) + + // Operators + + template <typename I, typename U> + mln_ch_value(I,bool) + operator<(const Image& ima, const level_t& v) { - return exact(i) < v.value; + return data::transform(ima, fun::v2b::threshold_lt<mln_value(I)>(v.value)); } - template <typename T, typename U> - inline - bool - operator<(const level_t& v, const Object<T>& i) + template <typename I, typename U> + mln_ch_value(I,bool) + operator<=(const Image& ima, const level_t& v) { - return v.value < exact(i); + return data::transform(ima, fun::v2b::threshold_le<mln_value(I)>(v.value)); } - template <typename T, typename U> - inline - bool - operator==(const Object<T>& i, const level_t& v) + template <typename I, typename U> + mln_ch_value(I,bool) + operator>(const Image& ima, const level_t& v) { - return exact(i) == v.value; + return data::transform(ima, fun::v2b::threshold_gt<mln_value(I)>(v.value)); } - template <typename T, typename U> - inline - bool - operator==(const level_t& v, const Object<T>& i) + template <typename I, typename U> + mln_ch_value(I,bool) + operator>=(const Image& ima, const level_t& v) + { + return data::transform(ima, fun::v2b::threshold_ge<mln_value(I)>(v.value)); + } + + template <typename I, typename U> + mln_ch_value(I,bool) + operator==(const Image& ima, const level_t& v) { - return v.value == exact(i); + return data::transform(ima, fun::v2b::compare<mln_value(I)>(v.value)); } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/tests/util/level.cc b/milena/tests/util/level.cc index 3f0c8bf..3626cef 100644 --- a/milena/tests/util/level.cc +++ b/milena/tests/util/level.cc @@ -23,20 +23,65 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +#include <mln/core/image/image2d.hh> +#include <mln/debug/iota.hh> #include <mln/util/level.hh> -#include <mln/value/int_u8.hh> +#include <mln/data/compare.hh> +#include <mln/make/image2d.hh> int main () { using namespace mln; - util::level_t<int> l(3); - mln_assertion(2 < l); - mln_assertion(l > 2); - mln_assertion(l == 3); + bool vref_lt[] = { + 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, + 1, 1, 1, 1, 0, + 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0 + }; + image2d<bool> ref_lt = make::image2d(vref_lt); - value::int_u8 v = 4; - mln_assertion(!(v < l)); - mln_assertion(v > l); - mln_assertion(!(v == l)); + bool vref_le[] = { + 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, + 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0 + }; + image2d<bool> ref_le = make::image2d(vref_le); + + bool vref_gt[] = { + 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, + 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1 + }; + image2d<bool> ref_gt = make::image2d(vref_gt); + + bool vref_ge[] = { + 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, + 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1 + }; + image2d<bool> ref_ge = make::image2d(vref_ge); + + + image2d<unsigned> ima(5,5); + debug::iota(ima); + + image2d<bool> imab_lt = (ima < util::level(15)); + mln_assertion(imab_lt == ref_lt); + + image2d<bool> imab_le = (ima <= util::level(15)); + mln_assertion(imab_le == ref_le); + + image2d<bool> imab_gt = (ima > util::level(15)); + mln_assertion(imab_gt == ref_gt); + + image2d<bool> imab_ge = (ima >= util::level(15)); + mln_assertion(imab_ge == ref_ge); } -- 1.7.2.5

12 years, 2 months

branch exp/khalimsky updated: olena-2.0-52-g0ee6ca9

by git＠lrde.epita.fr

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 0ee6ca936752310d487231054017dbfe2685dbcf (commit) via 63a31e89870d37a1cabe9f2185ea37755d40cfa4 (commit) via 1a5b21fe7b038b69f458c5eff9470cf9a297d062 (commit) via df0ecc75bbd147bb9bd3733217189879aafe1221 (commit) via acb3c05ba9f4d806c74604c440533ff5d7db3014 (commit) via 6b05452c6453e2114d063aef6c53078159c793ff (commit) via f81a760ac268c88667aa3d9f51f19b968640d308 (commit) via 61eef32bf34aa5d7b65ce8f27405ae16bed66d30 (commit) via 027f767ead3b99a0b564cf5723b6acac18dc3716 (commit) from cbf3fe229ced061e0a6b9aa590593c91fced0d10 (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 ----------------------------------------------------------------- 0ee6ca9 Let the user specify conversion functions in K2 immersion. 63a31e8 mln/core/routine/ops.hh: Update comments. 1a5b21f tests/value/interval.cc: Add more tests. df0ecc7 Introduce level tag. acb3c05 Fix accu::stat::median_interval. 6b05452 Introduce K2 and Kn spaces. f81a760 Some fixes. 61eef32 New span accumulator. 027f767 Add functions. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 85 +++++++ milena/mln/accu/math/span.hh | 169 ++++++++++++++ milena/mln/accu/stat/median_interval.hh | 75 +++---- milena/mln/core/routine/ops.hh | 4 +- milena/mln/fun/vv2v/span.hh | 78 +++++++ milena/mln/fun/vvvv2v/max.hh | 76 +++++++ milena/mln/fun/vvvv2v/mean.hh | 2 +- milena/mln/fun/vvvv2v/min.hh | 76 +++++++ milena/mln/fun/vvvv2v/span.hh | 82 +++++++ milena/mln/labeling/compute.hh | 2 +- milena/mln/math/max.hh | 17 ++ milena/mln/math/min.hh | 17 ++ milena/mln/util/level.hh | 128 +++++++++++ milena/mln/value/int_u.hh | 25 ++- milena/mln/value/interval.hh | 87 +++++++- milena/mln/world/k1/immerse.hh | 64 +++---- milena/mln/world/k2/converters.hh | 232 ++++++++++++++++++++ milena/mln/world/k2/fill_0_from_1_faces.hh | 114 ++++++++++ milena/mln/world/k2/fill_1_from_2_faces.hh | 118 ++++++++++ .../k2/fill_non_primary_from_primary_faces.hh | 217 ++++++++++++++++++ milena/mln/world/k2/immerse.hh | 127 +++++++++++ milena/mln/world/k2/immerse_with.hh | 173 +++++++++++++++ milena/mln/world/k2/is_non_primary_face.hh | 83 +++++++ milena/mln/world/k2/is_non_primary_face_cross.hh | 88 ++++++++ .../mln/world/k2/is_non_primary_face_horizontal.hh | 83 +++++++ .../mln/world/k2/is_non_primary_face_vertical.hh | 83 +++++++ milena/mln/world/k2/is_primary_face.hh | 82 +++++++ milena/mln/world/k2/neighb2d.hh | 139 ++++++++++++ milena/mln/world/kn/immerse.hh | 163 ++++++++++++++ milena/tests/accu/stat/median_interval.cc | 59 +++++ milena/tests/util/Makefile.am | 4 +- milena/tests/util/level.cc | 42 ++++ milena/tests/value/interval.cc | 6 + 33 files changed, 2714 insertions(+), 86 deletions(-) create mode 100644 milena/mln/accu/math/span.hh create mode 100644 milena/mln/fun/vv2v/span.hh create mode 100644 milena/mln/fun/vvvv2v/max.hh create mode 100644 milena/mln/fun/vvvv2v/min.hh create mode 100644 milena/mln/fun/vvvv2v/span.hh create mode 100644 milena/mln/util/level.hh create mode 100644 milena/mln/world/k2/converters.hh create mode 100644 milena/mln/world/k2/fill_0_from_1_faces.hh create mode 100644 milena/mln/world/k2/fill_1_from_2_faces.hh create mode 100644 milena/mln/world/k2/fill_non_primary_from_primary_faces.hh create mode 100644 milena/mln/world/k2/immerse.hh create mode 100644 milena/mln/world/k2/immerse_with.hh create mode 100644 milena/mln/world/k2/is_non_primary_face.hh create mode 100644 milena/mln/world/k2/is_non_primary_face_cross.hh create mode 100644 milena/mln/world/k2/is_non_primary_face_horizontal.hh create mode 100644 milena/mln/world/k2/is_non_primary_face_vertical.hh create mode 100644 milena/mln/world/k2/is_primary_face.hh create mode 100644 milena/mln/world/k2/neighb2d.hh create mode 100644 milena/mln/world/kn/immerse.hh create mode 100644 milena/tests/util/level.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

12 years, 2 months

olena-2.0-111-g995652f Let the user specify conversion functions in K2 immersion.

by Guillaume Lazzara

* mln/world/k2/convert_on_access.hh: Rename as... * mln/world/k2/converters.hh: ... this. * mln/world/k2/fill_non_primary_from_primary_faces.hh, * mln/world/kn/immerse.hh: Take a converter functor as argument. --- milena/ChangeLog | 10 + milena/mln/world/k2/convert_on_access.hh | 126 ----------- milena/mln/world/k2/converters.hh | 232 ++++++++++++++++++++ .../k2/fill_non_primary_from_primary_faces.hh | 73 ++++--- milena/mln/world/kn/immerse.hh | 16 +- 5 files changed, 290 insertions(+), 167 deletions(-) delete mode 100644 milena/mln/world/k2/convert_on_access.hh create mode 100644 milena/mln/world/k2/converters.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index bf4c572..fd1f830 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2012-10-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Let the user specify conversion functions in K2 immersion. + + * mln/world/k2/convert_on_access.hh: Rename as... + * mln/world/k2/converters.hh: ... this. + + * mln/world/k2/fill_non_primary_from_primary_faces.hh, + * mln/world/kn/immerse.hh: Take a converter functor as argument. + +2012-10-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/core/routine/ops.hh: Update comments. 2012-10-18 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/mln/world/k2/convert_on_access.hh b/milena/mln/world/k2/convert_on_access.hh deleted file mode 100644 index 4c9ab20..0000000 --- a/milena/mln/world/k2/convert_on_access.hh +++ /dev/null @@ -1,126 +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. - -/// \file -/// -/// \brief Fill 1 faces in a K2 2D image using its 2 faces. - -#ifndef MLN_WORLD_K2_CONVERT_ON_ACCESS_HH -# define MLN_WORLD_K2_CONVERT_ON_ACCESS_HH - -# include <mln/core/alias/point2d.hh> -# include <mln/world/k2/is_non_primary_face_vertical.hh> -# include <mln/world/k2/is_non_primary_face_horizontal.hh> -# include <mln/world/k2/convert_on_access.hh> - -# include <mln/value/int_u8.hh> -# include <mln/value/intsub.hh> - -namespace mln -{ - - namespace world - { - - namespace k2 - { - - using namespace mln::value; - - template <unsigned n> - void convert_on_access(const intsub<n>& from, intsub<n/2>& to); - - template <unsigned n> - void convert_on_access(const int_u8& from, intsub<n>& to); - - template <unsigned n> - void convert_on_access(const int_u8& from, interval<intsub<n> >& to); - - template <unsigned n> - void convert_on_access(const interval<intsub<n> >& from, int& to); - - template <unsigned n> - void convert_on_access(const interval<intsub<n> >& from, value::int_u8& to); - - template <typename T, typename U> - void convert_on_access(const T& from, U& to); - - -#ifndef MLN_INCLUDE_ONLY - - template <unsigned n> - void convert_on_access(const intsub<n/2>& from, intsub<n>& to) - { - to = from.to_int(); - } - - template <unsigned n> - void convert_on_access(const int_u8& from, intsub<n>& to) - { - to = from.to_equiv(); - } - - template <unsigned n> - void convert_on_access(const int_u8& from, interval<intsub<n> >& to) - { - to = intsub<n>(from.to_interop()); - } - - template <unsigned n> - void convert_on_access(const interval<intsub<n> >& from, int& to) - { - mln_precondition(from.is_degenerated()); - to = from.first(); - } - - template <unsigned n> - void convert_on_access(const interval<intsub<n> >& from, value::int_u8& to) - { - mln_precondition(from.is_degenerated()); - to = from.first(); - } - - template <unsigned n> - void convert_on_access(const interval<intsub<n> >& from, intsub<n/2>& to) - { - mln_precondition(from.is_degenerated()); - to = from.first().to_interop(); - } - - template <typename T, typename U> - void convert_on_access(const T& from, U& to) - { - to = static_cast(from); - } - -# endif // ! MLN_INCLUDE_ONLY - - } // end of namespace mln::world::k2 - - } // end of namespace mln::world - -} // end of namespace mln - -#endif // ! MLN_WORLD_K2_CONVERT_ON_ACCESS_HH diff --git a/milena/mln/world/k2/converters.hh b/milena/mln/world/k2/converters.hh new file mode 100644 index 0000000..de76087 --- /dev/null +++ b/milena/mln/world/k2/converters.hh @@ -0,0 +1,232 @@ +// 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 Fill 1 faces in a K2 2D image using its 2 faces. + +#ifndef MLN_WORLD_K2_CONVERTERS_HH +# define MLN_WORLD_K2_CONVERTERS_HH + +# include <mln/value/int_u8.hh> +# include <mln/value/intsub.hh> +# include <mln/value/interval.hh> + +namespace mln +{ + + namespace world + { + + namespace k2 + { + + using namespace mln::value; + + template <unsigned n> + struct int_sub_n_to_intsub_n_2 + { + intsub<n/2> operator()(const intsub<n>& from) const; + intsub<n> operator()(const intsub<n/2>& from) const; + }; + + template <unsigned n> + struct int_sub_n_to_intsub_2n + { + intsub<2*n> operator()(const intsub<n>& from) const; + intsub<n> operator()(const intsub<2*n>& from) const; + }; + + template <unsigned n> + struct int_u8_to_intsub_n + { + intsub<n> operator()(const value::int_u8& from) const; + value::int_u8 operator()(const intsub<n>& from) const; + }; + + template <unsigned n> + struct int_u8_to_interval_intsub_n + { + interval<intsub<n> > operator()(const value::int_u8& from) const; + value::int_u8 operator()(const interval<intsub<n> >& from) const; + }; + + template <unsigned n> + struct interval_intsub_n_to_int + { + int operator()(const interval<intsub<n> >& from) const; + interval<intsub<n> > operator()(const int& from) const; + }; + + template <unsigned n> + struct interval_intsub_n_to_int_u8 + { + value::int_u8 operator()(const interval<intsub<n> >& from) const; + interval<intsub<n> > operator()(const value::int_u8& from) const; + }; + + template <unsigned n> + struct interval_intsub_n_to_intsub_n_2 + { + intsub<n/2> operator()(const interval<intsub<n> >& from) const; + interval<intsub<n> > operator()(const intsub<n/2>& from) const; + }; + + template <typename T1, typename T2> + struct generic_converter + { + T2 operator()(const T1& from) const; + T1 operator()(const T2& from) const; + }; + + + +#ifndef MLN_INCLUDE_ONLY + + template <unsigned n> + intsub<n/2> + int_sub_n_to_intsub_n_2<n>::operator()(const intsub<n>& from) const + { + return intsub<n/2>(from); + } + + template <unsigned n> + intsub<n> + int_sub_n_to_intsub_n_2<n>::operator()(const intsub<n/2>& from) const + { + return intsub<n>(from); + } + + + template <unsigned n> + intsub<2*n> + int_sub_n_to_intsub_2n<n>::operator()(const intsub<n>& from) const + { + return static_cast<intsub<2*n> >(from.to_int()); + } + + template <unsigned n> + intsub<n> + int_sub_n_to_intsub_2n<n>::operator()(const intsub<2*n>& from) const + { + return static_cast<intsub<n> >(from.to_int()); + } + + template <unsigned n> + intsub<n> + int_u8_to_intsub_n<n>::operator()(const int_u8& from) const + { + return from.to_equiv(); + } + + template <unsigned n> + value::int_u8 + int_u8_to_intsub_n<n>::operator()(const intsub<n>& from) const + { + return from.to_interop(); + } + + template <unsigned n> + interval<intsub<n> > + int_u8_to_interval_intsub_n<n>::operator()(const int_u8& from) const + { + return intsub<n>(from.to_interop()); + } + + template <unsigned n> + value::int_u8 + int_u8_to_interval_intsub_n<n>::operator()(const interval<intsub<n> >& from) const + { + return from.first().to_interop(); + } + + template <unsigned n> + int + interval_intsub_n_to_int<n>::operator()(const interval<intsub<n> >& from) const + { + mln_precondition(from.is_degenerated()); + return from.first(); + } + + template <unsigned n> + interval<intsub<n> > + interval_intsub_n_to_int<n>::operator()(const int& from) const + { + return interval<intsub<n> >(from); + } + + template <unsigned n> + value::int_u8 + interval_intsub_n_to_int_u8<n>::operator()(const interval<intsub<n> >& from) const + { + mln_precondition(from.is_degenerated()); + return from.first().to_interop(); + } + + template <unsigned n> + interval<intsub<n> > + interval_intsub_n_to_int_u8<n>::operator()(const value::int_u8& from) const + { + return intsub<n>(from.to_interop()); + } + + template <unsigned n> + intsub<n/2> + interval_intsub_n_to_intsub_n_2<n>::operator()(const interval<intsub<n> >& from) const + { + mln_precondition(from.is_degenerated()); + return from.first().to_interop(); + } + + template <unsigned n> + interval<intsub<n> > + interval_intsub_n_to_intsub_n_2<n>::operator()(const intsub<n/2>& from) const + { + return interval<intsub<n> >(from); + } + + template <typename T1, typename T2> + T2 + generic_converter<T1,T2>::operator()(const T1& from) const + { + return static_cast<T2>(from); + } + + template <typename T1, typename T2> + T1 + generic_converter<T1,T2>::operator()(const T2& from) const + { + return static_cast<T1>(from); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::world::k2 + + } // end of namespace mln::world + +} // end of namespace mln + +#endif // ! MLN_WORLD_K2_CONVERTERS_HH diff --git a/milena/mln/world/k2/fill_non_primary_from_primary_faces.hh b/milena/mln/world/k2/fill_non_primary_from_primary_faces.hh index bc7509f..41d15cc 100644 --- a/milena/mln/world/k2/fill_non_primary_from_primary_faces.hh +++ b/milena/mln/world/k2/fill_non_primary_from_primary_faces.hh @@ -34,7 +34,7 @@ # include <mln/world/k2/is_non_primary_face_vertical.hh> # include <mln/world/k2/is_non_primary_face_horizontal.hh> # include <mln/world/k2/is_non_primary_face_cross.hh> -# include <mln/world/k2/convert_on_access.hh> +# include <mln/world/k2/converters.hh> namespace mln { @@ -76,10 +76,16 @@ namespace mln \endverbatim */ + template <typename I, typename A, typename F> + void fill_non_primary_from_primary_faces(Image& inout_, + Accumulator<A>& accu_, + const F& converter); /// \overload - template <typename I, typename A> + template <typename I, typename A, typename F> void fill_non_primary_from_primary_faces(Image& inout, - const Accumulator<A>& accu); + const Accumulator<A>& accu, + const F& converter); + # ifndef MLN_INCLUDE_ONLY @@ -87,58 +93,56 @@ namespace mln // Facade - template <typename I, typename A> + template <typename I, typename A, typename F> void fill_non_primary_from_primary_faces(Image& inout_, - F& functor_) + F& functor_, + const F& converter_) { trace::entering("mln::world::k2::fill_non_primary_from_primary_faces"); mln_precondition(exact(inout_).is_valid()); I& inout = exact(inout_); - (void) accu_; typedef typename A::argument V; - A& accu = exact(accu_); + const F& converter = exact(converter_); mln_piter(I) p(inout.domain()); for_all(p) if (is_non_primary_face_vertical(p)) { - accu.init(); V tmp1, tmp2; - convert_on_access(inout(p + 2 * left), tmp1); - convert_on_access(inout(p + 2 * right), tmp2); - convert_on_access(f(tmp1, tmp2), inout(p)); + tmp1 = converter(inout(p + 2 * left)); + tmp2 = converter(inout(p + 2 * right)); + converter(f(tmp1, tmp2), inout(p)); } else if (is_non_primary_face_horizontal(p)) { - accu.init(); V tmp1, tmp2; - convert_on_access(inout(p + 2 * up), tmp1); - convert_on_access(inout(p + 2 * down), tmp2); - convert_on_access(f(tmp1, tmp2), inout(p)); + tmp1 = converter(inout(p + 2 * up)); + tmp2 = converter(inout(p + 2 * down)); + converter(f(tmp1, tmp2), inout(p)); } else if (is_non_primary_face_cross(p)) { - accu.init(); V tmp1, tmp2, tmp3, tmp4; - convert_on_access(inout(p + 2 * up_left), tmp1); - convert_on_access(inout(p + 2 * up_right), tmp2); - convert_on_access(inout(p + 2 * down_left), tmp3); - convert_on_access(inout(p + 2 * down_right), tmp4); - convert_on_access(f(tmp1, tmp2, tmp3, tmp4), inout(p)); + tmp1 = converter(inout(p + 2 * up_left)); + tmp2 = converter(inout(p + 2 * up_right)); + tmp3 = converter(inout(p + 2 * down_left)); + tmp4 = converter(inout(p + 2 * down_right)); + converter(f(tmp1, tmp2, tmp3, tmp4), inout(p)); } trace::exiting("mln::world::k2::fill_non_primary_from_primary_faces"); } - template <typename I, typename A> + template <typename I, typename A, typename F> void fill_non_primary_from_primary_faces(Image& inout_, - Accumulator<A>& accu_) + Accumulator<A>& accu_, + const F& converter_) { trace::entering("mln::world::k2::fill_non_primary_from_primary_faces"); @@ -148,6 +152,7 @@ namespace mln typedef typename A::argument V; A& accu = exact(accu_); + const F& converter = exact(converter_); mln_piter(I) p(inout.domain()); for_all(p) @@ -156,45 +161,45 @@ namespace mln accu.init(); V tmp; - convert_on_access(inout(p + 2 * left), tmp); + tmp = converter(inout(p + 2 * left)); accu.take(tmp); - convert_on_access(inout(p + 2 * right), tmp); + tmp = converter(inout(p + 2 * right)); accu.take(tmp); - convert_on_access(accu.to_result(), inout(p)); + inout(p) = converter(accu.to_result()); } else if (is_non_primary_face_horizontal(p)) { accu.init(); V tmp; - convert_on_access(inout(p + 2 * up), tmp); + tmp = converter(inout(p + 2 * up)); accu.take(tmp); - convert_on_access(inout(p + 2 * down), tmp); + tmp = converter(inout(p + 2 * down)); accu.take(tmp); - convert_on_access(accu.to_result(), inout(p)); + inout(p) = converter(accu.to_result()); } else if (is_non_primary_face_cross(p)) { accu.init(); V tmp; - convert_on_access(inout(p + 2 * up_left), tmp); + tmp = converter(inout(p + 2 * up_left)); accu.take(tmp); - convert_on_access(inout(p + 2 * up_right), tmp); + tmp = converter(inout(p + 2 * up_right)); accu.take(tmp); - convert_on_access(inout(p + 2 * down_left), tmp); + tmp = converter(inout(p + 2 * down_left)); accu.take(tmp); - convert_on_access(inout(p + 2 * down_right), tmp); + tmp = converter(inout(p + 2 * down_right)); accu.take(tmp); - convert_on_access(accu.to_result(), inout(p)); + inout(p) = converter(accu.to_result()); } trace::exiting("mln::world::k2::fill_non_primary_from_primary_faces"); diff --git a/milena/mln/world/kn/immerse.hh b/milena/mln/world/kn/immerse.hh index 380b52f..835a4a1 100644 --- a/milena/mln/world/kn/immerse.hh +++ b/milena/mln/world/kn/immerse.hh @@ -40,7 +40,7 @@ # include <mln/world/k1/fill_0_from_1_faces.hh> # include <mln/world/k1/fill_1_from_2_faces.hh> -# include <mln/world/k2/convert_on_access.hh> +# include <mln/world/k2/converters.hh> namespace mln { @@ -73,9 +73,9 @@ namespace mln \endverbatim */ - template <typename I, typename V> + template <typename I, typename V, typename F> mln_ch_value(I, V) - immerse(const Image& ima_, const unsigned n, const V& new_type); + immerse(const Image& ima_, const unsigned n, const V& new_type, const F& converter_); /// \overload template <typename I> @@ -116,13 +116,15 @@ namespace mln // Facade - template <typename I, typename V> + template <typename I, typename V, typename F> mln_ch_value(I, V) - immerse(const Image& ima_, const unsigned n, const V& new_type) + immerse(const Image& ima_, const unsigned n, + const V& new_type, const F& converter_) { trace::entering("mln::world::kn::immerse_with"); mln_precondition(exact(ima_).is_valid()); const I& ima = exact(ima_); + const F& converter = exact(converter_); (void) new_type; mln_ch_value(I,V) @@ -133,7 +135,7 @@ namespace mln for_all(p) { V tmp; - k2::convert_on_access(ima(p), tmp); + tmp = converter(ima(p)); output(internal::immerse_point(p, n)) = tmp; } @@ -146,7 +148,7 @@ namespace mln immerse(const Image& ima, const unsigned n) { typedef mln_value(I) V; - return immerse(ima, n, V()); + return immerse(ima, n, V(), k2::generic_converter<V,V>()); } -- 1.7.2.5

12 years, 2 months

olena-2.0-52-g0ee6ca9 Let the user specify conversion functions in K2 immersion.

by Guillaume Lazzara

* mln/world/k2/convert_on_access.hh: Rename as... * mln/world/k2/converters.hh: ... this. * mln/world/k2/fill_non_primary_from_primary_faces.hh, * mln/world/kn/immerse.hh: Take a converter functor as argument. --- milena/ChangeLog | 10 + milena/mln/world/k2/convert_on_access.hh | 126 ----------- milena/mln/world/k2/converters.hh | 232 ++++++++++++++++++++ .../k2/fill_non_primary_from_primary_faces.hh | 73 ++++--- milena/mln/world/kn/immerse.hh | 16 +- 5 files changed, 290 insertions(+), 167 deletions(-) delete mode 100644 milena/mln/world/k2/convert_on_access.hh create mode 100644 milena/mln/world/k2/converters.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index c6ef422..e12a0b3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2012-10-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Let the user specify conversion functions in K2 immersion. + + * mln/world/k2/convert_on_access.hh: Rename as... + * mln/world/k2/converters.hh: ... this. + + * mln/world/k2/fill_non_primary_from_primary_faces.hh, + * mln/world/kn/immerse.hh: Take a converter functor as argument. + +2012-10-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/core/routine/ops.hh: Update comments. 2012-10-18 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/mln/world/k2/convert_on_access.hh b/milena/mln/world/k2/convert_on_access.hh deleted file mode 100644 index 4c9ab20..0000000 --- a/milena/mln/world/k2/convert_on_access.hh +++ /dev/null @@ -1,126 +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. - -/// \file -/// -/// \brief Fill 1 faces in a K2 2D image using its 2 faces. - -#ifndef MLN_WORLD_K2_CONVERT_ON_ACCESS_HH -# define MLN_WORLD_K2_CONVERT_ON_ACCESS_HH - -# include <mln/core/alias/point2d.hh> -# include <mln/world/k2/is_non_primary_face_vertical.hh> -# include <mln/world/k2/is_non_primary_face_horizontal.hh> -# include <mln/world/k2/convert_on_access.hh> - -# include <mln/value/int_u8.hh> -# include <mln/value/intsub.hh> - -namespace mln -{ - - namespace world - { - - namespace k2 - { - - using namespace mln::value; - - template <unsigned n> - void convert_on_access(const intsub<n>& from, intsub<n/2>& to); - - template <unsigned n> - void convert_on_access(const int_u8& from, intsub<n>& to); - - template <unsigned n> - void convert_on_access(const int_u8& from, interval<intsub<n> >& to); - - template <unsigned n> - void convert_on_access(const interval<intsub<n> >& from, int& to); - - template <unsigned n> - void convert_on_access(const interval<intsub<n> >& from, value::int_u8& to); - - template <typename T, typename U> - void convert_on_access(const T& from, U& to); - - -#ifndef MLN_INCLUDE_ONLY - - template <unsigned n> - void convert_on_access(const intsub<n/2>& from, intsub<n>& to) - { - to = from.to_int(); - } - - template <unsigned n> - void convert_on_access(const int_u8& from, intsub<n>& to) - { - to = from.to_equiv(); - } - - template <unsigned n> - void convert_on_access(const int_u8& from, interval<intsub<n> >& to) - { - to = intsub<n>(from.to_interop()); - } - - template <unsigned n> - void convert_on_access(const interval<intsub<n> >& from, int& to) - { - mln_precondition(from.is_degenerated()); - to = from.first(); - } - - template <unsigned n> - void convert_on_access(const interval<intsub<n> >& from, value::int_u8& to) - { - mln_precondition(from.is_degenerated()); - to = from.first(); - } - - template <unsigned n> - void convert_on_access(const interval<intsub<n> >& from, intsub<n/2>& to) - { - mln_precondition(from.is_degenerated()); - to = from.first().to_interop(); - } - - template <typename T, typename U> - void convert_on_access(const T& from, U& to) - { - to = static_cast(from); - } - -# endif // ! MLN_INCLUDE_ONLY - - } // end of namespace mln::world::k2 - - } // end of namespace mln::world - -} // end of namespace mln - -#endif // ! MLN_WORLD_K2_CONVERT_ON_ACCESS_HH diff --git a/milena/mln/world/k2/converters.hh b/milena/mln/world/k2/converters.hh new file mode 100644 index 0000000..de76087 --- /dev/null +++ b/milena/mln/world/k2/converters.hh @@ -0,0 +1,232 @@ +// 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 Fill 1 faces in a K2 2D image using its 2 faces. + +#ifndef MLN_WORLD_K2_CONVERTERS_HH +# define MLN_WORLD_K2_CONVERTERS_HH + +# include <mln/value/int_u8.hh> +# include <mln/value/intsub.hh> +# include <mln/value/interval.hh> + +namespace mln +{ + + namespace world + { + + namespace k2 + { + + using namespace mln::value; + + template <unsigned n> + struct int_sub_n_to_intsub_n_2 + { + intsub<n/2> operator()(const intsub<n>& from) const; + intsub<n> operator()(const intsub<n/2>& from) const; + }; + + template <unsigned n> + struct int_sub_n_to_intsub_2n + { + intsub<2*n> operator()(const intsub<n>& from) const; + intsub<n> operator()(const intsub<2*n>& from) const; + }; + + template <unsigned n> + struct int_u8_to_intsub_n + { + intsub<n> operator()(const value::int_u8& from) const; + value::int_u8 operator()(const intsub<n>& from) const; + }; + + template <unsigned n> + struct int_u8_to_interval_intsub_n + { + interval<intsub<n> > operator()(const value::int_u8& from) const; + value::int_u8 operator()(const interval<intsub<n> >& from) const; + }; + + template <unsigned n> + struct interval_intsub_n_to_int + { + int operator()(const interval<intsub<n> >& from) const; + interval<intsub<n> > operator()(const int& from) const; + }; + + template <unsigned n> + struct interval_intsub_n_to_int_u8 + { + value::int_u8 operator()(const interval<intsub<n> >& from) const; + interval<intsub<n> > operator()(const value::int_u8& from) const; + }; + + template <unsigned n> + struct interval_intsub_n_to_intsub_n_2 + { + intsub<n/2> operator()(const interval<intsub<n> >& from) const; + interval<intsub<n> > operator()(const intsub<n/2>& from) const; + }; + + template <typename T1, typename T2> + struct generic_converter + { + T2 operator()(const T1& from) const; + T1 operator()(const T2& from) const; + }; + + + +#ifndef MLN_INCLUDE_ONLY + + template <unsigned n> + intsub<n/2> + int_sub_n_to_intsub_n_2<n>::operator()(const intsub<n>& from) const + { + return intsub<n/2>(from); + } + + template <unsigned n> + intsub<n> + int_sub_n_to_intsub_n_2<n>::operator()(const intsub<n/2>& from) const + { + return intsub<n>(from); + } + + + template <unsigned n> + intsub<2*n> + int_sub_n_to_intsub_2n<n>::operator()(const intsub<n>& from) const + { + return static_cast<intsub<2*n> >(from.to_int()); + } + + template <unsigned n> + intsub<n> + int_sub_n_to_intsub_2n<n>::operator()(const intsub<2*n>& from) const + { + return static_cast<intsub<n> >(from.to_int()); + } + + template <unsigned n> + intsub<n> + int_u8_to_intsub_n<n>::operator()(const int_u8& from) const + { + return from.to_equiv(); + } + + template <unsigned n> + value::int_u8 + int_u8_to_intsub_n<n>::operator()(const intsub<n>& from) const + { + return from.to_interop(); + } + + template <unsigned n> + interval<intsub<n> > + int_u8_to_interval_intsub_n<n>::operator()(const int_u8& from) const + { + return intsub<n>(from.to_interop()); + } + + template <unsigned n> + value::int_u8 + int_u8_to_interval_intsub_n<n>::operator()(const interval<intsub<n> >& from) const + { + return from.first().to_interop(); + } + + template <unsigned n> + int + interval_intsub_n_to_int<n>::operator()(const interval<intsub<n> >& from) const + { + mln_precondition(from.is_degenerated()); + return from.first(); + } + + template <unsigned n> + interval<intsub<n> > + interval_intsub_n_to_int<n>::operator()(const int& from) const + { + return interval<intsub<n> >(from); + } + + template <unsigned n> + value::int_u8 + interval_intsub_n_to_int_u8<n>::operator()(const interval<intsub<n> >& from) const + { + mln_precondition(from.is_degenerated()); + return from.first().to_interop(); + } + + template <unsigned n> + interval<intsub<n> > + interval_intsub_n_to_int_u8<n>::operator()(const value::int_u8& from) const + { + return intsub<n>(from.to_interop()); + } + + template <unsigned n> + intsub<n/2> + interval_intsub_n_to_intsub_n_2<n>::operator()(const interval<intsub<n> >& from) const + { + mln_precondition(from.is_degenerated()); + return from.first().to_interop(); + } + + template <unsigned n> + interval<intsub<n> > + interval_intsub_n_to_intsub_n_2<n>::operator()(const intsub<n/2>& from) const + { + return interval<intsub<n> >(from); + } + + template <typename T1, typename T2> + T2 + generic_converter<T1,T2>::operator()(const T1& from) const + { + return static_cast<T2>(from); + } + + template <typename T1, typename T2> + T1 + generic_converter<T1,T2>::operator()(const T2& from) const + { + return static_cast<T1>(from); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::world::k2 + + } // end of namespace mln::world + +} // end of namespace mln + +#endif // ! MLN_WORLD_K2_CONVERTERS_HH diff --git a/milena/mln/world/k2/fill_non_primary_from_primary_faces.hh b/milena/mln/world/k2/fill_non_primary_from_primary_faces.hh index bc7509f..41d15cc 100644 --- a/milena/mln/world/k2/fill_non_primary_from_primary_faces.hh +++ b/milena/mln/world/k2/fill_non_primary_from_primary_faces.hh @@ -34,7 +34,7 @@ # include <mln/world/k2/is_non_primary_face_vertical.hh> # include <mln/world/k2/is_non_primary_face_horizontal.hh> # include <mln/world/k2/is_non_primary_face_cross.hh> -# include <mln/world/k2/convert_on_access.hh> +# include <mln/world/k2/converters.hh> namespace mln { @@ -76,10 +76,16 @@ namespace mln \endverbatim */ + template <typename I, typename A, typename F> + void fill_non_primary_from_primary_faces(Image& inout_, + Accumulator<A>& accu_, + const F& converter); /// \overload - template <typename I, typename A> + template <typename I, typename A, typename F> void fill_non_primary_from_primary_faces(Image& inout, - const Accumulator<A>& accu); + const Accumulator<A>& accu, + const F& converter); + # ifndef MLN_INCLUDE_ONLY @@ -87,58 +93,56 @@ namespace mln // Facade - template <typename I, typename A> + template <typename I, typename A, typename F> void fill_non_primary_from_primary_faces(Image& inout_, - F& functor_) + F& functor_, + const F& converter_) { trace::entering("mln::world::k2::fill_non_primary_from_primary_faces"); mln_precondition(exact(inout_).is_valid()); I& inout = exact(inout_); - (void) accu_; typedef typename A::argument V; - A& accu = exact(accu_); + const F& converter = exact(converter_); mln_piter(I) p(inout.domain()); for_all(p) if (is_non_primary_face_vertical(p)) { - accu.init(); V tmp1, tmp2; - convert_on_access(inout(p + 2 * left), tmp1); - convert_on_access(inout(p + 2 * right), tmp2); - convert_on_access(f(tmp1, tmp2), inout(p)); + tmp1 = converter(inout(p + 2 * left)); + tmp2 = converter(inout(p + 2 * right)); + converter(f(tmp1, tmp2), inout(p)); } else if (is_non_primary_face_horizontal(p)) { - accu.init(); V tmp1, tmp2; - convert_on_access(inout(p + 2 * up), tmp1); - convert_on_access(inout(p + 2 * down), tmp2); - convert_on_access(f(tmp1, tmp2), inout(p)); + tmp1 = converter(inout(p + 2 * up)); + tmp2 = converter(inout(p + 2 * down)); + converter(f(tmp1, tmp2), inout(p)); } else if (is_non_primary_face_cross(p)) { - accu.init(); V tmp1, tmp2, tmp3, tmp4; - convert_on_access(inout(p + 2 * up_left), tmp1); - convert_on_access(inout(p + 2 * up_right), tmp2); - convert_on_access(inout(p + 2 * down_left), tmp3); - convert_on_access(inout(p + 2 * down_right), tmp4); - convert_on_access(f(tmp1, tmp2, tmp3, tmp4), inout(p)); + tmp1 = converter(inout(p + 2 * up_left)); + tmp2 = converter(inout(p + 2 * up_right)); + tmp3 = converter(inout(p + 2 * down_left)); + tmp4 = converter(inout(p + 2 * down_right)); + converter(f(tmp1, tmp2, tmp3, tmp4), inout(p)); } trace::exiting("mln::world::k2::fill_non_primary_from_primary_faces"); } - template <typename I, typename A> + template <typename I, typename A, typename F> void fill_non_primary_from_primary_faces(Image& inout_, - Accumulator<A>& accu_) + Accumulator<A>& accu_, + const F& converter_) { trace::entering("mln::world::k2::fill_non_primary_from_primary_faces"); @@ -148,6 +152,7 @@ namespace mln typedef typename A::argument V; A& accu = exact(accu_); + const F& converter = exact(converter_); mln_piter(I) p(inout.domain()); for_all(p) @@ -156,45 +161,45 @@ namespace mln accu.init(); V tmp; - convert_on_access(inout(p + 2 * left), tmp); + tmp = converter(inout(p + 2 * left)); accu.take(tmp); - convert_on_access(inout(p + 2 * right), tmp); + tmp = converter(inout(p + 2 * right)); accu.take(tmp); - convert_on_access(accu.to_result(), inout(p)); + inout(p) = converter(accu.to_result()); } else if (is_non_primary_face_horizontal(p)) { accu.init(); V tmp; - convert_on_access(inout(p + 2 * up), tmp); + tmp = converter(inout(p + 2 * up)); accu.take(tmp); - convert_on_access(inout(p + 2 * down), tmp); + tmp = converter(inout(p + 2 * down)); accu.take(tmp); - convert_on_access(accu.to_result(), inout(p)); + inout(p) = converter(accu.to_result()); } else if (is_non_primary_face_cross(p)) { accu.init(); V tmp; - convert_on_access(inout(p + 2 * up_left), tmp); + tmp = converter(inout(p + 2 * up_left)); accu.take(tmp); - convert_on_access(inout(p + 2 * up_right), tmp); + tmp = converter(inout(p + 2 * up_right)); accu.take(tmp); - convert_on_access(inout(p + 2 * down_left), tmp); + tmp = converter(inout(p + 2 * down_left)); accu.take(tmp); - convert_on_access(inout(p + 2 * down_right), tmp); + tmp = converter(inout(p + 2 * down_right)); accu.take(tmp); - convert_on_access(accu.to_result(), inout(p)); + inout(p) = converter(accu.to_result()); } trace::exiting("mln::world::k2::fill_non_primary_from_primary_faces"); diff --git a/milena/mln/world/kn/immerse.hh b/milena/mln/world/kn/immerse.hh index 380b52f..835a4a1 100644 --- a/milena/mln/world/kn/immerse.hh +++ b/milena/mln/world/kn/immerse.hh @@ -40,7 +40,7 @@ # include <mln/world/k1/fill_0_from_1_faces.hh> # include <mln/world/k1/fill_1_from_2_faces.hh> -# include <mln/world/k2/convert_on_access.hh> +# include <mln/world/k2/converters.hh> namespace mln { @@ -73,9 +73,9 @@ namespace mln \endverbatim */ - template <typename I, typename V> + template <typename I, typename V, typename F> mln_ch_value(I, V) - immerse(const Image& ima_, const unsigned n, const V& new_type); + immerse(const Image& ima_, const unsigned n, const V& new_type, const F& converter_); /// \overload template <typename I> @@ -116,13 +116,15 @@ namespace mln // Facade - template <typename I, typename V> + template <typename I, typename V, typename F> mln_ch_value(I, V) - immerse(const Image& ima_, const unsigned n, const V& new_type) + immerse(const Image& ima_, const unsigned n, + const V& new_type, const F& converter_) { trace::entering("mln::world::kn::immerse_with"); mln_precondition(exact(ima_).is_valid()); const I& ima = exact(ima_); + const F& converter = exact(converter_); (void) new_type; mln_ch_value(I,V) @@ -133,7 +135,7 @@ namespace mln for_all(p) { V tmp; - k2::convert_on_access(ima(p), tmp); + tmp = converter(ima(p)); output(internal::immerse_point(p, n)) = tmp; } @@ -146,7 +148,7 @@ namespace mln immerse(const Image& ima, const unsigned n) { typedef mln_value(I) V; - return immerse(ima, n, V()); + return immerse(ima, n, V(), k2::generic_converter<V,V>()); } -- 1.7.2.5

12 years, 2 months

olena-2.0-108-g318c0f7 Introduce level tag.

by Guillaume Lazzara

* mln/util/level.hh, * tests/util/level.cc: New. * tests/util/Makefile.am: New target. --- milena/ChangeLog | 9 ++ milena/mln/util/level.hh | 128 ++++++++++++++++++++ milena/tests/util/Makefile.am | 4 +- .../tests/{world/k1/is_1_face.cc => util/level.cc} | 21 ++-- 4 files changed, 152 insertions(+), 10 deletions(-) create mode 100644 milena/mln/util/level.hh copy milena/tests/{world/k1/is_1_face.cc => util/level.cc} (80%) diff --git a/milena/ChangeLog b/milena/ChangeLog index d86373c..b223262 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2012-10-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce level tag. + + * mln/util/level.hh, + * tests/util/level.cc: New. + + * tests/util/Makefile.am: New target. + +2012-10-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix accu::stat::median_interval. * mln/accu/stat/median_interval.hh: Fix bugs and add support for diff --git a/milena/mln/util/level.hh b/milena/mln/util/level.hh new file mode 100644 index 0000000..ea7f3f3 --- /dev/null +++ b/milena/mln/util/level.hh @@ -0,0 +1,128 @@ +// 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_UTIL_LEVEL_HH +# define MLN_UTIL_LEVEL_HH + +# include <mln/core/concept/value.hh> +# include <mln/value/scalar.hh> + +/// \file +/// +/// Definition of a level tag. + +namespace mln +{ + + namespace util + { + + /// \brief Level tag structure. + template <typename T> + struct level_t + : public Object<level_t<T> > + { + const T& value; + explicit level_t(const T& value); + }; + + /// \brief construct a level tag. + template <typename T> + level_t<T> level(const T& value); + + + // Comparison Operators + + template <typename T, typename U> + bool + operator<(const Object<T>& i, const level_t& v); + + template <typename T, typename U> + bool + operator<(const level_t& v, const Object<T>& i); + + template <typename T, typename U> + bool + operator==(const Object<T>& i, const level_t& v); + + template <typename T, typename U> + bool + operator==(const level_t& v, const Object<T>& i); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename T> + level_t<T>::level_t(const T& value) + : value(value) + { + } + + template <typename T> + inline + level_t<T> level(const T& value) + { + return level_t<T>(value); + } + + template <typename T, typename U> + inline + bool + operator<(const Object<T>& i, const level_t& v) + { + return exact(i) < v.value; + } + + template <typename T, typename U> + inline + bool + operator<(const level_t& v, const Object<T>& i) + { + return v.value < exact(i); + } + + template <typename T, typename U> + inline + bool + operator==(const Object<T>& i, const level_t& v) + { + return exact(i) == v.value; + } + + template <typename T, typename U> + inline + bool + operator==(const level_t& v, const Object<T>& i) + { + return v.value == exact(i); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::util + +} // end of namespace mln + +#endif // ! MLN_UTIL_LEVEL_HH diff --git a/milena/tests/util/Makefile.am b/milena/tests/util/Makefile.am index 0a1119e..5bf503f 100644 --- a/milena/tests/util/Makefile.am +++ b/milena/tests/util/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -27,6 +27,7 @@ check_PROGRAMS = \ graph \ lazy_set \ lemmings \ + level \ line_graph \ ord \ ord_pair \ @@ -44,6 +45,7 @@ fibonacci_heap_SOURCES = fibonacci_heap.cc graph_SOURCES = graph.cc lazy_set_SOURCES = lazy_set.cc lemmings_SOURCES = lemmings.cc +level_SOURCES = level.cc line_graph_SOURCES = line_graph.cc ord_SOURCES = ord.cc ord_pair_SOURCES = ord_pair.cc diff --git a/milena/tests/world/k1/is_1_face.cc b/milena/tests/util/level.cc similarity index 80% copy from milena/tests/world/k1/is_1_face.cc copy to milena/tests/util/level.cc index bd50f84..3f0c8bf 100644 --- a/milena/tests/world/k1/is_1_face.cc +++ b/milena/tests/util/level.cc @@ -23,17 +23,20 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -/// \file +#include <mln/util/level.hh> +#include <mln/value/int_u8.hh> -#include <mln/core/alias/point2d.hh> -#include <mln/world/k1/is_1_face.hh> - -int main() +int main () { using namespace mln; - mln_assertion(!world::k1::is_1_face(point2d(-1, -1))); - mln_assertion(world::k1::is_1_face(point2d(-1, 0))); - mln_assertion(world::k1::is_1_face(point2d(0, -1))); - mln_assertion(!world::k1::is_1_face(point2d(0, 0))); + util::level_t<int> l(3); + mln_assertion(2 < l); + mln_assertion(l > 2); + mln_assertion(l == 3); + + value::int_u8 v = 4; + mln_assertion(!(v < l)); + mln_assertion(v > l); + mln_assertion(!(v == l)); } -- 1.7.2.5

12 years, 2 months

olena-2.0-49-gdf0ecc7 Introduce level tag.

by Guillaume Lazzara

* mln/util/level.hh, * tests/util/level.cc: New. * tests/util/Makefile.am: New target. --- milena/ChangeLog | 9 ++ milena/mln/util/level.hh | 128 ++++++++++++++++++++ milena/tests/util/Makefile.am | 4 +- .../tests/{world/k1/is_1_face.cc => util/level.cc} | 21 ++-- 4 files changed, 152 insertions(+), 10 deletions(-) create mode 100644 milena/mln/util/level.hh copy milena/tests/{world/k1/is_1_face.cc => util/level.cc} (80%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 31968b3..42a6553 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2012-10-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce level tag. + + * mln/util/level.hh, + * tests/util/level.cc: New. + + * tests/util/Makefile.am: New target. + +2012-10-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix accu::stat::median_interval. * mln/accu/stat/median_interval.hh: Fix bugs and add support for diff --git a/milena/mln/util/level.hh b/milena/mln/util/level.hh new file mode 100644 index 0000000..ea7f3f3 --- /dev/null +++ b/milena/mln/util/level.hh @@ -0,0 +1,128 @@ +// 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_UTIL_LEVEL_HH +# define MLN_UTIL_LEVEL_HH + +# include <mln/core/concept/value.hh> +# include <mln/value/scalar.hh> + +/// \file +/// +/// Definition of a level tag. + +namespace mln +{ + + namespace util + { + + /// \brief Level tag structure. + template <typename T> + struct level_t + : public Object<level_t<T> > + { + const T& value; + explicit level_t(const T& value); + }; + + /// \brief construct a level tag. + template <typename T> + level_t<T> level(const T& value); + + + // Comparison Operators + + template <typename T, typename U> + bool + operator<(const Object<T>& i, const level_t& v); + + template <typename T, typename U> + bool + operator<(const level_t& v, const Object<T>& i); + + template <typename T, typename U> + bool + operator==(const Object<T>& i, const level_t& v); + + template <typename T, typename U> + bool + operator==(const level_t& v, const Object<T>& i); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename T> + level_t<T>::level_t(const T& value) + : value(value) + { + } + + template <typename T> + inline + level_t<T> level(const T& value) + { + return level_t<T>(value); + } + + template <typename T, typename U> + inline + bool + operator<(const Object<T>& i, const level_t& v) + { + return exact(i) < v.value; + } + + template <typename T, typename U> + inline + bool + operator<(const level_t& v, const Object<T>& i) + { + return v.value < exact(i); + } + + template <typename T, typename U> + inline + bool + operator==(const Object<T>& i, const level_t& v) + { + return exact(i) == v.value; + } + + template <typename T, typename U> + inline + bool + operator==(const level_t& v, const Object<T>& i) + { + return v.value == exact(i); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::util + +} // end of namespace mln + +#endif // ! MLN_UTIL_LEVEL_HH diff --git a/milena/tests/util/Makefile.am b/milena/tests/util/Makefile.am index 0a1119e..5bf503f 100644 --- a/milena/tests/util/Makefile.am +++ b/milena/tests/util/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -27,6 +27,7 @@ check_PROGRAMS = \ graph \ lazy_set \ lemmings \ + level \ line_graph \ ord \ ord_pair \ @@ -44,6 +45,7 @@ fibonacci_heap_SOURCES = fibonacci_heap.cc graph_SOURCES = graph.cc lazy_set_SOURCES = lazy_set.cc lemmings_SOURCES = lemmings.cc +level_SOURCES = level.cc line_graph_SOURCES = line_graph.cc ord_SOURCES = ord.cc ord_pair_SOURCES = ord_pair.cc diff --git a/milena/tests/world/k1/is_1_face.cc b/milena/tests/util/level.cc similarity index 80% copy from milena/tests/world/k1/is_1_face.cc copy to milena/tests/util/level.cc index bd50f84..3f0c8bf 100644 --- a/milena/tests/world/k1/is_1_face.cc +++ b/milena/tests/util/level.cc @@ -23,17 +23,20 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -/// \file +#include <mln/util/level.hh> +#include <mln/value/int_u8.hh> -#include <mln/core/alias/point2d.hh> -#include <mln/world/k1/is_1_face.hh> - -int main() +int main () { using namespace mln; - mln_assertion(!world::k1::is_1_face(point2d(-1, -1))); - mln_assertion(world::k1::is_1_face(point2d(-1, 0))); - mln_assertion(world::k1::is_1_face(point2d(0, -1))); - mln_assertion(!world::k1::is_1_face(point2d(0, 0))); + util::level_t<int> l(3); + mln_assertion(2 < l); + mln_assertion(l > 2); + mln_assertion(l == 3); + + value::int_u8 v = 4; + mln_assertion(!(v < l)); + mln_assertion(v > l); + mln_assertion(!(v == l)); } -- 1.7.2.5

12 years, 2 months

olena-2.0-110-g1b1c0af mln/core/routine/ops.hh: Update comments.

by Guillaume Lazzara

--- milena/ChangeLog | 4 ++++ milena/mln/core/routine/ops.hh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ca57070..bf4c572 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2012-10-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/core/routine/ops.hh: Update comments. + +2012-10-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/value/interval.cc: Add more tests. 2012-10-18 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/mln/core/routine/ops.hh b/milena/mln/core/routine/ops.hh index db26631..11e0091 100644 --- a/milena/mln/core/routine/ops.hh +++ b/milena/mln/core/routine/ops.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -53,8 +53,8 @@ l != r : -> ! (l == r) l > r : -> (r < l) - l >= r : -> (r <= l) l <= r : -> ! (r < l) warning: re-define when partial ordering + l >= r : -> (r <= l) * \endcode * -- 1.7.2.5

12 years, 2 months

olena-2.0-51-g63a31e8 mln/core/routine/ops.hh: Update comments.

by Guillaume Lazzara

--- milena/ChangeLog | 4 ++++ milena/mln/core/routine/ops.hh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5fd931d..c6ef422 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2012-10-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/core/routine/ops.hh: Update comments. + +2012-10-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/value/interval.cc: Add more tests. 2012-10-18 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/mln/core/routine/ops.hh b/milena/mln/core/routine/ops.hh index db26631..11e0091 100644 --- a/milena/mln/core/routine/ops.hh +++ b/milena/mln/core/routine/ops.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Copyright (C) 2007, 2008, 2009, 2012 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -53,8 +53,8 @@ l != r : -> ! (l == r) l > r : -> (r < l) - l >= r : -> (r <= l) l <= r : -> ! (r < l) warning: re-define when partial ordering + l >= r : -> (r <= l) * \endcode * -- 1.7.2.5

12 years, 2 months

olena-2.0-109-g253edef tests/value/interval.cc: Add more tests.

by Guillaume Lazzara

--- milena/ChangeLog | 4 ++++ milena/tests/value/interval.cc | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b223262..ca57070 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2012-10-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * tests/value/interval.cc: Add more tests. + +2012-10-18 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce level tag. * mln/util/level.hh, diff --git a/milena/tests/value/interval.cc b/milena/tests/value/interval.cc index 0fd8e6d..2f57c4c 100644 --- a/milena/tests/value/interval.cc +++ b/milena/tests/value/interval.cc @@ -101,4 +101,10 @@ int main() mln_assertion(r1.ith_element(8) == 11.5); } + { + interval<intsub<1> > r1(0, 255); + mln_assertion(r1.ith_element(0) == 0); + mln_assertion(r1.ith_element(4) == 4); + } + } -- 1.7.2.5

12 years, 2 months

← Newer
1
...
11
12
13
14
15
16
17
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches October 2012