* mln/topo/complex.hh: Move iterator-related header inclusions... * mln/topo/complex_iterators.hh: ...here (new file). --- milena/ChangeLog | 7 +++++ milena/mln/topo/complex.hh | 14 +--------- milena/mln/topo/complex_iterators.hh | 50 ++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 13 deletions(-) create mode 100644 milena/mln/topo/complex_iterators.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index ee844c1..d466a7a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2008-10-05 Roland Levillain <roland@lrde.epita.fr> + Introduce a header for iterators on complexes. + + * mln/topo/complex.hh: Move iterator-related header inclusions... + * mln/topo/complex_iterators.hh: ...here (new file). + +2008-10-05 Roland Levillain <roland@lrde.epita.fr> + Add relative iterators on faces sharing lower/higher-dimension faces. * mln/topo/adj_lower_dim_connected_n_face_iter.hh, diff --git a/milena/mln/topo/complex.hh b/milena/mln/topo/complex.hh index 06c714e..d3d2e18 100644 --- a/milena/mln/topo/complex.hh +++ b/milena/mln/topo/complex.hh @@ -48,19 +48,7 @@ # include <mln/topo/n_face.hh> # include <mln/topo/n_faces_set.hh> -# include <mln/topo/face_iter.hh> -# include <mln/topo/n_face_iter.hh> -# include <mln/topo/static_n_face_iter.hh> -// FIXME: Disabled (moved to the attic). -# if 0 -# include <mln/topo/faces_iter.hh> -# endif - -# include <mln/topo/adj_lower_face_iter.hh> -# include <mln/topo/adj_higher_face_iter.hh> -# include <mln/topo/adj_lower_higher_face_iter.hh> -# include <mln/topo/adj_lower_dim_connected_n_face_iter.hh> -# include <mln/topo/adj_higher_dim_connected_n_face_iter.hh> +# include <mln/topo/complex_iterators.hh> namespace mln diff --git a/milena/mln/topo/complex_iterators.hh b/milena/mln/topo/complex_iterators.hh new file mode 100644 index 0000000..170e19c --- /dev/null +++ b/milena/mln/topo/complex_iterators.hh @@ -0,0 +1,50 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_TOPO_COMPLEX_ITERATORS_HH +# define MLN_TOPO_COMPLEX_ITERATORS_HH + +/// \file mln/core/topo/complex_iterators.hh +/// \brief Iterators on complexes. +/// +/// This file includes all iterators on faces. + +# include <mln/topo/face_iter.hh> +# include <mln/topo/n_face_iter.hh> +# include <mln/topo/static_n_face_iter.hh> +// FIXME: Disabled (moved to the attic). +# if 0 +# include <mln/topo/faces_iter.hh> +# endif + +# include <mln/topo/adj_lower_face_iter.hh> +# include <mln/topo/adj_higher_face_iter.hh> +# include <mln/topo/adj_lower_higher_face_iter.hh> +# include <mln/topo/adj_lower_dim_connected_n_face_iter.hh> +# include <mln/topo/adj_higher_dim_connected_n_face_iter.hh> + +#endif // ! MLN_TOPO_COMPLEX_ITERATORS_HH -- 1.6.0.1