Olena-patches October 2012

olena-patches@lrde.epita.fr

9 participants
221 discussions

branch exp/khalimsky updated: olena-2.0-160-g20e5ea1

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 20e5ea192b6d35558375dcdd31105040194a0549 (commit) via 8111a3b8d02f9172deb3afdbc2de78dba4c9ce11 (commit) via 1ae66a9420e5bcbb1b803146c2dbe2d832ce338a (commit) via 40868fc1ed059dba8ac32a197c8ca057119b7fc5 (commit) via 9f16736e0489a3dd08886d294cfe450455e9017e (commit) via b1996de47b003770f8216b7e9490caec1f752fb8 (commit) via 1e0a65a1766eb1f1899fb19028f99d27aa4d6ed2 (commit) via 91eebc54f3b25f8b45f50f074811901565ebe554 (commit) via e08e17f5cad0eaf44d5ac35eb59e9953a3aa46d0 (commit) from 5ee0431581d8905678c4823763e8c929f9cbe1d2 (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 ----------------------------------------------------------------- 20e5ea1 Add value::is_degenerated. 8111a3b Small fixes. 1ae66a9 mln/world/kn/debug/println.hh: New. 40868fc Add test for world::kn::border::compute_1_faces. 9f16736 Add kn::is_primary_2_face and kn::is_not_primary_2_face. b1996de Move kn::internal::face_dim to kn. 1e0a65a Move display_enlarged to kn. 91eebc5 Fix level comparisons. e08e17f More safe cast overloads. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 98 +++++++++ milena/mln/fun/v2b/compare.hh | 17 +- milena/mln/fun/v2b/threshold_ge.hh | 22 +- milena/mln/fun/v2b/threshold_gt.hh | 20 +- milena/mln/fun/v2b/threshold_le.hh | 21 +- milena/mln/fun/v2b/threshold_lt.hh | 17 +- milena/mln/util/hqueue.hh | 32 ++-- milena/mln/value/is_degenerated.hh | 122 ++++++++++++ milena/mln/world/k1/display_enlarged.hh | 154 -------------- .../world/k1/immerse_and_duplicate_2_to_1_faces.hh | 6 + milena/mln/world/k2/is_non_primary_2_face.hh | 4 +- milena/mln/world/k2/is_primary_2_face.hh | 7 +- milena/mln/world/kn/border/compute_1_faces.hh | 3 - milena/mln/world/kn/compute_tree_of_shapes.hh | 2 +- milena/mln/world/kn/debug/println.hh | 142 +++++++++++++ milena/mln/world/kn/display_enlarged.hh | 154 ++++++++++++++ milena/mln/world/kn/face_dim.hh | 79 ++++++++ milena/mln/world/kn/internal/display.hh | 6 +- milena/mln/world/kn/internal/face_dim.hh | 84 -------- milena/mln/world/kn/is_0_face.hh | 4 +- milena/mln/world/kn/is_0_or_1_face.hh | 4 +- milena/mln/world/kn/is_1_face.hh | 4 +- milena/mln/world/kn/is_2_face.hh | 4 +- milena/mln/world/kn/is_non_primary_2_face.hh | 99 +++++++++ milena/mln/world/kn/is_primary_2_face.hh | 100 ++++++++++ milena/mln/world/kn/level.hh | 15 +- milena/mln/world/kn/safe_cast.hh | 112 +++++++++-- milena/tests/value/Makefile.am | 4 +- milena/tests/value/is_degenerated.cc | 43 ++++ milena/tests/world/k1/Makefile.am | 2 - milena/tests/world/k1/display_enlarged.cc | 98 --------- milena/tests/world/k1/fill_0_from_1_faces.cc | 49 ++--- milena/tests/world/k1/immerse_with.cc | 11 +- milena/tests/world/kn/Makefile.am | 4 + milena/tests/world/kn/border/Makefile.am | 2 + milena/tests/world/kn/border/compute_1_faces.cc | 66 ++++++ milena/tests/world/kn/display_enlarged.cc | 94 +++++++++ milena/tests/world/kn/level.cc | 9 +- milena/tests/world/kn/safe_cast.cc | 209 ++++++++++++++++++++ 39 files changed, 1437 insertions(+), 486 deletions(-) create mode 100644 milena/mln/value/is_degenerated.hh delete mode 100644 milena/mln/world/k1/display_enlarged.hh create mode 100644 milena/mln/world/kn/debug/println.hh create mode 100644 milena/mln/world/kn/display_enlarged.hh create mode 100644 milena/mln/world/kn/face_dim.hh delete mode 100644 milena/mln/world/kn/internal/face_dim.hh create mode 100644 milena/mln/world/kn/is_non_primary_2_face.hh create mode 100644 milena/mln/world/kn/is_primary_2_face.hh create mode 100644 milena/tests/value/is_degenerated.cc delete mode 100644 milena/tests/world/k1/display_enlarged.cc create mode 100644 milena/tests/world/kn/border/compute_1_faces.cc create mode 100644 milena/tests/world/kn/display_enlarged.cc create mode 100644 milena/tests/world/kn/safe_cast.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

12 years, 1 month

olena-2.0-160-g20e5ea1 Add value::is_degenerated.

by Guillaume Lazzara

* mln/value/is_degenerated.hh, * tests/value/is_degenerated.cc: New. * tests/value/Makefile.am: New target. --- milena/ChangeLog | 9 +++ milena/mln/value/{prev.hh => is_degenerated.hh} | 59 +++++++++---------- milena/tests/value/Makefile.am | 4 +- .../{math/mean.cc => value/is_degenerated.cc} | 26 ++++----- 4 files changed, 51 insertions(+), 47 deletions(-) copy milena/mln/value/{prev.hh => is_degenerated.hh} (69%) copy milena/tests/{math/mean.cc => value/is_degenerated.cc} (77%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9edfec7..656968b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + Add value::is_degenerated. + + * mln/value/is_degenerated.hh, + * tests/value/is_degenerated.cc: New. + + * tests/value/Makefile.am: New target. + +2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes. * mln/util/hqueue.hh: Rename 'priority' arguments to 'bucket'. diff --git a/milena/mln/value/prev.hh b/milena/mln/value/is_degenerated.hh similarity index 69% copy from milena/mln/value/prev.hh copy to milena/mln/value/is_degenerated.hh index 93221c5..17794e1 100644 --- a/milena/mln/value/prev.hh +++ b/milena/mln/value/is_degenerated.hh @@ -23,15 +23,17 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_VALUE_PREV_HH -# define MLN_VALUE_PREV_HH +#ifndef MLN_VALUE_IS_DEGENERATED_HH +# define MLN_VALUE_IS_DEGENERATED_HH /// \file /// -/// Return the prev value. +/// Return True if a given value is degenerated. -# include <mln/value/iota.hh> -# include <mln/value/label.hh> +# include <mln/metal/abort.hh> +# include <mln/value/concept/scalar.hh> +# include <mln/value/scalar.hh> +# include <mln/value/interval.hh> namespace mln @@ -41,8 +43,8 @@ namespace mln { template <typename V> - V - prev(const V&); + bool + is_degenerated(const V&); # ifndef MLN_INCLUDE_ONLY @@ -57,24 +59,22 @@ namespace mln { template <typename V> - inline - V - prev(const V& v) + bool + is_degenerated(const V&) { - return v - mln::value::iota<V>::value(); + return true; } - } // end of namespace mln::value::implementation::generic - + } template <typename V> - inline - V - prev_method(const V& v) + bool + is_degenerated_interval(const interval<V>& v) { - return v.prev(); + return v.is_degenerated(); } + } // end of namespace mln::value::implementation @@ -84,20 +84,18 @@ namespace mln namespace internal { - template <unsigned n> - inline - label<n> - prev_dispatch(const label<n>& v) + template <typename V> + bool + is_degenerated_dispatch(const interval<V>& v) { - return implementation::prev_method(v); + return implementation::is_degenerated_interval(v); } template <typename V> - inline - V - prev_dispatch(const V& v) + bool + is_degenerated_dispatch(const V& v) { - return implementation::generic::prev(v); + return implementation::generic::is_degenerated(v); } } // end of namespace mln::value::internal @@ -107,11 +105,10 @@ namespace mln // Facade template <typename V> - inline - V - prev(const V& v) + bool + is_degenerated(const V& v) { - return internal::prev_dispatch(v); + return internal::is_degenerated_dispatch(exact(v)); } @@ -122,4 +119,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_VALUE_PREV_HH +#endif // ! MLN_VALUE_IS_DEGENERATED_HH diff --git a/milena/tests/value/Makefile.am b/milena/tests/value/Makefile.am index 537eb76..4b71064 100644 --- a/milena/tests/value/Makefile.am +++ b/milena/tests/value/Makefile.am @@ -36,7 +36,8 @@ check_PROGRAMS = \ scalar \ set \ sign \ - intsub + intsub \ + is_degenerated # float01 # float01_bis # float01_f @@ -62,6 +63,7 @@ scalar_SOURCES = scalar.cc set_SOURCES = set.cc sign_SOURCES = sign.cc intsub_SOURCES = intsub.cc +is_degenerated_SOURCES = is_degenerated.cc #<<lrde # FIXME: Not distributed (yet). diff --git a/milena/tests/math/mean.cc b/milena/tests/value/is_degenerated.cc similarity index 77% copy from milena/tests/math/mean.cc copy to milena/tests/value/is_degenerated.cc index a62cab6..348912b 100644 --- a/milena/tests/math/mean.cc +++ b/milena/tests/value/is_degenerated.cc @@ -23,25 +23,21 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#include <mln/math/mean.hh> +#include <cassert> +#include <mln/value/is_degenerated.hh> +#include <mln/value/interval.hh> #include <mln/value/intsub.hh> +#include <mln/value/int_u8.hh> + int main() { using namespace mln; + using namespace mln::value; - mln_assertion(math::mean(2,3) == 2.5); - - { - value::intsub<2> v1(1.5); - value::intsub<2> v2(2); - mln_assertion(math::mean(v1, v2) == 1.75); - } - - mln_assertion(math::mean(1,2,3,4) == 2.5); - - { - value::intsub<2> v1(1), v2(2), v3(3), v4(5); - mln_assertion(math::mean(v1, v2, v3, v4) == 2.75); - } + mln_assertion(is_degenerated(2)); + mln_assertion(is_degenerated(interval<int>(2,2))); + mln_assertion(!is_degenerated(interval<int>(2,6))); + mln_assertion(is_degenerated(intsub<2>(6))); + mln_assertion(is_degenerated(int_u8(6))); } -- 1.7.2.5

12 years, 1 month

olena-2.0-159-g8111a3b Small fixes.

by Guillaume Lazzara

* mln/util/hqueue.hh: Rename 'priority' arguments to 'bucket'. * mln/world/k1/immerse_and_duplicate_2_to_1_faces.hh: Add comments. * mln/world/kn/border/compute_1_faces.hh: Remove debug output. * mln/world/kn/compute_tree_of_shapes.hh: Fix a typo. * tests/world/k1/fill_0_from_1_faces.cc, * tests/world/k1/immerse_with.cc: Fix tests. --- milena/ChangeLog | 15 ++++++ milena/mln/util/hqueue.hh | 32 ++++++------ .../world/k1/immerse_and_duplicate_2_to_1_faces.hh | 6 ++ milena/mln/world/kn/border/compute_1_faces.hh | 3 - milena/mln/world/kn/compute_tree_of_shapes.hh | 2 +- milena/tests/world/k1/fill_0_from_1_faces.cc | 49 +++++++------------ milena/tests/world/k1/immerse_with.cc | 11 ++-- 7 files changed, 61 insertions(+), 57 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 32f1991..9edfec7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,20 @@ 2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + Small fixes. + + * mln/util/hqueue.hh: Rename 'priority' arguments to 'bucket'. + + * mln/world/k1/immerse_and_duplicate_2_to_1_faces.hh: Add comments. + + * mln/world/kn/border/compute_1_faces.hh: Remove debug output. + + * mln/world/kn/compute_tree_of_shapes.hh: Fix a typo. + + * tests/world/k1/fill_0_from_1_faces.cc, + * tests/world/k1/immerse_with.cc: Fix tests. + +2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/world/kn/debug/println.hh: New. 2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/mln/util/hqueue.hh b/milena/mln/util/hqueue.hh index ab7660c..6d535cf 100644 --- a/milena/mln/util/hqueue.hh +++ b/milena/mln/util/hqueue.hh @@ -53,13 +53,13 @@ namespace mln unsigned size() const; - bool is_empty(const P& priority) const; - bool is_not_empty(const P& priority) const; + bool is_empty(const P& bucket) const; + bool is_not_empty(const P& bucket) const; -// const std::queue<T>& operator[](const P& priority) const; +// const std::queue<T>& operator[](const P& bucket) const; - void push(const T& t, const P& priority); - T pop(const P& priority); + void push(const T& t, const P& bucket); + T pop(const P& bucket); private: std::vector<std::queue<T> > v_; @@ -103,16 +103,16 @@ namespace mln template <typename T, typename P> bool - hqueue<T,P>::is_empty(const P& priority) const + hqueue<T,P>::is_empty(const P& bucket) const { - return v_[inter_.index_of(priority)].empty() == 0; + return v_[inter_.index_of(bucket)].empty() == 0; } template <typename T, typename P> bool - hqueue<T,P>::is_not_empty(const P& priority) const + hqueue<T,P>::is_not_empty(const P& bucket) const { - return ! is_empty(priority); + return ! is_empty(bucket); } // template <typename T, typename P> @@ -125,19 +125,19 @@ namespace mln template <typename T, typename P> void - hqueue<T,P>::push(const T& t, const P& priority) + hqueue<T,P>::push(const T& t, const P& bucket) { - v_[inter_.index_of(priority)].push(t); + v_[inter_.index_of(bucket)].push(t); } template <typename T, typename P> T - hqueue<T,P>::pop(const P& priority) + hqueue<T,P>::pop(const P& bucket) { - mln_precondition(!is_empty()); - mln_precondition(priority < v_.size()); - T front = v_[priority].front(); - v_[priority].pop(); + mln_precondition(!is_empty(bucket)); + mln_precondition(bucket < v_.size()); + T front = v_[bucket].front(); + v_[bucket].pop(); return front; } diff --git a/milena/mln/world/k1/immerse_and_duplicate_2_to_1_faces.hh b/milena/mln/world/k1/immerse_and_duplicate_2_to_1_faces.hh index 33ef3dd..81208a5 100644 --- a/milena/mln/world/k1/immerse_and_duplicate_2_to_1_faces.hh +++ b/milena/mln/world/k1/immerse_and_duplicate_2_to_1_faces.hh @@ -53,12 +53,18 @@ namespace mln Data is copied into 1 faces located at the bottom right of each 2 faces. + \verbatim -1 0 1 2 3 0 1 -1 . a . d . 0 a d 0 a a a d d 1 b c -> 1 . a . d . 2 b b b c c 3 . b . c . + \endverbatim + + Warning: image borders are not initialized. \sa + world::kn::border::duplicate_2_faces, + world::kn::border::compute_1_faces. */ template <typename I> diff --git a/milena/mln/world/kn/border/compute_1_faces.hh b/milena/mln/world/kn/border/compute_1_faces.hh index 9788efc..4e6bfcf 100644 --- a/milena/mln/world/kn/border/compute_1_faces.hh +++ b/milena/mln/world/kn/border/compute_1_faces.hh @@ -85,8 +85,6 @@ namespace mln // Fill horizontal border for (def::coord col = min_col_1; col <= max_col_1; ++col) - { - std::cout << min_row_1 << "," << col << std::endl; if (is_1_face_vertical(min_row_1, col)) { // First row @@ -96,7 +94,6 @@ namespace mln inout.at_(max_row_1, col) = f(inout.at_(max_row_1, col - 1), inout.at_(max_row_1, col + 1)); } - } // Fill vertical border for (def::coord row = min_row_1; row <= max_row_1; ++row) diff --git a/milena/mln/world/kn/compute_tree_of_shapes.hh b/milena/mln/world/kn/compute_tree_of_shapes.hh index 6726259..1596618 100644 --- a/milena/mln/world/kn/compute_tree_of_shapes.hh +++ b/milena/mln/world/kn/compute_tree_of_shapes.hh @@ -265,7 +265,7 @@ namespace mln EV l_ = lcur; for (; l_ > inter_.first(); value::dec(l_)) - if (q.is_not_empty(l_))) + if (q.is_not_empty(l_)) { found = true; return l_; diff --git a/milena/tests/world/k1/fill_0_from_1_faces.cc b/milena/tests/world/k1/fill_0_from_1_faces.cc index e667734..ed53466 100644 --- a/milena/tests/world/k1/fill_0_from_1_faces.cc +++ b/milena/tests/world/k1/fill_0_from_1_faces.cc @@ -29,47 +29,34 @@ #include <mln/make/box2d.hh> #include <mln/data/compare.hh> #include <mln/accu/math/sum.hh> +#include <mln/fun/vvvv2v/sum.hh> #include <mln/world/k1/fill_0_from_1_faces.hh> #include <mln/border/fill.hh> -namespace mln -{ - - struct sum_t : Function_vvvv2v<sum_t> - { - typedef int result; - - int operator()(const int& v1, const int& v2, const int& v3, const int& v4) const - { - return v1 + v2 + v3 + v4; - } - - }; - -} - - - int main() { using namespace mln; - int refvals[5][5] = { - {2, 1, 3, 1, 2}, - {1, 0, 1, 0, 1}, - {3, 1, 4, 1, 3}, - {1, 0, 1, 0, 1}, - {2, 1, 3, 1, 2} + int refvals[7][7] = { + {2, 1, 3, 1, 3, 1, 2 }, + {1, 0, 1, 0, 1, 0, 1 }, + {3, 1, 4, 1, 4, 1, 3 }, + {1, 0, 1, 0, 1, 0, 1 }, + {3, 1, 4, 1, 4, 1, 3 }, + {1, 0, 1, 0, 1, 0, 1 }, + {2, 1, 3, 1, 3, 1, 2 }, }; image2d<int> ref = make::image(refvals, point2d(-1, -1)); - int vals[5][5] = { - {0, 1, 0, 1, 0 }, - {1, 0, 1, 0, 1 }, - {0, 1, 0, 1, 0 }, - {1, 0, 1, 0, 1 }, - {0, 1, 0, 1, 0 } + int vals[7][7] = { + {0, 1, 0, 1, 0, 1, 0 }, + {1, 0, 1, 0, 1, 0, 1 }, + {0, 1, 0, 1, 0, 1, 0 }, + {1, 0, 1, 0, 1, 0, 1 }, + {0, 1, 0, 1, 0, 1, 0 }, + {1, 0, 1, 0, 1, 0, 1 }, + {0, 1, 0, 1, 0, 1, 0 }, }; image2d<int> imak1 = make::image(vals, point2d(-1, -1)); @@ -78,7 +65,7 @@ int main() // Overload with function { - sum_t f; + fun::vvvv2v::sum<int> f; world::k1::fill_0_from_1_faces(imak1, f); mln_assertion(ref == imak1); } diff --git a/milena/tests/world/k1/immerse_with.cc b/milena/tests/world/k1/immerse_with.cc index c6d4af7..93074b5 100644 --- a/milena/tests/world/k1/immerse_with.cc +++ b/milena/tests/world/k1/immerse_with.cc @@ -45,11 +45,11 @@ int main() // computation will handle borders. int fvals[][5] = { - {0, 2, 0, 4, 0}, - {2, 1, 3, 2, 4}, - {0, 4, 20, 6, 0}, - {6, 3, 7, 4, 8}, - {0, 6, 0, 8, 0} + {8, 2, 12, 4, 16}, + {2, 1, 3, 2, 4 }, + {16, 4, 20, 6, 24}, + {6, 3, 7, 4, 8 }, + {24, 6, 28, 8, 32} }; image2d<int> ref = make::image(fvals, point2d(-1,-1)); @@ -59,7 +59,6 @@ int main() immersed = world::k1::immerse_with(ima, long(), 0l, fun::vv2v::sum<long>(), fun::vvvv2v::sum<long>()); - mln_assertion(immersed == ref); } -- 1.7.2.5

12 years, 1 month

olena-2.0-158-g1ae66a9 mln/world/kn/debug/println.hh: New.

by Guillaume Lazzara

--- milena/ChangeLog | 4 + milena/mln/world/kn/debug/println.hh | 142 ++++++++++++++++++++++++++++++++++ 2 files changed, 146 insertions(+), 0 deletions(-) create mode 100644 milena/mln/world/kn/debug/println.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index d1fd20e..32f1991 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/world/kn/debug/println.hh: New. + +2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + Add test for world::kn::border::compute_1_faces. * tests/world/kn/border/Makefile.am: New target. diff --git a/milena/mln/world/kn/debug/println.hh b/milena/mln/world/kn/debug/println.hh new file mode 100644 index 0000000..c603722 --- /dev/null +++ b/milena/mln/world/kn/debug/println.hh @@ -0,0 +1,142 @@ +// 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 Display a Kn 2D image. + +#ifndef MLN_WORLD_KN_DEBUG_PRINTLN_HH +# define MLN_WORLD_KN_DEBUG_PRINTLN_HH + +# include <mln/core/concept/image.hh> +# include <mln/geom/min_row.hh> +# include <mln/geom/max_row.hh> +# include <mln/geom/min_col.hh> +# include <mln/geom/max_col.hh> +# include <mln/world/kn/face_dim.hh> + +namespace mln +{ + + namespace world + { + + namespace kn + { + + namespace debug + { + + + /// \brief Display a Kn 2D image. + template <typename I> + void println(const std::string& msg, const Image& ima, + std::ostream& ostr = std::cout); + + + // \overload + template <typename I> + void println(const Image& ima, + std::ostream& ostr = std::cout); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename I> + void println(const std::string& msg, + const Image& ima_, + std::ostream& ostr = std::cout) + { + trace::entering("mln::world::kn::debug::println"); + mln_precondition(exact(ima_).is_valid()); + mln_precondition(I::site::dim == 2); + + const I& ima = exact(ima_); + + if (msg != "") + std::cout << msg << std::endl; + def::coord + min_row = geom::min_row(ima), max_row = geom::max_row(ima), + min_col = geom::min_col(ima), max_col = geom::max_col(ima); + + // FIXME: not generic. + mln_site(I) p; + def::coord& row = p.row(); + def::coord& col = p.col(); + + char bdr = '#'; + + for (col = min_col; col <= max_col + 2; ++col) + std::cout << bdr << ' '; + std::cout << std::endl; + + for (row = min_row; row <= max_row; ++row) + { + std::cout << bdr; + for (col = min_col; col <= max_col; ++col) + if (ima(p)) + switch (face_dim(p)) + { + case 0: + ostr << " +"; + break; + case 1: + ostr << (is_1_face_horizontal(p) ? " -" : " |"); + break; + case 2: + // ostr << " O"; + ostr << (k2::is_primary_2_face(p) ? " O" : " x"); + break; + } + else + ostr << " "; + std::cout << ' ' << bdr << std::endl; + } + for (col = min_col; col <= max_col + 2; ++col) + std::cout << bdr << ' '; + std::cout << std::endl + << std::endl; + + trace::exiting("mln::world::kn::debug::println"); + }; + + template <typename I> + void println(const Image& ima, + std::ostream& ostr = std::cout) + { + println("", ima, ostr); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // mln::world::kn::debug + + } // mln::world::kn + + } // mln::world + +} // mln + +#endif // ! MLN_WORLD_KN_DEBUG_PRINTLN_HH -- 1.7.2.5

12 years, 1 month

olena-2.0-157-g40868fc Add test for world::kn::border::compute_1_faces.

by Guillaume Lazzara

* tests/world/kn/border/Makefile.am: New target. * tests/world/kn/border/compute_1_faces.cc: New. --- milena/ChangeLog | 8 +++++++ milena/tests/world/kn/border/Makefile.am | 2 + .../{duplicate_2_faces.cc => compute_1_faces.cc} | 22 ++++++++++---------- 3 files changed, 21 insertions(+), 11 deletions(-) copy milena/tests/world/kn/border/{duplicate_2_faces.cc => compute_1_faces.cc} (83%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 84feb27..d1fd20e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + Add test for world::kn::border::compute_1_faces. + + * tests/world/kn/border/Makefile.am: New target. + + * tests/world/kn/border/compute_1_faces.cc: New. + +2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + Add kn::is_primary_2_face and kn::is_not_primary_2_face. * mln/world/k2/is_non_primary_2_face.hh, diff --git a/milena/tests/world/kn/border/Makefile.am b/milena/tests/world/kn/border/Makefile.am index e8a2666..d4b7ecd 100644 --- a/milena/tests/world/kn/border/Makefile.am +++ b/milena/tests/world/kn/border/Makefile.am @@ -18,9 +18,11 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ adjust_duplicate_2_faces \ + compute_1_faces \ duplicate_2_faces adjust_duplicate_2_faces_SOURCES = adjust_duplicate_2_faces.cc +compute_1_faces_SOURCES = compute_1_faces.cc duplicate_2_faces_SOURCES = duplicate_2_faces.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/world/kn/border/duplicate_2_faces.cc b/milena/tests/world/kn/border/compute_1_faces.cc similarity index 83% copy from milena/tests/world/kn/border/duplicate_2_faces.cc copy to milena/tests/world/kn/border/compute_1_faces.cc index 3f91c01..062203a 100644 --- a/milena/tests/world/kn/border/duplicate_2_faces.cc +++ b/milena/tests/world/kn/border/compute_1_faces.cc @@ -27,23 +27,22 @@ #include <mln/core/image/image2d.hh> #include <mln/border/fill.hh> +#include <mln/world/kn/border/compute_1_faces.hh> #include <mln/world/kn/border/duplicate_2_faces.hh> - +#include <mln/fun/vv2v/sum.hh> int main() { using namespace mln; - border::thickness = 1; - int refvals[][7] = { - {2, 9, 2, 9, 3, 9, 3}, - {9, 0, 1, 0, 1, 0, 9}, - {2, 1, 2, 1, 3, 1, 3}, - {9, 0, 1, 0, 1, 0, 9}, - {4, 1, 4, 1, 5, 1, 5}, - {9, 0, 1, 0, 1, 0, 9}, - {4, 9, 4, 9, 5, 9, 5} + {2, 4, 2, 5, 3, 6, 3 }, + {4, 0, 1, 0, 1, 0, 6 }, + {2, 1, 2, 1, 3, 1, 3 }, + {6, 0, 1, 0, 1, 0, 8 }, + {4, 1, 4, 1, 5, 1, 5 }, + {8, 0, 1, 0, 1, 0, 10}, + {4, 8, 4, 9, 5, 10, 5 } }; image2d<int> ref = make::image(refvals, point2d(-2,-2)); @@ -57,8 +56,9 @@ int main() }; image2d<int> ima = make::image(vals, point2d(-1,-1)); - border::fill(ima, 9); + border::fill(ima, 0); world::kn::border::duplicate_2_faces(ima); + world::kn::border::compute_1_faces(ima, fun::vv2v::sum<int>()); mln_piter(image2d<int>) p(ref.domain()); for_all(p) -- 1.7.2.5

12 years, 1 month

olena-2.0-156-g9f16736 Add kn::is_primary_2_face and kn::is_not_primary_2_face.

by Guillaume Lazzara

* mln/world/k2/is_non_primary_2_face.hh, * mln/world/k2/is_primary_2_face.hh: Make use of kn version. * mln/world/kn/is_non_primary_2_face.hh, * mln/world/kn/is_primary_2_face.hh: New. --- milena/ChangeLog | 10 ++++ milena/mln/world/k2/is_non_primary_2_face.hh | 4 +- milena/mln/world/k2/is_primary_2_face.hh | 7 ++- .../mln/world/{k2 => kn}/is_non_primary_2_face.hh | 38 ++++++++++---- milena/mln/world/{k2 => kn}/is_primary_2_face.hh | 51 +++++++++++++------ 5 files changed, 78 insertions(+), 32 deletions(-) copy milena/mln/world/{k2 => kn}/is_non_primary_2_face.hh (65%) copy milena/mln/world/{k2 => kn}/is_primary_2_face.hh (56%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5d5f642..84feb27 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + Add kn::is_primary_2_face and kn::is_not_primary_2_face. + + * mln/world/k2/is_non_primary_2_face.hh, + * mln/world/k2/is_primary_2_face.hh: Make use of kn version. + + * mln/world/kn/is_non_primary_2_face.hh, + * mln/world/kn/is_primary_2_face.hh: New. + +2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + Move kn::internal::face_dim to kn. * mln/world/kn/internal/face_dim.hh: Move... diff --git a/milena/mln/world/k2/is_non_primary_2_face.hh b/milena/mln/world/k2/is_non_primary_2_face.hh index d4d7944..038b62f 100644 --- a/milena/mln/world/k2/is_non_primary_2_face.hh +++ b/milena/mln/world/k2/is_non_primary_2_face.hh @@ -32,7 +32,7 @@ # include <mln/core/alias/point2d.hh> # include <mln/world/kn/is_2_face.hh> -# include <mln/world/k2/is_primary_2_face.hh> +# include <mln/world/kn/is_primary_2_face.hh> namespace mln @@ -68,7 +68,7 @@ namespace mln bool is_non_primary_2_face(const mln::def::coord& row, const mln::def::coord& col) { - return kn::is_2_face(row, col) && !is_primary_2_face(row, col); + return kn::is_2_face(row, col) && !kn::is_primary_2_face<2>(row, col); } diff --git a/milena/mln/world/k2/is_primary_2_face.hh b/milena/mln/world/k2/is_primary_2_face.hh index 442a8f5..48e842f 100644 --- a/milena/mln/world/k2/is_primary_2_face.hh +++ b/milena/mln/world/k2/is_primary_2_face.hh @@ -31,6 +31,7 @@ # define MLN_WORLD_K2_IS_PRIMARY_2_FACE_HH # include <mln/core/alias/point2d.hh> +# include <mln/world/kn/is_primary_2_face.hh> namespace mln @@ -48,7 +49,7 @@ namespace mln /// \overload bool is_primary_2_face(const mln::def::coord& row, - const mln::def::coord& col); + const mln::def::coord& col); # ifndef MLN_INCLUDE_ONLY @@ -64,9 +65,9 @@ namespace mln inline bool is_primary_2_face(const mln::def::coord& row, - const mln::def::coord& col) + const mln::def::coord& col) { - return row % 4 == 0 && col % 4 == 0; + return kn::is_primary_2_face<2>(row, col); } diff --git a/milena/mln/world/k2/is_non_primary_2_face.hh b/milena/mln/world/kn/is_non_primary_2_face.hh similarity index 65% copy from milena/mln/world/k2/is_non_primary_2_face.hh copy to milena/mln/world/kn/is_non_primary_2_face.hh index d4d7944..3a9d5f7 100644 --- a/milena/mln/world/k2/is_non_primary_2_face.hh +++ b/milena/mln/world/kn/is_non_primary_2_face.hh @@ -27,12 +27,12 @@ /// /// \brief Check if site is a non-primary face. -#ifndef MLN_WORLD_K2_IS_NON_PRIMARY_2_FACE_HH -# define MLN_WORLD_K2_IS_NON_PRIMARY_2_FACE_HH +#ifndef MLN_WORLD_KN_IS_NON_PRIMARY_2_FACE_HH +# define MLN_WORLD_KN_IS_NON_PRIMARY_2_FACE_HH # include <mln/core/alias/point2d.hh> # include <mln/world/kn/is_2_face.hh> -# include <mln/world/k2/is_primary_2_face.hh> +# include <mln/world/kn/is_primary_2_face.hh> namespace mln @@ -41,17 +41,24 @@ namespace mln namespace world { - namespace k2 + namespace kn { /// \brief Check if site is a non-primary face - bool is_non_primary_2_face(const point2d& p); + bool is_non_primary_2_face(const point2d& p, unsigned n); /// \overload bool is_non_primary_2_face(const mln::def::coord& row, - const mln::def::coord& col); + const mln::def::coord& col, + unsigned n); + /// \overload + /// Static version. \tparam n is a template parameter which + /// allows some computation to be performed at compile time. + template <unsigned n> + bool is_non_primary_2_face(const mln::def::coord& row, + const mln::def::coord& col); # ifndef MLN_INCLUDE_ONLY @@ -59,25 +66,34 @@ namespace mln // Facade inline - bool is_non_primary_2_face(const point2d& p) + bool is_non_primary_2_face(const point2d& p, unsigned n) { - return is_non_primary_2_face(p.row(), p.col()); + return is_non_primary_2_face(p.row(), p.col(), n); } inline bool is_non_primary_2_face(const mln::def::coord& row, + const mln::def::coord& col, + unsigned n) + { + return is_2_face(row, col) && !is_primary_2_face(row, col, n); + } + + + template <unsigned n> + bool is_non_primary_2_face(const mln::def::coord& row, const mln::def::coord& col) { - return kn::is_2_face(row, col) && !is_primary_2_face(row, col); + return is_2_face(row, col) && !is_primary_2_face<n>(row, col); } # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::world::k2 + } // end of namespace mln::world::kn } // end of namespace mln::world } // end of namespace mln -#endif // ! MLN_WORLD_K2_IS_NON_PRIMARY_2_FACE_HH +#endif // ! MLN_WORLD_KN_IS_NON_PRIMARY_2_FACE_HH diff --git a/milena/mln/world/k2/is_primary_2_face.hh b/milena/mln/world/kn/is_primary_2_face.hh similarity index 56% copy from milena/mln/world/k2/is_primary_2_face.hh copy to milena/mln/world/kn/is_primary_2_face.hh index 442a8f5..36c0e44 100644 --- a/milena/mln/world/k2/is_primary_2_face.hh +++ b/milena/mln/world/kn/is_primary_2_face.hh @@ -25,13 +25,14 @@ /// \file /// -/// \brief Check if site is a primary face. +/// \brief Check if site is a primary face in an image immersed in Kn. -#ifndef MLN_WORLD_K2_IS_PRIMARY_2_FACE_HH -# define MLN_WORLD_K2_IS_PRIMARY_2_FACE_HH +#ifndef MLN_WORLD_KN_IS_PRIMARY_2_FACE_HH +# define MLN_WORLD_KN_IS_PRIMARY_2_FACE_HH +# include <cmath> # include <mln/core/alias/point2d.hh> - +# include <mln/metal/math/pow.hh> namespace mln { @@ -39,43 +40,61 @@ namespace mln namespace world { - namespace k2 + namespace kn { - /// \brief Check if site is a primary face - bool is_primary_2_face(const point2d& p); + /// \brief Check if site is a primary face in an image immersed + /// in K\p n. + bool is_primary_2_face(const point2d& p, + unsigned n); /// \overload bool is_primary_2_face(const mln::def::coord& row, - const mln::def::coord& col); + const mln::def::coord& col, + unsigned n); + /// \overload + /// Static version. \tparam n is a template parameter which + /// allows some computation to be performed at compile time. + template <unsigned n> + bool is_primary_2_face(const mln::def::coord& row, + const mln::def::coord& col); # ifndef MLN_INCLUDE_ONLY - // Facade - inline - bool is_primary_2_face(const point2d& p) + bool is_primary_2_face(const point2d& p, unsigned n) { - return is_primary_2_face(p.row(), p.col()); + return is_primary_2_face(p.row(), p.col(), n); } inline bool is_primary_2_face(const mln::def::coord& row, - const mln::def::coord& col) + const mln::def::coord& col, + unsigned n) + { + long shift = std::pow(2u,n); + return (row % shift) == 0 + && (col % shift) == 0; + } + + template <unsigned n> + bool is_primary_2_face(const mln::def::coord& row, + const mln::def::coord& col) { - return row % 4 == 0 && col % 4 == 0; + return (row % mlc_pow_int(2, n)) == 0 + && (col % mlc_pow_int(2, n)) == 0; } # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::world::k2 + } // end of namespace mln::world::kn } // end of namespace mln::world } // end of namespace mln -#endif // ! MLN_WORLD_K2_IS_PRIMARY_2_FACE_HH +#endif // ! MLN_WORLD_KN_IS_PRIMARY_2_FACE_HH -- 1.7.2.5

12 years, 1 month

olena-2.0-155-gb1996de Move kn::internal::face_dim to kn.

by Guillaume Lazzara

* mln/world/kn/internal/face_dim.hh: Move... * mln/world/kn/face_dim.hh: ... here. * mln/world/kn/internal/display.hh, * mln/world/kn/is_0_face.hh, * mln/world/kn/is_0_or_1_face.hh, * mln/world/kn/is_1_face.hh, * mln/world/kn/is_2_face.hh: Update reference to face_dim. --- milena/ChangeLog | 13 +++++++++ milena/mln/world/kn/{internal => }/face_dim.hh | 35 ++++++++++------------- milena/mln/world/kn/internal/display.hh | 6 ++-- milena/mln/world/kn/is_0_face.hh | 4 +- milena/mln/world/kn/is_0_or_1_face.hh | 4 +- milena/mln/world/kn/is_1_face.hh | 4 +- milena/mln/world/kn/is_2_face.hh | 4 +- 7 files changed, 39 insertions(+), 31 deletions(-) rename milena/mln/world/kn/{internal => }/face_dim.hh (77%) diff --git a/milena/ChangeLog b/milena/ChangeLog index bc3b35c..5d5f642 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,18 @@ 2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + Move kn::internal::face_dim to kn. + + * mln/world/kn/internal/face_dim.hh: Move... + * mln/world/kn/face_dim.hh: ... here. + + * mln/world/kn/internal/display.hh, + * mln/world/kn/is_0_face.hh, + * mln/world/kn/is_0_or_1_face.hh, + * mln/world/kn/is_1_face.hh, + * mln/world/kn/is_2_face.hh: Update reference to face_dim. + +2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + Move display_enlarged to kn. * mln/world/k1/display_enlarged.hh, diff --git a/milena/mln/world/kn/internal/face_dim.hh b/milena/mln/world/kn/face_dim.hh similarity index 77% rename from milena/mln/world/kn/internal/face_dim.hh rename to milena/mln/world/kn/face_dim.hh index 105c6cc..6a6c418 100644 --- a/milena/mln/world/kn/internal/face_dim.hh +++ b/milena/mln/world/kn/face_dim.hh @@ -41,38 +41,33 @@ namespace mln namespace kn { - namespace internal - { - - /// \brief Returns the dimension of site in KN. - unsigned face_dim(const point2d& p); + /// \brief Returns the dimension of site in KN. + unsigned face_dim(const point2d& p); - /// \overload - unsigned face_dim(const mln::def::coord& row, const mln::def::coord& col); + /// \overload + unsigned face_dim(const mln::def::coord& row, const mln::def::coord& col); # ifndef MLN_INCLUDE_ONLY - // Facade + // Facade - inline - unsigned face_dim(const point2d& p) - { - return face_dim(p.row(), p.col()); - } + inline + unsigned face_dim(const point2d& p) + { + return face_dim(p.row(), p.col()); + } - inline - unsigned face_dim(const mln::def::coord& row, const mln::def::coord& col) - { - return (row % 2 == 0) + (col % 2 == 0); - } + inline + unsigned face_dim(const mln::def::coord& row, const mln::def::coord& col) + { + return (row % 2 == 0) + (col % 2 == 0); + } # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::work::kn::internal - } // end of namespace mln::world::kn } // end of namespace mln::world diff --git a/milena/mln/world/kn/internal/display.hh b/milena/mln/world/kn/internal/display.hh index 7eb1261..efa0b59 100644 --- a/milena/mln/world/kn/internal/display.hh +++ b/milena/mln/world/kn/internal/display.hh @@ -31,7 +31,7 @@ # define MLN_WORLD_KN_INTERNAL_DISPLAY_HH # include <sstream> -# include <mln/world/kn/internal/face_dim.hh> +# include <mln/world/kn/face_dim.hh> # include <mln/world/k2/is_primary_2_face.hh> # include <mln/world/kn/is_1_face_horizontal.hh> # include <mln/world/kn/is_1_face_vertical.hh> @@ -264,7 +264,7 @@ namespace mln void display_in_K1<Tree>::print_p(const point2d& p) { - switch (internal::face_dim(p)) + switch (face_dim(p)) { case 0: ostr << " +"; @@ -292,7 +292,7 @@ namespace mln void display_in_K2<Tree>::print_p(const point2d& p) { - switch (internal::face_dim(p)) + switch (face_dim(p)) { case 0: ostr << " +"; diff --git a/milena/mln/world/kn/is_0_face.hh b/milena/mln/world/kn/is_0_face.hh index c1124ac..a0ad80f 100644 --- a/milena/mln/world/kn/is_0_face.hh +++ b/milena/mln/world/kn/is_0_face.hh @@ -31,7 +31,7 @@ # define MLN_WORLD_KN_IS_0_FACE_HH # include <mln/core/alias/point2d.hh> -# include <mln/world/kn/internal/face_dim.hh> +# include <mln/world/kn/face_dim.hh> namespace mln @@ -66,7 +66,7 @@ namespace mln bool is_0_face(const mln::def::coord& row, const mln::def::coord& col) { - return internal::face_dim(row, col) == 0; + return face_dim(row, col) == 0; } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/world/kn/is_0_or_1_face.hh b/milena/mln/world/kn/is_0_or_1_face.hh index 6ddbd91..b05f279 100644 --- a/milena/mln/world/kn/is_0_or_1_face.hh +++ b/milena/mln/world/kn/is_0_or_1_face.hh @@ -31,7 +31,7 @@ # define MLN_WORLD_KN_IS_0_OR_1_FACE_HH # include <mln/core/alias/point2d.hh> -# include <mln/world/kn/internal/face_dim.hh> +# include <mln/world/kn/face_dim.hh> namespace mln @@ -55,7 +55,7 @@ namespace mln inline bool is_0_or_1_face(const point2d& p) { - unsigned dim = internal::face_dim(p); + unsigned dim = face_dim(p); return dim == 0 || dim == 1; } diff --git a/milena/mln/world/kn/is_1_face.hh b/milena/mln/world/kn/is_1_face.hh index f3bcdfb..bcd1742 100644 --- a/milena/mln/world/kn/is_1_face.hh +++ b/milena/mln/world/kn/is_1_face.hh @@ -31,7 +31,7 @@ # define MLN_WORLD_KN_IS_1_FACE_HH # include <mln/core/alias/point2d.hh> -# include <mln/world/kn/internal/face_dim.hh> +# include <mln/world/kn/face_dim.hh> namespace mln @@ -68,7 +68,7 @@ namespace mln bool is_1_face(const mln::def::coord& row, const mln::def::coord& col) { - return internal::face_dim(row, col) == 1; + return face_dim(row, col) == 1; } diff --git a/milena/mln/world/kn/is_2_face.hh b/milena/mln/world/kn/is_2_face.hh index e0a658c..2805b48 100644 --- a/milena/mln/world/kn/is_2_face.hh +++ b/milena/mln/world/kn/is_2_face.hh @@ -31,7 +31,7 @@ # define MLN_WORLD_KN_IS_2_FACE_HH # include <mln/core/alias/point2d.hh> -# include <mln/world/kn/internal/face_dim.hh> +# include <mln/world/kn/face_dim.hh> namespace mln @@ -66,7 +66,7 @@ namespace mln bool is_2_face(const mln::def::coord& row, const mln::def::coord& col) { - return internal::face_dim(row, col) == 2; + return face_dim(row, col) == 2; } # endif // ! MLN_INCLUDE_ONLY -- 1.7.2.5

12 years, 1 month

olena-2.0-154-g1e0a65a Move display_enlarged to kn.

by Guillaume Lazzara

* mln/world/k1/display_enlarged.hh, * tests/world/k1/display_enlarged.cc: Move... * mln/world/kn/display_enlarged.hh, * tests/world/kn/display_enlarged.cc: ... here. * tests/world/k1/Makefile.am, * tests/world/kn/Makefile.am: Update targets. --- milena/ChangeLog | 13 +++++ milena/mln/world/{k1 => kn}/display_enlarged.hh | 50 ++++++++++---------- milena/tests/world/k1/Makefile.am | 2 - milena/tests/world/kn/Makefile.am | 2 + milena/tests/world/{k1 => kn}/display_enlarged.cc | 12 ++--- 5 files changed, 44 insertions(+), 35 deletions(-) rename milena/mln/world/{k1 => kn}/display_enlarged.hh (74%) rename milena/tests/world/{k1 => kn}/display_enlarged.cc (90%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 04ceae2..bc3b35c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,18 @@ 2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + Move display_enlarged to kn. + + * mln/world/k1/display_enlarged.hh, + * tests/world/k1/display_enlarged.cc: Move... + + * mln/world/kn/display_enlarged.hh, + * tests/world/kn/display_enlarged.cc: ... here. + + * tests/world/k1/Makefile.am, + * tests/world/kn/Makefile.am: Update targets. + +2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix level comparisons. * mln/fun/v2b/compare.hh, diff --git a/milena/mln/world/k1/display_enlarged.hh b/milena/mln/world/kn/display_enlarged.hh similarity index 74% rename from milena/mln/world/k1/display_enlarged.hh rename to milena/mln/world/kn/display_enlarged.hh index fa437d4..5d1ef50 100644 --- a/milena/mln/world/k1/display_enlarged.hh +++ b/milena/mln/world/kn/display_enlarged.hh @@ -28,8 +28,8 @@ /// \brief Create a new image where 2 faces are enlarged for better /// visualization. -#ifndef MLN_WORLD_K1_DISPLAY_ENLARGED_HH -# define MLN_WORLD_K1_DISPLAY_ENLARGED_HH +#ifndef MLN_WORLD_KN_DISPLAY_ENLARGED_HH +# define MLN_WORLD_KN_DISPLAY_ENLARGED_HH # include <mln/core/alias/point2d.hh> # include <mln/world/kn/is_0_face.hh> @@ -45,7 +45,7 @@ namespace mln namespace world { - namespace k1 + namespace kn { /*! \brief Create a new image where 2 faces are enlarged for better @@ -64,7 +64,7 @@ namespace mln . - - - . - - - . \endverbatim - \param[in] ima_k1 A 2D image immersed in K1. + \param[in] ima_kn A 2D image immersed in KN. \param[in] zoom The number of times 2 faces must be duplicated (must be odd). @@ -75,7 +75,7 @@ namespace mln */ template <typename I> mln_concrete(I) - display_enlarged(const Image& ima_k1, unsigned zoom); + display_enlarged(const Image& ima_kn, unsigned zoom); # ifndef MLN_INCLUDE_ONLY @@ -85,30 +85,30 @@ namespace mln template <typename I> mln_concrete(I) - display_enlarged(const Image& ima_k1_, unsigned zoom_) + display_enlarged(const Image& ima_kn_, unsigned zoom_) { - trace::entering("mln::world::k1::display_enlarged"); + trace::entering("mln::world::kn::display_enlarged"); - mln_precondition(exact(ima_k1_).is_valid()); + mln_precondition(exact(ima_kn_).is_valid()); mln_assertion(zoom_ % 2); - const I& ima_k1 = exact(ima_k1_); + const I& ima_kn = exact(ima_kn_); int shift = zoom_ - 1; // No zoom: return original image. if (zoom_ == 1) - return ima_k1; + return ima_kn; - mln_concrete(I) output(make::box2d(ima_k1.domain().pmin().row() * shift, - ima_k1.domain().pmin().col() * shift, - ima_k1.domain().pmax().row() * shift, - ima_k1.domain().pmax().col() * shift)); + mln_concrete(I) output(make::box2d(ima_kn.domain().pmin().row() * shift, + ima_kn.domain().pmin().col() * shift, + ima_kn.domain().pmax().row() * shift, + ima_kn.domain().pmax().col() * shift)); const mln::def::coord - min_row = geom::min_row(ima_k1), - max_row = geom::max_row(ima_k1), - min_col = geom::min_col(ima_k1), - max_col = geom::max_col(ima_k1); + min_row = geom::min_row(ima_kn), + max_row = geom::max_row(ima_kn), + min_col = geom::min_col(ima_kn), + max_col = geom::max_col(ima_kn); for (mln::def::coord row = min_row; row <= max_row; ++row) { @@ -116,39 +116,39 @@ namespace mln { if (kn::is_0_face(row, col)) { - output.at_(row * shift, col * shift) = ima_k1.at_(row, col); + output.at_(row * shift, col * shift) = ima_kn.at_(row, col); } else if (kn::is_1_face_vertical(row, col)) { for (mln::def::coord j = -(shift - 1); j < (shift + 3); ++j) - output.at_(row * shift + j, col * shift) = ima_k1.at_(row, col); + output.at_(row * shift + j, col * shift) = ima_kn.at_(row, col); } else if (kn::is_1_face_horizontal(row, col)) { for (mln::def::coord j = -(shift - 1); j < (shift + 3); ++j) - output.at_(row * shift, col * shift + j) = ima_k1.at_(row, col); + output.at_(row * shift, col * shift + j) = ima_kn.at_(row, col); } else if (kn::is_2_face(row, col)) { for (mln::def::coord i = -(shift - 1); i < (shift + 3); ++i) for (mln::def::coord j = -(shift - 1); j < (shift + 3); ++j) - output.at_(row * shift + i, col * shift + j) = ima_k1.at_(row, col); + output.at_(row * shift + i, col * shift + j) = ima_kn.at_(row, col); } } } - trace::exiting("mln::world::k1::display_enlarged"); + trace::exiting("mln::world::kn::display_enlarged"); return output; } # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::world::k1 + } // end of namespace mln::world::kn } // end of namespace mln::world } // end of namespace mln -#endif // ! MLN_WORLD_K1_DISPLAY_ENLARGED_HH +#endif // ! MLN_WORLD_KN_DISPLAY_ENLARGED_HH diff --git a/milena/tests/world/k1/Makefile.am b/milena/tests/world/k1/Makefile.am index 3ff9c81..3c1e29c 100644 --- a/milena/tests/world/k1/Makefile.am +++ b/milena/tests/world/k1/Makefile.am @@ -17,7 +17,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - display_enlarged \ fill_0_from_1_faces \ fill_1_from_2_faces \ fill_0_from_primary_faces \ @@ -29,7 +28,6 @@ check_PROGRAMS = \ is_primary_face \ un_immerse -display_enlarged_SOURCES = display_enlarged.cc fill_0_from_1_faces_SOURCES = fill_0_from_1_faces.cc fill_1_from_2_faces_SOURCES = fill_1_from_2_faces.cc fill_0_from_primary_faces_SOURCES = fill_0_from_primary_faces.cc diff --git a/milena/tests/world/kn/Makefile.am b/milena/tests/world/kn/Makefile.am index d7d2fbe..9a52eb6 100644 --- a/milena/tests/world/kn/Makefile.am +++ b/milena/tests/world/kn/Makefile.am @@ -21,6 +21,7 @@ SUBDIRS = \ border check_PROGRAMS = \ + display_enlarged \ fill_0_1_faces_internal_border \ fill_0_from_1_faces \ fill_0_from_2_faces \ @@ -41,6 +42,7 @@ check_PROGRAMS = \ saturate \ un_immerse +display_enlarged_SOURCES = display_enlarged.cc fill_0_1_faces_internal_border_SOURCES = fill_0_1_faces_internal_border.cc fill_0_from_1_faces_SOURCES = fill_0_from_1_faces.cc fill_0_from_2_faces_SOURCES = fill_0_from_2_faces.cc diff --git a/milena/tests/world/k1/display_enlarged.cc b/milena/tests/world/kn/display_enlarged.cc similarity index 90% rename from milena/tests/world/k1/display_enlarged.cc rename to milena/tests/world/kn/display_enlarged.cc index 3365fbe..33b5909 100644 --- a/milena/tests/world/k1/display_enlarged.cc +++ b/milena/tests/world/kn/display_enlarged.cc @@ -26,13 +26,9 @@ /// \file #include <mln/core/image/image2d.hh> -#include <mln/world/k1/display_enlarged.hh> -#include <mln/world/k1/immerse.hh> -#include <mln/make/box2d.hh> +#include <mln/world/kn/display_enlarged.hh> #include <mln/data/compare.hh> -#include <mln/debug/println.hh> - int main() { using namespace mln; @@ -80,19 +76,19 @@ int main() image2d<int> ima = make::image(vals, point2d(-1, -1)); { - image2d<int> enlarged = world::k1::display_enlarged(ima, 1); + image2d<int> enlarged = world::kn::display_enlarged(ima, 1); mln_assertion(ima == enlarged); } { image2d<int> ref3 = make::image(vals3, point2d(-2, -2)); - image2d<int> enlarged = world::k1::display_enlarged(ima, 3); + image2d<int> enlarged = world::kn::display_enlarged(ima, 3); mln_assertion(ref3 == enlarged); } { image2d<int> ref5 = make::image(vals5, point2d(-4, -4)); - image2d<int> enlarged = world::k1::display_enlarged(ima, 5); + image2d<int> enlarged = world::kn::display_enlarged(ima, 5); mln_assertion(ref5 == enlarged); } } -- 1.7.2.5

12 years, 1 month

olena-2.0-153-g91eebc5 Fix level comparisons.

by Guillaume Lazzara

* mln/fun/v2b/compare.hh, * mln/fun/v2b/threshold_ge.hh, * mln/fun/v2b/threshold_gt.hh, * mln/fun/v2b/threshold_le.hh, * mln/fun/v2b/threshold_lt.hh: Generalize these functors. * mln/world/kn/level.hh: Do not pass the equivalent value to the functor. * tests/world/kn/level.cc: Fix test using intervals instead of int. --- milena/ChangeLog | 16 ++++++++++++++++ milena/mln/fun/v2b/compare.hh | 17 +++++++++-------- milena/mln/fun/v2b/threshold_ge.hh | 22 +++++++++++----------- milena/mln/fun/v2b/threshold_gt.hh | 20 +++++++++++--------- milena/mln/fun/v2b/threshold_le.hh | 21 ++++++++++----------- milena/mln/fun/v2b/threshold_lt.hh | 17 +++++++++-------- milena/mln/world/kn/level.hh | 15 ++++++++++----- milena/tests/world/kn/level.cc | 9 ++++++--- 8 files changed, 82 insertions(+), 55 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index dcfadaf..04ceae2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,21 @@ 2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix level comparisons. + + * mln/fun/v2b/compare.hh, + * mln/fun/v2b/threshold_ge.hh, + * mln/fun/v2b/threshold_gt.hh, + * mln/fun/v2b/threshold_le.hh, + * mln/fun/v2b/threshold_lt.hh: Generalize these functors. + + * mln/world/kn/level.hh: Do not pass the equivalent value to the + functor. + + * tests/world/kn/level.cc: Fix test using intervals instead of + int. + +2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + More safe cast overloads. * mln/world/kn/safe_cast.hh: New overloads. diff --git a/milena/mln/fun/v2b/compare.hh b/milena/mln/fun/v2b/compare.hh index 22f5d88..de17eb6 100644 --- a/milena/mln/fun/v2b/compare.hh +++ b/milena/mln/fun/v2b/compare.hh @@ -44,30 +44,31 @@ namespace mln /// Comparison function. /// f(v) = (v == ref). - template <typename V> - struct compare : public Function_v2b< compare<V> > + template <typename V, typename T = V> + struct compare : public Function_v2b< compare<V,T> > { typedef bool result; + compare(const T& a); + bool operator()(const V& v) const; - compare(const V& a); - V a; + T a; }; # ifndef MLN_INCLUDE_ONLY - template <typename V> + template <typename V, typename T> inline - compare<V>::compare(const V& a) + compare<V,T>::compare(const T& a) : a(a) { } - template <typename V> + template <typename V, typename T> inline bool - compare<V>::operator()(const V& v) const + compare<V,T>::operator()(const V& v) const { return v == a; } diff --git a/milena/mln/fun/v2b/threshold_ge.hh b/milena/mln/fun/v2b/threshold_ge.hh index c5fef9e..7820d44 100644 --- a/milena/mln/fun/v2b/threshold_ge.hh +++ b/milena/mln/fun/v2b/threshold_ge.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Copyright (C) 2008, 2009, 2011, 2012 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -45,30 +45,30 @@ namespace mln /// Threshold function. /// f(v) = (v >= threshold). - template <typename V> - struct threshold_ge : public Function_v2b< threshold_ge<V> > + template <typename V, typename T = V> + struct threshold_ge : public Function_v2b< threshold_ge<V,T> > { typedef bool result; + + threshold_ge(const T& a); + bool operator()(const V& v) const; - threshold_ge(const V& a); - V a; + T a; }; # ifndef MLN_INCLUDE_ONLY - template <typename V> - inline - threshold_ge<V>::threshold_ge(const V& a) + template <typename V, typename T> + threshold_ge<V,T>::threshold_ge(const T& a) : a(a) { } - template <typename V> - inline + template <typename V, typename T> bool - threshold_ge<V>::operator()(const V& v) const + threshold_ge<V,T>::operator()(const V& v) const { // Here the test seems to be inversed compared to the usual // use. Indeed, we want to preserve the following convention: diff --git a/milena/mln/fun/v2b/threshold_gt.hh b/milena/mln/fun/v2b/threshold_gt.hh index 05edd97..a5744e0 100644 --- a/milena/mln/fun/v2b/threshold_gt.hh +++ b/milena/mln/fun/v2b/threshold_gt.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Copyright (C) 2008, 2009, 2011, 2012 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -45,30 +45,32 @@ namespace mln /// Threshold function. /// f(v) = (v > threshold). - template <typename V> - struct threshold_gt : public Function_v2b< threshold_gt<V> > + template <typename V, typename T = V> + struct threshold_gt : public Function_v2b< threshold_gt<V,T> > { typedef bool result; + + threshold_gt(const T& a); + bool operator()(const V& v) const; - threshold_gt(const V& a); - V a; + T a; }; # ifndef MLN_INCLUDE_ONLY - template <typename V> + template <typename V, typename T> inline - threshold_gt<V>::threshold_gt(const V& a) + threshold_gt<V,T>::threshold_gt(const T& a) : a(a) { } - template <typename V> + template <typename V, typename T> inline bool - threshold_gt<V>::operator()(const V& v) const + threshold_gt<V,T>::operator()(const V& v) const { // Here the test seems to be inversed compared to the usual // use. Indeed, we want to preserve the following convention: diff --git a/milena/mln/fun/v2b/threshold_le.hh b/milena/mln/fun/v2b/threshold_le.hh index 21964c8..698d2be 100644 --- a/milena/mln/fun/v2b/threshold_le.hh +++ b/milena/mln/fun/v2b/threshold_le.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Copyright (C) 2008, 2009, 2011, 2012 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -45,30 +45,29 @@ namespace mln /// Threshold function. /// f(v) = (v <= threshold). - template <typename V> - struct threshold_le : public Function_v2b< threshold_le<V> > + template <typename V, typename T = V> + struct threshold_le : public Function_v2b< threshold_le<V,T> > { typedef bool result; + threshold_le(const T& a); + bool operator()(const V& v) const; - threshold_le(const V& a); - V a; + T a; }; # ifndef MLN_INCLUDE_ONLY - template <typename V> - inline - threshold_le<V>::threshold_le(const V& a) + template <typename V, typename T> + threshold_le<V,T>::threshold_le(const T& a) : a(a) { } - template <typename V> - inline + template <typename V, typename T> bool - threshold_le<V>::operator()(const V& v) const + threshold_le<V,T>::operator()(const V& v) const { // Here the test seems to be inversed compared to the usual // use. Indeed, we want to preserve the following convention: diff --git a/milena/mln/fun/v2b/threshold_lt.hh b/milena/mln/fun/v2b/threshold_lt.hh index dd82305..d12ca5b 100644 --- a/milena/mln/fun/v2b/threshold_lt.hh +++ b/milena/mln/fun/v2b/threshold_lt.hh @@ -44,30 +44,31 @@ namespace mln /// Threshold function. /// f(v) = (v < threshold). - template <typename V> - struct threshold_lt : public Function_v2b< threshold_lt<V> > + template <typename V, typename T = V> + struct threshold_lt : public Function_v2b< threshold_lt<V,T> > { typedef bool result; + threshold_lt(const T& a); + bool operator()(const V& v) const; - threshold_lt(const V& a); - V a; + T a; }; # ifndef MLN_INCLUDE_ONLY - template <typename V> + template <typename V, typename T> inline - threshold_lt<V>::threshold_lt(const V& a) + threshold_lt<V,T>::threshold_lt(const T& a) : a(a) { } - template <typename V> + template <typename V, typename T> inline bool - threshold_lt<V>::operator()(const V& v) const + threshold_lt<V,T>::operator()(const V& v) const { // Here the test seems to be inversed compared to the usual // use. Indeed, we want to preserve the following convention: diff --git a/milena/mln/world/kn/level.hh b/milena/mln/world/kn/level.hh index eabba44..8c5f700 100644 --- a/milena/mln/world/kn/level.hh +++ b/milena/mln/world/kn/level.hh @@ -195,35 +195,40 @@ namespace mln mln_ch_value(I,bool) operator<(const Image& ima, const world::kn::level_t& v) { - return data::transform(ima, fun::v2b::threshold_lt<mln_value(I)>(v.value)); + typedef world::kn::level_t T; + return data::transform(ima, fun::v2b::threshold_lt<mln_value(I),T>(v)); } template <typename I, typename U> mln_ch_value(I,bool) operator<=(const Image& ima, const world::kn::level_t& v) { - return data::transform(ima, fun::v2b::threshold_le<mln_value(I)>(v.value)); + typedef world::kn::level_t T; + return data::transform(ima, fun::v2b::threshold_le<mln_value(I),T>(v)); } template <typename I, typename U> mln_ch_value(I,bool) operator>(const Image& ima, const world::kn::level_t& v) { - return data::transform(ima, fun::v2b::threshold_gt<mln_value(I)>(v.value)); + typedef world::kn::level_t T; + return data::transform(ima, fun::v2b::threshold_gt<mln_value(I),T>(v)); } template <typename I, typename U> mln_ch_value(I,bool) operator>=(const Image& ima, const world::kn::level_t& v) { - return data::transform(ima, fun::v2b::threshold_ge<mln_value(I)>(v.value)); + typedef world::kn::level_t T; + return data::transform(ima, fun::v2b::threshold_ge<mln_value(I),T>(v)); } template <typename I, typename U> mln_ch_value(I,bool) operator==(const Image& ima, const world::kn::level_t& v) { - return data::transform(ima, fun::v2b::compare<mln_value(I)>(v.value)); + typedef world::kn::level_t T; + return data::transform(ima, fun::v2b::compare<mln_value(I),T>(v)); } # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/tests/world/kn/level.cc b/milena/tests/world/kn/level.cc index 9f902a3..55ab5b4 100644 --- a/milena/tests/world/kn/level.cc +++ b/milena/tests/world/kn/level.cc @@ -24,13 +24,13 @@ // executable file might be covered by the GNU General Public License. #include <mln/core/image/image2d.hh> -#include <mln/debug/iota.hh> #include <mln/world/kn/level.hh> #include <mln/data/compare.hh> #include <mln/make/image2d.hh> #include <mln/value/interval.hh> #include <mln/value/intsub.hh> + int main () { using namespace mln; @@ -74,8 +74,11 @@ int main () image2d<bool> ref_ge = make::image2d(vref_ge); - image2d<unsigned> ima(5,5); - debug::iota(ima); + int i = 0; + image2d<value::interval<int> > ima(5,5); + mln_piter_(image2d<value::interval<int> >) p(ima.domain()); + for_all(p) + ima(p) = ++i; // Comparison with images { -- 1.7.2.5

12 years, 1 month

olena-2.0-152-ge08e17f More safe cast overloads.

by Guillaume Lazzara

* mln/world/kn/safe_cast.hh: New overloads. * tests/world/kn/Makefile.am: New target. * tests/world/kn/safe_cast.cc: New. --- milena/ChangeLog | 10 ++ milena/mln/world/kn/safe_cast.hh | 112 ++++++++++++++++---- milena/tests/world/kn/Makefile.am | 2 + milena/tests/world/kn/safe_cast.cc | 209 ++++++++++++++++++++++++++++++++++++ 4 files changed, 314 insertions(+), 19 deletions(-) create mode 100644 milena/tests/world/kn/safe_cast.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 9c34521..dcfadaf 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + More safe cast overloads. + + * mln/world/kn/safe_cast.hh: New overloads. + + * tests/world/kn/Makefile.am: New target. + + * tests/world/kn/safe_cast.cc: New. + +2012-10-29 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/world/kn/fill_0_from_1_faces.hh: Add an overload with functions. diff --git a/milena/mln/world/kn/safe_cast.hh b/milena/mln/world/kn/safe_cast.hh index d4e4f5c..39309cd 100644 --- a/milena/mln/world/kn/safe_cast.hh +++ b/milena/mln/world/kn/safe_cast.hh @@ -31,7 +31,7 @@ #ifndef MLN_WORLD_KN_SAFE_CAST_HH # define MLN_WORLD_KN_SAFE_CAST_HH -# include <mln/value/int_u8.hh> +# include <mln/value/int_u.hh> # include <mln/value/intsub.hh> # include <mln/value/interval.hh> @@ -62,48 +62,85 @@ namespace mln namespace value { - template <unsigned n> - void safe_cast_(const int_u8& from, intsub<n>& to) + template <unsigned m, unsigned n> + void safe_cast_(const int_u<m>& from, intsub<n>& to) { - to = from.to_equiv(); + to = from.to_interop(); } - template <unsigned n> - void safe_cast_(const int_u8& from, interval<intsub<n> >& to) + template <unsigned m, unsigned n> + void safe_cast_(const int_u<m>& from, interval<intsub<n> >& to) { to = intsub<n>(from.to_interop()); } - inline - void safe_cast_(const int_u8& from, interval<int_u8>& to) + template <unsigned m> + void safe_cast_(const int_u<m>& from, interval<int_u<m> >& to) + { + to = from; + } + + template <unsigned m> + void safe_cast_(const int_u<m>& from, interval<int>& to) { to = from; } - inline - void safe_cast_(const int_u8& from, int& to) + template <unsigned m> + void safe_cast_(const int_u<m>& from, int& to) { to = from.to_interop(); } + void safe_cast_(const interval<int>& from, int& to) + { + if (!from.is_degenerated()) + std::abort(); + to = from.first(); + } + + template <unsigned m> + void safe_cast_(const interval<int>& from, int_u<m>& to) + { + if (!from.is_degenerated()) + std::abort(); + to = from.first(); + } + template <unsigned n> - void safe_cast_(const interval<intsub<n> >& from, int_u8& to) + void safe_cast_(const interval<int>& from, intsub<n>& to) + { + if (!from.is_degenerated()) + std::abort(); + to = from.first(); + } + + template <unsigned n, unsigned m> + void safe_cast_(const interval<intsub<n> >& from, int_u<m>& to) { if (!from.is_degenerated()) std::abort(); to = intsub<n>(from.first()); } - inline - void safe_cast_(const interval<int_u8>& from, int_u8& to) + template <unsigned m> + void safe_cast_(const interval<int_u<m> >& from, int_u<m>& to) { if (!from.is_degenerated()) std::abort(); to = from.first(); } - template <unsigned n> - void safe_cast_(const interval<int_u8>& from, intsub<n>& to) + template <unsigned m, unsigned n> + void safe_cast_(const interval<int_u<m> >& from, intsub<n>& to) + { + if (!from.is_degenerated()) + std::abort(); + to = from.first().to_interop(); + } + + template <unsigned m> + void safe_cast_(const interval<int_u<m> >& from, int& to) { if (!from.is_degenerated()) std::abort(); @@ -132,13 +169,25 @@ namespace mln to = interval<intsub<n> >(from); } - inline - void safe_cast_(const int& from, int_u8& to) + void safe_cast_(const int& from, interval<int>& to) + { + to = interval<int>(from); + } + + template <unsigned m> + void safe_cast_(const int& from, int_u<m>& to) { to = from; } template <unsigned n> + void safe_cast_(const int& from, intsub<n>& to) + { + to = from; + } + + + template <unsigned n> void safe_cast_(const intsub<n>& from, intsub<2*n>& to) { to = static_cast<intsub<2*n> >(from.to_int()); @@ -150,12 +199,37 @@ namespace mln to = static_cast<intsub<n/2> >(from.to_int()); } - template <unsigned n> - void safe_cast_(const intsub<n>& from, int_u8& to) + template <unsigned n, unsigned m> + void safe_cast_(const intsub<n>& from, int_u<m>& to) { to = from.to_interop(); } + template <unsigned n> + void safe_cast_(const intsub<n>& from, int& to) + { + to = from; + } + + template <unsigned n, unsigned m> + void safe_cast_(const intsub<n>& from, interval<int_u<m> >& to) + { + to = interval<int_u<m> >(from.to_interop()); + } + + template <unsigned n> + void safe_cast_(const intsub<n>& from, interval<int>& to) + { + to = interval<int>(from.to_interop()); + } + + template <unsigned n> + void safe_cast_(const intsub<n>& from, interval<intsub<n> >& to) + { + to = interval<intsub<n> >(from); + } + + } // end of namespace mln::value diff --git a/milena/tests/world/kn/Makefile.am b/milena/tests/world/kn/Makefile.am index 84b0b2f..d7d2fbe 100644 --- a/milena/tests/world/kn/Makefile.am +++ b/milena/tests/world/kn/Makefile.am @@ -37,6 +37,7 @@ check_PROGRAMS = \ is_1_face_horizontal \ is_2_face \ level \ + safe_cast \ saturate \ un_immerse @@ -56,6 +57,7 @@ is_1_face_vertical_SOURCES = is_1_face_vertical.cc is_1_face_horizontal_SOURCES = is_1_face_horizontal.cc is_2_face_SOURCES = is_2_face.cc level_SOURCES = level.cc +safe_cast_SOURCES = safe_cast.cc saturate_SOURCES = saturate.cc un_immerse_SOURCES = un_immerse.cc diff --git a/milena/tests/world/kn/safe_cast.cc b/milena/tests/world/kn/safe_cast.cc new file mode 100644 index 0000000..7c5be20 --- /dev/null +++ b/milena/tests/world/kn/safe_cast.cc @@ -0,0 +1,209 @@ +// 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 + +#include <mln/value/int_u8.hh> +#include <mln/value/interval.hh> +#include <mln/value/intsub.hh> +#include <mln/world/kn/safe_cast.hh> + +int main() +{ + using namespace mln; + using namespace mln::value; + using namespace mln::world; + + // int -> int_u<8> + { + int i = 2; + int_u<8> j = kn::safe_cast_to<int_u<8> >(i); + mln_assertion(j == 2); + } + + // int -> intsub<2> + { + int i = 2; + intsub<2> j = kn::safe_cast_to<intsub<2> >(i); + mln_assertion(j == 2); + } + + + // int_u<8> -> int + { + int_u<8> i = 2; + int j = kn::safe_cast_to<int>(i); + mln_assertion(j == 2); + } + + // int_u<8> -> intsub<2> + { + int_u<8> i = 2; + intsub<2> j = kn::safe_cast_to<intsub<2> >(i); + mln_assertion(j == 2); + } + + // intsub<2> -> int + { + intsub<2> i = 2; + int j = kn::safe_cast_to<int>(i); + mln_assertion(j == 2); + } + + // intsub<2> -> int_u<8> + { + intsub<2> i = 2; + int_u<8> j = kn::safe_cast_to<int_u<8> >(i); + mln_assertion(j == 2); + } + + // int -> interval<int> + { + int i = 2; + interval<int> j = kn::safe_cast_to<interval<int> >(i); + mln_assertion(j.is_degenerated() && j.first() == 2); + } + + // int_u -> interval<int> + { + int_u<8> i = 2; + interval<int> j = kn::safe_cast_to<interval<int> >(i); + mln_assertion(j.is_degenerated() && j.first() == 2); + } + + // int_u -> interval<int> + { + intsub<2> i = 2; + interval<int> j = kn::safe_cast_to<interval<int> >(i); + mln_assertion(j.is_degenerated() && j.first() == 2); + } + + // int -> interval<int_u<8> > + { + int i = 2; + interval<int_u<8> > j = kn::safe_cast_to<interval<int_u<8> > >(i); + mln_assertion(j.is_degenerated() && j.first() == 2); + } + + // int_u<8> -> interval<int_u<8> > + { + int_u<8> i = 2; + interval<int_u<8> > j = kn::safe_cast_to<interval<int_u<8> > >(i); + mln_assertion(j.is_degenerated() && j.first() == 2); + } + + // intsub<2> -> interval<int_u<8> > + { + intsub<2> i = 2; + interval<int_u<8> > j = kn::safe_cast_to<interval<int_u<8> > >(i); + mln_assertion(j.is_degenerated() && j.first() == 2); + } + + + // int -> interval<intsub<2> > + { + int i = 2; + interval<intsub<2> > j = kn::safe_cast_to<interval<intsub<2> > >(i); + mln_assertion(j.is_degenerated() && j.first() == 2); + } + + // int_u<8> -> interval<intsub<2> > + { + int_u<8> i = 2; + interval<intsub<2> > j = kn::safe_cast_to<interval<intsub<2> > >(i); + mln_assertion(j.is_degenerated() && j.first() == 2); + } + + // intsub<2> -> interval<intsub<2> > + { + intsub<2> i = 2; + interval<intsub<2> > j = kn::safe_cast_to<interval<intsub<2> > >(i); + mln_assertion(j.is_degenerated() && j.first() == 2); + } + + // interval<int> -> int + { + interval<int> i(2,2); + int j = kn::safe_cast_to<int>(i); + mln_assertion(j == 2); + } + + // interval<int> -> int_u<8> + { + interval<int> i(2,2); + int_u<8> j = kn::safe_cast_to<int_u<8> >(i); + mln_assertion(j == 2); + } + + // interval<int> -> int_sub<2> + { + interval<int> i(2,2); + intsub<2> j = kn::safe_cast_to<intsub<2> >(i); + mln_assertion(j == 2); + } + + // interval<int_u<8> > -> int + { + interval<int_u<8> > i(2,2); + int j = kn::safe_cast_to<int>(i); + mln_assertion(j == 2); + } + + // interval<int_u<8> > -> int_u<8> + { + interval<int_u<8> > i(2,2); + int_u<8> j = kn::safe_cast_to<int_u<8> >(i); + mln_assertion(j == 2); + } + + // interval<int_u<8> > -> int_sub<2> + { + interval<int_u<8> > i(2,2); + intsub<2> j = kn::safe_cast_to<intsub<2> >(i); + mln_assertion(j == 2); + } + + // interval<intsub<2> > -> int + { + interval<intsub<2> > i(2,2); + int j = kn::safe_cast_to<int>(i); + mln_assertion(j == 2); + } + + // interval<intsub<2> > -> int_u<8> + { + interval<intsub<2> > i(2,2); + int_u<8> j = kn::safe_cast_to<int_u<8> >(i); + mln_assertion(j == 2); + } + + // interval<intsub<2> > -> int_sub<2> + { + interval<intsub<2> > i(2,2); + intsub<2> j = kn::safe_cast_to<intsub<2> >(i); + mln_assertion(j == 2); + } + +} -- 1.7.2.5

12 years, 1 month

← Newer
1
2
3
4
5
6
7
8
9
...
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