Index: ChangeLog from Nicolas Ballas <ballas@lrde.epita.fr> minor modifications. * oln/core/concept/iterator_on_points.hh, * oln/core/concept/point.hh: change class name Generalised_Point to Generalized_Point. * oln/core/concept/generalised_point.hh: Remove. * oln/core/concept/generalized_point.hh: New, Change class name Generalised_Point to Generalized_Point. * oln/core/gen/dpoints_piter.hh, * oln/core/gen/niter_has.hh: Strengthen methods signatures. concept/generalized_point.hh | 14 +++++++------- concept/iterator_on_points.hh | 4 ++-- concept/point.hh | 6 +++--- gen/dpoints_piter.hh | 41 +++++++++++++++++++---------------------- gen/niter_has.hh | 7 +++---- 5 files changed, 34 insertions(+), 38 deletions(-) Index: oln/core/concept/iterator_on_points.hh --- oln/core/concept/iterator_on_points.hh (revision 933) +++ oln/core/concept/iterator_on_points.hh (working copy) @@ -31,7 +31,7 @@ # include <ostream> -# include <oln/core/concept/generalised_point.hh> +# include <oln/core/concept/generalized_point.hh> # include <oln/core/concept/iterator.hh> # include <oln/core/concept/point.hh> @@ -43,7 +43,7 @@ template <typename Exact> struct Iterator_on_Points : public Iterator<Exact>, - virtual public Generalised_Point<Exact> + virtual public Generalized_Point<Exact> { stc_typename(point); Index: oln/core/concept/point.hh --- oln/core/concept/point.hh (revision 933) +++ oln/core/concept/point.hh (working copy) @@ -31,7 +31,7 @@ # include <mlc/value.hh> -# include <oln/core/concept/generalised_point.hh> +# include <oln/core/concept/generalized_point.hh> # include <oln/core/concept/grid.hh> # include <oln/core/concept/operators.hh> @@ -47,9 +47,9 @@ /// Concept-class "Point". template <typename Exact> - struct Point : public Generalised_Point<Exact> + struct Point : public Generalized_Point<Exact> { - stc_using_from(Generalised_Point, dpoint); + stc_using_from(Generalized_Point, dpoint); /// Operator ==. bool op_equal_(const Exact& rhs) const; Index: oln/core/concept/generalized_point.hh --- oln/core/concept/generalized_point.hh (revision 933) +++ oln/core/concept/generalized_point.hh (working copy) @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef OLN_CORE_CONCEPT_GENERALISED_POINTS_HH -# define OLN_CORE_CONCEPT_GENERALISED_POINTS_HH +#ifndef OLN_CORE_CONCEPT_GENERALIZED_POINTS_HH +# define OLN_CORE_CONCEPT_GENERALIZED_POINTS_HH # include <oln/core/equipment.hh> @@ -34,10 +34,10 @@ namespace oln { - // Generalised_Point concept + // Generalized_Point concept template <typename Exact> - struct Generalised_Point : virtual public Any<Exact> + struct Generalized_Point : virtual public Any<Exact> { stc_typename(grid); stc_typename(dim); @@ -47,7 +47,7 @@ enum { n = mlc_value(dim) }; protected: - Generalised_Point(); + Generalized_Point(); }; @@ -55,7 +55,7 @@ # ifndef OLN_INCLUDE_ONLY template <typename Exact> - Generalised_Point<Exact>::Generalised_Point() + Generalized_Point<Exact>::Generalized_Point() { } @@ -63,4 +63,4 @@ } // end of namespace oln -#endif // ! OLN_CORE_CONCEPT_GENERALISED_POINTS_HH +#endif // ! OLN_CORE_CONCEPT_GENERALIZED_POINTS_HH Index: oln/core/gen/dpoints_piter.hh --- oln/core/gen/dpoints_piter.hh (revision 933) +++ oln/core/gen/dpoints_piter.hh (working copy) @@ -28,6 +28,7 @@ #ifndef OLN_CORE_GEN_DPOINTS_PITER_HH # define OLN_CORE_GEN_DPOINTS_PITER_HH +# include <oln/core/concept/generalized_point.hh> # include <oln/core/concept/window.hh> # include <oln/core/concept/neighborhood.hh> # include <oln/core/concept/image.hh> @@ -71,16 +72,14 @@ { public: - // FIXME: Strenghten sigs (Pl is either a Point or an Iterator_on_Points). - template <typename Pl, typename W> - dpoints_fwd_piter_(const Pl& p, const Window<W>& win); + dpoints_fwd_piter_(const Generalized_Point<Pl>& p, const Window<W>& win); template <typename Pl, typename I> - dpoints_fwd_piter_(const Pl& p, const Image_with_Nbh<I>& ima); + dpoints_fwd_piter_(const Generalized_Point<Pl>& p, const Image_with_Nbh<I>& ima); template <typename Pl, typename N> - dpoints_fwd_piter_(const Pl& p, const Neighborhood<N>& nbh); + dpoints_fwd_piter_(const Generalized_Point<Pl>& p, const Neighborhood<N>& nbh); }; // end of class oln::dpoints_fwd_piter_<P> @@ -118,16 +117,14 @@ { public: - // FIXME: Strenghten sigs (Pl is either a Point or an Iterator_on_Points). - template <typename Pl, typename W> - dpoints_bkd_piter_(const Pl& p, const Window<W>& win); + dpoints_bkd_piter_(const Generalized_Point<Pl>& p, const Window<W>& win); template <typename Pl, typename I> - dpoints_bkd_piter_(const Pl& p, const Image_with_Nbh<I>& ima); + dpoints_bkd_piter_(const Generalized_Point<Pl>& p, const Image_with_Nbh<I>& ima); template <typename Pl, typename N> - dpoints_bkd_piter_(const Pl& p, const Neighborhood<N>& nbh); + dpoints_bkd_piter_(const Generalized_Point<Pl>& p, const Neighborhood<N>& nbh); }; // end of class oln::dpoints_bkd_piter_<P> @@ -139,25 +136,25 @@ template <typename P> template <typename Pl, typename W> - dpoints_fwd_piter_<P>::dpoints_fwd_piter_(const Pl& p, const Window<W>& win) + dpoints_fwd_piter_<P>::dpoints_fwd_piter_(const Generalized_Point<Pl>& p, const Window<W>& win) : - internal::dpoints_fwd_piter_impl_<P>(p, exact(win)) + internal::dpoints_fwd_piter_impl_<P>(exact(p), exact(win)) { } template <typename P> template <typename Pl, typename I> - dpoints_fwd_piter_<P>::dpoints_fwd_piter_(const Pl& p, const Image_with_Nbh<I>& ima) + dpoints_fwd_piter_<P>::dpoints_fwd_piter_(const Generalized_Point<Pl>& p, const Image_with_Nbh<I>& ima) : - internal::dpoints_fwd_piter_impl_<P>(p, ima.nbhood()) + internal::dpoints_fwd_piter_impl_<P>(exact(p), ima.nbhood()) { } template <typename P> template <typename Pl, typename N> - dpoints_fwd_piter_<P>::dpoints_fwd_piter_(const Pl& p, const Neighborhood<N>& nbh) + dpoints_fwd_piter_<P>::dpoints_fwd_piter_(const Generalized_Point<Pl>& p, const Neighborhood<N>& nbh) : - internal::dpoints_fwd_piter_impl_<P>(p, exact(nbh)) + internal::dpoints_fwd_piter_impl_<P>(exact(p), exact(nbh)) { } @@ -165,25 +162,25 @@ template <typename P> template <typename Pl, typename W> - dpoints_bkd_piter_<P>::dpoints_bkd_piter_(const Pl& p, const Window<W>& win) + dpoints_bkd_piter_<P>::dpoints_bkd_piter_(const Generalized_Point<Pl>& p, const Window<W>& win) : - internal::dpoints_bkd_piter_impl_<P>(p, exact(win)) + internal::dpoints_bkd_piter_impl_<P>(exact(p), exact(win)) { } template <typename P> template <typename Pl, typename I> - dpoints_bkd_piter_<P>::dpoints_bkd_piter_(const Pl& p, const Image_with_Nbh<I>& ima) + dpoints_bkd_piter_<P>::dpoints_bkd_piter_(const Generalized_Point<Pl>& p, const Image_with_Nbh<I>& ima) : - internal::dpoints_bkd_piter_impl_<P>(p, ima.nbhood()) + internal::dpoints_bkd_piter_impl_<P>(exact(p), ima.nbhood()) { } template <typename P> template <typename Pl, typename N> - dpoints_bkd_piter_<P>::dpoints_bkd_piter_(const Pl& p, const Neighborhood<N>& nbh) + dpoints_bkd_piter_<P>::dpoints_bkd_piter_(const Generalized_Point<Pl>& p, const Neighborhood<N>& nbh) : - internal::dpoints_bkd_piter_impl_<P>(p, exact(nbh)) + internal::dpoints_bkd_piter_impl_<P>(exact(p), exact(nbh)) { } Index: oln/core/gen/niter_has.hh --- oln/core/gen/niter_has.hh (revision 933) +++ oln/core/gen/niter_has.hh (working copy) @@ -28,6 +28,7 @@ #ifndef OLN_CORE_GEN_NITER_HAS_HH # define OLN_CORE_GEN_NITER_HAS_HH +# include <oln/core/concept/generalized_point.hh> # include <oln/core/internal/piter_adaptor.hh> # include <oln/core/gen/dpoints_piter.hh> @@ -68,10 +69,8 @@ { public: - // FIXME: Strenghten sigs (Pl is either a Point or an Iterator_on_Points). - template <typename Pl, typename I> - niter_has_(const Pl& p, const Image_with_Nbh<I>& ima); + niter_has_(const Generalized_Point<Pl>& p, const Image_with_Nbh<I>& ima); void impl_start(); void impl_next(); @@ -89,7 +88,7 @@ template <typename It, typename Ps> template <typename Pl, typename I> - current::niter_has_(const Pl& p, const Image_with_Nbh<I>& ima) + current::niter_has_(const Generalized_Point<Pl>& p, const Image_with_Nbh<I>& ima) : super( It(p, ima) ), pset_( ima.points() )