Olena-patches June 2008

olena-patches@lrde.epita.fr

9 participants
135 discussions

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

cleanup-2008 2083: Convert ChangeLogs to Latin-1, and have Emacs respect that encoding

by Roland Levillain

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008 Index: milena/ChangeLog =================================================================== --- milena/ChangeLog (revision 2082) +++ milena/ChangeLog (revision 2083) @@ -9,7 +9,7 @@ image types can be delayed. (mln_decl_unary_expr_): Likewise. -2008-06-24 Thierry GÃ©raud <thierry.geraud(a)lrde.epita.fr> +2008-06-24 Thierry Géraud <thierry.geraud(a)lrde.epita.fr> Add some technical documentation to iterator base classes. @@ -13739,10 +13739,11 @@ * vcs/milena.rb: New file. +$Rev$ +$Id$ +$Date$ + Local Variables: ispell-local-dictionary: "american" +coding: iso-latin-1 End: - -$Rev$ -$Id$ -$Date$ Index: milena/sandbox/ChangeLog =================================================================== --- milena/sandbox/ChangeLog (revision 2082) +++ milena/sandbox/ChangeLog (revision 2083) @@ -2583,6 +2583,11 @@ method. +$Rev$ +$Id$ +$Date$ + Local Variables: ispell-local-dictionary: "american" +coding: iso-latin-1 End: Property changes on: milena/sandbox/ChangeLog ___________________________________________________________________ Name: svn:keywords + Rev Id Date Index: ChangeLog =================================================================== --- ChangeLog (revision 2082) +++ ChangeLog (revision 2083) @@ -831,10 +831,11 @@ * vcs/oln.rb: New. +$Rev$ +$Id$ +$Date$ + Local Variables: ispell-local-dictionary: "american" +coding: iso-latin-1 End: - -$Rev$ -$Id$ -$Date$

16 years, 6 months

2082: mln/core/concept/point_site.hh: Add FIXMEs.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * mln/core/concept/point_site.hh: Add FIXMEs. point_site.hh | 4 ++++ 1 file changed, 4 insertions(+) Index: mln/core/concept/point_site.hh --- mln/core/concept/point_site.hh (revision 2081) +++ mln/core/concept/point_site.hh (working copy) @@ -266,6 +266,8 @@ // Operators. + // FIXME: Remove, or factor in a lower class (Th�o removed it from + // the cleanup-2008 branch). template <typename L, typename R> inline bool operator==(const Point_Site<L>& lhs_, const Point_Site<R>& rhs_) @@ -279,6 +281,8 @@ return true; } + // FIXME: Remove, or factor in a lower class (Th�o removed it from + // the cleanup-2008 branch). template <typename L, typename R> inline bool operator<(const Point_Site<L>& lhs_, const Point_Site<R>& rhs_)

16 years, 6 months

***SPAM*** L2 2081: More uses of literal::zero in mln::labeling and mln::morpho.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> More uses of literal::zero in mln::labeling and mln::morpho. * mln/canvas/labeling.hh (mln::canvas::labeling<F>::init) * mln/morpho/meyer_wst.hh (mln::morpho::meyer_wst): Use mln::literal::zero instead of plain 0. * mln/labeling/regional_maxima.hh, * mln/labeling/regional_minima.hh: Add a FIXME (see https://trac.lrde.org/olena/ticket/146). canvas/labeling.hh | 11 +++++------ labeling/regional_maxima.hh | 11 ++++++----- labeling/regional_minima.hh | 11 ++++++----- morpho/meyer_wst.hh | 5 ++--- 4 files changed, 19 insertions(+), 19 deletions(-) Index: mln/canvas/labeling.hh --- mln/canvas/labeling.hh (revision 2080) +++ mln/canvas/labeling.hh (working copy) @@ -28,14 +28,13 @@ #ifndef MLN_CANVAS_LABELING_HH # define MLN_CANVAS_LABELING_HH -/*! \file mln/canvas/labeling.hh - * - * \brief Connected component labeling of the object part in a binary - * image. - */ +/// \file mln/canvas/labeling.hh +/// \brief Connected component labeling of the object part in a binary +/// image. # include <mln/core/concept/image.hh> # include <mln/level/fill.hh> +# include <mln/literal/zero.hh> # include <mln/convert/to_upper_window.hh> @@ -160,7 +159,7 @@ mln::level::fill(deja_vu, false); initialize(parent, f.input); initialize(output, f.input); - mln::level::fill(output, 0); // FIXME: Use literal::zero. + mln::level::fill(output, literal::zero); nlabels = 0; } Index: mln/morpho/meyer_wst.hh --- mln/morpho/meyer_wst.hh (revision 2080) +++ mln/morpho/meyer_wst.hh (working copy) @@ -46,10 +46,10 @@ // FIXME: See below. # include <mln/util/greater_psite.hh> # include <mln/morpho/includes.hh> +# include <mln/literal/zero.hh> # include <mln/labeling/regional_minima.hh> - namespace mln { @@ -110,8 +110,7 @@ /* FIXME: Ensure the input image has scalar values. */ typedef L marker; - // FIXME: Use literal::zero. - const marker unmarked = 0; + const marker unmarked = literal::zero; // Initialize the output with the markers (minima components). mln_ch_value(I, marker) output = Index: mln/labeling/regional_maxima.hh --- mln/labeling/regional_maxima.hh (revision 2080) +++ mln/labeling/regional_maxima.hh (working copy) @@ -28,11 +28,9 @@ #ifndef MLN_LABELING_REGIONAL_MAXIMA_HH # define MLN_LABELING_REGIONAL_MAXIMA_HH -/*! \file mln/labeling/regional_maxima.hh - * - * \brief Connected component labeling of the regional maxima of an - * image. - */ +/// \file mln/labeling/regional_maxima.hh +/// \brief Connected component labeling of the regional maxima of an +/// image. # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> @@ -124,6 +122,9 @@ { trace::entering("labeling::impl::generic::regional_maxima_"); + // FIXME: abort if L is not wide enough to encode the set of + // maxima. + typedef impl::regional_maxima_functor<I,N,L> F; F f(input, nbh); canvas::labeling<F> run(f); Index: mln/labeling/regional_minima.hh --- mln/labeling/regional_minima.hh (revision 2080) +++ mln/labeling/regional_minima.hh (working copy) @@ -28,11 +28,9 @@ #ifndef MLN_LABELING_REGIONAL_MINIMA_HH # define MLN_LABELING_REGIONAL_MINIMA_HH -/*! \file mln/labeling/regional_minima.hh - * - * \brief Connected component labeling of the regional minima of an - * image. - */ +/// \file mln/labeling/regional_minima.hh +/// \brief Connected component labeling of the regional minima of an +/// image. # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> @@ -122,6 +120,9 @@ { trace::entering("labeling::impl::generic::regional_minima_"); + // FIXME: abort if L is not wide enough to encode the set of + // minima. + typedef impl::regional_minima_functor<I,N,L> F; F f(input, nbh); canvas::labeling<F> run(f);

16 years, 6 months

2080: Move a morpho-related test in the right directory.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Move a morpho-related test in the right directory. * tests/core/line_graph_image_wst.cc: Move... * tests/morpho/line_graph_image_wst.cc: ...here. * tests/core/Makefile.am (check_PROGRAMS): Remove line_graph_image_wst. (line_graph_image_wst_SOURCES): Move... * tests/morpho/Makefile.am: ...here. (check_PROGRAMS): Add line_graph_image_wst. core/Makefile.am | 2 -- morpho/Makefile.am | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) Index: tests/core/Makefile.am --- tests/core/Makefile.am (revision 2079) +++ tests/core/Makefile.am (working copy) @@ -41,7 +41,6 @@ line_graph_elt_neighborhood \ line_graph_elt_window \ line_graph_image \ - line_graph_image_wst \ line_piter \ \ mono_obased_rle_image \ @@ -128,7 +127,6 @@ line_graph_elt_neighborhood_SOURCES = line_graph_elt_neighborhood.cc line_graph_elt_window_SOURCES = line_graph_elt_window.cc line_graph_image_SOURCES = line_graph_image.cc -line_graph_image_wst_SOURCES = line_graph_image_wst.cc line_piter_SOURCES = line_piter.cc mono_obased_rle_image_SOURCES = mono_obased_rle_image.cc Index: tests/morpho/Makefile.am --- tests/morpho/Makefile.am (revision 2079) +++ tests/morpho/Makefile.am (working copy) @@ -18,6 +18,7 @@ laplacian \ lena_line_graph_image_wst1 \ lena_line_graph_image_wst2 \ + line_graph_image_wst \ meyer_wst \ meyer_wst_long \ opening_area \ @@ -48,6 +49,7 @@ laplacian_SOURCES = laplacian.cc thinning_SOURCES = thinning.cc +line_graph_image_wst_SOURCES = line_graph_image_wst.cc meyer_wst_SOURCES = meyer_wst.cc combined_SOURCES = combined.cc

16 years, 6 months

2079: Misc. fixes in mln::p_array.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Misc. fixes in mln::p_array. * mln/core/p_array.hh: Update documentation. Aesthetic changes. (mln::p_array::p_array ()) (mln::p_array::p_array (const std::vector&)): Initialize mln::p_array::bb_needs_update_ using the initialization list of the ctor. (mln::p_array::clear): Don't forget to initialize mln::p_array::bb_. p_array.hh | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) Index: mln/core/p_array.hh --- mln/core/p_array.hh (revision 2078) +++ mln/core/p_array.hh (working copy) @@ -28,10 +28,8 @@ #ifndef MLN_CORE_P_ARRAY_HH # define MLN_CORE_P_ARRAY_HH -/*! \file mln/core/p_array.hh - * - * \brief Definition of a point set class based on std::vector. - */ +/// \file mln/core/p_array.hh +/// \brief Definition of a point set class based on std::vector. # include <vector> @@ -47,15 +45,17 @@ template <typename P> struct p_array_bkd_piter_; - /*! \brief Point set class based on std::vector. - * - * This is a multi-set of points. - * - * \warning We have some troubles with point set comparison based on - * a call to npoints(). FIXME: Explain! - * - * \todo Make it work with P being a Point_Site. - */ + /// \brief Point set class based on std::vector. + /// + /// This is a multi-set of points. The parameter \p P shall be a + /// Point type or a Point_Site. + /// + /// FIXME: If \p P is a Point_Site, but not a Point, the method + /// mln::p_array::bbox will not compile (see below). (Will be + /// fixed with the merge with branch cleanup-2008.) + /// + /// \warning We have some troubles with point set comparison based on + /// a call to npoints(). FIXME: Explain! template <typename P> class p_array : public internal::point_set_base_< P, p_array > { @@ -87,6 +87,8 @@ /// Give the number of points. std::size_t npoints() const; + /* FIXME: Won't work if P is not (implicitly) convertible to + mln_point(P). */ /// Give the exact bounding box. const box_<point>& bbox() const; @@ -125,16 +127,16 @@ template <typename P> inline p_array::p_array() + : bb_needs_update_(false) { - bb_needs_update_ = false; } template <typename P> inline p_array::p_array(const std::vector& vect) - : vect_(vect) + : vect_(vect), + bb_needs_update_(true) { - bb_needs_update_ = true; } template <typename P> @@ -223,6 +225,7 @@ p_array::clear() { vect_.clear(); + bb_.init(); bb_needs_update_ = false; }

16 years, 6 months

2078: Make the computation of the bbox of an mln::p_set lazy.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/trunk/milena Now, mln::p_set's and mln::p_array's implementations are much closer one another. Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Make the computation of the bbox of an mln::p_set lazy. * mln/core/p_set.hh (mln::p_set::point): New typedef. Use it... (mln::p_set::bbox): ...in the declaration of this method. (mln::p_set::bb_): Make it mutable. Change type from `accu::bbox' to `accu::bbox<point>'. (mln::p_set::bb_needs_update_): New attribute. (mln::p_set::update_bb_): New method. (p_set::p_set): Adjust ctor. (mln::p_set::insert) (mln::p_set::remove) (mln::p_set::clear) (mln::p_set::bbox): Adjust methods. * tests/core/point_set_compatibility.cc: Exercise p_set< graph_psite<point2d> >. mln/core/p_set.hh | 66 ++++++++++++++++++++++++---------- tests/core/point_set_compatibility.cc | 35 ++++++++++++++---- 2 files changed, 75 insertions(+), 26 deletions(-) Index: mln/core/p_set.hh --- mln/core/p_set.hh (revision 2077) +++ mln/core/p_set.hh (working copy) @@ -28,10 +28,9 @@ #ifndef MLN_CORE_P_SET_HH # define MLN_CORE_P_SET_HH -/*! \file mln/core/p_set.hh - * - * \brief Definition of a point set class based on std::set. - */ +/// \file mln/core/p_set.hh +/// \brief Definition of a point set class based on std::set, that can +/// behave also as a vector. # include <mln/core/internal/point_set_base.hh> # include <mln/core/internal/set_of.hh> @@ -42,13 +41,14 @@ namespace mln { - /*! \brief Point set class based on std::set. - * - * This is a mathematical set of points (not a multi-set). The - * parameter \p P shall be a Point type. - * - * \todo Test if \p P being a Point_Site is ok. - */ + /// \brief Point set class based on std::set. + /// + /// This is a mathematical set of points (not a multi-set). The + /// parameter \p P shall be a Point type or a Point_Site. + /// + /// FIXME: If \p is a Point_Site, but not a Point, the method + /// mln::p_set::bbox will not compile (see below). (Will be fixed + /// with the merge with branch cleanup-2008.) template <typename P> class p_set : public internal::point_set_base_< P, p_set >, private internal::set_of_ @@ -56,6 +56,16 @@ typedef internal::set_of_ super_; public: + /* FIXME: Should be removed as soon as branch cleanup-2008 is + merged with the trunk. */ + typedef mln_point(P) point; + + /* FIXME: mln::p_set uses the same iterators as mln::p_array, + because mln::p_set also have the interface of an array. We + might want to keep this, but we should change the name of the + iterator, either by using an alias (typedef), of by giving them + their own type (which could share code with + mln::p_array_{fwd,bkd}_piter_, of course). */ /// Forward Point_Iterator associated type. typedef p_array_fwd_piter_ fwd_piter; @@ -87,12 +97,16 @@ /// Clear this set. void clear(); + /* FIXME: Won't work if P is not (implicitly) convertible to + mln_point(P). */ /// Give the exact bounding box. - const box_<mln_point(P)>& bbox() const; + const box_<point>& bbox() const; protected: + mutable accu::bbox<point> bb_; + mutable bool bb_needs_update_; - accu::bbox bb_; + void update_bb_() const; // FIXME: Add invariant bb_.is_valid() <=> npoints() != 0 }; @@ -102,11 +116,24 @@ template <typename P> inline p_set::p_set() + : bb_needs_update_(false) { } template <typename P> inline + void + p_set::update_bb_() const + { + bb_.init(); + for (typename std::set::const_iterator i = this->s_.begin(); + i != this->s_.end(); ++i) + bb_.take(*i); + bb_needs_update_ = false; + } + + template <typename P> + inline bool p_set::has(const P& p) const { @@ -127,7 +154,8 @@ p_set::insert(const P& p) { this->super_::insert(p); - bb_.take(p); + if (! bb_needs_update_) + bb_needs_update_ = true; return *this; } @@ -137,11 +165,8 @@ p_set::remove(const P& p) { this->super_::remove(p); - // Rebuild the bounding box. - bb_.init(); - for (typename std::set::const_iterator i = this->s_.begin(); - i != this->s_.end(); ++i) - bb_.take(*i); + if (! bb_needs_update_) + bb_needs_update_ = true; return *this; } @@ -161,6 +186,7 @@ { this->super_::clear(); bb_.init(); + bb_needs_update_ = false; } template <typename P> @@ -169,6 +195,8 @@ p_set::bbox() const { mln_precondition(npoints() != 0); + if (bb_needs_update_) + update_bb_(); return bb_.to_result(); } Index: tests/core/point_set_compatibility.cc --- tests/core/point_set_compatibility.cc (revision 2077) +++ tests/core/point_set_compatibility.cc (working copy) @@ -32,6 +32,7 @@ #include <mln/core/point2d.hh> #include <mln/core/p_array.hh> +#include <mln/core/p_set.hh> #include <mln/core/graph_psite.hh> #include <mln/core/p_graph_piter.hh> @@ -69,21 +70,41 @@ // Graph point set. + typedef p_graph<point2d> pg_t; p_graph<point2d> pg(g); - - - // Array of graph point sites. typedef graph_psite<point2d> gpsite_t; - p_array<gpsite_t> pa; + { + // Array of graph point sites. + typedef p_array<gpsite_t> pa_t; + pa_t pa; // Tests: copying all psites from PG to PA. - p_graph_fwd_piter_<point2d> p(pg); + mln_piter_(pg_t) p(pg); for_all (p) pa.append (p); // Test: create and use an iterator over PA. - p_array_fwd_piter_<gpsite_t> p2(pa); + mln_piter_(pa_t) p2(pa); for_all (p2) - std::cout << p2 << std::endl; + std::cout << p2 << ' '; + std::cout << std::endl; + } + + { + // Set of graph point sites. + typedef p_set<gpsite_t> ps_t; + ps_t ps; + + // Tests: copying all psites from PG to PS. + mln_piter_(pg_t) p(pg); + for_all (p) + ps.insert(p); + + // Test: create and use an iterator over PS. + mln_piter_(ps_t) p2(ps); + for_all (p2) + std::cout << p2 << ' '; + std::cout << std::endl; + } }

16 years, 6 months

2077: Convert ChangeLogs to Latin-1, and have Emacs respect that encoding

by Roland Levillain

URL: https://svn.lrde.epita.fr/svn/oln/trunk Index: external/trimesh/ChangeLog =================================================================== --- external/trimesh/ChangeLog (revision 2076) +++ external/trimesh/ChangeLog (revision 2077) @@ -26,10 +26,11 @@ Convert these Makefiles to Automake. +$Rev$ +$Id$ +$Date$ + Local Variables: ispell-local-dictionary: "american" +coding: iso-latin-1 End: - -$Rev$ -$Id$ -$Date$ Index: milena/ChangeLog =================================================================== --- milena/ChangeLog (revision 2076) +++ milena/ChangeLog (revision 2077) @@ -1,4 +1,4 @@ -2008-06-26 Thierry GÃ©raud <thierry.geraud(a)lrde.epita.fr> +2008-06-26 Thierry Géraud <thierry.geraud(a)lrde.epita.fr> Allow delayed construction of function expressions. @@ -13154,10 +13154,11 @@ * vcs/milena.rb: New file. +$Rev$ +$Id$ +$Date$ + Local Variables: ispell-local-dictionary: "american" +coding: iso-latin-1 End: - -$Rev$ -$Id$ -$Date$ Index: milena/sandbox/ChangeLog =================================================================== --- milena/sandbox/ChangeLog (revision 2076) +++ milena/sandbox/ChangeLog (revision 2077) @@ -3273,6 +3273,11 @@ method. +$Rev$ +$Id$ +$Date$ + Local Variables: ispell-local-dictionary: "american" +coding: iso-latin-1 End: Property changes on: milena/sandbox/ChangeLog ___________________________________________________________________ Name: svn:keywords + Rev Id Date Index: ChangeLog =================================================================== --- ChangeLog (revision 2076) +++ ChangeLog (revision 2077) @@ -1019,10 +1019,11 @@ * vcs/oln.rb: New. +$Rev$ +$Id$ +$Date$ + Local Variables: ispell-local-dictionary: "american" +coding: iso-latin-1 End: - -$Rev$ -$Id$ -$Date$

16 years, 6 months

← Newer
1
2
3
4
5
6
7
...
14
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 June 2008