[Olena-patches] 3255: De-activate fastest versions of algebraic impl.

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud &lt;thierry.geraud(a)lrde.epita.fr&gt; De-activate fastest versions of algebraic impl. * mln/morpho/closing_attribute.hh: De-activate fastest version. * mln/canvas/morpho/algebraic_union_find.hh: Likewise. * mln/morpho/elementary/gradient.hh (p_out): Fix type. canvas/morpho/algebraic_union_find.hh | 8 ++++++-- morpho/closing_attribute.hh | 6 +++++- morpho/elementary/gradient.hh | 5 +++-- 3 files changed, 14 insertions(+), 5 deletions(-) Index: mln/morpho/elementary/gradient.hh --- mln/morpho/elementary/gradient.hh (revision 3254) +++ mln/morpho/elementary/gradient.hh (working copy) @@ -160,11 +160,12 @@ accu::min_max<mln_value(I)> a; extension::adjust_duplicate(input, nbh); - mln_concrete(I) output; + typedef mln_concrete(I) O; + O output; initialize(output, input); mln_pixter(const I) p_in(input); - mln_pixter(I) p_out(output); + mln_pixter(O) p_out(output); mln_nixter(const I, N) n(p_in, nbh); for_all_2(p_in, p_out) { Index: mln/morpho/closing_attribute.hh --- mln/morpho/closing_attribute.hh (revision 3254) +++ mln/morpho/closing_attribute.hh (working copy) @@ -36,6 +36,9 @@ /// \todo How to pass dynamic data (e.g., k of accu::rank) to the routine? /// /// \todo Add extension::adjust_fill. +/// +/// \todo Re-activate the fastest version when accumulators are +/// cleaned-up. # include <mln/morpho/includes.hh> # include <mln/canvas/morpho/algebraic_union_find.hh> @@ -223,7 +226,8 @@ const Image<I>& input, const Neighborhood<N>& nbh, mln_result(A) lambda) { - return impl::closing_attribute_fastest<A>(input, nbh, lambda); + return impl::generic::closing_attribute<A>(input, nbh, lambda); +// return impl::closing_attribute_fastest<A>(input, nbh, lambda); } template <typename A, typename I, typename N> Index: mln/canvas/morpho/algebraic_union_find.hh --- mln/canvas/morpho/algebraic_union_find.hh (revision 3254) +++ mln/canvas/morpho/algebraic_union_find.hh (working copy) @@ -31,7 +31,10 @@ /// \file mln/canvas/morpho/algebraic_union_find.hh /// -/// FIXME: Doc! +/// \todo: Doc! +/// +/// \todo Re-activate the fastest version when accumulators are +/// cleaned-up. # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> @@ -352,7 +355,8 @@ const Neighborhood<N>& nbh, F& f) { - return impl::algebraic_union_find_fastest(input, nbh, f); + return impl::generic::algebraic_union_find(input, nbh, f); +// return impl::algebraic_union_find_fastest(input, nbh, f); } template <typename I, typename N, typename F>