September 2008 - Olena-patches

2439: Delegate pretty-printing of iterators on faces to mln::topo::face.
by Roland Levillain 30 Sep '08

30 Sep '08

* mln/topo/internal/complex_iter_base.hh (operator<<): Here. --- milena/ChangeLog | 6 ++++++ milena/mln/topo/internal/complex_iter_base.hh | 7 ++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a376900..d820e59 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2008-09-30 Roland Levillain <roland(a)lrde.epita.fr> + Delegate pretty-printing of iterators on faces to mln::topo::face. + + * mln/topo/internal/complex_iter_base.hh (operator<<): Here. + +2008-09-30 Roland Levillain <roland(a)lrde.epita.fr> + Add accesses to adjacent faces to mln::topo::face<D>. * mln/topo/face.hh diff --git a/milena/mln/topo/internal/complex_iter_base.hh b/milena/mln/topo/internal/complex_iter_base.hh index 8e20801..dc479e2 100644 --- a/milena/mln/topo/internal/complex_iter_base.hh +++ b/milena/mln/topo/internal/complex_iter_base.hh @@ -97,10 +97,7 @@ namespace mln }; - /* FIXME: This hand-made delegation is painful. We should rely on - the general mechanism provided by Point_Site. But then again, we - need to refine/adjust the interface of Point_Site w.r.t. the - mandatory conversions to points. */ + /// Print an mln::topo::internal::complex_iter_base. template <typename F, typename E> inline std::ostream& @@ -194,7 +191,7 @@ namespace mln This is a general remark that applies to all iterators of Milena. */ F f = p; - return ostr << "(dim = " << f.n() << ", id = " << f.face_id() << ')'; + return ostr << f; } # endif // ! MLN_INCLUDE_ONLY -- 1.6.0.1

1 0

2438: Add accesses to adjacent faces to mln::topo::face<D>.
by Roland Levillain 30 Sep '08

30 Sep '08

* mln/topo/face.hh (mln::topo::face<D>::lower_dim_adj_faces) (mln::topo::face<D>::higher_dim_adj_faces): New. (mln::topo::internal::lower_dim_adj_faces_if_dim_matches_<N, D>) (mln::topo::internal::higher_dim_adj_faces_if_dim_matches_<N, D>): New classes. * mln/topo/face_data.hh (mln::topo::internal::lower_dim_faces_data_mixin<N, D>): Allow mln::topo::internal::lower_dim_adj_faces_if_dim_matches_<N, D> to access to private data. (mln::topo::internal::higher_dim_faces_data_mixin<N, D>): Allow mln::topo::internal::higher_dim_adj_faces_if_dim_matches_<N, D> to access to private data. * tests/topo/complex.cc: Exercise accesses to adjacent faces. --- milena/ChangeLog | 20 +++++++ milena/mln/topo/face.hh | 121 ++++++++++++++++++++++++++++++++++++++++++ milena/mln/topo/face_data.hh | 9 +++ milena/tests/topo/complex.cc | 25 +++++++++ 4 files changed, 175 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 42ea6ad..a376900 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,25 @@ 2008-09-30 Roland Levillain <roland(a)lrde.epita.fr> + Add accesses to adjacent faces to mln::topo::face<D>. + + * mln/topo/face.hh + (mln::topo::face<D>::lower_dim_adj_faces) + (mln::topo::face<D>::higher_dim_adj_faces): + New. + (mln::topo::internal::lower_dim_adj_faces_if_dim_matches_<N, D>) + (mln::topo::internal::higher_dim_adj_faces_if_dim_matches_<N, D>): + New classes. + * mln/topo/face_data.hh + (mln::topo::internal::lower_dim_faces_data_mixin<N, D>): Allow + mln::topo::internal::lower_dim_adj_faces_if_dim_matches_<N, D> to + access to private data. + (mln::topo::internal::higher_dim_faces_data_mixin<N, D>): Allow + mln::topo::internal::higher_dim_adj_faces_if_dim_matches_<N, D> to + access to private data. + * tests/topo/complex.cc: Exercise accesses to adjacent faces. + +2008-09-30 Roland Levillain <roland(a)lrde.epita.fr> + * tests/topo/complex.cc: Fix diagram in documentation. 2008-09-30 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/mln/topo/face.hh b/milena/mln/topo/face.hh index 0d32c33..c485697 100644 --- a/milena/mln/topo/face.hh +++ b/milena/mln/topo/face.hh @@ -96,6 +96,13 @@ namespace mln /// Return the mln::topo::face_data pointed by this handle. template <unsigned N> face_data<N, D>& data() const; + + // FIXME: To be overhauled. + // FIXME: Why no `const' here? + /// Return an array of face handles pointing to adjacent (n-1)-faces. + std::vector< face<D> > lower_dim_adj_faces(); + /// Return an array of face handles pointing to adjacent (n+1)-faces. + std::vector< face<D> > higher_dim_adj_faces(); /// \} private: @@ -251,6 +258,120 @@ namespace mln } + // FIXME: This is way too complicated. + namespace internal + { + template <unsigned N, unsigned D> + struct lower_dim_adj_faces_if_dim_matches_ + { + std::vector< face<D> > operator()(face<D>& face) + { + metal::bool_< (N <= D) >::check(); + metal::bool_< (N > 1) >::check(); + + if (face.n() == N) + { + face_data<N, D>& data = face.template data<N>(); + std::vector< n_face<N - 1, D> > lower_dim_faces = + data.lower_dim_faces_; + std::vector< topo::face<D> > result; + for (typename std::vector< n_face<N - 1, D> >::const_iterator f = + lower_dim_faces.begin(); f != lower_dim_faces.end(); ++f) + result.push_back(*f); + return result; + } + else + return internal::lower_dim_adj_faces_if_dim_matches_<N - 1, D>()(face); + } + }; + + template <unsigned D> + struct lower_dim_adj_faces_if_dim_matches_<1, D> + { + std::vector< face<D> > operator()(face<D>& face) + { + /// If we reached this function, then the dimension of FACE + /// has to be 1. + mln_precondition(face.n() == 1); + face_data<1, D>& data = face.template data<1>(); + std::vector< n_face<0, D> > lower_dim_faces = data.lower_dim_faces_; + std::vector< topo::face<D> > result; + for (typename std::vector< n_face<0, D> >::const_iterator f = + lower_dim_faces.begin(); f != lower_dim_faces.end(); ++f) + result.push_back(*f); + return result; + } + }; + + template <unsigned N, unsigned D> + struct higher_dim_adj_faces_if_dim_matches_ + { + std::vector< face<D> > operator()(face<D>& face) + { + metal::bool_< (N < D) >::check(); + + if (face.n() == N) + { + face_data<N, D>& data = face.template data<N>(); + std::vector< n_face<N + 1, D> > higher_dim_faces = + data.higher_dim_faces_; + std::vector< topo::face<D> > result; + for (typename std::vector< n_face<N + 1, D> >::const_iterator f = + higher_dim_faces.begin(); f != higher_dim_faces.end(); ++f) + result.push_back(*f); + return result; + } + else + return + internal::higher_dim_adj_faces_if_dim_matches_<N - 1, D>()(face); + } + }; + + template <unsigned D> + struct higher_dim_adj_faces_if_dim_matches_<0, D> + { + std::vector< face<D> > operator()(face<D>& face) + { + /// If we reached this function, then the dimension of face + /// has to be D - 1. + mln_precondition(face.n() == 0); + face_data<0, D>& data = face.template data<0>(); + std::vector< n_face<1, D> > higher_dim_faces = + data.higher_dim_faces_; + std::vector< topo::face<D> > result; + for (typename std::vector< n_face<1, D> >::const_iterator f = + higher_dim_faces.begin(); f != higher_dim_faces.end(); ++f) + result.push_back(*f); + return result; + } + }; + } + + template <unsigned D> + inline + std::vector< face<D> > + face<D>::lower_dim_adj_faces() + { + // FIXME: Warning: might prevent any attempt to build a complex<0>. + metal::bool_< D != 0 >::check(); + + mln_precondition(n_ > 0); + return internal::lower_dim_adj_faces_if_dim_matches_<D, D>()(*this); + } + + template <unsigned D> + inline + std::vector< face<D> > + face<D>::higher_dim_adj_faces() + { + // FIXME: Warning: might prevent any attempt to build a complex<0>. + metal::bool_< D != 0 >::check(); + + mln_precondition(n_ < D); + return internal::higher_dim_adj_faces_if_dim_matches_<D - 1, D>()(*this); + } + + template <unsigned D> inline bool diff --git a/milena/mln/topo/face_data.hh b/milena/mln/topo/face_data.hh index 7c94ddd..28d425e 100644 --- a/milena/mln/topo/face_data.hh +++ b/milena/mln/topo/face_data.hh @@ -51,6 +51,11 @@ namespace mln { template <unsigned N, unsigned D> struct lower_dim_faces_set_mixin; template <unsigned N, unsigned D> struct higher_dim_faces_set_mixin; + + template <unsigned N, unsigned D> + struct lower_dim_adj_faces_if_dim_matches_; + template <unsigned N, unsigned D> + struct higher_dim_adj_faces_if_dim_matches_; } // Forward declarations (internal). @@ -109,6 +114,8 @@ namespace mln void connect_lower_dim_face (const n_face<N - 1, D>& f); private: friend class mln::topo::internal::lower_dim_faces_set_mixin<N, D>; + friend class mln::topo::internal::lower_dim_adj_faces_if_dim_matches_<N, D>; + // FIXME: Rename as lower_dim_adj_faces_? std::vector< n_face<N - 1, D> > lower_dim_faces_; }; @@ -119,6 +126,8 @@ namespace mln void connect_higher_dim_face(const n_face<N + 1, D>& f); private: friend class mln::topo::internal::higher_dim_faces_set_mixin<N, D>; + friend class mln::topo::internal::higher_dim_adj_faces_if_dim_matches_<N, D>; + // FIXME: Rename as higher_dim_adj_faces_? std::vector< n_face<N + 1, D> > higher_dim_faces_; }; /// \} diff --git a/milena/tests/topo/complex.cc b/milena/tests/topo/complex.cc index d4f824a..349921c 100644 --- a/milena/tests/topo/complex.cc +++ b/milena/tests/topo/complex.cc @@ -28,6 +28,8 @@ /// \file tests/topo/complex.cc /// \brief Test of mln::complex. +#include <algorithm> +#include <iterator> #include <iostream> #include <mln/topo/complex.hh> @@ -114,6 +116,8 @@ int main() // Get the face data from (``static'') face handle E0. const topo::face_data<1, D>& face1 = e0.data(); + /* FIXME: Rename AF (everywhere) as `any-face handles' have been + renamed to `face'. */ // Any-face handle. topo::face<D> af(e0); // Get the face data from (``dynamic'') face handle AF. @@ -121,6 +125,27 @@ int main() mln_assertion(&face1 == &face2); + /*-----------------. + | Adjacent faces. | + `-----------------*/ + + // Adjacent lower-dimension faces of AF. + std::vector< topo::face<D> > af_lower_dim_adj_faces = + af.lower_dim_adj_faces(); + std::cout << "lower-dimension faces adjacent to " << af << ":" << std::endl; + std::copy (af_lower_dim_adj_faces.begin(), af_lower_dim_adj_faces.end(), + std::ostream_iterator< topo::face<D> > (std::cout, "\n")); + std::cout << std::endl; + + // Adjacent higher-dimension faces of AF. + std::vector< topo::face<D> > af_higher_dim_adj_faces = + af.higher_dim_adj_faces(); + std::cout << "higher-dimension faces adjacent to " << af << ":" << std::endl; + std::copy (af_higher_dim_adj_faces.begin(), af_higher_dim_adj_faces.end(), + std::ostream_iterator< topo::face<D> > (std::cout, "\n")); + std::cout << std::endl; + + /*------------. | Iteration. | `------------*/ -- 1.6.0.1

1 0

2437: * tests/topo/complex.cc: Fix diagram in documentation.
by Roland Levillain 30 Sep '08

30 Sep '08

--- milena/ChangeLog | 4 ++++ milena/tests/topo/complex.cc | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f912670..42ea6ad 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2008-09-30 Roland Levillain <roland(a)lrde.epita.fr> + * tests/topo/complex.cc: Fix diagram in documentation. + +2008-09-30 Roland Levillain <roland(a)lrde.epita.fr> + Add pretty-printing operators for face handles. * mln/topo/face.hh (operator<<(std::ostream&, const face<D>)) diff --git a/milena/tests/topo/complex.cc b/milena/tests/topo/complex.cc index 848b139..d4f824a 100644 --- a/milena/tests/topo/complex.cc +++ b/milena/tests/topo/complex.cc @@ -52,9 +52,9 @@ int main() v0 e3 v3 o-----------o v0----e3----v3 / \ ,-----. / / \ | / - / . \ \ t2/ / / \ t2 / + / . \ \ t1/ / / \ t1 / e0 / / \ e1\ / / e4 e0. ,e1Ž `e4 - / /t1 \ \ ' / / t1 \ / + / /t0 \ \ ' / / t0 \ / / `-----' \ / / | \ / o-----------o v1----e2----v2 v1 e2 v2 -- 1.6.0.1

1 0

2436: Add pretty-printing operators for face handles.
by Roland Levillain 30 Sep '08

30 Sep '08

* mln/topo/face.hh (operator<<(std::ostream&, const face<D>)) * mln/topo/n_face.hh (operator<<(std::ostream&, const n_face<N, D>)): New operators. --- milena/ChangeLog | 8 ++++++++ milena/mln/topo/face.hh | 15 +++++++++++++++ milena/mln/topo/n_face.hh | 15 +++++++++++++++ 3 files changed, 38 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f0cf69b..f912670 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2008-09-30 Roland Levillain <roland(a)lrde.epita.fr> + Add pretty-printing operators for face handles. + + * mln/topo/face.hh (operator<<(std::ostream&, const face<D>)) + * mln/topo/n_face.hh (operator<<(std::ostream&, const n_face<N, D>)): + New operators. + +2008-09-30 Roland Levillain <roland(a)lrde.epita.fr> + * mln/topo/complex.hh: Add some more documentation. 2008-09-30 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/mln/topo/face.hh b/milena/mln/topo/face.hh index b2d82b1..0d32c33 100644 --- a/milena/mln/topo/face.hh +++ b/milena/mln/topo/face.hh @@ -135,6 +135,12 @@ namespace mln /// \} + /// Print an mln::topo::face. + template <unsigned D> + std::ostream& + operator<<(std::ostream& ostr, const face<D>& f); + + # ifndef MLN_INCLUDE_ONLY @@ -269,6 +275,15 @@ namespace mln return lhs.face().id() < rhs.face().id(); } + + template <unsigned D> + inline + std::ostream& + operator<<(std::ostream& ostr, const face<D>& f) + { + return ostr << "(dim = " << f.n() << ", id = " << f.face_id() << ')'; + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::topo diff --git a/milena/mln/topo/n_face.hh b/milena/mln/topo/n_face.hh index 8d9664b..bb4e926 100644 --- a/milena/mln/topo/n_face.hh +++ b/milena/mln/topo/n_face.hh @@ -130,6 +130,12 @@ namespace mln /// \} + /// Print an mln::topo::n_face. + template <unsigned N, unsigned D> + std::ostream& + operator<<(std::ostream& ostr, const n_face<N, D>& f); + + # ifndef MLN_INCLUDE_ONLY @@ -247,6 +253,15 @@ namespace mln return lhs.face().id() < rhs.face().id(); } + + template <unsigned N, unsigned D> + inline + std::ostream& + operator<<(std::ostream& ostr, const n_face<N, D>& f) + { + return ostr << "(dim = " << f.n() << ", id = " << f.face_id() << ')'; + } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::topo -- 1.6.0.1

1 0

2435: * mln/topo/complex.hh: Add some more documentation.
by Roland Levillain 30 Sep '08

30 Sep '08

--- milena/ChangeLog | 4 +++ milena/mln/topo/complex.hh | 54 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f7bf9f4..f0cf69b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2008-09-30 Roland Levillain <roland(a)lrde.epita.fr> + * mln/topo/complex.hh: Add some more documentation. + +2008-09-30 Roland Levillain <roland(a)lrde.epita.fr> + * mln/topo/complex.hh: Add missing `inline' keywords. 2008-09-29 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/mln/topo/complex.hh b/milena/mln/topo/complex.hh index 303c3f8..643285c 100644 --- a/milena/mln/topo/complex.hh +++ b/milena/mln/topo/complex.hh @@ -231,6 +231,59 @@ namespace mln | Complex data. | `---------------*/ + /** \brief Complex data. + + Data is aggregated as follows in an mln::topo::complex<D>: + + \verbatim + + ,-----------> lower_dim_faces_set_mixin<D, D> + | + faces_set_mixin<0, D> + ^ + | + | ,-----------> higher_dim_faces_set_mixin<1, D> + | | ,---------> lower_dim_faces_set_mixin<1, D> + | | | + faces_set_mixin<1, D> + ^ + | + | + + ... + + ^ + | + | ,-----------> higher_dim_faces_set_mixin<D - 1, D> + | | ,---------> lower_dim_faces_set_mixin<D - 1, D> + | | | + faces_set_mixin<D - 1, D> + ^ + | + | ,---------> lower_dim_faces_set_mixin<D, D> + | | + faces_set_mixin<D, D> + ^ + | + | + complex_data<D> ----. (shared data) + | + | + ,--------------' + | + | + `----<> tracked_ptr< complex_data<D> > ----<> complex<D> + + \endverbatim + + + An instance of mln::topo::internal::faces_set_mixin<N, D> + stores the \p N-faces of a \p D-complex. + + Classes mln::topo::internal::lower_dim_faces_set_mixin<N, D> + are implementation classes factoring services related to + complex data. */ + /// \{ namespace internal { // Forward declarations. @@ -245,6 +298,7 @@ namespace mln }; } // end of namespace mln::topo::internal + /// \} /*---------------------. -- 1.6.0.1

1 0

2434: * mln/topo/complex.hh: Add missing `inline' keywords.
by Roland Levillain 30 Sep '08

30 Sep '08

--- milena/ChangeLog | 4 ++++ milena/mln/topo/complex.hh | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 96f3ef5..f7bf9f4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2008-09-30 Roland Levillain <roland(a)lrde.epita.fr> + + * mln/topo/complex.hh: Add missing `inline' keywords. + 2008-09-29 Roland Levillain <roland(a)lrde.epita.fr> * tests/topo/complex.cc: Move some comments to the Trac Wiki. diff --git a/milena/mln/topo/complex.hh b/milena/mln/topo/complex.hh index c16ec9b..303c3f8 100644 --- a/milena/mln/topo/complex.hh +++ b/milena/mln/topo/complex.hh @@ -414,6 +414,7 @@ namespace mln `-----------------------*/ template <unsigned D> + inline complex<D>::complex() // Allocate data for this complex. : data_(new internal::complex_data<D>()) @@ -421,6 +422,7 @@ namespace mln } template <unsigned D> + inline n_face<0u, D> complex<D>::add_face() { @@ -434,6 +436,7 @@ namespace mln template <unsigned D> template <unsigned N> + inline n_face<N + 1, D> complex<D>::add_face(const n_faces_set<N, D>& adjacent_faces) { @@ -514,6 +517,7 @@ namespace mln `----------------------*/ template <unsigned D> + inline std::size_t complex<D>::nfaces() const { @@ -522,6 +526,7 @@ namespace mln template <unsigned D> template <unsigned N> + inline std::size_t complex<D>::nfaces() const { @@ -534,6 +539,7 @@ namespace mln `-----------------------*/ template <unsigned D> + inline std::size_t complex<D>::nfaces(unsigned n) const { @@ -549,6 +555,7 @@ namespace mln template <unsigned D> template <unsigned N> + inline face_data<N, D>& complex<D>::face_data_(unsigned face_id) { @@ -557,6 +564,7 @@ namespace mln template <unsigned D> template <unsigned N> + inline const face_data<N, D>& complex<D>::face_data_(unsigned face_id) const { @@ -565,6 +573,7 @@ namespace mln template <unsigned D> template <unsigned N> + inline void complex<D>::connect_(const n_face<N, D>& f1, const n_face<N + 1, D>& f2) @@ -582,6 +591,7 @@ namespace mln `-------------*/ template <unsigned D> + inline bool operator==(const complex<D>& lhs, const complex<D>& rhs) { @@ -594,6 +604,7 @@ namespace mln `------------------*/ template <unsigned D> + inline std::ostream& operator<<(std::ostream& ostr, const complex<D>& c) { @@ -602,6 +613,7 @@ namespace mln } template <unsigned D> + inline void complex<D>::print(std::ostream& ostr) const { @@ -610,6 +622,7 @@ namespace mln template <unsigned D> template <unsigned N> + inline void complex<D>::print_faces(std::ostream& ostr) const { @@ -624,6 +637,7 @@ namespace mln { template <unsigned N, unsigned D> + inline void faces_set_mixin<N, D>::print_rec_asc(std::ostream& ostr) const { @@ -632,6 +646,7 @@ namespace mln } template <unsigned D> + inline void faces_set_mixin<0u, D>::print_rec_asc(std::ostream& ostr) const { @@ -639,6 +654,7 @@ namespace mln } template <unsigned D> + inline void faces_set_mixin<D, D>::print_rec_asc(std::ostream& ostr) const { @@ -646,6 +662,7 @@ namespace mln print(ostr); } + inline void faces_set_mixin<0u, 0u>::print_rec_asc(std::ostream& ostr) const { @@ -654,6 +671,7 @@ namespace mln template <unsigned N, unsigned D> + inline void faces_set_mixin<N, D>::print(std::ostream& ostr) const { @@ -672,6 +690,7 @@ namespace mln } template <unsigned D> + inline void faces_set_mixin<0u, D>::print(std::ostream& ostr) const { @@ -688,6 +707,7 @@ namespace mln } template <unsigned D> + inline void faces_set_mixin<D, D>::print(std::ostream& ostr) const { @@ -703,6 +723,7 @@ namespace mln } } + inline void faces_set_mixin<0u, 0u>::print(std::ostream& ostr) const { @@ -714,6 +735,7 @@ namespace mln template <unsigned N, unsigned D> + inline void lower_dim_faces_set_mixin<N, D>::print(std::ostream& ostr, const face_data<N, D>& f) const @@ -724,6 +746,7 @@ namespace mln } template <unsigned N, unsigned D> + inline void higher_dim_faces_set_mixin<N, D>::print(std::ostream& ostr, const face_data<N, D>& f) const @@ -746,6 +769,7 @@ namespace mln template <unsigned D> template <typename BinaryFunction, typename T> + inline T complex<D>::fold_left_(const BinaryFunction& f, const T& accu) const { @@ -759,6 +783,7 @@ namespace mln template <unsigned D> template <typename BinaryFunction, typename T> + inline T faces_set_mixin<D, D>::fold_left_(const BinaryFunction& f, const T& accu) const @@ -768,6 +793,7 @@ namespace mln template <unsigned N, unsigned D> template <typename BinaryFunction, typename T> + inline T faces_set_mixin<N, D>::fold_left_(const BinaryFunction& f, const T& accu) const @@ -777,6 +803,7 @@ namespace mln template <unsigned D> template <typename BinaryFunction, typename T> + inline T faces_set_mixin<0u, D>::fold_left_(const BinaryFunction& f, const T& accu) const @@ -785,6 +812,7 @@ namespace mln } template <typename BinaryFunction, typename T> + inline T faces_set_mixin<0u, 0u>::fold_left_(const BinaryFunction& f, const T& accu) const @@ -801,6 +829,7 @@ namespace mln template <unsigned D> template <typename UnaryFunction> + inline typename UnaryFunction::result_type complex<D>::apply_if_dim_matches_(unsigned n, const UnaryFunction& f) const { @@ -816,6 +845,7 @@ namespace mln template <unsigned D> template <typename UnaryFunction> + inline typename UnaryFunction::result_type faces_set_mixin<D, D>::apply_if_dim_matches_(unsigned n, const UnaryFunction& f) const @@ -829,6 +859,7 @@ namespace mln template <unsigned N, unsigned D> template <typename UnaryFunction> + inline typename UnaryFunction::result_type faces_set_mixin<N, D>::apply_if_dim_matches_(unsigned n, const UnaryFunction& f) const @@ -842,6 +873,7 @@ namespace mln template <unsigned D> template <typename UnaryFunction> + inline typename UnaryFunction::result_type faces_set_mixin<0u, D>::apply_if_dim_matches_(unsigned n, const UnaryFunction& f) const @@ -852,6 +884,7 @@ namespace mln } template <typename UnaryFunction> + inline typename UnaryFunction::result_type faces_set_mixin<0u, 0u>::apply_if_dim_matches_(unsigned n, const UnaryFunction& f) const -- 1.6.0.1

1 0

cleanup-2008 2433: Sandbox: Start revamp registration.
by Ugo Jardonnet 29 Sep '08

29 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Sandbox: Start revamp registration. * jardonnet/test/registration.cc: Simple registration test. * jardonnet/registration/registration.hh: Simple registration. * jardonnet/registration/multiscale.hh: Multiscale registration. * jardonnet/test/icp.cc, * jardonnet/registration/icp.hh, * jardonnet/registration/final_qk.hh, * jardonnet/registration/save.hh, * jardonnet/registration/tools.hh, * jardonnet/registration/icp_ref.hh, * jardonnet/registration/quat7.hh: Upgrade to 'clean-up'. * jardonnet/test/Makefile: Add rules. registration/final_qk.hh | 8 +- registration/icp.hh | 6 - registration/multiscale.hh | 78 +++++++++++++++++++ registration/quat7.hh | 2 registration/registration.hh | 171 +++++++++++++++++++++++++++++++++++++++++++ registration/tools.hh | 54 +++++-------- test/Makefile | 13 ++- test/icp.cc | 18 ++-- test/registration.cc | 110 +++++++++++++++++++++++++++ 9 files changed, 410 insertions(+), 50 deletions(-) Index: jardonnet/test/registration.cc --- jardonnet/test/registration.cc (revision 0) +++ jardonnet/test/registration.cc (revision 0) @@ -0,0 +1,110 @@ +#include <mln/core/image/image3d.hh> + +#include <mln/io/pbm/load.hh> +#include <mln/io/pbm/save.hh> +#include <mln/io/ppm/save.hh> +#include <mln/convert/to_p_array.hh> +#include <mln/norm/l2.hh> + +#include <sandbox/jardonnet/registration/icp.hh> +#include <sandbox/jardonnet/registration/tools.hh> +#include <sandbox/jardonnet/registration/final_qk.hh> +#include <mln/geom/bbox.hh> + +void usage(char *argv[]) +{ + std::cout << "usage : " << argv[0] + << " cloud.pbm surface.pbm q e" << std::endl + << " q >= 1 and e >= 1" << std::endl; + exit(1); +} + + +int main(int argc, char* argv[]) +{ + // usage + float q = std::atof(argv[3]); + int e = std::atoi(argv[4]); + if (argc != 5) + usage(argv); + if (q < 1 or e < 1) + usage(argv); + + using namespace mln; + typedef image2d< bool > image2db; + + image2db img1; + image2db img2; + + //load images + io::pbm::load(img1, argv[1]); + io::pbm::load(img2, argv[2]); + + //build p_arrays. + p_array<mln_psite_(image2db)> c = convert::to< p_array<point2d> >(img1); + p_array<mln_psite_(image2db)> x = convert::to< p_array<point2d> >(img2); + + //working box + const box<point2d> working_box = + enlarge(bigger(geom::bbox(c), geom::bbox(x)), 100); + + //Make a lazy_image map via function closest_point + closest_point<mln_psite_(image2db)> fun(x, working_box); + + // * Use real lazy image + //lazy_image< closest_point<mln_psite_(image2db)> > map(fun); + p_array<point2d> map; + quat7<2> qk ;//= registration::icp(c, map, q, e, x); + +#ifndef NDEBUG + std::cout << "closest_point(Ck[i]) = " << fun.i << std::endl; + std::cout << "Pts processed = " << registration::pts << std::endl; +#endif + + qk.apply_on(c, c, c.nsites()); + + float stddev, mean; + registration::mean_stddev(c, map, mean, stddev); + +#ifndef NDEBUG + std::cout << "mean : " << mean << std::endl; + std::cout << "stddev : " << stddev << std::endl; +#endif + + std::vector<float> length(c.nsites()); + for (size_t i = 0; i < c.nsites(); i++) + length[i] = norm::l2( convert::to< algebra::vec<2,float> >( c[i] - map(c[i]) ) ); + + + // final transform + quat7<2> fqk = registration::final_qk2(c, map, 2*stddev); + fqk.apply_on(c, c, c.nsites()); + + + //init output image + image2d<value::rgb8> output(convert::to_box2d(working_box), 0); + level::fill(output, literal::white); + + + //print x + for (unsigned i = 0; i < x.nsites(); i++) + { + //Xk points + point2d px(x[i][0], x[i][1]); + if (output.has(px)) + output(px) = literal::black; + } + + + for (unsigned i = 0; i < c.nsites(); i++) + { + //Ck points + point2d p(c[i][0], c[i][1]); + if (output.has(p)) + output(p) = literal::green; + } + + io::ppm::save(output, "registred.ppm"); + +} + Index: jardonnet/test/icp.cc --- jardonnet/test/icp.cc (revision 2432) +++ jardonnet/test/icp.cc (working copy) @@ -21,12 +21,11 @@ int main(int argc, char* argv[]) { - if (argc != 5) - usage(argv); - + // usage float q = std::atof(argv[3]); int e = std::atoi(argv[4]); - + if (argc != 5) + usage(argv); if (q < 1 or e < 1) usage(argv); @@ -45,15 +44,16 @@ I3d surface = convert::to_image3d(img2); //build p_arrays. - p_array<mln_point_(I3d)> c = convert::to_p_array(cloud); - p_array<mln_point_(I3d)> x = convert::to_p_array(surface); + p_array<mln_psite_(I3d)> c = convert::to_p_array(cloud); + p_array<mln_psite_(I3d)> x = convert::to_p_array(surface); //working box - const box_<mln_point_(I3d)> working_box = enlarge(bigger(c.bbox(),x.bbox()),100); + const box<mln_psite_(I3d)> working_box = + enlarge(bigger(c.bbox(),x.domain()),100); //Make a lazy_image map via function closest_point - closest_point<mln_point_(I3d)> fun(x, working_box); - lazy_image< closest_point<mln_point_(I3d)> > map(fun); + closest_point<mln_psite_(I3d)> fun(x, working_box); + lazy_image< closest_point<mln_psite_(I3d)> > map(fun); quat7<3> qk = registration::icp(c, map, q, e, x); Index: jardonnet/test/Makefile --- jardonnet/test/Makefile (revision 2432) +++ jardonnet/test/Makefile (working copy) @@ -13,18 +13,27 @@ gau: g++ gaussian.cc $(FLAG) -o 'gau' + +# # icp icpD: icp.cc +depend g++ icp.cc -I../../.. -g -o 'icpD' - icp: +depend g++ icp.cc -I../../.. -O3 -DNDEBUG -o 'icp' + +# # icp-ref icp_refD: icp_ref.cc ../registration/icp_ref.hh +depend g++ -Wall -W icp_ref.cc -I../../.. -g -o 'icp_refD' - icp_ref: icp_ref.cc ../registration/icp_ref.hh +depend g++ icp_ref.cc -I../../.. -O3 -DNDEBUG -o 'icp_ref' + +# # reg +regD: registration.cc +depend + g++ registration.cc -I../../.. -g -o 'reg' +reg: registration.cc +depend + g++ registration.cc -I../../.. -g -o 'reg' + bench: ruby bench.rb Index: jardonnet/registration/final_qk.hh --- jardonnet/registration/final_qk.hh (revision 2432) +++ jardonnet/registration/final_qk.hh (working copy) @@ -19,7 +19,7 @@ for (size_t i = 0; i < c.nsites(); i++) { - float f = norm::l2(algebra::vec<3,int> (c[i] - map(c[i]))); + float f = norm::l2(convert::to< algebra::vec<P::dim,int> > (c[i] - map(c[i]))); length[i] = f; mean += f; } @@ -80,8 +80,8 @@ float nb_point = 0; for (size_t i = 0; i < c.nsites(); ++i) { - algebra::vec<3,float> xki = map(c[i]); - algebra::vec<3,float> ci = c[i]; + algebra::vec<P::dim,float> xki = map(c[i]); + algebra::vec<P::dim,float> ci = c[i]; if (norm::l2(ci - xki) > nstddev) { @@ -94,7 +94,7 @@ mu_Xk /= nb_point; // qT - const algebra::vec<3,float> qT = mu_C - mu_Xk; + const algebra::vec<P::dim,float> qT = mu_C - mu_Xk; // qR quat7<P::dim> qk = final_qk(c, map, nstddev); Index: jardonnet/registration/save.hh Index: jardonnet/registration/tools.hh --- jardonnet/registration/tools.hh (revision 2432) +++ jardonnet/registration/tools.hh (working copy) @@ -12,14 +12,6 @@ namespace mln { - namespace registration - { - - - - } - - template <typename P> void shuffle(p_array& a) { @@ -28,8 +20,8 @@ unsigned int r = rand() % a.nsites(); P tmp; tmp = a[i]; - a.hook_()[i] = a[r]; - a.hook_()[r] = tmp; + a[i] = a[r]; + a[r] = tmp; } } @@ -73,7 +65,7 @@ typedef algebra::vec<P::dim, float> input; typedef P result; - closest_point(const p_array& X, const box_& box) + closest_point(const p_array& X, const box& box) : X(X), box(box) #ifndef NDEBUG , i(0) @@ -105,13 +97,13 @@ return algebra::to_point(best_x); } - const box_& domain() const + const box& domain() const { return box; } const p_array& X; - const box_ box; + const box box; #ifndef NDEBUG mutable unsigned i; @@ -161,10 +153,10 @@ template <typename P> inline - box_ //dif - enlarge(const box_& box, unsigned b) + box //dif + enlarge(const box& box, unsigned b) { - box_ nbox(box); + mln::box nbox(box); for (unsigned i = 0; i < P::dim; ++i) { @@ -175,7 +167,7 @@ } template <typename P> - box_ bigger(box_ a, box_ b) + box bigger(const box& a, const box& b) { P pmin,pmax; @@ -185,7 +177,7 @@ pmax[i] = (a.pmax()[i] > b.pmax()[i]) ? a.pmax()[i] : b.pmax()[i]; } - return box_(pmin, pmax); + return box(pmin, pmax); } @@ -214,13 +206,13 @@ template < typename P > inline - box_<point2d> - to_box2d(const box_& b) + box<point2d> + to_box2d(const box& b) { point2d pmin(b.pmin()[0], b.pmin()[1]); point2d pmax(b.pmax()[0], b.pmax()[1]); - return box_<point2d>(pmin, pmax); + return box<point2d>(pmin, pmax); } @@ -246,17 +238,17 @@ //point3d -> point2d template <typename T> inline - point_<grid::square, T> - to_point2d(const point_<grid::cube, T>& p) + point<grid::square, T> + to_point2d(const point<grid::cube, T>& p) { - return point_<grid::square, T>(p[0], p[1]); + return point<grid::square, T>(p[0], p[1]); } //point2d -> point2d template <typename T> inline - point_<grid::square, T>& - to_point2d(const point_<grid::square, T>& p) + point<grid::square, T>& + to_point2d(const point<grid::square, T>& p) { return p; } @@ -264,16 +256,16 @@ //point2d -> point3d template <typename T> inline - point_<grid::cube, T> - to_point3d(const point_<grid::square, T>& p) + point<grid::cube, T> + to_point3d(const point<grid::square, T>& p) { - return point_<grid::cube, T>(p[0], p[1], 0); + return point<grid::cube, T>(p[0], p[1], 0); } //point3d -> point3d template <typename T> inline - point_<grid::cube, T>& - to_point3d(const point_<grid::cube, T>& p) + point<grid::cube, T>& + to_point3d(const point<grid::cube, T>& p) { return p; } Index: jardonnet/registration/quat7.hh --- jardonnet/registration/quat7.hh (revision 2432) +++ jardonnet/registration/quat7.hh (working copy) @@ -69,7 +69,7 @@ assert(_qR.is_unit()); for (size_t i = 0; i < c_length; i++) - output.hook_()[i] = algebra::to_point((*this)(input[i])); + output[i] = algebra::to_point((*this)(input[i])); } friend std::ostream& operator << (std::ostream& os, quat7& q) Index: jardonnet/registration/multiscale.hh --- jardonnet/registration/multiscale.hh (revision 0) +++ jardonnet/registration/multiscale.hh (revision 0) @@ -0,0 +1,78 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or 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_REGISTRATION_MULTISCALE_HH +# define MLN_REGISTRATION_MULTISCALE_HH + +# include <mln/registration/icp.hh> + +namespace mln +{ + + namespace registration + { + + // FIXME: Make it works in 3d *AND* 2d + template <typename P, typename M> + inline + quat7<P::dim> + multiscale(p_array& cloud, + const M& map, + const float q, + const unsigned nb_it, + const p_array& x) + { + trace::entering("registration::registration"); + + mln_precondition(P::dim == 3 || P::dim == 2); + mln_precondition(cloud.nsites() != 0); + + // Shuffle cloud + shuffle(cloud); + + //init rigid transform qk + quat7<P::dim> qk; + + //run registration + for (int e = nb_it-1; e >= 0; e--) + { + unsigned l = cloud.nsites() / std::pow(q, e); + l = (l<1) ? 1 : l; + impl::registration_(cloud, map, qk, l, 1e-3); + } + + trace::exiting("registration::registration"); + + return qk; + } + + } // end of namespace mln::registration + +} // end of namespace mln + + +#endif // ! MLN_REGISTRATION_MULTISCALE_HH Index: jardonnet/registration/icp_ref.hh Index: jardonnet/registration/registration.hh --- jardonnet/registration/registration.hh (revision 0) +++ jardonnet/registration/registration.hh (revision 0) @@ -0,0 +1,171 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or 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_REGISTRATION_REGISTRATION_HH +# define MLN_REGISTRATION_REGISTRATION_HH + +/*! \file mln/registration/registration.hh + * + * \brief image registration + */ + +# include <iostream> +# include <string> +# include <cmath> + +# include <mln/algebra/quat.hh> +# include <mln/algebra/vec.hh> +# include <mln/make/w_window.hh> +# include <mln/make/w_window3d.hh> + +# include <mln/value/rgb8.hh> +# include <mln/literal/colors.hh> +# include <mln/literal/black.hh> +# include <mln/level/fill.hh> +# include <mln/io/ppm/save.hh> + + +# include "tools.hh" + +# include "cloud.hh" +# include "quat7.hh" +# include "update_qk.hh" +# include "chamfer.hh" + +# include "save.hh" + +namespace mln +{ + + namespace registration + { + +#ifndef NDEBUG + static unsigned pts = 0; +#endif + + /*! Registration FIXME : doxy + * + * + */ + template <typename I, typename J> + inline + mln_concrete(I) + registration(const Image& cloud, + const Image<J>& surface); + +# ifndef MLN_INCLUDE_ONLY + + namespace impl + { + + template <typename P, typename M> + inline + void + registration_(const p_array& C, + const M& map, + quat7<P::dim>& qk, + const unsigned c_length, + const float epsilon = 1e-3) + { + trace::entering("registration::impl::registration_"); + + buffer<4,quat7<P::dim> > buf_qk; + buffer<3,float> buf_dk; + + float d_k = 10000; + p_array Ck(C); + + algebra::vec<P::dim,float> mu_C = center(C, c_length), mu_Xk; + + buf_qk.store(qk); + + qk.apply_on(C, Ck, c_length); + + unsigned int k = 0; + do { + buf_dk.store(d_k); + + //compute qk + qk = match(C, mu_C, Ck, map, c_length); + buf_qk.store(qk); + + //update qk + if (k > 2) + qk = update_qk(buf_qk.get_array(), buf_dk.get_array()); + qk._qR.set_unit(); + buf_qk[0] = qk; + + //Ck+1 = qk(C) + qk.apply_on(C, Ck, c_length); + + // d_k = d(Yk, Pk+1) + // = d(closest(qk-1(P)), qk(P)) + d_k = rms(C, map, c_length, buf_qk[1], qk); + + k++; + } while ((qk - buf_qk[1]).sqr_norm() / qk.sqr_norm() > epsilon); + + trace::exiting("registration::impl::registration_"); + } + + } // end of namespace mln::registration::impl + + + // FIXME: Separate icp.hh registration.hh multiscale_registration.hh + // FIXME: Make it works in 3d *AND* 2d + template <typename P, typename M> + inline + quat7<P::dim> + registration(p_array& cloud, + const M& map, + const p_array& x) + { + trace::entering("registration::registration"); + + mln_precondition(P::dim == 3 || P::dim == 2); + mln_precondition(cloud.nsites() != 0); + + //init rigid transform qk + quat7<P::dim> qk; + + //run registration + impl::registration_(cloud, map, qk, l, 1e-3); + + trace::exiting("registration::registration"); + + return qk; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::registration + +} // end of namespace mln + + +#endif // ! MLN_REGISTRATION_REGISTRATION_HH Index: jardonnet/registration/icp.hh --- jardonnet/registration/icp.hh (revision 2432) +++ jardonnet/registration/icp.hh (working copy) @@ -163,7 +163,7 @@ template <typename P, typename M> inline quat7<P::dim> - icp(p_array cloud, // More efficient without reference + icp(p_array& cloud, const M& map, const float q, const unsigned nb_it, @@ -182,7 +182,7 @@ #ifndef NDEBUG // FIXME: theo - const box_ working_box = enlarge(bigger(cloud.bbox(),x.bbox()),5); + const box working_box = enlarge(bigger(geom::bbox(cloud),geom::bbox(x)),5); image2d<value::rgb8> tmp(convert::to_box2d(working_box), 1); level::fill(tmp, literal::black); //write X @@ -230,7 +230,7 @@ mln_piter(p_array) p(cloud); for_all(p) { - algebra::vec<3,float> p_ = point3d(p), qp_ = qk(p_); + algebra::vec<P::dim,float> p_ = point3d(p), qp_ = qk(p_); point2d qp = point2d(int(qp_[0]), int(qp_[1])); if (tmp.has(qp)) tmp(qp) = c;

1 0

2432: * tests/topo/complex.cc: Move some comments to the Trac Wiki. See https://trac.lrde.org/olena/wiki/Olena/ComplexBasedImages.
by Roland Levillain 29 Sep '08

29 Sep '08

--- milena/ChangeLog | 5 +++++ milena/tests/topo/complex.cc | 34 +++------------------------------- 2 files changed, 8 insertions(+), 31 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 77f42ad..96f3ef5 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2008-09-29 Roland Levillain <roland(a)lrde.epita.fr> + * tests/topo/complex.cc: Move some comments to the Trac Wiki. + See https://trac.lrde.org/olena/wiki/Olena/ComplexBasedImages. + +2008-09-29 Roland Levillain <roland(a)lrde.epita.fr> + Remove macros mln_*[cf]iter. * mln/core/macros.hh diff --git a/milena/tests/topo/complex.cc b/milena/tests/topo/complex.cc index deafb57..848b139 100644 --- a/milena/tests/topo/complex.cc +++ b/milena/tests/topo/complex.cc @@ -205,37 +205,9 @@ int main() complex_faces_piter) use a static `n'. We should also have n-faces iterators where n could be dynamic. - - But first, we need to clarify (existing) names. These ones are - OK: - - ----------------------------------------------------------------- - Name Definition - ----------------------------------------------------------------- - complex<D> General complex. - - face_data<N, D> Face data. - n_face<N, D> (Static) n-face handle. - n_faces_set<N, D> Set of face handles. - face<D> Dynamic face handle. - - face_fwd_iter<D>(c) | Iterators on all the faces - face_bkd_iter<D>(c) | of c. - - n_face_fwd_iter<D>(c) | Iterators on n-faces, - n_face_bkd_iter<D>(c) | n being dynamic. - - static_n_face_fwd_iter<D>(c) | Iterators on n-faces, - static_n_face_bkd_iter<D>(c) | n being static. - - internal::complex_iter_base<F, E> Factoring base class. - ----------------------------------------------------------------- - - (Note: get rid of trailing underscores, even for entities in - mln::internal::.) - - And likewise for image-related entities! - + 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: -- 1.5.6.5

1 0

2431: Remove macros mln_*[cf]iter.
by Roland Levillain 29 Sep '08

29 Sep '08

* mln/core/macros.hh (mln_citer, mln_citer_) (mln_fwd_citer, mln_fwd_citer_, mln_bkd_citer, mln_bkd_citer_) (mln_fiter, mln_fiter_) (mln_fwd_fiter, mln_fwd_fiter_, mln_bkd_fiter, mln_bkd_fiter_): Remove macros. * tests/topo/complex.cc: Adjust. --- milena/ChangeLog | 12 ++++++++++++ milena/mln/core/macros.hh | 36 ------------------------------------ milena/tests/topo/complex.cc | 4 ++-- 3 files changed, 14 insertions(+), 38 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 36b4640..77f42ad 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2008-09-29 Roland Levillain <roland(a)lrde.epita.fr> + Remove macros mln_*[cf]iter. + + * mln/core/macros.hh + (mln_citer, mln_citer_) + (mln_fwd_citer, mln_fwd_citer_, mln_bkd_citer, mln_bkd_citer_) + (mln_fiter, mln_fiter_) + (mln_fwd_fiter, mln_fwd_fiter_, mln_bkd_fiter, mln_bkd_fiter_): + Remove macros. + * tests/topo/complex.cc: Adjust. + +2008-09-29 Roland Levillain <roland(a)lrde.epita.fr> + Add (dynamic) iterators on n-faces. * mln/core/internal/p_complex_piter_base.hh diff --git a/milena/mln/core/macros.hh b/milena/mln/core/macros.hh index 5d6af75..b2cf7fc 100644 --- a/milena/mln/core/macros.hh +++ b/milena/mln/core/macros.hh @@ -49,12 +49,6 @@ // b -/// Shortcuts to access the bkd_citer type associated to T. -/// \{ -# define mln_bkd_citer(T) typename T::bkd_citer -# define mln_bkd_citer_(T) T::bkd_citer -/// \} - /// Shortcuts to access the element-backward-iterator type associated /// to T. /// \{ @@ -62,12 +56,6 @@ # define mln_bkd_eiter_(T) T::bkd_eiter /// \} -/// Shortcuts to access the (N-faces) bkd_fiter type associated to T. -/// \{ -# define mln_bkd_fiter(N, T) typename T::template bkd_fiter< N >::ret -# define mln_bkd_fiter_(N, T) T:: bkd_fiter< N >::ret -/// \} - /// Shortcuts to access the bkd_niter type associated to T. /// \{ # define mln_bkd_niter(T) typename T::bkd_niter @@ -101,12 +89,6 @@ // c -/// Shortcuts to access the citer type associated to T. -/// \{ -# define mln_citer(T) typename T::fwd_citer -# define mln_citer_(T) T::fwd_citer -/// \} - /// Shortcuts to access the coord type associated to T. /// \{ # define mln_coord(T) typename T::coord @@ -164,18 +146,6 @@ // f -/// Shortcuts to access the (N-faces) fiter type associated to T. -/// \{ -# define mln_fiter(N, T) typename T::template fwd_fiter< N >::ret -# define mln_fiter_(N, T) T:: fwd_fiter< N >::ret -/// \} - -/// Shortcuts to access the fwd_citer type associated to T. -/// \{ -# define mln_fwd_citer(T) typename T::fwd_citer -# define mln_fwd_citer_(T) T::fwd_citer -/// \} - /// Shortcuts to access the element-forward-iterator type associated /// to T. /// \{ @@ -183,12 +153,6 @@ # define mln_fwd_eiter_(T) T::fwd_eiter /// \} -/// Shortcuts to access the (N-faces) fwd_fiter type associated to T. -/// \{ -# define mln_fwd_fiter(N, T) typename T::template fwd_fiter< N >::ret -# define mln_fwd_fiter_(N, T) T:: fwd_fiter< N >::ret -/// \} - /// Shortcuts to access the fwd_niter type associated to T. /// \{ # define mln_fwd_niter(T) typename T::fwd_niter diff --git a/milena/tests/topo/complex.cc b/milena/tests/topo/complex.cc index 782bf97..deafb57 100644 --- a/milena/tests/topo/complex.cc +++ b/milena/tests/topo/complex.cc @@ -133,8 +133,8 @@ int main() // Iterators on a complex (not complex_image), or more precisely on // (all) the faces of complex C. - mln_fwd_citer_(topo::complex<D>) fwd_f(c); - mln_bkd_citer_(topo::complex<D>) bkd_f(c); + topo::face_fwd_iter<D> fwd_f(c); + topo::face_bkd_iter<D> bkd_f(c); for_all_2(fwd_f, bkd_f) std::cout << fwd_f << ' ' << bkd_f << std::endl; std::cout << std::endl; -- 1.5.6.5

1 0

2430: Add (dynamic) iterators on n-faces.
by Roland Levillain 29 Sep '08

29 Sep '08

* mln/core/internal/p_complex_piter_base.hh (mln::internal::p_complex_piter_base_<I, S, P, E>::iter_): Set to protected. * mln/core/site_set/p_n_faces_piter.hh): New file. Include it... * mln/core/site_set/p_complex.hh: ...here. * tests/core/image/complex_image.cc: Exercise iterators on n-faces. --- milena/ChangeLog | 13 ++ milena/mln/core/internal/p_complex_piter_base.hh | 2 - milena/mln/core/site_set/p_complex.hh | 1 + milena/mln/core/site_set/p_n_faces_piter.hh | 200 ++++++++++++++++++++++ milena/tests/core/image/complex_image.cc | 13 ++ 5 files changed, 227 insertions(+), 2 deletions(-) create mode 100644 milena/mln/core/site_set/p_n_faces_piter.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 8f404c2..36b4640 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,18 @@ 2008-09-29 Roland Levillain <roland(a)lrde.epita.fr> + Add (dynamic) iterators on n-faces. + + * mln/core/internal/p_complex_piter_base.hh + (mln::internal::p_complex_piter_base_<I, S, P, E>::iter_): + Set to protected. + * mln/core/site_set/p_n_faces_piter.hh): New file. + Include it... + * mln/core/site_set/p_complex.hh: ...here. + * tests/core/image/complex_image.cc: Exercise iterators on + n-faces. + +2008-09-29 Roland Levillain <roland(a)lrde.epita.fr> + Help the compiler not to mix up classes and methods. * mln/topo/face.hh (mln::topo::face<D>::face_data): diff --git a/milena/mln/core/internal/p_complex_piter_base.hh b/milena/mln/core/internal/p_complex_piter_base.hh index 41cc29d..d906011 100644 --- a/milena/mln/core/internal/p_complex_piter_base.hh +++ b/milena/mln/core/internal/p_complex_piter_base.hh @@ -96,8 +96,6 @@ namespace mln protected: /// The psite corresponding to this iterator. using super_::p_; - - private: /// The underlying complex iterator. iter iter_; }; diff --git a/milena/mln/core/site_set/p_complex.hh b/milena/mln/core/site_set/p_complex.hh index 06fc8b2..3ef413a 100644 --- a/milena/mln/core/site_set/p_complex.hh +++ b/milena/mln/core/site_set/p_complex.hh @@ -37,6 +37,7 @@ # include <mln/core/site_set/complex_psite.hh> # include <mln/core/site_set/p_complex_piter.hh> +# include <mln/core/site_set/p_n_faces_piter.hh> // FIXME: Disabled (moved to the attic). # if 0 # include <mln/core/site_set/p_complex_faces_piter.hh> diff --git a/milena/mln/core/site_set/p_n_faces_piter.hh b/milena/mln/core/site_set/p_n_faces_piter.hh new file mode 100644 index 0000000..bcf2149 --- /dev/null +++ b/milena/mln/core/site_set/p_n_faces_piter.hh @@ -0,0 +1,200 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_SITE_SET_P_N_FACES_PITER_HH +# define MLN_CORE_SITE_SET_P_N_FACES_PITER_HH + +/// \file mln/core/site_set/p_n_faces_piter.hh +/// \brief Definition of point iterator on the n-faces of a +/// complex-based pset. + +# include <mln/core/site_set/p_complex.hh> +# include <mln/core/internal/p_complex_piter_base.hh> +# include <mln/topo/n_face_iter.hh> + +/* FIXME: Maybe we could factor these iterators again, by introducing + an implementation class having methods n() and set_n(). */ + + +namespace mln +{ + + /*----------------------------. + | p_n_faces_fwd_piter<D, P>. | + `----------------------------*/ + + /// \brief Forward iterator on the n-faces sites of an + /// mln::p_complex<D, P>. + template <unsigned D, typename P> + class p_n_faces_fwd_piter + : public internal::p_complex_piter_base_< topo::n_face_fwd_iter<D>, + p_complex<D, P>, + P, + p_n_faces_fwd_piter<D, P> > + { + typedef p_n_faces_fwd_piter<D, P> self_; + typedef internal::p_complex_piter_base_< topo::n_face_fwd_iter<D>, + p_complex<D, P>, + P, + self_ > super_; + + public: + /// Construction and assignment. + /// \{ + p_n_faces_fwd_piter(); + p_n_faces_fwd_piter(const p_complex<D, P>& pc, unsigned n); + /// \} + + /// \brief Accessors. + /// + /// Shortcuts to face_'s accessors. + /// \{ + unsigned n() const; + void set_n (unsigned n); + /// \} + }; + + + /*----------------------------. + | p_n_faces_bkd_piter<D, P>. | + `----------------------------*/ + + /// \brief Backward iterator on the n-faces sites of an + /// mln::p_complex<D, P>. + template <unsigned D, typename P> + class p_n_faces_bkd_piter + /* FIXME: Rename internal::p_complex_piter_base_ to something else, + as it is also used for p_faces piters! */ + : public internal::p_complex_piter_base_< topo::n_face_bkd_iter<D>, + p_complex<D, P>, + P, + p_n_faces_bkd_piter<D, P> > + { + typedef p_n_faces_bkd_piter<D, P> self_; + typedef internal::p_complex_piter_base_< topo::n_face_bkd_iter<D>, + p_complex<D, P>, + P, + self_ > super_; + + public: + /// Construction and assignment. + /// \{ + p_n_faces_bkd_piter(); + p_n_faces_bkd_piter(const p_complex<D, P>& pc, unsigned n); + /// \} + + /// \brief Accessors. + /// + /// Shortcuts to face_'s accessors. + /// \{ + unsigned n() const; + void set_n (unsigned n); + /// \} + }; + + + +# ifndef MLN_INCLUDE_ONLY + + /*----------------------------. + | p_n_faces_fwd_piter<D, P>. | + `----------------------------*/ + + template <unsigned D, typename P> + inline + p_n_faces_fwd_piter<D, P>::p_n_faces_fwd_piter() + { + } + + template <unsigned D, typename P> + inline + p_n_faces_fwd_piter<D, P>::p_n_faces_fwd_piter(const p_complex<D, P>& pc, + unsigned n) + : super_(pc) + { + mln_precondition(n <= D); + set_n(n); + } + + template <unsigned D, typename P> + inline + unsigned + p_n_faces_fwd_piter<D, P>::n() const + { + return this->iter_.n(); + } + + template <unsigned D, typename P> + inline + void + p_n_faces_fwd_piter<D, P>::set_n (unsigned n) + { + this->iter_.set_n(n); + } + + + /*----------------------------. + | p_n_faces_bkd_piter<D, P>. | + `----------------------------*/ + + template <unsigned D, typename P> + inline + p_n_faces_bkd_piter<D, P>::p_n_faces_bkd_piter() + { + } + + template <unsigned D, typename P> + inline + p_n_faces_bkd_piter<D, P>::p_n_faces_bkd_piter(const p_complex<D, P>& pc, + unsigned n) + : super_(pc) + { + mln_precondition(n <= D); + set_n(n); + } + + template <unsigned D, typename P> + inline + unsigned + p_n_faces_bkd_piter<D, P>::n() const + { + return this->iter_.n(); + } + + template <unsigned D, typename P> + inline + void + p_n_faces_bkd_piter<D, P>::set_n (unsigned n) + { + this->iter_.set_n(n); + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of mln + +#endif // ! MLN_CORE_SITE_SET_P_N_FACES_PITER_HH diff --git a/milena/tests/core/image/complex_image.cc b/milena/tests/core/image/complex_image.cc index 47233cb..59eba87 100644 --- a/milena/tests/core/image/complex_image.cc +++ b/milena/tests/core/image/complex_image.cc @@ -164,6 +164,19 @@ int main() // Iterators on n-faces (with n fixed in [0, D]). // // ----------------------------------------------- // + // Dynamic version. + for (unsigned n = 0; n <= D; ++n) + { + p_n_faces_fwd_piter<D, point2d> fwd_np(ima.domain(), n); + p_n_faces_bkd_piter<D, point2d> bkd_np(ima.domain(), n); + for_all_2(fwd_np, bkd_np) + std::cout << "ima(" << fwd_np << ") = " << ima(fwd_np) << '\t' + << "ima(" << bkd_np << ") = " << ima(bkd_np) + << std::endl; + std::cout << std::endl; + } + + // Static version. // FIXME: Disabled (moved to the attic). # if 0 // FIXME: Sugar the name of the iterator. -- 1.5.6.5

1 0