https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud@lrde.epita.fr> Get consistent naming for p_line2d and dpsites_impl. Ensure consistent naming. * mln/core/site_set/line2d.hh: Rename as... * mln/core/site_set/p_line2d.hh: ...this. * mln/core/internal/dpoints_base.hh: Rename as... * mln/core/internal/dpsites_impl.hh: ...this. (dpoints_base_): Rename as... (dpsites_impl): ...this. * doc/tutorial/examples/p_line2d.cc, * mln/core/site_set/all.hh, * mln/core/image/extension_ima.hh, * mln/core/clock_neighb.hh, * mln/draw/line.hh, * mln/draw/plot.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, * sandbox/pellegrin/set/core/line2d.hh, * sandbox/nivault/dyn_line.hh: Update. Misc. * mln/core/neighborhood.hh: Remove; obsolete because we now fully rely on neighb<W>. * doc/tutorial/examples/window.cc (include): Fix missing. doc/tutorial/examples/p_line2d.cc | 2 +- doc/tutorial/examples/window.cc | 1 + mln/core/clock_neighb.hh | 2 +- mln/core/image/extension_ima.hh | 2 +- mln/core/internal/dpsites_impl.hh | 32 ++++++++++++++++---------------- mln/core/site_set/all.hh | 2 +- mln/core/site_set/p_line2d.hh | 2 +- mln/draw/line.hh | 2 +- mln/draw/plot.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/nivault/dyn_line.hh | 4 ++-- sandbox/pellegrin/set/core/line2d.hh | 2 +- 19 files changed, 43 insertions(+), 42 deletions(-) Index: doc/tutorial/examples/p_line2d.cc --- doc/tutorial/examples/p_line2d.cc (revision 2375) +++ doc/tutorial/examples/p_line2d.cc (working copy) @@ -1,7 +1,7 @@ # include <mln/core/image/image2d.hh> # include <mln/pw/all.hh> -# include <mln/core/site_set/line2d.hh> +# include <mln/core/site_set/p_line2d.hh> # include <mln/core/site_set/p_set.hh> # include <mln/core/image/sub_image.hh> Index: doc/tutorial/examples/window.cc --- doc/tutorial/examples/window.cc (revision 2375) +++ doc/tutorial/examples/window.cc (working copy) @@ -6,6 +6,7 @@ # include <mln/debug/println.hh> # include <mln/core/alias/neighb2d.hh> +# include <mln/convert/to.hh> template <typename I, typename W, typename P> Index: mln/core/site_set/all.hh --- mln/core/site_set/all.hh (revision 2375) +++ mln/core/site_set/all.hh (working copy) @@ -35,7 +35,7 @@ # include <mln/core/site_set/box.hh> -# include <mln/core/site_set/line2d.hh> +# include <mln/core/site_set/p_line2d.hh> # include <mln/core/site_set/p_array.hh> # include <mln/core/site_set/p_centered.hh> # include <mln/core/site_set/p_if.hh> Index: mln/core/site_set/p_line2d.hh --- mln/core/site_set/p_line2d.hh (revision 2375) +++ mln/core/site_set/p_line2d.hh (working copy) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_P_LINE2D_HH # define MLN_CORE_P_LINE2D_HH -/*! \file mln/core/site_set/line2d.hh +/*! \file mln/core/site_set/p_line2d.hh * * \brief Definition of a 2D discrete line of points (based on * p_array). Index: mln/core/image/extension_ima.hh --- mln/core/image/extension_ima.hh (revision 2375) +++ mln/core/image/extension_ima.hh (working copy) @@ -84,7 +84,7 @@ template <typename I, typename J, typename V> struct ch_value< extension_ima<I, J>, V > { - typedef mlc_converts_to(mln_result(J), V) keep_ext; + typedef mlc_converts_to(mln_value(J), V) keep_ext; typedef mln_ch_value(I, V) Iv; typedef extension_ima<Iv, J> Iv_ext; typedef mlc_if(keep_ext, Iv_ext, Iv) ret; Index: mln/core/clock_neighb.hh --- mln/core/clock_neighb.hh (revision 2375) +++ mln/core/clock_neighb.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/neighborhood.hh> -# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/internal/dpsites_impl.hh> # include <mln/core/dpoint.hh> # include <mln/core/site_set/p_array.hh> Index: mln/core/internal/dpsites_impl.hh --- mln/core/internal/dpsites_impl.hh (revision 2375) +++ mln/core/internal/dpsites_impl.hh (working copy) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_INTERNAL_DPOINTS_BASE_HH -# define MLN_CORE_INTERNAL_DPOINTS_BASE_HH +#ifndef MLN_CORE_INTERNAL_DPSITES_IMPL_HH +# define MLN_CORE_INTERNAL_DPSITES_IMPL_HH -/*! \file mln/core/internal/dpoints_base.hh +/*! \file mln/core/internal/dpsites_impl.hh * * \brief Definition of a base class for classes based on a set of dpoints. * @@ -52,7 +52,7 @@ * */ template <typename D, typename E> - class dpoints_base_ + class dpsites_impl { public: @@ -98,7 +98,7 @@ protected: - dpoints_base_(); + dpsites_impl(); void insert(const D& d); @@ -111,27 +111,27 @@ template <typename D, typename E> inline - dpoints_base_<D,E>::dpoints_base_() + dpsites_impl<D,E>::dpsites_impl() { } template <typename D, typename E> inline - bool dpoints_base_<D,E>::is_centered() const + bool dpsites_impl<D,E>::is_centered() const { return win_.is_centered(); } template <typename D, typename E> inline - bool dpoints_base_<D,E>::is_empty() const + bool dpsites_impl<D,E>::is_empty() const { return win_.is_empty(); } template <typename D, typename E> inline - unsigned dpoints_base_<D,E>::delta() const + unsigned dpsites_impl<D,E>::delta() const { return win_.delta(); } @@ -139,7 +139,7 @@ template <typename D, typename E> inline unsigned - dpoints_base_<D,E>::size() const + dpsites_impl<D,E>::size() const { return win_.size(); } @@ -147,7 +147,7 @@ template <typename D, typename E> inline const D& - dpoints_base_<D,E>::dp(unsigned i) const + dpsites_impl<D,E>::dp(unsigned i) const { mln_precondition(i < size()); return win_.dp(i); @@ -156,7 +156,7 @@ template <typename D, typename E> inline const std::vector<D>& - dpoints_base_<D,E>::std_vector() const + dpsites_impl<D,E>::std_vector() const { return win_.std_vector(); } @@ -164,7 +164,7 @@ template <typename D, typename E> inline const std::vector<D>& - dpoints_base_<D,E>::vect() const + dpsites_impl<D,E>::vect() const { return std_vector(); } @@ -172,7 +172,7 @@ template <typename D, typename E> inline bool - dpoints_base_<D,E>::has(const D& dp) const + dpsites_impl<D,E>::has(const D& dp) const { return win_.has(dp); } @@ -180,7 +180,7 @@ template <typename D, typename E> inline void - dpoints_base_<D,E>::insert(const D& d) + dpsites_impl<D,E>::insert(const D& d) { win_.insert(d); } @@ -192,4 +192,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_INTERNAL_DPOINTS_BASE_HH +#endif // ! MLN_CORE_INTERNAL_DPSITES_IMPL_HH Index: mln/draw/line.hh --- mln/draw/line.hh (revision 2375) +++ mln/draw/line.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/site_set/line2d.hh> +# include <mln/core/site_set/p_line2d.hh> # include <mln/level/paste.hh> # include <mln/pw/image.hh> # include <mln/pw/cst.hh> Index: mln/draw/plot.hh --- mln/draw/plot.hh (revision 2375) +++ mln/draw/plot.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/image.hh> -# include <mln/core/site_set/line2d.hh> +# include <mln/core/site_set/p_line2d.hh> # include <mln/level/paste.hh> # include <mln/pw/image.hh> # include <mln/pw/cst.hh> Index: mln/win/cube3d.hh --- mln/win/cube3d.hh (revision 2375) +++ mln/win/cube3d.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/internal/window_base.hh> -# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/internal/dpsites_impl.hh> # include <mln/core/alias/dpoint3d.hh> @@ -64,7 +64,7 @@ * is defined with length = 3. */ struct cube3d : public internal::window_base< dpoint3d, cube3d >, - public internal::dpoints_base_< dpoint3d, cube3d > + public internal::dpsites_impl< dpoint3d, cube3d > { /*! \brief Constructor. * Index: mln/win/line.hh --- mln/win/line.hh (revision 2375) +++ mln/win/line.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/internal/window_base.hh> -# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/internal/dpsites_impl.hh> # include <mln/core/dpoint.hh> @@ -57,7 +57,7 @@ */ template <typename M, unsigned i, typename C> struct line : public internal::window_base< dpoint<M, C>, line<M,i,C> >, - public internal::dpoints_base_< dpoint<M, C>, line<M,i,C> > + public internal::dpsites_impl< dpoint<M, C>, line<M,i,C> > { /*! \brief Constructor. * Index: mln/win/rectangle2d.hh --- mln/win/rectangle2d.hh (revision 2375) +++ mln/win/rectangle2d.hh (working copy) @@ -36,7 +36,7 @@ */ # include <mln/core/internal/window_base.hh> -# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/internal/dpsites_impl.hh> # include <mln/core/alias/dpoint2d.hh> # include <mln/core/def/coord.hh> @@ -59,7 +59,7 @@ * is defined with height = 3 and width = 5. */ struct rectangle2d : public internal::window_base< dpoint2d, rectangle2d >, - public internal::dpoints_base_< dpoint2d, rectangle2d > + public internal::dpsites_impl< dpoint2d, rectangle2d > { /*! \brief Constructor. * Index: mln/win/diag2d.hh --- mln/win/diag2d.hh (revision 2375) +++ mln/win/diag2d.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/internal/window_base.hh> -# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/internal/dpsites_impl.hh> # include <mln/core/alias/dpoint2d.hh> @@ -58,7 +58,7 @@ * is defined with length = 5. */ struct diag2d : public internal::window_base< dpoint2d, diag2d >, - public internal::dpoints_base_< dpoint2d, diag2d > + public internal::dpsites_impl< dpoint2d, diag2d > { /*! \brief Constructor. * Index: mln/win/backdiag2d.hh --- mln/win/backdiag2d.hh (revision 2375) +++ mln/win/backdiag2d.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/internal/window_base.hh> -# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/internal/dpsites_impl.hh> # include <mln/core/alias/dpoint2d.hh> @@ -58,7 +58,7 @@ * is defined with length = 5. */ struct backdiag2d : public internal::window_base< dpoint2d, backdiag2d >, - public internal::dpoints_base_< dpoint2d, backdiag2d > + public internal::dpsites_impl< dpoint2d, backdiag2d > { /*! \brief Constructor. * Index: mln/win/cuboid3d.hh --- mln/win/cuboid3d.hh (revision 2375) +++ mln/win/cuboid3d.hh (working copy) @@ -32,7 +32,7 @@ /// \brief Definition of the mln::win::cuboid3d window. # include <mln/core/internal/window_base.hh> -# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/internal/dpsites_impl.hh> # include <mln/core/alias/dpoint3d.hh> @@ -74,7 +74,7 @@ http://en.wikipedia.org/wiki/Cuboid */ struct cuboid3d : public internal::window_base< dpoint3d, cuboid3d >, - public internal::dpoints_base_< dpoint3d, cuboid3d > + public internal::dpsites_impl< dpoint3d, cuboid3d > { /// \brief Constructor. /// Index: mln/win/octagon2d.hh --- mln/win/octagon2d.hh (revision 2375) +++ mln/win/octagon2d.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/internal/window_base.hh> -# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/internal/dpsites_impl.hh> # include <mln/core/alias/dpoint2d.hh> @@ -62,7 +62,7 @@ * is defined with L = 7 (l = 1). */ struct octagon2d : public internal::window_base< dpoint2d, octagon2d >, - public internal::dpoints_base_< dpoint2d, octagon2d > + public internal::dpsites_impl< dpoint2d, octagon2d > { /*! \brief Constructor. * Index: mln/win/disk2d.hh --- mln/win/disk2d.hh (revision 2375) +++ mln/win/disk2d.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/internal/window_base.hh> -# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/internal/dpsites_impl.hh> # include <mln/core/alias/dpoint2d.hh> @@ -50,7 +50,7 @@ * */ struct disk2d : public internal::window_base< dpoint2d, disk2d >, - public internal::dpoints_base_< dpoint2d, disk2d > + public internal::dpsites_impl< dpoint2d, disk2d > { /*! \brief Constructor. * Index: sandbox/pellegrin/set/core/line2d.hh --- sandbox/pellegrin/set/core/line2d.hh (revision 2375) +++ sandbox/pellegrin/set/core/line2d.hh (working copy) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_SITE_SET_LINE2D_HH # define MLN_CORE_SITE_SET_LINE2D_HH -/*! \file mln/core/site_set/line2d.hh +/*! \file mln/core/site_set/p_line2d.hh * * \brief Definition of a point set class based on std::vector. */ Index: sandbox/nivault/dyn_line.hh --- sandbox/nivault/dyn_line.hh (revision 2375) +++ sandbox/nivault/dyn_line.hh (working copy) @@ -34,7 +34,7 @@ */ # include <mln/core/concept/window.hh> -# include <mln/core/internal/dpoints_base.hh> +# include <mln/core/internal/dpsites_impl.hh> # include <mln/core/dpoint.hh> # include <mln/core/dpsites_piter.hh> @@ -47,7 +47,7 @@ template <typename M, typename C> struct dyn_line : public Window< dyn_line<M,C> >, - public internal::dpoints_base_<dpoint_<M, C>, point_<M, C> > + public internal::dpsites_impl<dpoint_<M, C>, point_<M, C> > { /// Point associated type. typedef point_<M, int> point;