- Olena-patches

cleanup-2008 2425: Update documentation about the image value properties.
by Nicolas Ballas 29 Sep '08

29 Sep '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> Update documentation about the image value properties. * doc/technical/designs/properties/values.txt: Update. values.txt | 65 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 32 insertions(+), 33 deletions(-) Index: doc/technical/designs/properties/values.txt --- doc/technical/designs/properties/values.txt (revision 2425) +++ doc/technical/designs/properties/values.txt (working copy) @@ -3,12 +3,12 @@ Values related properties -* TODO - -> Are the properties related to the values sufficiant? - -> What are the interface related to each value property? +* What is this file about + -> Are the image properties about the values sufficient/correct? + -> What are the piece of interface related to each property? -> How these values properties affect the fill/paste/transform process? -* Values properties list: +* Image values properties: ** value_access: /any/ | @@ -33,12 +33,12 @@ value_storage == singleton => ima.value() -> return the image value - value_storage == one_block + value_storage == one_block (what about the fastest image?) => image.nelements() -> return the number of elements in memory => image.buffer() -> return the start adress of the ima buffer value_storage == piece_wise - //FIXME + // runs iterator? ** value_browsing:/any/ | @@ -55,7 +55,7 @@ => ima.values_taken() -> return the current values taken by ima => ima.change_value(oldVal, newVal) -> change the value oldVal to newVal - => ima.change_values(f) -> apply f (a function v2v) to all the + => ima.apply(f) -> apply f (a function v2v) to all the values => ima.sites(v) -> return the sites associated to the value v @@ -68,9 +68,11 @@ +* Impact on the fill and paste algorithms +** fill -* fill (depends on the value_storage property) +Fill an image ima with a value v. *** values_storage == oneblock // Replace by Memcopy? @@ -78,12 +80,10 @@ mln_value(I)* ptr = ima.buffer(); for (unsigned i = 0; i < n; ++i) *ptr++ = val; - **** Method related -> nelements -> buffer - *** value_storage == piece_wise // MemCopy on the runs? for (ungsigned i = 0; i < ima.nruns(); ++i) @@ -91,23 +91,37 @@ **** Method related: nruns ??? - -*** value_storage == any && value_browsing == value_wise - +*** value_browsing == value_wise // direct access to the value mln_viter(mln_taken_values(I)) viter(I.taken_values(); for_all(viter); ima.changes_values(viter, v); - **** Method related: -> iterator on value taken -> change_values -*** Generic case: all the other case +*** generic case mln_piter(I) p(ima.domain()); for_all(p) ima(p) = v; +** Paste + +Paste value data from an image source to destination. + +*** values_storage == oneblock (for source an destination) +// Replace by Memcopy? +const unsigned n = ima.nelements(); +mln_value(I)* ptr_src = source.buffer(); +mln_value(I)* ptr_dest = destination.buffer(); +for (unsigned i = 0; i < n; ++i) + *ptr_src++ = *ptr_dest++; + + +*** generic case +mln_piter(I) p(source.domain()); +for_all(p) + destination(p) = source(p); * To keep in Mind @@ -147,22 +161,7 @@ -differentiate the localization of an image and its storage method. -* Image related with 'special' values access - -** Run Images (sparce, value_encoded) - -=> fill: *cpt++ = v sur chaque run -| -+-> related to memory storage - -** Pkey Images - -=> change_value - - - -* Note +** Image related with 'special' values access -- Cell access and Value access wise property depends on the image - --> property related: - cell-wise and value wise +*** Run Images (sparse, value_encoded) +*** Pkey Images

1 0

2425: * tests/topo/complex.cc (test_static_n_face_iter): Aesthetic changes.
by Roland Levillain 26 Sep '08

26 Sep '08

--- milena/ChangeLog | 4 ++++ milena/tests/topo/complex.cc | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d5309e4..44b8b7a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> + * tests/topo/complex.cc (test_static_n_face_iter): Aesthetic changes. + +2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> + Add iterators on n-faces (with a dynamically known `n'). * mln/topo/n_face_iter.hh: New. diff --git a/milena/tests/topo/complex.cc b/milena/tests/topo/complex.cc index 16099f5..59d6047 100644 --- a/milena/tests/topo/complex.cc +++ b/milena/tests/topo/complex.cc @@ -321,10 +321,10 @@ test_static_n_face_iter(topo::complex<D>& c) /* FIXME: Provide sugar. Maybe redefined mln_fwd_fiter and mln_bkd_fiter so that they expand as complex_faces_iters (instead of faces_iters). */ - topo::static_n_face_fwd_iter<N, D> fwd_ncf(c); - topo::static_n_face_bkd_iter<N, D> bkd_ncf(c); - for_all_2(fwd_ncf, bkd_ncf) - std::cout << fwd_ncf << ' ' << bkd_ncf << std::endl; + topo::static_n_face_fwd_iter<N, D> fwd_nf(c); + topo::static_n_face_bkd_iter<N, D> bkd_nf(c); + for_all_2(fwd_nf, bkd_nf) + std::cout << fwd_nf << ' ' << bkd_nf << std::endl; std::cout << std::endl; } -- 1.6.0.1

1 0

2424: Add iterators on n-faces (with a dynamically known `n').
by Roland Levillain 26 Sep '08

26 Sep '08

* mln/topo/n_face_iter.hh: New. * mln/topo/complex.hh: Include mln/topo/n_face_iter.hh. * tests/topo/complex.cc: Exercise n_face_fwd_iter and n_face_bkd_iter. --- milena/ChangeLog | 9 ++ milena/mln/topo/complex.hh | 1 + milena/mln/topo/n_face_iter.hh | 311 ++++++++++++++++++++++++++++++++++++++++ milena/tests/topo/complex.cc | 33 +++-- 4 files changed, 345 insertions(+), 9 deletions(-) create mode 100644 milena/mln/topo/n_face_iter.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 4d9412b..d5309e4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> + Add iterators on n-faces (with a dynamically known `n'). + + * mln/topo/n_face_iter.hh: New. + * mln/topo/complex.hh: Include mln/topo/n_face_iter.hh. + * tests/topo/complex.cc: Exercise n_face_fwd_iter and + n_face_bkd_iter. + +2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> + Revive iterators on n-faces (with a statically known `n'). * mln/topo/attic/complex_faces_iter.hh: Rename as... diff --git a/milena/mln/topo/complex.hh b/milena/mln/topo/complex.hh index 61ce84b..13e21d0 100644 --- a/milena/mln/topo/complex.hh +++ b/milena/mln/topo/complex.hh @@ -49,6 +49,7 @@ # 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 diff --git a/milena/mln/topo/n_face_iter.hh b/milena/mln/topo/n_face_iter.hh new file mode 100644 index 0000000..1156707 --- /dev/null +++ b/milena/mln/topo/n_face_iter.hh @@ -0,0 +1,311 @@ +// 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_N_FACE_ITER_HH +# define MLN_TOPO_N_FACE_ITER_HH + +/// \file mln/topo/n_face_iter.hh +/// \brief Definition of forward and backward iterators on all the +/// \a n-faces of a complex, \a n being a dynamic value. + +# include <mln/topo/internal/complex_iter_base.hh> +# include <mln/topo/face.hh> + +// FIXME: Factor a bit more? (Using complex_iter_base.) + +// FIXME: Rename the old commplex_faces_{fwd,bkd}_iter as +// static_n_face_{fwd,bkd}_iter. + + +namespace mln +{ + + namespace topo + { + + // Forward declaration. + template <unsigned D> class complex; + + + /*---------------------------. + | topo::n_face_fwd_iter<D>. | + `---------------------------*/ + + /// \brief Forward iterator on all the faces of an mln::complex<D>. + /// + /// \arg \p D The dimension of the complex this iterator belongs to. + template <unsigned D> + class n_face_fwd_iter + : public internal::complex_iter_base< face<D>, n_face_fwd_iter<D> > + { + public: + /// Type of associated face. + typedef face<D> face; + + private: + typedef n_face_fwd_iter<D> self_; + typedef internal::complex_iter_base< face, self_ > super_; + + public: + using super_::is_valid; + using super_::invalidate; + + public: + /// Construction and assignment. + /// \{ + n_face_fwd_iter(); + // FIXME: See comment in internal::complex_iter_base's default ctor + n_face_fwd_iter(complex<D>& c, unsigned n); + /// \} + + /// Manipulation. + /// \{ + /// Test if the iterator is valid. + void start(); + /// Go to the next point. + void next_(); + /// \} + + /// \brief Accessors. + /// + /// Shortcuts to face_'s accessors. + /// \{ + unsigned n() const; + void set_n (unsigned n); + /// \} + + private: + using super_::face_; + }; + + + /*---------------------------. + | topo::n_face_bkd_iter<D>. | + `---------------------------*/ + + /// \brief Backward iterator on all the faces of an mln::complex<D>. + /// + /// \arg \p D The dimension of the complex this iterator belongs to. + template <unsigned D> + class n_face_bkd_iter + : public internal::complex_iter_base< face<D>, n_face_bkd_iter<D> > + { + public: + /// Type of associated face. + typedef face<D> face; + + private: + typedef n_face_bkd_iter<D> self_; + typedef internal::complex_iter_base< face, self_ > super_; + + public: + using super_::is_valid; + using super_::invalidate; + + public: + /// Construction and assignment. + /// \{ + n_face_bkd_iter(); + // FIXME: See comment in internal::complex_iter_base's default ctor + n_face_bkd_iter(complex<D>& c, unsigned n); + /// \} + + /// Manipulation. + /// \{ + /// Start an iteration. + void start(); + /// Go to the next point. + void next_(); + /// \} + + /// \brief Accessors. + /// + /// Shortcuts to face_'s accessors. + /// \{ + unsigned n() const; + void set_n (unsigned n); + /// \} + + private: + using super_::face_; + }; + + + +# ifndef MLN_INCLUDE_ONLY + + /*---------------------------. + | topo::n_face_fwd_iter<D>. | + `---------------------------*/ + + template <unsigned D> + inline + n_face_fwd_iter<D>::n_face_fwd_iter() + : super_() + { + } + + template <unsigned D> + inline + n_face_fwd_iter<D>::n_face_fwd_iter(complex<D>& c, unsigned n) + : super_(c) + { + mln_precondition(n <= D); + set_cplx(c); + set_n(n); + mln_postcondition(!is_valid()); + } + + template <unsigned D> + inline + void + n_face_fwd_iter<D>::start() + { + face_.set_face_id(0u); + } + + template <unsigned D> + inline + void + n_face_fwd_iter<D>::next_() + { + if (is_valid()) + { + unsigned face_id = face_.face_id(); + // The number of faces of dimension N in cplx_. + unsigned nn_faces = face_.cplx().nfaces(n()); + if (face_id + 1 < nn_faces) + /* FIXME: Provide accessor face::face_id() returning + a mutable reference? This way, we could just write + + ++face_.face_id(); + + instead of the following. + + Or add {inc,add}_face_id() services. */ + face_.set_face_id(face_id + 1); + else + invalidate(); + } + } + + template <unsigned D> + inline + unsigned + n_face_fwd_iter<D>::n() const + { + return face_.n(); + } + + template <unsigned D> + inline + void + n_face_fwd_iter<D>::set_n(unsigned n) + { + mln_precondition(n <= D); + face_.set_n(n); + } + + + /*---------------------------. + | topo::n_face_bkd_iter<D>. | + `---------------------------*/ + + template <unsigned D> + inline + n_face_bkd_iter<D>::n_face_bkd_iter() + : super_() + { + } + + template <unsigned D> + inline + n_face_bkd_iter<D>::n_face_bkd_iter(complex<D>& c, unsigned n) + : super_(c) + { + mln_precondition(n <= D); + set_cplx(c); + set_n(n); + mln_postcondition(!is_valid()); + } + + template <unsigned D> + inline + void + n_face_bkd_iter<D>::start() + { + face_.set_n(n()); + face_.set_face_id(face_.cplx().nfaces(n()) - 1); + } + + template <unsigned D> + inline + void + n_face_bkd_iter<D>::next_() + { + if (is_valid()) + { + unsigned face_id = face_.face_id(); + if (face_id > 0) + /* FIXME: Provide accessor face::face_id() returning + a mutable reference? This way, we could just write + + ++face_.face_id(); + + instead of the following. + + Or add {inc,add}_face_id() services. */ + face_.set_face_id(face_id - 1); + else + invalidate(); + } + } + + template <unsigned D> + inline + unsigned + n_face_bkd_iter<D>::n() const + { + return face_.n(); + } + + template <unsigned D> + inline + void + n_face_bkd_iter<D>::set_n(unsigned n) + { + mln_precondition(n <= D); + face_.set_n(n); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::topo + +} // end of namespace mln + +#endif // ! MLN_TOPO_N_FACE_ITER_HH diff --git a/milena/tests/topo/complex.cc b/milena/tests/topo/complex.cc index 4d220e7..16099f5 100644 --- a/milena/tests/topo/complex.cc +++ b/milena/tests/topo/complex.cc @@ -148,6 +148,18 @@ int main() actual complex processing since they are not really flexible --- but I'm not sure. */ + // Dynamic version. + for (unsigned n = 0; n <= D; ++n) + { + topo::n_face_fwd_iter<D> fwd_nf(c, n); + topo::n_face_fwd_iter<D> bkd_nf(c, n); + std::cout << "test (dynamic) n_face_iters (n = " << n << "):" + << std::endl; + for_all_2(fwd_nf, bkd_nf) + std::cout << fwd_nf << ' ' << bkd_nf << std::endl; + std::cout << std::endl; + } + // Static version. test_static_n_face_iter<0>(c); test_static_n_face_iter<1>(c); @@ -200,15 +212,21 @@ int main() ----------------------------------------------------------------- Name Definition ----------------------------------------------------------------- - complex<D> General complex + 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_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 + 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. ----------------------------------------------------------------- @@ -224,9 +242,6 @@ int main() ----------------------------------------------------------------- Name Definition ----------------------------------------------------------------- - n_faces_fwd_iter<D>(c) | Iterators on n-faces, - n_faces_bkd_iter<D>(c) | n being dynamic - adj_lower_faces_fwd_iter<D>(c, f) | Iterators on the adjacent adj_lower_faces_bkd_iter<D>(c, f) | (lower) (n-1)-faces of the | n-face f of the complex c, -- 1.6.0.1

1 0

2423: Revive iterators on n-faces (with a statically known `n').
by Roland Levillain 26 Sep '08

26 Sep '08

* mln/topo/attic/complex_faces_iter.hh: Rename as... * mln/topo/static_n_face_iter.hh: ...this. (mln::topo::complex_faces_fwd_iter_<N, D>) (mln::topo::complex_faces_bkd_iter_<N, D>): Rename as... (static_n_face_fwd_iter) (static_n_face_bkd_iter): ...these. Adjust file layout. * mln/topo/complex.hh: Include mln/topo/static_n_face_iter.hh. * tests/topo/complex.cc (test_complex_faces_iter): Rename as... (test_static_n_face_iter): ...this. Adjust to static_n_face_fwd_iter and static_n_face_bkd_iter. (main): Exercise static_n_face_fwd_iter and static_n_face_bkd_iter. (test_faces_iter): Really disable this funcion. --- milena/ChangeLog | 21 +++++ milena/mln/topo/complex.hh | 2 +- ...complex_faces_iter.hh => static_n_face_iter.hh} | 86 ++++++++++---------- milena/tests/topo/complex.cc | 54 +++++++------ 4 files changed, 94 insertions(+), 69 deletions(-) rename milena/mln/topo/{attic/complex_faces_iter.hh => static_n_face_iter.hh} (72%) diff --git a/milena/ChangeLog b/milena/ChangeLog index d469c21..4d9412b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,26 @@ 2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> + Revive iterators on n-faces (with a statically known `n'). + + * mln/topo/attic/complex_faces_iter.hh: Rename as... + * mln/topo/static_n_face_iter.hh: ...this. + (mln::topo::complex_faces_fwd_iter_<N, D>) + (mln::topo::complex_faces_bkd_iter_<N, D>): + Rename as... + (static_n_face_fwd_iter) + (static_n_face_bkd_iter): + ...these. + Adjust file layout. + * mln/topo/complex.hh: Include mln/topo/static_n_face_iter.hh. + * tests/topo/complex.cc (test_complex_faces_iter): Rename as... + (test_static_n_face_iter): ...this. + Adjust to static_n_face_fwd_iter and static_n_face_bkd_iter. + (main): Exercise static_n_face_fwd_iter and + static_n_face_bkd_iter. + (test_faces_iter): Really disable this funcion. + +2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> + Adjust paths of included files in the attic. * mln/core/site_set/attic/p_complex_faces_piter.hh, diff --git a/milena/mln/topo/complex.hh b/milena/mln/topo/complex.hh index e49f513..61ce84b 100644 --- a/milena/mln/topo/complex.hh +++ b/milena/mln/topo/complex.hh @@ -49,10 +49,10 @@ # include <mln/topo/n_faces_set.hh> # include <mln/topo/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> -# include <mln/topo/complex_faces_iter.hh> # endif namespace mln diff --git a/milena/mln/topo/attic/complex_faces_iter.hh b/milena/mln/topo/static_n_face_iter.hh similarity index 72% rename from milena/mln/topo/attic/complex_faces_iter.hh rename to milena/mln/topo/static_n_face_iter.hh index c0d278c..2146310 100644 --- a/milena/mln/topo/attic/complex_faces_iter.hh +++ b/milena/mln/topo/static_n_face_iter.hh @@ -25,20 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_TOPO_COMPLEX_FACES_ITER_HH -# define MLN_TOPO_COMPLEX_FACES_ITER_HH +#ifndef MLN_TOPO_STATIC_N_FACE_ITER_HH +# define MLN_TOPO_STATIC_N_FACE_ITER_HH -/// \file mln/topo/complex_faces_iter.hh -/// \brief Definition of forward and backward iterators on the n-faces -/// of a complex. +/// \file mln/topo/static_n_face_iter.hh +/// \brief Definition of forward and backward iterators on all the +/// \p N-faces of a complex, \p N being a static value. # include <mln/topo/internal/complex_iter_base.hh> # include <mln/topo/face.hh> -/* FIXME: Should we drop N from the signature of these iterators? - I.e., have N be dynamic? Or better: provide other iterators where - N is dynamic? */ - namespace mln { @@ -46,25 +42,26 @@ namespace mln namespace topo { - /*--------------------------------------. - | topo::complex_faces_fwd_iter_<N, D>. | - `--------------------------------------*/ + /*-------------------------------------. + | topo::static_n_face_fwd_iter<N, D>. | + `-------------------------------------*/ - /// \brief Forward iterator on all the faces of a mln::complex<D>. + /// \brief Forward iterator on all the \p N-faces of a + /// mln::complex<D>. /// /// \arg \p N The dimension of the face associated to this iterator. /// \arg \p D The dimension of the complex this iterator belongs to. template <unsigned N, unsigned D> - class complex_faces_fwd_iter_ + class static_n_face_fwd_iter : public internal::complex_iter_base< face<D>, - complex_faces_fwd_iter_<N, D> > + static_n_face_fwd_iter<N, D> > { public: /// Type of associated face. typedef face<D> face; private: - typedef complex_faces_fwd_iter_<N, D> self_; + typedef static_n_face_fwd_iter<N, D> self_; typedef internal::complex_iter_base< face, self_ > super_; public: @@ -74,9 +71,9 @@ namespace mln public: /// Construction and assignment. /// \{ - complex_faces_fwd_iter_(); + static_n_face_fwd_iter(); // FIXME: See comment in internal::complex_iter_base's default ctor - complex_faces_fwd_iter_(complex<D>& c); + static_n_face_fwd_iter(complex<D>& c); /// \} /// Manipulation. @@ -92,25 +89,26 @@ namespace mln }; - /*--------------------------------------. - | topo::complex_faces_bkd_iter_<N, D>. | - `--------------------------------------*/ + /*-------------------------------------. + | topo::static_n_face_bkd_iter<N, D>. | + `-------------------------------------*/ - /// \brief Backward iterator on all the faces of a mln::complex<D>. + /// \brief Backward iterator on all the \p N-faces of a + /// mln::complex<D>. /// /// \arg \p N The dimension of the face associated to this iterator. /// \arg \p D The dimension of the complex this iterator belongs to. template <unsigned N, unsigned D> - class complex_faces_bkd_iter_ + class static_n_face_bkd_iter : public internal::complex_iter_base< face<D>, - complex_faces_bkd_iter_<N, D> > + static_n_face_bkd_iter<N, D> > { public: /// Type of associated face. typedef face<D> face; private: - typedef complex_faces_bkd_iter_<N, D> self_; + typedef static_n_face_bkd_iter<N, D> self_; typedef internal::complex_iter_base< face, self_ > super_; public: @@ -120,9 +118,9 @@ namespace mln public: /// Construction and assignment. /// \{ - complex_faces_bkd_iter_(); + static_n_face_bkd_iter(); // FIXME: See comment in internal::complex_iter_base's default ctor - complex_faces_bkd_iter_(complex<D>& c); + static_n_face_bkd_iter(complex<D>& c); /// \} /// Manipulation. @@ -141,13 +139,13 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - /*--------------------------------------. - | topo::complex_faces_fwd_iter_<N, D>. | - `--------------------------------------*/ + /*-------------------------------------. + | topo::static_n_face_fwd_iter<N, D>. | + `-------------------------------------*/ template <unsigned N, unsigned D> inline - complex_faces_fwd_iter_<N, D>::complex_faces_fwd_iter_() + static_n_face_fwd_iter<N, D>::static_n_face_fwd_iter() : super_() { // Ensure N is compatible with D. @@ -158,7 +156,7 @@ namespace mln template <unsigned N, unsigned D> inline - complex_faces_fwd_iter_<N, D>::complex_faces_fwd_iter_(complex<D>& c) + static_n_face_fwd_iter<N, D>::static_n_face_fwd_iter(complex<D>& c) : super_(c) { // Ensure N is compatible with D. @@ -170,7 +168,7 @@ namespace mln template <unsigned N, unsigned D> inline void - complex_faces_fwd_iter_<N, D>::start() + static_n_face_fwd_iter<N, D>::start() { face_.set_face_id(0u); } @@ -178,12 +176,14 @@ namespace mln template <unsigned N, unsigned D> inline void - complex_faces_fwd_iter_<N, D>::next_() + static_n_face_fwd_iter<N, D>::next_() { if (is_valid()) { unsigned face_id = face_.face_id(); - if (face_id + 1 < face_.cplx().template nfaces<N>()) + // The number of faces of dimension N in cplx_. + unsigned nn_faces = face_.cplx().template nfaces<N>(); + if (face_id + 1 < nn_faces) /* FIXME: Provide accessor face::face_id() returning a mutable reference? This way, we could just write @@ -200,13 +200,13 @@ namespace mln } - /*--------------------------------------. - | topo::complex_faces_bkd_iter_<N, D>. | - `--------------------------------------*/ + /*-------------------------------------. + | topo::static_n_face_bkd_iter<N, D>. | + `-------------------------------------*/ template <unsigned N, unsigned D> inline - complex_faces_bkd_iter_<N, D>::complex_faces_bkd_iter_() + static_n_face_bkd_iter<N, D>::static_n_face_bkd_iter() : super_() { // Ensure N is compatible with D. @@ -217,7 +217,7 @@ namespace mln template <unsigned N, unsigned D> inline - complex_faces_bkd_iter_<N, D>::complex_faces_bkd_iter_(complex<D>& c) + static_n_face_bkd_iter<N, D>::static_n_face_bkd_iter(complex<D>& c) : super_(c) { // Ensure N is compatible with D. @@ -229,7 +229,7 @@ namespace mln template <unsigned N, unsigned D> inline void - complex_faces_bkd_iter_<N, D>::start() + static_n_face_bkd_iter<N, D>::start() { face_.set_face_id(face_.cplx().template nfaces<N>() - 1); } @@ -237,7 +237,7 @@ namespace mln template <unsigned N, unsigned D> inline void - complex_faces_bkd_iter_<N, D>::next_() + static_n_face_bkd_iter<N, D>::next_() { if (is_valid()) { @@ -264,4 +264,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_TOPO_COMPLEX_FACES_ITER_HH +#endif // ! MLN_TOPO_STATIC_N_FACE_ITER_HH diff --git a/milena/tests/topo/complex.cc b/milena/tests/topo/complex.cc index 3319813..4d220e7 100644 --- a/milena/tests/topo/complex.cc +++ b/milena/tests/topo/complex.cc @@ -35,9 +35,14 @@ using namespace mln; -// Forward declaration. -template <unsigned N, unsigned D> void test_faces_iter(topo::complex<D>& c); -template <unsigned N, unsigned D> void test_complex_faces_iter(topo::complex<D>& c); +// Forward declarations. +template <unsigned N, unsigned D> +void test_static_n_face_iter(topo::complex<D>& c); +// FIXME: Disabled (moved to the attic). +#if 0 +template <unsigned N, unsigned D> +void test_faces_iter(topo::complex<D>& c); +#endif int main() @@ -143,6 +148,11 @@ int main() actual complex processing since they are not really flexible --- but I'm not sure. */ + // Static version. + test_static_n_face_iter<0>(c); + test_static_n_face_iter<1>(c); + test_static_n_face_iter<2>(c); + // FIXME: Disabled (moved to the attic). # if 0 /* Using faces_{fwd,bkd}_iter_<N, D>, which are proxies to @@ -150,12 +160,6 @@ int main() test_faces_iter<0>(c); test_faces_iter<1>(c); test_faces_iter<2>(c); - - /* Using complex_faces_{fwd,bkd}_iter_<N, D>, which are proxies to - faces<N>. */ - test_complex_faces_iter<0>(c); - test_complex_faces_iter<1>(c); - test_complex_faces_iter<2>(c); #endif /*------------------------------. @@ -293,6 +297,22 @@ int main() } +template <unsigned N, unsigned D> +void +test_static_n_face_iter(topo::complex<D>& c) +{ + std::cout << "test_static_n_face_iter<" << N << ", " << D << ">:" + << std::endl; + /* FIXME: Provide sugar. Maybe redefined mln_fwd_fiter and + mln_bkd_fiter so that they expand as complex_faces_iters (instead + of faces_iters). */ + topo::static_n_face_fwd_iter<N, D> fwd_ncf(c); + topo::static_n_face_bkd_iter<N, D> bkd_ncf(c); + for_all_2(fwd_ncf, bkd_ncf) + std::cout << fwd_ncf << ' ' << bkd_ncf << std::endl; + std::cout << std::endl; +} + // FIXME: Disabled (moved to the attic). # if 0 template <unsigned N, unsigned D> @@ -307,20 +327,4 @@ test_faces_iter(topo::complex<D>& c) std::cout << fwd_nf << ' ' << bkd_nf << std::endl; std::cout << std::endl; } - -template <unsigned N, unsigned D> -void -test_complex_faces_iter(topo::complex<D>& c) -{ - std::cout << "test_complex_faces_iter<" << N << ", " << D << ">:" - << std::endl; - /* FIXME: Provide sugar. Maybe redefined mln_fwd_fiter and - mln_bkd_fiter so that they expand as complex_faces_iters (instead - of faces_iters). */ - topo::complex_faces_fwd_iter_<N, D> fwd_ncf(c); - topo::complex_faces_bkd_iter_<N, D> bkd_ncf(c); - for_all_2(fwd_ncf, bkd_ncf) - std::cout << fwd_ncf << ' ' << bkd_ncf << std::endl; - std::cout << std::endl; -} #endif -- 1.6.0.1

1 0

2422: Adjust paths of included files in the attic.
by Roland Levillain 26 Sep '08

26 Sep '08

* mln/core/site_set/attic/p_complex_faces_piter.hh, * mln/core/site_set/attic/p_faces_piter.hh: Do it. --- milena/ChangeLog | 8 ++++++++ .../core/site_set/attic/p_complex_faces_piter.hh | 2 +- milena/mln/core/site_set/attic/p_faces_piter.hh | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 77d210c..d469c21 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> + Adjust paths of included files in the attic. + + * mln/core/site_set/attic/p_complex_faces_piter.hh, + * mln/core/site_set/attic/p_faces_piter.hh: + Do it. + +2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> + Remove useless copy ctors and assignment operators in face handles. * mln/topo/face.hh, mln/topo/n_face.hh diff --git a/milena/mln/core/site_set/attic/p_complex_faces_piter.hh b/milena/mln/core/site_set/attic/p_complex_faces_piter.hh index de10d54..59ab7b4 100644 --- a/milena/mln/core/site_set/attic/p_complex_faces_piter.hh +++ b/milena/mln/core/site_set/attic/p_complex_faces_piter.hh @@ -37,7 +37,7 @@ # include <mln/core/site_set/p_complex.hh> # include <mln/core/internal/p_complex_piter_base.hh> -# include <mln/topo/complex_faces_iter.hh> +# include <mln/topo/attic/complex_faces_iter.hh> /* FIXME: p_complex_faces_fwd_piter_ and p_complex_faces_bkd_piter_ are really long names: find something shorter. */ diff --git a/milena/mln/core/site_set/attic/p_faces_piter.hh b/milena/mln/core/site_set/attic/p_faces_piter.hh index bfd1031..4f28082 100644 --- a/milena/mln/core/site_set/attic/p_faces_piter.hh +++ b/milena/mln/core/site_set/attic/p_faces_piter.hh @@ -36,7 +36,7 @@ # include <mln/core/site_set/p_faces.hh> # include <mln/core/internal/p_complex_piter_base.hh> -# include <mln/topo/faces_iter.hh> +# include <mln/topo/attic/faces_iter.hh> namespace mln -- 1.6.0.1

1 0

2421: Remove useless copy ctors and assignment operators in face handles.
by Roland Levillain 26 Sep '08

26 Sep '08

* mln/topo/face.hh, mln/topo/n_face.hh (mln::face<D>::face(const face<D>&)) (mln::n_face<N, D>::n_face(const n_face<N, D>&)): Remove copy ctors. (mln::face<D>::operator=(const face<D>&)) (mln::n_face<N, D>::operator=(const n_face<N, D>&)): Remove assignment operators. --- milena/ChangeLog | 12 ++++++++++++ milena/mln/topo/face.hh | 28 ---------------------------- milena/mln/topo/n_face.hh | 29 ----------------------------- 3 files changed, 12 insertions(+), 57 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6269489..77d210c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> + Remove useless copy ctors and assignment operators in face handles. + + * mln/topo/face.hh, mln/topo/n_face.hh + (mln::face<D>::face(const face<D>&)) + (mln::n_face<N, D>::n_face(const n_face<N, D>&)): + Remove copy ctors. + (mln::face<D>::operator=(const face<D>&)) + (mln::n_face<N, D>::operator=(const n_face<N, D>&)): + Remove assignment operators. + +2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> + Adjust complex piters w.r.t. new names of iterators on complex faces. * mln/core/site_set/p_complex_piter.hh: diff --git a/milena/mln/topo/face.hh b/milena/mln/topo/face.hh index 136271c..b35f6c7 100644 --- a/milena/mln/topo/face.hh +++ b/milena/mln/topo/face.hh @@ -70,13 +70,6 @@ namespace mln template <unsigned N> face(const n_face<N, D>& f); - // FIXME: Probably useless. - /// Copy and assignment. - /// \{ - face(const face<D>& rhs); - face<D>& operator=(const face<D>& rhs); - /// \} - /// Is this handle valid? bool is_valid() const; /// Invalidate this handle. @@ -176,27 +169,6 @@ namespace mln template <unsigned D> inline - face<D>::face(const face<D>& rhs) - : cplx_(rhs.cplx_), n_(rhs.n_), face_id_(rhs.face_id_) - { - } - - template <unsigned D> - inline - face<D>& - face<D>::operator=(const face<D>& rhs) - { - if (&rhs != this) - { - cplx_ = rhs.cplx_; - n_ = rhs.n_; - face_id_ = rhs.face_id_; - } - return *this; - } - - template <unsigned D> - inline bool face<D>::is_valid() const { diff --git a/milena/mln/topo/n_face.hh b/milena/mln/topo/n_face.hh index afeb4ab..e243cc6 100644 --- a/milena/mln/topo/n_face.hh +++ b/milena/mln/topo/n_face.hh @@ -66,13 +66,6 @@ namespace mln /// Build a face handle from \a complex and \a face_id. n_face(complex<D>& complex, unsigned face_id); - // FIXME: Probably useless. - /// Copy and assignment. - /// \{ - n_face(const n_face<N, D>& rhs); - n_face<N, D>& operator=(const n_face<N, D>& rhs); - /// \} - /// Is this handle valid? bool is_valid() const; /// Invalidate this handle. @@ -160,28 +153,6 @@ namespace mln template <unsigned N, unsigned D> inline - n_face<N, D>::n_face(const n_face<N, D>& rhs) - : cplx_(rhs.cplx_), face_id_(rhs.face_id_) - { - // Ensure N is compatible with D. - metal::bool_< N <= D >::check(); - } - - template <unsigned N, unsigned D> - inline - n_face<N, D>& - n_face<N, D>::operator=(const n_face<N, D>& rhs) - { - if (&rhs != this) - { - cplx_ = rhs.cplx_; - face_id_ = rhs.face_id_; - } - return *this; - } - - template <unsigned N, unsigned D> - inline bool n_face<N, D>::is_valid() const { -- 1.6.0.1

1 0

2420: Adjust complex piters w.r.t. new names of iterators on complex faces.
by Roland Levillain 26 Sep '08

26 Sep '08

* mln/core/site_set/p_complex_piter.hh: s/topo::complex_fwd_iter_/topo::face_fwd_iter/ s/topo::complex_bkd_iter_/topo::face_bkd_iter/ Update included header's name. --- milena/ChangeLog | 9 +++++++++ milena/mln/core/site_set/p_complex_piter.hh | 10 +++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e2d0609..6269489 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> + Adjust complex piters w.r.t. new names of iterators on complex faces. + + * mln/core/site_set/p_complex_piter.hh: + s/topo::complex_fwd_iter_/topo::face_fwd_iter/ + s/topo::complex_bkd_iter_/topo::face_bkd_iter/ + Update included header's name. + +2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> + Rename topo::complex_{fwd,bkd}_iter_ as topo::face_{fwd,bkd}_iter. * mln/topo/complex_iter.hh: Rename as... diff --git a/milena/mln/core/site_set/p_complex_piter.hh b/milena/mln/core/site_set/p_complex_piter.hh index 996b637..b9ec30e 100644 --- a/milena/mln/core/site_set/p_complex_piter.hh +++ b/milena/mln/core/site_set/p_complex_piter.hh @@ -36,7 +36,7 @@ # include <mln/core/site_set/p_complex.hh> # include <mln/core/internal/p_complex_piter_base.hh> -# include <mln/topo/complex_iter.hh> +# include <mln/topo/face_iter.hh> namespace mln { @@ -55,13 +55,13 @@ namespace mln /// \brief Forward iterator on (all) the faces of an mln::p_complex<D, P>. template <unsigned D, typename P> class p_complex_fwd_piter_ - : public internal::p_complex_piter_base_< topo::complex_fwd_iter_<D>, + : public internal::p_complex_piter_base_< topo::face_fwd_iter<D>, p_complex<D, P>, P, p_complex_fwd_piter_<D, P> > { typedef p_complex_fwd_piter_<D, P> self_; - typedef internal::p_complex_piter_base_< topo::complex_fwd_iter_<D>, + typedef internal::p_complex_piter_base_< topo::face_fwd_iter<D>, p_complex<D, P>, P, self_ > super_; @@ -82,13 +82,13 @@ namespace mln /// \brief Backward iterator on (all) the faces of an mln::p_complex<D, P>. template <unsigned D, typename P> class p_complex_bkd_piter_ - : public internal::p_complex_piter_base_< topo::complex_bkd_iter_<D>, + : public internal::p_complex_piter_base_< topo::face_bkd_iter<D>, p_complex<D, P>, P, p_complex_bkd_piter_<D, P> > { typedef p_complex_bkd_piter_<D, P> self_; - typedef internal::p_complex_piter_base_< topo::complex_bkd_iter_<D>, + typedef internal::p_complex_piter_base_< topo::face_bkd_iter<D>, p_complex<D, P>, P, self_ > super_; -- 1.6.0.1

1 0

2419: Rename topo::complex_{fwd, bkd}_iter_ as topo::face_{fwd, bkd}_iter.
by Roland Levillain 26 Sep '08

26 Sep '08

* mln/topo/complex_iter.hh: Rename as... * mln/topo/face_iter.hh: ...this. (mln::topo::complex_fwd_iter_<D>) (mln::topo::complex_bkd_iter_<D>): Rename as... (mln::topo::face_fwd_iter<D>) (mln::topo::face_bkd_iter<D>): ...these. * milena/mln/topo/complex.hh: Adjust. * milena/tests/topo/complex.cc: Update documentation. --- milena/ChangeLog | 15 ++++ milena/mln/topo/complex.hh | 10 ++-- milena/mln/topo/{complex_iter.hh => face_iter.hh} | 75 +++++++++++---------- milena/tests/topo/complex.cc | 26 ++++---- 4 files changed, 71 insertions(+), 55 deletions(-) rename milena/mln/topo/{complex_iter.hh => face_iter.hh} (76%) diff --git a/milena/ChangeLog b/milena/ChangeLog index e129023..e2d0609 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,20 @@ 2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> + Rename topo::complex_{fwd,bkd}_iter_ as topo::face_{fwd,bkd}_iter. + + * mln/topo/complex_iter.hh: Rename as... + * mln/topo/face_iter.hh: ...this. + (mln::topo::complex_fwd_iter_<D>) + (mln::topo::complex_bkd_iter_<D>): + Rename as... + (mln::topo::face_fwd_iter<D>) + (mln::topo::face_bkd_iter<D>): + ...these. + * milena/mln/topo/complex.hh: Adjust. + * milena/tests/topo/complex.cc: Update documentation. + +2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> + Rename internal::complex_iter_base_ as internal::complex_iter_base. * mln/topo/internal/complex_iter_base.hh diff --git a/milena/mln/topo/complex.hh b/milena/mln/topo/complex.hh index 2ce88fd..e49f513 100644 --- a/milena/mln/topo/complex.hh +++ b/milena/mln/topo/complex.hh @@ -48,7 +48,7 @@ # include <mln/topo/n_face.hh> # include <mln/topo/n_faces_set.hh> -# include <mln/topo/complex_iter.hh> +# include <mln/topo/face_iter.hh> // FIXME: Disabled (moved to the attic). # if 0 # include <mln/topo/faces_iter.hh> @@ -63,8 +63,8 @@ namespace mln // Forward declarations (external). template <unsigned N, unsigned D> class n_faces_set; - template <unsigned D> class complex_fwd_iter_; - template <unsigned D> class complex_bkd_iter_; + template <unsigned D> class face_fwd_iter; + template <unsigned D> class face_bkd_iter; // FIXME: Disabled (moved to the attic). # if 0 template <unsigned N, unsigned D> class faces_fwd_iter_; @@ -92,9 +92,9 @@ namespace mln { public: /// Forward mln::Iterator type iterating on all faces. - typedef complex_fwd_iter_<D> fwd_citer; + typedef face_fwd_iter<D> fwd_citer; /// Backward mln::Iterator type iterating on all faces. - typedef complex_bkd_iter_<D> bkd_citer; + typedef face_bkd_iter<D> bkd_citer; // FIXME: Disabled (moved to the attic). # if 0 diff --git a/milena/mln/topo/complex_iter.hh b/milena/mln/topo/face_iter.hh similarity index 76% rename from milena/mln/topo/complex_iter.hh rename to milena/mln/topo/face_iter.hh index c589093..e366441 100644 --- a/milena/mln/topo/complex_iter.hh +++ b/milena/mln/topo/face_iter.hh @@ -25,11 +25,12 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_TOPO_COMPLEX_ITER_HH -# define MLN_TOPO_COMPLEX_ITER_HH +#ifndef MLN_TOPO_FACE_ITER_HH +# define MLN_TOPO_FACE_ITER_HH -/// \file mln/topo/complex_iter.hh -/// \brief Definition of forward and backward iterators on complexes. +/// \file mln/topo/face_iter.hh +/// \brief Definition of forward and backward iterators on all the +/// faces of a complex. # include <mln/topo/internal/complex_iter_base.hh> # include <mln/topo/face.hh> @@ -47,23 +48,23 @@ namespace mln template <unsigned D> class complex; - /*-----------------------------. - | topo::complex_fwd_iter_<D>. | - `-----------------------------*/ + /*-------------------------. + | topo::face_fwd_iter<D>. | + `-------------------------*/ - /// \brief Forward iterator on all the faces of a mln::complex<D>. + /// \brief Forward iterator on all the faces of an mln::complex<D>. /// /// \arg \p D The dimension of the complex this iterator belongs to. template <unsigned D> - class complex_fwd_iter_ - : public internal::complex_iter_base< face<D>, complex_fwd_iter_<D> > + class face_fwd_iter + : public internal::complex_iter_base< face<D>, face_fwd_iter<D> > { public: /// Type of associated face. typedef face<D> face; private: - typedef complex_fwd_iter_<D> self_; + typedef face_fwd_iter<D> self_; typedef internal::complex_iter_base< face, self_ > super_; public: @@ -73,9 +74,9 @@ namespace mln public: /// Construction and assignment. /// \{ - complex_fwd_iter_(); + face_fwd_iter(); // FIXME: See comment in internal::complex_iter_base's default ctor - complex_fwd_iter_(complex<D>& c); + face_fwd_iter(complex<D>& c); /// \} /// Manipulation. @@ -91,23 +92,23 @@ namespace mln }; - /*-----------------------------. - | topo::complex_bkd_iter_<D>. | - `-----------------------------*/ + /*-------------------------. + | topo::face_bkd_iter<D>. | + `-------------------------*/ - /// \brief Backward iterator on all the faces of a mln::complex<D>. + /// \brief Backward iterator on all the faces of an mln::complex<D>. /// /// \arg \p D The dimension of the complex this iterator belongs to. template <unsigned D> - class complex_bkd_iter_ - : public internal::complex_iter_base< face<D>, complex_bkd_iter_<D> > + class face_bkd_iter + : public internal::complex_iter_base< face<D>, face_bkd_iter<D> > { public: /// Type of associated face. typedef face<D> face; private: - typedef complex_bkd_iter_<D> self_; + typedef face_bkd_iter<D> self_; typedef internal::complex_iter_base< face, self_ > super_; public: @@ -117,9 +118,9 @@ namespace mln public: /// Construction and assignment. /// \{ - complex_bkd_iter_(); + face_bkd_iter(); // FIXME: See comment in internal::complex_iter_base's default ctor - complex_bkd_iter_(complex<D>& c); + face_bkd_iter(complex<D>& c); /// \} /// Manipulation. @@ -138,20 +139,20 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - /*-----------------------------. - | topo::complex_fwd_iter_<D>. | - `-----------------------------*/ + /*-------------------------. + | topo::face_fwd_iter<D>. | + `-------------------------*/ template <unsigned D> inline - complex_fwd_iter_<D>::complex_fwd_iter_() + face_fwd_iter<D>::face_fwd_iter() : super_() { } template <unsigned D> inline - complex_fwd_iter_<D>::complex_fwd_iter_(complex<D>& c) + face_fwd_iter<D>::face_fwd_iter(complex<D>& c) : super_(c) { set_cplx(c); @@ -161,7 +162,7 @@ namespace mln template <unsigned D> inline void - complex_fwd_iter_<D>::start() + face_fwd_iter<D>::start() { face_.set_n(0u); face_.set_face_id(0u); @@ -170,7 +171,7 @@ namespace mln template <unsigned D> inline void - complex_fwd_iter_<D>::next_() + face_fwd_iter<D>::next_() { if (is_valid()) { @@ -202,20 +203,20 @@ namespace mln } - /*-----------------------------. - | topo::complex_bkd_iter_<D>. | - `-----------------------------*/ + /*-------------------------. + | topo::face_bkd_iter<D>. | + `-------------------------*/ template <unsigned D> inline - complex_bkd_iter_<D>::complex_bkd_iter_() + face_bkd_iter<D>::face_bkd_iter() : super_() { } template <unsigned D> inline - complex_bkd_iter_<D>::complex_bkd_iter_(complex<D>& c) + face_bkd_iter<D>::face_bkd_iter(complex<D>& c) : super_(c) { set_cplx(c); @@ -225,7 +226,7 @@ namespace mln template <unsigned D> inline void - complex_bkd_iter_<D>::start() + face_bkd_iter<D>::start() { face_.set_n(D); face_.set_face_id(face_.cplx().template nfaces<D>() - 1); @@ -234,7 +235,7 @@ namespace mln template <unsigned D> inline void - complex_bkd_iter_<D>::next_() + face_bkd_iter<D>::next_() { if (is_valid()) { @@ -271,4 +272,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_TOPO_COMPLEX_ITER_HH +#endif // ! MLN_TOPO_FACE_ITER_HH diff --git a/milena/tests/topo/complex.cc b/milena/tests/topo/complex.cc index eeaeb14..3319813 100644 --- a/milena/tests/topo/complex.cc +++ b/milena/tests/topo/complex.cc @@ -189,24 +189,24 @@ 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. + + But first, we need to clarify (existing) names. These ones are + OK: ----------------------------------------------------------------- - Current name New name Definition + Name Definition ----------------------------------------------------------------- - complex<D> (n/a) General complex + complex<D> General complex - face_data<N, D> (n/a) Face data - n_face<N, D> (n/a) (Static) n-face handle - n_faces_set<N, D> (n/a) Set of face handles - face<D> (n/a) Dynamic face handle + 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 - complex_fwd_iter_<D>(c) face_fwd_iter<D>(c) | Iterators on all - complex_bkd_iter_<D>(c) face_bkd_iter<D>(c) | faces of c + face_fwd_iter<D>(c) | Iterators on all the faces + face_bkd_iter<D>(c) | of c - complex_iter_base_<F, E> complex_iter_base<F, E> - | Factoring base - | class. + internal::complex_iter_base<F, E> Factoring base class. ----------------------------------------------------------------- (Note: get rid of trailing underscores, even for entities in @@ -286,7 +286,7 @@ int main() n_face<N, D>'s. faces_fwd_iter_<N, D> Iterators on N-faces, N being - faces_fwd_iter_<N, D> static, acting as proxies of + faces_fwd_iter_<N, D> static, acting as proxies of face<D>'s. ----------------------------------------------------------------- */ -- 1.6.0.1

1 0

2418: Rename internal::complex_iter_base_ as internal::complex_iter_base.
by Roland Levillain 26 Sep '08

26 Sep '08

* mln/topo/internal/complex_iter_base.hh (mln::topo::internal::complex_iter_base_<F, E>): Rename as... (mln::topo::internal::complex_iter_base<F, E>): ...this. * milena/mln/topo/attic/complex_faces_iter.hh, * milena/mln/topo/attic/faces_iter.hh, * milena/mln/topo/complex_iter.hh: Adjust clients. --- milena/ChangeLog | 12 +++++++++++ milena/mln/topo/attic/complex_faces_iter.hh | 16 +++++++------- milena/mln/topo/attic/faces_iter.hh | 16 +++++++------- milena/mln/topo/complex_iter.hh | 16 ++++++-------- milena/mln/topo/internal/complex_iter_base.hh | 26 ++++++++++++------------ 5 files changed, 48 insertions(+), 38 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d105628..e129023 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> + Rename internal::complex_iter_base_ as internal::complex_iter_base. + + * mln/topo/internal/complex_iter_base.hh + (mln::topo::internal::complex_iter_base_<F, E>): Rename as... + (mln::topo::internal::complex_iter_base<F, E>): ...this. + * milena/mln/topo/attic/complex_faces_iter.hh, + * milena/mln/topo/attic/faces_iter.hh, + * milena/mln/topo/complex_iter.hh: + Adjust clients. + +2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> + Disable old iterators on n-faces (with n statically known). * milena/mln/core/site_set/p_complex_faces_piter.hh, diff --git a/milena/mln/topo/attic/complex_faces_iter.hh b/milena/mln/topo/attic/complex_faces_iter.hh index 95d7901..c0d278c 100644 --- a/milena/mln/topo/attic/complex_faces_iter.hh +++ b/milena/mln/topo/attic/complex_faces_iter.hh @@ -56,8 +56,8 @@ namespace mln /// \arg \p D The dimension of the complex this iterator belongs to. template <unsigned N, unsigned D> class complex_faces_fwd_iter_ - : public internal::complex_iter_base_< face<D>, - complex_faces_fwd_iter_<N, D> > + : public internal::complex_iter_base< face<D>, + complex_faces_fwd_iter_<N, D> > { public: /// Type of associated face. @@ -65,7 +65,7 @@ namespace mln private: typedef complex_faces_fwd_iter_<N, D> self_; - typedef internal::complex_iter_base_< face, self_ > super_; + typedef internal::complex_iter_base< face, self_ > super_; public: using super_::is_valid; @@ -75,7 +75,7 @@ namespace mln /// Construction and assignment. /// \{ complex_faces_fwd_iter_(); - // FIXME: See comment in internal::complex_iter_base_'s default ctor + // FIXME: See comment in internal::complex_iter_base's default ctor complex_faces_fwd_iter_(complex<D>& c); /// \} @@ -102,8 +102,8 @@ namespace mln /// \arg \p D The dimension of the complex this iterator belongs to. template <unsigned N, unsigned D> class complex_faces_bkd_iter_ - : public internal::complex_iter_base_< face<D>, - complex_faces_bkd_iter_<N, D> > + : public internal::complex_iter_base< face<D>, + complex_faces_bkd_iter_<N, D> > { public: /// Type of associated face. @@ -111,7 +111,7 @@ namespace mln private: typedef complex_faces_bkd_iter_<N, D> self_; - typedef internal::complex_iter_base_< face, self_ > super_; + typedef internal::complex_iter_base< face, self_ > super_; public: using super_::is_valid; @@ -121,7 +121,7 @@ namespace mln /// Construction and assignment. /// \{ complex_faces_bkd_iter_(); - // FIXME: See comment in internal::complex_iter_base_'s default ctor + // FIXME: See comment in internal::complex_iter_base's default ctor complex_faces_bkd_iter_(complex<D>& c); /// \} diff --git a/milena/mln/topo/attic/faces_iter.hh b/milena/mln/topo/attic/faces_iter.hh index 509ed9c..9497a14 100644 --- a/milena/mln/topo/attic/faces_iter.hh +++ b/milena/mln/topo/attic/faces_iter.hh @@ -51,8 +51,8 @@ namespace mln /// \arg \p D The dimension of the complex this iterator belongs to. template <unsigned N, unsigned D> class faces_fwd_iter_ - : public internal::complex_iter_base_< n_face<N, D>, - faces_fwd_iter_<N, D> > + : public internal::complex_iter_base< n_face<N, D>, + faces_fwd_iter_<N, D> > { public: /// Type of associated face. @@ -60,7 +60,7 @@ namespace mln private: typedef faces_fwd_iter_<N, D> self_; - typedef internal::complex_iter_base_< face, self_ > super_; + typedef internal::complex_iter_base< face, self_ > super_; public: using super_::is_valid; @@ -70,7 +70,7 @@ namespace mln /// Construction and assignment. /// \{ faces_fwd_iter_(); - // FIXME: See comment in internal::complex_iter_base_'s default ctor + // FIXME: See comment in internal::complex_iter_base's default ctor faces_fwd_iter_(complex<D>& c); /// \} @@ -97,8 +97,8 @@ namespace mln /// \arg \p D The dimension of the complex this iterator belongs to. template <unsigned N, unsigned D> class faces_bkd_iter_ - : public internal::complex_iter_base_< n_face<N, D>, - faces_bkd_iter_<N, D> > + : public internal::complex_iter_base< n_face<N, D>, + faces_bkd_iter_<N, D> > { public: /// Type of associated face. @@ -106,7 +106,7 @@ namespace mln private: typedef faces_bkd_iter_<N, D> self_; - typedef internal::complex_iter_base_< face, self_ > super_; + typedef internal::complex_iter_base< face, self_ > super_; public: using super_::is_valid; @@ -116,7 +116,7 @@ namespace mln /// Construction and assignment. /// \{ faces_bkd_iter_(); - // FIXME: See comment in internal::complex_iter_base_'s default ctor + // FIXME: See comment in internal::complex_iter_base's default ctor faces_bkd_iter_(complex<D>& c); /// \} diff --git a/milena/mln/topo/complex_iter.hh b/milena/mln/topo/complex_iter.hh index 32bbb1f..c589093 100644 --- a/milena/mln/topo/complex_iter.hh +++ b/milena/mln/topo/complex_iter.hh @@ -34,7 +34,7 @@ # include <mln/topo/internal/complex_iter_base.hh> # include <mln/topo/face.hh> -// FIXME: Factor a bit more? (Using complex_iter_base_.) +// FIXME: Factor a bit more? (Using complex_iter_base.) namespace mln @@ -56,8 +56,7 @@ namespace mln /// \arg \p D The dimension of the complex this iterator belongs to. template <unsigned D> class complex_fwd_iter_ - : public internal::complex_iter_base_< face<D>, - complex_fwd_iter_<D> > + : public internal::complex_iter_base< face<D>, complex_fwd_iter_<D> > { public: /// Type of associated face. @@ -65,7 +64,7 @@ namespace mln private: typedef complex_fwd_iter_<D> self_; - typedef internal::complex_iter_base_< face, self_ > super_; + typedef internal::complex_iter_base< face, self_ > super_; public: using super_::is_valid; @@ -75,7 +74,7 @@ namespace mln /// Construction and assignment. /// \{ complex_fwd_iter_(); - // FIXME: See comment in internal::complex_iter_base_'s default ctor + // FIXME: See comment in internal::complex_iter_base's default ctor complex_fwd_iter_(complex<D>& c); /// \} @@ -101,8 +100,7 @@ namespace mln /// \arg \p D The dimension of the complex this iterator belongs to. template <unsigned D> class complex_bkd_iter_ - : public internal::complex_iter_base_< face<D>, - complex_bkd_iter_<D> > + : public internal::complex_iter_base< face<D>, complex_bkd_iter_<D> > { public: /// Type of associated face. @@ -110,7 +108,7 @@ namespace mln private: typedef complex_bkd_iter_<D> self_; - typedef internal::complex_iter_base_< face, self_ > super_; + typedef internal::complex_iter_base< face, self_ > super_; public: using super_::is_valid; @@ -120,7 +118,7 @@ namespace mln /// Construction and assignment. /// \{ complex_bkd_iter_(); - // FIXME: See comment in internal::complex_iter_base_'s default ctor + // FIXME: See comment in internal::complex_iter_base's default ctor complex_bkd_iter_(complex<D>& c); /// \} diff --git a/milena/mln/topo/internal/complex_iter_base.hh b/milena/mln/topo/internal/complex_iter_base.hh index d371372..8e20801 100644 --- a/milena/mln/topo/internal/complex_iter_base.hh +++ b/milena/mln/topo/internal/complex_iter_base.hh @@ -53,9 +53,9 @@ namespace mln /// \arg \p F The type of the face handle. /// \arg \p E The type exact type of the iterator. template <typename F, typename E> - class complex_iter_base_ : public Iterator<E> + class complex_iter_base : public Iterator<E> { - typedef complex_iter_base_<F, E> self_; + typedef complex_iter_base<F, E> self_; public: typedef F face; @@ -67,8 +67,8 @@ namespace mln /// \{ /* FIXME: Keep this non-const? See a (big) comment about this in milena/tests/complex_image.cc. */ - complex_iter_base_(); - complex_iter_base_(complex_type& c); + complex_iter_base(); + complex_iter_base(complex_type& c); /// \} /// Manipulation. @@ -104,7 +104,7 @@ namespace mln template <typename F, typename E> inline std::ostream& - operator<<(std::ostream& ostr, const complex_iter_base_<F, E>& p); + operator<<(std::ostream& ostr, const complex_iter_base<F, E>& p); @@ -112,7 +112,7 @@ namespace mln template <typename F, typename E> inline - complex_iter_base_<F, E>::complex_iter_base_() + complex_iter_base<F, E>::complex_iter_base() { // Ensure F and E are compatible. mlc_equal(F, typename E::face)::check(); @@ -122,7 +122,7 @@ namespace mln template <typename F, typename E> inline - complex_iter_base_<F, E>::complex_iter_base_(complex_type& c) + complex_iter_base<F, E>::complex_iter_base(complex_type& c) { // Ensure F and E are compatible. mlc_equal(F, typename E::face)::check(); @@ -135,7 +135,7 @@ namespace mln template <typename F, typename E> inline void - complex_iter_base_<F, E>::set_cplx(complex_type& c) + complex_iter_base<F, E>::set_cplx(complex_type& c) { face_.set_cplx(c); // Invalidate face_. @@ -145,7 +145,7 @@ namespace mln template <typename F, typename E> inline bool - complex_iter_base_<F, E>::is_valid() const + complex_iter_base<F, E>::is_valid() const { return face_.is_valid(); } @@ -153,7 +153,7 @@ namespace mln template <typename F, typename E> inline void - complex_iter_base_<F, E>::invalidate() + complex_iter_base<F, E>::invalidate() { face_.invalidate(); } @@ -161,14 +161,14 @@ namespace mln template <typename F, typename E> inline const F& - complex_iter_base_<F, E>::to_face() const + complex_iter_base<F, E>::to_face() const { return face_; } template <typename F, typename E> inline - complex_iter_base_<F, E>::operator F() const + complex_iter_base<F, E>::operator F() const { mln_precondition(is_valid()); return face_; @@ -178,7 +178,7 @@ namespace mln template <typename F, typename E> inline std::ostream& - operator<<(std::ostream& ostr, const complex_iter_base_<F, E>& p) + operator<<(std::ostream& ostr, const complex_iter_base<F, E>& p) { /* FIXME: We should use p.to_face() here, but as it lacks the precondition the conversion operator has, so we use the latter. -- 1.6.0.1

1 0

2417: Disable old iterators on n-faces (with n statically known).
by Roland Levillain 26 Sep '08

26 Sep '08

* milena/mln/core/site_set/p_complex_faces_piter.hh, * milena/mln/core/site_set/p_faces_piter.hh, * milena/mln/topo/complex_faces_iter.hh, * milena/mln/topo/faces_iter.hh: Move... * milena/mln/core/site_set/attic/p_complex_faces_piter.hh, * milena/mln/core/site_set/attic/p_faces_piter.hh, * milena/mln/topo/attic/complex_faces_iter.hh, * milena/mln/topo/attic/faces_iter.hh: ...here. Disable these iterators... * milena/mln/core/site_set/p_complex.hh, * milena/mln/core/site_set/p_faces.hh, * milena/mln/topo/complex.hh, * milena/tests/core/image/complex_image.cc, * milena/tests/topo/complex.cc: ...in those files. --- milena/ChangeLog | 22 ++++++++++++++++++++ .../site_set/{ => attic}/p_complex_faces_piter.hh | 0 .../mln/core/site_set/{ => attic}/p_faces_piter.hh | 0 milena/mln/core/site_set/p_complex.hh | 9 ++++++- milena/mln/core/site_set/p_faces.hh | 6 ++++- milena/mln/topo/{ => attic}/complex_faces_iter.hh | 0 milena/mln/topo/{ => attic}/faces_iter.hh | 0 milena/mln/topo/complex.hh | 14 ++++++++++-- milena/tests/core/image/complex_image.cc | 8 ++---- milena/tests/topo/complex.cc | 13 ++++++++++- 10 files changed, 59 insertions(+), 13 deletions(-) rename milena/mln/core/site_set/{ => attic}/p_complex_faces_piter.hh (100%) rename milena/mln/core/site_set/{ => attic}/p_faces_piter.hh (100%) rename milena/mln/topo/{ => attic}/complex_faces_iter.hh (100%) rename milena/mln/topo/{ => attic}/faces_iter.hh (100%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9bd58d5..d105628 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,27 @@ 2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> + Disable old iterators on n-faces (with n statically known). + + * milena/mln/core/site_set/p_complex_faces_piter.hh, + * milena/mln/core/site_set/p_faces_piter.hh, + * milena/mln/topo/complex_faces_iter.hh, + * milena/mln/topo/faces_iter.hh: + Move... + * milena/mln/core/site_set/attic/p_complex_faces_piter.hh, + * milena/mln/core/site_set/attic/p_faces_piter.hh, + * milena/mln/topo/attic/complex_faces_iter.hh, + * milena/mln/topo/attic/faces_iter.hh: + ...here. + Disable these iterators... + * milena/mln/core/site_set/p_complex.hh, + * milena/mln/core/site_set/p_faces.hh, + * milena/mln/topo/complex.hh, + * milena/tests/core/image/complex_image.cc, + * milena/tests/topo/complex.cc: + ...in those files. + +2008-09-26 Roland Levillain <roland(a)lrde.epita.fr> + Split mln/topo/face.hh. * milena/mln/topo/face.hh diff --git a/milena/mln/core/site_set/p_complex_faces_piter.hh b/milena/mln/core/site_set/attic/p_complex_faces_piter.hh similarity index 100% rename from milena/mln/core/site_set/p_complex_faces_piter.hh rename to milena/mln/core/site_set/attic/p_complex_faces_piter.hh diff --git a/milena/mln/core/site_set/p_faces_piter.hh b/milena/mln/core/site_set/attic/p_faces_piter.hh similarity index 100% rename from milena/mln/core/site_set/p_faces_piter.hh rename to milena/mln/core/site_set/attic/p_faces_piter.hh diff --git a/milena/mln/core/site_set/p_complex.hh b/milena/mln/core/site_set/p_complex.hh index a747b69..06fc8b2 100644 --- a/milena/mln/core/site_set/p_complex.hh +++ b/milena/mln/core/site_set/p_complex.hh @@ -37,7 +37,10 @@ # include <mln/core/site_set/complex_psite.hh> # include <mln/core/site_set/p_complex_piter.hh> -# include <mln/core/site_set/p_complex_faces_piter.hh> +// FIXME: Disabled (moved to the attic). +# if 0 +# include <mln/core/site_set/p_complex_faces_piter.hh> +# endif namespace mln @@ -49,11 +52,13 @@ namespace mln template <unsigned D, typename P> class p_complex_fwd_piter_; template <unsigned D, typename P> class p_complex_bkd_piter_; +// FIXME: Disabled (moved to the attic). +# if 0 template <unsigned N, unsigned D, typename P> class p_complex_faces_fwd_piter_; template <unsigned N, unsigned D, typename P> class p_complex_faces_bkd_piter_; - +# endif namespace trait { diff --git a/milena/mln/core/site_set/p_faces.hh b/milena/mln/core/site_set/p_faces.hh index b17f85a..6df4ded 100644 --- a/milena/mln/core/site_set/p_faces.hh +++ b/milena/mln/core/site_set/p_faces.hh @@ -37,7 +37,11 @@ # include <mln/topo/complex.hh> # include <mln/core/faces_psite.hh> -# include <mln/core/site_set/p_faces_piter.hh> + +// FIXME: Disabled (moved to the attic). +# if 0 +# include <mln/core/site_set/p_faces_piter.hh> +# endif # include <mln/core/site_set/p_complex.hh> diff --git a/milena/mln/topo/complex_faces_iter.hh b/milena/mln/topo/attic/complex_faces_iter.hh similarity index 100% rename from milena/mln/topo/complex_faces_iter.hh rename to milena/mln/topo/attic/complex_faces_iter.hh diff --git a/milena/mln/topo/faces_iter.hh b/milena/mln/topo/attic/faces_iter.hh similarity index 100% rename from milena/mln/topo/faces_iter.hh rename to milena/mln/topo/attic/faces_iter.hh diff --git a/milena/mln/topo/complex.hh b/milena/mln/topo/complex.hh index bef3ca9..2ce88fd 100644 --- a/milena/mln/topo/complex.hh +++ b/milena/mln/topo/complex.hh @@ -49,9 +49,11 @@ # include <mln/topo/n_faces_set.hh> # include <mln/topo/complex_iter.hh> -# include <mln/topo/faces_iter.hh> -# include <mln/topo/complex_faces_iter.hh> - +// FIXME: Disabled (moved to the attic). +# if 0 +# include <mln/topo/faces_iter.hh> +# include <mln/topo/complex_faces_iter.hh> +# endif namespace mln { @@ -63,8 +65,11 @@ namespace mln template <unsigned N, unsigned D> class n_faces_set; template <unsigned D> class complex_fwd_iter_; template <unsigned D> class complex_bkd_iter_; +// FIXME: Disabled (moved to the attic). +# if 0 template <unsigned N, unsigned D> class faces_fwd_iter_; template <unsigned N, unsigned D> class faces_bkd_iter_; +#endif // Forward declarations (internal). namespace internal @@ -91,12 +96,15 @@ namespace mln /// Backward mln::Iterator type iterating on all faces. typedef complex_bkd_iter_<D> bkd_citer; +// FIXME: Disabled (moved to the attic). +# if 0 /// Forward mln::Iterator type iterating on \p N-faces. template <unsigned N> struct fwd_fiter { typedef faces_fwd_iter_<N, D> ret; }; /// Backward mln::Iterator type iterating on \p N-faces. template <unsigned N> struct bkd_fiter { typedef faces_bkd_iter_<N, D> ret; }; +#endif /// Complex construction. /// \{ diff --git a/milena/tests/core/image/complex_image.cc b/milena/tests/core/image/complex_image.cc index 148041d..47233cb 100644 --- a/milena/tests/core/image/complex_image.cc +++ b/milena/tests/core/image/complex_image.cc @@ -164,15 +164,13 @@ int main() // Iterators on n-faces (with n fixed in [0, D]). // // ----------------------------------------------- // - // We need to instantiate a (non temporary) object on the stack, so - // that it can be referenced later by face_psites held by iterators - // (as for windows and neighborhoods). - +// FIXME: Disabled (moved to the attic). +# if 0 // FIXME: Sugar the name of the iterator. p_complex_faces_fwd_piter_<0, D, point2d> f0p(ima.domain()); for_all(f0p) std::cout << "ima(" << f0p << ") = " << ima(f0p) << std::endl; - +#endif /* FIXME: Implement other psite iterators, for instance: diff --git a/milena/tests/topo/complex.cc b/milena/tests/topo/complex.cc index 6b8c17e..eeaeb14 100644 --- a/milena/tests/topo/complex.cc +++ b/milena/tests/topo/complex.cc @@ -143,6 +143,8 @@ int main() actual complex processing since they are not really flexible --- but I'm not sure. */ +// FIXME: Disabled (moved to the attic). +# if 0 /* Using faces_{fwd,bkd}_iter_<N, D>, which are proxies to n_faces<N, D>. */ test_faces_iter<0>(c); @@ -154,6 +156,7 @@ int main() test_complex_faces_iter<0>(c); test_complex_faces_iter<1>(c); test_complex_faces_iter<2>(c); +#endif /*------------------------------. | Iterators on adjacent faces. | @@ -269,8 +272,11 @@ int main() | define the iterated subset. ----------------------------------------------------------------- - I'm unsure about the following existing iterators; should we keep - them? What are they good for, except testing our code? + + I'm unsure about the old iterators on n-faces (with a static n) + moved to the attic; should we keep them? What are they good for, + except testing our code? At least, we should find better names + for them, as we might confuse them with new iterators. ----------------------------------------------------------------- Current name Definition @@ -287,6 +293,8 @@ int main() } +// FIXME: Disabled (moved to the attic). +# if 0 template <unsigned N, unsigned D> void test_faces_iter(topo::complex<D>& c) @@ -315,3 +323,4 @@ test_complex_faces_iter(topo::complex<D>& c) std::cout << fwd_ncf << ' ' << bkd_ncf << std::endl; std::cout << std::endl; } +#endif -- 1.6.0.1

1 0