[Olena-patches] 2417: 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. --- 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 &lt;roland(a)lrde.epita.fr&gt; + 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 &lt;roland(a)lrde.epita.fr&gt; + 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