[Olena-patches] 4683: Small fixes.

* mln/accu/count_labels.hh, * mln/labeling/relabel.hh: Disable preconditions related to Symbolic value types. * mln/data/compare.hh: Pass variable with exact type. * mln/geom/max_sli.hh, * mln/geom/min_sli.hh: Use geom::bbox. * mln/io/plot/save.hh: Rename template parameter. * mln/util/set.hh: Reindent header. --- milena/ChangeLog | 17 +++++++++++++++++ milena/mln/accu/count_labels.hh | 4 ++-- milena/mln/data/compare.hh | 2 +- milena/mln/geom/max_sli.hh | 3 ++- milena/mln/geom/min_sli.hh | 3 ++- milena/mln/io/plot/save.hh | 8 ++++---- milena/mln/labeling/relabel.hh | 8 ++++---- milena/mln/util/set.hh | 3 ++- 8 files changed, 34 insertions(+), 14 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8896a5f..6d1aa08 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,22 @@ 2009-10-28 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Small fixes. + + * mln/accu/count_labels.hh, + * mln/labeling/relabel.hh: Disable preconditions related to + Symbolic value types. + + * mln/data/compare.hh: Pass variable with exact type. + + * mln/geom/max_sli.hh, + * mln/geom/min_sli.hh: Use geom::bbox. + + * mln/io/plot/save.hh: Rename template parameter. + + * mln/util/set.hh: Reindent header. + +2009-10-28 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + Add data::wrap. * mln/data/wrap.hh: New. diff --git a/milena/mln/accu/count_labels.hh b/milena/mln/accu/count_labels.hh index 7a24766..07c48b2 100644 --- a/milena/mln/accu/count_labels.hh +++ b/milena/mln/accu/count_labels.hh @@ -50,8 +50,8 @@ namespace mln // template <typename L> struct count_labels - : public mln::accu::internal::base< unsigned , count_labels<L> >, - mlc_is_a(L, mln::value::Symbolic)::check_t + : public mln::accu::internal::base< unsigned , count_labels<L> > + // mlc_is_a(L, mln::value::Symbolic)::check_t { typedef L argument; diff --git a/milena/mln/data/compare.hh b/milena/mln/data/compare.hh index 30ea9ce..8a55739 100644 --- a/milena/mln/data/compare.hh +++ b/milena/mln/data/compare.hh @@ -95,7 +95,7 @@ namespace mln mln_precondition(lhs.domain() == rhs.domain()); typedef fun::vv2b::eq<mln_value(L), mln_value(R)> F; - bool res = test::predicate(lhs_, rhs_, F()); + bool res = test::predicate(lhs, rhs, F()); trace::exiting("data::compare (==)"); return res; diff --git a/milena/mln/geom/max_sli.hh b/milena/mln/geom/max_sli.hh index c016cbc..b0c541c 100644 --- a/milena/mln/geom/max_sli.hh +++ b/milena/mln/geom/max_sli.hh @@ -32,6 +32,7 @@ # include <mln/core/concept/image.hh> +# include <mln/geom/bbox.hh> namespace mln { @@ -53,7 +54,7 @@ namespace mln trace::entering("mln::geom::max_sli"); mln_precondition(exact(ima).is_valid()); - mln_deduce(I, site, coord) maxsli = exact(ima).bbox().pmax().sli(); + mln_deduce(I, site, coord) maxsli = geom::bbox(ima).pmax().sli(); trace::exiting("mln::geom::max_sli"); return maxsli; diff --git a/milena/mln/geom/min_sli.hh b/milena/mln/geom/min_sli.hh index ecd8857..7b07a8c 100644 --- a/milena/mln/geom/min_sli.hh +++ b/milena/mln/geom/min_sli.hh @@ -32,6 +32,7 @@ # include <mln/core/concept/image.hh> +# include <mln/geom/bbox.hh> namespace mln { @@ -53,7 +54,7 @@ namespace mln trace::entering("mln::geom::min_sli"); mln_precondition(exact(ima).is_valid()); - mln_deduce(I, site, coord) minsli = exact(ima).bbox().pmin().sli(); + mln_deduce(I, site, coord) minsli = geom::bbox(ima).pmin().sli(); trace::exiting("mln::geom::min_sli"); return minsli; diff --git a/milena/mln/io/plot/save.hh b/milena/mln/io/plot/save.hh index 1a01267..8010afa 100644 --- a/milena/mln/io/plot/save.hh +++ b/milena/mln/io/plot/save.hh @@ -57,8 +57,8 @@ namespace mln \param[out] filename The output file. \param[in] start_value The start index value of the plot (optional). */ - template <typename I> - void save(util::array<I>& arr, + template <typename T> + void save(util::array<T>& arr, const std::string& filename, int start_value = 0); @@ -82,9 +82,9 @@ namespace mln trace::exiting("mln::io::plot::save"); } - template <typename I> + template <typename T> inline - void save(const util::array<I>& arr, const std::string& filename, + void save(const util::array<T>& arr, const std::string& filename, int start_value = 0) { trace::entering("mln::io::plot::save"); diff --git a/milena/mln/labeling/relabel.hh b/milena/mln/labeling/relabel.hh index b8ebc12..dfb35fb 100644 --- a/milena/mln/labeling/relabel.hh +++ b/milena/mln/labeling/relabel.hh @@ -120,7 +120,7 @@ namespace mln mln_value(I)& new_nlabels) { // FIXME: we may want to check that it is exactly a label. - mlc_is_a(mln_value(I), mln::value::Symbolic)::check(); +// mlc_is_a(mln_value(I), mln::value::Symbolic)::check(); mln_precondition(exact(label).is_valid()); (void) label; (void) new_nlabels; @@ -134,7 +134,7 @@ namespace mln const Function<F>& f) { // FIXME: we may want to check that it is exactly a label. - mlc_is_a(mln_value(I), mln::value::Symbolic)::check(); +// mlc_is_a(mln_value(I), mln::value::Symbolic)::check(); mln_precondition(exact(label).is_valid()); (void) label; (void) nlabels; @@ -149,7 +149,7 @@ namespace mln const Function<F>& f) { // FIXME: we may want to check that it is exactly a label. - mlc_is_a(mln_value(I), mln::value::Symbolic)::check(); +// mlc_is_a(mln_value(I), mln::value::Symbolic)::check(); mln_precondition(exact(label).is_valid()); (void) label; (void) nlabels; @@ -164,7 +164,7 @@ namespace mln const Function<F>& f) { // FIXME: we may want to check that it is exactly a label. - mlc_is_a(mln_value(I), mln::value::Symbolic)::check(); +// mlc_is_a(mln_value(I), mln::value::Symbolic)::check(); mln_precondition(exact(label).is_valid()); (void) label; (void) nlabels; diff --git a/milena/mln/util/set.hh b/milena/mln/util/set.hh index 29c6ea6..d9e91e2 100644 --- a/milena/mln/util/set.hh +++ b/milena/mln/util/set.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // -- 1.5.6.5