Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

2091: Add image conversion to p_array.

by Ugo Jardonnet

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Add image conversion to p_array. * mln/convert/to_p_array.hh (to_p_array): Add. to_p_array.hh | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) Index: mln/convert/to_p_array.hh --- mln/convert/to_p_array.hh (revision 2091) +++ mln/convert/to_p_array.hh (working copy) @@ -52,6 +52,11 @@ p_array<mln_psite(W)> to_p_array(const Window<W>& win, const mln_psite(W)& p); + /// Convert an image \p img into a p_array. + template <typename I> + p_array<mln_point(I)> + to_p_array(const Image& img); + # ifndef MLN_INCLUDE_ONLY @@ -83,6 +88,23 @@ return v; } + template <typename I> + inline + p_array<mln_point(I)> + to_p_array(const Image& img_) + { + const I& img = exact(img_); + + p_array<mln_point(I)> a; + + mln_piter(I) p(img.domain()); + for_all(p) + if (img(p)) + a.append(p); + + return a; + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::convert

16 years, 6 months

2091: Fix conflict in point.hh.

by Ugo Jardonnet

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Fix conflict in point.hh. * mln/core/point.hh (operator algebra::vec<M,float>: Fail if point coordinate type is already float. point.hh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) Index: mln/core/point.hh --- mln/core/point.hh (revision 2090) +++ mln/core/point.hh (working copy) @@ -38,6 +38,7 @@ # include <mln/fun/i2v/all_to.hh> # include <mln/metal/bool.hh> +# include <mln/metal/is_not.hh> # include <mln/algebra/vec.hh> # include <mln/metal/converts_to.hh> # include <mln/core/h_vec.hh> @@ -62,7 +63,7 @@ template <typename M, typename C> struct point_to_ { - typedef algebra::vec<M::dim, C> metal_vec; + typedef algebra::vec<M::dim, C> algebra_vec; typedef mln::h_vec<M::dim, C> h_vec; }; @@ -146,7 +147,7 @@ typedef algebra::vec<M::dim, C> vec_t; /// Hook to coordinates. - operator typename internal::point_to_<M, C>::metal_vec () const; + operator typename internal::point_to_<M, C>::algebra_vec () const; operator algebra::vec<M::dim, float> () const; /// Transform to point in homogene coordinate system. @@ -303,19 +304,22 @@ return *this; } + template <typename M, typename C> inline - point_<M,C>::operator typename internal::point_to_<M, C>::metal_vec () const + point_<M,C>::operator typename internal::point_to_<M, C>::algebra_vec () const { return coord_; // FIXME: Is-it OK? } + template <typename M, typename C> inline point_<M,C>::operator algebra::vec<M::dim, float> () const { + mlc_is_not(C,float)::check(); algebra::vec<dim, float> tmp; - for (unsigned i = 0; i < dim; ++i) + for (unsigned int i = 0; i < dim; ++i) tmp[i] = coord_[i]; return tmp; }

16 years, 6 months

2090: Add matrix trace and transposition.

by Ugo Jardonnet

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Add matrix trace and transposition. * mln/algebra/mat.hh (transpose,trace): Add. mat.hh | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) Index: mln/algebra/mat.hh --- mln/algebra/mat.hh (revision 2089) +++ mln/algebra/mat.hh (working copy) @@ -256,6 +256,16 @@ std::ostream& operator<<(std::ostream& ostr, const mat<n,m,T>& v); + // transpose + + template<unsigned n, unsigned m, typename T> + mat<m,n,T> + trans(const mat<n,m,T>& matrix); + + // trace + + template<unsigned n, typename T> inline + float tr(const mat<n,n,T>& m); # ifndef MLN_INCLUDE_ONLY @@ -489,6 +499,27 @@ return ostr; } + + template<unsigned n, unsigned m, typename T> + mat<m,n,T> + trans(const mat<n,m,T>& matrix) + { + mat<m,n,T> tmp; + for (unsigned i = 0; i < n; ++i) + for (unsigned j = 0; j < m; ++j) + tmp(j,i) = matrix(i,j); + return tmp; + } + + template<unsigned n, typename T> inline + float tr(const mat<n,n,T>& m) + { + float f = 0.f; + for (unsigned i = 0; i < n; ++i) + f += m(i,i); + return f; + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::algebra

16 years, 6 months

2089: Fix a first bug in the watershed.

by Alexandre Abraham

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> Fix a first bug in the watershed. * abraham/tests/morpho/test_watershed.cc: . * abraham/tests/morpho/Makefile: remove Werror. * abraham/mln/morpho/basic_najman.hh: fix bug. mln/morpho/basic_najman.hh | 123 +++++++++++++++++++++++++++++------------ tests/morpho/Makefile | 2 tests/morpho/test_watershed.cc | 4 - 3 files changed, 92 insertions(+), 37 deletions(-) Index: abraham/tests/morpho/test_watershed.cc --- abraham/tests/morpho/test_watershed.cc (revision 2088) +++ abraham/tests/morpho/test_watershed.cc (working copy) @@ -22,9 +22,9 @@ // #define TEST - // io::pgm::load(input, "./images/test_watershed.pgm"); + io::pgm::load(input, "./images/test_watershed.pgm"); // io::pgm::load(input, "./images/little_test.pgm"); - io::pgm::load(input, "./images/test_2.pgm"); + // io::pgm::load(input, "./images/test_2.pgm"); // io::pgm::load(input, "./images/lena_light.pgm"); // io::pgm::load(mverif, "./images/result_m_watershed.pgm"); Index: abraham/tests/morpho/Makefile --- abraham/tests/morpho/Makefile (revision 2088) +++ abraham/tests/morpho/Makefile (working copy) @@ -2,7 +2,7 @@ OBJ=$(SRC:.cc=.o) EXEC=$(SRC:.cc=) CC=g++ -CXXFLAGS=-Wall -W -Werror -I ../../ -I ../../../../ -g +CXXFLAGS=-Wall -W -I ../../ -I ../../../../ -g all: $(EXEC) Index: abraham/mln/morpho/basic_najman.hh --- abraham/mln/morpho/basic_najman.hh (revision 2088) +++ abraham/mln/morpho/basic_najman.hh (working copy) @@ -113,14 +113,14 @@ // Priority function for the second wateshed template <typename I> - class lesser_psite + class lower_psite { public: typedef mln_psite(I) psite; - lesser_psite(const Image& ima); + lower_psite(const Image& ima); - /// Is \a x lesser than \a y? + /// Is \a x lower than \a y? bool operator()(const psite& x, const psite& y); private: @@ -128,31 +128,31 @@ }; template <typename I> - lesser_psite - make_lesser_psite(const Image& ima); + lower_psite + make_lower_psite(const Image& ima); # ifndef MLN_INCLUDE_ONLY template <typename I> - lesser_psite::lesser_psite(const Image& ima) + lower_psite::lower_psite(const Image& ima) : ima_ (exact(ima)) { } template <typename I> bool - lesser_psite::operator()(const mln_psite(I)& x, const mln_psite(I)& y) + lower_psite::operator()(const mln_psite(I)& x, const mln_psite(I)& y) { return ima_(x) < ima_(y); } template <typename I> - lesser_psite - make_lesser_psite(const Image& ima) + lower_psite + make_lower_psite(const Image& ima) { - return lesser_psite(ima); + return lower_psite(ima); } # endif // ! MLN_INCLUDE_ONLY @@ -160,16 +160,16 @@ template <typename I, typename N, typename B> - class my_lesser_psite + class my_lower_psite { public: typedef mln_psite(I) psite; - my_lesser_psite(const Image& ima, + my_lower_psite(const Image& ima, const Neighborhood<N>& nbh, const Image& enqueued); - /// Is \a x lesser than \a y? + /// Is \a x lower than \a y? bool operator()(const psite& x, const psite& y); private: @@ -180,8 +180,8 @@ template <typename I, typename N, typename B> - my_lesser_psite<I, N, B> - make_my_lesser_psite(const Image& ima, + my_lower_psite<I, N, B> + make_my_lower_psite(const Image& ima, const Neighborhood<N>& nbh, const Image& enqueued); @@ -189,7 +189,7 @@ # ifndef MLN_INCLUDE_ONLY template <typename I, typename N, typename B> - my_lesser_psite<I, N, B>::my_lesser_psite(const Image& ima, + my_lower_psite<I, N, B>::my_lower_psite(const Image& ima, const Neighborhood<N>& nbh, const Image& enqueued) : ima_ (exact(ima)), nbh_(exact(nbh)), enqueued_(exact(enqueued)) @@ -198,7 +198,7 @@ template <typename I, typename N, typename B> bool - my_lesser_psite<I, N, B>::operator()(const mln_psite(I)& x, const mln_psite(I)& y) + my_lower_psite<I, N, B>::operator()(const mln_psite(I)& x, const mln_psite(I)& y) { #if 0 @@ -269,12 +269,12 @@ template <typename I, typename N, typename B> - my_lesser_psite<I, N, B> - make_my_lesser_psite(const Image& ima, + my_lower_psite<I, N, B> + make_my_lower_psite(const Image& ima, const Neighborhood<N>& nbh, const Image& enqueued) { - return my_lesser_psite<I, N, B>(ima, nbh, enqueued); + return my_lower_psite<I, N, B>(ima, nbh, enqueued); } # endif // ! MLN_INCLUDE_ONLY @@ -576,6 +576,7 @@ psite adjCanonicalElt = Find_tree(q); psite adjNode = Find_node(subtreeRoot(adjCanonicalElt)); if (curNode != adjNode) + { if (nodes(curNode).level == nodes(adjNode).level) curNode = MergeNode(adjNode, curNode); else @@ -584,6 +585,7 @@ nodes(curNode).area += nodes(adjNode).area; nodes(curNode).highest += nodes(adjNode).highest; } + } curCanonicalElt = Link_tree(adjCanonicalElt, curCanonicalElt); subtreeRoot(curCanonicalElt) = curNode; @@ -884,7 +886,11 @@ return psite(-1, -1); if (v.npoints() == 1) + { + if (nodes(v[0]).children.npoints() == 1) + std::cout << "SINGL QUI MERDE" << std::endl; return v[0]; + } psite c = max(v), @@ -905,6 +911,47 @@ if (nodes(c).level <= pima(p)) return psite(-1, -1); + if (nodes(c).children.npoints() == 1) + std::cout << "LCA QUI MERDE" << std::endl; + + return c; + } + + + psite w_constructible_slow(psite p) + { + mln_niter(N) q(nbh, p); + p_set<psite> v; + + for_all(q) + if (pima.has(q) && pima(q) > pima(p)) + v.insert(Par_node(q)); + + if (v.npoints() == 0) + return psite(-1, -1); + + if (v.npoints() == 1) + return v[0]; + + psite + c = max(v), + cmax = c; + + typename p_set<psite>::fwd_piter it(v); + for_all(it) + { + // Can't remove the point from the set + if (it.to_point() == cmax) + continue; + + psite c1 = lca(c, it.to_point()); + if (c1 != it.to_point()) + c = c1; + } + + if (nodes(c).level <= pima(p)) + return psite(-1, -1); + return c; } @@ -1154,6 +1201,10 @@ enqueued(x) = false; psite c = w_constructible(x); + // psite d = w_constructible_slow(x); + + //if (c != d) + // std::cerr << "COUILLE AVEC LE LCA : " << x << " donne " << c << " au lieu de " << d << std::endl; if (c != psite(-1, -1)) @@ -1169,7 +1220,10 @@ { } else + { std::cerr << "ERREUR COMPOSANTE BRANCHE " << nodes(c).children.npoints() << std::endl; + } + mln_niter(N) q(nbh, x); for_all(q) @@ -1216,7 +1270,7 @@ repr[position] = p; depth[position] = d; euler[position] = pos[p]; - position++; + ++position; node& n = nodes(p); typename p_array<mln_psite(I)>::fwd_piter it(n.children); @@ -1225,7 +1279,8 @@ build_euler_tour_rec(it.to_point(), position, d+1); depth[position] = d; // Not optimized euler[position] = pos[p]; - position++; + repr[position] = p; // Pas necessaire? + ++position; } } @@ -1265,7 +1320,7 @@ Minim[0][i] = i+1; } - Minim[0][size - 1] = size - 1; + // Minim[0][size - 1] = size - 1; int k; for (int j = 1; j < logn; j++) { @@ -1273,7 +1328,7 @@ Minim[j] = &minim[j * size]; for (int i = 0; i < size; i++) { if ((i + (k << 1)) >= size) { - Minim[j][i] = size - 1; + //Minim[j][i] = size - 1; } else { if (depth[euler[Minim[j - 1][i]]] <= depth[euler[Minim[j - 1][i + k]]])

16 years, 6 months

Add config/ directory

by yabo

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-06-26 Maxime van Noppen <yabo(a)lrde.epita.fr> Add the config/ directory * config/Makefile.am: New. * config: New. Makefile.am | 15 +++++++++++++++ 1 file changed, 15 insertions(+) Index: branches/scool-ng/config/Makefile.am =================================================================== --- branches/scool-ng/config/Makefile.am (revision 0) +++ branches/scool-ng/config/Makefile.am (revision 64) @@ -0,0 +1,15 @@ +MAINTAINERCLEANFILES = \ + Makefile.in \ + $(STANDARD_TOOLS) + +STANDARD_TOOLS = \ + install-sh \ + missing \ + mkinstalldirs \ + depcomp + +EXTRA_DIST = \ + Makefile.xt \ + autoxt.m4 + +bootclean: -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

16 years, 6 months

***SPAM*** L1 cleanup-2008 2088: Start cleaning up level::fill.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Start cleaning up level::fill. * tests/level/fill_with_value.cc: New. * tests/level/Makefile.am: Update. * mln/level/fill_with_image.hh: New. * mln/level/fill.hh (generic): Remove. (fill): Use fill_with_value and fill_with_image. * mln/level/fill.spe.hh: Deactivate obsolete contents. * mln/level/fill_with_value.hh: New. mln/level/fill.hh | 70 +++---------- mln/level/fill.spe.hh | 33 ------ mln/level/fill_with_image.hh | 128 ++++++++++++++++++++++++ mln/level/fill_with_value.hh | 211 +++++++++++++++++++++++++++++++++++++++++ tests/level/Makefile.am | 2 tests/level/fill_with_value.cc | 48 +++++++++ 6 files changed, 406 insertions(+), 86 deletions(-) Index: tests/level/fill_with_value.cc --- tests/level/fill_with_value.cc (revision 0) +++ tests/level/fill_with_value.cc (revision 0) @@ -0,0 +1,48 @@ +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// +// 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. + +/*! \file tests/level/fill_with_value.cc + * + * \brief Tests on mln::level::fill_with_value + */ + +#include <mln/core/image2d.hh> +#include <mln/level/fill_with_value.hh> + + +int main() +{ + using namespace mln; + + const unsigned size = 100; + + image2d<unsigned char> ima(size, size); + level::fill_with_value(ima, 51); + box2d::piter p(ima.domain()); + for_all(p) + mln_assertion(ima(p) == 51); +} Index: tests/level/Makefile.am --- tests/level/Makefile.am (revision 2087) +++ tests/level/Makefile.am (working copy) @@ -12,6 +12,7 @@ compare \ compute \ fill \ + fill_with_value \ median \ median_dir \ median_fast \ @@ -34,6 +35,7 @@ compare_SOURCES = compare.cc compute_SOURCES = compute.cc fill_SOURCES = fill.cc +fill_with_value_SOURCES = fill_with_value.cc median_SOURCES = median.cc median_dir_SOURCES = median_dir.cc median_fast_SOURCES = median_fast.cc Index: mln/level/fill_with_image.hh --- mln/level/fill_with_image.hh (revision 0) +++ mln/level/fill_with_image.hh (revision 0) @@ -0,0 +1,128 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory +// +// 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_LEVEL_FILL_WITH_IMAGE_HH +# define MLN_LEVEL_FILL_WITH_IMAGE_HH + +/*! \file mln/level/fill_with_image.hh + * + * \brief Fill an image with the values from another image. + * + * \todo Specialize with line_piter... + */ + +# include <mln/core/concept/image.hh> +# include <mln/core/inplace.hh> + + +namespace mln +{ + + namespace level + { + + /*! Fill the image \p ima with the values of the image \p data. + * + * \param[in,out] ima The image to be filled. + * \param[in] data The image. + * + * \warning The definition domain of \p ima has to be included in + * the one of \p data. + * + * \pre \p ima.domain <= \p data.domain. + */ + template <typename I, typename J> + void fill_with_image(Image& ima, const Image<J>& data); + + + +# ifndef MLN_INCLUDE_ONLY + + namespace impl + { + + namespace generic + { + + template <typename I, typename J> + inline + void fill_with_image(I& ima, const J& data) + { + trace::entering("level::impl::generic::fill_with_image"); + + mln_piter(I) p(ima.domain()); + for_all(p) + ima(p) = data(p); + + trace::exiting("level::impl::generic::fill_with_image"); + } + + } // end if namespace mln::level::impl::generic + + + // Selector. + + template <typename I, typename J> + inline + void fill_with_image_(I& ima, const J& data) + { + generic::fill_with_image(ima, data); + } + + } // end of namespace mln::level::impl + + + + /// Facade. + + template <typename I, typename J> + inline + void fill_with_image(Image& ima_, const Image<J>& data_) + { + trace::entering("level::fill_with_image"); + + mlc_is(mln_trait_image_value_io(I), + mln::trait::image::value_io::read_write)::check(); + mlc_converts_to(mln_value(J), mln_value(I))::check(); + + I& ima = exact(ima_); + const J& data = exact(data_); + mln_precondition(ima.domain() <= data.domain()); + + impl::fill_with_image_(ima, data); + + trace::exiting("level::fill_with_image"); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::level + +} // end of namespace mln + + +#endif // ! MLN_LEVEL_FILL_WITH_IMAGE_HH Index: mln/level/fill.hh --- mln/level/fill.hh (revision 2087) +++ mln/level/fill.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -35,16 +35,14 @@ * \todo Re-organize this file contents + Overload for fastest images. */ -# include <cstring> - -# include <mln/core/concept/image.hh> # include <mln/core/concept/function.hh> -# include <mln/core/inplace.hh> -# include <mln/level/memset_.hh> +# include <mln/level/fill_with_value.hh> +# include <mln/level/fill_with_image.hh> // Specializations are in: -# include <mln/level/fill.spe.hh> +// # include <mln/level/fill.spe.hh> + namespace mln { @@ -55,7 +53,7 @@ /*! Fill the whole image \p ima with the single value \p v. * * \param[in,out] ima The image to be filled. - * \param[in] v The value to assign to all pixels. + * \param[in] v The value to assign to all sites. * * \pre \p ima has to be initialized. * @@ -132,44 +130,27 @@ # ifndef MLN_INCLUDE_ONLY - namespace impl - { - namespace generic - { + // With: value + template <typename I> inline - void fill_with_value(I& ima, const mln_value(I)& value) + void fill(Image& ima, const mln_value(I)& value) { - trace::entering("level::impl::generic::fill_with_value"); - - mln_piter(I) p(ima.domain()); - for_all(p) - ima(p) = value; - - trace::exiting("level::impl::generic::fill_with_value"); + trace::entering("level::fill"); + fill_with_value(ima, value); + trace::exiting("level::fill"); } - } // end if namespace mln::level::impl::generic - - } // end of namespace mln::level::impl - + // with: Image<J> - // with: value - - template <typename I> + template <typename I, typename J> inline - void fill(Image& ima, const mln_value(I)& value) + void fill(Image& ima, const Image<J>& data) { trace::entering("level::fill"); - - mlc_is(mln_trait_image_value_io(I), - trait::image::value_io::read_write)::check(); // FIXME: Only the upcoming general facade!!! - mln_precondition(exact(ima).has_data()); - impl::fill_with_value(mln_trait_image_speed(I)(), exact(ima), - value); - + fill_with_image(ima, data); trace::exiting("level::fill"); } @@ -233,25 +214,6 @@ } - // with: Image<J> - - template <typename I, typename J> - inline - void fill(Image& ima_, const Image<J>& data_) - { - trace::entering("level::fill"); - - I& ima = exact(ima_); - const J& data = exact(data_); - mln_precondition(ima.domain() <= data.domain()); - - mln_piter(I) p(ima.domain()); - for_all(p) - ima(p) = data(p); - - trace::exiting("level::fill"); - } - # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::level Index: mln/level/fill.spe.hh --- mln/level/fill.spe.hh (revision 2087) +++ mln/level/fill.spe.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -43,7 +43,6 @@ # include <mln/core/concept/image.hh> # include <mln/core/concept/function.hh> # include <mln/core/inplace.hh> -# include <mln/level/memset_.hh> # ifndef MLN_INCLUDE_ONLY @@ -57,36 +56,6 @@ namespace impl { - namespace generic - { - template <typename I> - void fill_with_value(I& ima, const mln_value(I)& value); - } - - - // Disjunction. - - - template <typename I> - inline - void fill_with_value(trait::image::speed::any, I& ima, - const mln_value(I)& value) - { - generic::fill_with_value(ima, value); - } - - template <typename I> - inline - void fill_with_value(trait::image::speed::fastest, I& ima, - const mln_value(I)& value) - { - trace::entering("level::impl::fill_with_value"); - - level::memset_(ima, ima.point_at_offset(0), value, ima.ncells()); - - trace::exiting("level::impl::fill_with_value"); - } - } // end of namespace mln::level::impl Index: mln/level/fill_with_value.hh --- mln/level/fill_with_value.hh (revision 0) +++ mln/level/fill_with_value.hh (revision 0) @@ -0,0 +1,211 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory +// +// 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_LEVEL_FILL_WITH_VALUE_HH +# define MLN_LEVEL_FILL_WITH_VALUE_HH + +/*! \file mln/level/fill_with_value.hh + * + * \brief Fill an image with a value, that is, set all pixel values to + * the given value. + * + * \todo Overload for fastest images. + * \todo Handle all value_storage properties (piecewise, etc.) + * \todo Make memset_ work and use it when appropriate. + * \todo Move specializations in a extra file. + * \toto Activate fill_with_value_cell_wise. + */ + +# include <mln/core/concept/image.hh> +# include <mln/core/inplace.hh> + + +namespace mln +{ + + namespace level + { + + /*! Fill the whole image \p ima with the single value \p v. + * + * \param[in,out] ima The image to be filled. + * \param[in] val The value to assign to all sites. + * + * \pre \p ima has to be initialized. + * + * \todo Optimize when \p ima is large and sizeof(mln_value(I)) > 1. + */ + template <typename I, typename V> + void fill_with_value(Image& ima, const V& val); + + + +# ifndef MLN_INCLUDE_ONLY + + namespace impl + { + + template <typename I> + inline + void fill_with_value_site_wise_any(I& ima, const mln_value(I)& val) + { + trace::entering("level::impl::fill_with_value_site_wise_any"); + + mln_piter(I) p(ima.domain()); + for_all(p) + ima(p) = val; + + trace::exiting("level::impl::fill_with_value_site_wise_any"); + } + + + template <typename I, typename V> + inline + void fill_with_value_site_wise_one_block(I& ima, const V& val) + { + trace::entering("level::impl::fill_with_value_site_wise_one_block"); + + // level::memset_(ima, ima.point_at_index(0), v, ima.nelements()); + const unsigned n = ima.nelements(); + mln_value(I)* ptr = ima.buffer(); + for (unsigned i = 0; i < n; ++i) + *ptr++ = val; + + trace::exiting("level::impl::fill_with_value_site_wise_one_block"); + } + + + template <typename I, typename V> + inline + void fill_with_value_cell_wise(I& ima, const V& val) + { + trace::entering("level::impl::fill_with_value_cell_wise"); + + abort(); +// mln_viter(I) v(ima.values()); +// for_all(v) +// v.change_to(val); + + trace::exiting("level::impl::fill_with_value_cell_wise"); + } + + + namespace dispatch + { + + // Cases for "value_browsing == site_wise_only" w.r.t. value_storage. + + template <typename I, typename V> + inline + void fill_with_value_site_wise_(mln::trait::image::value_storage::any, + I& ima, const V& val) + { + fill_with_value_site_wise_any(ima, val); + } + + template <typename I, typename V> + inline + void fill_with_value_site_wise_(mln::trait::image::value_storage::one_block, + I& ima, const V& val) + { + fill_with_value_site_wise_one_block(ima, val); + } + + // Case site_wise -> selector w.r.t. value_storage. + + template <typename I, typename V> + inline + void fill_with_value_site_wise(I& ima, const V& val) + { + fill_with_value_site_wise_(mln_trait_image_value_storage(I)(), + ima, val); + } + + + // Cases w.r.t. value_browsing. + + template <typename I, typename V> + inline + void fill_with_value_(mln::trait::image::value_browsing::site_wise_only, + I& ima, const V& val) + { + fill_with_value_site_wise(ima, val); + } + + template <typename I, typename V> + inline + void fill_with_value_(mln::trait::image::value_browsing::cell_wise, + I& ima, const V& val) + { + fill_with_value_cell_wise(ima, val); + } + + // Selector w.r.t. value_browsing. + + template <typename I, typename V> + inline + void fill_with_value_(I& ima, const V& val) + { + fill_with_value_(mln_trait_image_value_browsing(I)(), + ima, val); + } + + } // end of namespace mln::level::impl::dispatch + + } // end of namespace mln::level::impl + + + + /// Facade. + + template <typename I, typename V> + inline + void fill_with_value(Image& ima, const V& val) + { + trace::entering("level::fill"); + + mlc_is(mln_trait_image_value_io(I), + mln::trait::image::value_io::read_write)::check(); + mlc_converts_to(V, mln_value(I))::check(); + + mln_precondition(exact(ima).has_data()); + + impl::dispatch::fill_with_value_(exact(ima), exact(val)); + + trace::exiting("level::fill"); + } + + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::level + +} // end of namespace mln + + +#endif // ! MLN_LEVEL_FILL_WITH_VALUE_HH

16 years, 6 months

***SPAM*** L3 cleanup-2008 2087: Rename the methods of fastest images.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Rename the methods of fastest images. * mln/core/internal/check/image_fastest.hh (offset_at, offset, point_at_offset: Rename as... (index_of_point, delta_index, point_at_index): ...these. (operator[], ncells): Rename as... (element, nelements): ...these. (size_t): Replace by... (unsigned): ...this to handle indices. * mln/core/image2d.hh: Likewise. (super_): New. (nrows, ncols): New. Layout. * mln/level/paste.spe.hh: Update with new properties. * mln/level/paste.hh: Likewise. * mln/border/get.hh: Likewise. * mln/border/resize.hh: Revamp. * tests/core/image2d.cc: Update. Make tests silent. mln/border/get.hh | 9 + mln/border/resize.hh | 78 +++++++++++++--- mln/core/image2d.hh | 151 ++++++++++++++++++++----------- mln/core/internal/check/image_fastest.hh | 24 ++-- mln/level/paste.hh | 6 - mln/level/paste.spe.hh | 12 +- tests/core/image2d.cc | 18 ++- 7 files changed, 202 insertions(+), 96 deletions(-) Index: tests/core/image2d.cc --- tests/core/image2d.cc (revision 2086) +++ tests/core/image2d.cc (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -45,18 +45,22 @@ const unsigned nrows = 1; const unsigned ncols = 66; const unsigned border = 4; + const unsigned new_border = 3; image2d<int> f(nrows, ncols, border); + mln_assertion(f.nrows() == nrows); + mln_assertion(f.ncols() == ncols); + { - std::cout << f.id_() << std::endl; + const void* f_id = f.id_(); image2d<int> g; - std::cout << g.id_() << std::endl; + mln_assertion(g.id_() == 0); g = f; - // border::resize (g, 2); - std::cout << g.id_() << std::endl; + border::resize(g, new_border); + mln_assertion(g.id_() == f_id); } - mln_assertion(f.npoints() == geom::nrows(f) * geom::ncols(f)); - mln_assertion(f.ncells() == (nrows + 2 * border) * (ncols + 2 * border)); + mln_assertion(f.nsites() == geom::nrows(f) * geom::ncols(f)); + mln_assertion(f.nelements() == (nrows + 2 * new_border) * (ncols + 2 * new_border)); } Index: mln/core/internal/check/image_fastest.hh --- mln/core/internal/check/image_fastest.hh (revision 2086) +++ mln/core/internal/check/image_fastest.hh (working copy) @@ -64,8 +64,8 @@ * \post p == point_at_offset(result) */ template <typename P> - std::size_t - offset_at(const P& p) const; + unsigned + index_of_point(const P& p) const; protected: image_fastest_(); @@ -93,9 +93,9 @@ typedef mln_fwd_pixter(E) fwd_pixter; typedef mln_bkd_pixter(E) bkd_pixter; - int (E::*m1)(const dpsite&) const = & E::offset; + int (E::*m1)(const dpsite&) const = & E::delta_index; m1 = 0; - site (E::*m2)(unsigned) const = & E::point_at_offset; + site (E::*m2)(unsigned) const = & E::point_at_index; m2 = 0; unsigned (E::*m3)() const = & E::border; m3 = 0; @@ -110,12 +110,12 @@ typedef mln_rvalue(E) rvalue; typedef mln_lvalue(E) lvalue; - rvalue (E::*m6)(unsigned) const = & E::operator[]; + rvalue (E::*m6)(unsigned) const = & E::element; m6 = 0; - lvalue (E::*m7)(unsigned) = & E::operator[]; + lvalue (E::*m7)(unsigned) = & E::element; m7 = 0; - std::size_t (E::*m8)() const = & E::ncells; + unsigned (E::*m8)() const = & E::nelements; m8 = 0; // FIXME: how to check that qixter are defined when W is unknown! @@ -124,16 +124,16 @@ template <typename E, typename B> template <typename P> inline - std::size_t - image_fastest_<E,B>::offset_at(const P& p) const + unsigned + image_fastest_<E,B>::index_of_point(const P& p) const { const E* this_ = & internal::force_exact<E>(*this); mln_precondition(this_->has_data()); mln_precondition(this_->has(p)); - unsigned o = & this_->operator()(p) - this_->buffer(); - mln_postcondition(p == this_->point_at_offset(o)); - return o; + unsigned i = & this_->operator()(p) - this_->buffer(); + mln_postcondition(p == this_->point_at_index(i)); + return i; } # endif // ! MLN_INCLUDE_ONLY Index: mln/core/image2d.hh --- mln/core/image2d.hh (revision 2086) +++ mln/core/image2d.hh (working copy) @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// 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 @@ -120,8 +121,11 @@ * thickness around data. */ template <typename T> - struct image2d : public internal::image_primary< box2d, image2d<T> > + class image2d : public internal::image_primary< box2d, image2d<T> > { + typedef internal::image_primary< box2d, image2d<T> > super_; + public: + /// Coordinate associated type. typedef int coord; @@ -171,23 +175,15 @@ /// Give the bounding box domain. const box2d& bbox() const; - /// Give the border thickness. - unsigned border() const; - - /// Give the number of cells (points including border ones). - std::size_t ncells() const; - /// Read-only access to the image value located at point \p p. const T& operator()(const point2d& p) const; /// Read-write access to the image value located at point \p p. T& operator()(const point2d& p); - /// Read-only access to the image value located at offset \p o. - const T& operator[](unsigned o) const; - /// Read-write access to the image value located at offset \p o. - T& operator[](unsigned o); + // Specific methods: + // ----------------- /// Read-only access to the image value located at (\p row, \p col). const T& at(int row, int col) const; @@ -195,14 +191,36 @@ /// Read-write access to the image value located at (\p row, \p col). T& at(int row, int col); + /// Give the number of rows. + unsigned nrows() const; + + /// Give the number of columns. + unsigned ncols() const; + + + // As a fastest image: + // ------------------- + + // Give the index of a point. + using super_::index_of_point; + + /// Give the border thickness. + unsigned border() const; + + /// Give the number of elements (points including border ones). + unsigned nelements() const; - /// Fast Image method + /// Read-only access to the image value located at index \p i. + const T& element(unsigned i) const; - /// Give the offset corresponding to the delta-point \p dp. - int offset(const dpoint2d& dp) const; + /// Read-write access to the image value located at index \p i. + T& element(unsigned i); - /// Give the point corresponding to the offset \p o. - point2d point_at_offset(unsigned o) const; + /// Give the delta-index corresponding to the delta-point \p dp. + int delta_index(const dpoint2d& dp) const; + + /// Give the point corresponding to the index \p i. + point2d point_at_index(unsigned i) const; /// Give a hook to the value buffer. const T* buffer() const; @@ -403,24 +421,6 @@ template <typename T> inline - unsigned - image2d<T>::border() const - { - mln_precondition(this->has_data()); - return this->data_->bdr_; - } - - template <typename T> - inline - std::size_t - image2d<T>::ncells() const - { - mln_precondition(this->has_data()); - return this->data_->vb_.nsites(); - } - - template <typename T> - inline bool image2d<T>::has(const point2d& p) const { @@ -446,40 +446,82 @@ return this->data_->array_[p.row()][p.col()]; } + + // Specific methods: + template <typename T> inline const T& - image2d<T>::operator[](unsigned o) const + image2d<T>::at(int row, int col) const { - mln_precondition(o < ncells()); - return *(this->data_->buffer_ + o); + mln_precondition(this->has(make::point2d(row, col))); + return this->data_->array_[row][col]; } template <typename T> inline T& - image2d<T>::operator[](unsigned o) + image2d<T>::at(int row, int col) { - mln_precondition(o < ncells()); - return *(this->data_->buffer_ + o); + mln_precondition(this->has(make::point2d(row, col))); + return this->data_->array_[row][col]; + } + + template <typename T> + inline + unsigned + image2d<T>::nrows() const + { + mln_precondition(this->has_data()); + return this->data_->b_.len(0); + } + + template <typename T> + inline + unsigned + image2d<T>::ncols() const + { + mln_precondition(this->has_data()); + return this->data_->b_.len(1); + } + + + // As a fastest image: + + template <typename T> + inline + unsigned + image2d<T>::border() const + { + mln_precondition(this->has_data()); + return this->data_->bdr_; + } + + template <typename T> + inline + unsigned + image2d<T>::nelements() const + { + mln_precondition(this->has_data()); + return this->data_->vb_.nsites(); } template <typename T> inline const T& - image2d<T>::at(int row, int col) const + image2d<T>::element(unsigned i) const { - mln_precondition(this->has(make::point2d(row, col))); - return this->data_->array_[row][col]; + mln_precondition(i < nelements()); + return *(this->data_->buffer_ + i); } template <typename T> inline T& - image2d<T>::at(int row, int col) + image2d<T>::element(unsigned i) { - mln_precondition(this->has(make::point2d(row, col))); - return this->data_->array_[row][col]; + mln_precondition(i < nelements()); + return *(this->data_->buffer_ + i); } template <typename T> @@ -503,7 +545,7 @@ template <typename T> inline int - image2d<T>::offset(const dpoint2d& dp) const + image2d<T>::delta_index(const dpoint2d& dp) const { mln_precondition(this->has_data()); int o = dp[0] * this->data_->vb_.len(1) + dp[1]; @@ -513,20 +555,23 @@ template <typename T> inline point2d - image2d<T>::point_at_offset(unsigned o) const + image2d<T>::point_at_index(unsigned i) const { - mln_precondition(o < ncells()); - point2d p = make::point2d(o / this->data_->vb_.len(1) + this->data_->vb_.min_row(), - o % this->data_->vb_.len(1) + this->data_->vb_.min_col()); - mln_postcondition(& this->operator()(p) == this->data_->buffer_ + o); + mln_precondition(i < nelements()); + point2d p = make::point2d(i / this->data_->vb_.len(1) + this->data_->vb_.min_row(), + i % this->data_->vb_.len(1) + this->data_->vb_.min_col()); + mln_postcondition(& this->operator()(p) == this->data_->buffer_ + i); return p; } + // Extra. + template <typename T> inline void image2d<T>::resize_(unsigned new_border) { + mln_precondition(this->has_data()); this->data_->reallocate_(new_border); } Index: mln/level/paste.spe.hh --- mln/level/paste.spe.hh (revision 2086) +++ mln/level/paste.spe.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -31,6 +31,8 @@ /*! \file mln/level/paste.spe.hh * * \brief Specializations for mln::level::paste. + * + * \todo Rewrite the dispatch!!! */ # ifndef MLN_LEVEL_PASTE_HH @@ -84,16 +86,16 @@ template <typename I, typename J> inline - void paste_(trait::image::data::any, const I& data, - trait::image::data::any, J& destination) + void paste_(trait::image::value_storage::any, const I& data, + trait::image::value_storage::any, J& destination) { generic::paste_(data, destination); } template <typename I, typename J> inline - void paste_(trait::image::data::raw, const I& data, - trait::image::data::raw, J& destination) + void paste_(trait::image::value_storage::one_block, const I& data, + trait::image::value_storage::one_block, J& destination) { if (sizeof(mln_value(I)) == sizeof(mln_value(J))) paste_lines_(data, destination); Index: mln/level/paste.hh --- mln/level/paste.hh (revision 2086) +++ mln/level/paste.hh (working copy) @@ -108,12 +108,12 @@ const I& data = exact(data_); J& destination = exact(destination_); - mlc_is(mln_trait_image_io(J), trait::image::io::write)::check(); + mlc_is(mln_trait_image_value_io(J), trait::image::value_io::read_write)::check(); mlc_converts_to(mln_value(I), mln_value(J))::check(); mln_precondition(data.domain() <= destination.domain()); - impl::paste_(mln_trait_image_data(I)(), data, - mln_trait_image_data(J)(), destination); + impl::paste_(mln_trait_image_value_storage(I)(), data, + mln_trait_image_value_storage(J)(), destination); trace::exiting("level::paste"); } Index: mln/border/resize.hh --- mln/border/resize.hh (revision 2086) +++ mln/border/resize.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -32,13 +32,15 @@ * * \brief Define a function that resizes the virtual border of an * image. + * + * \todo Use level::fill!!! */ # include <mln/core/concept/image.hh> # include <mln/core/clone.hh> -# include <mln/level/fill.hh> -# include <mln/metal/is.hh> # include <mln/border/get.hh> +// # include <mln/level/fill.hh> +// # include <mln/level/paste.hh> namespace mln @@ -68,12 +70,14 @@ namespace impl { + // Effective resizing. + template <typename I> inline void resize_(trait::image::category::morpher, - const I& ima_, unsigned thickness) + const I& ima, unsigned thickness) { - return resize(*ima_.delegatee_(), thickness); + return resize(*ima.delegatee_(), thickness); } template <typename I> @@ -85,7 +89,62 @@ mln_concrete(I) memo = clone(ima); ima.resize_(thickness); - level::fill(ima, memo); + // level::fill(ima, memo); + // level::paste(memo, ima); + mln_piter(I) p(ima.domain()); + for_all(p) + ima(p) = memo(p); + } + +// ext_domain: /any/ +// | +// + -- none +// | +// + -- /some/ +// | +// + -- fixed +// | | +// | + -- infinite +// | +// + -- extendable + + template <typename I> + inline + void resize_(trait::image::ext_domain::none, + const I& ima, unsigned thickness) + { + // No-op. + } + + template <typename I> + inline + void resize_(trait::image::ext_domain::fixed, + const I& ima, unsigned thickness) + { + // No-op. + } + + template <typename I> + inline + void resize_(trait::image::ext_domain::extendable, + const I& ima, unsigned thickness) + { + if (border::get(ima) == thickness) + return; // No-op. + resize_(mln_trait_image_category(I)(), + ima, thickness); + mln_postcondition(border::get(ima) == thickness); + } + + + // Selector. + + template <typename I> + inline + void resize_(const I& ima, unsigned thickness) + { + resize_(mln_trait_image_ext_domain(I)(), + ima, thickness); } } // end of namespace mln::border::resize @@ -99,15 +158,10 @@ { trace::entering("border::resize"); - mlc_is(mln_trait_image_border(I), trait::image::border::some)::check(); const I& ima = exact(ima_); mln_precondition(ima.has_data()); - if (border::get(ima) == thickness) - return; // No-op. - // Otherwise: do-it. - impl::resize_(mln_trait_image_category(I)(), - ima, thickness); + impl::resize_(ima, thickness); mln_postcondition(border::get(ima) == thickness); Index: mln/border/get.hh --- mln/border/get.hh (revision 2086) +++ mln/border/get.hh (working copy) @@ -60,7 +60,7 @@ template <typename I> inline - unsigned get_(trait::image::border::some, trait::image::category::primary, + unsigned get_(trait::image::ext_domain::some, trait::image::category::primary, const I& ima) { return ima.border(); @@ -68,7 +68,7 @@ template <typename I> inline - unsigned get_(trait::image::border::some, trait::image::category::morpher, + unsigned get_(trait::image::ext_domain::some, trait::image::category::morpher, const I& ima) { return border::get( *ima.delegatee_() ); @@ -77,7 +77,7 @@ template <typename I> inline - unsigned get_(trait::image::border::none, trait::image::category::any, + unsigned get_(trait::image::ext_domain::none, trait::image::category::any, const I&) { return 0; @@ -95,7 +95,8 @@ trace::entering("border::get"); mln_precondition(exact(ima).has_data()); - unsigned res = border::impl::get_(mln_trait_image_border(I)(), mln_trait_image_category(I)(), + unsigned res = border::impl::get_(mln_trait_image_ext_domain(I)(), + mln_trait_image_category(I)(), exact(ima)); trace::exiting("border::get");

16 years, 6 months

cleanup-2008 2086: Augment gradient_elementary; it is a sample code.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Augment gradient_elementary; it is a sample code. * tests/morpho/gradient_elementary.cc: New. * tests/morpho/Makefile.am: Update. * mln/morpho/gradient_elementary.hh (gradient_elementary_): Rename as... (gradient_elementary_on_function): ...this. (gradient_elementary_on_set): New. (todo): Update. Add a selector. * img/tiny.pbm: New. mln/morpho/gradient_elementary.hh | 78 +++++++++++++++++++++++++++++++----- tests/morpho/Makefile.am | 2 tests/morpho/gradient_elementary.cc | 24 +++++++---- 3 files changed, 88 insertions(+), 16 deletions(-) Index: tests/morpho/gradient_elementary.cc --- tests/morpho/gradient_elementary.cc (revision 2085) +++ tests/morpho/gradient_elementary.cc (working copy) @@ -25,19 +25,21 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file tests/morpho/gradient.cc +/*! \file tests/morpho/gradient_elementary.cc * - * \brief Test on mln::morpho::gradient. + * \brief Test on mln::morpho::gradient_elementary. */ #include <mln/core/image2d.hh> -#include <mln/win/rectangle2d.hh> +#include <mln/core/neighb2d.hh> +#include <mln/io/pbm/load.hh> +#include <mln/io/pbm/save.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> #include <mln/value/int_u8.hh> -#include <mln/morpho/gradient.hh> +#include <mln/morpho/gradient_elementary.hh> #include "tests/data.hh" @@ -47,12 +49,20 @@ using namespace mln; using value::int_u8; - win::rectangle2d rect(5, 5); - border::thickness = 2; + border::thickness = 0; + { image2d<int_u8> lena; io::pgm::load(lena, MLN_IMG_DIR "/tiny.pgm"); - io::pgm::save( morpho::gradient(lena, rect), + io::pgm::save( morpho::gradient_elementary(lena, c4()), "out.pgm" ); } + { + image2d<bool> pic; + io::pbm::load(pic, MLN_IMG_DIR "/tiny.pbm"); + + io::pbm::save( morpho::gradient_elementary(pic, c4()), + "out.pbm" ); + } +} Index: tests/morpho/Makefile.am --- tests/morpho/Makefile.am (revision 2085) +++ tests/morpho/Makefile.am (working copy) @@ -11,6 +11,7 @@ erosion \ erosion_min_h \ gradient \ + gradient_elementary \ hit_or_miss \ laplacian \ lena_line_graph_image_wst1 \ @@ -35,6 +36,7 @@ contrast_SOURCES = contrast.cc gradient_SOURCES = gradient.cc +gradient_elementary_SOURCES = gradient_elementary.cc hit_or_miss_SOURCES = hit_or_miss.cc laplacian_SOURCES = laplacian.cc thinning_SOURCES = thinning.cc Index: mln/morpho/gradient_elementary.hh --- mln/morpho/gradient_elementary.hh (revision 2085) +++ mln/morpho/gradient_elementary.hh (working copy) @@ -31,11 +31,12 @@ /// \file mln/morpho/gradient_elementary.hh /// \brief Morphological elementary gradient. /// -/// \todo Write specific code. +/// \todo Handle border + add fastest versions. # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> # include <mln/accu/min_max.hh> +# include <mln/level/fill.hh> namespace mln @@ -68,10 +69,9 @@ template <typename I, typename N> mln_concrete(I) - gradient_elementary_(const mln::trait::image::kind::any&, - const I& input, const N& nbh) + gradient_elementary_on_function(const I& input, const N& nbh) { - trace::entering("morpho::impl::generic::gradient_elementary_"); + trace::entering("morpho::impl::generic::gradient_elementary_on_function"); mln_concrete(I) output; initialize(output, input); @@ -87,15 +87,76 @@ output(p) = m.second() - m.first(); } - trace::exiting("morpho::impl::generic::gradient_elementary_"); + trace::exiting("morpho::impl::generic::gradient_elementary_on_function"); return output; + } + + template <typename I, typename N> + mln_concrete(I) + gradient_elementary_on_set(const I& input, const N& nbh) + { + trace::entering("morpho::impl::generic::gradient_elementary_on_set"); + + mln_concrete(I) output; + initialize(output, input); + level::fill(output, false); + mln_piter(I) p(input.domain()); + mln_niter(N) n(nbh, p); + for_all(p) + { + bool b = input(p); + for_all(n) if (input.has(n)) + if (input(n) != b) + { + output(p) = true; + break; + } } - } // end of namespace mln::internal::generic + trace::exiting("morpho::impl::generic::gradient_elementary_on_set"); + return output; + } + + } // end of namespace mln::impl::generic - } // end of namespace mln::internal + // Different cases. + + template <typename I, typename N> + mln_concrete(I) + gradient_elementary_(const mln::trait::image::kind::any&, + const mln::trait::image::speed::any&, + const I& input, const N& nbh) + { + return generic::gradient_elementary_on_function(input, nbh); + } + + template <typename I, typename N> + mln_concrete(I) + gradient_elementary_(const mln::trait::image::kind::logic&, + const mln::trait::image::speed::any&, + const I& input, const N& nbh) + { + return generic::gradient_elementary_on_set(input, nbh); + } + + + // Selector. + + template <typename I, typename N> + mln_concrete(I) + gradient_elementary_(const I& input, const N& nbh) + { + return gradient_elementary_(mln_trait_image_kind(I)(), + mln_trait_image_speed(I)(), + input, nbh); + } + + } // end of namespace mln::impl + + + // Facade. template <typename I, typename N> mln_concrete(I) @@ -108,8 +169,7 @@ mln_precondition(input.has_data()); // FIXME: mln_precondition(! nbh.is_empty()); - mln_concrete(I) output = impl::generic::gradient_elementary_(mln_trait_image_kind(I)(), - input, nbh); + mln_concrete(I) output = impl::gradient_elementary_(input, nbh); trace::exiting("morpho::gradient_elementary"); return output; Index: img/tiny.pbm Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: img/tiny.pbm ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

16 years, 6 months

cleanup-2008 2085: Add morpho elementary gradient and test.

by Thierry Géraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Géraud <thierry.geraud(a)lrde.epita.fr> Add morpho elementary gradient and test. * doc/tutorial/examples/sub_image.cc: Use an IP operator. * mln/accu/pair.hh (first, second): Fix return type. * mln/morpho/gradient_elementary.hh: New. doc/tutorial/examples/sub_image.cc | 3 mln/accu/pair.hh | 8 +- mln/morpho/gradient_elementary.hh | 125 +++++++++++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+), 4 deletions(-) Index: doc/tutorial/examples/sub_image.cc --- doc/tutorial/examples/sub_image.cc (revision 2084) +++ doc/tutorial/examples/sub_image.cc (working copy) @@ -1,9 +1,11 @@ # include <mln/core/image2d.hh> +# include <mln/core/neighb2d.hh> # include <mln/core/sub_image.hh> # include <mln/debug/iota.hh> # include <mln/debug/println.hh> +# include <mln/morpho/gradient_elementary.hh> int main() @@ -17,6 +19,7 @@ sub_image<I, box2d> sub(ima, box2d(2,3)); debug::println(sub); + debug::println(morpho::gradient_elementary(sub, c4())); trait::image::print(sub); } Index: mln/accu/pair.hh --- mln/accu/pair.hh (revision 2084) +++ mln/accu/pair.hh (working copy) @@ -75,8 +75,8 @@ result to_result() const; void get_result(result_1& r1, result_2& r2) const; - result_1 first() const; - result_2 second() const; + mln_result(A1) first() const; + mln_result(A2) second() const; protected: @@ -166,7 +166,7 @@ template <typename A1, typename A2, typename T> inline - result_1 + mln_result(A1) pair_<A1,A2,T>::first()const { return a1_.to_result(); @@ -174,7 +174,7 @@ template <typename A1, typename A2, typename T> inline - result_2 + mln_result(A2) pair_<A1,A2,T>::second() const { return a2_.to_result(); Index: mln/morpho/gradient_elementary.hh --- mln/morpho/gradient_elementary.hh (revision 0) +++ mln/morpho/gradient_elementary.hh (revision 0) @@ -0,0 +1,125 @@ +// Copyright (C) 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_MORPHO_GRADIENT_ELEMENTARY_HH +# define MLN_MORPHO_GRADIENT_ELEMENTARY_HH + +/// \file mln/morpho/gradient_elementary.hh +/// \brief Morphological elementary gradient. +/// +/// \todo Write specific code. + +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/accu/min_max.hh> + + +namespace mln +{ + + namespace morpho + { + + /// Morphological elementary gradient. + /// + /// \param[in] input The image to be dilated. + /// \param[in] nbh The neighborhood to consider. + /// + /// The structuring element is the neighborhood + the center site. + /// + /// \{ + template <typename I, typename N> + mln_concrete(I) + gradient_elementary(const Image& input, const Neighborhood<N>& nbh); + /// \} + + +# ifndef MLN_INCLUDE_ONLY + + namespace impl + { + + namespace generic + { + + template <typename I, typename N> + mln_concrete(I) + gradient_elementary_(const mln::trait::image::kind::any&, + const I& input, const N& nbh) + { + trace::entering("morpho::impl::generic::gradient_elementary_"); + + mln_concrete(I) output; + initialize(output, input); + + accu::min_max_<mln_value(I)> m; + mln_piter(I) p(input.domain()); + mln_niter(N) n(nbh, p); + for_all(p) + { + m.take_as_init(input(p)); + for_all(n) if (input.has(n)) + m.take(input(n)); + output(p) = m.second() - m.first(); + } + + trace::exiting("morpho::impl::generic::gradient_elementary_"); + return output; + + } + + } // end of namespace mln::internal::generic + + } // end of namespace mln::internal + + + template <typename I, typename N> + mln_concrete(I) + gradient_elementary(const Image& input_, const Neighborhood<N>& nbh_) + { + const I& input = exact(input_); + const N& nbh = exact(nbh_); + + trace::entering("morpho::gradient_elementary"); + mln_precondition(input.has_data()); + // FIXME: mln_precondition(! nbh.is_empty()); + + mln_concrete(I) output = impl::generic::gradient_elementary_(mln_trait_image_kind(I)(), + input, nbh); + + trace::exiting("morpho::gradient_elementary"); + return output; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::morpho + +} // end of namespace mln + + +#endif // ! MLN_MORPHO_GRADIENT_ELEMENTARY_HH

16 years, 6 months

cleanup-2008 2084: Misc fixes.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Misc fixes. * mln/core/window.hh: Layout doc. * mln/core/internal/window_base.hh: Typo. * mln/core/internal/site_relative_iterator_base.hh (is_valid_, invalidate_): Remove decls; meaningless. * mln/core/internal/site_iterator_base.hh (s_): Fix missing initialization in ctor without arg. * mln/core/dpsites_piter.hh (dpsites_fwd_piter, dpsites_bkd_piter): New ctor overload. * mln/core/init.hh: Fix missing exact. * mln/core/image2d.hh (coord): Reactivate. * mln/accu/pair.hh (first, second): New methods. * mln/make/neighb2d.hh: Fix missing mln::. * mln/pw/var.hh (var_): New ctor overload. * mln/win/rectangle2d.hh: Revamp. * mln/util/index.hh (dim): New; required for window<D>. * sandbox/geraud/win_fun.hh: New. * sandbox/geraud/win_fun.cc: New. mln/accu/pair.hh | 21 ++- mln/core/dpsites_piter.hh | 16 ++ mln/core/image2d.hh | 3 mln/core/init.hh | 4 mln/core/internal/site_iterator_base.hh | 1 mln/core/internal/site_relative_iterator_base.hh | 6 mln/core/internal/window_base.hh | 4 mln/core/window.hh | 13 + mln/make/neighb2d.hh | 4 mln/pw/var.hh | 18 ++ mln/util/index.hh | 7 + mln/win/rectangle2d.hh | 63 ++++----- sandbox/geraud/win_fun.cc | 160 +++++++++++++++++++++++ sandbox/geraud/win_fun.hh | 160 +++++++++++++++++++++++ 14 files changed, 428 insertions(+), 52 deletions(-) Index: mln/core/window.hh --- mln/core/window.hh (revision 2083) +++ mln/core/window.hh (working copy) @@ -78,12 +78,14 @@ */ bool is_centered() const; - /*! \brief Test if the window is symmetric. + /*! Test if the window is symmetric. + * + * \return True if for every dp of this window, -dp is also in + * this window. */ bool is_symmetric() const; - /*! Apply a central symmetry to the target window. - */ + /// Apply a central symmetry to the target window. void sym(); @@ -125,7 +127,7 @@ /// \{ Insertion of a delta-point with different numbers of /// arguments (coordinates) w.r.t. the dimension. - window<D>& insert(const mln_coord(D)& dind); // For 1D. + window<D>& insert(const mln_coord(D)& dind); // For 1D or index access. window<D>& insert(const mln_coord(D)& drow, const mln_coord(D)& dcol); // For 2D. @@ -135,7 +137,8 @@ const mln_coord(D)& dcol); // For 3D. /// \} - /// Give the vector of delta-points. + + /// Give the std vector of delta-points. const std::vector<D>& std_vector() const; /// Hook to the set of D. Index: mln/core/internal/window_base.hh --- mln/core/internal/window_base.hh (revision 2083) +++ mln/core/internal/window_base.hh (working copy) @@ -67,9 +67,9 @@ # ifndef MLN_INCLUDE_ONLY - template <typename S, typename E> + template <typename D, typename E> inline - window_base<S,E>::window_base() + window_base<D,E>::window_base() { } Index: mln/core/internal/site_relative_iterator_base.hh --- mln/core/internal/site_relative_iterator_base.hh (revision 2083) +++ mln/core/internal/site_relative_iterator_base.hh (working copy) @@ -67,12 +67,6 @@ template <typename P> void center_at(const P& c); - /// Test the iterator validity. - bool is_valid_() const; - - /// Invalidate the iterator. - void invalidate_(); - /// Start an iteration. void start_(); Index: mln/core/internal/site_iterator_base.hh --- mln/core/internal/site_iterator_base.hh (revision 2083) +++ mln/core/internal/site_iterator_base.hh (working copy) @@ -109,6 +109,7 @@ template <typename S, typename E> inline site_iterator_base<S, E>::site_iterator_base() + : s_(0) { } Index: mln/core/dpsites_piter.hh --- mln/core/dpsites_piter.hh (revision 2083) +++ mln/core/dpsites_piter.hh (working copy) @@ -61,6 +61,9 @@ template <typename P> dpsites_fwd_piter(const V& v, const P& c); + /// Constructor without argument. + dpsites_fwd_piter(); + /// Test the iterator validity. bool is_valid_() const; @@ -102,6 +105,9 @@ template <typename P> dpsites_bkd_piter(const V& v, const P& c); + /// Constructor without argument. + dpsites_bkd_piter(); + /// Test the iterator validity. bool is_valid_() const; @@ -129,6 +135,11 @@ // Forward. + template <typename V> + inline + dpsites_fwd_piter<V>::dpsites_fwd_piter() + { + } template <typename V> template <typename P> @@ -182,6 +193,11 @@ // Backward. + template <typename V> + inline + dpsites_bkd_piter<V>::dpsites_bkd_piter() + { + } template <typename V> template <typename P> Index: mln/core/init.hh --- mln/core/init.hh (revision 2083) +++ mln/core/init.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -78,7 +78,7 @@ inline void init_(tag::bbox_t, B& b, const Image& ima) { - b = geom::bbox(ima.domain()); + b = geom::bbox(exact(ima).domain()); } template <typename I> Index: mln/core/image2d.hh --- mln/core/image2d.hh (revision 2083) +++ mln/core/image2d.hh (working copy) @@ -122,6 +122,9 @@ template <typename T> struct image2d : public internal::image_primary< box2d, image2d<T> > { + /// Coordinate associated type. + typedef int coord; + /// Value associated type. typedef T value; Index: mln/accu/pair.hh --- mln/accu/pair.hh (revision 2083) +++ mln/accu/pair.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -75,6 +75,9 @@ result to_result() const; void get_result(result_1& r1, result_2& r2) const; + result_1 first() const; + result_2 second() const; + protected: A1 a1_; @@ -161,6 +164,22 @@ r2 = a2_.to_result(); } + template <typename A1, typename A2, typename T> + inline + result_1 + pair_<A1,A2,T>::first()const + { + return a1_.to_result(); + } + + template <typename A1, typename A2, typename T> + inline + result_2 + pair_<A1,A2,T>::second() const + { + return a2_.to_result(); + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::accu Index: mln/make/neighb2d.hh --- mln/make/neighb2d.hh (revision 2083) +++ mln/make/neighb2d.hh (working copy) @@ -76,7 +76,7 @@ enum { h = mlc_sqrt_int(S) / 2 }; mlc_bool((2 * h + 1) * (2 * h + 1) == S)::check(); mln::window2d win = make::window2d(values); - neighb2d tmp(win); + mln::neighb2d tmp(win); return tmp; } @@ -88,7 +88,7 @@ mlc_bool(R % 2 == 1)::check(); mlc_bool(C % 2 == 1)::check(); mln::window2d win = make::window2d(values); - neighb2d tmp(win); + mln::neighb2d tmp(win); return tmp; } Index: mln/pw/var.hh --- mln/pw/var.hh (revision 2083) +++ mln/pw/var.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -49,13 +49,15 @@ { typedef V result; + var_(); + var_(const V& v); template <typename P> const V& operator()(const P&) const; private: - const V& v_; + const V* v_; }; @@ -69,8 +71,15 @@ template <typename V> inline + var_<V>::var_() + : v_(0) + { + } + + template <typename V> + inline var_<V>::var_(const V& v) - : v_(v) + : v_(&v) { } @@ -80,7 +89,8 @@ const V& var_<V>::operator()(const P&) const { - return v_; + mln_precondition(v_ != 0); + return *v_; } // pw::var(v) Index: mln/win/rectangle2d.hh --- mln/win/rectangle2d.hh (revision 2083) +++ mln/win/rectangle2d.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -31,12 +31,11 @@ /*! \file mln/win/rectangle2d.hh * * \brief Definition of the mln::win::rectangle2d window. + * + * \todo Reactivate includes at EOF. */ -# include <mln/core/concept/window.hh> -# include <mln/core/internal/dpoints_base.hh> -# include <mln/core/dpoint2d.hh> -# include <mln/core/dpoints_piter.hh> +# include <mln/core/window.hh> namespace mln @@ -56,27 +55,20 @@ * o o o o o \n * is defined with height = 3 and width = 5. */ - struct rectangle2d : public Window< rectangle2d >, - public internal::dpoints_base_< dpoint2d, rectangle2d > + struct rectangle2d : public internal::window_base< dpoint2d, rectangle2d > { - /// Point Site associated type. - typedef point2d psite; - - /// Point associated type. - typedef point2d point; - - /// Dpoint associated type. - typedef dpoint2d dpoint; /*! \brief Site_Iterator type to browse a rectangle such as: "for each row * (increasing), for each column (increasing)." */ - typedef dpoints_fwd_piter<dpoint2d> fwd_qiter; + typedef dpsites_fwd_piter<rectangle2d> fwd_qiter; /*! \brief Site_Iterator type to browse a rectangle such as: "for each row * (decreasing), for each column (decreasing)." */ - typedef dpoints_bkd_piter<dpoint2d> bkd_qiter; + typedef dpsites_fwd_piter<rectangle2d> bkd_qiter; + + typedef fwd_qiter qiter; /*! \brief Constructor. @@ -101,16 +93,13 @@ */ bool is_symmetric() const; - /*! \brief Give the rectangle height. - */ + /// Give the rectangle height. unsigned height() const; - /*! \brief Give the rectangle width. - */ + /// Give the rectangle width. unsigned width() const; - /*! \brief Give the rectangle area. - */ + /// Give the rectangle area. unsigned area() const; /*! \brief Give the maximum coordinate gap between the window @@ -118,11 +107,17 @@ */ unsigned delta() const; - /// Apply a central symmetry to the target window. - rectangle2d& sym(); + /// Apply a central symmetry to the target window; a no-op here. + void sym(); + + + /// Give the std vector of delta-points. + const std::vector<dpoint2d>& std_vector() const; protected: + unsigned height_, width_; + window2d win_; }; @@ -151,7 +146,7 @@ const int drow = height / 2, dcol = width / 2; for (int row = - drow; row <= drow; ++row) for (int col = - dcol; col <= dcol; ++col) - insert(make::dpoint2d(row, col)); + win_.insert(row, col); } inline @@ -191,9 +186,17 @@ } inline - rectangle2d& rectangle2d::sym() + void + rectangle2d::sym() + { + // No-op. + } + + inline + const std::vector<dpoint2d>& + rectangle2d::std_vector() const { - return *this; + return win_.std_vector(); } inline @@ -212,8 +215,8 @@ // When rectangle2d is involved, one surely also wants: -# include <mln/win/hline2d.hh> -# include <mln/win/vline2d.hh> +// # include <mln/win/hline2d.hh> +// # include <mln/win/vline2d.hh> #endif // ! MLN_WIN_RECTANGLE2D_HH Index: mln/util/index.hh --- mln/util/index.hh (revision 2083) +++ mln/util/index.hh (working copy) @@ -31,6 +31,9 @@ /*! \file mln/util/index.hh * * \brief Definition of an "index" type. + * + * \todo Remove coord and dim, then make window<dindex> work. + */ # include <mln/core/concept/object.hh> @@ -53,7 +56,9 @@ struct index_ // : public Object< index_<Tag> > { typedef dindex_<Tag> dpsite; + typedef int coord; + enum { dim = 1 }; int i_; @@ -71,7 +76,9 @@ { typedef index_<Tag> psite; typedef index_<Tag> site; + typedef int coord; + enum { dim = 1 }; int i_; Index: sandbox/geraud/win_fun.hh --- sandbox/geraud/win_fun.hh (revision 0) +++ sandbox/geraud/win_fun.hh (revision 0) @@ -0,0 +1,160 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory +// +// 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 infun 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_WIN_FUN_HH +# define MLN_WIN_FUN_HH + +/*! \file mln/win/fun.hh + * + * \brief Definition of the mln::win::fun window. + */ + +# include <mln/core/internal/window_base.hh> +# include <mln/core/internal/site_relative_iterator_base.hh> + + +namespace mln +{ + + namespace win + { + + // Fwd decl. + template <typename F> class fun_piter; + + + /*! \brief Window defined by a function. + */ + template <typename F> + struct fun : public internal::window_base< mln_deduce(F, result, dpsite), + fun<F> > + { + + /// Site_Iterator type to browse a fun forward + typedef fun_piter<F> fwd_qiter; + + /// Site_Iterator type to browse a fun backward + typedef fun_piter<F> bkd_qiter; + + /// Same as fwd_qiter + typedef fwd_qiter qiter; + + /// Constructor. + fun(const F& f) : f(f) {} + + /// Test if the window is centered. + bool is_centered() const { return false; } + + /// Test if the window is empty. + bool is_empty() const { return false; } + + /// Test if the window is symmetric. + bool is_symmetric() const { return false; } + + /// Give the maximum coordinate gap between the window + unsigned delta() const { return 100; } // FIXME + + /// Apply a central symmetry to the target window. + void sym() {} + + const F& f; + }; + + + template <typename F> + class fun_piter + : public internal::site_relative_iterator_base< fun<F>, + fun_piter<F> > + { + public: + + typedef mln_result(F) W; + + /// Constructor. + template <typename P> + fun_piter(const fun<F>& win, const P& c) + : f_(win.f) + { + q_.center_at(c); + this->change_target(win); + this->center_at(c); + } + + /// Test the iterator validity. + bool is_valid_() const + { + return this->c_ != 0 && q_.is_valid(); + } + + /// Invalidate the iterator. + void invalidate_() + { + q_.invalidate(); + } + + /// Start an iteration. + void do_start_() + { + q_.change_target(f_(*this->c_)); + q_.start(); + } + + /// Go to the next point. + void do_next_() + { + q_.next(); + } + + /// Compute the current psite. + mln_psite(W) compute_p_() const + { + return q_; + } + + protected: + + const F& f_; + mln_fwd_qiter(W) q_; + }; + + +# ifndef MLN_INCLUDE_ONLY + + // FIXME: Move code here. + + // MEMO: mln_fwd_qiter(mln_result(F)) + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::win + +} // end of namespace mln + + + +#endif // ! MLN_WIN_FUN_HH Index: sandbox/geraud/win_fun.cc --- sandbox/geraud/win_fun.cc (revision 0) +++ sandbox/geraud/win_fun.cc (revision 0) @@ -0,0 +1,160 @@ +# include <mln/core/image2d.hh> +# include <mln/core/window2d.hh> +# include <mln/win/rectangle2d.hh> +# include <mln/win/fun.hh> + +# include <mln/debug/iota.hh> +# include <mln/debug/println.hh> + + +// # include <mln/morpho/gradient.bis.hh> +// # include <mln/morpho/erosion.bis.hh> + +// # include <mln/value/int_u8.hh> +// # include <mln/io/pgm/load.hh> +// # include <mln/io/pgm/save.hh> + + +template <typename I, typename W, typename P> +void picture(const I& ima, const W& win, const P& p) +{ + std::cout << ima(p) << ": "; + mln_qiter(W) q(win, p); + for_all(q) + if (ima.has(q)) + std::cout << ima(q) << ' '; + else + std::cout << "- "; + std::cout << std::endl; +} + + + +struct uni_t +{ + typedef mln::window2d result; + mln::window2d win_; + uni_t() { win_.insert(-1,0).insert(0,-1); } + const mln::window2d& operator()(const mln::point2d& p) const { return win_; } +} uni; + + +struct bi_t +{ + typedef mln::window2d result; + mln::window2d win1_, win2_; + bi_t() { + win1_.insert(-1,0).insert(0,-1); + win2_.insert( 1,0).insert(0, 1); + } + const mln::window2d& operator()(const mln::point2d& p) const { + return p.col() % 2 ? win1_ : win2_; + } +} bi; + + +struct bi_rect_t +{ + typedef mln::win::rectangle2d result; + result *win1_, *win2_; + bi_rect_t() { + win1_ = new result(1,3); + win2_ = new result(3,1); + } + const result& operator()(const mln::point2d& p) const { + return p.row() % 2 ? *win1_ : *win2_; + } +} bi_rect; + + +// template <typename T> +// struct grad_t +// { +// typedef mln::win::rectangle2d result; +// mln::image2d<T> grad_; +// std::vector<result*> win_; + +// grad_t(const mln::image2d<T>& gr) +// { +// grad_ = gr; +// for (unsigned i = 0; i < 10; ++i) +// { +// unsigned l = i % 2 ? i : i + 1; +// win_.push_back(new result(l, l)); +// } +// } +// const result& operator()(const mln::point2d& p) const { +// float s = 1.f - grad_(p) / 256.f; +// s *= s * s; +// return * win_[unsigned(s * 9)]; +// } +// }; + + + + +int main() +{ + using namespace mln; + + typedef image2d<unsigned> I; + I ima(2, 3, 0); // no border + debug::iota(ima); + debug::println(ima); + + + { + win::fun<uni_t> win(uni); + mln_fwd_piter_(I) p(ima.domain()); + for_all(p) + picture(ima, win, p); + std::cout << std::endl; + } + + { + win::fun<bi_t> win(bi); + mln_fwd_piter_(I) p(ima.domain()); + for_all(p) + picture(ima, win, p); + std::cout << std::endl; + } + + { + win::rectangle2d rect(3, 3); + mln_fwd_piter_(I) p(ima.domain()); + for_all(p) + picture(ima, rect, p); + std::cout << std::endl; + } + + { + win::fun<bi_rect_t> win(bi_rect); + mln_fwd_piter_(I) p(ima.domain()); + for_all(p) + picture(ima, win, p); + std::cout << std::endl; + } + + + +// { +// using value::int_u8; +// image2d<int_u8> ima(2, 2); +// // io::pgm::load(ima, "small.pgm"); + +// window2d c4p; +// c4p.insert(-1,0).insert(0,-1).insert(0,0).insert(0,1).insert(1,0); + +// grad_t<int_u8> f(morpho::gradient(ima, c4p)); +// win::fun< grad_t<int_u8> > win(f); + +// image2d<int_u8> ero = morpho::erosion(ima, win); +// // io::pgm::save(ero, "ero.pgm"); + +// mln_fwd_piter_(I) p(ima.domain()); +// for_all(p) +// picture(ima, win, p); +// std::cout << std::endl; +// } + +}

16 years, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches