Olena-patches September 2008

olena-patches@lrde.epita.fr

12 participants
359 discussions

2266: Fix the compilation of tools in Trimesh.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/external/trimesh Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix the compilation of tools in Trimesh. * utilsrc/Makefile.am (AM_LDFLAGS): New. (LDADD): Add $(GLLIBS). (mesh_view_LDFLAGS, mesh_view_LDADD): Remove. Makefile.am | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) Index: utilsrc/Makefile.am --- utilsrc/Makefile.am (revision 2265) +++ utilsrc/Makefile.am (working copy) @@ -6,7 +6,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -LDADD = -L$(top_builddir)/libsrc -ltrimesh -lm +AM_LDFLAGS = $(GLFLAGS) +LDADD = -L$(top_builddir)/libsrc -ltrimesh -lm $(GLLIBS) bin_PROGRAMS = \ @@ -24,7 +25,4 @@ mesh_filter_SOURCES = mesh_filter.cc mesh_make_SOURCES = mesh_make.cc mesh_shade_SOURCES = mesh_shade.cc - mesh_view_SOURCES = mesh_view.cc -mesh_view_LDFLAGS = $(AM_LDFLAGS) $(GLFLAGS) -mesh_view_LDADD = $(LDADD) $(GLLIBS)

16 years, 3 months

cleanup-2008 2265: Make morpho erosion test compile.

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> Make morpho erosion test compile. * mln/core/internal/dpoints_base.hh (site, psite, dpsite): Remove these typedefs; they were inherited twice in window concrete classes, causing ambiguities. * mln/win/rectangle2d.hh: Likewise; useless. * mln/morpho/erosion.spe.hh (border): De-activate calls. * mln/morpho/erosion.hh: Fix missing initialize. * mln/morpho/includes.hh (border): De-activate include. (has_neighborhood): De-activate include; this part of code is soon obsolete. core/internal/dpoints_base.hh | 10 ---------- morpho/erosion.hh | 4 +++- morpho/erosion.spe.hh | 20 ++++++++++---------- morpho/includes.hh | 8 ++++---- win/rectangle2d.hh | 6 ------ 5 files changed, 17 insertions(+), 31 deletions(-) Index: mln/core/internal/dpoints_base.hh --- mln/core/internal/dpoints_base.hh (revision 2264) +++ mln/core/internal/dpoints_base.hh (working copy) @@ -56,16 +56,6 @@ { public: - /// Dpsite associated type. - typedef D dpsite; - - /// Psite associated type. - typedef mln_psite(D) psite; - - /// Site associated type. - typedef mln_site(D) site; - - /// Forward site iterator associated type. typedef dpsites_fwd_piter<E> fwd_qiter; Index: mln/win/rectangle2d.hh --- mln/win/rectangle2d.hh (revision 2264) +++ mln/win/rectangle2d.hh (working copy) @@ -60,12 +60,6 @@ struct rectangle2d : public internal::window_base< dpoint2d, rectangle2d >, public internal::dpoints_base_< dpoint2d, rectangle2d > { - typedef internal::dpoints_base_< dpoint2d, rectangle2d > super_; - - typedef super_::site site; - typedef super_::psite psite; - typedef super_::dpsite dpsite; - /*! \brief Constructor. * * \param[in] height Height of the rectangle2d. Index: mln/morpho/erosion.spe.hh --- mln/morpho/erosion.spe.hh (revision 2264) +++ mln/morpho/erosion.spe.hh (working copy) @@ -89,10 +89,10 @@ typedef mln_concrete(I) O; const I& input = exact(input_); const W& win = exact(win_); - O output; + O output; initialize(output, input); - border::fill(input, mln_max(mln_value(I))); +// border::fill(input, mln_max(mln_value(I))); mln_pixter(const I) p(input); mln_pixter(O) o(output); @@ -120,10 +120,10 @@ typedef mln_concrete(I) O; const I& input = exact(input_); const W& win = exact(win_); - O output; + O output; initialize(output, input); - border::fill(input, true); +// border::fill(input, true); mln_pixter(const I) p(input); mln_pixter(O) p_out(output); @@ -153,7 +153,7 @@ const W& win = exact(win_); O output; - border::fill(input, true); +// border::fill(input, true); output = clone(input); mln_piter(I) p(input.domain()); @@ -182,7 +182,7 @@ const W& win = exact(win_); O output; - border::fill(input, true); +// border::fill(input, true); output = clone(input); mln_pixter(const I) p(input); @@ -445,15 +445,15 @@ trait::image::kind::logic)::value == true) if (mlc_equal(mln_trait_image_speed(I)(), trait::image::speed::fastest)::value == true) - impl::erosion_on_set_fastest(input, win); + return impl::erosion_on_set_fastest(input, win); else - impl::generic::erosion_on_set(input, win); + return impl::generic::erosion_on_set(input, win); else if (mlc_equal(mln_trait_image_speed(I)(), trait::image::speed::fastest)::value == true) - impl::erosion_on_function_fastest(input, win); + return impl::erosion_on_function_fastest(input, win); else - impl::generic::erosion_on_function(input, win); + return impl::generic::erosion_on_function(input, win); } } // end of namespace mln::morpho::internal Index: mln/morpho/erosion.hh --- mln/morpho/erosion.hh (revision 2264) +++ mln/morpho/erosion.hh (working copy) @@ -100,9 +100,11 @@ const I& input = exact(input_); const W& win = exact(win_); + mln_concrete(I) output; + initialize(output, input); + mln_piter(I) p(input.domain()); mln_qiter(W) q(win, p); - mln_concrete(I) output; for_all(p) { for_all(q) if (input.has(q)) Index: mln/morpho/includes.hh --- mln/morpho/includes.hh (revision 2264) +++ mln/morpho/includes.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/morpho/includes.hh * * \brief Basic list of includes for all files in mln/morpho/. + * + * \todo Re-activate the border/all include when ready. */ @@ -38,8 +40,6 @@ # include <mln/core/concept/window.hh> # include <mln/core/concept/neighborhood.hh> -# include <mln/metal/has_neighborhood.hh> - # include <mln/value/ops.hh> # include <mln/accu/min.hh> @@ -54,7 +54,7 @@ # include <mln/level/fill.hh> # include <mln/test/positive.hh> -# include <mln/border/all.hh> +// # include <mln/border/all.hh> # include <mln/geom/sym.hh> # include <mln/set/inter.hh>

16 years, 3 months

cleanup-2008 r2264: Temporary fix doc compilation

by Guillaume Lazzara

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> Temporary fix doc compilation. * milena/doc/Doxyfile.in: Temporary excludes core/concept from the doc generation. The doc can now be generated. Due to core/concept the doc generation never ended. --- Doxyfile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: branches/cleanup-2008/milena/doc/Doxyfile.in =================================================================== --- branches/cleanup-2008/milena/doc/Doxyfile.in (revision 2263) +++ branches/cleanup-2008/milena/doc/Doxyfile.in (revision 2264) @@ -79,7 +79,8 @@ *.hxx \ *.hcc RECURSIVE = YES -EXCLUDE = @top_srcdir@/milena/sandbox +EXCLUDE = @top_srcdir@/milena/sandbox \ + @top_srcdir@/milena/mln/core/concept EXCLUDE_SYMLINKS = YES EXCLUDE_PATTERNS = *spe.hh EXCLUDE_SYMBOLS =

16 years, 3 months

cleanup-2008 r2263: Remove deprecated tests

by Guillaume Lazzara

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> Remove deprecated tests. * milena/tests/core/image/Makefile.am: Remove deprecated tests and comments few others. --- Makefile.am | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) Index: branches/cleanup-2008/milena/tests/core/image/Makefile.am =================================================================== --- branches/cleanup-2008/milena/tests/core/image/Makefile.am (revision 2262) +++ branches/cleanup-2008/milena/tests/core/image/Makefile.am (revision 2263) @@ -16,10 +16,6 @@ ## image2d_h \ image3d \ image_if \ - - image_if_interval \ - image_if_value \ - ## interpolated \ ## line_graph_image \ mono_obased_rle_image \ @@ -45,13 +41,11 @@ ##hexa_SOURCES = hexa.cc image1d_SOURCES = image1d.cc image2d_SOURCES = image2d.cc -image2d_h_SOURCES = image2d_h.cc +##image2d_h_SOURCES = image2d_h.cc image3d_SOURCES = image3d.cc image_if_SOURCES = image_if.cc -image_if_interval_SOURCES = image_if_interval.cc -image_if_value_SOURCES = image_if_value.cc -interpolated_SOURCES = interpolated.cc -line_graph_image_SOURCES = line_graph_image.cc +##interpolated_SOURCES = interpolated.cc +##line_graph_image_SOURCES = line_graph_image.cc mono_obased_rle_image_SOURCES = mono_obased_rle_image.cc mono_rle_image_SOURCES = mono_rle_image.cc obased_rle_image_SOURCES = obased_rle_image.cc

16 years, 3 months

cleanup-2008 r2262: Fix fill_with_image

by Guillaume Lazzara

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> Fix fill_with_image. * milena/mln/level/fill_with_image.hh: Use exact(). * milena/mln/level/fill_with_image.spe.hh: Fix fill_with_image prototype. * milena/mln/level/memcpy_.hh: Use full namespace name. --- fill_with_image.hh | 6 ++++-- fill_with_image.spe.hh | 2 +- memcpy_.hh | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) Index: branches/cleanup-2008/milena/mln/level/fill_with_image.hh =================================================================== --- branches/cleanup-2008/milena/mln/level/fill_with_image.hh (revision 2261) +++ branches/cleanup-2008/milena/mln/level/fill_with_image.hh (revision 2262) @@ -90,10 +90,12 @@ { template <typename I, typename J> - inline - void fill_with_image(Image<I>& ima, const Image<J>& data) + void fill_with_image(Image<I>& ima_, const Image<J>& data_) { trace::entering("level::impl::generic::fill_with_image"); + I& ima = exact(ima_); + const J& data = exact(data_); + internal::fill_with_image_tests(ima, data); mln_piter(I) p(ima.domain()); Index: branches/cleanup-2008/milena/mln/level/memcpy_.hh =================================================================== --- branches/cleanup-2008/milena/mln/level/memcpy_.hh (revision 2261) +++ branches/cleanup-2008/milena/mln/level/memcpy_.hh (revision 2262) @@ -118,8 +118,8 @@ typedef mln_image(Pd) Id; metal::is_not_const<Id>::check(); typedef mln_image(Ps) Is; - Pd& dest = internal::force_exact<Pd>(dest_); - Ps& src = internal::force_exact<Ps>(src_); + Pd& dest = mln::internal::force_exact<Pd>(dest_); + Ps& src = mln::internal::force_exact<Ps>(src_); mln_precondition(sizeof(mln_value(Id)) == sizeof(mln_value(Is))); mln_precondition(dest.ima().has_data()); Index: branches/cleanup-2008/milena/mln/level/fill_with_image.spe.hh =================================================================== --- branches/cleanup-2008/milena/mln/level/fill_with_image.spe.hh (revision 2261) +++ branches/cleanup-2008/milena/mln/level/fill_with_image.spe.hh (revision 2262) @@ -55,7 +55,7 @@ namespace generic { template <typename I, typename J> - void fill_with_image(const Image<I>& data, Image<J>& destination); + void fill_with_image(Image<I>& ima, const Image<J>& data); } // FIXME: Add specializations here...

16 years, 3 months

cleanup-2008 2261: Make the from_to conversion mechanism more general.

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> Make the from_to conversion mechanism more general. * mln/core/alias/window2d.hh (from_to_): New overload. The code comes from make/window2d.hh * mln/convert/to.hh (to): New static check on O. * mln/convert/from_to.hh: Relax signature. Add tech note. convert/from_to.hh | 20 ++++++++++++----- convert/to.hh | 1 core/alias/window2d.hh | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 6 deletions(-) Index: mln/core/alias/window2d.hh --- mln/core/alias/window2d.hh (revision 2260) +++ mln/core/alias/window2d.hh (working copy) @@ -34,6 +34,7 @@ # include <mln/core/window.hh> # include <mln/core/alias/dpoint2d.hh> +# include <mln/metal/math/sqrt.hh> namespace mln @@ -54,6 +55,22 @@ const window2d& win_c4p(); + namespace convert + { + namespace impl + { + + template <unsigned S> + void from_to_(bool (&values)[S], window2d& win); + + template <unsigned R, unsigned C> + void from_to_(bool (&values)[R][C], window2d& win); + + } // end of namespace mln::convert::impl + + } // end of namespace mln::convert + + # ifndef MLN_INCLUDE_ONLY @@ -74,6 +91,44 @@ return it; } + + namespace convert + { + namespace impl + { + + template <unsigned S> + void + from_to_(bool (&values)[S], window2d& win) + { + mln_precondition(win.is_empty()); // FIXME: or just .clear() it? + enum { h = mlc_sqrt_int(S) / 2 }; + mlc_bool((2 * h + 1) * (2 * h + 1) == S)::check(); + unsigned i = 0; + for (int row = - h; row <= h; ++row) + for (int col = - h; col <= h; ++col) + if (values[i++]) + win.insert(row, col); + } + + template <unsigned R, unsigned C> + void + from_to_(bool (&values)[R][C], window2d& win) + { + mln_precondition(win.is_empty()); // FIXME: or just .clear() it? + mlc_bool(R % 2 == 1)::check(); + mlc_bool(C % 2 == 1)::check(); + const int drow = int(R) / 2, dcol = int(C) / 2; + for (int row = - drow; row <= drow; ++row) + for (int col = - dcol; col <= dcol; ++col) + if (values[row + drow][col + dcol]) + win.insert(row, col); + } + + } // end of namespace mln::convert::impl + + } // end of namespace mln::convert + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln Index: mln/convert/to.hh --- mln/convert/to.hh (revision 2260) +++ mln/convert/to.hh (working copy) @@ -64,6 +64,7 @@ to(const O& from) { mlc_equal(T, mln_exact(T))::check(); + mlc_equal(O, mln_exact(O))::check(); trace::entering("convert::to"); T tmp; Index: mln/convert/from_to.hh --- mln/convert/from_to.hh (revision 2260) +++ mln/convert/from_to.hh (working copy) @@ -56,11 +56,10 @@ /// Conversion of an object \p from towards an object \p to. - template <typename F, typename T> inline void - from_to(const Object<F>& from, Object<T>& to); + from_to(F& from, Object<T>& to); // See below an explanation of this signature. template <typename T> @@ -75,15 +74,23 @@ from_to(const int& from, Object<T>& to); + // Technical note: + + // In order to remain as general as possible (for instance to be + // able to pass a C array to 'from'), the signature cannot be + // "const F& from." It cannot embed the strong typing "Object<*>" + // neither. + + # ifndef MLN_INCLUDE_ONLY namespace impl { - // Default (Object -> Object) means "unknown conversion". + // Default (F -> Object) means "unknown conversion". template <typename F, typename T> void - from_to_(const Object<F>& from, Object<T>& to); + from_to_(const F& from, Object<T>& to); // Image -> Site_Set. @@ -129,10 +136,11 @@ template <typename F, typename T> inline void - from_to(const Object<F>& from, Object<T>& to) + from_to(F& from, Object<T>& to) { trace::entering("convert::from_to"); - impl::from_to_(exact(from), exact(to)); + mlc_equal(F, mln_exact(F))::check(); + impl::from_to_(from, exact(to)); trace::exiting("convert::from_to"); }

16 years, 3 months

2260: Misc. fixes on complex-related iterators.

by Roland Levillain

* mln/core/internal/complex_iter_base.hh: Fix the Doxygen documentation. More forward declaration of mln::complex<D>... * mln/core/complex_iter.hh: ...here. --- milena/ChangeLog | 9 +++++++++ milena/mln/core/complex_iter.hh | 3 +++ milena/mln/core/internal/complex_iter_base.hh | 13 +++++++------ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d80dc75..c2ca75f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2008-09-14 Roland Levillain <roland(a)lrde.epita.fr> + Misc. fixes on complex-related iterators. + + * mln/core/internal/complex_iter_base.hh: Fix the Doxygen + documentation. + More forward declaration of mln::complex<D>... + * mln/core/complex_iter.hh: ...here. + +2008-09-14 Roland Levillain <roland(a)lrde.epita.fr> + Factor iterators on mln::p_complex. * mln/core/internal/p_complex_piter_base.hh: New. diff --git a/milena/mln/core/complex_iter.hh b/milena/mln/core/complex_iter.hh index 4e757ea..ba2731e 100644 --- a/milena/mln/core/complex_iter.hh +++ b/milena/mln/core/complex_iter.hh @@ -36,6 +36,9 @@ namespace mln { + // Forward declaration. + template <unsigned D> class complex; + /*-----------------------. | complex_fwd_iter_<D>. | `-----------------------*/ diff --git a/milena/mln/core/internal/complex_iter_base.hh b/milena/mln/core/internal/complex_iter_base.hh index df9b39a..a2462ea 100644 --- a/milena/mln/core/internal/complex_iter_base.hh +++ b/milena/mln/core/internal/complex_iter_base.hh @@ -28,9 +28,9 @@ #ifndef MLN_CORE_INTERNAL_COMPLEX_ITER_BASE_HH # define MLN_CORE_INTERNAL_COMPLEX_ITER_BASE_HH -/// \file mln/core/complex_iter_base.hh +/// \file mln/core/internal/complex_iter_base.hh /// \brief Definition of an implementation (factoring) class for -/// iterators on complexes. +/// iterators on mln::complex. # include <limits> @@ -42,12 +42,9 @@ namespace mln { - // Forward declaration. - template <unsigned D> class complex; - namespace internal { - /// \brief Factoring classe for iterators on complexes. + /// \brief Factoring class for iterators on mln::complex. /// /// \arg \p F The type of the face handle. /// \arg \p E The type exact type of the iterator. @@ -58,6 +55,8 @@ namespace mln public: typedef F face; + // FIXME: Maybe we could just get the dimension D of the face's + // complex, an define complex_type as mln::complex<D>? typedef typename F::complex_type complex_type; /// Construction and assignment. @@ -103,6 +102,8 @@ namespace mln } // end of mln::internal + + # ifndef MLN_INCLUDE_ONLY namespace internal -- 1.6.0.1

16 years, 3 months

: Have iterators on mln::complex export their dimension.

by Roland Levillain

* mln/core/complex_iter.hh (mln::complex_fwd_iter<D>::complex_dim): (mln::complex_bkd_iter<D>::complex_dim): New constants. --- milena/ChangeLog | 9 +++++++++ milena/mln/core/complex_iter.hh | 2 ++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e4a915e..fbf267f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2008-09-14 Roland Levillain <roland(a)lrde.epita.fr> + + Have iterators on mln::complex export their dimension. + + * mln/core/complex_iter.hh + (mln::complex_fwd_iter<D>::complex_dim): + (mln::complex_bkd_iter<D>::complex_dim): + New constants. + 2008-09-13 Roland Levillain <roland(a)lrde.epita.fr> Add default ctors for iterators on faces. diff --git a/milena/mln/core/complex_iter.hh b/milena/mln/core/complex_iter.hh index 3dcb445..4e757ea 100644 --- a/milena/mln/core/complex_iter.hh +++ b/milena/mln/core/complex_iter.hh @@ -50,6 +50,7 @@ namespace mln { public: typedef any_face_handle<D> face; + static const unsigned complex_dim = D; private: typedef complex_fwd_iter_<D> self_; @@ -100,6 +101,7 @@ namespace mln { public: typedef any_face_handle<D> face; + static const unsigned complex_dim = D; private: typedef complex_bkd_iter_<D> self_; -- 1.6.0.1

16 years, 3 months

2259: Factor iterators on mln::p_complex.

by Roland Levillain

* mln/core/internal/p_complex_piter_base.hh: New. Use it to factor... * mln/core/p_complex_piter.hh (mln::p_complex_fwd_piter_<D, P>) (mln::p_complex_bkd_piter_<D, P>): ...these. --- milena/ChangeLog | 11 + milena/mln/core/internal/p_complex_piter_base.hh | 294 ++++++++++++++++ milena/mln/core/p_complex_piter.hh | 397 +--------------------- 3 files changed, 322 insertions(+), 380 deletions(-) create mode 100644 milena/mln/core/internal/p_complex_piter_base.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index fbf267f..d80dc75 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2008-09-14 Roland Levillain <roland(a)lrde.epita.fr> + Factor iterators on mln::p_complex. + + * mln/core/internal/p_complex_piter_base.hh: New. + Use it to factor... + * mln/core/p_complex_piter.hh + (mln::p_complex_fwd_piter_<D, P>) + (mln::p_complex_bkd_piter_<D, P>): + ...these. + +2008-09-14 Roland Levillain <roland(a)lrde.epita.fr> + Have iterators on mln::complex export their dimension. * mln/core/complex_iter.hh diff --git a/milena/mln/core/internal/p_complex_piter_base.hh b/milena/mln/core/internal/p_complex_piter_base.hh new file mode 100644 index 0000000..a9d5f6d --- /dev/null +++ b/milena/mln/core/internal/p_complex_piter_base.hh @@ -0,0 +1,294 @@ +// 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. +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_INTERNAL_P_COMPLEX_PITER_BASE_HH +# define MLN_CORE_INTERNAL_P_COMPLEX_PITER_BASE_HH + +/// \file mln/core/internal/p_complex_piter_base.hh +/// \brief Definition of an implementation (factoring) class for +/// iterators on mln::p_complex. + +# include <limits> + +# include <mln/core/internal/point_iterator_base.hh> +# include <mln/core/p_complex.hh> +# include <mln/core/complex_psite.hh> +# include <mln/core/complex_iter.hh> + +namespace mln +{ + /* FIXME: Get rid of P? */ + + // Forward declarations. + template <unsigned D, typename P> class p_complex; + template <unsigned D, typename P> class complex_psite; + + namespace internal + { + + /*---------------------------------. + | p_complex_piter_base_<I, P, E>. | + `---------------------------------*/ + + /// \brief Factoring class for iterators on mln::p_complex. + /// + /// \arg \p I The type of the underlying complex iterator. + /// \arg \p P The associated point type. + /// \arg \p E The type exact type of the iterator. + template <typename I, typename P, typename E> + class p_complex_piter_base_ : public point_iterator_base_< P, E > + { + typedef p_complex_piter_base_<I, P, E> self_; + typedef point_iterator_base_< P, E > super_; + + /// The type of the underlying complex iterator. + typedef I iter; + + public: + typedef p_complex<iter::complex_dim, P> pset; + typedef complex_psite<iter::complex_dim, P> psite; + typedef P point; + typedef mln_coord(point) coord; + + /// Construction and assignment. + /// \{ + p_complex_piter_base_(const pset& pc); + p_complex_piter_base_(const self_& rhs); + self_& operator= (const self_& rhs); + /// \} + + /// Manipulation. + /// \{ + /// Test if the iterator is valid. + bool is_valid() const; + /// Invalidate the iterator. + void invalidate(); + /// Start an iteration. + void start(); + + /// Go to the next point. + void next_(); + /// Update the internal data of the iterator. + void update_(); + /// \} + + /// Conversion and accessors. + /// \{ + /// Reference to the corresponding point. + // FIXME: Don't use this method (dummy value). + const point& to_point () const; + /// Reference to the corresponding point site. + const psite& to_psite () const; + /// Convert the iterator into a line graph psite. + operator psite() const; + + /// Read-only access to the \a i-th coordinate. + // FIXME: Don't use this operator (dummy value). + coord operator[](unsigned i) const; + /// \} + + private: + /// The underlying complex iterator. + iter iter_; + /// The psite corresponding to this iterator. + psite psite_; + /// \brief The point associated to this psite. + // FIXME: Actually, this is a dummy value! + point p_; + }; + + + /* FIXME: This hand-made delegation is painful. We should rely on + the general mechanism provided by Point_Site. But then again, we + need to refine/adjust the interface of Point_Site w.r.t. the + mandatory conversions to points. */ + template <typename I, typename P, typename E> + inline + std::ostream& + operator<<(std::ostream& ostr, const p_complex_piter_base_<I, P, E>& p); + + + + +# ifndef MLN_INCLUDE_ONLY + + /*---------------------------------. + | p_complex_piter_base_<I, P, E>. | + `---------------------------------*/ + + template <typename I, typename P, typename E> + inline + p_complex_piter_base_<I, P, E>::p_complex_piter_base_(const pset& pc) + // Initialize psite_ and p_ a dummy values. + : psite_(), + p_() + { + iter_.set_cplx(pc.cplx()); + mln_postcondition(!is_valid()); + } + + template <typename I, typename P, typename E> + inline + p_complex_piter_base_<I, P, E>::p_complex_piter_base_(const p_complex_piter_base_<I, P, E>& rhs) + : iter_(rhs.iter_), + psite_(rhs.psite_), + // Dummy value. + p_() + { + } + + template <typename I, typename P, typename E> + inline + p_complex_piter_base_<I, P, E>& + p_complex_piter_base_<I, P, E>::operator=(const p_complex_piter_base_<I, P, E>& rhs) + { + if (&rhs == this) + return *this; + iter_ = rhs.iter_; + psite_ = rhs.psite_; + return *this; + } + + template <typename I, typename P, typename E> + inline + mln_coord(P) + p_complex_piter_base_<I, P, E>::operator[](unsigned i) const + { + // Dummy value. + return p_[i]; + } + + template <typename I, typename P, typename E> + inline + bool + p_complex_piter_base_<I, P, E>::is_valid() const + { + return iter_.is_valid(); + } + + template <typename I, typename P, typename E> + inline + void + p_complex_piter_base_<I, P, E>::invalidate() + { + iter_.invalidate(); + } + + template <typename I, typename P, typename E> + inline + void + p_complex_piter_base_<I, P, E>::start() + { + iter_.start(); + update_(); + } + + template <typename I, typename P, typename E> + inline + void + p_complex_piter_base_<I, P, E>::next_() + { + iter_.next_(); + if (is_valid()) + update_(); + } + + template <typename I, typename P, typename E> + inline + void + p_complex_piter_base_<I, P, E>::update_() + { + // Update psite_. + psite_ = psite(iter_); + } + + template <typename I, typename P, typename E> + inline + const P& + p_complex_piter_base_<I, P, E>::to_point() const + { + // Dummy value. + return p_; + } + + template <typename I, typename P, typename E> + inline + const typename p_complex_piter_base_<I, P, E>::psite& + p_complex_piter_base_<I, P, E>::to_psite() const + { + /* We don't check whether the iterator is valid before returning + the value using + + mln_precondition(is_valid()); + + since this method may be called *before* the iterator is + actually initialized. This is the case for instance when this + point iterator (say, P) is used to initialize another iterator + on window or neighborhood (say, Q); most of the time, for_all() + is responsible for the initialization of P, but it takes place + *after* the creation of Q. */ + return psite_; + } + + template <typename I, typename P, typename E> + inline + p_complex_piter_base_<I, P, E>::operator psite() const + { + mln_precondition(is_valid()); + return psite_; + } + + + template <typename I, typename P, typename E> + inline + std::ostream& + operator<<(std::ostream& ostr, const p_complex_piter_base_<I, P, E>& p) + { + /* FIXME: We should use p.to_psite() here, but as it lacks the + precondition the conversion operator has, so we use the latter. + + We should + - rename `to_psite' as `to_psite_'; + - write a new `to_psite' routine checking the validity of the + iterator; + - have the conversion operator to psite use this new `to_psite' + routine; + - adjust former clients of `to_psite' + + This is a general remark that applies to all point/psite + iterators of Milena. */ + return ostr << static_cast< mln_psite(E) >(p); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of mln::internal + +} // end of mln + + +#endif // ! MLN_CORE_INTERNAL_P_COMPLEX_PITER_BASE_HH diff --git a/milena/mln/core/p_complex_piter.hh b/milena/mln/core/p_complex_piter.hh index d9ce17a..f4b1158 100644 --- a/milena/mln/core/p_complex_piter.hh +++ b/milena/mln/core/p_complex_piter.hh @@ -31,23 +31,12 @@ /// \file mln/core/p_complex_piter.hh /// \brief Definition of point iterator on complex-based pset. -# include <limits> - -# include <mln/core/internal/point_iterator_base.hh> -# include <mln/core/p_complex.hh> -# include <mln/core/complex_psite.hh> -# include <mln/core/complex_iter.hh> - -// Factor p_complex_fwd_piter_<D, P> and p_complex_bkd_piter_<D, P>. +# include <mln/core/internal/p_complex_piter_base.hh> namespace mln { /* FIXME: Get rid of P? */ - // Fwd decls. - template <unsigned D, typename P> class p_complex; - template <unsigned D, typename P> class complex_psite; - /*-----------------------------. | p_complex_fwd_piter_<D, P>. | @@ -56,81 +45,24 @@ namespace mln /// \brief Forward iterator on point sites of a mln::p_complex<D, P>. template <unsigned D, typename P> class p_complex_fwd_piter_ - : public internal::point_iterator_base_< P, p_complex_fwd_piter_<D, P> > + : public internal::p_complex_piter_base_< complex_fwd_iter_<D>, + P, + p_complex_fwd_piter_<D, P> > { typedef p_complex_fwd_piter_<D, P> self_; - typedef internal::point_iterator_base_< P, self_ > super_; - - /// The type of the underlying complex iterator. - typedef complex_fwd_iter_<D> iter; + typedef + internal::p_complex_piter_base_< complex_fwd_iter_<D>, P, self_ > super_; public: - // Make definitions from super class available. - // FIXME: Is it still meaningful for a complex? - enum { dim = super_::dim }; - - typedef complex_psite<D, P> psite; - typedef P point; - typedef mln_coord(point) coord; - /// Construction and assignment. /// \{ p_complex_fwd_piter_(const p_complex<D, P>& pc); p_complex_fwd_piter_(const self_& rhs); self_& operator= (const self_& rhs); /// \} - - /// Manipulation. - /// \{ - /// Test if the iterator is valid. - bool is_valid() const; - /// Invalidate the iterator. - void invalidate(); - /// Start an iteration. - void start(); - - /// Go to the next point. - void next_(); - /// Update the internal data of the iterator. - void update_(); - /// \} - - /// Conversion and accessors. - /// \{ - /// Reference to the corresponding point. - // FIXME: Don't use this method (dummy value). - const point& to_point () const; - /// Reference to the corresponding point site. - const psite& to_psite () const; - /// Convert the iterator into a line graph psite. - operator psite() const; - - /// Read-only access to the \a i-th coordinate. - // FIXME: Don't use this operator (dummy value). - coord operator[](unsigned i) const; - /// \} - - private: - /// The underlying complex iterator. - iter iter_; - /// The psite corresponding to this iterator. - psite psite_; - /// \brief The point associated to this psite. - // FIXME: Actually, this is a dummy value! - point p_; }; - /* FIXME: This hand-made delegation is painful. We should rely on - the general mechanism provided by Point_Site. But then again, we - need to refine/adjust the interface of Point_Site w.r.t. the - mandatory conversions to points. */ - template <unsigned D, typename P> - inline - std::ostream& - operator<<(std::ostream& ostr, const p_complex_fwd_piter_<D, P>& p); - - /*-----------------------------. | p_complex_bkd_piter_<D, P>. | `-----------------------------*/ @@ -138,81 +70,24 @@ namespace mln /// \brief Backward iterator on point sites of a mln::p_complex<D, P>. template <unsigned D, typename P> class p_complex_bkd_piter_ - : public internal::point_iterator_base_< P, p_complex_bkd_piter_<D, P> > + : public internal::p_complex_piter_base_< complex_bkd_iter_<D>, + P, + p_complex_bkd_piter_<D, P> > { typedef p_complex_bkd_piter_<D, P> self_; - typedef internal::point_iterator_base_< P, self_ > super_; - - /// The type of the underlying complex iterator. - typedef complex_bkd_iter_<D> iter; + typedef + internal::p_complex_piter_base_< complex_bkd_iter_<D>, P, self_ > super_; public: - // Make definitions from super class available. - // FIXME: Is it still meaningful for a complex? - enum { dim = super_::dim }; - - typedef complex_psite<D, P> psite; - typedef P point; - typedef mln_coord(point) coord; - /// Construction and assignment. /// \{ p_complex_bkd_piter_(const p_complex<D, P>& pc); p_complex_bkd_piter_(const self_& rhs); self_& operator= (const self_& rhs); /// \} - - /// Manipulation. - /// \{ - /// Test if the iterator is valid. - bool is_valid() const; - /// Invalidate the iterator. - void invalidate(); - /// Start an iteration. - void start(); - - /// Go to the next point. - void next_(); - /// Update the internal data of the iterator. - void update_(); - /// \} - - /// Conversion and accessors. - /// \{ - /// Reference to the corresponding point. - // FIXME: Don't use this method (dummy value). - const point& to_point () const; - /// Reference to the corresponding point site. - const psite& to_psite () const; - /// Convert the iterator into a line graph psite. - operator psite() const; - - /// Read-only access to the \a i-th coordinate. - // FIXME: Don't use this operator (dummy value). - coord operator[](unsigned i) const; - /// \} - - private: - /// The underlying complex iterator. - iter iter_; - /// The psite corresponding to this iterator. - psite psite_; - /// \brief The point associated to this psite. - // FIXME: Actually, this is a dummy value! - point p_; }; - /* FIXME: This hand-made delegation is painful. We should rely on - the general mechanism provided by Point_Site. But then again, we - need to refine/adjust the interface of Point_Site w.r.t. the - mandatory conversions to points. */ - template <unsigned D, typename P> - inline - std::ostream& - operator<<(std::ostream& ostr, const p_complex_bkd_piter_<D, P>& p); - - # ifndef MLN_INCLUDE_ONLY @@ -223,21 +98,14 @@ namespace mln template <unsigned D, typename P> inline p_complex_fwd_piter_<D, P>::p_complex_fwd_piter_(const p_complex<D, P>& pc) - // Initialize psite_ and p_ a dummy values. - : psite_(), - p_() + : super_(pc) { - iter_.set_cplx(pc.cplx()); - mln_postcondition(!is_valid()); } template <unsigned D, typename P> inline p_complex_fwd_piter_<D, P>::p_complex_fwd_piter_(const p_complex_fwd_piter_<D, P>& rhs) - : iter_(rhs.iter_), - psite_(rhs.psite_), - // Dummy value. - p_() + : super_(rhs) { } @@ -248,122 +116,10 @@ namespace mln { if (&rhs == this) return *this; - iter_ = rhs.iter_; - psite_ = rhs.psite_; + super_::operator=(rhs); return *this; } - template <unsigned D, typename P> - inline - mln_coord(P) - p_complex_fwd_piter_<D, P>::operator[](unsigned i) const - { - // Dummy value. - return p_[i]; - } - - template <unsigned D, typename P> - inline - bool - p_complex_fwd_piter_<D, P>::is_valid() const - { - return iter_.is_valid(); - } - - template <unsigned D, typename P> - inline - void - p_complex_fwd_piter_<D, P>::invalidate() - { - iter_.invalidate(); - } - - template <unsigned D, typename P> - inline - void - p_complex_fwd_piter_<D, P>::start() - { - iter_.start(); - update_(); - } - - template <unsigned D, typename P> - inline - void - p_complex_fwd_piter_<D, P>::next_() - { - iter_.next_(); - if (is_valid()) - update_(); - } - - template <unsigned D, typename P> - inline - void - p_complex_fwd_piter_<D, P>::update_() - { - // Update psite_. - psite_ = complex_psite<D, P>(iter_); - } - - template <unsigned D, typename P> - inline - const P& - p_complex_fwd_piter_<D, P>::to_point() const - { - // Dummy value. - return p_; - } - - template <unsigned D, typename P> - inline - const complex_psite<D, P>& - p_complex_fwd_piter_<D, P>::to_psite() const - { - /* We don't check whether the iterator is valid before returning - the value using - - mln_precondition(is_valid()); - - since this method may be called *before* the iterator is - actually initialized. This is the case for instance when this - point iterator (say, P) is used to initialize another iterator - on window or neighborhood (say, Q); most of the time, for_all() - is responsible for the initialization of P, but it takes place - *after* the creation of Q. */ - return psite_; - } - - template <unsigned D, typename P> - inline - p_complex_fwd_piter_<D, P>::operator complex_psite<D, P>() const - { - mln_precondition(is_valid()); - return psite_; - } - - - template <unsigned D, typename P> - inline - std::ostream& - operator<<(std::ostream& ostr, const p_complex_fwd_piter_<D, P>& p) - { - /* FIXME: We should use p.to_psite() here, but as it lacks the - precondition the conversion operator has, so we use the latter. - - We should - - rename `to_psite' as `to_psite_'; - - write a new `to_psite' routine checking the validity of the - iterator; - - have the conversion operator to psite use this new `to_psite' - routine; - - adjust former clients of `to_psite' - - This is a general remark that applies to all point/psite - iterators of Milena. */ - return ostr << static_cast< complex_psite<D, P> >(p); - } - /*-----------------------------. | p_complex_bkd_piter_<D, P>. | @@ -372,21 +128,14 @@ namespace mln template <unsigned D, typename P> inline p_complex_bkd_piter_<D, P>::p_complex_bkd_piter_(const p_complex<D, P>& pc) - // Initialize psite_ and p_ a dummy values. - : psite_(), - p_() + : super_(pc) { - iter_.set_cplx(pc.cplx()); - mln_postcondition(!is_valid()); } template <unsigned D, typename P> inline p_complex_bkd_piter_<D, P>::p_complex_bkd_piter_(const p_complex_bkd_piter_<D, P>& rhs) - : iter_(rhs.iter_), - psite_(rhs.psite_), - // Dummy value. - p_() + : super_(rhs) { } @@ -397,122 +146,10 @@ namespace mln { if (&rhs == this) return *this; - iter_ = rhs.iter_; - psite_ = rhs.psite_; + super_::operator=(rhs); return *this; } - template <unsigned D, typename P> - inline - mln_coord(P) - p_complex_bkd_piter_<D, P>::operator[](unsigned i) const - { - // Dummy value. - return p_[i]; - } - - template <unsigned D, typename P> - inline - bool - p_complex_bkd_piter_<D, P>::is_valid() const - { - return iter_.is_valid(); - } - - template <unsigned D, typename P> - inline - void - p_complex_bkd_piter_<D, P>::invalidate() - { - iter_.invalidate(); - } - - template <unsigned D, typename P> - inline - void - p_complex_bkd_piter_<D, P>::start() - { - iter_.start(); - update_(); - } - - template <unsigned D, typename P> - inline - void - p_complex_bkd_piter_<D, P>::next_() - { - iter_.next_(); - if (is_valid()) - update_(); - } - - template <unsigned D, typename P> - inline - void - p_complex_bkd_piter_<D, P>::update_() - { - // Update psite_. - psite_ = complex_psite<D, P>(iter_); - } - - template <unsigned D, typename P> - inline - const P& - p_complex_bkd_piter_<D, P>::to_point() const - { - // Dummy value. - return p_; - } - - template <unsigned D, typename P> - inline - const complex_psite<D, P>& - p_complex_bkd_piter_<D, P>::to_psite() const - { - /* We don't check whether the iterator is valid before returning - the value using - - mln_precondition(is_valid()); - - since this method may be called *before* the iterator is - actually initialized. This is the case for instance when this - point iterator (say, P) is used to initialize another iterator - on window or neighborhood (say, Q); most of the time, for_all() - is responsible for the initialization of P, but it takes place - *after* the creation of Q. */ - return psite_; - } - - template <unsigned D, typename P> - inline - p_complex_bkd_piter_<D, P>::operator complex_psite<D, P>() const - { - mln_precondition(is_valid()); - return psite_; - } - - - template <unsigned D, typename P> - inline - std::ostream& - operator<<(std::ostream& ostr, const p_complex_bkd_piter_<D, P>& p) - { - /* FIXME: We should use p.to_psite() here, but as it lacks the - precondition the conversion operator has, so we use the latter. - - We should - - rename `to_psite' as `to_psite_'; - - write a new `to_psite' routine checking the validity of the - iterator; - - have the conversion operator to psite use this new `to_psite' - routine; - - adjust former clients of `to_psite' - - This is a general remark that applies to all point/psite - iterators of Milena. */ - return ostr << static_cast< complex_psite<D, P> >(p); - } - # endif // ! MLN_INCLUDE_ONLY } // end of mln -- 1.6.0.1

16 years, 3 months

cleanup-2008 2257: Fix multiple-windows.

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> Fix multiple-windows. * mln/win/multiple.hh (n): Turn this parameter into dynamic. Fix. * doc/tutorial/examples/win_multiple.cc: Update. doc/tutorial/examples/win_multiple.cc | 8 - mln/win/multiple.hh | 210 +++++++++++++++++++++++++--------- 2 files changed, 164 insertions(+), 54 deletions(-) Index: doc/tutorial/examples/win_multiple.cc --- doc/tutorial/examples/win_multiple.cc (revision 2256) +++ doc/tutorial/examples/win_multiple.cc (working copy) @@ -2,6 +2,7 @@ # include <mln/core/alias/window2d.hh> # include <mln/win/multiple.hh> +// # include <mln/border/fill.hh> # include <mln/debug/iota.hh> # include <mln/debug/println.hh> @@ -39,11 +40,12 @@ using namespace mln; typedef image2d<unsigned> I; - I ima(3, 3, 0); // no border + I ima(3, 3, 0); // 1); + // border::fill(ima, 0); debug::iota(ima); debug::println(ima); - win::multiple<2, window2d, row_oddity> w; + win::multiple<window2d, row_oddity> w; bool vert[] = { 0, 1, 0, 0, 0, 0, @@ -53,7 +55,7 @@ 1, 0, 1, 0, 0, 0 }; w.set_window(1, make::window2d(horiz)); + mln_assertion(w.size() == 2); browse(ima, w); - } Index: mln/win/multiple.hh --- mln/win/multiple.hh (revision 2256) +++ mln/win/multiple.hh (working copy) @@ -35,6 +35,7 @@ # include <mln/core/internal/window_base.hh> # include <mln/core/internal/site_relative_iterator_base.hh> +# include <mln/util/array.hh> @@ -45,11 +46,11 @@ { // Forward declaration. - template <unsigned n, typename W, typename F> class multiple_qiter; + template <typename W, typename F> class multiple_qiter; - template <unsigned n, typename W, typename F> - class multiple : public internal::window_base< mln_dpsite(W), multiple<n,W,F> > + template <typename W, typename F> + class multiple : public internal::window_base< mln_dpsite(W), multiple<W,F> > { public: @@ -57,106 +58,213 @@ typedef mln_psite(W) psite; typedef mln_site(W) site; - typedef multiple_qiter<n,W,F> fwd_qiter; - typedef multiple_qiter<n,W,F> bkd_qiter; - typedef multiple_qiter<n,W,F> qiter; + typedef multiple_qiter<W,F> fwd_qiter; + typedef multiple_qiter<W,F> bkd_qiter; + typedef multiple_qiter<W,F> qiter; - multiple() + multiple(); + + multiple(const F& f); + + bool is_empty() const; + + void set_window(unsigned i, const W& win); + + const W& window(unsigned i) const; + + unsigned size() const; + + unsigned size_around(const mln_psite(W)& p) const; + + const mln_dpsite(W)& ith_dp_around(unsigned i, const mln_psite(W)& p) const; + + private: + + util::array<W> win_; + F f_; + unsigned size_; + }; + + + + template <typename W, typename F> + class multiple_qiter + : public internal::site_relative_iterator_base< multiple<W,F>, + multiple_qiter<W,F> > + { + public: + + multiple_qiter(); + + template <typename P> + multiple_qiter(const multiple<W,F>& w, const P& c); + + /// Test the iterator validity. + bool is_valid_() const; + + /// Invalidate the iterator. + void invalidate_(); + + /// Start an iteration. + void do_start_(); + + /// Go to the next point. + void do_next_(); + + /// Compute the current psite. + mln_psite(W) compute_p_() const; + + private: + int i_; + unsigned n_() const; + }; + + + +# ifndef MLN_INCLUDE_ONLY + + // win::multiple<W,F> + + template <typename W, typename F> + inline + multiple<W,F>::multiple() : f_() { } - multiple(const F& f) + template <typename W, typename F> + inline + multiple<W,F>::multiple(const F& f) : f_(f) { } - bool is_empty() const + template <typename W, typename F> + inline + bool + multiple<W,F>::is_empty() const { - bool res = false; - for (unsigned i = 0; i < n; ++i) - if (win_[i].is_empty()) - return true; - return res; + return size_ == 0; } - void set_window(unsigned i, const W& win) + template <typename W, typename F> + inline + void + multiple<W,F>::set_window(unsigned i, const W& win) { - mln_precondition(i < n); - win_[i] = win; + mln_precondition(i == win_.nelements()); + win_.append(win); } - const W& window(unsigned i) const + template <typename W, typename F> + inline + const W& + multiple<W,F>::window(unsigned i) const { - mln_precondition(i < n); + mln_precondition(i < win_.nelements()); return win_[i]; } - const F& fun() const + template <typename W, typename F> + inline + unsigned + multiple<W,F>::size() const { - return f_; + mln_precondition(win_.nelements() >= 1); + unsigned s = win_[0].size(); + for (unsigned i = 1; i < win_.nelements(); ++i) + mln_precondition(win_[i].size() == s); + return s; } - private: - W win_[n]; - F f_; - }; + template <typename W, typename F> + inline + unsigned + multiple<W,F>::size_around(const mln_psite(W)& p) const + { + mln_precondition(f_(p) < win_.nelements()); + return win_[f_(p)].size(); + } + template <typename W, typename F> + inline + const mln_dpsite(W)& + multiple<W,F>::ith_dp_around(unsigned i, const mln_psite(W)& p) const + { + mln_precondition(f_(p) < win_.nelements()); + mln_precondition(i < win_[f_(p)].size()); + return win_[f_(p)].dp(i); + } - template <unsigned n, typename W, typename F> - class multiple_qiter - : public internal::site_relative_iterator_base< multiple<n,W,F>, - multiple_qiter<n,W,F> > - { - public: + // win::multiple_qiter<W,F> - multiple_qiter() + template <typename W, typename F> + inline + multiple_qiter<W,F>::multiple_qiter() { } + template <typename W, typename F> template <typename P> - multiple_qiter(const multiple<n,W,F>& w, const P& c) + inline + multiple_qiter<W,F>::multiple_qiter(const multiple<W,F>& w, const P& c) { - this->change_target(w); this->center_at(c); + // We have to first change the center so that 'invalidate' can + // work when changing the target. + this->change_target(w); } - /// Test the iterator validity. - bool is_valid_() const + template <typename W, typename F> + inline + bool + multiple_qiter<W,F>::is_valid_() const { - return i_ != -1; + return i_ < n_(); } - /// Invalidate the iterator. - void invalidate_() + template <typename W, typename F> + inline + void + multiple_qiter<W,F>::invalidate_() { - i_ = -1; + i_ = n_(); } - /// Start an iteration. - void do_start_() + template <typename W, typename F> + inline + void + multiple_qiter<W,F>::do_start_() { i_ = 0; } - /// Go to the next point. - void do_next_() + template <typename W, typename F> + inline + void + multiple_qiter<W,F>::do_next_() { ++i_; } - /// Compute the current psite. - mln_psite(W) compute_p_() const + template <typename W, typename F> + inline + mln_psite(W) + multiple_qiter<W,F>::compute_p_() const { - unsigned w = this->s_->fun()(*this->c_); - return *this->c_ + this->s_->window(w).std_vector()[i_]; + return *this->c_ + this->s_->ith_dp_around(i_, *this->c_); } - private: - int i_; - }; + template <typename W, typename F> + inline + unsigned + multiple_qiter<W,F>::n_() const + { + return this->s_->size_around(*this->c_); + } +# endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::win

16 years, 3 months

← Newer
1
...
20
21
22
23
24
25
26
...
36
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 September 2008