[Olena-patches] 2572: Add a floating-point 3-dimensional point type.

* mln/core/alias/point3df.hh: New. --- milena/ChangeLog | 6 + milena/mln/core/alias/point3df.hh | 215 +++++++++++++++++++++++++++++++++++++ 2 files changed, 221 insertions(+), 0 deletions(-) create mode 100644 milena/mln/core/alias/point3df.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 3f4208e..860f449 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2008-10-16 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Add a floating-point 3-dimensional point type. + + * mln/core/alias/point3df.hh: New. + +2008-10-16 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Add a floating-point coordinate type. * mln/core/def/coordf.hh: New. diff --git a/milena/mln/core/alias/point3df.hh b/milena/mln/core/alias/point3df.hh new file mode 100644 index 0000000..444db8e --- /dev/null +++ b/milena/mln/core/alias/point3df.hh @@ -0,0 +1,215 @@ +// Copyright (C) 2007, 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. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CORE_ALIAS_POINT3DF_HH +# define MLN_CORE_ALIAS_POINT3DF_HH + +/*! \file mln/core/alias/point3df.hh + * + * \brief Definition of the mln::point3df alias and of its construction + * routine. + */ + +/* FIXME: Factor with mln/core/alias/point3d.hh (these two files are + almost identical). */ + +# include <mln/core/point.hh> +# include <mln/core/def/coordf.hh> +// For site_const_impl and site_mutable_impl: +# include <mln/core/concept/site_proxy.hh> +# include <mln/core/internal/force_exact.hh> + +namespace mln +{ + + /*! \brief Type alias for a point defined on the 3D square grid with + * floating-point coordinates. + */ + typedef point<grid::cube, def::coordf> point3df; + + namespace internal + { + + // Specialization. + + template <typename C, typename E> + struct subject_impl< const point<grid::cube, C>, E > + { + typedef C coordf; + enum { dim = 3 }; + + typedef const C& row_t; + const C& row() const; + + typedef const C& col_t; + const C& col() const; + + typedef const C& sli_t; + const C& sli() const; + + const C& operator[](unsigned i) const; + const C& last_coord() const; + private: + const E& exact_() const; + }; + + + // Specialization for point<M,C>. + + template <typename C, typename E> + struct subject_impl< point<grid::cube, C>, E > : + subject_impl< const point<grid::cube, C>, E > + { + private: + typedef subject_impl< const point<grid::cube, C>, E > super_; + E& exact_(); + public: + + using super_::row; + C& row(); + + using super_::col; + C& col(); + + using super_::sli; + C& sli(); + + using super_::operator[]; + C& operator[](unsigned i); + }; + + + +# ifndef MLN_INCLUDE_ONLY + + // subject_impl + + template <typename C, typename E> + inline + const C& + subject_impl< const point<grid::cube, C>, E >::row() const + { + return exact_().get_subject().row(); + } + + template <typename C, typename E> + inline + const C& + subject_impl< const point<grid::cube, C>, E >::col() const + { + return exact_().get_subject().col(); + } + + template <typename C, typename E> + inline + const C& + subject_impl< const point<grid::cube, C>, E >::sli() const + { + return exact_().get_subject().sli(); + } + + template <typename C, typename E> + inline + const C& + subject_impl< const point<grid::cube, C>, E >::operator[](unsigned i) const + { + mln_precondition(i < 3); + return exact_().get_subject()[i]; + } + + template <typename C, typename E> + inline + const C& + subject_impl< const point<grid::cube, C>, E >::last_coord() const + { + return this->col(); + } + + template <typename C, typename E> + inline + const E& + subject_impl< const point<grid::cube, C>, E >::exact_() const + { + return internal::force_exact<const E>(*this); + } + + // subject_impl + + template <typename C, typename E> + inline + C& + subject_impl< point<grid::cube, C>, E >::row() + { + return exact_().get_subject().row(); + } + + template <typename C, typename E> + inline + C& + subject_impl< point<grid::cube, C>, E >::col() + { + return exact_().get_subject().col(); + } + + template <typename C, typename E> + inline + C& + subject_impl< point<grid::cube, C>, E >::sli() + { + return exact_().get_subject().sli(); + } + + template <typename C, typename E> + inline + C& + subject_impl< point<grid::cube, C>, E >::operator[](unsigned i) + { + mln_precondition(i < 3); + return exact_().get_subject()[i]; + } + + template <typename C, typename E> + inline + E& + subject_impl< point<grid::cube, C>, E >::exact_() + { + return internal::force_exact<E>(*this); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::internal + + +} // end of namespace mln + +// FIXME: File mln/core/alias/dpoint3df does not exist yet. +# if 0 +# include <mln/core/alias/dpoint3df.hh> +# endif + +#endif // ! MLN_CORE_ALIAS_POINT3DF_HH -- 1.6.0.1