- Olena-patches

milena r1179: Add transformed images
by Simon Nivault 26 Sep '07

26 Sep '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-09-26 Simon Nivault <simon.nivault(a)lrde.epita.fr> Add transformed images. * mln/core/tr_image.hh: New. * tests/tr_image.cc: New. --- mln/core/tr_image.hh | 186 +++++++++++++++++++++++++++++++++++++++++++++++++++ tests/tr_image.cc | 66 ++++++++++++++++++ 2 files changed, 252 insertions(+) Index: trunk/milena/tests/tr_image.cc =================================================================== --- trunk/milena/tests/tr_image.cc (revision 0) +++ trunk/milena/tests/tr_image.cc (revision 1179) @@ -0,0 +1,66 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// 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. + +/*! \file tests/image2d_b.cc + * + * \brief Tests on mln::image2d_b. + */ + + +#include <iostream> +#include <mln/fun/x2x/translation.hh> +#include <mln/core/image2d_b.hh> +#include <mln/value/int_u8.hh> +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> +#include <mln/core/tr_image.hh> + +int main() +{ + using namespace mln; + using value::int_u8; + + image2d_b<int_u8> lena = io::pgm::load("../img/lena.pgm"); + image2d_b<int_u8> out(lena.domain()); + + fun::x2x::translation<2,float> rot1(make::vec(10., 10.)); + + tr_image<fun::x2x::translation<2,float>, image2d_b<int_u8> > inter(lena, rot1); + + + image2d_b<int_u8>::fwd_piter p(out.domain()); + + for_all(p) + { + metal::vec<2,int> vec = (image2d_b<int_u8>::point)p; + if (inter.owns_(vec)) + out(p) = inter(vec); + else + out(p) = 255; + } + io::pgm::save(out, "out.pgm"); +} Index: trunk/milena/mln/core/tr_image.hh =================================================================== --- trunk/milena/mln/core/tr_image.hh (revision 0) +++ trunk/milena/mln/core/tr_image.hh (revision 1179) @@ -0,0 +1,186 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// 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_TR_IMAGE_HH +# define MLN_CORE_TR_IMAGE_HH + +/*! \file mln/core/tr_image.hh + * + * \brief Definition of an image class FIXME + */ + +# include <cmath> + +# include <mln/core/internal/image_identity.hh> +# include <mln/metal/vec.hh> + + +namespace mln +{ + + // Fwd decl. + template <typename T, typename I> struct tr_image; + + namespace internal + { + + template <typename T, typename I> + struct data_< tr_image<T,I> > + { + data_(I& ima, T& tr); + + I ima_; + T tr_; + }; + + } // end of namespace mln::internal + + /*! \brief FIXME + * + */ + template <typename T, typename I> + struct tr_image : public mln::internal::image_identity_< I, mln_pset(I), tr_image<T,I> > + { + + /// Super type. + typedef mln::internal::image_identity_< I, mln_pset(I), tr_image<T,I> > super_; + + /// Point_Site associated type. + typedef mln_psite(I) psite; + + /// Value associated type. + typedef mln_value(I) value; + + /// Return type of read-write access. + typedef mln_lvalue(I) lvalue; // FIXME: Depends on lvalue presence in I. + + /// Return type of read-only access. + typedef mln_rvalue(I) rvalue; + + /// Value set associated type. + typedef mln::value::set<value> vset; + + + /// Skeleton. + typedef tr_image< T, tag::image_ > skeleton; + + + /// Constructors. + tr_image(I& ima, T& tr); + tr_image(); + + + /// Test if this image has been initialized. + bool has_data() const; + + /// Test if a pixel value is accessible at \p p. + using super_::owns_; + + /// Test if a pixel value is accessible at \p v. + bool owns_(const mln::metal::vec<I::point::dim, float>& v) const; + + /// Read-only access of pixel value at point site \p p. + /// Mutable access is only OK for reading (not writing). + using super_::operator(); + + mln_value(I) operator()(const mln::metal::vec<I::point::dim, float>& v) const; + + void set_tr(T& tr); + }; + + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + // internal::data_< tr_image<I,S> > + + template <typename T, typename I> + data_< tr_image<T,I> >::data_(I& ima, T& tr) + : ima_(ima), + tr_(tr) + { + } + + } // end of namespace mln::internal + + template <typename T, typename I> + tr_image<T,I>::tr_image(I& ima, T& tr) + { + mln_precondition(ima.has_data()); + this->data_ = new internal::data_< tr_image<T,I> >(ima, tr); + } + + template <typename T, typename I> + tr_image<T,I>::tr_image() + { + } + + template <typename T, typename I> + bool tr_image<T,I>::has_data() const + { + mln_invariant(this->data_->ima_.has_data()); + return true; + } + + template <typename T, typename I> + bool tr_image<T,I>::owns_(const metal::vec<I::point::dim, float>& v) const + { + mln_point(I) p; + metal::vec<I::point::dim, float> v2 = this->data_->tr_.inv()(v); + for (unsigned i = 0; i < I::point::dim; ++i) + p[i] = static_cast<int>(round(v2[i])); + return this->data_->ima_.owns_(p); + } + + template <typename T, typename I> + mln_value(I) + tr_image<T,I>::operator()(const metal::vec<I::point::dim, float>& v) const + { + mln_point(I) p; + metal::vec<I::point::dim, float> v2 = this->data_->tr_.inv()(v); + for (unsigned i = 0; i < I::point::dim; ++i) + p[i] = static_cast<int>(round(v2[i])); + mln_assertion(this->data_->ima_.owns_(p)); + return this->data_->ima_(p); + } + + template <typename T, typename I> + void + tr_image<T,I>::set_tr(T& tr) + { + this->data_->tr_ = tr; + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_CORE_TR_IMAGE_HH

1 0

milena r1178: Update draw mesh
by Guillaume Duhamel 25 Sep '07

25 Sep '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-09-25 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update draw mesh. * draw_mesh.hh, * main.cc: Update. --- draw_mesh.hh | 18 ++++++++++++++++++ main.cc | 12 ++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) Index: trunk/milena/sandbox/duhamel/draw_mesh.hh =================================================================== --- trunk/milena/sandbox/duhamel/draw_mesh.hh (revision 1177) +++ trunk/milena/sandbox/duhamel/draw_mesh.hh (revision 1178) @@ -20,7 +20,25 @@ point2d p2, mln_value(I) link_v) { + mln_dpoint(I) d = p1 - p2; + float e = 0.5; + if (!d[0]) + return; + float e1 = (float)d[1] / (float)d[0]; + std::cout << " " << d[1] << " " << d[0] << " "<< e1 << std::endl; + float e2 = -1.0; + int y = p1[1]; + for (int x = p1[0]; x < p2[0]; ++x) + { + exact(ima)(make::point2d(x,y)) = link_v; + e += e1; + if (e >= 0.5) + { + ++y; + e += e2; + } + } } template <typename I, typename P> Index: trunk/milena/sandbox/duhamel/main.cc =================================================================== --- trunk/milena/sandbox/duhamel/main.cc (revision 1177) +++ trunk/milena/sandbox/duhamel/main.cc (revision 1178) @@ -19,23 +19,23 @@ g.add_node (); g.add_edge (0, 1); - g.add_edge (1, 2); g.add_edge (0, 2); - g.add_edge (2, 3); - g.add_edge (0, 3); +// g.add_edge (0, 2); +// g.add_edge (2, 3); +// g.add_edge (0, 3); g.coherence (); // g.print_debug (); std::vector<point2d> v; v.push_back (make::point2d (1,2)); - v.push_back (make::point2d (14,6)); + v.push_back (make::point2d (5,6)); v.push_back (make::point2d (1,15)); - v.push_back (make::point2d (16,19)); + v.push_back (make::point2d (16,5)); image2d_b<int> ima (20, 20, 1); Mesh_p<point2d> m(g, v); - draw::mesh (ima, m, 42, 1); + draw::mesh (ima, m, 7, 1); debug::println (ima); }

1 0

milena r1177: Add draw mesh in sandbox
by Guillaume Duhamel 25 Sep '07

25 Sep '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-09-25 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add draw mesh in sandbox. * draw_mesh.hh: New. * graph.hh, * main.cc, * mesh_p.hh, * mesh_psite.hh: Update. --- draw_mesh.hh | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ graph.hh | 2 +- main.cc | 17 ++++++++++++++--- mesh_p.hh | 23 +++++++---------------- mesh_psite.hh | 4 ---- 5 files changed, 70 insertions(+), 24 deletions(-) Index: trunk/milena/sandbox/duhamel/mesh_psite.hh =================================================================== --- trunk/milena/sandbox/duhamel/mesh_psite.hh (revision 1176) +++ trunk/milena/sandbox/duhamel/mesh_psite.hh (revision 1177) @@ -5,9 +5,6 @@ namespace mln { - - namespace util - { template<typename P> class Mesh_psite { @@ -19,6 +16,5 @@ unsigned i; Mesh_p* m_ptr; }; - } // end of util } // end of mln #endif // MLN_MESH_PSITE_HH Index: trunk/milena/sandbox/duhamel/graph.hh =================================================================== --- trunk/milena/sandbox/duhamel/graph.hh (revision 1176) +++ trunk/milena/sandbox/duhamel/graph.hh (revision 1177) @@ -83,7 +83,7 @@ void coherence () const; void print_debug () const; - private: + public: unsigned nb_node_; unsigned nb_link_; std::vector<struct s_node<N>*> nodes_; Index: trunk/milena/sandbox/duhamel/draw_mesh.hh =================================================================== --- trunk/milena/sandbox/duhamel/draw_mesh.hh (revision 0) +++ trunk/milena/sandbox/duhamel/draw_mesh.hh (revision 1177) @@ -0,0 +1,48 @@ +#ifndef MLN_DRAW_MESH_HH +# define MLN_DRAW_MESH_HH + +# include <mln/pw/image.hh> +#include <mln/core/image2d_b.hh> +# include <mln/core/point2d.hh> +//# include <mln/pw/cst.hh> +# include <mln/level/fill.hh> +//# include <mln/metal/is_a.hh> +# include "mesh_p.hh" + +namespace mln +{ + namespace draw + { + template <typename I> + void + bresenham(Image& ima, + point2d p1, + point2d p2, + mln_value(I) link_v) + { + + } + + template <typename I, typename P> + void + mesh(Image& ima, const Mesh_p& m, + mln_value(I) node_v, + mln_value(I) link_v) + { + level::fill(ima, 0); + + for (unsigned i = 0; i < m.gr_.nb_link_; ++i) + bresenham (exact(ima), + m.loc_[m.gr_.links_[i]->node1], + m.loc_[m.gr_.links_[i]->node2], + link_v); + + for (unsigned i = 0; i < m.gr_.nb_node_; ++i) + exact(ima)(m.loc_[i]) = node_v; + } + + } // end of draw + +} // end of mln + +#endif // MLN_MESH_PSITE_HH Index: trunk/milena/sandbox/duhamel/main.cc =================================================================== --- trunk/milena/sandbox/duhamel/main.cc (revision 1176) +++ trunk/milena/sandbox/duhamel/main.cc (revision 1177) @@ -1,6 +1,10 @@ +#include <mln/core/image2d_b.hh> +#include <mln/core/point2d.hh> +#include <mln/debug/println.hh> #include "graph.hh" #include "mesh_p.hh" #include "mesh_psite.hh" +#include "draw_mesh.hh" using namespace mln; @@ -21,10 +25,17 @@ g.add_edge (0, 3); g.coherence (); - g.print_debug (); - - // image2d_b<int> out (2, 2, 1); + // g.print_debug (); + std::vector<point2d> v; + v.push_back (make::point2d (1,2)); + v.push_back (make::point2d (14,6)); + v.push_back (make::point2d (1,15)); + v.push_back (make::point2d (16,19)); + image2d_b<int> ima (20, 20, 1); + Mesh_p<point2d> m(g, v); + draw::mesh (ima, m, 42, 1); + debug::println (ima); } Index: trunk/milena/sandbox/duhamel/mesh_p.hh =================================================================== --- trunk/milena/sandbox/duhamel/mesh_p.hh (revision 1176) +++ trunk/milena/sandbox/duhamel/mesh_p.hh (revision 1177) @@ -6,34 +6,25 @@ namespace mln { - namespace util - { - template<typename P> class Mesh_p { public: - Mesh_p () - { - } - Mesh_p (Graph<void>& gr) - : gr_ (gr) + Mesh_p () {} + + Mesh_p (util::Graph<void>& gr, + std::vector& loc) + : gr_ (gr), + loc_ (loc) { } ~Mesh_p () {} - std::vector& loc_get () - { - return loc_; - } - - private: - Graph<void> gr_; + util::Graph<void> gr_; std::vector loc_; // Mesh_psite psite; }; - } // end of util } // end of mln #endif // MLN_MESH_P_HH

1 0

milena r1176: Add image_identity test
by Matthieu Garrigues 25 Sep '07

25 Sep '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-09-25 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Test a diamond inherance for image_identity * sandbox/garrigues/image_identity/image_domain_morpher.hh: New. * sandbox/garrigues/image_identity/image_identity.cc: New. * sandbox/garrigues/image_identity/image_identity.hh: New. * sandbox/garrigues/image_identity/image_value_morpher.hh: New. * sandbox/garrigues/image_identity/interpolated.cc: New. * sandbox/garrigues/image_identity/interpolated.hh: New. * sandbox/garrigues/image_identity: New. --- image_domain_morpher.hh | 122 +++++++++++++++++++++++++++++++ image_identity.cc | 9 ++ image_identity.hh | 77 +++++++++++++++++++ image_value_morpher.hh | 95 ++++++++++++++++++++++++ interpolated.cc | 70 ++++++++++++++++++ interpolated.hh | 185 ++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 558 insertions(+) Index: trunk/milena/sandbox/garrigues/image_identity/image_identity.cc =================================================================== --- trunk/milena/sandbox/garrigues/image_identity/image_identity.cc (revision 0) +++ trunk/milena/sandbox/garrigues/image_identity/image_identity.cc (revision 1176) @@ -0,0 +1,9 @@ +namespace sandbox +{ + +} + +int main() +{ + +} Index: trunk/milena/sandbox/garrigues/image_identity/image_domain_morpher.hh =================================================================== --- trunk/milena/sandbox/garrigues/image_identity/image_domain_morpher.hh (revision 0) +++ trunk/milena/sandbox/garrigues/image_identity/image_domain_morpher.hh (revision 1176) @@ -0,0 +1,122 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// 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_INTERNAL_IMAGE_DOMAIN_MORPHER_HH +# define MLN_CORE_INTERNAL_IMAGE_DOMAIN_MORPHER_HH + +/*! \file mln/core/internal/image_domain_morpher.hh + * + * \brief Definition of a base class for image morphers w.r.t. domain. + */ + +# include <mln/core/internal/image_morpher.hh> + + +namespace mln +{ + + namespace internal + { + + + /*! \brief A base class for image morphers w.r.t. domain. + * + * Parameter \p S is a point set type. + * + * \internal + */ + template <typename I, typename S, typename E> + class image_domain_morpher_ : public virtual image_morpher_<I, S, E> + { + public: + + /// Value_Set associated type. + typedef mln_vset(I) vset; + + /// Value associated type. + typedef mln_value(I) value; + + /// Return type of read-only access. + typedef mln_rvalue(I) rvalue; + + /// Return type of read-write access. + typedef typename internal::morpher_lvalue_::ret lvalue; + + + /// Give the set of values. + const vset& values() const; + + /// Read-only access of pixel value at point site \p p. + rvalue operator()(const mln_psite(S)& p) const; + + /// Read-write access of pixel value at point site \p p. + lvalue operator()(const mln_psite(S)& p); + + protected: + image_domain_morpher_(); + }; + + +# ifndef MLN_INCLUDE_ONLY + + template <typename I, typename S, typename E> + image_domain_morpher_<I,S,E>::image_domain_morpher_() + { + } + + template <typename I, typename S, typename E> + const mln_vset(I)& + image_domain_morpher_<I,S,E>::values() const + { + mln_precondition(this->delegatee_() != 0); + return this->delegatee_()->values(); + } + + template <typename I, typename S, typename E> + mln_rvalue(I) + image_domain_morpher_<I,S,E>::operator()(const mln_psite(S)& p) const + { + mln_precondition(this->delegatee_() != 0); + return this->delegatee_()->operator()(p); + } + + template <typename I, typename S, typename E> + typename image_domain_morpher_<I,S,E>::lvalue + image_domain_morpher_<I,S,E>::operator()(const mln_psite(S)& p) + { + mln_precondition(this->delegatee_() != 0); + return this->delegatee_()->operator()(p); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::internal + +} // end of namespace mln + + +#endif // ! MLN_CORE_INTERNAL_IMAGE_DOMAIN_MORPHER_HH Index: trunk/milena/sandbox/garrigues/image_identity/image_value_morpher.hh =================================================================== --- trunk/milena/sandbox/garrigues/image_identity/image_value_morpher.hh (revision 0) +++ trunk/milena/sandbox/garrigues/image_identity/image_value_morpher.hh (revision 1176) @@ -0,0 +1,95 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// 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_INTERNAL_IMAGE_VALUE_MORPHER_HH +# define MLN_CORE_INTERNAL_IMAGE_VALUE_MORPHER_HH + +/*! \file mln/core/internal/image_value_morpher.hh + * + * \brief Definition of a base class for image morphers w.r.t. value. + */ + +# include <mln/core/internal/image_morpher.hh> + + +namespace mln +{ + + namespace internal + { + + + /*! \brief A base class for image morphers w.r.t. value. + * + * Parameter \p S is a point set type. + * + * \internal + */ + template <typename I, typename E> + class image_value_morpher_ : public virtual image_morpher_<I, mln_pset(I), E> + { + public: + + const mln_pset(I)& domain() const; + bool owns_(const mln_psite(I)& p) const; + + protected: + image_value_morpher_(); + }; + + +# ifndef MLN_INCLUDE_ONLY + + template <typename I, typename E> + image_value_morpher_<I,E>::image_value_morpher_() + { + } + + template <typename I, typename E> + const mln_pset(I)& + image_value_morpher_<I,E>::domain() const + { + mln_precondition(this->delegatee_() != 0); + return this->delegatee_()->domain(); + } + + template <typename I, typename E> + bool + image_value_morpher_<I,E>::owns_(const mln_psite(I)& p) const + { + mln_precondition(this->delegatee_() != 0); + return this->delegatee_()->owns_(p); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::internal + +} // end of namespace mln + + +#endif // ! MLN_CORE_INTERNAL_IMAGE_VALUE_MORPHER_HH Index: trunk/milena/sandbox/garrigues/image_identity/interpolated.hh =================================================================== --- trunk/milena/sandbox/garrigues/image_identity/interpolated.hh (revision 0) +++ trunk/milena/sandbox/garrigues/image_identity/interpolated.hh (revision 1176) @@ -0,0 +1,185 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// 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_INTERPOLATED_HH +# define MLN_CORE_INTERPOLATED_HH + +/*! \file mln/core/interpolated.hh + * + * \brief Definition of an image class FIXME + */ + +# include <cmath> + +# include "image_identity.hh" +# include <mln/metal/vec.hh> + + +namespace mln +{ + + // Fwd decl. + template <typename I> struct interpolated; + + namespace internal + { + + template <typename I> + struct data_< interpolated > + { + data_(I& ima); + + I ima_; + }; + + } // end of namespace mln::internal + + /*! \brief FIXME + * + */ + template <typename I> + struct interpolated : public mln::internal::image_identity_< I, mln_pset(I), interpolated > + { + + typedef mln::internal::image_identity_< I, mln_pset(I), interpolated > super_; + + /// Point_Site associated type. + typedef mln_psite(I) psite; + + /// Value associated type. + typedef mln_value(I) value; + + /// Return type of read-write access. + typedef mln_lvalue(I) lvalue; // FIXME: Depends on lvalue presence in I. + + /// Return type of read-only access. + typedef mln_rvalue(I) rvalue; + + /// Value set associated type. + typedef mln::value::set<value> vset; + + + /// Skeleton. + typedef interpolated< tag::image_ > skeleton; + + + /// Constructors. + interpolated(I& ima); + interpolated(); + + + /// Test if this image has been initialized. + bool has_data() const; + + /// Test if a pixel value is accessible at \p p. + using super_::owns_; + + /// Test if a pixel value is accessible at \p v. + bool owns_(const mln::metal::vec<I::point::dim, float>& v) const; + + /// Read-only access of pixel value at point site \p p. + /// Mutable access is only OK for reading (not writing). + using super_::operator(); + + mln_value(I) operator()(const mln::metal::vec<I::point::dim, float>& v) const; + + + /// Give the set of values of the image. + const vset& values() const; + }; + + + +# ifndef MLN_INCLUDE_ONLY + + namespace internal + { + + // internal::data_< interpolated<I,S> > + + template <typename I> + data_< interpolated >::data_(I& ima) + : ima_(ima) + { + } + + } // end of namespace mln::internal + + template <typename I> + interpolated::interpolated(I& ima) + { + mln_precondition(ima.has_data()); + this->data_ = new internal::data_< interpolated >(ima); + } + + template <typename I> + interpolated::interpolated() + { + } + + template <typename I> + bool interpolated::has_data() const + { + mln_invariant(this->data_->ima_.has_data()); + return true; + } + + template <typename I> + bool interpolated::owns_(const mln::metal::vec<I::point::dim, float>& v) const + { + mln_point(I) p; + for (unsigned i = 0; i < I::point::dim; ++i) + p[i] = static_cast<int>(round(v[i])); + return this->data_->ima_.owns_(p); + } + + template <typename I> + mln_value(I) + interpolated::operator()(const mln::metal::vec<I::point::dim, float>& v) const + { + mln_point(I) p; + for (unsigned i = 0; i < I::point::dim; ++i) + p[i] = static_cast<int>(round(v[i])); + mln_assertion(this->data_->ima_.owns_(p)); + return this->data_->ima_(p); + } + + // FIXME : Should we remove this method? (and inherit it from + // identity morpher) + template <typename I> + const mln::value::set<mln_value(I) >& + interpolated::values() const + { + return vset::the(); + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_CORE_INTERPOLATED_HH Index: trunk/milena/sandbox/garrigues/image_identity/image_identity.hh =================================================================== --- trunk/milena/sandbox/garrigues/image_identity/image_identity.hh (revision 0) +++ trunk/milena/sandbox/garrigues/image_identity/image_identity.hh (revision 1176) @@ -0,0 +1,77 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// 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_INTERNAL_IMAGE_IDENTITY_HH +# define MLN_CORE_INTERNAL_IMAGE_IDENTITY_HH + +/*! \file mln/core/internal/image_identity.hh + * + * \brief Definition of a base class for image morphers w.r.t. identity. + */ + +# include "image_value_morpher.hh" +# include "image_domain_morpher.hh" + +namespace mln +{ + + namespace internal + { + + + /*! \brief A base class for image morphers w.r.t. identity. + * + * Parameter \p S is a point set type. + * + * \internal + */ + template <typename I, typename S, typename E> + class image_identity_ : public image_domain_morpher_<I, S, E>, + public image_value_morpher_<I, E> + { + public: + + protected: + image_identity_(); + }; + + +# ifndef MLN_INCLUDE_ONLY + + template <typename I, typename S, typename E> + image_identity_<I,S,E>::image_identity_() + { + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::internal + +} // end of namespace mln + + +#endif // ! MLN_CORE_INTERNAL_IMAGE_IDENTITY_HH Index: trunk/milena/sandbox/garrigues/image_identity/interpolated.cc =================================================================== --- trunk/milena/sandbox/garrigues/image_identity/interpolated.cc (revision 0) +++ trunk/milena/sandbox/garrigues/image_identity/interpolated.cc (revision 1176) @@ -0,0 +1,70 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// 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. + +/*! \file tests/image2d_b.cc + * + * \brief Tests on mln::image2d_b. + */ + + +#include <iostream> +#include <mln/core/image2d_b.hh> +#include "interpolated.hh" + +#include <mln/metal/vec.hh> + +#include <mln/level/fill.hh> + +#include <mln/debug/println.hh> + + + +int main() +{ + using namespace mln; + + const unsigned nrows = 4; + const unsigned ncols = 4; + const unsigned border = 4; + + image2d_b<float> f(nrows, ncols, border); + float tab[] = {1., 3., 5., 7., + 4., 7., 10., 13., + 7., 11., 15., 19., + 10., 15., 20., 25.}; + level::fill(f, tab); + + interpolated< image2d_b<float> > inter(f); + + metal::vec<2, float> v1 = make::vec(2.3, 0.6); + metal::vec<2, float> v2 = make::vec(3.2, 1.8); + + debug::println(f); + + std::cout << v1 << " : " << inter(v1) << std::endl; + std::cout << v2 << " : " << inter(v2) << std::endl; +}

1 0

milena r1175: Clean interpolated image class
by Matthieu Garrigues 25 Sep '07

25 Sep '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-09-25 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Clean interpolated image class. * mln/core/interpolated.hh: Remove useless methods because of inherited methods from identity morpher. --- interpolated.hh | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) Index: trunk/milena/mln/core/interpolated.hh =================================================================== --- trunk/milena/mln/core/interpolated.hh (revision 1174) +++ trunk/milena/mln/core/interpolated.hh (revision 1175) @@ -64,6 +64,9 @@ template <typename I> struct interpolated : public mln::internal::image_identity_< I, mln_pset(I), interpolated > { + + typedef mln::internal::image_identity_< I, mln_pset(I), interpolated > super_; + /// Point_Site associated type. typedef mln_psite(I) psite; @@ -93,17 +96,14 @@ bool has_data() const; /// Test if a pixel value is accessible at \p p. - bool owns_(const psite& p) const; + using super_::owns_; /// Test if a pixel value is accessible at \p v. bool owns_(const mln::metal::vec<I::point::dim, float>& v) const; /// Read-only access of pixel value at point site \p p. - mln_rvalue(I) operator()(const psite& p) const; - /// Mutable access is only OK for reading (not writing). - mln_lvalue(I) operator()(const psite& p); - + using super_::operator(); mln_value(I) operator()(const mln::metal::vec<I::point::dim, float>& v) const; @@ -149,12 +149,6 @@ } template <typename I> - bool interpolated::owns_(const psite& p) const - { - return this->data_->ima_.owns_(p); - } - - template <typename I> bool interpolated::owns_(const mln::metal::vec<I::point::dim, float>& v) const { mln_point(I) p; @@ -164,21 +158,6 @@ } template <typename I> - mln_rvalue(I) - interpolated::operator()(const psite& p) const - { - mln_precondition(this->data_->ima_.owns_(p)); - return this->data_->ima_(p); - } - - template <typename I> - mln_lvalue(I) - interpolated::operator()(const psite& p) - { - return this->data_->ima_(p); - } - - template <typename I> mln_value(I) interpolated::operator()(const mln::metal::vec<I::point::dim, float>& v) const { @@ -189,6 +168,8 @@ return this->data_->ima_(p); } + // FIXME : Should we remove this method? (and inherit it from + // identity morpher) template <typename I> const mln::value::set<mln_value(I) >& interpolated::values() const

1 0

milena r1174: Rename image_identity morpher
by Matthieu Garrigues 25 Sep '07

25 Sep '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-09-25 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Rename image_identity morpher. * mln/core/internal/image_identity_morpher.hh: Rename as... * mln/core/internal/image_identity.hh: ...this. --- image_identity.hh | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) Index: trunk/milena/mln/core/internal/image_identity_morpher.hh (deleted) =================================================================== Index: trunk/milena/mln/core/internal/image_identity.hh =================================================================== --- trunk/milena/mln/core/internal/image_identity.hh (revision 0) +++ trunk/milena/mln/core/internal/image_identity.hh (revision 1174) @@ -0,0 +1,140 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// 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_INTERNAL_IMAGE_IDENTITY_HH +# define MLN_CORE_INTERNAL_IMAGE_IDENTITY_HH + +/*! \file mln/core/internal/image_identity.hh + * + * \brief Definition of a base class for image morphers w.r.t. identity. + */ + +# include <mln/core/internal/image_morpher.hh> + + +namespace mln +{ + + namespace internal + { + + + /*! \brief A base class for image morphers w.r.t. identity. + * + * Parameter \p S is a point set type. + * + * \internal + */ + template <typename I, typename S, typename E> + class image_identity_ : public image_morpher_<I, S, E> + { + public: + + /// Value_Set associated type. + typedef mln_vset(I) vset; + + /// Value associated type. + typedef mln_value(I) value; + + /// Return type of read-only access. + typedef mln_rvalue(I) rvalue; + + /// Return type of read-write access. + typedef typename internal::morpher_lvalue_::ret lvalue; + + + /// Give the set of values. + const vset& values() const; + + /// Read-only access of pixel value at point site \p p. + rvalue operator()(const mln_psite(S)& p) const; + + /// Read-write access of pixel value at point site \p p. + lvalue operator()(const mln_psite(S)& p); + + const mln_pset(I)& domain() const; + bool owns_(const mln_psite(I)& p) const; + + protected: + image_identity_(); + }; + + +# ifndef MLN_INCLUDE_ONLY + + template <typename I, typename S, typename E> + image_identity_<I,S,E>::image_identity_() + { + } + + template <typename I, typename S, typename E> + const mln_vset(I)& + image_identity_<I,S,E>::values() const + { + mln_precondition(this->delegatee_() != 0); + return this->delegatee_()->values(); + } + + template <typename I, typename S, typename E> + mln_rvalue(I) + image_identity_<I,S,E>::operator()(const mln_psite(S)& p) const + { + mln_precondition(this->delegatee_() != 0); + return this->delegatee_()->operator()(p); + } + + template <typename I, typename S, typename E> + typename image_identity_<I,S,E>::lvalue + image_identity_<I,S,E>::operator()(const mln_psite(S)& p) + { + mln_precondition(this->delegatee_() != 0); + return this->delegatee_()->operator()(p); + } + + template <typename I, typename S, typename E> + const mln_pset(I)& + image_identity_<I,S,E>::domain() const + { + mln_precondition(this->delegatee_() != 0); + return this->delegatee_()->domain(); + } + + template <typename I, typename S, typename E> + bool + image_identity_<I,S,E>::owns_(const mln_psite(I)& p) const + { + mln_precondition(this->delegatee_() != 0); + return this->delegatee_()->owns_(p); + } +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::internal + +} // end of namespace mln + + +#endif // ! MLN_CORE_INTERNAL_IMAGE_IDENTITY_HH

1 0

milena r1173: Add mesh_p in sandbox
by Guillaume Duhamel 25 Sep '07

25 Sep '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-09-25 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Add mesh_p in sandbox. * main.cc: Update. * mesh_p.hh: New. * mesh_psite.hh: New. --- main.cc | 15 +++++++++++---- mesh_p.hh | 39 +++++++++++++++++++++++++++++++++++++++ mesh_psite.hh | 24 ++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 4 deletions(-) Index: trunk/milena/sandbox/duhamel/mesh_psite.hh =================================================================== --- trunk/milena/sandbox/duhamel/mesh_psite.hh (revision 0) +++ trunk/milena/sandbox/duhamel/mesh_psite.hh (revision 1173) @@ -0,0 +1,24 @@ +#ifndef MLN_MESH_PSITE_HH +# define MLN_MESH_PSITE_HH + +# include "mesh_p.hh" + +namespace mln +{ + + namespace util + { + template<typename P> + class Mesh_psite + { + public: + Mesh_psite() {} + ~Mesh_psite() {} + P to_point () {return m_ptr->loc_[i];} + private: + unsigned i; + Mesh_p* m_ptr; + }; + } // end of util +} // end of mln +#endif // MLN_MESH_PSITE_HH Index: trunk/milena/sandbox/duhamel/main.cc =================================================================== --- trunk/milena/sandbox/duhamel/main.cc (revision 1172) +++ trunk/milena/sandbox/duhamel/main.cc (revision 1173) @@ -1,6 +1,6 @@ #include "graph.hh" -//#include "mesh_p.hh" -//#include "mesh_psite.hh" +#include "mesh_p.hh" +#include "mesh_psite.hh" using namespace mln; @@ -12,12 +12,19 @@ g.add_node (); g.add_node (); g.add_node (); + g.add_node (); + g.add_edge (0,1); + g.add_edge (1, 2); + g.add_edge (0, 2); + g.add_edge (2, 3); + g.add_edge (0, 3); + g.coherence (); g.print_debug (); -// image2d_b<int> out (5, 5, 1); + // image2d_b<int> out (2, 2, 1); + - // debug::println_with_border (out); } Index: trunk/milena/sandbox/duhamel/mesh_p.hh =================================================================== --- trunk/milena/sandbox/duhamel/mesh_p.hh (revision 0) +++ trunk/milena/sandbox/duhamel/mesh_p.hh (revision 1173) @@ -0,0 +1,39 @@ +#ifndef MLN_MESH_P_HH +# define MLN_MESH_P_HH + +#include "graph.hh" + +namespace mln +{ + + namespace util + { + + template<typename P> + class Mesh_p + { + public: + Mesh_p () + { + } + Mesh_p (Graph<void>& gr) + : gr_ (gr) + { + } + + ~Mesh_p () {} + + std::vector& loc_get () + { + return loc_; + } + + private: + Graph<void> gr_; + std::vector loc_; + // Mesh_psite psite; + }; + } // end of util +} // end of mln + +#endif // MLN_MESH_P_HH

1 0

milena r1172: Update Graph
by Guillaume Duhamel 25 Sep '07

25 Sep '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-09-25 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update Graph. * graph.hh, * graph.hxx, * main.cc: Update. --- graph.hh | 49 +++++++++++++++++++++++++++++++++++-------------- graph.hxx | 24 +++++++++++++----------- main.cc | 8 +++++--- 3 files changed, 53 insertions(+), 28 deletions(-) Index: trunk/milena/sandbox/duhamel/graph.hh =================================================================== --- trunk/milena/sandbox/duhamel/graph.hh (revision 1171) +++ trunk/milena/sandbox/duhamel/graph.hh (revision 1172) @@ -39,40 +39,61 @@ namespace util { - template<typename N, typename E = void> - class Graph + template<typename T> + struct s_node { - public: - typedef struct s_node + T data; + std::vector<unsigned> links; + }; + + template<> + struct s_node<void> { std::vector<unsigned> links; - } s_node; + }; + + template<typename T> + struct s_edge + { + T data; + unsigned node1; + unsigned node2; + }; - typedef struct s_edge + template<> + struct s_edge <void> { unsigned node1; unsigned node2; - } s_edge; + }; - Graph () {} + template<typename N, typename E = void> + class Graph + { + public: + Graph () : + nb_node_ (0), nb_link_ (0) {} Graph (unsigned nb_node, unsigned nb_link) : nb_node_ (nb_node), nb_link_ (nb_link) {} ~Graph () {} - void add_node (); + + // void add_node (N& elt); + void add_node (void); void add_edge (unsigned n1, unsigned n2); - void coherce (); - void print (); -// void coherence () const; + void coherence () const; + void print_debug () const; + private: unsigned nb_node_; unsigned nb_link_; - std::vector<s_node*> nodes_; - std::vector<s_edge*> links_; + std::vector<struct s_node<N>*> nodes_; + std::vector<struct s_edge<E>*> links_; }; } // end of util } // end of mln + #include "graph.hxx" #endif // MLN_GRAPH_HH Index: trunk/milena/sandbox/duhamel/graph.hxx =================================================================== --- trunk/milena/sandbox/duhamel/graph.hxx (revision 1171) +++ trunk/milena/sandbox/duhamel/graph.hxx (revision 1172) @@ -8,16 +8,18 @@ namespace util { - template<typename N, typename E> inline void - Graph<N, E>::add_node () + Graph<N, E>::add_node (void) { - nodes_.push_back (new s_node); + struct s_node<N>* n = new struct s_node<N>; + + nodes_.push_back (n); ++nb_node_; } + template<typename N, typename E> inline void @@ -26,9 +28,9 @@ mln_precondition(n1 < this->nb_node_); mln_precondition(n2 < this->nb_node_); - s_edge* edge; + struct s_edge<E>* edge; - edge = new s_edge; + edge = new struct s_edge<E>; edge->node1 = n1; edge->node2 = n2; links_.push_back (edge); @@ -39,11 +41,11 @@ template<typename N, typename E> inline void - Graph<N, E>::coherce () + Graph<N, E>::coherence () const { mln_precondition(nodes_.size () == this->nb_node_); mln_precondition(links_.size () == this->nb_link_); - typename std::vector<s_node*>::const_iterator it = nodes_.begin (); + typename std::vector<struct s_node <N>*>::const_iterator it = nodes_.begin (); for (; it != nodes_.end (); ++it) { typename std::vector<unsigned>::const_iterator it2 = (*it)->links.begin (); @@ -51,7 +53,7 @@ mln_precondition((*it2) < nb_node_); } - typename std::vector<s_edge*>::const_iterator it3 = links_.begin (); + typename std::vector<struct s_edge<E>*>::const_iterator it3 = links_.begin (); for (; it3 != links_.end (); ++it3) { mln_precondition((*it3)->node1 < nb_node_); @@ -62,12 +64,12 @@ template<typename N, typename E> inline void - Graph<N, E>::print () + Graph<N, E>::print_debug () const { std::cout << "nodes :" << std::endl; - typename std::vector<s_node*>::const_iterator it = nodes_.begin (); + typename std::vector<struct s_node<N>*>::const_iterator it = nodes_.begin (); int i = 0; for (; it != nodes_.end (); ++it, ++i) { @@ -75,7 +77,7 @@ <::const_iterator it2 = (*it)->links.begin (); - for (; it2 != (*it)->links.end (); ++it2, ++i) + for (; it2 != (*it)->links.end (); ++it2) { std::cout << (*it2) << " "; Index: trunk/milena/sandbox/duhamel/main.cc =================================================================== --- trunk/milena/sandbox/duhamel/main.cc (revision 1171) +++ trunk/milena/sandbox/duhamel/main.cc (revision 1172) @@ -1,18 +1,20 @@ #include "graph.hh" +//#include "mesh_p.hh" +//#include "mesh_psite.hh" using namespace mln; int main (void) { - mln::util::Graph<void> g (0,0); + util::Graph<void> g; g.add_node (); g.add_node (); g.add_node (); g.add_edge (0,1); - g.coherce (); - g.print (); + g.coherence (); + g.print_debug (); // image2d_b<int> out (5, 5, 1);

1 0

milena r1171: Rename image_identity_morpher_ to image_identity_
by Matthieu Garrigues 25 Sep '07

25 Sep '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-09-25 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Rename image_identity_morpher_ to image_identity_. * mln/core/internal/image_identity_morpher.hh, * mln/core/decorated_image.hh, * mln/core/interpolated.hh, * mln/core/safe.hh: Rename. --- decorated_image.hh | 4 ++-- internal/image_identity_morpher.hh | 26 +++++++++++++------------- interpolated.hh | 4 ++-- safe.hh | 6 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) Index: trunk/milena/mln/core/decorated_image.hh =================================================================== --- trunk/milena/mln/core/decorated_image.hh (revision 1170) +++ trunk/milena/mln/core/decorated_image.hh (revision 1171) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_DECORATED_IMAGE_HH # define MLN_CORE_DECORATED_IMAGE_HH -# include <mln/core/internal/image_identity_morpher.hh> +# include <mln/core/internal/image_identity.hh> # include <mln/value/proxy.hh> @@ -74,7 +74,7 @@ template <typename I, typename D> struct decorated_image : public internal::decorated_image_impl_< I, decorated_image<I,D> >, - public internal::image_identity_morpher_< I, mln_pset(I), decorated_image<I,D> > + public internal::image_identity_< I, mln_pset(I), decorated_image<I,D> > { public: typedef decorated_image<I, D> self_; Index: trunk/milena/mln/core/internal/image_identity_morpher.hh =================================================================== --- trunk/milena/mln/core/internal/image_identity_morpher.hh (revision 1170) +++ trunk/milena/mln/core/internal/image_identity_morpher.hh (revision 1171) @@ -25,10 +25,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_CORE_INTERNAL_IMAGE_IDENTITY_MORPHER_HH -# define MLN_CORE_INTERNAL_IMAGE_IDENTITY_MORPHER_HH +#ifndef MLN_CORE_INTERNAL_IMAGE_IDENTITY_HH +# define MLN_CORE_INTERNAL_IMAGE_IDENTITY_HH -/*! \file mln/core/internal/image_identity_morpher.hh +/*! \file mln/core/internal/image_identity.hh * * \brief Definition of a base class for image morphers w.r.t. identity. */ @@ -50,7 +50,7 @@ * \internal */ template <typename I, typename S, typename E> - class image_identity_morpher_ : public image_morpher_<I, S, E> + class image_identity_ : public image_morpher_<I, S, E> { public: @@ -80,20 +80,20 @@ bool owns_(const mln_psite(I)& p) const; protected: - image_identity_morpher_(); + image_identity_(); }; # ifndef MLN_INCLUDE_ONLY template <typename I, typename S, typename E> - image_identity_morpher_<I,S,E>::image_identity_morpher_() + image_identity_<I,S,E>::image_identity_() { } template <typename I, typename S, typename E> const mln_vset(I)& - image_identity_morpher_<I,S,E>::values() const + image_identity_<I,S,E>::values() const { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->values(); @@ -101,15 +101,15 @@ template <typename I, typename S, typename E> mln_rvalue(I) - image_identity_morpher_<I,S,E>::operator()(const mln_psite(S)& p) const + image_identity_<I,S,E>::operator()(const mln_psite(S)& p) const { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->operator()(p); } template <typename I, typename S, typename E> - typename image_identity_morpher_<I,S,E>::lvalue - image_identity_morpher_<I,S,E>::operator()(const mln_psite(S)& p) + typename image_identity_<I,S,E>::lvalue + image_identity_<I,S,E>::operator()(const mln_psite(S)& p) { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->operator()(p); @@ -117,7 +117,7 @@ template <typename I, typename S, typename E> const mln_pset(I)& - image_identity_morpher_<I,S,E>::domain() const + image_identity_<I,S,E>::domain() const { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->domain(); @@ -125,7 +125,7 @@ template <typename I, typename S, typename E> bool - image_identity_morpher_<I,S,E>::owns_(const mln_psite(I)& p) const + image_identity_<I,S,E>::owns_(const mln_psite(I)& p) const { mln_precondition(this->delegatee_() != 0); return this->delegatee_()->owns_(p); @@ -137,4 +137,4 @@ } // end of namespace mln -#endif // ! MLN_CORE_INTERNAL_IMAGE_IDENTITY_MORPHER_HH +#endif // ! MLN_CORE_INTERNAL_IMAGE_IDENTITY_HH Index: trunk/milena/mln/core/interpolated.hh =================================================================== --- trunk/milena/mln/core/interpolated.hh (revision 1170) +++ trunk/milena/mln/core/interpolated.hh (revision 1171) @@ -35,7 +35,7 @@ # include <cmath> -# include <mln/core/internal/image_identity_morpher.hh> +# include <mln/core/internal/image_identity.hh> # include <mln/metal/vec.hh> @@ -62,7 +62,7 @@ * */ template <typename I> - struct interpolated : public mln::internal::image_identity_morpher_< I, mln_pset(I), interpolated > + struct interpolated : public mln::internal::image_identity_< I, mln_pset(I), interpolated > { /// Point_Site associated type. typedef mln_psite(I) psite; Index: trunk/milena/mln/core/safe.hh =================================================================== --- trunk/milena/mln/core/safe.hh (revision 1170) +++ trunk/milena/mln/core/safe.hh (revision 1171) @@ -28,7 +28,7 @@ #ifndef MLN_CORE_SAFE_HH # define MLN_CORE_SAFE_HH -# include <mln/core/internal/image_identity_morpher.hh> +# include <mln/core/internal/image_identity.hh> namespace mln @@ -55,9 +55,9 @@ // FIXME: Doc! template <typename I> - class safe_image : public internal::image_identity_morpher_< I, mln_pset(I), safe_image > + class safe_image : public internal::image_identity_< I, mln_pset(I), safe_image > { - typedef internal::image_identity_morpher_< I, mln_pset(I), safe_image > super_; + typedef internal::image_identity_< I, mln_pset(I), safe_image > super_; public: /// Skeleton.

1 0

milena r1170: Add transformed meshes
by Simon Nivault 25 Sep '07

25 Sep '07

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-09-25 Simon Nivault <simon.nivault(a)lrde.epita.fr> Add transformed meshes. * mln/core/tr_mesh.hh: New. --- tr_mesh.hh | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) Index: trunk/milena/mln/core/tr_mesh.hh =================================================================== --- trunk/milena/mln/core/tr_mesh.hh (revision 0) +++ trunk/milena/mln/core/tr_mesh.hh (revision 1170) @@ -0,0 +1,65 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// 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_TR_MESH_HH +# define MLN_CORE_TR_MESH_HH + +/*! \file mln/core/tr_mesh.hh + * \brief Definition of mln::tr_mesh. + */ + +# include <mln/core/concept/mesh.hh> +# include <mln/core/bool.hh> + + +namespace mln +{ + + /// Base class for implementation classes of tranformed meshes. + template <typename T, typename M> + struct tr_mesh : public Mesh< tr_mesh<T,M> > + { + typedef metal::false_ regular; + + tr_mesh(const T& tr) + : t_(tr) + { + } + + T t_; + }; + + + +# ifndef MLN_INCLUDE_ONLY + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_CORE_TR_MESH_HH

1 0