- Olena-patches

[Olena] #158: Clean up complex-based images
by Olena 06 Oct '08

06 Oct '08

#158: Clean up complex-based images -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: enhancement | Status: new Priority: major | Milestone: Olena 1.0 Component: Milena | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- See the `FIXME`s in files listed in wiki:Olena/ComplexBasedImages. In particular, it seems wise to move complexes out of face handles (after all), since it solves many problems, to the price of relaxed (dynamic) checks (i.e., less guarantees on the validity of complex handles, psites and iterators). -- Ticket URL: <https://trac.lrde.org/olena/ticket/158> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 2

2522: Fix entry of revision 2518 in milena/ChangeLog.
by Roland Levillain 05 Oct '08

05 Oct '08

--- milena/ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d466a7a..03789ee 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -30,7 +30,7 @@ Add a centered window of lower/higher-dim. adjacent complex faces. - * mln/core/image/complex_lower_higher_neighborhood.hh: New. + * mln/core/image/complex_lower_higher_window_p.hh: New. * tests/morpho/complex_image_morpho.cc: Exercise this window. 2008-10-05 Roland Levillain <roland(a)lrde.epita.fr> -- 1.6.0.1

1 0

2521: Introduce a header for iterators on complexes.
by Roland Levillain 05 Oct '08

05 Oct '08

* mln/topo/complex.hh: Move iterator-related header inclusions... * mln/topo/complex_iterators.hh: ...here (new file). --- milena/ChangeLog | 7 +++++ milena/mln/topo/complex.hh | 14 +--------- milena/mln/topo/complex_iterators.hh | 50 ++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 13 deletions(-) create mode 100644 milena/mln/topo/complex_iterators.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index ee844c1..d466a7a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2008-10-05 Roland Levillain <roland(a)lrde.epita.fr> + Introduce a header for iterators on complexes. + + * mln/topo/complex.hh: Move iterator-related header inclusions... + * mln/topo/complex_iterators.hh: ...here (new file). + +2008-10-05 Roland Levillain <roland(a)lrde.epita.fr> + Add relative iterators on faces sharing lower/higher-dimension faces. * mln/topo/adj_lower_dim_connected_n_face_iter.hh, diff --git a/milena/mln/topo/complex.hh b/milena/mln/topo/complex.hh index 06c714e..d3d2e18 100644 --- a/milena/mln/topo/complex.hh +++ b/milena/mln/topo/complex.hh @@ -48,19 +48,7 @@ # include <mln/topo/n_face.hh> # include <mln/topo/n_faces_set.hh> -# include <mln/topo/face_iter.hh> -# include <mln/topo/n_face_iter.hh> -# include <mln/topo/static_n_face_iter.hh> -// FIXME: Disabled (moved to the attic). -# if 0 -# include <mln/topo/faces_iter.hh> -# endif - -# 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/complex_iterators.hh> namespace mln diff --git a/milena/mln/topo/complex_iterators.hh b/milena/mln/topo/complex_iterators.hh new file mode 100644 index 0000000..170e19c --- /dev/null +++ b/milena/mln/topo/complex_iterators.hh @@ -0,0 +1,50 @@ +// 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_COMPLEX_ITERATORS_HH +# define MLN_TOPO_COMPLEX_ITERATORS_HH + +/// \file mln/core/topo/complex_iterators.hh +/// \brief Iterators on complexes. +/// +/// This file includes all iterators on faces. + +# include <mln/topo/face_iter.hh> +# include <mln/topo/n_face_iter.hh> +# include <mln/topo/static_n_face_iter.hh> +// FIXME: Disabled (moved to the attic). +# if 0 +# include <mln/topo/faces_iter.hh> +# endif + +# 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> + +#endif // ! MLN_TOPO_COMPLEX_ITERATORS_HH -- 1.6.0.1

1 0

2520: Add relative iterators on faces sharing lower/higher-dimension faces.
by Roland Levillain 05 Oct '08

05 Oct '08

* mln/topo/adj_lower_dim_connected_n_face_iter.hh, * mln/topo/adj_higher_dim_connected_n_face_iter.hh: New. Include these headers... * mln/topo/complex.hh: ...here. * tests/topo/complex.cc: Exercise these iterators. --- milena/ChangeLog | 11 + .../topo/adj_higher_dim_connected_n_face_iter.hh | 270 ++++++++++++++++++++ .../topo/adj_lower_dim_connected_n_face_iter.hh | 270 ++++++++++++++++++++ milena/mln/topo/complex.hh | 2 + milena/tests/topo/complex.cc | 66 +++-- 5 files changed, 595 insertions(+), 24 deletions(-) create mode 100644 milena/mln/topo/adj_higher_dim_connected_n_face_iter.hh create mode 100644 milena/mln/topo/adj_lower_dim_connected_n_face_iter.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 583c73e..ee844c1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2008-10-05 Roland Levillain <roland(a)lrde.epita.fr> + Add relative iterators on faces sharing lower/higher-dimension faces. + + * mln/topo/adj_lower_dim_connected_n_face_iter.hh, + * mln/topo/adj_higher_dim_connected_n_face_iter.hh: + New. + Include these headers... + * mln/topo/complex.hh: ...here. + * tests/topo/complex.cc: Exercise these iterators. + +2008-10-05 Roland Levillain <roland(a)lrde.epita.fr> + Add operator!= on face handles. * mln/topo/face.hh diff --git a/milena/mln/topo/adj_higher_dim_connected_n_face_iter.hh b/milena/mln/topo/adj_higher_dim_connected_n_face_iter.hh new file mode 100644 index 0000000..ad6dbe9 --- /dev/null +++ b/milena/mln/topo/adj_higher_dim_connected_n_face_iter.hh @@ -0,0 +1,270 @@ +// 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_HIGHER_DIM_CONNECTED_N_FACE_ITER_HH +# define MLN_TOPO_ADJ_HIGHER_DIM_CONNECTED_N_FACE_ITER_HH + +/// \file mln/topo/adj_higher_dim_connected_n_face_iter.hh + +/// \brief Definition of forward and backward iterators on all the +/// n-faces sharing an adjacent (n+1)-face with 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_higher_dim_connected_n_face_iterator; + } + + + /*---------------------------------------------------. + | topo::adj_higher_dim_connected_n_face_fwd_iter<D>. | + `---------------------------------------------------*/ + + /// \brief Forward iterator on all the n-faces sharing an adjacent + /// (n+1)-face with a (reference) n-face of an mln::complex<D>. + /// + /// \arg \p D The dimension of the complex this iterator belongs to. + template <unsigned D> + class adj_higher_dim_connected_n_face_fwd_iter + : public internal::forward_complex_relative_iterator_base< face<D>, + adj_higher_dim_connected_n_face_fwd_iter<D> >, + private internal::adj_higher_dim_connected_n_face_iterator<D> + { + private: + typedef adj_higher_dim_connected_n_face_fwd_iter<D> self_; + typedef internal::forward_complex_relative_iterator_base< face<D>, + self_ > super_; + + public: + /// Construction. + /// \{ + adj_higher_dim_connected_n_face_fwd_iter(); + template <typename Fref> + adj_higher_dim_connected_n_face_fwd_iter(const Fref& f_ref); + /// \} + + /// Compute the set of faces adjacent to the reference face. + void update_adj_faces_(); + }; + + + /*---------------------------------------------------. + | topo::adj_higher_dim_connected_n_face_bkd_iter<D>. | + `---------------------------------------------------*/ + + /// \brief Backward iterator on all the n-faces sharing an adjacent + /// (n+1)-face with a (reference) n-face of an mln::complex<D>. + /// + /// \arg \p D The dimension of the complex this iterator belongs to. + template <unsigned D> + class adj_higher_dim_connected_n_face_bkd_iter + : public internal::backward_complex_relative_iterator_base< face<D>, + adj_higher_dim_connected_n_face_bkd_iter<D> >, + private internal::adj_higher_dim_connected_n_face_iterator<D> + { + private: + typedef adj_higher_dim_connected_n_face_bkd_iter<D> self_; + typedef internal::backward_complex_relative_iterator_base< face<D>, + self_ > super_; + + public: + /// Construction. + /// \{ + adj_higher_dim_connected_n_face_bkd_iter(); + template <typename Fref> + adj_higher_dim_connected_n_face_bkd_iter(const Fref& f_ref); + /// \} + + /// \brief Compute the set of faces adjacent to the reference face. + /// + /// The computation is delegated to + /// mln::topo::internal::adj_higher_dim_connected_n_face_iterator. + void update_adj_faces_(); + }; + + + /*-------------------------------------------------------------. + | topo::internal::adj_higher_dim_connected_n_face_iterator<D>. | + `-------------------------------------------------------------*/ + + namespace internal + { + + template <unsigned D> + class adj_higher_dim_connected_n_face_iterator + { + 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); + }; + + } // end of namespace mln::topo::internal + + + +# ifndef MLN_INCLUDE_ONLY + + /*---------------------------------------------------. + | topo::adj_higher_dim_connected_n_face_fwd_iter<D>. | + `---------------------------------------------------*/ + + template <unsigned D> + inline + adj_higher_dim_connected_n_face_fwd_iter<D>::adj_higher_dim_connected_n_face_fwd_iter() + { + } + + template <unsigned D> + template <typename Fref> + inline + adj_higher_dim_connected_n_face_fwd_iter<D>::adj_higher_dim_connected_n_face_fwd_iter(const Fref& f_ref) + : super_(f_ref) + { + } + + /* FIXME: Most of this code is shared by + adj_higher_dim_connected_n_face_{fwd,bkd}_iter<D> and + adj_higher_dim_connected_n_face_{fwd,bkd}_iter<D>). Find a way + to factor this, maybe through a common (implementation) base + class. */ + template <unsigned D> + inline + void + adj_higher_dim_connected_n_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_higher_dim_connected_n_face_bkd_iter<D>. | + `---------------------------------------------------*/ + + template <unsigned D> + inline + adj_higher_dim_connected_n_face_bkd_iter<D>::adj_higher_dim_connected_n_face_bkd_iter() + { + } + + template <unsigned D> + template <typename Fref> + inline + adj_higher_dim_connected_n_face_bkd_iter<D>::adj_higher_dim_connected_n_face_bkd_iter(const Fref& f_ref) + : super_(f_ref) + { + } + + template <unsigned D> + inline + void + adj_higher_dim_connected_n_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_higher_dim_connected_n_face_iterator<D>. | + `-------------------------------------------------------------*/ + + namespace internal + { + + /* FIXME: Factor + topo::internal::adj_lower_dim_connected_n_face_iterator<D> and + topo::internal::adj_higher_dim_connected_n_face_iterator<D>. */ + + template <unsigned D> + inline + void + adj_higher_dim_connected_n_face_iterator<D>::update_adj_faces__(const face<D>& center, + std::vector< face<D> >& adj_faces) + { + // Reset the result container. + adj_faces.clear(); + + /* A set of faces containing the same values as ADJ_FACES, used + to quickly check whether a candidate face has already been + added to the pool of adjacent faces. We use an std::set + because the lookup is cheaper (O(log(n)) vs O(n) for a + vector, where n is the size of the containers. */ + std::set< face<D> > faces_set; + typedef std::vector< face<D> > faces_t; + + // The set of (n+1)-faces adjacent to CENTER. + faces_t shared_higher_faces = center.higher_dim_adj_faces(); + for (typename faces_t::const_iterator slf = shared_higher_faces.begin(); + slf != shared_higher_faces.end(); ++slf) + { + /* The n-faces sharing an adjacent (n+1)-face with CENTER. + Note that this set contains CENTER itself. */ + faces_t adj_n_faces = slf->lower_dim_adj_faces(); + for (typename faces_t::const_iterator af = adj_n_faces.begin(); + af != adj_n_faces.end(); ++af) + { + /* Ensure that 1. we are not adding CENTER to the result; + and 2. that we are not adding an already added + processed face. */ + if (*af != center && + faces_set.find(*af) == faces_set.end()) + { + adj_faces.push_back(*af); + faces_set.insert(*af); + } + } + } + } + + } // end of namespace mln::topo::internal + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::topo + +} // end of namespace mln + +#endif // ! MLN_TOPO_ADJ_HIGHER_DIM_CONNECTED_N_FACE_ITER_HH diff --git a/milena/mln/topo/adj_lower_dim_connected_n_face_iter.hh b/milena/mln/topo/adj_lower_dim_connected_n_face_iter.hh new file mode 100644 index 0000000..7a11009 --- /dev/null +++ b/milena/mln/topo/adj_lower_dim_connected_n_face_iter.hh @@ -0,0 +1,270 @@ +// 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_LOWER_DIM_CONNECTED_N_FACE_ITER_HH +# define MLN_TOPO_ADJ_LOWER_DIM_CONNECTED_N_FACE_ITER_HH + +/// \file mln/topo/adj_lower_dim_connected_n_face_iter.hh + +/// \brief Definition of forward and backward iterators on all the +/// n-faces sharing an adjacent (n-1)-face with 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_lower_dim_connected_n_face_iterator; + } + + + /*---------------------------------------------------. + | topo::adj_lower_dim_connected_n_face_fwd_iter<D>. | + `---------------------------------------------------*/ + + /// \brief Forward iterator on all the n-faces sharing an adjacent + /// (n-1)-face with a (reference) n-face of an mln::complex<D>. + /// + /// \arg \p D The dimension of the complex this iterator belongs to. + template <unsigned D> + class adj_lower_dim_connected_n_face_fwd_iter + : public internal::forward_complex_relative_iterator_base< face<D>, + adj_lower_dim_connected_n_face_fwd_iter<D> >, + private internal::adj_lower_dim_connected_n_face_iterator<D> + { + private: + typedef adj_lower_dim_connected_n_face_fwd_iter<D> self_; + typedef internal::forward_complex_relative_iterator_base< face<D>, + self_ > super_; + + public: + /// Construction. + /// \{ + adj_lower_dim_connected_n_face_fwd_iter(); + template <typename Fref> + adj_lower_dim_connected_n_face_fwd_iter(const Fref& f_ref); + /// \} + + /// Compute the set of faces adjacent to the reference face. + void update_adj_faces_(); + }; + + + /*---------------------------------------------------. + | topo::adj_lower_dim_connected_n_face_bkd_iter<D>. | + `---------------------------------------------------*/ + + /// \brief Backward iterator on all the n-faces sharing an adjacent + /// (n-1)-face with a (reference) n-face of an mln::complex<D>. + /// + /// \arg \p D The dimension of the complex this iterator belongs to. + template <unsigned D> + class adj_lower_dim_connected_n_face_bkd_iter + : public internal::backward_complex_relative_iterator_base< face<D>, + adj_lower_dim_connected_n_face_bkd_iter<D> >, + private internal::adj_lower_dim_connected_n_face_iterator<D> + { + private: + typedef adj_lower_dim_connected_n_face_bkd_iter<D> self_; + typedef internal::backward_complex_relative_iterator_base< face<D>, + self_ > super_; + + public: + /// Construction. + /// \{ + adj_lower_dim_connected_n_face_bkd_iter(); + template <typename Fref> + adj_lower_dim_connected_n_face_bkd_iter(const Fref& f_ref); + /// \} + + /// \brief Compute the set of faces adjacent to the reference face. + /// + /// The computation is delegated to + /// mln::topo::internal::adj_lower_dim_connected_n_face_iterator. + void update_adj_faces_(); + }; + + + /*-------------------------------------------------------------. + | topo::internal::adj_lower_dim_connected_n_face_iterator<D>. | + `-------------------------------------------------------------*/ + + namespace internal + { + + template <unsigned D> + class adj_lower_dim_connected_n_face_iterator + { + 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); + }; + + } // end of namespace mln::topo::internal + + + +# ifndef MLN_INCLUDE_ONLY + + /*---------------------------------------------------. + | topo::adj_lower_dim_connected_n_face_fwd_iter<D>. | + `---------------------------------------------------*/ + + template <unsigned D> + inline + adj_lower_dim_connected_n_face_fwd_iter<D>::adj_lower_dim_connected_n_face_fwd_iter() + { + } + + template <unsigned D> + template <typename Fref> + inline + adj_lower_dim_connected_n_face_fwd_iter<D>::adj_lower_dim_connected_n_face_fwd_iter(const Fref& f_ref) + : super_(f_ref) + { + } + + /* FIXME: Most of this code is shared by + adj_lower_dim_connected_n_face_{fwd,bkd}_iter<D> and + adj_higher_dim_connected_n_face_{fwd,bkd}_iter<D>). Find a way + to factor this, maybe through a common (implementation) base + class. */ + template <unsigned D> + inline + void + adj_lower_dim_connected_n_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_lower_dim_connected_n_face_bkd_iter<D>. | + `---------------------------------------------------*/ + + template <unsigned D> + inline + adj_lower_dim_connected_n_face_bkd_iter<D>::adj_lower_dim_connected_n_face_bkd_iter() + { + } + + template <unsigned D> + template <typename Fref> + inline + adj_lower_dim_connected_n_face_bkd_iter<D>::adj_lower_dim_connected_n_face_bkd_iter(const Fref& f_ref) + : super_(f_ref) + { + } + + template <unsigned D> + inline + void + adj_lower_dim_connected_n_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_lower_dim_connected_n_face_iterator<D>. | + `-------------------------------------------------------------*/ + + namespace internal + { + + /* FIXME: Factor + topo::internal::adj_lower_dim_connected_n_face_iterator<D> and + topo::internal::adj_higher_dim_connected_n_face_iterator<D>. */ + + template <unsigned D> + inline + void + adj_lower_dim_connected_n_face_iterator<D>::update_adj_faces__(const face<D>& center, + std::vector< face<D> >& adj_faces) + { + // Reset the result container. + adj_faces.clear(); + + /* A set of faces containing the same values as ADJ_FACES, used + to quickly check whether a candidate face has already been + added to the pool of adjacent faces. We use an std::set + because the lookup is cheaper (O(log(n)) vs O(n) for a + vector, where n is the size of the containers. */ + std::set< face<D> > faces_set; + typedef std::vector< face<D> > faces_t; + + // The set of (n-1)-faces adjacent to CENTER. + faces_t shared_lower_faces = center.lower_dim_adj_faces(); + for (typename faces_t::const_iterator slf = shared_lower_faces.begin(); + slf != shared_lower_faces.end(); ++slf) + { + /* The n-faces sharing an adjacent (n-1)-face with CENTER. + Note that this set contains CENTER itself. */ + faces_t adj_n_faces = slf->higher_dim_adj_faces(); + for (typename faces_t::const_iterator af = adj_n_faces.begin(); + af != adj_n_faces.end(); ++af) + { + /* Ensure that 1. we are not adding CENTER to the result; + and 2. that we are not adding an already added + processed face. */ + if (*af != center && + faces_set.find(*af) == faces_set.end()) + { + adj_faces.push_back(*af); + faces_set.insert(*af); + } + } + } + } + + } // 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.hh b/milena/mln/topo/complex.hh index 1291ca7..06c714e 100644 --- a/milena/mln/topo/complex.hh +++ b/milena/mln/topo/complex.hh @@ -59,6 +59,8 @@ # 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> namespace mln diff --git a/milena/tests/topo/complex.cc b/milena/tests/topo/complex.cc index 92d0398..249b743 100644 --- a/milena/tests/topo/complex.cc +++ b/milena/tests/topo/complex.cc @@ -211,10 +211,12 @@ int main() milena/tests/core/complex_image.cc) and ticket #162 (https://trac.lrde.org/olena/ticket/162) */ - /* Iterate on the the set of (n-1)- and/or (n+1)-faces adjacent to - the faces of C. + // ------------------------------------------------------------ // + // Iterate on the the set of (n-1)- and/or (n+1)-faces adjacent // + // to the faces of C. // + // ------------------------------------------------------------ // - Note: this can be solved with iterators where the dimension can + /* Note: this can be solved with iterators where the dimension can be either static or dynamic. For the moment, our iterators are dynamic w.r.t. the dimensions of the faces (both the reference face and the iterated ones). @@ -259,31 +261,44 @@ int main() } std::cout << std::endl; - /* But first, we need to clarify (existing) names. The one listed - in https://trac.lrde.org/olena/wiki/Olena/ComplexBasedImages - are OK. - Next, write these: + // ------------------------------------------------------- // + // Iterators on the the set of n-faces sharing an adjacent // + // (n-1)-face or (n+1)-face with f, n being dynamic. // + // ------------------------------------------------------- // + + // For each face F of C, iterate on the the set of n-faces sharing + // adjacent (n-1)-faces with F. + topo::adj_lower_dim_connected_n_face_fwd_iter<D> fwd_aldcf(fwd_f); + topo::adj_lower_dim_connected_n_face_bkd_iter<D> bkd_aldcf(fwd_f); + for_all(fwd_f) + { + std::cout << "Lower-dim-connected faces adjacent to " << fwd_f + << ": " << std::endl; + for_all_2(fwd_aldcf, bkd_aldcf) + std::cout << " " << fwd_aldcf << '\t' << bkd_aldcf << std::endl; + } + std::cout << std::endl; + + // For each face F of C, iterate on the the set of n-faces sharing + // adjacent (n+1)-faces with F. + topo::adj_higher_dim_connected_n_face_fwd_iter<D> fwd_ahdcf(fwd_f); + topo::adj_higher_dim_connected_n_face_bkd_iter<D> bkd_ahdcf(fwd_f); + for_all(fwd_f) + { + std::cout << "Higher-dim-connected faces adjacent to " << fwd_f + << ": " << std::endl; + for_all_2(fwd_ahdcf, bkd_ahdcf) + std::cout << " " << fwd_ahdcf << '\t' << bkd_ahdcf << std::endl; + } + std::cout << std::endl; + + + /* Next, write these: ----------------------------------------------------------------- Name Definition ----------------------------------------------------------------- - adj_lower_dim_connected_n_face_fwd_iter<D>(c, f) - adj_lower_dim_connected_n_face_bkd_iter<D>(c, f) - (FIXME: These names are admittedly too long.) - | Iterators on the the set of - | n-faces sharing an adjacent - | (n-1)-face with f, n being - | dynamic - - adj_higher_dim_connected_n_face_fwd_iter<D>(c, f) - adj_higher_dim_connected_n_face_bkd_iter<D>(c, f) - (FIXME: These names are admittedly too long.) - | Iterators on the the set of - | n-faces sharing an adjacent - | (n+1)-face with f, n being - | dynamic - cell_fwd_iter<D>(c, f) | Iterators on the set of the cell_bkd_iter<D>(c, f) | faces in the « cell » | including p, i.e. the set of @@ -324,7 +339,9 @@ int main() faces_fwd_iter_<N, D> static, acting as proxies of face<D>'s. ----------------------------------------------------------------- - */ + + See also https://trac.lrde.org/olena/wiki/Olena/ComplexBasedImages */ + /*------------------. | Other iterators. | @@ -333,6 +350,7 @@ int main() // For each face, iterate on itself. (This iterator is not // interesting as-is, but is useful when combined with others, // e.g. in topo::centered_iter_adapter). + std::cout << "Center-only iterator:" << std::endl; topo::center_only_iter<D> center(fwd_f); for_all(fwd_f) for_all(center) -- 1.6.0.1

1 0

2519: Add operator!= on face handles.
by Roland Levillain 05 Oct '08

05 Oct '08

* mln/topo/face.hh (operator!=(const face<D>&, const face<D>&)) * mln/topo/n_face.hh (operator!=(const n_face<N, D>&, const n_face<N, D>&)): New operators. --- milena/ChangeLog | 10 ++++++++++ milena/mln/topo/face.hh | 25 +++++++++++++++++++++---- milena/mln/topo/n_face.hh | 25 +++++++++++++++++++++---- 3 files changed, 52 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c2b1c36..583c73e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2008-10-05 Roland Levillain <roland(a)lrde.epita.fr> + Add operator!= on face handles. + + * mln/topo/face.hh + (operator!=(const face<D>&, const face<D>&)) + * mln/topo/n_face.hh + (operator!=(const n_face<N, D>&, const n_face<N, D>&)): + New operators. + +2008-10-05 Roland Levillain <roland(a)lrde.epita.fr> + Add a centered window of lower/higher-dim. adjacent complex faces. * mln/core/image/complex_lower_higher_neighborhood.hh: New. diff --git a/milena/mln/topo/face.hh b/milena/mln/topo/face.hh index 686c50a..ac02877 100644 --- a/milena/mln/topo/face.hh +++ b/milena/mln/topo/face.hh @@ -121,13 +121,20 @@ namespace mln /// Comparison of two instances of mln::topo::face. /// \{ + /// \brief Is \a lhs equal to \a rhs? /// /// \pre Arguments \a lhs and \a rhs must belong to the same /// mln::topo::complex. template <unsigned D> - bool - operator==(const face<D>& lhs, const face<D>& rhs); + bool operator==(const face<D>& lhs, const face<D>& rhs); + + /// \brief Is \a lhs different from \a rhs? + /// + /// \pre Arguments \a lhs and \a rhs must belong to the same + /// mln::topo::complex. + template <unsigned D> + bool operator!=(const face<D>& lhs, const face<D>& rhs); /// \brief Is \a lhs ``less'' than \a rhs? /// @@ -137,8 +144,8 @@ namespace mln /// mln::topo::complex. /// \pre Arguments \a lhs and \a rhs must have the same dimension. template <unsigned D> - bool - operator< (const face<D>& lhs, const face<D>& rhs); + bool operator< (const face<D>& lhs, const face<D>& rhs); + /// \} @@ -387,6 +394,16 @@ namespace mln template <unsigned D> inline bool + operator!=(const face<D>& lhs, const face<D>& rhs) + { + // Ensure LHS and RHS belong to the same complex. + mln_precondition(lhs.cplx() == rhs.cplx()); + return !(lhs == rhs); + } + + template <unsigned D> + inline + bool operator< (const face<D>& lhs, const face<D>& rhs) { // Ensure LHS and RHS belong to the same complex. diff --git a/milena/mln/topo/n_face.hh b/milena/mln/topo/n_face.hh index 343f7b0..6cf3b37 100644 --- a/milena/mln/topo/n_face.hh +++ b/milena/mln/topo/n_face.hh @@ -110,13 +110,20 @@ namespace mln /// Comparison of two instances of mln::topo::n_face. /// \{ + /// \brief Is \a lhs equal to \a rhs? /// /// \pre Arguments \a lhs and \a rhs must belong to the same /// mln::topo::complex. template <unsigned N, unsigned D> - bool - operator==(const n_face<N, D>& lhs, const n_face<N, D>& rhs); + bool operator==(const n_face<N, D>& lhs, const n_face<N, D>& rhs); + + /// \brief Is \a lhs different from \a rhs? + /// + /// \pre Arguments \a lhs and \a rhs must belong to the same + /// mln::topo::complex. + template <unsigned N, unsigned D> + bool operator!=(const n_face<N, D>& lhs, const n_face<N, D>& rhs); /// \brief Is \a lhs ``less'' than \a rhs? /// @@ -125,8 +132,8 @@ namespace mln /// \pre Arguments \a lhs and \a rhs must belong to the same /// mln::topo::complex. template <unsigned N, unsigned D> - bool - operator< (const n_face<N, D>& lhs, const n_face<N, D>& rhs); + bool operator< (const n_face<N, D>& lhs, const n_face<N, D>& rhs); + /// \} @@ -246,6 +253,16 @@ namespace mln template <unsigned N, unsigned D> inline bool + operator!=(const n_face<N, D>& lhs, const n_face<N, D>& rhs) + { + // Ensure LHS and RHS belong to the same complex. + mln_precondition(lhs.cplx() == rhs.cplx()); + return !(lhs == rhs); + } + + template <unsigned N, unsigned D> + inline + bool operator< (const n_face<N, D>& lhs, const n_face<N, D>& rhs) { // Ensure LHS and RHS belong to the same complex. -- 1.6.0.1

1 0

2518: Add a centered window of lower/higher-dim. adjacent complex faces.
by Roland Levillain 05 Oct '08

05 Oct '08

* mln/core/image/complex_lower_higher_neighborhood.hh: New. * tests/morpho/complex_image_morpho.cc: Exercise this window. --- milena/ChangeLog | 7 + .../core/image/complex_lower_higher_window_p.hh | 147 ++++++++++++++++++++ milena/tests/morpho/complex_image_morpho.cc | 2 + 3 files changed, 156 insertions(+), 0 deletions(-) create mode 100644 milena/mln/core/image/complex_lower_higher_window_p.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 4f36848..c2b1c36 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2008-10-05 Roland Levillain <roland(a)lrde.epita.fr> + Add a centered window of lower/higher-dim. adjacent complex faces. + + * mln/core/image/complex_lower_higher_neighborhood.hh: New. + * tests/morpho/complex_image_morpho.cc: Exercise this window. + +2008-10-05 Roland Levillain <roland(a)lrde.epita.fr> + Add a centered window of higher-dimension adjacent complex faces. * mln/core/image/complex_higher_window_p.hh: New. diff --git a/milena/mln/core/image/complex_lower_higher_window_p.hh b/milena/mln/core/image/complex_lower_higher_window_p.hh new file mode 100644 index 0000000..a3260df --- /dev/null +++ b/milena/mln/core/image/complex_lower_higher_window_p.hh @@ -0,0 +1,147 @@ +// 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_COMPLEX_LOWER_HIGHER_WINDOW_P_HH +# define MLN_CORE_IMAGE_COMPLEX_LOWER_HIGHER_WINDOW_P_HH + +/// \file mln/core/complex_lower_higher_window_p.hh +/// \brief Definition of a window centered on a n-face of complex +/// returning its adjacent (n-1)-faces and (n+1)-faces as well as the +/// center n-face. + +# include <mln/core/concept/window.hh> + +# include <mln/core/site_set/complex_psite.hh> + +# include <mln/topo/centered_iter_adapter.hh> +# include <mln/topo/adj_lower_higher_face_iter.hh> + + +namespace mln +{ + // Forward declarations. + template <unsigned D, typename P> class complex_lower_higher_window_p; + template <typename I, typename P, typename W> class complex_window_fwd_piter; + template <typename I, typename P, typename W> class complex_window_bkd_piter; + + + namespace trait + { + + template <unsigned D, typename P> + struct window_< mln::complex_lower_higher_window_p<D,P> > + { + typedef trait::window::size::unknown size; + typedef trait::window::support::irregular support; + typedef trait::window::definition::varying definition; + }; + + } // end of namespace mln::trait + + + /// \brief Window centered on a n-face of complex returning its + /// adjacent (n-1)-faces as well as the center n-face. + template <unsigned D, typename P> + class complex_lower_higher_window_p + : public Window< complex_lower_higher_window_p<D, P> > + { + typedef complex_lower_higher_window_p<D, P> self_; + /// The complex iterators on the adjacent faces only + /// (without the center point). + /// \{ + typedef topo::adj_lower_higher_face_fwd_iter<D> adj_fwd_iter_; + typedef topo::adj_lower_higher_face_bkd_iter<D> adj_bkd_iter_; + /// \} + + public: + /// The associated complex iterators. + /// \{ + typedef topo::centered_fwd_iter_adapter<D, adj_fwd_iter_> complex_fwd_iter; + typedef topo::centered_bkd_iter_adapter<D, adj_bkd_iter_> complex_bkd_iter; + /// \} + + public: + /// Associated types. + /// \{ + /// The type of psite corresponding to the window. + typedef complex_psite<D, P> psite; + /// The type of site corresponding to the window. + typedef mln_site(psite) site; + + // FIXME: This is a dummy value. + typedef void dpsite; + + /// \brief Site_Iterator type to browse the psites of the window + /// w.r.t. the ordering of vertices. + typedef + complex_window_fwd_piter<complex_fwd_iter, P, self_> fwd_qiter; + + /// \brief Site_Iterator type to browse the psites of the window + /// w.r.t. the reverse ordering of vertices. + typedef + complex_window_bkd_piter<complex_bkd_iter, P, self_> bkd_qiter; + + /// The default qiter type. + typedef fwd_qiter qiter; + /// \} + + public: + /// Services. + /// \{ + /* FIXME: mln::morpho::dilation requires these method from models + of concept Window, but Window does not list them in its + requirements. Who's guilty: morpho::dilation or Window? */ + /// Is this window empty? (Always returns \c false). + bool is_empty() const; + /// Is this window centered? (Always returns \c true). + bool is_centered() const; + /// \} + }; + + + +# ifndef MLN_INCLUDE_ONLY + + template <unsigned D, typename P> + bool + complex_lower_higher_window_p<D, P>::is_empty() const + { + return false; + } + + template <unsigned D, typename P> + bool + complex_lower_higher_window_p<D, P>::is_centered() const + { + return true; + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + +#endif // ! MLN_CORE_IMAGE_COMPLEX_LOWER_HIGHER_WINDOW_P_HH diff --git a/milena/tests/morpho/complex_image_morpho.cc b/milena/tests/morpho/complex_image_morpho.cc index c950b2c..1d01c17 100644 --- a/milena/tests/morpho/complex_image_morpho.cc +++ b/milena/tests/morpho/complex_image_morpho.cc @@ -39,6 +39,7 @@ // FIXME: Include these elsewhere? (In complex_image.hh?) #include <mln/core/image/complex_lower_window_p.hh> #include <mln/core/image/complex_higher_window_p.hh> +#include <mln/core/image/complex_lower_higher_window_p.hh> #include <mln/core/image/complex_window_piter.hh> #include <mln/debug/iota.hh> @@ -149,6 +150,7 @@ int main() 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>()); /* FIXME: Exercise elementary erosion/dilation (with neighborhoods) when available. */ -- 1.6.0.1

1 0

2517: Add a centered window of higher-dimension adjacent complex faces.
by Roland Levillain 05 Oct '08

05 Oct '08

* mln/core/image/complex_higher_window_p.hh: New. * tests/morpho/complex_image_morpho.cc: Exercise this window. --- milena/ChangeLog | 7 + milena/mln/core/image/complex_higher_window_p.hh | 146 ++++++++++++++++++++++ milena/tests/morpho/complex_image_morpho.cc | 2 + 3 files changed, 155 insertions(+), 0 deletions(-) create mode 100644 milena/mln/core/image/complex_higher_window_p.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index b36b7d2..4f36848 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2008-10-05 Roland Levillain <roland(a)lrde.epita.fr> + Add a centered window of higher-dimension adjacent complex faces. + + * mln/core/image/complex_higher_window_p.hh: New. + * tests/morpho/complex_image_morpho.cc: Exercise this window. + +2008-10-05 Roland Levillain <roland(a)lrde.epita.fr> + Revamp test complex_image_morpho. * tests/morpho/complex_image_morpho.cc: Clean up whitespaces. diff --git a/milena/mln/core/image/complex_higher_window_p.hh b/milena/mln/core/image/complex_higher_window_p.hh new file mode 100644 index 0000000..8e68544 --- /dev/null +++ b/milena/mln/core/image/complex_higher_window_p.hh @@ -0,0 +1,146 @@ +// 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_COMPLEX_HIGHER_WINDOW_P_HH +# define MLN_CORE_IMAGE_COMPLEX_HIGHER_WINDOW_P_HH + +/// \file mln/core/complex_higher_window_p.hh +/// \brief Definition of a window centered on a n-face of complex +/// returning its adjacent (n+1)-faces as well as the center n-face. + +# include <mln/core/concept/window.hh> + +# include <mln/core/site_set/complex_psite.hh> + +# include <mln/topo/centered_iter_adapter.hh> +# include <mln/topo/adj_higher_face_iter.hh> + + +namespace mln +{ + // Forward declarations. + template <unsigned D, typename P> class complex_higher_window_p; + template <typename I, typename P, typename W> class complex_window_fwd_piter; + template <typename I, typename P, typename W> class complex_window_bkd_piter; + + + namespace trait + { + + template <unsigned D, typename P> + struct window_< mln::complex_higher_window_p<D,P> > + { + typedef trait::window::size::unknown size; + typedef trait::window::support::irregular support; + typedef trait::window::definition::varying definition; + }; + + } // end of namespace mln::trait + + + /// \brief Window centered on a n-face of complex returning its + /// adjacent (n+1)-faces as well as the center n-face. + template <unsigned D, typename P> + class complex_higher_window_p + : public Window< complex_higher_window_p<D, P> > + { + typedef complex_higher_window_p<D, P> self_; + /// The complex iterators on the adjacent faces only + /// (without the center point). + /// \{ + typedef topo::adj_higher_face_fwd_iter<D> adj_fwd_iter_; + typedef topo::adj_higher_face_bkd_iter<D> adj_bkd_iter_; + /// \} + + public: + /// The associated complex iterators. + /// \{ + typedef topo::centered_fwd_iter_adapter<D, adj_fwd_iter_> complex_fwd_iter; + typedef topo::centered_bkd_iter_adapter<D, adj_bkd_iter_> complex_bkd_iter; + /// \} + + public: + /// Associated types. + /// \{ + /// The type of psite corresponding to the window. + typedef complex_psite<D, P> psite; + /// The type of site corresponding to the window. + typedef mln_site(psite) site; + + // FIXME: This is a dummy value. + typedef void dpsite; + + /// \brief Site_Iterator type to browse the psites of the window + /// w.r.t. the ordering of vertices. + typedef + complex_window_fwd_piter<complex_fwd_iter, P, self_> fwd_qiter; + + /// \brief Site_Iterator type to browse the psites of the window + /// w.r.t. the reverse ordering of vertices. + typedef + complex_window_bkd_piter<complex_bkd_iter, P, self_> bkd_qiter; + + /// The default qiter type. + typedef fwd_qiter qiter; + /// \} + + public: + /// Services. + /// \{ + /* FIXME: mln::morpho::dilation requires these method from models + of concept Window, but Window does not list them in its + requirements. Who's guilty: morpho::dilation or Window? */ + /// Is this window empty? (Always returns \c false). + bool is_empty() const; + /// Is this window centered? (Always returns \c true). + bool is_centered() const; + /// \} + }; + + + +# ifndef MLN_INCLUDE_ONLY + + template <unsigned D, typename P> + bool + complex_higher_window_p<D, P>::is_empty() const + { + return false; + } + + template <unsigned D, typename P> + bool + complex_higher_window_p<D, P>::is_centered() const + { + return true; + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + +#endif // ! MLN_CORE_IMAGE_COMPLEX_HIGHER_WINDOW_P_HH diff --git a/milena/tests/morpho/complex_image_morpho.cc b/milena/tests/morpho/complex_image_morpho.cc index 98da610..c950b2c 100644 --- a/milena/tests/morpho/complex_image_morpho.cc +++ b/milena/tests/morpho/complex_image_morpho.cc @@ -38,6 +38,7 @@ // FIXME: Include these elsewhere? (In complex_image.hh?) #include <mln/core/image/complex_lower_window_p.hh> +#include <mln/core/image/complex_higher_window_p.hh> #include <mln/core/image/complex_window_piter.hh> #include <mln/debug/iota.hh> @@ -147,6 +148,7 @@ int main() `---------------------------------------------------*/ test_morpho(ima, complex_lower_window_p<D, P>()); + test_morpho(ima, complex_higher_window_p<D, P>()); /* FIXME: Exercise elementary erosion/dilation (with neighborhoods) when available. */ -- 1.6.0.1

1 0

2516: Revamp test complex_image_morpho.
by Roland Levillain 05 Oct '08

05 Oct '08

* tests/morpho/complex_image_morpho.cc: Clean up whitespaces. (main): Move tests on morphological filters... (test_morpho): ...here (new function). --- milena/ChangeLog | 8 +++ milena/tests/morpho/complex_image_morpho.cc | 64 +++++++++++++++++++-------- 2 files changed, 54 insertions(+), 18 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 22c65e2..b36b7d2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2008-10-05 Roland Levillain <roland(a)lrde.epita.fr> + + Revamp test complex_image_morpho. + + * tests/morpho/complex_image_morpho.cc: Clean up whitespaces. + (main): Move tests on morphological filters... + (test_morpho): ...here (new function). + 2008-10-04 Roland Levillain <roland(a)lrde.epita.fr> First tests of morphological filters on complex-based images. diff --git a/milena/tests/morpho/complex_image_morpho.cc b/milena/tests/morpho/complex_image_morpho.cc index cbe874f..98da610 100644 --- a/milena/tests/morpho/complex_image_morpho.cc +++ b/milena/tests/morpho/complex_image_morpho.cc @@ -48,6 +48,10 @@ /* FIXME: Factor common parts with milena/tests/core/image/complex_image.cc */ +// Forward declaration. +template <typename I, typename W> +void test_morpho(const mln::Image& ima, const mln::Window<W> win); + int main() { @@ -59,14 +63,14 @@ 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 + 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 v = vertex @@ -84,7 +88,7 @@ int main() 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); @@ -96,7 +100,7 @@ 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-based site set. | `-------------------------*/ @@ -118,30 +122,54 @@ int main() // Initialize values. debug::iota(ima); + /* Values of IMA. + + v0 e3 v3 1 8 4 + o-----------o o-----------o + / \ ,-----. / / \ ,-----. / + / . \ \ t1/ / / . \ \ 11/ / + e0 / / \ e1\ / / e4 5 / / \ 6 \ / / 9 + / /t0 \ \ ' / / /10 \ \ ' / + / `-----' \ / / `-----' \ / + o-----------o o-----------o + v1 e2 v2 2 7 3 + + */ + // Manual iteration over the domain of IMA. mln_piter_(ima_t) p(ima.domain()); for_all (p) std::cout << "ima (" << p << ") = " << ima(p) << std::endl; - std::cout << std::endl; + std::cout << std::endl << std::endl; /*---------------------------------------------------. | Morphological operations on complex-based images. | `---------------------------------------------------*/ - typedef complex_lower_window_p<D, P> win_t; - win_t win; + test_morpho(ima, complex_lower_window_p<D, P>()); + + /* FIXME: Exercise elementary erosion/dilation (with neighborhoods) + when available. */ +} - ima_t ima_dil = morpho::dilation(ima, win); + +template <typename I, typename W> +void +test_morpho(const mln::Image& ima_, const mln::Window<W> win) +{ + const I& ima = exact(ima_); + mln_assertion(ima.has_data()); + mln_piter(I) p(ima.domain()); + + mln_concrete(I) ima_dil = mln::morpho::dilation(ima, win); // Manual iteration over the domain of IMA_DIL. for_all (p) std::cout << "ima_dil (" << p << ") = " << ima_dil(p) << std::endl; std::cout << std::endl; - ima_t ima_ero = morpho::erosion(ima, win); + mln_concrete(I) ima_ero = mln::morpho::erosion(ima, win); // Manual iteration over the domain of IMA_ERO. for_all (p) std::cout << "ima_ero (" << p << ") = " << ima_ero(p) << std::endl; - - /* FIXME: Exercise elementary erosion/dilation (with neighborhoods) - when available. */ + std::cout << std::endl << std::endl; } -- 1.6.0.1

1 0

2515: First tests of morphological filters on complex-based images.
by Roland Levillain 04 Oct '08

04 Oct '08

* tests/morpho/complex_image_morpho.cc: New. * tests/morpho/Makefile.am (check_PROGRAMS): Add complex_image_morpho. (complex_image_morpho_SOURCES): New. --- milena/ChangeLog | 9 ++ milena/tests/morpho/Makefile.am | 3 + milena/tests/morpho/complex_image_morpho.cc | 147 +++++++++++++++++++++++++++ 3 files changed, 159 insertions(+), 0 deletions(-) create mode 100644 milena/tests/morpho/complex_image_morpho.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index f5e4b5e..22c65e2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2008-10-04 Roland Levillain <roland(a)lrde.epita.fr> + First tests of morphological filters on complex-based images. + + * tests/morpho/complex_image_morpho.cc: New. + * tests/morpho/Makefile.am (check_PROGRAMS): Add + complex_image_morpho. + (complex_image_morpho_SOURCES): New. + +2008-10-04 Roland Levillain <roland(a)lrde.epita.fr> + Add a centered window of lower-dimension adjacent complex faces. * mln/core/image/complex_lower_window_p.hh: New. diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am index d47f5d4..747d55d 100644 --- a/milena/tests/morpho/Makefile.am +++ b/milena/tests/morpho/Makefile.am @@ -8,6 +8,7 @@ check_PROGRAMS = \ closing_height \ closing_volume \ combined \ + complex_image_morpho \ contrast \ dilation \ dilation_max_h \ @@ -60,6 +61,8 @@ graph_image_wst_SOURCES = graph_image_wst.cc line_graph_image_morpho_SOURCES = line_graph_image_morpho.cc line_graph_image_wst_SOURCES = line_graph_image_wst.cc +complex_image_morpho_SOURCES = complex_image_morpho.cc + meyer_wst_SOURCES = meyer_wst.cc combined_SOURCES = combined.cc diff --git a/milena/tests/morpho/complex_image_morpho.cc b/milena/tests/morpho/complex_image_morpho.cc new file mode 100644 index 0000000..cbe874f --- /dev/null +++ b/milena/tests/morpho/complex_image_morpho.cc @@ -0,0 +1,147 @@ +// 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/complex_image_morpho.cc +/// \brief Test of mln::complex_image with morphological filters. + +#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: Include these elsewhere? (In complex_image.hh?) +#include <mln/core/image/complex_lower_window_p.hh> +#include <mln/core/image/complex_window_piter.hh> + +#include <mln/debug/iota.hh> + +#include <mln/morpho/erosion.hh> +#include <mln/morpho/dilation.hh> + +/* FIXME: Factor common parts with + milena/tests/core/image/complex_image.cc */ + + +int main() +{ + using namespace mln; + + /*----------. + | Complex. | + `----------*/ + + /* 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 + + 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-based site set. | + `-------------------------*/ + + typedef point2d P; + p_complex<D, P> pc(c); + + + /*----------------------. + | Complex-based image. | + `----------------------*/ + + using mln::value::int_u8; + + // 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; + ima_t ima(pc); + // Initialize values. + debug::iota(ima); + + // Manual iteration over the domain of IMA. + mln_piter_(ima_t) p(ima.domain()); + for_all (p) + std::cout << "ima (" << p << ") = " << ima(p) << std::endl; + std::cout << std::endl; + + /*---------------------------------------------------. + | Morphological operations on complex-based images. | + `---------------------------------------------------*/ + + typedef complex_lower_window_p<D, P> win_t; + win_t win; + + ima_t ima_dil = morpho::dilation(ima, win); + // Manual iteration over the domain of IMA_DIL. + for_all (p) + std::cout << "ima_dil (" << p << ") = " << ima_dil(p) << std::endl; + std::cout << std::endl; + + ima_t ima_ero = morpho::erosion(ima, win); + // Manual iteration over the domain of IMA_ERO. + for_all (p) + std::cout << "ima_ero (" << p << ") = " << ima_ero(p) << std::endl; + + /* FIXME: Exercise elementary erosion/dilation (with neighborhoods) + when available. */ +} -- 1.6.0.1

1 0

2514: Add a centered window of lower-dimension adjacent complex faces.
by Roland Levillain 04 Oct '08

04 Oct '08

* mln/core/image/complex_lower_window_p.hh: New. --- milena/ChangeLog | 6 + milena/mln/core/image/complex_lower_window_p.hh | 146 +++++++++++++++++++++++ 2 files changed, 152 insertions(+), 0 deletions(-) create mode 100644 milena/mln/core/image/complex_lower_window_p.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 60b6c1e..f5e4b5e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2008-10-04 Roland Levillain <roland(a)lrde.epita.fr> + Add a centered window of lower-dimension adjacent complex faces. + + * mln/core/image/complex_lower_window_p.hh: New. + +2008-10-04 Roland Levillain <roland(a)lrde.epita.fr> + Add generic site iterators on complex windows. * mln/core/image/complex_window_piter.hh: New. diff --git a/milena/mln/core/image/complex_lower_window_p.hh b/milena/mln/core/image/complex_lower_window_p.hh new file mode 100644 index 0000000..d346d4a --- /dev/null +++ b/milena/mln/core/image/complex_lower_window_p.hh @@ -0,0 +1,146 @@ +// 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_COMPLEX_LOWER_WINDOW_P_HH +# define MLN_CORE_IMAGE_COMPLEX_LOWER_WINDOW_P_HH + +/// \file mln/core/complex_lower_window_p.hh +/// \brief Definition of a window centered on a n-face of complex +/// returning its adjacent (n-1)-faces as well as the center n-face. + +# include <mln/core/concept/window.hh> + +# include <mln/core/site_set/complex_psite.hh> + +# include <mln/topo/centered_iter_adapter.hh> +# include <mln/topo/adj_lower_face_iter.hh> + + +namespace mln +{ + // Forward declarations. + template <unsigned D, typename P> class complex_lower_window_p; + template <typename I, typename P, typename W> class complex_window_fwd_piter; + template <typename I, typename P, typename W> class complex_window_bkd_piter; + + + namespace trait + { + + template <unsigned D, typename P> + struct window_< mln::complex_lower_window_p<D,P> > + { + typedef trait::window::size::unknown size; + typedef trait::window::support::irregular support; + typedef trait::window::definition::varying definition; + }; + + } // end of namespace mln::trait + + + /// \brief Window centered on a n-face of complex returning its + /// adjacent (n-1)-faces as well as the center n-face. + template <unsigned D, typename P> + class complex_lower_window_p + : public Window< complex_lower_window_p<D, P> > + { + typedef complex_lower_window_p<D, P> self_; + /// The complex iterators on the adjacent faces only + /// (without the center point). + /// \{ + typedef topo::adj_lower_face_fwd_iter<D> adj_fwd_iter_; + typedef topo::adj_lower_face_bkd_iter<D> adj_bkd_iter_; + /// \} + + public: + /// The associated complex iterators. + /// \{ + typedef topo::centered_fwd_iter_adapter<D, adj_fwd_iter_> complex_fwd_iter; + typedef topo::centered_bkd_iter_adapter<D, adj_bkd_iter_> complex_bkd_iter; + /// \} + + public: + /// Associated types. + /// \{ + /// The type of psite corresponding to the window. + typedef complex_psite<D, P> psite; + /// The type of site corresponding to the window. + typedef mln_site(psite) site; + + // FIXME: This is a dummy value. + typedef void dpsite; + + /// \brief Site_Iterator type to browse the psites of the window + /// w.r.t. the ordering of vertices. + typedef + complex_window_fwd_piter<complex_fwd_iter, P, self_> fwd_qiter; + + /// \brief Site_Iterator type to browse the psites of the window + /// w.r.t. the reverse ordering of vertices. + typedef + complex_window_bkd_piter<complex_bkd_iter, P, self_> bkd_qiter; + + /// The default qiter type. + typedef fwd_qiter qiter; + /// \} + + public: + /// Services. + /// \{ + /* FIXME: mln::morpho::dilation requires these method from models + of concept Window, but Window does not list them in its + requirements. Who's guilty: morpho::dilation or Window? */ + /// Is this window empty? (Always returns \c false). + bool is_empty() const; + /// Is this window centered? (Always returns \c true). + bool is_centered() const; + /// \} + }; + + + +# ifndef MLN_INCLUDE_ONLY + + template <unsigned D, typename P> + bool + complex_lower_window_p<D, P>::is_empty() const + { + return false; + } + + template <unsigned D, typename P> + bool + complex_lower_window_p<D, P>::is_centered() const + { + return true; + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + +#endif // ! MLN_CORE_IMAGE_COMPLEX_LOWER_WINDOW_P_HH -- 1.6.0.1

1 0