- Olena-patches

2626: Exercise iterators on transitively adjacent m-faces.
by Roland Levillain 21 Oct '08

21 Oct '08

* tests/topo/complex.cc: Here. --- milena/ChangeLog | 6 ++++++ milena/tests/topo/complex.cc | 19 ++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index dbe1c06..736c0cc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -24,6 +24,12 @@ 2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Exercise iterators on transitively adjacent m-faces. + + * tests/topo/complex.cc: Here. + +2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Add a complex relative iterator on transitively adjacent m-faces. * mln/topo/adj_m_face_iter.hh: New. diff --git a/milena/tests/topo/complex.cc b/milena/tests/topo/complex.cc index 249b743..7d5d354 100644 --- a/milena/tests/topo/complex.cc +++ b/milena/tests/topo/complex.cc @@ -33,7 +33,6 @@ #include <iostream> #include <mln/topo/complex.hh> -#include <mln/topo/center_only_iter.hh> using namespace mln; @@ -293,6 +292,24 @@ int main() } std::cout << std::endl; + // For each face F of C, and for M in [0, D], iterate on the the set + // of M-faces transitively adjacent to F. + topo::adj_m_face_fwd_iter<D> fwd_amf(fwd_f, 0); + topo::adj_m_face_bkd_iter<D> bkd_amf(fwd_f, 0); + for_all(fwd_f) + { + for (unsigned m = 0; m <= D; ++m) + { + fwd_amf.set_m(m); + bkd_amf.set_m(m); + std::cout << m << "-faces (transitively) adjacent to " << fwd_f + << ": " << std::endl; + for_all_2(fwd_amf, bkd_amf) + std::cout << " " << fwd_amf << '\t' << bkd_amf << std::endl; + } + std::cout << std::endl; + } + /* Next, write these: -- 1.6.0.1

1 0

2625: Add a complex relative iterator on transitively adjacent m-faces.
by Roland Levillain 21 Oct '08

21 Oct '08

* mln/topo/adj_m_face_iter.hh: New. Include this file... * mln/topo/complex_iterators.hh: ...here. Include also mln/topo/center_only_iter.hh. --- milena/ChangeLog | 9 + milena/mln/topo/adj_m_face_iter.hh | 342 ++++++++++++++++++++++++++++++++++ milena/mln/topo/complex_iterators.hh | 17 ++ 3 files changed, 368 insertions(+), 0 deletions(-) create mode 100644 milena/mln/topo/adj_m_face_iter.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 16ddcbb..dbe1c06 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -24,6 +24,15 @@ 2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Add a complex relative iterator on transitively adjacent m-faces. + + * mln/topo/adj_m_face_iter.hh: New. + Include this file... + * mln/topo/complex_iterators.hh: ...here. + Include also mln/topo/center_only_iter.hh. + +2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Supplement complex-based image. * mln/core/image/complex_image.hh diff --git a/milena/mln/topo/adj_m_face_iter.hh b/milena/mln/topo/adj_m_face_iter.hh new file mode 100644 index 0000000..f54a341 --- /dev/null +++ b/milena/mln/topo/adj_m_face_iter.hh @@ -0,0 +1,342 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_TOPO_ADJ_M_FACE_ITER_HH +# define MLN_TOPO_ADJ_M_FACE_ITER_HH + +/// \file mln/topo/adj_m_face_iter.hh + +/// \brief Definition of forward and backward iterators on all the +/// m-faces transitively adjacent to a (reference) n-face in a +/// complex. + +# include <set> + +# include <mln/topo/internal/complex_relative_iterator_base.hh> +# include <mln/topo/face.hh> + + +namespace mln +{ + + namespace topo + { + + // Forward declarations. + template <unsigned D> class complex; + namespace internal + { + template <unsigned D> class adj_m_face_iterator; + } + + + /*-------------------------------. + | topo::adj_m_face_fwd_iter<D>. | + `-------------------------------*/ + + /** \brief Forward iterator on all the m-faces transitively + adjacent to a (reference) n-face in a complex. + + \tparam D The dimension of the complex this iterator belongs to. + + The dimension parameter (\a m_) must be lower or equal to D. + + If \a m_ is equal to the dimension of the reference face, then + the iterated set is empty. */ + template <unsigned D> + class adj_m_face_fwd_iter + : public internal::forward_complex_relative_iterator_base< face<D>, + adj_m_face_fwd_iter<D> >, + public internal::adj_m_face_iterator<D> + { + private: + typedef adj_m_face_fwd_iter<D> self_; + typedef internal::forward_complex_relative_iterator_base< face<D>, + self_ > super_; + typedef internal::adj_m_face_iterator<D> impl_; + + public: + /// Construction. + /// \{ + /// Construct an iterator, with an invalid reference face, and + /// a target dimension equal to 0. + adj_m_face_fwd_iter(); + /// Constructs an iterator, with \a f_ref as reference face, and + /// a target dimension equal to \a m. + template <typename Fref> + adj_m_face_fwd_iter(const Fref& f_ref, unsigned m); + /// \} + + /// \brief Compute the set of faces adjacent to the reference face. + /// + /// The computation is delegated to + /// mln::topo::internal::adj_m_face_iterator. + void update_adj_faces_(); + }; + + + /*-------------------------------. + | topo::adj_m_face_bkd_iter<D>. | + `-------------------------------*/ + + /** \brief Backward iterator on all the m-faces transitively + adjacent to a (reference) n-face in a complex. + + \tparam D The dimension of the complex this iterator belongs to. + + The dimension parameter (\a m_) must be lower or equal to D. + + If \a m_ is equal to the dimension of the reference face, then + the iterated set is empty. */ + template <unsigned D> + class adj_m_face_bkd_iter + : public internal::backward_complex_relative_iterator_base< face<D>, + adj_m_face_bkd_iter<D> >, + public internal::adj_m_face_iterator<D> + { + private: + typedef adj_m_face_bkd_iter<D> self_; + typedef internal::backward_complex_relative_iterator_base< face<D>, + self_ > super_; + typedef internal::adj_m_face_iterator<D> impl_; + + public: + /// Construction. + /// \{ + /// Construct an iterator, with an invalid reference face, and + /// a target dimension equal to 0. + adj_m_face_bkd_iter(); + /// Constructs an iterator, with \a f_ref as reference face, and + /// a target dimension equal to \a m. + template <typename Fref> + adj_m_face_bkd_iter(const Fref& f_ref, unsigned m); + /// \} + + /// \brief Compute the set of faces adjacent to the reference face. + /// + /// The computation is delegated to + /// mln::topo::internal::adj_m_face_iterator. + void update_adj_faces_(); + }; + + + /*-----------------------------------------. + | topo::internal::adj_m_face_iterator<D>. | + `-----------------------------------------*/ + + namespace internal + { + + template <unsigned D> + class adj_m_face_iterator + { + protected: + adj_m_face_iterator(); + adj_m_face_iterator(unsigned m); + + public: + /// Get the target dimension. + unsigned m() const; + /// Set the target dimension. + void set_m(unsigned m); + + protected: + /// The actual implementation of the computation of the set of + /// faces adjacent to the reference face. + void update_adj_faces__(const face<D>& center, + std::vector< face<D> >& adj_faces); + + /// The dimension of the iterated faces. + unsigned m_; + }; + + } // end of namespace mln::topo::internal + + + +# ifndef MLN_INCLUDE_ONLY + + /*-------------------------------. + | topo::adj_m_face_fwd_iter<D>. | + `-------------------------------*/ + + template <unsigned D> + inline + adj_m_face_fwd_iter<D>::adj_m_face_fwd_iter() + { + } + + template <unsigned D> + template <typename Fref> + inline + adj_m_face_fwd_iter<D>::adj_m_face_fwd_iter(const Fref& f_ref, unsigned m) + : super_(f_ref), impl_(m) + { + } + + template <unsigned D> + inline + void + adj_m_face_fwd_iter<D>::update_adj_faces_() + { + mln_precondition(this->c_); + // Delegate computation to base class. + this->update_adj_faces__(*this->c_, this->adj_faces_); + } + + + /*-------------------------------. + | topo::adj_m_face_bkd_iter<D>. | + `-------------------------------*/ + + template <unsigned D> + inline + adj_m_face_bkd_iter<D>::adj_m_face_bkd_iter() + { + } + + template <unsigned D> + template <typename Fref> + inline + adj_m_face_bkd_iter<D>::adj_m_face_bkd_iter(const Fref& f_ref, unsigned m) + : super_(f_ref), impl_(m) + { + } + + template <unsigned D> + inline + void + adj_m_face_bkd_iter<D>::update_adj_faces_() + { + mln_precondition(this->c_); + // Delegate computation to base class. + this->update_adj_faces__(*this->c_, this->adj_faces_); + } + + + /*-----------------------------------------. + | topo::internal::adj_m_face_iterator<D>. | + `-----------------------------------------*/ + + namespace internal + { + + template <unsigned D> + inline + adj_m_face_iterator<D>::adj_m_face_iterator() + : m_(0) + { + } + + template <unsigned D> + inline + adj_m_face_iterator<D>::adj_m_face_iterator(unsigned m) + : m_(m) + { + mln_precondition(m <= D); + } + + template <unsigned D> + unsigned + adj_m_face_iterator<D>::m() const + { + return m_; + } + + template <unsigned D> + void + adj_m_face_iterator<D>::set_m(unsigned m) + { + m_ = m; + } + + template <unsigned D> + inline + void + adj_m_face_iterator<D>::update_adj_faces__(const face<D>& center, + std::vector< face<D> >& adj_faces) + { + adj_faces.clear(); + + if (center.n() == m_) + return; + + typedef std::vector < topo::face<D> > faces_t; + typedef std::set < topo::face<D> > faces_set_t; + + /* FIXME: p_faces is redundant; we could use adj_faces + directly. */ + /* The adjacent p-faces being built; initialized with CENTER, + and filled with q-faces at each step, until q reaches + m_. */ + faces_t p_faces(1, center); + // The set of faces being built. + /* FIXME: This pattern is recurring in Milena---using an + std::set (or any fast associative container) to improve + the lookup speed of an std::vector; we should create a + class for this, a bit like mln::util::set, but with a + garantee on the order of insertion. */ + faces_t work_faces; + faces_set_t work_faces_set; + + // Iteratively compute the set of locations. + for (unsigned p = center.n(); p != m_; (p < m_ ? ++p : --p) ) + { + mln_invariant (p != m_); + for (typename faces_t::const_iterator g = p_faces.begin(); + g != p_faces.end(); ++g) + { + mln_invariant (g->n() != m_); + faces_t q_faces = g->n() < m_ ? + g->higher_dim_adj_faces() : + g->lower_dim_adj_faces(); + // Don't insert a face twice. + for (typename faces_t::const_iterator h = q_faces.begin(); + h != q_faces.end(); ++h) + if (work_faces_set.find(*h) == work_faces_set.end()) + { + work_faces.push_back(*h); + work_faces_set.insert(*h); + } + } + work_faces.swap(p_faces); + work_faces.clear(); + work_faces_set.clear(); + } + + adj_faces = p_faces; + } + + } // end of namespace mln::topo::internal + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::topo + +} // end of namespace mln + +#endif // ! MLN_TOPO_ADJ_LOWER_DIM_CONNECTED_N_FACE_ITER_HH diff --git a/milena/mln/topo/complex_iterators.hh b/milena/mln/topo/complex_iterators.hh index 0db739c..8a01b78 100644 --- a/milena/mln/topo/complex_iterators.hh +++ b/milena/mln/topo/complex_iterators.hh @@ -33,6 +33,10 @@ /// /// This file includes all iterators on faces. +/*-----------------------------. +| Iterators on sets of faces. | +`-----------------------------*/ + # include <mln/topo/face_iter.hh> # include <mln/topo/n_face_iter.hh> # include <mln/topo/static_n_face_iter.hh> @@ -41,10 +45,23 @@ # include <mln/topo/faces_iter.hh> # endif +/*---------------------. +| Relative iterators. | +`---------------------*/ + # include <mln/topo/adj_lower_face_iter.hh> # include <mln/topo/adj_higher_face_iter.hh> # include <mln/topo/adj_lower_higher_face_iter.hh> + # include <mln/topo/adj_lower_dim_connected_n_face_iter.hh> # include <mln/topo/adj_higher_dim_connected_n_face_iter.hh> +# include <mln/topo/adj_m_face_iter.hh> + +/*--------------------. +| Special iterators. | +`--------------------*/ + +# include <mln/topo/center_only_iter.hh> + #endif // ! MLN_TOPO_COMPLEX_ITERATORS_HH -- 1.6.0.1

1 0

2624: Supplement complex-based image.
by Roland Levillain 21 Oct '08

21 Oct '08

* mln/core/image/complex_image.hh (mln::complex_image<D, G, V>::dim): New constant. (mln::complex_image<D, G, V>::geom): New typedef. --- milena/ChangeLog | 8 ++++++++ milena/mln/core/image/complex_image.hh | 6 +++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5ce1170..16ddcbb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -24,6 +24,14 @@ 2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Supplement complex-based image. + + * mln/core/image/complex_image.hh + (mln::complex_image<D, G, V>::dim): New constant. + (mln::complex_image<D, G, V>::geom): New typedef. + +2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + * mln/core/macros.hh (mln_geom, mln_geom_): New macros. 2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/mln/core/image/complex_image.hh b/milena/mln/core/image/complex_image.hh index 94ba949..32c83cb 100644 --- a/milena/mln/core/image/complex_image.hh +++ b/milena/mln/core/image/complex_image.hh @@ -116,7 +116,7 @@ namespace mln /// Values attached to each face of the complex. /// /// \arg p D The dimension of the complex. - /// \arg p G The geometry of the complex. + /// \arg p G The geometry type of the complex. /// \arg p V The value type of the image. template <unsigned D, typename G, typename V> class complex_image @@ -124,6 +124,10 @@ namespace mln complex_image<D, G, V> > { public: + /// The dimension of the complex. + static const unsigned dim = D; + /// The geometry type of the complex. + typedef G geom; /// Value associated type. typedef V value; -- 1.6.0.1

1 0

2623: mln/core/macros.hh (mln_geom, mln_geom_): New macros.
by Roland Levillain 21 Oct '08

21 Oct '08

--- milena/ChangeLog | 4 ++++ milena/mln/core/macros.hh | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index faaf934..5ce1170 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -24,6 +24,10 @@ 2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + * mln/core/macros.hh (mln_geom, mln_geom_): New macros. + +2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Add accessors to implementations class of complex iterators. * mln/topo/internal/complex_set_iterator_base.hh diff --git a/milena/mln/core/macros.hh b/milena/mln/core/macros.hh index 2b800e0..d075bdb 100644 --- a/milena/mln/core/macros.hh +++ b/milena/mln/core/macros.hh @@ -186,6 +186,12 @@ // g +/// Shortcuts to access the geometry type associated to T. +/// \{ +# define mln_geom(T) typename T::geom +# define mln_geom_(T) T::geom +/// \} + /// Shortcuts to access the grid type associated to T. /// \{ # define mln_grid(T) typename T::grid -- 1.6.0.1

1 0

2622: Add accessors to implementations class of complex iterators.
by Roland Levillain 21 Oct '08

21 Oct '08

* mln/topo/internal/complex_set_iterator_base.hh (internal::complex_set_iterator_base<F, E>::face): Rename typedef as... (internal::complex_set_iterator_base<F, E>::face_type): ...this. Adjust. (internal::complex_set_iterator_base<F, E>::face): New iterator. (internal::complex_set_iterator_base<F, E>): Remove irrelevant static assertion. * mln/topo/internal/complex_relative_iterator_base.hh (internal::complex_relative_iterator_base<F, E>::face) (internal::forward_complex_relative_iterator_base<F, E>::face) (internal::backward_complex_relative_iterator_base<F, E>::face): Rename typedefs as... (internal::complex_relative_iterator_base<F, E>::face_type) (internal::forward_complex_relative_iterator_base<F, E>::face_type) (internal::backward_complex_relative_iterator_base<F, E>::face_type): ...these. Adjust. (internal::complex_relative_iterator_base<F, E>::face): New accessor. (internal::complex_relative_iterator_base<F, E>): Remove irrelevant static assertion. --- milena/ChangeLog | 52 ++++++++++++++++++++ .../internal/complex_relative_iterator_base.hh | 38 +++++++++------ .../mln/topo/internal/complex_set_iterator_base.hh | 30 +++++++----- 3 files changed, 93 insertions(+), 27 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 37cd5d2..faaf934 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,57 @@ 2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + s/milena/Milena/. + + * mln/core/concept/gpoint.hh, + * mln/core/concept/object.hh, + * mln/core/concept/point_site.hh, + * mln/core/image/fi_adaptor.hh, + * mln/core/macros.hh, + * mln/core/routine/ops.hh, + * mln/io/fits/load.hh, + * mln/io/pbm/load.hh, + * mln/io/pbm/save.hh, + * mln/io/pfm/load.hh, + * mln/io/pfm/save.hh, + * mln/io/pgm/load.hh, + * mln/io/pgm/save.hh, + * mln/io/pnm/save.hh, + * mln/io/pnm/save_header.hh, + * mln/io/ppm/load.hh, + * mln/io/ppm/save.hh, + * mln/make/all.hh: + Do it. + +2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + + Add accessors to implementations class of complex iterators. + + * mln/topo/internal/complex_set_iterator_base.hh + (internal::complex_set_iterator_base<F, E>::face): + Rename typedef as... + (internal::complex_set_iterator_base<F, E>::face_type): + ...this. + Adjust. + (internal::complex_set_iterator_base<F, E>::face): New iterator. + (internal::complex_set_iterator_base<F, E>): Remove irrelevant + static assertion. + * mln/topo/internal/complex_relative_iterator_base.hh + (internal::complex_relative_iterator_base<F, E>::face) + (internal::forward_complex_relative_iterator_base<F, E>::face) + (internal::backward_complex_relative_iterator_base<F, E>::face): + Rename typedefs as... + (internal::complex_relative_iterator_base<F, E>::face_type) + (internal::forward_complex_relative_iterator_base<F, E>::face_type) + (internal::backward_complex_relative_iterator_base<F, E>::face_type): + ...these. + Adjust. + (internal::complex_relative_iterator_base<F, E>::face): + New accessor. + (internal::complex_relative_iterator_base<F, E>): + Remove irrelevant static assertion. + +2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Use alias mln::bin_2complex_image3df. * mln/io/off/load.hh, diff --git a/milena/mln/topo/internal/complex_relative_iterator_base.hh b/milena/mln/topo/internal/complex_relative_iterator_base.hh index 7275989..16b913b 100644 --- a/milena/mln/topo/internal/complex_relative_iterator_base.hh +++ b/milena/mln/topo/internal/complex_relative_iterator_base.hh @@ -58,7 +58,7 @@ # include <mln/topo/complex.hh> /* FIXME: Introduce a common factoring class for this class and for - complex_relative_iterator_base? */ + complex_set_iterator_base? */ /* FIXME: By moving iterator `i_' into internal::complex_relative_iterator_base, we'll be able to factor @@ -91,7 +91,7 @@ namespace mln public: /// The type of the iterated faces. - typedef F face; + typedef F face_type; /// Construction. /// \{ @@ -111,24 +111,28 @@ namespace mln void next_(); /// \} - /// Conversion. - /// \{ + /// \brief Conversion. + /// /// Return a reference to the corresponding face handle. - operator const face&() const; + /// \{ + /// Explicit conversion (accessor). + const face_type& face() const; + /// Implicit conversion (conversion operator). + operator const face_type&() const; /// \} protected: /// A pointer to the center face around which this iterator /// moves. - const face* c_; + const face_type* c_; // The type of the set of vicinity sites (adjacent face handles). - typedef std::vector<face> adj_faces_t; + typedef std::vector<face_type> adj_faces_t; /// The set of faces adjacent to the reference face. adj_faces_t adj_faces_; /// The face handle this iterator is pointing to. - face f_; + face_type f_; }; @@ -160,7 +164,7 @@ namespace mln typedef complex_relative_iterator_base<F, E> super_; public: - typedef F face; + typedef F face_type; public: /// Construction. @@ -210,7 +214,7 @@ namespace mln typedef complex_relative_iterator_base<F, E> super_; public: - typedef F face; + typedef F face_type; public: /// Construction. @@ -255,8 +259,6 @@ namespace mln complex_relative_iterator_base<F, E>::complex_relative_iterator_base() : c_(0) { - // Ensure F and E are compatible. - mlc_equal(F, typename E::face)::check(); // Check for required methods in E. void (E::*m)() = & E::update_adj_faces_; m = 0; @@ -269,8 +271,6 @@ namespace mln inline complex_relative_iterator_base<F, E>::complex_relative_iterator_base(const Fref& f_ref) { - // Ensure F and E are compatible. - mlc_equal(F, typename E::face)::check(); // Check for required methods in E. void (E::*m)() = & E::update_adj_faces_; m = 0; @@ -309,7 +309,15 @@ namespace mln template <typename F, typename E> inline - complex_relative_iterator_base<F, E>::operator const face&() const + const F& + complex_relative_iterator_base<F, E>::face() const + { + return f_; + } + + template <typename F, typename E> + inline + complex_relative_iterator_base<F, E>::operator const face_type&() const { return f_; } diff --git a/milena/mln/topo/internal/complex_set_iterator_base.hh b/milena/mln/topo/internal/complex_set_iterator_base.hh index fd09b19..6a7588d 100644 --- a/milena/mln/topo/internal/complex_set_iterator_base.hh +++ b/milena/mln/topo/internal/complex_set_iterator_base.hh @@ -62,7 +62,7 @@ namespace mln public: /// The type of the iterated faces. - typedef F face; + typedef F face_type; // FIXME: Maybe we could just get the dimension D of the face's // complex, an define complex_type as mln::complex<D>? typedef typename F::complex_type complex_type; @@ -87,15 +87,19 @@ namespace mln void invalidate(); /// \} - /// Conversion. - /// \{ + /// \brief Conversion. + /// /// Return a reference to the corresponding face handle. - operator const face&() const; + /// \{ + /// Explicit conversion (accessor). + const face_type& face() const; + /// Implicit conversion (conversion operator). + operator const face_type&() const; /// \} protected: /// The face handle this iterator is pointing to. - face f_; + face_type f_; }; @@ -113,9 +117,6 @@ namespace mln inline complex_set_iterator_base<F, E>::complex_set_iterator_base() { - // Ensure F and E are compatible. - mlc_equal(F, typename E::face)::check(); - invalidate(); } @@ -123,9 +124,6 @@ namespace mln inline complex_set_iterator_base<F, E>::complex_set_iterator_base(complex_type& c) { - // Ensure F and E are compatible. - mlc_equal(F, typename E::face)::check(); - f_.set_cplx(c); // Invalidate f_. invalidate(); @@ -159,7 +157,15 @@ namespace mln template <typename F, typename E> inline - complex_set_iterator_base<F, E>::operator const face&() const + const F& + complex_set_iterator_base<F, E>::face() const + { + return f_; + } + + template <typename F, typename E> + inline + complex_set_iterator_base<F, E>::operator const face_type&() const { return f_; } -- 1.6.0.1

1 0

2621: Use alias mln::bin_2complex_image3df.
by Roland Levillain 21 Oct '08

21 Oct '08

* mln/io/off/load.hh, * tests/io/off/load_bin.cc: Here. --- milena/ChangeLog | 8 ++++++++ milena/mln/io/off/load.hh | 13 +++---------- milena/tests/io/off/load_bin.cc | 4 +--- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3c2e65d..37cd5d2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Use alias mln::bin_2complex_image3df. + + * mln/io/off/load.hh, + * tests/io/off/load_bin.cc: + Here. + +2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + Provide an alias for binary 2-complex-based 3-dimensional images. * mln/core/alias/bin_2complex_image3df.hh: New. diff --git a/milena/mln/io/off/load.hh b/milena/mln/io/off/load.hh index ff8d106..1a00f3d 100644 --- a/milena/mln/io/off/load.hh +++ b/milena/mln/io/off/load.hh @@ -40,12 +40,7 @@ # 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> +# include <mln/core/alias/bin_2complex_image3df.hh> namespace mln @@ -64,8 +59,7 @@ namespace mln 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); + void load(bin_2complex_image3df& ima, const std::string& filename); namespace internal { @@ -77,8 +71,7 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - void load(complex_image<2 ,geom::complex_geometry<2,point3df>, bool>& ima, - const std::string& filename) + void load(bin_2complex_image3df& ima, const std::string& filename) { const std::string me = "mln::io::load::off"; diff --git a/milena/tests/io/off/load_bin.cc b/milena/tests/io/off/load_bin.cc index e171704..341c874 100644 --- a/milena/tests/io/off/load_bin.cc +++ b/milena/tests/io/off/load_bin.cc @@ -42,9 +42,7 @@ 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; + typedef bin_2complex_image3df ima_t; ima_t ima; io::off::load(ima, MLN_MESH_DIR "/tetrahedron.off"); -- 1.6.0.1

1 0

2620: Provide an alias for binary 2-complex-based 3-dimensional images.
by Roland Levillain 21 Oct '08

21 Oct '08

* mln/core/alias/bin_2complex_image3df.hh: New. --- milena/ChangeLog | 6 +++ milena/mln/core/alias/bin_2complex_image3df.hh | 51 ++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) create mode 100644 milena/mln/core/alias/bin_2complex_image3df.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index aedb0ae..3c2e65d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2008-10-22 Roland Levillain <roland(a)lrde.epita.fr> + + Provide an alias for binary 2-complex-based 3-dimensional images. + + * mln/core/alias/bin_2complex_image3df.hh: New. + 2008-10-21 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Remove debug in chamfer. diff --git a/milena/mln/core/alias/bin_2complex_image3df.hh b/milena/mln/core/alias/bin_2complex_image3df.hh new file mode 100644 index 0000000..c429752 --- /dev/null +++ b/milena/mln/core/alias/bin_2complex_image3df.hh @@ -0,0 +1,51 @@ +// 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_ALIAS_BIN_2COMPLEX_IMAGE3DF_HH +# define MLN_CORE_ALIAS_BIN_2COMPLEX_IMAGE3DF_HH + +/// \file mln/core/alias/bin_2complex_image3df.hh +/// \brief Definition of the mln::bin_2complex_image3df alias. + +# include <mln/core/image/complex_image.hh> +# include <mln/geom/complex_geometry.hh> +# include <mln/core/alias/point3df.hh> + + +namespace mln +{ + + /// \brief Type alias for a binary image based on a 2-complex, where + /// 0-faces are located at floating-point 3-dimensional points. + typedef + mln::complex_image<2, mln::geom::complex_geometry<2,point3df>, bool> + bin_2complex_image3df; + +} // end of namespace mln + + +#endif // ! MLN_CORE_ALIAS_BIN_2COMPLEX_IMAGE3DF_HH -- 1.6.0.1

1 0

r2619: Work on ICCVG04 classification method
by Ugo Jardonnet 21 Oct '08

21 Oct '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox ChangeLog: 2008-10-21 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Work on ICCVG04 classification method * iccvg04.cc: Add a general display function for 3d images. iccvg04.cc | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) Index: branches/cleanup-2008/milena/sandbox/classif/iccvg04.cc =================================================================== --- branches/cleanup-2008/milena/sandbox/classif/iccvg04.cc (revision 2618) +++ branches/cleanup-2008/milena/sandbox/classif/iccvg04.cc (revision 2619) @@ -11,6 +11,8 @@ #include <mln/arith/revert.hh> #include <mln/morpho/meyer_wst.hh> #include <mln/core/alias/neighb3d.hh> +#include <mln/util/array.hh> +#include <mln/labeling/compute.hh> // FIXME: !? #include <mln/geom/all.hh> @@ -19,6 +21,10 @@ #include <mln/io/pgm/save.hh> +#include <sys/stat.h> +#include <sstream> + + using namespace mln; unsigned max = 0; @@ -52,6 +58,33 @@ } template <typename I> +void display(const I& ima, const char * dir) +{ + mkdir(dir, 0777); + chdir(dir); + + for (int s = 0; s < geom::nslis(ima); ++s) + { + image2d< mln_value(I) > out(geom::nrows(ima), geom::ncols(ima)); + // image2d< value::int_u8 > out(geom::nrows(ima), geom::ncols(ima)); + for (int r = 0; r < geom::nrows(ima); ++r) + { + for (int c = 0; c < geom::ncols(ima); ++c) + { + out(point2d(r, c)) = ima(point3d(s, r, c)); + } + } + + std::ostringstream is; + is << "out_" << s << ".ppm"; + + io::pgm::save(out, is.str()); + } + + chdir(".."); +} + +template <typename I> void display_proj_revert(const I& histo, const char * s) { image2d< unsigned long long > proj_histo(geom::nrows(histo),geom::ncols(histo)); @@ -133,6 +166,24 @@ return res; } +template <typename I, typename J, typename K> +mln_ch_value(I, value::int_u8) donne_tout(const I& ima, const J& histo, const K& ws, int nbasins) +{ + image2d<value::rgb8> out(ima.domain()); + + typedef mln::accu::mean<mln_value(J)> accu_t; + + accu_t acu; + + util::array<mln_result(accu_t)> tmp = labeling::compute(acu, histo, ws, nbasins); + + /*mln_piter(I) p(ima.domain()); + + for_all(p) + { + }*/ +} + int main(int argc, char **argv) { image2d<value::rgb8> ima; @@ -140,14 +191,16 @@ //make histo image3d<unsigned> histo = fill_histo(ima); - image3d<value::int_u8> nhisto = normalizeu8(histo); + //display(nhisto, "histo"); + //revert histo image3d<value::int_u8> rhisto = arith::revert(nhisto); + //display(rhisto, "rhisto"); //compute closing_area of histo - image3d<unsigned> histo_closure(histo.domain()); + image3d<value::int_u8> histo_closure(histo.domain()); morpho::closing_area(rhisto, c6(), 420, histo_closure); //display_proj_revert(histo_closure, "chisto.ppm"); @@ -156,7 +209,9 @@ value::int_u16 nbasins; image3d<value::int_u16> ws = morpho::meyer_wst(histo_closure, c6(), nbasins); + display(ws, "ws"); display_proj_revert(ws, "whisto.ppm"); //gplot(ws); + //donne_tout(ima, histo_closure, ws, nbasins); }

1 0

r2618: Work on INIM classification
by Ugo Jardonnet 21 Oct '08

21 Oct '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox ChangeLog: 2008-10-21 Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Work on INIM classification * classif/Makefile: Change flags. * classif/iccvg04.cc: Implement classification method of ICCVG04. * classif/scoolNBR.ppm: Remove. Makefile | 1 iccvg04.cc | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 84 insertions(+), 14 deletions(-) Index: branches/cleanup-2008/milena/sandbox/classif/scoolNBR.ppm (deleted) =================================================================== Index: branches/cleanup-2008/milena/sandbox/classif/iccvg04.cc =================================================================== --- branches/cleanup-2008/milena/sandbox/classif/iccvg04.cc (revision 2617) +++ branches/cleanup-2008/milena/sandbox/classif/iccvg04.cc (revision 2618) @@ -6,10 +6,14 @@ #include <mln/value/all.hh> #include <mln/level/fill.hh> +#include <mln/morpho/closing_volume.hh> #include <mln/morpho/closing_area.hh> #include <mln/arith/revert.hh> #include <mln/morpho/meyer_wst.hh> -#include <mln/core/alias/neighb2d.hh> +#include <mln/core/alias/neighb3d.hh> + +// FIXME: !? +#include <mln/geom/all.hh> #include <mln/io/ppm/load.hh> @@ -23,14 +27,14 @@ mln::image3d<unsigned> fill_histo(const I& ima) { - image3d< unsigned > histo(256,256,256); + image3d< unsigned > histo(128,128,128); level::fill(histo, 0); unsigned i = 0; mln_piter(I) p(ima.domain()); for_all(p) { - point3d p3(ima(p).red(),ima(p).green(), ima(p).blue()); + point3d p3(ima(p).red()/2,ima(p).green()/2, ima(p).blue()/2); histo(p3)++; } return histo; @@ -48,29 +52,85 @@ } template <typename I> -void display_proj(const I& histo) +void display_proj_revert(const I& histo, const char * s) { - image2d< unsigned long long > proj_histo(256,256); + image2d< unsigned long long > proj_histo(geom::nrows(histo),geom::ncols(histo)); level::fill(proj_histo, 0); mln_piter_(image2d< unsigned long long >) p(proj_histo.domain()); double max = 0; for_all(p) { - for (unsigned i = 0; i < 256; i++) + for (unsigned i = 0; i < geom::nslis(histo); i++) +// if (histo(point3d(p[0], p[1], i)) < 255) proj_histo(p) += histo(point3d(p[0], p[1], i)); if (proj_histo(p) > max) max = proj_histo(p); } - image2d< value::int_u8 > out(256, 256); + image2d< value::int_u8 > out(proj_histo.domain()); + for_all(p) + { + out(p) = (proj_histo(p) / max) * 255; + + if (out(p) < 255) + out(p) -= (255 - out(p)) * 10; + } + + io::pgm::save(out,s); +} + +template <typename I> +void display_proj_min(const I& histo, const char * s) +{ + image2d< unsigned long long > proj_histo(geom::nrows(histo),geom::ncols(histo)); + level::fill(proj_histo, 0); + + mln_piter_(image2d< unsigned long long >) p(proj_histo.domain()); + double max = 0; + for_all(p) + { + unsigned min = 9999999; + for (unsigned i = 0; i < geom::nslis(histo); i++) + if (histo(point3d(p[0], p[1], i)) < min) + min = histo(point3d(p[0], p[1], i)); + proj_histo(p) = min; + + if (proj_histo(p) > max) + max = proj_histo(p); + } + + image2d< value::int_u8 > out(proj_histo.domain()); for_all(p) { out(p) = (proj_histo(p) / max) * 255; } - io::pgm::save(out,"./chiche.pgm"); + io::pgm::save(out, s); +} + + +template <typename I> +mln_ch_value(I, value::int_u8) normalizeu8(const I& ima) +{ + mln_ch_value(I, value::int_u8) res(ima.domain()); + level::fill(res, literal::zero); + + mln_piter(I) p(ima.domain()); + mln_value(I) max = 0; + for_all(p) + { + if (ima(p) > max) + max = ima(p); + } + + for_all(p) + { + res(p) = (ima(p) / (double) max) * 255; + } + + return res; } int main(int argc, char **argv) @@ -78,14 +138,25 @@ image2d<value::rgb8> ima; ima = io::ppm::load<value::rgb8>(argv[1]); + //make histo image3d<unsigned> histo = fill_histo(ima); - histo = arith::revert(histo); - image3d<value::int_u8> histo_closed(histo.domain()); + image3d<value::int_u8> nhisto = normalizeu8(histo); + + //revert histo + image3d<value::int_u8> rhisto = arith::revert(nhisto); + //compute closing_area of histo + + image3d<unsigned> histo_closure(histo.domain()); + morpho::closing_area(rhisto, c6(), 420, histo_closure); + + //display_proj_revert(histo_closure, "chisto.ppm"); - morpho::closing_area(histo, c4(), 510, histo_closed); + //watershed over histo_closure + value::int_u16 nbasins; + image3d<value::int_u16> ws = morpho::meyer_wst(histo_closure, c6(), nbasins); - //display_proj(arith::revert(histo)); + display_proj_revert(ws, "whisto.ppm"); + //gplot(ws); - //display_proj(histo); } Index: branches/cleanup-2008/milena/sandbox/classif/Makefile =================================================================== --- branches/cleanup-2008/milena/sandbox/classif/Makefile (revision 2617) +++ branches/cleanup-2008/milena/sandbox/classif/Makefile (revision 2618) @@ -1,2 +1,2 @@ all: - g++ *.cc -I../../ -O3 \ No newline at end of file + g++ *.cc -I../../ -O1 -DNDEBUG \ No newline at end of file

1 0

milena r2617: Remove debug in chamfer
by Matthieu Garrigues 21 Oct '08

21 Oct '08

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-10-21 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Remove debug in chamfer. * mln/geom/chamfer.hh: Remove debug. (sorry). --- chamfer.hh | 1 - 1 file changed, 1 deletion(-) Index: branches/cleanup-2008/milena/mln/geom/chamfer.hh =================================================================== --- branches/cleanup-2008/milena/mln/geom/chamfer.hh (revision 2616) +++ branches/cleanup-2008/milena/mln/geom/chamfer.hh (revision 2617) @@ -100,7 +100,6 @@ // Was : // level::fill((output | (input | pw::cst(true)).domain()).rw(), 0); // level::fill((output | (input | pw::cst(false)).domain()).rw(), max); - debug::println(output); } inline bool handles(const P& p) const { return input(p) == false; }

1 0