Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

2590: Factor concrete neighborhoods of complex image.

by Roland Levillain

* mln/core/image/complex_lower_neighborhood.hh, * mln/core/image/complex_higher_neighborhood.hh, * mln/core/image/complex_lower_higher_neighborhood.hh: Factor using mln::internal::complex_neighborhood_base. --- milena/ChangeLog | 9 ++ .../mln/core/image/complex_higher_neighborhood.hh | 78 ++----------------- .../image/complex_lower_higher_neighborhood.hh | 82 ++------------------ .../mln/core/image/complex_lower_neighborhood.hh | 78 ++----------------- 4 files changed, 29 insertions(+), 218 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 774c861..1a4fe48 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2008-10-17 Roland Levillain <roland(a)lrde.epita.fr> + Factor concrete neighborhoods of complex image. + + * mln/core/image/complex_lower_neighborhood.hh, + * mln/core/image/complex_higher_neighborhood.hh, + * mln/core/image/complex_lower_higher_neighborhood.hh: + Factor using mln::internal::complex_neighborhood_base. + +2008-10-17 Roland Levillain <roland(a)lrde.epita.fr> + Add a factored implementation of neighborhood of complex image. * mln/core/internal/complex_neighborhood_base.hh: New. diff --git a/milena/mln/core/image/complex_higher_neighborhood.hh b/milena/mln/core/image/complex_higher_neighborhood.hh index 4dce482..d68051a 100644 --- a/milena/mln/core/image/complex_higher_neighborhood.hh +++ b/milena/mln/core/image/complex_higher_neighborhood.hh @@ -32,88 +32,22 @@ /// \brief A neighborhood centered on a n-face of complex returning its /// adjacent (n+1)-faces. -# include <mln/core/concept/neighborhood.hh> - -# include <mln/core/site_set/complex_psite.hh> - +# include <mln/core/internal/complex_neighborhood_base.hh> # include <mln/topo/adj_higher_face_iter.hh> -// FIXME: Factor with complex_lower_neighborhood. - namespace mln { - // Forward declarations. - template <typename I, typename G, typename N> - class complex_neighborhood_fwd_piter; - template <typename I, typename G, typename N> - class complex_neighborhood_bkd_piter; - - /// \brief Neighborhood centered on a n-face of complex returning its - /// adjacent (n-1)-faces. template <unsigned D, typename G> - class complex_higher_neighborhood - : public Neighborhood< complex_higher_neighborhood<D, G> > + struct complex_higher_neighborhood + : internal::complex_neighborhood_base< D, G, + topo::adj_higher_face_fwd_iter<D>, + topo::adj_higher_face_bkd_iter<D>, + complex_higher_neighborhood<D, G> > { - typedef complex_higher_neighborhood<D, G> self_; - - public: - /// The associated complex iterators. - /// \{ - typedef topo::adj_higher_face_fwd_iter<D> complex_fwd_iter; - typedef topo::adj_higher_face_bkd_iter<D> complex_bkd_iter; - /// \} - - public: - /// Associated types. - /// \{ - /// The type of psite corresponding to the neighborhood. - typedef complex_psite<D, G> psite; - /// The type of site corresponding to the neighborhood. - typedef mln_site(psite) site; - - /// \brief Site_Iterator type to browse the psites of the neighborhood - /// w.r.t. the ordering of vertices. - typedef - complex_neighborhood_fwd_piter<complex_fwd_iter, G, self_> fwd_niter; - - /// \brief Site_Iterator type to browse the psites of the neighborhood - /// w.r.t. the reverse ordering of vertices. - typedef - complex_neighborhood_bkd_piter<complex_bkd_iter, G, self_> bkd_niter; - - /// The default niter type. - typedef fwd_niter niter; - /// \} - - /// Conversions. - /// \{ - /// The window type corresponding to this neighborhood. - // FIXME: Dummy. - typedef self_ window; - /// Create a window corresponding to this neighborhood. - const window& win() const; - /// \} }; - - -# ifndef MLN_INCLUDE_ONLY - - // FIXME: Dummy. - template <unsigned D, typename G> - inline - // FIXME: Change (dummy) type. - const typename complex_higher_neighborhood<D, G>::window& - complex_higher_neighborhood<D, G>::win() const - { - // FIXME: Dummy. - return *this; - } - -# endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln #endif // ! MLN_CORE_IMAGE_COMPLEX_HIGHER_NEIGHBORHOOD_HH diff --git a/milena/mln/core/image/complex_lower_higher_neighborhood.hh b/milena/mln/core/image/complex_lower_higher_neighborhood.hh index 459913a..593982d 100644 --- a/milena/mln/core/image/complex_lower_higher_neighborhood.hh +++ b/milena/mln/core/image/complex_lower_higher_neighborhood.hh @@ -32,90 +32,24 @@ /// \brief A neighborhood centered on a n-face of complex returning its /// adjacent (n-1)-faces and (n+1)-faces. -# include <mln/core/concept/neighborhood.hh> - -# include <mln/core/site_set/complex_psite.hh> - +# include <mln/core/internal/complex_neighborhood_base.hh> # include <mln/topo/adj_lower_higher_face_iter.hh> -/* FIXME: Factor with complex_lower_neighborhood and - complex_higher_neighborhood (e.g., using an - internal::complex_neighborhood_base common base class). */ - namespace mln { - // Forward declarations. - template <typename I, typename G, typename N> - class complex_neighborhood_fwd_piter; - template <typename I, typename G, typename N> - class complex_neighborhood_bkd_piter; - - /// \brief Neighborhood centered on a n-face of complex returning its - /// adjacent (n-1)-faces. template <unsigned D, typename G> - class complex_lower_higher_neighborhood - : public Neighborhood< complex_lower_higher_neighborhood<D, G> > + struct complex_lower_higher_neighborhood + : internal::complex_neighborhood_base< + D, G, + topo::adj_lower_higher_face_fwd_iter<D>, + topo::adj_lower_higher_face_bkd_iter<D>, + complex_lower_higher_neighborhood<D, G> + > { - typedef complex_lower_higher_neighborhood<D, G> self_; - - public: - /// The associated complex iterators. - /// \{ - typedef topo::adj_lower_higher_face_fwd_iter<D> complex_fwd_iter; - typedef topo::adj_lower_higher_face_bkd_iter<D> complex_bkd_iter; - /// \} - - public: - /// Associated types. - /// \{ - /// The type of psite corresponding to the neighborhood. - typedef complex_psite<D, G> psite; - /// The type of site corresponding to the neighborhood. - typedef mln_site(psite) site; - - /// \brief Site_Iterator type to browse the psites of the neighborhood - /// w.r.t. the ordering of vertices. - typedef - complex_neighborhood_fwd_piter<complex_fwd_iter, G, self_> fwd_niter; - - /// \brief Site_Iterator type to browse the psites of the neighborhood - /// w.r.t. the reverse ordering of vertices. - typedef - complex_neighborhood_bkd_piter<complex_bkd_iter, G, self_> bkd_niter; - - /// The default niter type. - typedef fwd_niter niter; - /// \} - - /// Conversions. - /// \{ - /// The window type corresponding to this neighborhood. - // FIXME: Dummy. - typedef self_ window; - /// Create a window corresponding to this neighborhood. - const window& win() const; - /// \} }; - - -# ifndef MLN_INCLUDE_ONLY - - // FIXME: Dummy. - template <unsigned D, typename G> - inline - // FIXME: Change (dummy) type. - const typename complex_lower_higher_neighborhood<D, G>::window& - complex_lower_higher_neighborhood<D, G>::win() const - { - // FIXME: Dummy. - return *this; - } - -# endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln #endif // ! MLN_CORE_IMAGE_COMPLEX_LOWER_HIGHER_NEIGHBORHOOD_HH diff --git a/milena/mln/core/image/complex_lower_neighborhood.hh b/milena/mln/core/image/complex_lower_neighborhood.hh index a93298b..c7fc882 100644 --- a/milena/mln/core/image/complex_lower_neighborhood.hh +++ b/milena/mln/core/image/complex_lower_neighborhood.hh @@ -32,88 +32,22 @@ /// \brief A neighborhood centered on a n-face of complex returning its /// adjacent (n-1)-faces. -# include <mln/core/concept/neighborhood.hh> - -# include <mln/core/site_set/complex_psite.hh> - +# include <mln/core/internal/complex_neighborhood_base.hh> # include <mln/topo/adj_lower_face_iter.hh> -// FIXME: Factor with complex_higher_neighborhood. - namespace mln { - // Forward declarations. - template <typename I, typename G, typename N> - class complex_neighborhood_fwd_piter; - template <typename I, typename G, typename N> - class complex_neighborhood_bkd_piter; - - /// \brief Neighborhood centered on a n-face of complex returning its - /// adjacent (n-1)-faces. template <unsigned D, typename G> - class complex_lower_neighborhood - : public Neighborhood< complex_lower_neighborhood<D, G> > + struct complex_lower_neighborhood + : internal::complex_neighborhood_base< D, G, + topo::adj_lower_face_fwd_iter<D>, + topo::adj_lower_face_bkd_iter<D>, + complex_lower_neighborhood<D, G> > { - typedef complex_lower_neighborhood<D, G> self_; - - public: - /// The associated complex iterators. - /// \{ - typedef topo::adj_lower_face_fwd_iter<D> complex_fwd_iter; - typedef topo::adj_lower_face_bkd_iter<D> complex_bkd_iter; - /// \} - - public: - /// Associated types. - /// \{ - /// The type of psite corresponding to the neighborhood. - typedef complex_psite<D, G> psite; - /// The type of site corresponding to the neighborhood. - typedef mln_site(psite) site; - - /// \brief Site_Iterator type to browse the psites of the neighborhood - /// w.r.t. the ordering of vertices. - typedef - complex_neighborhood_fwd_piter<complex_fwd_iter, G, self_> fwd_niter; - - /// \brief Site_Iterator type to browse the psites of the neighborhood - /// w.r.t. the reverse ordering of vertices. - typedef - complex_neighborhood_bkd_piter<complex_bkd_iter, G, self_> bkd_niter; - - /// The default niter type. - typedef fwd_niter niter; - /// \} - - /// Conversions. - /// \{ - /// The window type corresponding to this neighborhood. - // FIXME: Dummy. - typedef self_ window; - /// Create a window corresponding to this neighborhood. - const window& win() const; - /// \} }; - - -# ifndef MLN_INCLUDE_ONLY - - // FIXME: Dummy. - template <unsigned D, typename G> - inline - // FIXME: Change (dummy) type. - const typename complex_lower_neighborhood<D, G>::window& - complex_lower_neighborhood<D, G>::win() const - { - // FIXME: Dummy. - return *this; - } - -# endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln #endif // ! MLN_CORE_IMAGE_COMPLEX_LOWER_NEIGHBORHOOD_HH -- 1.6.0.1

16 years, 3 months

2589: Add a factored implementation of neighborhood of complex image.

by Roland Levillain

* mln/core/internal/complex_neighborhood_base.hh: New. --- milena/ChangeLog | 6 + .../mln/core/internal/complex_neighborhood_base.hh | 130 ++++++++++++++++++++ 2 files changed, 136 insertions(+), 0 deletions(-) create mode 100644 milena/mln/core/internal/complex_neighborhood_base.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index d8b0307..774c861 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2008-10-17 Roland Levillain <roland(a)lrde.epita.fr> + + Add a factored implementation of neighborhood of complex image. + + * mln/core/internal/complex_neighborhood_base.hh: New. + 2008-10-16 Roland Levillain <roland(a)lrde.epita.fr> Exercise mln::io::load on OFF file (with no color data). diff --git a/milena/mln/core/internal/complex_neighborhood_base.hh b/milena/mln/core/internal/complex_neighborhood_base.hh new file mode 100644 index 0000000..9ecf09f --- /dev/null +++ b/milena/mln/core/internal/complex_neighborhood_base.hh @@ -0,0 +1,130 @@ +// 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_CORE_IMAGE_INTERNAL_COMPLEX_NEIGHBORHOOD_BASE_HH +# define MLN_CORE_IMAGE_INTERNAL_COMPLEX_NEIGHBORHOOD_BASE_HH + +/// \file mln/core/internal/complex_neighborhood_base.hh +/// \brief Definition of a generic neighborhood centered on the face +/// of a complex, based on a pair of (forward and backward) complex +/// iterators. + +# include <mln/core/concept/neighborhood.hh> +# include <mln/core/site_set/complex_psite.hh> + +// FIXME: Factor with mln::internal::complex_window_base. + + +namespace mln +{ + // Forward declarations. + template <typename I, typename G, typename N> + class complex_neighborhood_fwd_piter; + template <typename I, typename G, typename N> + class complex_neighborhood_bkd_piter; + + namespace internal + { + template <unsigned D, typename G, typename F, typename B, typename E> + class complex_neighborhood_base; + } + + + namespace internal + { + /** \brief Generic neighborhood centered on the face of a complex, + based on an pair of (forward and backward) complex iterators. + + \tparam D The dimension of the complex. + \tparam G The geometry functor of the complex. + \tparam F The underlying forward iterator. + \tparam B The underlying backward iterator. + \tparam E The exact type. */ + template <unsigned D, typename G, typename F, typename B, typename E> + class complex_neighborhood_base : public Neighborhood<E> + { + public: + /// The associated complex iterators. + /// \{ + typedef F complex_fwd_iter; + typedef B complex_bkd_iter; + /// \} + + public: + /// Associated types. + /// \{ + /// The type of psite corresponding to the neighborhood. + typedef complex_psite<D, G> psite; + /// The type of site corresponding to the neighborhood. + typedef mln_site(psite) site; + + /// \brief Site_Iterator type to browse the psites of the neighborhood + /// w.r.t. the ordering of vertices. + typedef + complex_neighborhood_fwd_piter<complex_fwd_iter, G, E> fwd_niter; + + /// \brief Site_Iterator type to browse the psites of the neighborhood + /// w.r.t. the reverse ordering of vertices. + typedef + complex_neighborhood_bkd_piter<complex_bkd_iter, G, E> bkd_niter; + + /// The default niter type. + typedef fwd_niter niter; + /// \} + + /// Conversions. + /// \{ + /// The window type corresponding to this neighborhood. + // FIXME: Dummy. + typedef E window; + /// Create a window corresponding to this neighborhood. + const window& win() const; + /// \} + }; + + + +# ifndef MLN_INCLUDE_ONLY + + // FIXME: Dummy. + template <unsigned D, typename G, typename F, typename B, typename E> + inline + // FIXME: Change (dummy) type. + const typename complex_neighborhood_base<D, G, F, B, E>::window& + complex_neighborhood_base<D, G, F, B, E>::win() const + { + // FIXME: Dummy. + return exact(*this); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::internal + +} // end of namespace mln + +#endif // ! MLN_CORE_IMAGE_INTERNAL_COMPLEX_NEIGHBORHOOD_BASE_HH -- 1.6.0.1

16 years, 3 months

scool r119: Handle C++ const methods

by Maxime van Noppen

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-10-17 Maxime van Noppen <yabo(a)lrde.epita.fr> Handle C++ const methods * cxx-syn/CxxFun.sdf: Add a grammar rule to produce const methods. * cxx-syn/Lexical.sdf: Add the "const" keyword. * scl-syn/Declaration.sdf: Remove useless commented code. * scl-syn/Lexical.sdf: Cleanup keywords. cxx-syn/CxxFun.sdf | 3 +++ cxx-syn/Lexical.sdf | 2 ++ scl-syn/Declaration.sdf | 1 - scl-syn/Lexical.sdf | 13 +++++++------ 4 files changed, 12 insertions(+), 7 deletions(-) Index: branches/scool-ng/src/scl-syn/Declaration.sdf =================================================================== --- branches/scool-ng/src/scl-syn/Declaration.sdf (revision 118) +++ branches/scool-ng/src/scl-syn/Declaration.sdf (revision 119) @@ -25,7 +25,6 @@ FunctionQualifier? Identifier ":" FunctionType ";" -> Declaration {cons("FunctionDeclaration")} FunctionQualifier? Identifier ":" FunctionType "=" FunctionBlock -> Declaration {cons("FunctionDefinition")} -%% FunctionQualifier? Identifier ":" FunctionType "=>" Expression ";" -> Declaration {cons("FunctionDefinition")} Identifier ":" ParametersDeclaration "->" "type" "=" StaticBlock -> StaticFunction {cons("StaticTypeFunction")} ClassQualifier? Identifier ":" ParametersDeclaration "->" "class" "=" StaticClassBlock -> StaticFunction {cons("StaticClassFunction")} Index: branches/scool-ng/src/scl-syn/Lexical.sdf =================================================================== --- branches/scool-ng/src/scl-syn/Lexical.sdf (revision 118) +++ branches/scool-ng/src/scl-syn/Lexical.sdf (revision 119) @@ -29,17 +29,18 @@ "var" -> SimpleQualifier "final" -> ClassQualifier + "abtract" -> ClassQualifier "models" -> TypeQualifier + "abtract" -> FunctionQualifier + "mutable" -> FunctionQualifier - "decl" -> FunctionQualifier - "abtract" -> MethodQualifier - + SimpleQualifier -> Keyword + ClassQualifier -> Keyword + TypeQualifier -> Keyword + FunctionQualifier -> Keyword "class" -> Keyword "concept" -> Keyword - "var" -> Keyword - "final" -> Keyword - "models" -> Keyword "type" -> Keyword "ref" -> Keyword "public" -> Keyword Index: branches/scool-ng/src/cxx-syn/CxxFun.sdf =================================================================== --- branches/scool-ng/src/cxx-syn/CxxFun.sdf (revision 118) +++ branches/scool-ng/src/cxx-syn/CxxFun.sdf (revision 119) @@ -17,6 +17,9 @@ "template" "<" {(CxxType CxxId) ","}* ">" CxxType CxxId "(" {(CxxType CxxId) ","}* ")" ";" -> CxxTopLevel {cons("CxxFun")} + "template" "<" {(CxxType CxxId) ","}* ">" + CxxType CxxId "(" {(CxxType CxxId) ","}* ")" Const? ";" -> CxxTopLevel {cons("CxxFun")} + CxxId ("<" {CxxType ","}* ">")? "(" {(CxxType CxxId) ","}* ")" ";" -> CxxTopLevel {cons("CxxFunCall")} CxxDecl -> CxxTopLevel Index: branches/scool-ng/src/cxx-syn/Lexical.sdf =================================================================== --- branches/scool-ng/src/cxx-syn/Lexical.sdf (revision 118) +++ branches/scool-ng/src/cxx-syn/Lexical.sdf (revision 119) @@ -11,6 +11,8 @@ "public" -> CxxAccessModifier "protected" -> CxxAccessModifier + context-free syntax CxxId -> CxxId {cons("CxxId")} CxxType "::" CxxId -> CxxId {cons("CxxScope")} + "const" -> Const {cons("Const")} -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

16 years, 3 months

cleanup-2008 2588: Fix some morpho operators.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008 Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix some morpho operators. * milena/tests/morpho/erosion.cc: Fix typo. * milena/mln/core/routine/ops.hh (todo): New. * milena/mln/morpho/erosion.spe.hh (octagon2d): Fix. (hline2d, vline2d): Fix dispatch. mln/core/routine/ops.hh | 8 +++ mln/morpho/erosion.spe.hh | 97 +++++++++++++++++++++++++++++++++++++--------- tests/morpho/erosion.cc | 8 +-- 3 files changed, 91 insertions(+), 22 deletions(-) Index: milena/tests/morpho/erosion.cc --- milena/tests/morpho/erosion.cc (revision 2587) +++ milena/tests/morpho/erosion.cc (working copy) @@ -194,20 +194,20 @@ std::cout << " " << (test ? "OK" : "KO!!!") << std::endl; } - std::cout << "-------------------------- Octogone: " << std::endl; + std::cout << "-------------------------- Octagon: " << std::endl; - //Octogone + // Octagon { t.start(); ref = morpho::impl::generic::erosion_on_function(lena, oct); - std::cout << "generic on octogone: " << t << std::endl; + std::cout << "generic on octagon: " << t << std::endl; io::pgm::save(ref, "out_oct_ref.pgm"); } { t.start(); out = morpho::erosion(lena, oct); - std::cout << "dispach on octogone: " << t << std::endl; + std::cout << "dispach on octagon: " << t << std::endl; bool test = out == ref; mln_assertion(test); std::cout << " " << (test ? "OK" : "KO!!!") << std::endl; Index: milena/mln/core/routine/ops.hh --- milena/mln/core/routine/ops.hh (revision 2587) +++ milena/mln/core/routine/ops.hh (working copy) @@ -78,6 +78,14 @@ * \endcode * * \todo Complete those definitions (...) + Overload for const (?) + * + * \todo Optimize deduced ops to eliminate object creation. E.g. + * in the unary minus op: + * literal::zero_t* p_zero = 0; + * return O(*p_zero) - exact(rhs); + * can become: + * static O zero =... + * return zero - exact(rhs); */ # include <mln/trait/op/all.hh> Index: milena/mln/morpho/erosion.spe.hh --- milena/mln/morpho/erosion.spe.hh (revision 2587) +++ milena/mln/morpho/erosion.spe.hh (working copy) @@ -302,9 +302,8 @@ mln_concrete(I) temp_1, temp_2, output; temp_1 = morpho::erosion(input, win::hline2d(len)); - temp_2 = morpho::erosion(temp_1, win::vline2d(len)); - temp_1 = morpho::erosion(temp_2, win::diag2d(len)); - output = morpho::erosion(temp_1, win::backdiag2d(len)); + temp_2 = morpho::erosion(temp_1, win::diag2d(len)); + output = morpho::erosion(temp_2, win::backdiag2d(len)); trace::exiting("morpho::impl::erosion_(win::octagon2d)"); return output; @@ -683,16 +682,16 @@ min.init(); p[dir]--; mln_qiter(W) q(win, p); - for_all(q) + for_all(q) if (input.has(q)) min.take(input(q)); p[dir]++; } void next() { - for_all(q_l) + for_all(q_l) if (input.has(q_l)) min.untake(input(q_l)); - for_all(q_r) + for_all(q_r) if (input.has(q_r)) min.take(input(q_r)); output(p) = min; } @@ -735,13 +734,9 @@ enum { dim = I::site::dim }; unsigned dir; - window2d - win_left, - win_right; + window2d win_left, win_right; - mln_qixter(const I, window2d) - q_l, - q_r; + mln_qixter(const I, window2d) q_l, q_r; erosion_directional_nd_fastest_functor(const I& input, const W& win, unsigned dir) : input(input), @@ -984,27 +979,93 @@ } + /// Handling win::hline2d. + /// \{ + + template <typename I> + mln_concrete(I) + erosion_dispatch_wrt_win(metal::true_, + const I& input, const win::hline2d& win) + { + return erosion_dispatch_for_directional(input, win, 1); + } + + template <typename I> + mln_concrete(I) + erosion_dispatch_wrt_win(metal::false_, + const I& input, const win::hline2d& win) + { + return erosion_dispatch_for_generic(input, win); + } + template <typename I> mln_concrete(I) erosion_dispatch_wrt_win(const I& input, const win::hline2d& win) { - if (win.size() <= 3) + if (win.size() == 1) + return clone(input); + else if (win.size() == 3) return erosion_dispatch_for_generic(input, win); else - return impl::erosion_line_on_function(input, win); -// return erosion_dispatch_for_directional(input, win, 1); + { + typedef mlc_is_not(mln_trait_image_kind(I), + mln::trait::image::kind::logic) test_not_logic; + typedef mlc_is_a(mln_pset(I), Box) test_box; + typedef mlc_equal(mln_trait_image_quant(I), + mln::trait::image::quant::low) test_lowq; + typedef mlc_and(test_not_logic, test_box) temp; + typedef mlc_and(temp, test_lowq) tests; + return erosion_dispatch_wrt_win(typename tests::eval (), + input, win); + } + } + + /// \} + + + + /// Handling win::vline2d. + /// \{ + + template <typename I> + mln_concrete(I) + erosion_dispatch_wrt_win(metal::true_, + const I& input, const win::vline2d& win) + { + return erosion_dispatch_for_directional(input, win, 0); + } + + template <typename I> + mln_concrete(I) + erosion_dispatch_wrt_win(metal::false_, + const I& input, const win::vline2d& win) + { + return erosion_dispatch_for_generic(input, win); } template <typename I> mln_concrete(I) erosion_dispatch_wrt_win(const I& input, const win::vline2d& win) { - if (win.size() <= 3) + if (win.size() == 1) + return clone(input); + else if (win.size() == 3) return erosion_dispatch_for_generic(input, win); else - return impl::erosion_line_on_function(input, win); -// return erosion_dispatch_for_directional(input, win, 0); + { + typedef mlc_is_not(mln_trait_image_kind(I), + mln::trait::image::kind::logic) test_not_logic; + typedef mlc_is_a(mln_pset(I), Box) test_box; + typedef mlc_equal(mln_trait_image_quant(I), + mln::trait::image::quant::low) test_lowq; + typedef mlc_and(test_not_logic, test_box) temp; + typedef mlc_and(temp, test_lowq) tests; + return erosion_dispatch_wrt_win(typename tests::eval (), + input, win); } + } + + /// \} // The dispatch entry point.

16 years, 3 months

2587: configure.ac: Configure milena/tests/io/off/Makefile.

by Roland Levillain

--- ChangeLog | 4 ++++ configure.ac | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e039de5..93d7d20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-10-15 Roland Levillain <roland(a)lrde.epita.fr> + + * configure.ac: Configure milena/tests/io/off/Makefile. + 2008-16-07 Guillaume Lazzara <z(a)lrde.epita.fr> Fix ambiguous namespaces. diff --git a/configure.ac b/configure.ac index c6dcd24..9ad3ce7 100644 --- a/configure.ac +++ b/configure.ac @@ -191,6 +191,7 @@ AC_CONFIG_FILES([ milena/tests/histo/Makefile milena/tests/io/Makefile milena/tests/io/fits/Makefile + milena/tests/io/off/Makefile milena/tests/io/pbm/Makefile milena/tests/io/pfm/Makefile milena/tests/io/pgm/Makefile -- 1.6.0.1

16 years, 3 months

2586: Exercise mln::io::load on OFF file (with no color data).

by Roland Levillain

* tests/io/Makefile.am (SUBDIRS): Add io. * tests/io/off/: New directory. * tests/io/off/load_bin.cc: New. * tests/io/off/Makefile.am: New. --- milena/ChangeLog | 9 +++++ milena/tests/io/Makefile.am | 1 + milena/tests/io/{ => off}/Makefile.am | 13 +++---- milena/tests/io/off/load_bin.cc | 64 +++++++++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 7 deletions(-) copy milena/tests/io/{ => off}/Makefile.am (56%) create mode 100644 milena/tests/io/off/load_bin.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 546bec0..d8b0307 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2008-10-16 Roland Levillain <roland(a)lrde.epita.fr> + Exercise mln::io::load on OFF file (with no color data). + + * tests/io/Makefile.am (SUBDIRS): Add io. + * tests/io/off/: New directory. + * tests/io/off/load_bin.cc: New. + * tests/io/off/Makefile.am: New. + +2008-10-16 Roland Levillain <roland(a)lrde.epita.fr> + Add a routine to create a complex-based image from an OFF file. * mln/io/off/load.hh: New. diff --git a/milena/tests/io/Makefile.am b/milena/tests/io/Makefile.am index 89cfa56..36d7797 100644 --- a/milena/tests/io/Makefile.am +++ b/milena/tests/io/Makefile.am @@ -4,6 +4,7 @@ include $(top_srcdir)/milena/tests/tests.mk SUBDIRS = \ fits \ + off \ pbm \ pfm \ pgm \ diff --git a/milena/tests/io/Makefile.am b/milena/tests/io/off/Makefile.am similarity index 56% copy from milena/tests/io/Makefile.am copy to milena/tests/io/off/Makefile.am index 89cfa56..4b592ce 100644 --- a/milena/tests/io/Makefile.am +++ b/milena/tests/io/off/Makefile.am @@ -2,10 +2,9 @@ include $(top_srcdir)/milena/tests/tests.mk -SUBDIRS = \ - fits \ - pbm \ - pfm \ - pgm \ - pnm \ - ppm +check_PROGRAMS = \ + load_bin + +load_bin_SOURCES = load_bin.cc + +TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/off/load_bin.cc b/milena/tests/io/off/load_bin.cc new file mode 100644 index 0000000..e171704 --- /dev/null +++ b/milena/tests/io/off/load_bin.cc @@ -0,0 +1,64 @@ +// 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. + +/// \file tests/io/off/load_bin.cc +/// \brief Test mln::io::off::load with an +/// mln::complex_image<3, geom::complex_data<3, point3df>, bool>. + +#include <algorithm> +#include <iterator> +#include <iostream> + +#include <mln/io/off/load.hh> + +#include "tests/data.hh" + + +int main() +{ + using namespace mln; + + /* FIXME: Create an alias in milena/mln/core/alias/ for this + particular image type? */ + typedef mln::complex_image<2, geom::complex_geometry<2,point3df>, bool> ima_t; + ima_t ima; + io::off::load(ima, MLN_MESH_DIR "/tetrahedron.off"); + + std::cout << ima.domain().cplx() << std::endl; + + mln_piter_(ima_t) p(ima.domain()); + for_all(p) + { + std::cout << "ima(" << p << ") = " << ima(p) << " ( "; + // Print site(s). + typedef mln_site_(ima_t) site_t; + site_t s(p); + std::copy (s.sites.begin(), s.sites.end(), + std::ostream_iterator<site_t::location>(std::cout, " ")); + std::cout << ")" << std::endl; + } +} -- 1.6.0.1

16 years, 3 months

2585: Add a routine to create a complex-based image from an OFF file.

by Roland Levillain

* mln/io/off/load.hh: New. --- milena/ChangeLog | 6 + milena/mln/io/off/load.hh | 308 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 314 insertions(+), 0 deletions(-) create mode 100644 milena/mln/io/off/load.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 30e48e9..546bec0 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2008-10-16 Roland Levillain <roland(a)lrde.epita.fr> + Add a routine to create a complex-based image from an OFF file. + + * mln/io/off/load.hh: New. + +2008-10-16 Roland Levillain <roland(a)lrde.epita.fr> + Add a macro containing the path to meshes, to be used in tests. * tests/data.hh.in (MLN_MESH_DIR): New macro. diff --git a/milena/mln/io/off/load.hh b/milena/mln/io/off/load.hh new file mode 100644 index 0000000..ff8d106 --- /dev/null +++ b/milena/mln/io/off/load.hh @@ -0,0 +1,308 @@ +// 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_IO_OFF_LOAD_HH +# define MLN_IO_OFF_LOAD_HH + +/// \file mln/io/off/load.hh +/// \brief Input loading function for OFF files. +/// +/// \see http://shape.cs.princeton.edu/benchmark/documentation/off_format.html + +# include <cstdlib> + +# include <iostream> +# include <fstream> + +# include <string> + +# include <mln/core/image/complex_image.hh> +# include <mln/geom/complex_geometry.hh> +# include <mln/core/alias/point3df.hh> + +// // FIXME: Really needed? +// # include <mln/topo/n_faces_set.hh> + + +namespace mln +{ + + namespace io + { + + namespace off + { + + /** \brief Load a (boolean) OFF image into a complex image. + + \param[out] ima A reference to the image to construct. + \param[in] filename The name of the file to load. + + The image is said boolean since data only represent the + existence of vertices and faces. */ + void load(complex_image<2, geom::complex_geometry<2,point3df>, bool>& ima, + const std::string& filename); + + namespace internal + { + /// A stream manipulator eating comments starting with a `#' + /// and ending at an end of line + std::istream& eat_comment (std::istream& istr); + } + + +# ifndef MLN_INCLUDE_ONLY + + void load(complex_image<2 ,geom::complex_geometry<2,point3df>, bool>& ima, + const std::string& filename) + { + const std::string me = "mln::io::load::off"; + + std::ifstream istr(filename.c_str()); + if (!istr) + { + std::cerr << me << ": `" << filename << "' not found." << std::endl; + /* FIXME: Too violent. We should allow the use of + exception, at least to have Milena's code behave + correctly in interpreted environments (std::exit() or + std::abort() causes the termination of a Python + interpreter, for instance!). */ + std::exit(1); + } + + /*---------. + | Header. | + `---------*/ + + /* ``The .off files in the Princeton Shape Benchmark conform + to the following standard. */ + + /* OFF files are all ASCII files beginning with the keyword + OFF. '' */ + std::string type; + istr >> internal::eat_comment >> type; + if (type != "OFF") + { + std::cerr << me << ": `" << filename << "': ill-formed header." + << std::endl; + std::exit(1); + } + + /* ``The next line states the number of vertices, the number + of faces, and the number of edges. The number of edges can + be safely ignored.'' */ + unsigned nvertices, nfaces, nedges; + istr >> internal::eat_comment >> nvertices + >> internal::eat_comment >> nfaces + >> internal::eat_comment >> nedges; + + /*-------. + | Data. | + `-------*/ + + /* FIXME: Maybe we could sugar all this (using make_whatever + helpers?). */ + + // --------- // + // Complex. // + // --------- // + + const unsigned D = 2; + topo::complex<D> c; + + // ------------------------------------------ // + // Vertices & geometry (vertices locations). // + // ------------------------------------------ // + + /* ``The vertices are listed with x, y, z coordinates, written + one per line. */ + + /* FIXME: We should have a faster way to create a bunch of + 0-faces (vertices). */ + for (unsigned v = 0; v < nvertices; ++v) + c.add_face(); + + typedef point3df P; + typedef mln_coord_(P) C; + typedef geom::complex_geometry<D, P> G; + G geom; + for (unsigned v = 0; v < nvertices; ++v) + { + C x, y, z; + istr >> internal::eat_comment >> x + >> internal::eat_comment >> y + >> internal::eat_comment >> z; + geom.add_location(point3df(x, y, z)); + } + + // --------------- // + // Faces & edges. // + // --------------- // + + /* After the list of vertices, the faces are listed, with one + face per line. For each face, the number of vertices is + specified, followed by indices into the list of + vertices.'' */ + + // An adjacenty matrix recording the edges seen so far. + typedef std::vector< std::vector<bool> > complex_edges_t; + complex_edges_t complex_edges (nvertices, + std::vector<bool>(nvertices, false)); + + for (unsigned f = 0; f < nfaces; ++f) + { + unsigned nface_vertices; + istr >> internal::eat_comment >> nface_vertices; + if (nface_vertices <= 2) + { + std::cerr << me << ": `" << filename + << "': ill-formed face (" << nface_vertices + << " vertices)" << std::endl; + std::exit(1); + } + + // The edges of the face. + topo::n_faces_set<1, D> face_edges_set; + face_edges_set.reserve(nface_vertices); + + // The first vertex id of the face. + unsigned first_vertex_id; + istr >> internal::eat_comment >> first_vertex_id; + // The current vertex id initialized with the first id. + unsigned vertex_id = first_vertex_id; + if (first_vertex_id >= nvertices) + { + std::cerr << me << ": `" << filename + << "': invalid vertex id " << first_vertex_id + << std::endl; + std::exit(1); + } + // Iterate on vertices and form edges. + for (unsigned v = 0; v < nface_vertices; ++v) + { + /* The next vertex id. The pair (vertex_id, next_vertex_id) + is an edge of the mesh/complex. */ + unsigned next_vertex_id; + /* When V is the id of the last vertex of the face F, + set next_vertex_id to first_vertex_id; otherwise, + read it from the input. */ + if (v == nface_vertices - 1) + next_vertex_id = first_vertex_id; + else + { + istr >> internal::eat_comment >> next_vertex_id; + if (next_vertex_id >= nvertices) + { + std::cerr << me << ": `" << filename + << "': invalid vertex id " << next_vertex_id + << std::endl; + std::exit(1); + } + } + // The ends of the current edge. + topo::n_face<0, D> vertex(c, vertex_id); + topo::n_face<0, D> next_vertex(c, next_vertex_id); + // The current edge. + topo::n_face<1, D> edge; + // If the edge has been constructed yet, create it; + // otherwise, retrieve its id from the complex. + if (!complex_edges[vertex_id][next_vertex_id]) + { + complex_edges[vertex_id][next_vertex_id] = true; + complex_edges[next_vertex_id][vertex_id] = true; + edge = c.add_face(vertex + next_vertex); + } + else + { + edge = topo::edge(vertex, next_vertex); + mln_assertion(edge.is_valid()); + } + // Record this edge. + face_edges_set += edge; + // Next vertex. + vertex_id = next_vertex_id; + } + + // Add face. + c.add_face(face_edges_set); + } + + /*--------. + | Image. | + `--------*/ + + // Value type. + typedef bool V; + + // Site set. + p_complex<D, G> pc(c, geom); + + // Values. + metal::vec<D + 1, std::vector<V> > values; + for (unsigned i = 0; i <= D; ++i) + values[i].insert(values[i].begin(), pc.cplx().nfaces(i), true); + + // Image. + ima.init_(pc, values); + + istr.close(); + } + + + namespace internal + { + /// A stream manipulator eating comments starting with a `#' + /// and ending at an end of line + std::istream& eat_comment (std::istream& istr) + { + // Skip whitespace and newlines. + std::ws(istr); + while (istr.peek() == '#') + { + /* Eat the `#' and the rest of the line until `\n' or + `\r' is found or the end of the file is reached. */ + char c; + do + istr.get(c); + while (c != '\n' && c != '\r' && !istr.eof()); + // Skip whitespace and newlines. + std::ws(istr); + } + return istr; + } + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::io::off + + } // end of namespace mln::io + +} // end of namespace mln + + +#endif // ! MLN_IO_OFF_LOAD_HH -- 1.6.0.1

16 years, 3 months

2584: Add a macro containing the path to meshes, to be used in tests.

by Roland Levillain

* tests/data.hh.in (MLN_MESH_DIR): New macro. --- milena/ChangeLog | 6 ++++++ milena/tests/data.hh.in | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 582245d..30e48e9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2008-10-16 Roland Levillain <roland(a)lrde.epita.fr> + Add a macro containing the path to meshes, to be used in tests. + + * tests/data.hh.in (MLN_MESH_DIR): New macro. + +2008-10-16 Roland Levillain <roland(a)lrde.epita.fr> + Add more meshes. * mesh/cube.off, diff --git a/milena/tests/data.hh.in b/milena/tests/data.hh.in index f30cfdc..f26299b 100644 --- a/milena/tests/data.hh.in +++ b/milena/tests/data.hh.in @@ -30,10 +30,13 @@ # include <string> -/** \brief The absolute path to the img directory of Milena. +/* Macros are evil, but they save us an extra compilation unit here + (as well as additional burden in Makefiles, too.). */ - Macros are evil, but they save us an extra compilation unit here - (as well as additional burden in Makefiles, too.). */ +/// \brief The absolute path to the img directory of Milena. # define MLN_IMG_DIR "@abs_top_srcdir@/milena/img" +/// \brief The absolute path to the mesh directory of Milena. +# define MLN_MESH_DIR "@abs_top_srcdir@/milena/mesh" + #endif // ! TESTS_DATA_HH -- 1.6.0.1

16 years, 3 months

2583: Add more meshes.

by Roland Levillain

* mesh/cube.off, * mesh/tetrahedron.off: New. --- milena/ChangeLog | 8 ++++++++ milena/mesh/cube.off | 16 ++++++++++++++++ milena/mesh/tetrahedron.off | 10 ++++++++++ 3 files changed, 34 insertions(+), 0 deletions(-) create mode 100644 milena/mesh/cube.off create mode 100644 milena/mesh/tetrahedron.off diff --git a/milena/ChangeLog b/milena/ChangeLog index 24542de..582245d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2008-10-16 Roland Levillain <roland(a)lrde.epita.fr> + Add more meshes. + + * mesh/cube.off, + * mesh/tetrahedron.off: + New. + +2008-10-16 Roland Levillain <roland(a)lrde.epita.fr> + Exercise mln::geom::complex_geometry with mln::p_complex. * tests/core/image/complex_image.cc, diff --git a/milena/mesh/cube.off b/milena/mesh/cube.off new file mode 100644 index 0000000..b251b4e --- /dev/null +++ b/milena/mesh/cube.off @@ -0,0 +1,16 @@ +OFF +8 6 12 + 1.632993 0.000000 1.154701 + 0.000000 1.632993 1.154701 + -1.632993 0.000000 1.154701 + -0.000000 -1.632993 1.154701 + 1.632993 -0.000000 -1.154701 + 0.000000 1.632993 -1.154701 + -1.632993 0.000000 -1.154701 + -0.000000 -1.632993 -1.154701 + 4 0 1 2 3 + 4 7 4 0 3 + 4 4 5 1 0 + 4 5 6 2 1 + 4 3 2 6 7 + 4 6 5 4 7 diff --git a/milena/mesh/tetrahedron.off b/milena/mesh/tetrahedron.off new file mode 100644 index 0000000..70900c0 --- /dev/null +++ b/milena/mesh/tetrahedron.off @@ -0,0 +1,10 @@ +OFF +4 4 6 + 0.0 0.0 2.0 + 1.632993 -0.942809 -0.666667 + 0.000000 1.885618 -0.666667 + -1.632993 -0.942809 -0.666667 + 3 1 0 3 + 3 2 0 1 + 3 3 0 2 + 3 3 2 1 -- 1.6.0.1

16 years, 3 months

2582: Exercise mln::geom::complex_geometry with mln::p_complex.

by Roland Levillain

* tests/core/image/complex_image.cc, * tests/morpho/complex_image_morpho.cc: ...here. Adjust: s/P/G/. * tests/core/site_set/p_complex.cc: New. * tests/core/site_set/Makefile.am (check_PROGRAMS): Add p_complex. (p_complex_SOURCES): New. --- milena/ChangeLog | 12 +++ milena/tests/core/image/complex_image.cc | 79 ++++++++++------- milena/tests/core/site_set/Makefile.am | 2 + milena/tests/core/site_set/p_complex.cc | 127 +++++++++++++++++++++++++++ milena/tests/morpho/complex_image_morpho.cc | 36 +++++--- 5 files changed, 209 insertions(+), 47 deletions(-) create mode 100644 milena/tests/core/site_set/p_complex.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index fa3e596..24542de 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2008-10-16 Roland Levillain <roland(a)lrde.epita.fr> + Exercise mln::geom::complex_geometry with mln::p_complex. + + * tests/core/image/complex_image.cc, + * tests/morpho/complex_image_morpho.cc: + ...here. + Adjust: s/P/G/. + * tests/core/site_set/p_complex.cc: New. + * tests/core/site_set/Makefile.am (check_PROGRAMS): Add p_complex. + (p_complex_SOURCES): New. + +2008-10-16 Roland Levillain <roland(a)lrde.epita.fr> + Have complex-based site set use geometry functor for site location. * mln/core/site_set/p_complex.hh diff --git a/milena/tests/core/image/complex_image.cc b/milena/tests/core/image/complex_image.cc index d30ccc4..4b81713 100644 --- a/milena/tests/core/image/complex_image.cc +++ b/milena/tests/core/image/complex_image.cc @@ -57,15 +57,17 @@ int main() /* A 2-d (simplicial) complex and its adjacency graph. - v0 e3 v3 - o-----------o v0----e3----v3 - / \ ,-----. / / \ | / - / . \ \ t1/ / / \ t1 / - e0 / / \ e1\ / / e4 e0. ,e1Ž `e4 - / /t0 \ \ ' / / t0 \ / - / `-----' \ / / | \ / - o-----------o v1----e2----v2 - v1 e2 v2 + c 0 1 2 3 + r .------------------------ + | v0 e3 v3 + 0 | o-----------o v0----e3----v3 + | / \ ,-----. / / \ | / + | / . \ \ t1/ / / \ t1 / + 1 | e0 / / \ e1\ / / e4 e0. ,e1Ž `e4 + | / /t0 \ \ ' / / t0 \ / + | / `-----' \ / / | \ / + 2 | o-----------o v1----e2----v2 + | v1 e2 v2 v = vertex e = edge @@ -94,18 +96,29 @@ int main() topo::n_face<2, D> t0 = c.add_face(e0 + e1 + e2); topo::n_face<2, D> t1 = c.add_face(e1 + e3 + e4); - + + /*------------------------------. + | Complex geometry (location). | + `------------------------------*/ + + typedef point2d P; + typedef geom::complex_geometry<D, P> G; + G geom; + geom.add_location(point2d(0,1)); // 0-face #0. + geom.add_location(point2d(2,0)); // 0-face #1. + geom.add_location(point2d(2,2)); // 0-face #2. + geom.add_location(point2d(0,3)); // 0-face #3. + + /*---------------------. | Complex-based pset. | `---------------------*/ - typedef point2d P; - // A pset. - p_complex<D, P> pc(c); + p_complex<D, G> pc(c, geom); topo::face<D> af(e0); // An associated psite. - complex_psite<D, P> cs(pc, af); + complex_psite<D, G> cs(pc, af); /*--------------------. @@ -117,16 +130,16 @@ int main() of the test? */ // Pset of 0-faces. - p_faces<0, D, P> pf0(c); + p_faces<0, D, G> pf0(c); // Pset of 1-faces. - p_faces<1, D, P> pf1(c); + p_faces<1, D, G> pf1(c); // Pset of 2-faces. - p_faces<2, D, P> pf2(c); + p_faces<2, D, G> pf2(c); // Some psites on faces. - faces_psite<0, D, P> fs0(pf0, v0); - faces_psite<1, D, P> fs1(pf1, e0); - faces_psite<2, D, P> fs2(pf2, t0); + faces_psite<0, D, G> fs0(pf0, v0); + faces_psite<1, D, G> fs1(pf1, e0); + faces_psite<2, D, G> fs2(pf2, t0); /*----------------------. @@ -137,7 +150,7 @@ int main() // An image type built on a 2-complex with mln::int_u8 values on // each face. - typedef complex_image<D, P, int_u8> ima_t; + typedef complex_image<D, G, int_u8> ima_t; // Values. metal::vec<D + 1, std::vector< int_u8 > > values; @@ -179,8 +192,8 @@ int main() // Dynamic version. for (unsigned n = 0; n <= D; ++n) { - p_n_faces_fwd_piter<D, P> fwd_np(ima.domain(), n); - p_n_faces_bkd_piter<D, P> bkd_np(ima.domain(), n); + p_n_faces_fwd_piter<D, G> fwd_np(ima.domain(), n); + p_n_faces_bkd_piter<D, G> bkd_np(ima.domain(), n); for_all_2(fwd_np, bkd_np) std::cout << "ima(" << fwd_np << ") = " << ima(fwd_np) << '\t' << "ima(" << bkd_np << ") = " << ima(bkd_np) @@ -192,7 +205,7 @@ int main() // FIXME: Disabled (moved to the attic). # if 0 // FIXME: Sugar the name of the iterator. - p_complex_faces_fwd_piter_<0, D, P> f0p(ima.domain()); + p_complex_faces_fwd_piter_<0, D, G> f0p(ima.domain()); for_all(f0p) std::cout << "ima(" << f0p << ") = " << ima(f0p) << std::endl; #endif @@ -211,7 +224,7 @@ int main() // Iterate on the lower-dimension faces of each face. { - typedef complex_lower_neighborhood<D, P> nbh_t; + typedef complex_lower_neighborhood<D, G> nbh_t; nbh_t nbh; mln_fwd_niter_(nbh_t) fn(nbh, fp); mln_bkd_niter_(nbh_t) bn(nbh, fp); @@ -221,9 +234,9 @@ int main() for_all_2(fn, bn) { mln_assertion((fn.center() == - static_cast<const complex_psite<D, P>&>(fp))); + static_cast<const complex_psite<D, G>&>(fp))); mln_assertion((bn.center() == - static_cast<const complex_psite<D, P>&>(fp))); + static_cast<const complex_psite<D, G>&>(fp))); std::cout << " " << fn << '\t' << bn << std::endl; } } @@ -232,7 +245,7 @@ int main() // Iterate on the higher-dimension faces of each face. { - typedef complex_higher_neighborhood<D, P> nbh_t; + typedef complex_higher_neighborhood<D, G> nbh_t; nbh_t nbh; mln_fwd_niter_(nbh_t) fn(nbh, fp); mln_bkd_niter_(nbh_t) bn(nbh, fp); @@ -242,9 +255,9 @@ int main() for_all_2(fn, bn) { mln_assertion((fn.center() == - static_cast<const complex_psite<D, P>&>(fp))); + static_cast<const complex_psite<D, G>&>(fp))); mln_assertion((bn.center() == - static_cast<const complex_psite<D, P>&>(fp))); + static_cast<const complex_psite<D, G>&>(fp))); std::cout << " " << fn << '\t' << bn << std::endl; } } @@ -253,7 +266,7 @@ int main() // Iterate on the lower- and higher-dimension faces of each face. { - typedef complex_lower_higher_neighborhood<D, P> nbh_t; + typedef complex_lower_higher_neighborhood<D, G> nbh_t; nbh_t nbh; mln_fwd_niter_(nbh_t) fn(nbh, fp); mln_bkd_niter_(nbh_t) bn(nbh, fp); @@ -264,9 +277,9 @@ int main() for_all_2(fn, bn) { mln_assertion((fn.center() == - static_cast<const complex_psite<D, P>&>(fp))); + static_cast<const complex_psite<D, G>&>(fp))); mln_assertion((bn.center() == - static_cast<const complex_psite<D, P>&>(fp))); + static_cast<const complex_psite<D, G>&>(fp))); std::cout << " " << fn << '\t' << bn << std::endl; } } diff --git a/milena/tests/core/site_set/Makefile.am b/milena/tests/core/site_set/Makefile.am index 1b23c79..7c9c2a8 100644 --- a/milena/tests/core/site_set/Makefile.am +++ b/milena/tests/core/site_set/Makefile.am @@ -5,6 +5,7 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ p_array \ ## p_bgraph \ + p_complex \ p_edges \ p_image \ p_priority_queue \ @@ -16,6 +17,7 @@ check_PROGRAMS = \ p_array_SOURCES = p_array.cc ##p_bgraph_SOURCES = p_bgraph.cc +p_complex_SOURCES = p_complex.cc p_image_SOURCES = p_image.cc p_priority_queue_SOURCES = p_priority_queue.cc p_queue_SOURCES = p_queue.cc diff --git a/milena/tests/core/site_set/p_complex.cc b/milena/tests/core/site_set/p_complex.cc new file mode 100644 index 0000000..490d387 --- /dev/null +++ b/milena/tests/core/site_set/p_complex.cc @@ -0,0 +1,127 @@ +// 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. + +/// \file tests/core/image/p_complex.cc +/// \brief Test of mln::p_complex and mln::geom::complex_geometry. + +#include <algorithm> +#include <iterator> +#include <iostream> + +#include <mln/value/int_u8.hh> +#include <mln/core/alias/point2d.hh> + +#include <mln/core/site_set/p_faces.hh> +#include <mln/core/image/complex_image.hh> + +/* FIXME: Split this test (and maybe factor common parts, like the + construction of the complex), since it exercises too many features + in a single file. */ + + +int main() +{ + using namespace mln; + + /*----------. + | Complex. | + `----------*/ + + /* A 2-d (simplicial) complex and its adjacency graph. + + c 0 1 2 3 + r .------------------------ + | v0 e3 v3 + 0 | o-----------o v0----e3----v3 + | / \ ,-----. / / \ | / + | / . \ \ t1/ / / \ t1 / + 1 | e0 / / \ e1\ / / e4 e0. ,e1Ž `e4 + | / /t0 \ \ ' / / t0 \ / + | / `-----' \ / / | \ / + 2 | o-----------o v1----e2----v2 + | v1 e2 v2 + + v = vertex + e = edge + t = triangle + */ + + + const unsigned D = 2; + + topo::complex<D> c; + + // 0-faces (points). + topo::n_face<0, D> v0 = c.add_face(); + topo::n_face<0, D> v1 = c.add_face(); + topo::n_face<0, D> v2 = c.add_face(); + topo::n_face<0, D> v3 = c.add_face(); + + // 1-faces (segments). + topo::n_face<1, D> e0 = c.add_face(v0 + v1); + topo::n_face<1, D> e1 = c.add_face(v0 + v2); + topo::n_face<1, D> e2 = c.add_face(v1 + v2); + topo::n_face<1, D> e3 = c.add_face(v0 + v3); + topo::n_face<1, D> e4 = c.add_face(v2 + v3); + + // 2-faces (triangles). + topo::n_face<2, D> t0 = c.add_face(e0 + e1 + e2); + topo::n_face<2, D> t1 = c.add_face(e1 + e3 + e4); + + + /*------------------------------. + | Complex geometry (location). | + `------------------------------*/ + + typedef point2d P; + typedef geom::complex_geometry<D, P> G; + G geom; + geom.add_location(point2d(0,1)); // 0-face #0. + geom.add_location(point2d(2,0)); // 0-face #1. + geom.add_location(point2d(2,2)); // 0-face #2. + geom.add_location(point2d(0,3)); // 0-face #3. + + + /*---------------------. + | Complex-based pset. | + `---------------------*/ + + // A pset. + p_complex<D, G> pc(c, geom); + + // An iterator on this pset. + p_complex_fwd_piter_<D, G> p(pc); + for_all(p) + { + std::cout << p << ": "; + // Print site(s). + mln_site_(G) s(p); + std::copy (s.sites.begin(), s.sites.end(), + std::ostream_iterator<P>(std::cout, " ")); + std::cout << std::endl; + } +} diff --git a/milena/tests/morpho/complex_image_morpho.cc b/milena/tests/morpho/complex_image_morpho.cc index e8b7d25..baf0f68 100644 --- a/milena/tests/morpho/complex_image_morpho.cc +++ b/milena/tests/morpho/complex_image_morpho.cc @@ -65,15 +65,17 @@ int main() /* A 2-d (simplicial) complex and its adjacency graph. - v0 e3 v3 - o-----------o v0----e3----v3 - / \ ,-----. / / \ | / - / . \ \ t1/ / / \ t1 / - e0 / / \ e1\ / / e4 e0. ,e1Ž `e4 - / /t0 \ \ ' / / t0 \ / - / `-----' \ / / | \ / - o-----------o v1----e2----v2 - v1 e2 v2 + c 0 1 2 3 + r .------------------------ + | v0 e3 v3 + 0 | o-----------o v0----e3----v3 + | / \ ,-----. / / \ | / + | / . \ \ t1/ / / \ t1 / + 1 | e0 / / \ e1\ / / e4 e0. ,e1Ž `e4 + | / /t0 \ \ ' / / t0 \ / + | / `-----' \ / / | \ / + 2 | o-----------o v1----e2----v2 + | v1 e2 v2 v = vertex e = edge @@ -108,7 +110,13 @@ int main() `-------------------------*/ typedef point2d P; - p_complex<D, P> pc(c); + typedef geom::complex_geometry<D, P> G; + G geom; + geom.add_location(point2d(0,1)); // 0-face #0. + geom.add_location(point2d(2,0)); // 0-face #1. + geom.add_location(point2d(2,2)); // 0-face #2. + geom.add_location(point2d(0,3)); // 0-face #3. + p_complex<D, G> pc(c, geom); /*----------------------. @@ -119,7 +127,7 @@ int main() // An image type built on a 2-complex with mln::int_u8 values on // each face. - typedef complex_image<D, P, int_u8> ima_t; + typedef complex_image<D, G, int_u8> ima_t; ima_t ima(pc); // Initialize values. debug::iota(ima); @@ -148,9 +156,9 @@ int main() | Morphological operations on complex-based images. | `---------------------------------------------------*/ - test_morpho(ima, complex_lower_window_p<D, P>()); - test_morpho(ima, complex_higher_window_p<D, P>()); - test_morpho(ima, complex_lower_higher_window_p<D, P>()); + test_morpho(ima, complex_lower_window_p<D, G>()); + test_morpho(ima, complex_higher_window_p<D, G>()); + test_morpho(ima, complex_lower_higher_window_p<D, G>()); /* FIXME: Exercise elementary erosion/dilation (with neighborhoods) when available. */ -- 1.6.0.1

16 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches