URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-02-09 Fabien Freling <freling@lrde.epita.fr> Implement fastest versions of labeling. * fabien/flat_zones.hh: Implement fastest version. * fabien/level.hh: Fix. --- flat_zones.hh | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ level.hh | 2 2 files changed, 141 insertions(+), 2 deletions(-) Index: trunk/milena/sandbox/fabien/flat_zones.hh =================================================================== --- trunk/milena/sandbox/fabien/flat_zones.hh (revision 0) +++ trunk/milena/sandbox/fabien/flat_zones.hh (revision 3318) @@ -0,0 +1,141 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library 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 this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library 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_LABELING_FLAT_ZONES_HH +# define MLN_LABELING_FLAT_ZONES_HH + +/// \file mln/labeling/flat_zones.hh +/// +/// Connected component labeling of the flat zones of an image. + +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/canvas/labeling.hh> + + +namespace mln +{ + + namespace labeling + { + + /// Connected component labeling of the flat zones of an image. + /// + /// \param[in] input The input image. + /// \param[in] nbh The connexity of the flat zones. + /// \param[out] nlabels The number of labels. + /// \return The label image. + /// + template <typename I, typename N, typename L> + mln_ch_value(I, L) + flat_zones(const Image<I>& input, const Neighborhood<N>& nbh, L& nlabels); + + + +# ifndef MLN_INCLUDE_ONLY + + namespace impl + { + + // Flat zone functor for the labeling canvas. + + template <typename I> + struct flat_zones_functor + { + typedef mln_psite(I) P; + + // Requirements from mln::canvas::labeling: + + typedef mln_pset(I) S; + + const I& input; + + // Generic implementation. + + void init() {} + bool handles(const P&) const { return true; } + bool equiv(const P& n, const P& p) const { return input(n) == + input(p); } + bool labels(const P&) const { return true; } + void do_no_union(const P&, const P&) {} + void init_attr(const P&) {} + void merge_attr(const P&, const P&) {} + + // Fastest implementation. + + void init_() {} + bool handles_(unsigned) const { return true; } + bool equiv_(unsigned n, unsigned p) const { return input.element(n) == + input.element(p); } + bool labels_(unsigned) const { return true; } + void do_no_union_(unsigned, unsigned) {} + void init_attr_(unsigned) {} + void merge_attr_(unsigned, unsigned) {} + + // end of requirements. + + flat_zones_functor(const I& input, const N& nbh) + : input(input) + {} + }; + + + } // end of namespace mln::labeling::impl + + + + // Facade. + + template <typename I, typename N, typename L> + mln_ch_value(I, L) + flat_zones(const Image<I>& input_, const Neighborhood<N>& nbh_, + L& nlabels) + { + trace::entering("labeling::flat_zones"); + + const I& input = exact(input_); + const N& nbh = exact(nbh_); + mln_precondition(input.is_valid()); + + // Calls the only implementation. + typedef flat_zones_functor<I,N,L> F; + F f(exact(input), exact(nbh)); + mln_ch_value(I, L) output = canvas::labeling_video(input, nbh, nlabels, f); + + trace::exiting("labeling::flat_zones"); + return output; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::labeling + +} // end of namespace mln + + +#endif // ! MLN_LABELING_FLAT_ZONES_HH Index: trunk/milena/sandbox/fabien/level.hh =================================================================== --- trunk/milena/sandbox/fabien/level.hh (revision 3317) +++ trunk/milena/sandbox/fabien/level.hh (revision 3318) @@ -90,8 +90,6 @@ - // Generic implementation. - namespace impl {