https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud &lt;thierry.geraud(a)lrde.epita.fr&gt; Change 'point' into 'site' in point-set-related tokens. Get rid of obsolete files / filenames. * mln/core/internal/point_iterator_base.hh: Remove. * mln/core/internal/point_set_base.hh: Rename as... * mln/core/internal/site_set_base.hh: ...this. * mln/core/concept/point_set.hh: Remove. * mln/core/concept/doc/point_set.hh: Rename as... * mln/core/concept/doc/site_set.hh: ...this. * mln/core/concept/point_iterator.hh: Rename as... * mln/core/concept/site_set.hh: ...this. Rename 'point' as 'site' in some tokens. * mln/core/line_graph_elt_neighborhood.hh, * mln/core/window.hh, * mln/core/pset_array.hh, * mln/core/internal/graph_vicinity_piter.hh, * mln/core/internal/line_graph_vicinity_piter.hh, * mln/core/internal/piter_adaptor.hh, * mln/core/internal/set_of.hh, * mln/core/p_priority_queue_fast.hh, * mln/core/p_bgraph_piter.hh, * mln/core/neighb.hh, * mln/core/p_priority_queue_fast_with_array.hh, * mln/core/box_piter.hh, * mln/core/dp_array.hh, * mln/core/p_queue_fast.hh, * mln/core/p_graph_piter.hh, * mln/core/graph_elt_window.hh, * mln/core/pset_if_piter.hh, * mln/core/p_array_bb.hh, * mln/core/p_array_piter.hh, * mln/core/dpoints_piter.hh, * mln/core/p_line_graph.hh, * mln/core/p_image2d.hh, * mln/core/p_image2d_piter.hh, * mln/core/p_line_graph_piter.hh, * mln/core/w_window.hh, * mln/core/line_graph_elt_window.hh, * mln/core/p_queue.hh, * mln/core/clock_neighb.hh, * mln/core/p_graph.hh, * mln/core/hexa.hh, * mln/core/line_piter.hh, * mln/core/graph_elt_neighborhood.hh, * mln/core/p_priority_queue.hh, * mln/core/p_set.hh, * mln/core/line2d.hh, * mln/core/p_bgraph.hh, * mln/core/p_run.hh, * mln/core/p_run_piter.hh, * mln/core/pset_if.hh, * mln/core/p_array.hh, * mln/core/concept/proxy.hh, * mln/core/concept/box.hh, * mln/core/concept/doc/image.hh, * mln/core/concept/doc/weighted_window.hh, * mln/core/concept/doc/point_iterator.hh, * mln/core/concept/doc/window.hh, * mln/core/concept/doc/neighborhood.hh, * mln/core/concept/image.hh, * mln/core/p_runs.hh, * mln/test/predicate.hh, * mln/convert/to_image.hh, * mln/geom/pmin_pmax.hh, * mln/geom/bbox.hh, * mln/set/is_subset_of.hh, * mln/win/cube3d.hh, * mln/win/line.hh, * mln/win/rectangle2d.hh, * mln/win/diag2d.hh, * mln/win/backdiag2d.hh, * mln/win/cuboid3d.hh, * mln/win/octagon2d.hh, * mln/win/disk2d.hh, * mln/util/lazy_set.hh, * sandbox/duhamel/mesh_p.hh, * sandbox/duhamel/queue_p_fast.hh, * sandbox/duhamel/queue_p_priority.hh, * sandbox/pellegrin/set/core/p_priority_queue_fast.hh, * sandbox/pellegrin/set/core/p_bgraph.hh, * sandbox/pellegrin/set/core/p_run.hh, * sandbox/pellegrin/set/core/p_line_graph.hh, * sandbox/pellegrin/set/core/pset_if.hh, * sandbox/pellegrin/set/core/concept/point_set.hh, * sandbox/pellegrin/set/core/p_array.hh, * sandbox/pellegrin/set/core/p_queue.hh, * sandbox/pellegrin/set/core/p_priority_queue.hh, * sandbox/pellegrin/set/core/p_runs.hh, * sandbox/pellegrin/set/core/p_set.hh, * sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh, * sandbox/pellegrin/set/core/line2d.hh, * sandbox/pellegrin/set/core/internal/multi_set.hh, * sandbox/pellegrin/set/core/internal/uni_set.hh, * sandbox/pellegrin/set/core/p_graph.hh, * sandbox/pellegrin/set/core/p_queue_fast.hh, * sandbox/nivault/dyn_line.hh, * sandbox/garrigues/fllt/types.hh (Point_Iterator, point_iterator_base_): Rename as... (Site_Iterator, site_iterator_base_): ...these. (Point_Set, point_set_base_): Rename as... (Site_Set, site_set_base_): ...these. Clean-up. * doc/tutorial/examples/p_array.cc (ima): Remove; unused. Swap two lines. doc/tutorial/examples/p_array.cc | 5 --- mln/convert/to_image.hh | 2 - mln/core/box_piter.hh | 14 +++++----- mln/core/clock_neighb.hh | 4 +- mln/core/concept/box.hh | 2 - mln/core/concept/doc/image.hh | 4 +- mln/core/concept/doc/neighborhood.hh | 6 ++-- mln/core/concept/doc/point_iterator.hh | 10 +++---- mln/core/concept/doc/site_set.hh | 2 - mln/core/concept/doc/weighted_window.hh | 4 +- mln/core/concept/doc/window.hh | 6 ++-- mln/core/concept/image.hh | 2 - mln/core/concept/proxy.hh | 1 mln/core/concept/site_set.hh | 10 +++---- mln/core/dp_array.hh | 6 ++-- mln/core/dpoints_piter.hh | 6 ++-- mln/core/graph_elt_neighborhood.hh | 8 ++--- mln/core/graph_elt_window.hh | 8 ++--- mln/core/hexa.hh | 4 +- mln/core/internal/graph_vicinity_piter.hh | 6 ++-- mln/core/internal/line_graph_vicinity_piter.hh | 6 ++-- mln/core/internal/piter_adaptor.hh | 6 ++-- mln/core/internal/set_of.hh | 4 +- mln/core/internal/site_set_base.hh | 10 +++---- mln/core/line2d.hh | 6 ++-- mln/core/line_graph_elt_neighborhood.hh | 8 ++--- mln/core/line_graph_elt_window.hh | 8 ++--- mln/core/line_piter.hh | 6 ++-- mln/core/neighb.hh | 4 +- mln/core/p_array.hh | 6 ++-- mln/core/p_array_bb.hh | 6 ++-- mln/core/p_array_piter.hh | 4 +- mln/core/p_bgraph.hh | 6 ++-- mln/core/p_bgraph_piter.hh | 6 ++-- mln/core/p_graph.hh | 6 ++-- mln/core/p_graph_piter.hh | 10 +++---- mln/core/p_image2d.hh | 6 ++-- mln/core/p_image2d_piter.hh | 8 ++--- mln/core/p_line_graph.hh | 6 ++-- mln/core/p_line_graph_piter.hh | 10 +++---- mln/core/p_priority_queue.hh | 6 ++-- mln/core/p_priority_queue_fast.hh | 6 ++-- mln/core/p_priority_queue_fast_with_array.hh | 6 ++-- mln/core/p_queue.hh | 6 ++-- mln/core/p_queue_fast.hh | 6 ++-- mln/core/p_run.hh | 6 ++-- mln/core/p_run_piter.hh | 8 ++--- mln/core/p_runs.hh | 6 ++-- mln/core/p_set.hh | 6 ++-- mln/core/pset_array.hh | 6 ++-- mln/core/pset_if.hh | 6 ++-- mln/core/pset_if_piter.hh | 2 - mln/core/w_window.hh | 4 +- mln/core/window.hh | 4 +- mln/geom/bbox.hh | 2 - mln/geom/pmin_pmax.hh | 10 +++---- mln/set/is_subset_of.hh | 2 - mln/test/predicate.hh | 2 - mln/util/lazy_set.hh | 2 - mln/win/backdiag2d.hh | 4 +- mln/win/cube3d.hh | 4 +- mln/win/cuboid3d.hh | 4 +- mln/win/diag2d.hh | 4 +- mln/win/disk2d.hh | 4 +- mln/win/line.hh | 4 +- mln/win/octagon2d.hh | 4 +- mln/win/rectangle2d.hh | 4 +- sandbox/duhamel/mesh_p.hh | 10 +++---- sandbox/duhamel/queue_p_fast.hh | 4 +- sandbox/duhamel/queue_p_priority.hh | 4 +- sandbox/garrigues/fllt/types.hh | 4 +- sandbox/nivault/dyn_line.hh | 4 +- sandbox/pellegrin/set/core/concept/point_set.hh | 2 - sandbox/pellegrin/set/core/internal/multi_set.hh | 4 +- sandbox/pellegrin/set/core/internal/uni_set.hh | 4 +- sandbox/pellegrin/set/core/line2d.hh | 4 +- sandbox/pellegrin/set/core/p_array.hh | 4 +- sandbox/pellegrin/set/core/p_bgraph.hh | 4 +- sandbox/pellegrin/set/core/p_graph.hh | 4 +- sandbox/pellegrin/set/core/p_line_graph.hh | 4 +- sandbox/pellegrin/set/core/p_priority_queue.hh | 4 +- sandbox/pellegrin/set/core/p_priority_queue_fast.hh | 4 +- sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh | 4 +- sandbox/pellegrin/set/core/p_queue.hh | 4 +- sandbox/pellegrin/set/core/p_queue_fast.hh | 4 +- sandbox/pellegrin/set/core/p_run.hh | 4 +- sandbox/pellegrin/set/core/p_runs.hh | 4 +- sandbox/pellegrin/set/core/p_set.hh | 4 +- sandbox/pellegrin/set/core/pset_if.hh | 4 +- 89 files changed, 230 insertions(+), 232 deletions(-) Index: doc/tutorial/examples/p_array.cc --- doc/tutorial/examples/p_array.cc (revision 1982) +++ doc/tutorial/examples/p_array.cc (working copy) @@ -2,7 +2,6 @@ # include <mln/core/p_array.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> -# include <mln/value/int_u8.hh> template <typename A> @@ -30,12 +29,10 @@ typedef p_array<point2d> Arr1; Arr1 arr1; - image2d<value::int_u8> ima(5, 5); - { point2d p(1,1); - dpoint2d dp[] = { right, right, down, down, left, left, up }; arr1.append(p); + dpoint2d dp[] = { right, right, down, down, left, left, up }; for (unsigned i = 0; i < 7; ++i) p += dp[i], arr1.append(p); Index: mln/core/line_graph_elt_neighborhood.hh --- mln/core/line_graph_elt_neighborhood.hh (revision 1982) +++ mln/core/line_graph_elt_neighborhood.hh (working copy) @@ -79,11 +79,11 @@ // FIXME: This is a dummy value. typedef void dpoint; - /// \brief Point_Iterator type to browse the psites of the + /// \brief Site_Iterator type to browse the psites of the /// neighborhood w.r.t. the ordering of edges. typedef line_graph_neighborhood_fwd_piter<P, self_> fwd_niter; - /// \brief Point_Iterator type to browse the psites of the + /// \brief Site_Iterator type to browse the psites of the /// neighborhood w.r.t. the reverse ordering of edges. typedef line_graph_neighborhood_bkd_piter<P, self_> bkd_niter; @@ -95,7 +95,7 @@ /// \{ /// Compute the set of sites for this neighborhood around \a piter. template <typename Piter> - void compute_sites_(Point_Iterator<Piter>& piter) const; + void compute_sites_(Site_Iterator<Piter>& piter) const; /// \} }; @@ -107,7 +107,7 @@ template <typename Piter> inline void - line_graph_elt_neighborhood<P>::compute_sites_(Point_Iterator<Piter>& piter_) const + line_graph_elt_neighborhood<P>::compute_sites_(Site_Iterator<Piter>& piter_) const { Piter& piter = exact(piter_); util::edge_id ref_edge_id = piter.p_ref().id(); Index: mln/core/window.hh --- mln/core/window.hh (revision 1982) +++ mln/core/window.hh (working copy) @@ -67,12 +67,12 @@ typedef internal::dpoints_base_<D, window<D> > super_; public: - /*! \brief Point_Iterator type to browse the points of a generic window + /*! \brief Site_Iterator type to browse the points of a generic window * w.r.t. the ordering of delta-points. */ typedef dpoints_fwd_piter<D> fwd_qiter; - /*! \brief Point_Iterator type to browse the points of a generic window + /*! \brief Site_Iterator type to browse the points of a generic window * w.r.t. the reverse ordering of delta-points. */ typedef dpoints_bkd_piter<D> bkd_qiter; Index: mln/core/pset_array.hh --- mln/core/pset_array.hh (revision 1982) +++ mln/core/pset_array.hh (working copy) @@ -34,8 +34,8 @@ * \brief Definition of the pset array class. */ -# include <mln/core/internal/point_set_base.hh> -# include <mln/core/internal/point_iterator_base.hh> +# include <mln/core/internal/site_set_base.hh> +# include <mln/core/internal/site_iterator_base.hh> # include <vector> # include <mln/accu/bbox.hh> @@ -198,7 +198,7 @@ */ template <typename Pset> class pset_array_fwd_piter_ : public - internal::point_iterator_base_<pset_array_psite<typename Pset::psite>, + internal::site_iterator_base_<pset_array_psite<typename Pset::psite>, pset_array_fwd_piter_<Pset> > { public: Index: mln/core/internal/graph_vicinity_piter.hh --- mln/core/internal/graph_vicinity_piter.hh (revision 1982) +++ mln/core/internal/graph_vicinity_piter.hh (working copy) @@ -37,7 +37,7 @@ - mln::internal::graph_vicinity_piter.hh - mln::internal::line_graph_vicinity_piter.hh */ -# include <mln/core/concept/point_iterator.hh> +# include <mln/core/concept/site_iterator.hh> # include <mln/core/p_graph.hh> # include <mln/core/graph_psite.hh> @@ -61,10 +61,10 @@ /// \brief Base for iterator on a graph vicinity. template <typename P, typename E> - class graph_vicinity_piter_ : public Point_Iterator< E > + class graph_vicinity_piter_ : public Site_Iterator< E > { typedef graph_vicinity_piter_<P, E> self_; - typedef Point_Iterator< self_ > super_; + typedef Site_Iterator< self_ > super_; public: enum { dim = P::dim }; Index: mln/core/internal/line_graph_vicinity_piter.hh --- mln/core/internal/line_graph_vicinity_piter.hh (revision 1982) +++ mln/core/internal/line_graph_vicinity_piter.hh (working copy) @@ -39,7 +39,7 @@ # include <set> -# include <mln/core/concept/point_iterator.hh> +# include <mln/core/concept/site_iterator.hh> # include <mln/core/p_line_graph.hh> # include <mln/core/line_graph_psite.hh> @@ -59,10 +59,10 @@ /// \brief Base for iterator on a line graph vicinity. template <typename P, typename E> - class line_graph_vicinity_piter_ : public Point_Iterator< E > + class line_graph_vicinity_piter_ : public Site_Iterator< E > { typedef line_graph_vicinity_piter_<P, E> self_; - typedef Point_Iterator< self_ > super_; + typedef Site_Iterator< self_ > super_; public: enum { dim = P::dim }; Index: mln/core/internal/piter_adaptor.hh --- mln/core/internal/piter_adaptor.hh (revision 1982) +++ mln/core/internal/piter_adaptor.hh (working copy) @@ -33,7 +33,7 @@ * \brief Definition of iterators on points of boxes. */ -# include <mln/core/internal/point_iterator_base.hh> +# include <mln/core/internal/site_iterator_base.hh> # include <mln/core/concept/box.hh> @@ -48,9 +48,9 @@ * parameter E is the exact type. */ template <typename Pi, typename E> - class piter_adaptor_ : public internal::point_iterator_base_< mln_psite(Pi), E > + class piter_adaptor_ : public internal::site_iterator_base_< mln_psite(Pi), E > { - typedef internal::point_iterator_base_< mln_psite(Pi), E > super_; + typedef internal::site_iterator_base_< mln_psite(Pi), E > super_; public: // Make dim definition from super class available. Index: mln/core/internal/site_set_base.hh --- mln/core/internal/site_set_base.hh (revision 1981) +++ mln/core/internal/site_set_base.hh (working copy) @@ -25,15 +25,15 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_INTERNAL_POINT_SET_BASE_HH -# define MLN_CORE_INTERNAL_POINT_SET_BASE_HH +#ifndef MLN_CORE_INTERNAL_SITE_SET_BASE_HH +# define MLN_CORE_INTERNAL_SITE_SET_BASE_HH -/*! \file mln/core/internal/point_set_base.hh +/*! \file mln/core/internal/site_set_base.hh * * \brief Definition of a base class for site set classes. */ -# include <mln/core/concept/point_set.hh> +# include <mln/core/concept/site_set.hh> # include <mln/core/concept/site_proxy.hh> # include <mln/core/grids.hh> # include <mln/metal/is_a.hh> @@ -77,4 +77,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_INTERNAL_POINT_SET_BASE_HH +#endif // ! MLN_CORE_INTERNAL_SITE_SET_BASE_HH Index: mln/core/internal/set_of.hh --- mln/core/internal/set_of.hh (revision 1982) +++ mln/core/internal/set_of.hh (working copy) @@ -175,7 +175,7 @@ * * \relates mln::internal::set_of_ */ - // FIXME : ambiguous with point_set operator << + // FIXME : ambiguous with site_set operator << // template <typename E> // std::ostream& operator<<(std::ostream& ostr, const set_of_<E>& s); @@ -285,7 +285,7 @@ needs_update_ = false; } - // FIXME : ambiguous with point_set operator << + // FIXME : ambiguous with site_set operator << // template <typename E> // std::ostream& operator<<(std::ostream& ostr, // const set_of_<E>& s) Index: mln/core/p_priority_queue_fast.hh --- mln/core/p_priority_queue_fast.hh (revision 1982) +++ mln/core/p_priority_queue_fast.hh (working copy) @@ -40,7 +40,7 @@ # include <algorithm> # include <iterator> -# include <mln/core/internal/point_set_base.hh> +# include <mln/core/internal/site_set_base.hh> # include <mln/core/p_array_piter.hh> # include <mln/accu/bbox.hh> # include <mln/core/p_queue_fast.hh> @@ -67,10 +67,10 @@ { public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_array_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_array_bkd_piter_<P> bkd_piter; /// Constructor. Index: mln/core/p_bgraph_piter.hh --- mln/core/p_bgraph_piter.hh (revision 1982) +++ mln/core/p_bgraph_piter.hh (working copy) @@ -30,7 +30,7 @@ # include <utility> -# include <mln/core/internal/point_iterator_base.hh> +# include <mln/core/internal/site_iterator_base.hh> # include <mln/core/p_bgraph.hh> # include <mln/core/bgraph_psite.hh> @@ -49,10 +49,10 @@ // FIXME: check the constraint due to the boost iterators template<typename P> class p_bgraph_piter_ - : public internal::point_iterator_base_< P, p_bgraph_piter_<P> > + : public internal::site_iterator_base_< P, p_bgraph_piter_<P> > { typedef p_bgraph_piter_<P> self_; - typedef internal::point_iterator_base_< P, self_ > super_; + typedef internal::site_iterator_base_< P, self_ > super_; typedef std::pair<typename p_bgraph<P>::node_iterator, typename p_bgraph<P>::node_iterator> iterators_type_; Index: mln/core/neighb.hh --- mln/core/neighb.hh (revision 1982) +++ mln/core/neighb.hh (working copy) @@ -61,12 +61,12 @@ /// Point associated type. typedef mln_point(D) point; - /*! \brief Point_Iterator type to browse the points of a generic + /*! \brief Site_Iterator type to browse the points of a generic * neighborhood w.r.t. the ordering of delta-points. */ typedef dpoints_fwd_piter<D> fwd_niter; - /*! \brief Point_Iterator type to browse the points of a generic + /*! \brief Site_Iterator type to browse the points of a generic * neighborhood w.r.t. the reverse ordering of delta-points. */ typedef dpoints_bkd_piter<D> bkd_niter; Index: mln/core/p_priority_queue_fast_with_array.hh --- mln/core/p_priority_queue_fast_with_array.hh (revision 1982) +++ mln/core/p_priority_queue_fast_with_array.hh (working copy) @@ -40,7 +40,7 @@ # include <algorithm> # include <iterator> -# include <mln/core/internal/point_set_base.hh> +# include <mln/core/internal/site_set_base.hh> # include <mln/core/p_array_piter.hh> # include <mln/accu/bbox.hh> # include <mln/core/p_queue_fast.hh> @@ -67,10 +67,10 @@ { public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_array_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_array_bkd_piter_<P> bkd_piter; /// Constructor. Index: mln/core/box_piter.hh --- mln/core/box_piter.hh (revision 1982) +++ mln/core/box_piter.hh (working copy) @@ -33,7 +33,7 @@ * \brief Definition of iterators on points of boxes. */ -# include <mln/core/internal/point_iterator_base.hh> +# include <mln/core/internal/site_iterator_base.hh> # include <mln/core/concept/box.hh> @@ -47,10 +47,10 @@ * \see mln::box_ */ template <typename P> - class box_fwd_piter_ : public internal::point_iterator_base_< P, box_fwd_piter_<P> > + class box_fwd_piter_ : public internal::site_iterator_base_< P, box_fwd_piter_<P> > { typedef box_fwd_piter_<P> self_; - typedef internal::point_iterator_base_< P, self_ > super_; + typedef internal::site_iterator_base_< P, self_ > super_; public: // Make definitions from super class available. @@ -97,10 +97,10 @@ * \see mln::box_ */ template <typename P> - class box_bkd_piter_ : public internal::point_iterator_base_< P, box_bkd_piter_<P> > + class box_bkd_piter_ : public internal::site_iterator_base_< P, box_bkd_piter_<P> > { typedef box_bkd_piter_<P> self_; - typedef internal::point_iterator_base_< P, self_ > super_; + typedef internal::site_iterator_base_< P, self_ > super_; public: // Make definitions from super class available. @@ -149,10 +149,10 @@ */ template <typename P> - class box_bounds_piter_ : public internal::point_iterator_base_< P, box_bounds_piter_<P> > + class box_bounds_piter_ : public internal::site_iterator_base_< P, box_bounds_piter_<P> > { typedef box_bounds_piter_<P> self_; - typedef internal::point_iterator_base_< P, self_ > super_; + typedef internal::site_iterator_base_< P, self_ > super_; public: // Make definitions from super class available. Index: mln/core/dp_array.hh --- mln/core/dp_array.hh (revision 1982) +++ mln/core/dp_array.hh (working copy) @@ -35,7 +35,7 @@ # include <vector> -# include <mln/core/internal/point_set_base.hh> +# include <mln/core/internal/site_set_base.hh> # include <mln/accu/bbox.hh> @@ -67,12 +67,12 @@ /// Point associated type. typedef mln_point(D) point; - /*! \brief Point_Iterator type to browse the points of a generic + /*! \brief Site_Iterator type to browse the points of a generic * neighborhood w.r.t. the ordering of delta-points. */ typedef dpoints_fwd_piter<D> fwd_niter; - /*! \brief Point_Iterator type to browse the points of a generic + /*! \brief Site_Iterator type to browse the points of a generic * neighborhood w.r.t. the reverse ordering of delta-points. */ typedef dpoints_bkd_piter<D> bkd_niter; Index: mln/core/p_queue_fast.hh --- mln/core/p_queue_fast.hh (revision 1982) +++ mln/core/p_queue_fast.hh (working copy) @@ -39,7 +39,7 @@ # include <algorithm> # include <iterator> -# include <mln/core/internal/point_set_base.hh> +# include <mln/core/internal/site_set_base.hh> # include <mln/core/p_array_piter.hh> # include <mln/accu/bbox.hh> @@ -66,10 +66,10 @@ { public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_array_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_array_bkd_piter_<P> bkd_piter; /// Constructor. Index: mln/core/p_graph_piter.hh --- mln/core/p_graph_piter.hh (revision 1982) +++ mln/core/p_graph_piter.hh (working copy) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_P_GRAPH_PITER_HH # define MLN_CORE_P_GRAPH_PITER_HH -# include <mln/core/internal/point_iterator_base.hh> +# include <mln/core/internal/site_iterator_base.hh> # include <mln/core/p_graph.hh> # include <mln/core/graph_psite.hh> @@ -49,10 +49,10 @@ /// \brief Forward iterator on point sites of a mln::p_graph<P>. template<typename P> class p_graph_fwd_piter_ - : public internal::point_iterator_base_< P, p_graph_fwd_piter_<P> > + : public internal::site_iterator_base_< P, p_graph_fwd_piter_<P> > { typedef p_graph_fwd_piter_<P> self_; - typedef internal::point_iterator_base_< P, self_ > super_; + typedef internal::site_iterator_base_< P, self_ > super_; public: // Make definitions from super class available. @@ -125,10 +125,10 @@ /// \brief Backward iterator on point sites of a mln::p_graph<P>. template<typename P> class p_graph_bkd_piter_ - : public internal::point_iterator_base_< P, p_graph_bkd_piter_<P> > + : public internal::site_iterator_base_< P, p_graph_bkd_piter_<P> > { typedef p_graph_bkd_piter_<P> self_; - typedef internal::point_iterator_base_< P, self_ > super_; + typedef internal::site_iterator_base_< P, self_ > super_; public: // Make definitions from super class available. Index: mln/core/graph_elt_window.hh --- mln/core/graph_elt_window.hh (revision 1982) +++ mln/core/graph_elt_window.hh (working copy) @@ -76,11 +76,11 @@ // FIXME: This is a dummy value. typedef void dpoint; - /// \brief Point_Iterator type to browse the psites of the window + /// \brief Site_Iterator type to browse the psites of the window /// w.r.t. the ordering of vertices. typedef graph_window_fwd_piter<P, self_> fwd_qiter; - /// \brief Point_Iterator type to browse the psites of the window + /// \brief Site_Iterator type to browse the psites of the window /// w.r.t. the reverse ordering of vertices. typedef graph_window_bkd_piter<P, self_> bkd_qiter; @@ -92,7 +92,7 @@ /// \{ /// Compute the set of sites for this window around \a piter. template <typename Piter> - void compute_sites_(Point_Iterator<Piter>& piter) const; + void compute_sites_(Site_Iterator<Piter>& piter) const; /// \} /// Interface of the concept Window. @@ -129,7 +129,7 @@ template <typename Piter> inline void - graph_elt_window<P>::compute_sites_(Point_Iterator<Piter>& piter_) const + graph_elt_window<P>::compute_sites_(Site_Iterator<Piter>& piter_) const { Piter& piter = exact(piter_); util::node_id ref_node_id = piter.p_ref().id(); Index: mln/core/pset_if_piter.hh --- mln/core/pset_if_piter.hh (revision 1982) +++ mln/core/pset_if_piter.hh (working copy) @@ -33,7 +33,7 @@ * \brief Definition of iterators on points of pset_ifes. */ -# include <mln/core/concept/point_iterator.hh> +# include <mln/core/concept/site_iterator.hh> # include <mln/core/internal/piter_adaptor.hh> # include <mln/core/pset_if.hh> Index: mln/core/p_array_bb.hh --- mln/core/p_array_bb.hh (revision 1982) +++ mln/core/p_array_bb.hh (working copy) @@ -35,7 +35,7 @@ # include <vector> -# include <mln/core/internal/point_set_base.hh> +# include <mln/core/internal/site_set_base.hh> # include <mln/accu/bbox.hh> @@ -66,10 +66,10 @@ /// The associated point type. typedef mln_point(P) point; - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_array_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_array_bkd_piter_<P> bkd_piter; /// Constructor. Index: mln/core/p_array_piter.hh --- mln/core/p_array_piter.hh (revision 1982) +++ mln/core/p_array_piter.hh (working copy) @@ -98,10 +98,10 @@ // /// \brief Backward iterator on points of a p_array<P>. // template <typename P> // struct p_array_bkd_piter_ -// : public internal::point_iterator_base_< P, p_array_bkd_piter_<P> > +// : public internal::site_iterator_base_< P, p_array_bkd_piter_<P> > // { // typedef p_array_bkd_piter_<P> self_; -// typedef internal::point_iterator_base_< P, self_ > super_; +// typedef internal::site_iterator_base_< P, self_ > super_; // public: // /// The associated psite type. // typedef P psite; Index: mln/core/dpoints_piter.hh --- mln/core/dpoints_piter.hh (revision 1982) +++ mln/core/dpoints_piter.hh (working copy) @@ -35,7 +35,7 @@ */ # include <vector> -# include <mln/core/internal/point_iterator_base.hh> +# include <mln/core/internal/site_iterator_base.hh> # include <mln/core/concept/point_site.hh> @@ -48,7 +48,7 @@ * The parameter \c D is the type of delta-points. */ template <typename D> - class dpoints_fwd_piter : public internal::point_iterator_base_< mln_point(D), dpoints_fwd_piter<D> > + class dpoints_fwd_piter : public internal::site_iterator_base_< mln_point(D), dpoints_fwd_piter<D> > { public: @@ -106,7 +106,7 @@ * The parameter \c D is the type of delta-points. */ template <typename D> - class dpoints_bkd_piter : public internal::point_iterator_base_< mln_point(D), dpoints_bkd_piter<D> > + class dpoints_bkd_piter : public internal::site_iterator_base_< mln_point(D), dpoints_bkd_piter<D> > { public: Index: mln/core/p_line_graph.hh --- mln/core/p_line_graph.hh (revision 1982) +++ mln/core/p_line_graph.hh (working copy) @@ -29,7 +29,7 @@ # define MLN_CORE_LINE_GRAPH_P_HH # include <mln/core/concept/point_site.hh> -# include <mln/core/internal/point_set_base.hh> +# include <mln/core/internal/site_set_base.hh> # include <mln/accu/bbox.hh> # include <mln/util/graph.hh> # include <mln/util/tracked_ptr.hh> @@ -68,10 +68,10 @@ /// Point_Site associated type. typedef line_graph_psite<P> psite; - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_line_graph_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_line_graph_bkd_piter_<P> bkd_piter; /// Return The number of points (sites) of the set, i.e., the Index: mln/core/p_image2d.hh --- mln/core/p_image2d.hh (revision 1982) +++ mln/core/p_image2d.hh (working copy) @@ -34,7 +34,7 @@ * \brief Definition of a point set class based on a image of booleans. */ -# include <mln/core/internal/point_set_base.hh> +# include <mln/core/internal/site_set_base.hh> # include <mln/core/box2d.hh> # include <mln/core/image2d.hh> # include <mln/core/sub_image.hh> @@ -61,10 +61,10 @@ typedef image2d<bool> image_type; - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_image2d_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_image2d_bkd_piter_<P> bkd_piter; /// Constructor. Index: mln/core/p_image2d_piter.hh --- mln/core/p_image2d_piter.hh (revision 1982) +++ mln/core/p_image2d_piter.hh (working copy) @@ -41,10 +41,10 @@ /// \brief Forward iterator on points of a p_array<P>. template <typename P> struct p_image2d_fwd_piter_ - : public internal::point_iterator_base_< P, p_image2d_fwd_piter_<P> > + : public internal::site_iterator_base_< P, p_image2d_fwd_piter_<P> > { typedef p_image2d_fwd_piter_<P> self_; - typedef internal::point_iterator_base_< P, self_ > super_; + typedef internal::site_iterator_base_< P, self_ > super_; public: /// The associated psite type. typedef P psite; @@ -92,10 +92,10 @@ /// \brief Backward iterator on points of a p_array<P>. template <typename P> struct p_image2d_bkd_piter_ - : public internal::point_iterator_base_< P, p_image2d_bkd_piter_<P> > + : public internal::site_iterator_base_< P, p_image2d_bkd_piter_<P> > { typedef p_image2d_bkd_piter_<P> self_; - typedef internal::point_iterator_base_< P, self_ > super_; + typedef internal::site_iterator_base_< P, self_ > super_; public: /// The associated psite type. typedef P psite; Index: mln/core/p_line_graph_piter.hh --- mln/core/p_line_graph_piter.hh (revision 1982) +++ mln/core/p_line_graph_piter.hh (working copy) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_P_LINE_GRAPH_PITER_HH # define MLN_CORE_P_LINE_GRAPH_PITER_HH -# include <mln/core/internal/point_iterator_base.hh> +# include <mln/core/internal/site_iterator_base.hh> # include <mln/core/p_line_graph.hh> # include <mln/core/line_graph_psite.hh> @@ -49,10 +49,10 @@ /// \brief Forward iterator on point sites of a mln::p_line_graph<P>. template<typename P> class p_line_graph_fwd_piter_ - : public internal::point_iterator_base_< P, p_line_graph_fwd_piter_<P> > + : public internal::site_iterator_base_< P, p_line_graph_fwd_piter_<P> > { typedef p_line_graph_fwd_piter_<P> self_; - typedef internal::point_iterator_base_< P, self_ > super_; + typedef internal::site_iterator_base_< P, self_ > super_; public: // Make definitions from super class available. @@ -129,10 +129,10 @@ /// \brief Backward iterator on point sites of a mln::p_line_graph<P>. template<typename P> class p_line_graph_bkd_piter_ - : public internal::point_iterator_base_< P, p_line_graph_bkd_piter_<P> > + : public internal::site_iterator_base_< P, p_line_graph_bkd_piter_<P> > { typedef p_line_graph_bkd_piter_<P> self_; - typedef internal::point_iterator_base_< P, self_ > super_; + typedef internal::site_iterator_base_< P, self_ > super_; public: // Make definitions from super class available. Index: mln/core/w_window.hh --- mln/core/w_window.hh (revision 1982) +++ mln/core/w_window.hh (working copy) @@ -69,10 +69,10 @@ typedef mln::window<D> window; - /// Point_Iterator type to browse (forward) the points of a generic w_window. + /// Site_Iterator type to browse (forward) the points of a generic w_window. typedef with_w_< dpoints_fwd_piter<D>, W > fwd_qiter; - /// Point_Iterator type to browse (backward) the points of a generic w_window. + /// Site_Iterator type to browse (backward) the points of a generic w_window. typedef with_w_< dpoints_bkd_piter<D>, W > bkd_qiter; Index: mln/core/line_graph_elt_window.hh --- mln/core/line_graph_elt_window.hh (revision 1982) +++ mln/core/line_graph_elt_window.hh (working copy) @@ -76,11 +76,11 @@ // FIXME: This is a dummy value. typedef void dpoint; - /// \brief Point_Iterator type to browse the psites of the window + /// \brief Site_Iterator type to browse the psites of the window /// w.r.t. the ordering of edges. typedef line_graph_window_fwd_piter<P, self_> fwd_qiter; - /// \brief Point_Iterator type to browse the psites of the window + /// \brief Site_Iterator type to browse the psites of the window /// w.r.t. the reverse ordering of edges. typedef line_graph_window_bkd_piter<P, self_> bkd_qiter; @@ -92,7 +92,7 @@ /// \{ /// Compute the set of sites for this window around \a piter. template <typename Piter> - void compute_sites_(Point_Iterator<Piter>& piter) const; + void compute_sites_(Site_Iterator<Piter>& piter) const; /// \} /// Interface of the concept Window. @@ -129,7 +129,7 @@ template <typename Piter> inline void - line_graph_elt_window<P>::compute_sites_(Point_Iterator<Piter>& piter_) const + line_graph_elt_window<P>::compute_sites_(Site_Iterator<Piter>& piter_) const { Piter& piter = exact(piter_); sites_t& sites = piter.sites(); Index: mln/core/p_queue.hh --- mln/core/p_queue.hh (revision 1982) +++ mln/core/p_queue.hh (working copy) @@ -38,7 +38,7 @@ # include <algorithm> # include <iterator> -# include <mln/core/internal/point_set_base.hh> +# include <mln/core/internal/site_set_base.hh> # include <mln/core/p_array_piter.hh> # include <mln/accu/bbox.hh> @@ -67,10 +67,10 @@ { public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_array_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_array_bkd_piter_<P> bkd_piter; /// Constructor. Index: mln/core/clock_neighb.hh --- mln/core/clock_neighb.hh (revision 1982) +++ mln/core/clock_neighb.hh (working copy) @@ -60,12 +60,12 @@ /// Point associated type. typedef mln_point(D) point; - /*! \brief Point_Iterator type to browse the points of a generic + /*! \brief Site_Iterator type to browse the points of a generic * neighborhood w.r.t. the ordering of delta-points. */ typedef dpoints_fwd_piter<D> fwd_niter; - /*! \brief Point_Iterator type to browse the points of a generic + /*! \brief Site_Iterator type to browse the points of a generic * neighborhood w.r.t. the reverse ordering of delta-points. * * !!! Be careful the start delta point become the last now. Index: mln/core/p_graph.hh --- mln/core/p_graph.hh (revision 1982) +++ mln/core/p_graph.hh (working copy) @@ -29,7 +29,7 @@ # define MLN_CORE_P_GRAPH_HH # include <mln/core/concept/point_site.hh> -# include <mln/core/internal/point_set_base.hh> +# include <mln/core/internal/site_set_base.hh> # include <mln/accu/bbox.hh> # include <mln/util/tracked_ptr.hh> # include <mln/util/graph.hh> @@ -62,10 +62,10 @@ /// Point_Site associated type. typedef graph_psite<P> psite; - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_graph_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_graph_bkd_piter_<P> bkd_piter; /// Return The number of points (sites) of the set, i.e., the Index: mln/core/hexa.hh --- mln/core/hexa.hh (revision 1982) +++ mln/core/hexa.hh (working copy) @@ -134,11 +134,11 @@ typedef point2d_h psite; /// FIXME : should it be in box2d_h? - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef hexa_fwd_piter_<box2d> fwd_piter; /// FIXME : should it be in box2d_h? - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef hexa_bkd_piter_<box2d> bkd_piter; Index: mln/core/line_piter.hh --- mln/core/line_piter.hh (revision 1982) +++ mln/core/line_piter.hh (working copy) @@ -35,7 +35,7 @@ * \todo Rename as box_line_piter. */ -# include <mln/core/internal/point_iterator_base.hh> +# include <mln/core/internal/site_iterator_base.hh> # include <mln/core/box.hh> namespace mln @@ -47,10 +47,10 @@ */ template <typename P> class line_piter_ : - public internal::point_iterator_base_< P, line_piter_<P> > + public internal::site_iterator_base_< P, line_piter_<P> > { typedef line_piter_<P> self_; - typedef internal::point_iterator_base_< P, self_ > super_; + typedef internal::site_iterator_base_< P, self_ > super_; public: // Make definitions from super class available. Index: mln/core/graph_elt_neighborhood.hh --- mln/core/graph_elt_neighborhood.hh (revision 1982) +++ mln/core/graph_elt_neighborhood.hh (working copy) @@ -77,11 +77,11 @@ // FIXME: This is a dummy value. typedef void dpoint; - /// \brief Point_Iterator type to browse the psites of the + /// \brief Site_Iterator type to browse the psites of the /// neighborhood w.r.t. the ordering of vertices. typedef graph_neighborhood_fwd_piter<P, self_> fwd_niter; - /// \brief Point_Iterator type to browse the psites of the + /// \brief Site_Iterator type to browse the psites of the /// neighborhood w.r.t. the reverse ordering of vertices. typedef graph_neighborhood_bkd_piter<P, self_> bkd_niter; @@ -93,7 +93,7 @@ /// \{ /// Compute the set of sites for this neighborhood around \a piter. template <typename Piter> - void compute_sites_(Point_Iterator<Piter>& piter) const; + void compute_sites_(Site_Iterator<Piter>& piter) const; /// \} }; @@ -104,7 +104,7 @@ template <typename Piter> inline void - graph_elt_neighborhood<P>::compute_sites_(Point_Iterator<Piter>& piter_) const + graph_elt_neighborhood<P>::compute_sites_(Site_Iterator<Piter>& piter_) const { Piter& piter = exact(piter_); util::node_id ref_node_id = piter.p_ref().id(); Index: mln/core/p_priority_queue.hh --- mln/core/p_priority_queue.hh (revision 1982) +++ mln/core/p_priority_queue.hh (working copy) @@ -40,7 +40,7 @@ # include <algorithm> # include <iterator> -# include <mln/core/internal/point_set_base.hh> +# include <mln/core/internal/site_set_base.hh> # include <mln/core/p_array_piter.hh> # include <mln/accu/bbox.hh> # include <mln/core/p_queue.hh> @@ -67,10 +67,10 @@ { public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_array_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_array_bkd_piter_<P> bkd_piter; /// Constructor. Index: mln/core/p_set.hh --- mln/core/p_set.hh (revision 1982) +++ mln/core/p_set.hh (working copy) @@ -33,7 +33,7 @@ * \brief Definition of a point set class based on std::set. */ -# include <mln/core/internal/point_set_base.hh> +# include <mln/core/internal/site_set_base.hh> # include <mln/core/internal/set_of.hh> # include <mln/accu/bbox.hh> # include <mln/core/p_array.hh> @@ -57,10 +57,10 @@ public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_array_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_array_bkd_piter_<P> bkd_piter; /// Constructor. Index: mln/core/line2d.hh --- mln/core/line2d.hh (revision 1982) +++ mln/core/line2d.hh (working copy) @@ -35,7 +35,7 @@ # include <vector> -# include <mln/core/internal/point_set_base.hh> +# include <mln/core/internal/site_set_base.hh> # include <mln/core/p_array_piter.hh> # include <mln/core/box2d.hh> # include <mln/math/all.hh> @@ -51,10 +51,10 @@ { public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_array_fwd_piter_<point2d> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_array_bkd_piter_<point2d> bkd_piter; Index: mln/core/p_bgraph.hh --- mln/core/p_bgraph.hh (revision 1982) +++ mln/core/p_bgraph.hh (working copy) @@ -31,7 +31,7 @@ # include <utility> # include <mln/core/concept/point_site.hh> -# include <mln/core/internal/point_set_base.hh> +# include <mln/core/internal/site_set_base.hh> # include <mln/accu/bbox.hh> # include <mln/util/internal/boost_graph.hh> # include <mln/core/bgraph_psite.hh> @@ -56,10 +56,10 @@ /// Point_Site associated type. typedef bgraph_psite<P> psite; - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_bgraph_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_bgraph_piter_<P> bkd_piter; /// Graph vertex/edge identifier Index: mln/core/p_run.hh --- mln/core/p_run.hh (revision 1982) +++ mln/core/p_run.hh (working copy) @@ -33,7 +33,7 @@ * \brief Definition of a point set class based on std::set. */ -# include <mln/core/internal/point_set_base.hh> +# include <mln/core/internal/site_set_base.hh> # include <mln/core/internal/set_of.hh> # include <mln/accu/bbox.hh> @@ -57,10 +57,10 @@ { public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_run_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_run_bkd_piter_<P> bkd_piter; /// Constructor without argument. Index: mln/core/p_run_piter.hh --- mln/core/p_run_piter.hh (revision 1982) +++ mln/core/p_run_piter.hh (working copy) @@ -43,10 +43,10 @@ * */ template <typename P> - struct p_run_fwd_piter_ : public internal::point_iterator_base_< P, p_run_fwd_piter_<P> > + struct p_run_fwd_piter_ : public internal::site_iterator_base_< P, p_run_fwd_piter_<P> > { typedef p_run_fwd_piter_<P> self_; - typedef internal::point_iterator_base_< P, self_ > super_; + typedef internal::site_iterator_base_< P, self_ > super_; public: // Make definitions from super class available. @@ -98,10 +98,10 @@ * */ template <typename P> - struct p_run_bkd_piter_ : public internal::point_iterator_base_< P, p_run_bkd_piter_<P> > + struct p_run_bkd_piter_ : public internal::site_iterator_base_< P, p_run_bkd_piter_<P> > { typedef p_run_bkd_piter_<P> self_; - typedef internal::point_iterator_base_< P, self_ > super_; + typedef internal::site_iterator_base_< P, self_ > super_; public: // Make definitions from super class available. Index: mln/core/pset_if.hh --- mln/core/pset_if.hh (revision 1982) +++ mln/core/pset_if.hh (working copy) @@ -33,7 +33,7 @@ * \brief Definition of the restriction of a point set w.r.t. a predicate. */ -# include <mln/core/internal/point_set_base.hh> +# include <mln/core/internal/site_set_base.hh> # include <mln/core/concept/function.hh> @@ -73,10 +73,10 @@ typedef mln_psite(super_) psite; - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef pset_if_fwd_piter_<S,F> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef mln::internal::fixme bkd_piter; Index: mln/core/p_array.hh --- mln/core/p_array.hh (revision 1982) +++ mln/core/p_array.hh (working copy) @@ -35,7 +35,7 @@ # include <vector> -# include <mln/core/internal/point_set_base.hh> +# include <mln/core/internal/site_set_base.hh> # include <mln/core/internal/pseudo_site_base.hh> # include <mln/accu/bbox.hh> @@ -132,10 +132,10 @@ /// The associated site type. typedef typename super::site site; - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_array_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_array_fwd_piter_<P> bkd_piter; // HOT: FIXME /// Constructor. Index: mln/core/concept/proxy.hh --- mln/core/concept/proxy.hh (revision 1982) +++ mln/core/concept/proxy.hh (working copy) @@ -34,6 +34,7 @@ */ # include <mln/core/concept/object.hh> +# include <mln/core/internal/force_exact.hh> # include <mln/trait/all.hh> Index: mln/core/concept/box.hh --- mln/core/concept/box.hh (revision 1982) +++ mln/core/concept/box.hh (working copy) @@ -33,7 +33,7 @@ * \brief Definition of the concept of mln::Box. */ -# include <mln/core/concept/point_set.hh> +# include <mln/core/concept/site_set.hh> namespace mln Index: mln/core/concept/doc/image.hh --- mln/core/concept/doc/image.hh (revision 1982) +++ mln/core/concept/doc/image.hh (working copy) @@ -143,12 +143,12 @@ /*! \brief Forward point iterator associated type. - * \invariant This type has to derive from mln::Point_Iterator. + * \invariant This type has to derive from mln::Site_Iterator. */ typedef void fwd_piter; /*! \brief Backward point iterator associated type. - * \invariant This type has to derive from mln::Point_Iterator. + * \invariant This type has to derive from mln::Site_Iterator. */ typedef void bkd_piter; Index: mln/core/concept/doc/weighted_window.hh --- mln/core/concept/doc/weighted_window.hh (revision 1982) +++ mln/core/concept/doc/weighted_window.hh (working copy) @@ -46,12 +46,12 @@ struct Weighted_Window : public Object<E> { - /*! \brief Point_Iterator type associated to this weighted_window to browse its + /*! \brief Site_Iterator type associated to this weighted_window to browse its * points in a forward way. */ typedef void fwd_qiter; - /*! \brief Point_Iterator type associated to this weighted_window to browse its + /*! \brief Site_Iterator type associated to this weighted_window to browse its * points in a backward way. */ typedef void bkd_qiter; Index: mln/core/concept/doc/point_iterator.hh --- mln/core/concept/doc/point_iterator.hh (revision 1982) +++ mln/core/concept/doc/point_iterator.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file mln/core/concept/doc/point_iterator.hh - * \brief This file documents the concept of mln::Point_Iterator. +/*! \file mln/core/concept/doc/site_iterator.hh + * \brief This file documents the concept of mln::Site_Iterator. */ namespace mln @@ -35,12 +35,12 @@ namespace doc { - /*! \brief Documentation class for mln::Point_Iterator. + /*! \brief Documentation class for mln::Site_Iterator. * - * \see mln::Point_Iterator + * \see mln::Site_Iterator */ template <typename E> - struct Point_Iterator : public Iterator<E>, + struct Site_Iterator : public Iterator<E>, public Generalized_Point<E> { /*! \brief Point_Site associated type. Index: mln/core/concept/doc/window.hh --- mln/core/concept/doc/window.hh (revision 1982) +++ mln/core/concept/doc/window.hh (working copy) @@ -45,17 +45,17 @@ template <typename E> struct Window : public Object<E> { - /*! \brief Point_Iterator type associated to this window to browse its + /*! \brief Site_Iterator type associated to this window to browse its * points. */ typedef void qiter; - /*! \brief Point_Iterator type associated to this window to browse its + /*! \brief Site_Iterator type associated to this window to browse its * points in a forward way. */ typedef void fwd_qiter; - /*! \brief Point_Iterator type associated to this window to browse its + /*! \brief Site_Iterator type associated to this window to browse its * points in a backward way. */ typedef void bkd_qiter; Index: mln/core/concept/doc/neighborhood.hh --- mln/core/concept/doc/neighborhood.hh (revision 1982) +++ mln/core/concept/doc/neighborhood.hh (working copy) @@ -42,17 +42,17 @@ template <typename E> struct Neighborhood : public Object<E> { - /*! \brief Point_Iterator type associated to this neighborhood to browse + /*! \brief Site_Iterator type associated to this neighborhood to browse * neighbors. */ typedef void niter; - /*! \brief Point_Iterator type associated to this neighborhood to browse + /*! \brief Site_Iterator type associated to this neighborhood to browse * neighbors in a forward way. */ typedef void fwd_niter; - /*! \brief Point_Iterator type associated to this neighborhood to browse + /*! \brief Site_Iterator type associated to this neighborhood to browse * neighbors in a backward way. */ typedef void bkd_niter; Index: mln/core/concept/doc/site_set.hh --- mln/core/concept/doc/site_set.hh (revision 1981) +++ mln/core/concept/doc/site_set.hh (working copy) @@ -25,7 +25,7 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/*! \file mln/core/concept/doc/point_set.hh +/*! \file mln/core/concept/doc/site_set.hh * \brief This file documents the concept of mln::Site_Set. */ Index: mln/core/concept/image.hh --- mln/core/concept/image.hh (revision 1982) +++ mln/core/concept/image.hh (working copy) @@ -32,7 +32,7 @@ * \brief Definition of the concept of mln::Image. */ -# include <mln/core/concept/point_set.hh> +# include <mln/core/concept/site_set.hh> # include <mln/core/concept/mesh.hh> # include <mln/core/trait/all.hh> // FIXME: Move out of core! Index: mln/core/concept/site_set.hh --- mln/core/concept/site_set.hh (revision 1981) +++ mln/core/concept/site_set.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_CONCEPT_POINT_SET_HH -# define MLN_CORE_CONCEPT_POINT_SET_HH +#ifndef MLN_CORE_CONCEPT_SITE_SET_HH +# define MLN_CORE_CONCEPT_SITE_SET_HH -/*! \file mln/core/concept/point_set.hh +/*! \file mln/core/concept/site_set.hh * * \brief Definition of the concept of mln::Site_Set. * @@ -36,7 +36,7 @@ */ # include <mln/core/concept/point_site.hh> -# include <mln/core/concept/point_iterator.hh> +# include <mln/core/concept/site_iterator.hh> # include <mln/trait/site_sets.hh> # include <mln/metal/not_equal.hh> # include <mln/metal/is_a.hh> @@ -238,4 +238,4 @@ # include <mln/core/ops.hh> -#endif // ! MLN_CORE_CONCEPT_POINT_SET_HH +#endif // ! MLN_CORE_CONCEPT_SITE_SET_HH Index: mln/core/p_runs.hh --- mln/core/p_runs.hh (revision 1982) +++ mln/core/p_runs.hh (working copy) @@ -34,8 +34,8 @@ * (for internal use only). */ -# include <mln/core/internal/point_set_base.hh> -# include <mln/core/internal/point_iterator_base.hh> +# include <mln/core/internal/site_set_base.hh> +# include <mln/core/internal/site_iterator_base.hh> # include <mln/core/runs_psite.hh> # include <mln/core/p_run.hh> # include <mln/accu/bbox.hh> @@ -256,7 +256,7 @@ * Parameter \c E is the exact type of the iterator */ template <typename P, typename E> - class p_runs_piter_ : public internal::point_iterator_base_< runs_psite<P>, E > + class p_runs_piter_ : public internal::site_iterator_base_< runs_psite<P>, E > { public: Index: mln/test/predicate.hh --- mln/test/predicate.hh (revision 1982) +++ mln/test/predicate.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/concept/function.hh> -# include <mln/core/concept/point_set.hh> +# include <mln/core/concept/site_set.hh> namespace mln Index: mln/convert/to_image.hh --- mln/convert/to_image.hh (revision 1982) +++ mln/convert/to_image.hh (working copy) @@ -37,7 +37,7 @@ # include <mln/core/image2d.hh> # include <mln/core/image3d.hh> -# include <mln/core/concept/point_set.hh> +# include <mln/core/concept/site_set.hh> # include <mln/core/concept/window.hh> # include <mln/core/concept/weighted_window.hh> # include <mln/core/concept/neighborhood.hh> Index: mln/geom/pmin_pmax.hh --- mln/geom/pmin_pmax.hh (revision 1982) +++ mln/geom/pmin_pmax.hh (working copy) @@ -36,7 +36,7 @@ # include <utility> -# include <mln/core/concept/point_set.hh> +# include <mln/core/concept/site_set.hh> # include <mln/core/concept/box.hh> @@ -65,14 +65,14 @@ /// iterator \p p. template <typename I> std::pair<mln_point(I), mln_point(I)> - pmin_pmax(const Point_Iterator<I>& p); + pmin_pmax(const Site_Iterator<I>& p); /// Compute the minimum and maximum points, \p pmin and \p max, /// when browsing with iterator \p p. template <typename I> void - pmin_pmax(const Point_Iterator<I>& p, mln_point(I)& pmin, mln_point(I)& pmax); + pmin_pmax(const Site_Iterator<I>& p, mln_point(I)& pmin, mln_point(I)& pmax); @@ -84,7 +84,7 @@ template <typename I> inline void - pmin_pmax(const Point_Iterator<I>& p_, mln_point(I)& pmin, mln_point(I)& pmax) + pmin_pmax(const Site_Iterator<I>& p_, mln_point(I)& pmin, mln_point(I)& pmax) { I p = exact(p_); // a copy of p_ @@ -106,7 +106,7 @@ template <typename I> inline std::pair<mln_point(I), mln_point(I)> - pmin_pmax(const Point_Iterator<I>& p) + pmin_pmax(const Site_Iterator<I>& p) { typedef mln_point(I) P; std::pair<P, P> tmp; Index: mln/geom/bbox.hh --- mln/geom/bbox.hh (revision 1982) +++ mln/geom/bbox.hh (working copy) @@ -35,7 +35,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/concept/point_set.hh> +# include <mln/core/concept/site_set.hh> # include <mln/core/concept/box.hh> # include <mln/core/concept/window.hh> # include <mln/core/concept/weighted_window.hh> Index: mln/set/is_subset_of.hh --- mln/set/is_subset_of.hh (revision 1982) +++ mln/set/is_subset_of.hh (working copy) @@ -33,7 +33,7 @@ * \brief Routine to test if a set is a subset of another. */ -# include <mln/core/concept/point_set.hh> +# include <mln/core/concept/site_set.hh> namespace mln { Index: mln/win/cube3d.hh --- mln/win/cube3d.hh (revision 1982) +++ mln/win/cube3d.hh (working copy) @@ -73,12 +73,12 @@ /// Dpoint associated type. typedef dpoint3d dpoint; - /*! \brief Point_Iterator type to browse a cube such as: "for each row + /*! \brief Site_Iterator type to browse a cube such as: "for each row * (increasing), for each column (increasing)." */ typedef dpoints_fwd_piter<dpoint3d> fwd_qiter; - /*! \brief Point_Iterator type to browse a cube such as: "for each row + /*! \brief Site_Iterator type to browse a cube such as: "for each row * (decreasing), for each column (decreasing)." */ typedef dpoints_bkd_piter<dpoint3d> bkd_qiter; Index: mln/win/line.hh --- mln/win/line.hh (revision 1982) +++ mln/win/line.hh (working copy) @@ -66,10 +66,10 @@ /// Dpoint associated type. typedef dpoint_<M, int> dpoint; - /// Point_Iterator type to browse a line forward + /// Site_Iterator type to browse a line forward typedef dpoints_fwd_piter<dpoint> fwd_qiter; - /// Point_Iterator type to browse a line backward + /// Site_Iterator type to browse a line backward typedef dpoints_bkd_piter<dpoint> bkd_qiter; /// Same as fwd_qiter Index: mln/win/rectangle2d.hh --- mln/win/rectangle2d.hh (revision 1982) +++ mln/win/rectangle2d.hh (working copy) @@ -68,12 +68,12 @@ /// Dpoint associated type. typedef dpoint2d dpoint; - /*! \brief Point_Iterator type to browse a rectangle such as: "for each row + /*! \brief Site_Iterator type to browse a rectangle such as: "for each row * (increasing), for each column (increasing)." */ typedef dpoints_fwd_piter<dpoint2d> fwd_qiter; - /*! \brief Point_Iterator type to browse a rectangle such as: "for each row + /*! \brief Site_Iterator type to browse a rectangle such as: "for each row * (decreasing), for each column (decreasing)." */ typedef dpoints_bkd_piter<dpoint2d> bkd_qiter; Index: mln/win/diag2d.hh --- mln/win/diag2d.hh (revision 1982) +++ mln/win/diag2d.hh (working copy) @@ -67,12 +67,12 @@ /// Dpoint associated type. typedef dpoint2d dpoint; - /*! \brief Point_Iterator type to browse a hline such as: "for each row + /*! \brief Site_Iterator type to browse a hline such as: "for each row * (increasing), for each column (increasing)." */ typedef dpoints_fwd_piter<dpoint2d> fwd_qiter; - /*! \brief Point_Iterator type to browse a hline such as: "for each row + /*! \brief Site_Iterator type to browse a hline such as: "for each row * (decreasing), for each column (decreasing)." */ typedef dpoints_bkd_piter<dpoint2d> bkd_qiter; Index: mln/win/backdiag2d.hh --- mln/win/backdiag2d.hh (revision 1982) +++ mln/win/backdiag2d.hh (working copy) @@ -67,12 +67,12 @@ /// Dpoint associated type. typedef dpoint2d dpoint; - /*! \brief Point_Iterator type to browse a hline such as: "for each row + /*! \brief Site_Iterator type to browse a hline such as: "for each row * (increasing), for each column (increasing)." */ typedef dpoints_fwd_piter<dpoint2d> fwd_qiter; - /*! \brief Point_Iterator type to browse a hline such as: "for each row + /*! \brief Site_Iterator type to browse a hline such as: "for each row * (decreasing), for each column (decreasing)." */ typedef dpoints_bkd_piter<dpoint2d> bkd_qiter; Index: mln/win/cuboid3d.hh --- mln/win/cuboid3d.hh (revision 1982) +++ mln/win/cuboid3d.hh (working copy) @@ -86,12 +86,12 @@ /// Dpoint associated type. typedef dpoint3d dpoint; - /// \brief Point_Iterator type to browse a cuboid such as: "for + /// \brief Site_Iterator type to browse a cuboid such as: "for /// each slice (increasing), for each row (increasing), for each /// column (increasing)." typedef dpoints_fwd_piter<dpoint3d> fwd_qiter; - /// \brief Point_Iterator type to browse a cuboid such as: "for + /// \brief Site_Iterator type to browse a cuboid such as: "for /// each slice (decreasing), for each row (decreasing), for each /// column (decreasing)." typedef dpoints_bkd_piter<dpoint3d> bkd_qiter; Index: mln/win/octagon2d.hh --- mln/win/octagon2d.hh (revision 1982) +++ mln/win/octagon2d.hh (working copy) @@ -71,12 +71,12 @@ /// Dpoint associated type. typedef dpoint2d dpoint; - /*! \brief Point_Iterator type to browse a hline such as: "for each row + /*! \brief Site_Iterator type to browse a hline such as: "for each row * (increasing), for each column (increasing)." */ typedef dpoints_fwd_piter<dpoint2d> fwd_qiter; - /*! \brief Point_Iterator type to browse a hline such as: "for each row + /*! \brief Site_Iterator type to browse a hline such as: "for each row * (decreasing), for each column (decreasing)." */ typedef dpoints_bkd_piter<dpoint2d> bkd_qiter; Index: mln/win/disk2d.hh --- mln/win/disk2d.hh (revision 1982) +++ mln/win/disk2d.hh (working copy) @@ -59,12 +59,12 @@ /// Dpoint associated type. typedef dpoint2d dpoint; - /*! \brief Point_Iterator type to browse a hline such as: "for each row + /*! \brief Site_Iterator type to browse a hline such as: "for each row * (increasing), for each column (increasing)." */ typedef dpoints_fwd_piter<dpoint2d> fwd_qiter; - /*! \brief Point_Iterator type to browse a hline such as: "for each row + /*! \brief Site_Iterator type to browse a hline such as: "for each row * (decreasing), for each column (decreasing)." */ typedef dpoints_bkd_piter<dpoint2d> bkd_qiter; Index: mln/util/lazy_set.hh --- mln/util/lazy_set.hh (revision 1982) +++ mln/util/lazy_set.hh (working copy) @@ -357,7 +357,7 @@ needs_update_ = false; } - // FIXME : ambiguous with point_set operator << + // FIXME : ambiguous with site_set operator << // template <typename E> // std::ostream& operator<<(std::ostream& ostr, // const lazy_set_<E>& s) Index: sandbox/duhamel/mesh_p.hh --- sandbox/duhamel/mesh_p.hh (revision 1982) +++ sandbox/duhamel/mesh_p.hh (working copy) @@ -3,7 +3,7 @@ # include <mln/core/concept/point.hh> # include <mln/core/internal/point_set_base.hh> -# include <mln/core/internal/point_iterator_base.hh> +# include <mln/core/internal/site_iterator_base.hh> # include <mln/accu/bbox.hh> # include <mln/util/graph.hh> # include "mesh_psite.hh" @@ -22,10 +22,10 @@ /// Point_Site associated type. typedef mesh_psite<P> psite; - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef mesh_p_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef mesh_p_piter_<P> bkd_piter; std::size_t npoints() const; @@ -43,10 +43,10 @@ template<typename P> - class mesh_p_piter_ : public internal::point_iterator_base_< P, mesh_p_piter_<P> > + class mesh_p_piter_ : public internal::site_iterator_base_< P, mesh_p_piter_<P> > { typedef mesh_p_piter_<P> self_; - typedef internal::point_iterator_base_< P, self_ > super_; + typedef internal::site_iterator_base_< P, self_ > super_; public: Index: sandbox/duhamel/queue_p_fast.hh --- sandbox/duhamel/queue_p_fast.hh (revision 1982) +++ sandbox/duhamel/queue_p_fast.hh (working copy) @@ -67,10 +67,10 @@ { public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef vec_p_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef vec_p_bkd_piter_<P> bkd_piter; /// Constructor. Index: sandbox/duhamel/queue_p_priority.hh --- sandbox/duhamel/queue_p_priority.hh (revision 1982) +++ sandbox/duhamel/queue_p_priority.hh (working copy) @@ -68,10 +68,10 @@ { public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef vec_p_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef vec_p_bkd_piter_<P> bkd_piter; /// Constructor. Index: sandbox/pellegrin/set/core/p_priority_queue_fast.hh --- sandbox/pellegrin/set/core/p_priority_queue_fast.hh (revision 1982) +++ sandbox/pellegrin/set/core/p_priority_queue_fast.hh (working copy) @@ -82,10 +82,10 @@ { public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_array_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_array_bkd_piter_<P> bkd_piter; /// Constructor. Index: sandbox/pellegrin/set/core/p_bgraph.hh --- sandbox/pellegrin/set/core/p_bgraph.hh (revision 1982) +++ sandbox/pellegrin/set/core/p_bgraph.hh (working copy) @@ -70,10 +70,10 @@ /// Point_Site associated type. typedef bgraph_psite<P> psite; - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_bgraph_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_bgraph_piter_<P> bkd_piter; /// Graph vertex/edge identifier Index: sandbox/pellegrin/set/core/p_run.hh --- sandbox/pellegrin/set/core/p_run.hh (revision 1982) +++ sandbox/pellegrin/set/core/p_run.hh (working copy) @@ -71,10 +71,10 @@ { public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_run_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_run_bkd_piter_<P> bkd_piter; /// Constructor without argument. Index: sandbox/pellegrin/set/core/p_line_graph.hh --- sandbox/pellegrin/set/core/p_line_graph.hh (revision 1982) +++ sandbox/pellegrin/set/core/p_line_graph.hh (working copy) @@ -86,10 +86,10 @@ /// Point associated type. typedef point_pair<P> point; - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_line_graph_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_line_graph_piter_<P> bkd_piter; /// Return The number of points (i.e., nodes) in the graph. Index: sandbox/pellegrin/set/core/pset_if.hh --- sandbox/pellegrin/set/core/pset_if.hh (revision 1982) +++ sandbox/pellegrin/set/core/pset_if.hh (working copy) @@ -84,10 +84,10 @@ typedef mln_psite(super_) psite; - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef pset_if_fwd_piter_<S,F> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef mln::internal::fixme bkd_piter; Index: sandbox/pellegrin/set/core/concept/point_set.hh --- sandbox/pellegrin/set/core/concept/point_set.hh (revision 1982) +++ sandbox/pellegrin/set/core/concept/point_set.hh (working copy) @@ -37,7 +37,7 @@ */ # include <mln/core/concept/point_site.hh> -# include <mln/core/concept/point_iterator.hh> +# include <mln/core/concept/site_iterator.hh> # include <trait/point_set.hh> Index: sandbox/pellegrin/set/core/p_array.hh --- sandbox/pellegrin/set/core/p_array.hh (revision 1982) +++ sandbox/pellegrin/set/core/p_array.hh (working copy) @@ -74,10 +74,10 @@ { public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_array_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_array_bkd_piter_<P> bkd_piter; /// Constructor. Index: sandbox/pellegrin/set/core/p_queue.hh --- sandbox/pellegrin/set/core/p_queue.hh (revision 1982) +++ sandbox/pellegrin/set/core/p_queue.hh (working copy) @@ -80,10 +80,10 @@ { public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_array_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_array_bkd_piter_<P> bkd_piter; /// Constructor. Index: sandbox/pellegrin/set/core/p_priority_queue.hh --- sandbox/pellegrin/set/core/p_priority_queue.hh (revision 1982) +++ sandbox/pellegrin/set/core/p_priority_queue.hh (working copy) @@ -82,10 +82,10 @@ { public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_array_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_array_bkd_piter_<P> bkd_piter; /// Constructor. Index: sandbox/pellegrin/set/core/p_runs.hh --- sandbox/pellegrin/set/core/p_runs.hh (revision 1982) +++ sandbox/pellegrin/set/core/p_runs.hh (working copy) @@ -37,7 +37,7 @@ # include <utility> # include <mln/core/internal/point_set_base.hh> -# include <mln/core/internal/point_iterator_base.hh> +# include <mln/core/internal/site_iterator_base.hh> # include <mln/core/runs_psite.hh> # include <mln/core/p_run.hh> # include <mln/accu/bbox.hh> @@ -269,7 +269,7 @@ * Parameter \c E is the exact type of the iterator */ template <typename P, typename E> - class p_runs_piter_ : public internal::point_iterator_base_< runs_psite<P>, E > + class p_runs_piter_ : public internal::site_iterator_base_< runs_psite<P>, E > { public: Index: sandbox/pellegrin/set/core/p_set.hh --- sandbox/pellegrin/set/core/p_set.hh (revision 1982) +++ sandbox/pellegrin/set/core/p_set.hh (working copy) @@ -73,10 +73,10 @@ public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_array_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_array_bkd_piter_<P> bkd_piter; /// Constructor. Index: sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh --- sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh (revision 1982) +++ sandbox/pellegrin/set/core/p_priority_queue_fast_with_array.hh (working copy) @@ -82,10 +82,10 @@ { public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_array_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_array_bkd_piter_<P> bkd_piter; /// Constructor. Index: sandbox/pellegrin/set/core/line2d.hh --- sandbox/pellegrin/set/core/line2d.hh (revision 1982) +++ sandbox/pellegrin/set/core/line2d.hh (working copy) @@ -66,10 +66,10 @@ { public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_array_fwd_piter_<point2d> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_array_bkd_piter_<point2d> bkd_piter; Index: sandbox/pellegrin/set/core/internal/multi_set.hh --- sandbox/pellegrin/set/core/internal/multi_set.hh (revision 1982) +++ sandbox/pellegrin/set/core/internal/multi_set.hh (working copy) @@ -55,9 +55,9 @@ typedef internal::set_of_<P> super_; public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef multi_set_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef multi_set_bkd_piter_<P> bkd_piter; /// Constructor. Index: sandbox/pellegrin/set/core/internal/uni_set.hh --- sandbox/pellegrin/set/core/internal/uni_set.hh (revision 1982) +++ sandbox/pellegrin/set/core/internal/uni_set.hh (working copy) @@ -55,9 +55,9 @@ typedef internal::set_of_<P> super_; public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef uni_set_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef uni_set_bkd_piter_<P> bkd_piter; /// Constructor. Index: sandbox/pellegrin/set/core/p_graph.hh --- sandbox/pellegrin/set/core/p_graph.hh (revision 1982) +++ sandbox/pellegrin/set/core/p_graph.hh (working copy) @@ -71,10 +71,10 @@ /// Point_Site associated type. typedef graph_psite<P> psite; - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_graph_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_graph_piter_<P> bkd_piter; /// Return The number of points (i.e., nodes) in the graph. Index: sandbox/pellegrin/set/core/p_queue_fast.hh --- sandbox/pellegrin/set/core/p_queue_fast.hh (revision 1982) +++ sandbox/pellegrin/set/core/p_queue_fast.hh (working copy) @@ -79,10 +79,10 @@ { public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef p_array_fwd_piter_<P> fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef p_array_bkd_piter_<P> bkd_piter; /// Constructor. Index: sandbox/nivault/dyn_line.hh --- sandbox/nivault/dyn_line.hh (revision 1982) +++ sandbox/nivault/dyn_line.hh (working copy) @@ -55,10 +55,10 @@ /// Dpoint associated type. typedef dpoint_<M, int> dpoint; - /// Point_Iterator type to browse a dyn_line forward + /// Site_Iterator type to browse a dyn_line forward typedef dpoints_fwd_piter<dpoint> fwd_qiter; - /// Point_Iterator type to browse a dyn_line backward + /// Site_Iterator type to browse a dyn_line backward typedef dpoints_bkd_piter<dpoint> bkd_qiter; /// Same as fwd_qiter Index: sandbox/garrigues/fllt/types.hh --- sandbox/garrigues/fllt/types.hh (revision 1982) +++ sandbox/garrigues/fllt/types.hh (working copy) @@ -68,10 +68,10 @@ { public: - /// Forward Point_Iterator associated type. + /// Forward Site_Iterator associated type. typedef mln_fwd_piter_(box2d) fwd_piter; - /// Backward Point_Iterator associated type. + /// Backward Site_Iterator associated type. typedef mln_bkd_piter_(box2d) bkd_piter; /// Constructor.