June 2008 - Olena-patches

2054: Fix apps/statues/mesh-segm.
by Roland Levillain 23 Jun '08

23 Jun '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix apps/statues/mesh-segm. * apps/statues/mesh-segm.cc (main): Actually use a vector of curv_t (int) instead of a vector of floats. mesh-segm.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) Index: apps/statues/mesh-segm.cc --- apps/statues/mesh-segm.cc (revision 2053) +++ apps/statues/mesh-segm.cc (working copy) @@ -25,6 +25,12 @@ // reasons why the executable file might be covered by the GNU General // Public License. +/// \file apps/statues/mesh-segm.cc +/// \brief A program performing a WST-based segmentation of the +/// surface of the (triangle) mesh of a statue. + +// FIXME: Factor commons parts between mesh-segm and mesh-skel. + #include <cstdlib> #include <cmath> @@ -82,10 +88,10 @@ // Computation of the mean curvature on each vertex of the mesh. mesh.need_curvatures(); /* FIXME: Our implementation of the WST doesn't work well with - floats. Convert floating point values to a proportional integer - value for the moment. */ + floats (yet). Convert floating point values to a proportional + integer value for the moment. */ typedef int curv_t; - std::vector<float> vertex_h_inv(mesh.vertices.size(), 0.f); + std::vector<curv_t> vertex_h_inv(mesh.vertices.size(), 0.f); for (unsigned v = 0; v < mesh.vertices.size(); ++v) { float h = (mesh.curv1[v] + mesh.curv2[v]) / 2;

1 0

2053: Clean up ChangeLogs
by Roland Levillain 21 Jun '08

21 Jun '08

URL: https://svn.lrde.epita.fr/svn/oln/trunk Index: milena/ChangeLog =================================================================== --- milena/ChangeLog (revision 2052) +++ milena/ChangeLog (revision 2053) @@ -31,7 +31,7 @@ Fix priority queue-based point sets. These problems were spotted using TESTS_CXXFLAGS_DEBUG. - * mln/core/p_priority_queue.hh: + * mln/core/p_priority_queue.hh: (mln::p_priority_queue<P, T>::queue_map_t): New typedef. Use it... (mln::p_priority_queue<P, T>::q_): ...here, and fix the type @@ -134,10 +134,10 @@ (graph_psite(const p_graph&, util::vertex_id)): Likewise. * mln/core/p_line_graph_piter.hh - (p_line_graph_fwd_piter_::next_): + (p_line_graph_fwd_piter_::next_): (p_line_graph_bkd_piter_::next_): Adjust. - * tests/morpho/lena_line_graph_image_wst1.cc: Adjust. + * tests/morpho/lena_line_graph_image_wst1.cc: Adjust. 2008-06-07 Ugo Jardonnet <jardonnet(a)lrde.epita.fr> @@ -214,7 +214,7 @@ Add more documentation. Aesthetic changes. (mln::accu::count_<T>::result) - (mln::accu::volume_::result): + (mln::accu::volume_::result): Remove useless typedef. * mln/accu/volume.hh: (mln::accu::volume_::height__): Rename member as... @@ -225,7 +225,7 @@ (mln::accu::volume_::init): Likewise. Actually initialize all members. (mln::accu::count_adjacent_vertices_<P, V>::set_value): Reset - member ref_level__ and area__. + member ref_level__ and area__. * mln/accu/count_adjacent_vertices.hh (mln::accu::count_adjacent_vertices_<P, V>::set_value): Reset member vertices_. @@ -325,7 +325,7 @@ Have graph vertex and edge creation return the created identifier. - * mln/util/internal/graph_base.hh: + * mln/util/internal/graph_base.hh: (mln::util::internal::graph_base<N, E>::add_node_) (mln::util::internal::graph_base<N, E>::add_edge_) * mln/util/graph.hh @@ -346,7 +346,7 @@ * mln/morpho/erosion.hh (erosion_on_function_, erosion_on_set_): Change 'has' to 'owns_'. * mln/morpho/dilation.hh - (dilation_on_function_, dilation_on_set_): Likewise. + (dilation_on_function_, dilation_on_set_): Likewise. * mln/labeling/regional_minima.hh (regional_minima_functor): Fix initialization of 'attr'; use the proper command instead of ctor call. Index: ChangeLog =================================================================== --- ChangeLog (revision 2052) +++ ChangeLog (revision 2053) @@ -6,7 +6,7 @@ Autoconfiscate trimesh2. - * configure.ac: Require Autoconf 2.16 and Automake 1.10. + * configure.ac: Require Autoconf 2.61 and Automake 1.10. Configure external/Makefile. Configure subdirectory external/trimesh/. Fix the definition of TESTS_CXXFLAGS_DEBUG. @@ -22,7 +22,7 @@ * external/: New directory. * external/README: New. - * external/trimesh/ + * external/trimesh/, * external/trimesh/COPYING, * external/trimesh/Makedefs.Darwin, * external/trimesh/Makedefs.Linux,

1 0

cleanup-2008 2052: Prefer p() than p_ in site iterators.
by Thierry Geraud 20 Jun '08

20 Jun '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Prefer p() than p_ in site iterators. For optimization purpose, we can have in site iterators a couple of current location (see, e.g., in pset_if_piter.hh we have this->p_ inherited plus the local pi_ attribute). * mln/core/internal/site_iterator_base.hh (p): New. (current_p_): New; can be overridden. * mln/core/box_piter.hh: Update. * mln/core/pset_if_piter.hh: Update. * mln/core/box.hh: Update. box.hh | 3 +++ box_piter.hh | 36 ++++++++++++++++++------------------ internal/site_iterator_base.hh | 23 +++++++++++++++++++---- pset_if_piter.hh | 11 +++++++---- 4 files changed, 47 insertions(+), 26 deletions(-) Index: mln/core/internal/site_iterator_base.hh --- mln/core/internal/site_iterator_base.hh (revision 2051) +++ mln/core/internal/site_iterator_base.hh (working copy) @@ -41,6 +41,13 @@ # include <mln/core/concept/site_iterator.hh> # include <mln/core/concept/pseudo_site.hh> // Use of if_possible::change_target. +// site_iterator_base<S> where S is a Site_Set +// { +// s_ : const S* +// } + + + namespace mln { @@ -96,6 +103,12 @@ /// Change the iterator target. void change_target(const S& s); + mln_psite(S)& p() { return exact(this)->current_p_(); } + const mln_psite(S)& p() const { return exact(this)->current_p_(); } + + mln_psite(S)& current_p_() { return p_; } + const mln_psite(S)& current_p_() const { return p_; } + protected: site_iterator_base(); @@ -103,6 +116,8 @@ /// The target. const S* s_; + private: + /// The psite designated by this iterator. mln_psite(S) p_; }; @@ -131,7 +146,7 @@ site_iterator_base<S, E>::to_site() const { mln_precondition(exact(*this).is_valid()); // FIXME: OK? - return internal::to_site( exact(this)->unproxy() ); + return internal::to_site( p() ); } template <typename S, typename E> @@ -139,7 +154,7 @@ const mln_psite(S)& site_iterator_base<S, E>::unproxy() const { - return p_; + return p(); } template <typename S, typename E> @@ -156,9 +171,9 @@ site_iterator_base<S, E>::change_target(const S& s) { s_ = & s; - // p_ might be also updated since it can hold a pointer towards + // p might be also updated since it can hold a pointer towards // the set it designates, so: - if_possible::change_target(p_, s); + if_possible::change_target(p(), s); // Last: this->invalidate(); } Index: mln/core/box_piter.hh --- mln/core/box_piter.hh (revision 2051) +++ mln/core/box_piter.hh (working copy) @@ -79,9 +79,9 @@ /// Go to the next point. void next_(); - protected: + using super_::p; - using super_::p_; + protected: using super_::s_; }; @@ -126,9 +126,9 @@ /// Go to the next point. void next_(); - protected: + using super_::p; - using super_::p_; + protected: using super_::s_; }; @@ -158,7 +158,7 @@ bool box_fwd_piter_::is_valid_() const { - return p_[0] != s_->pmax()[0] + 1; + return p()[0] != s_->pmax()[0] + 1; } template <typename P> @@ -166,7 +166,7 @@ void box_fwd_piter_::invalidate_() { - p_[0] = s_->pmax()[0] + 1; + p()[0] = s_->pmax()[0] + 1; } template <typename P> @@ -174,7 +174,7 @@ void box_fwd_piter_::start_() { - p_ = s_->pmin(); + p() = s_->pmin(); } template <typename P> @@ -183,14 +183,14 @@ box_fwd_piter_::next_() { for (int i = dim - 1; i >= 0; --i) - if (p_[i] == s_->pmax()[i]) - p_[i] = s_->pmin()[i]; + if (p()[i] == s_->pmax()[i]) + p()[i] = s_->pmin()[i]; else { - ++p_[i]; + ++p()[i]; break; } - if (p_ == s_->pmin()) + if (p() == s_->pmin()) invalidate_(); } @@ -215,7 +215,7 @@ bool box_bkd_piter_::is_valid_() const { - return p_[0] != s_->pmin()[0] - 1; + return p()[0] != s_->pmin()[0] - 1; } template <typename P> @@ -223,7 +223,7 @@ void box_bkd_piter_::invalidate_() { - p_[0] = s_->pmin()[0] - 1; + p()[0] = s_->pmin()[0] - 1; } template <typename P> @@ -231,7 +231,7 @@ void box_bkd_piter_::start_() { - p_ = s_->pmax(); + p() = s_->pmax(); } template <typename P> @@ -240,14 +240,14 @@ box_bkd_piter_::next_() { for (int i = dim - 1; i >= 0; --i) - if (p_[i] == s_->pmin()[i]) - p_[i] = s_->pmax()[i]; + if (p()[i] == s_->pmin()[i]) + p()[i] = s_->pmax()[i]; else { - --p_[i]; + --p()[i]; break; } - if (p_ == s_->pmax()) + if (p() == s_->pmax()) invalidate_(); } Index: mln/core/pset_if_piter.hh --- mln/core/pset_if_piter.hh (revision 2051) +++ mln/core/pset_if_piter.hh (working copy) @@ -76,6 +76,9 @@ mln_fwd_piter(S)& hook_pi_() { return pi_; } + mln_psite(S)& current_p_() { return pi_.p(); } + const mln_psite(S)& current_p_() const { return pi_.p(); } + private: mln_fwd_piter(S) pi_; @@ -134,8 +137,8 @@ pi_.start(); while (pi_.is_valid() && ! this->s_->pred(pi_)) pi_.next(); - if (is_valid_()) - this->p_ = pi_; +// if (is_valid_()) +// this->p_ = pi_; } template <typename S, typename F> @@ -146,8 +149,8 @@ do pi_.next(); while (pi_.is_valid() && ! this->s_->pred(pi_)); - if (is_valid_()) - this->p_ = pi_; +// if (is_valid_()) +// this->p_ = pi_; } Index: mln/core/box.hh --- mln/core/box.hh (revision 2051) +++ mln/core/box.hh (working copy) @@ -85,6 +85,9 @@ /// Forward Site_Iterator associated type. typedef box_fwd_piter_ fwd_piter; + /// Site_Iterator associated type. + typedef fwd_piter piter; + /// Backward Site_Iterator associated type. typedef box_bkd_piter_ bkd_piter;

1 0

cleanup-2008 2051: Fix typo.
by Thierry Geraud 20 Jun '08

20 Jun '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix typo. * mln/core/pset_array.hh, * mln/core/dpoints_piter.hh, * mln/core/decorated_image.hh, * mln/core/image_if.hh, * mln/core/line_piter.hh, * mln/core/image_if_interval.hh, * mln/core/safe.hh, * mln/core/concept/doc/value_iterator.hh, * mln/core/concept/doc/point_iterator.hh, * mln/core/plain.hh, * mln/core/p_runs.hh, * mln/value/proxy.hh, * mln/value/graylevel.hh, * mln/value/graylevel_f.hh, * mln/value/internal/gray_.hh, * mln/value/internal/gray_f.hh, * mln/value/viter.hh, * mln/value/float01.hh, * mln/value/label.hh, * mln/convert/all.hh, * mln/util/branch_iter_ind.hh, * mln/util/branch_iter.hh, * sandbox/pellegrin/set/core/p_runs.hh, * sandbox/geraud/cs2d/dbl_neighb.hh, * sandbox/geraud/cs2d/cs2d_morpho.hh (convertion): Fix typo. mln/convert/all.hh | 4 ++-- mln/core/concept/doc/point_iterator.hh | 2 +- mln/core/concept/doc/value_iterator.hh | 2 +- mln/core/decorated_image.hh | 2 +- mln/core/dpoints_piter.hh | 4 ++-- mln/core/image_if.hh | 2 +- mln/core/image_if_interval.hh | 2 +- mln/core/line_piter.hh | 2 +- mln/core/p_runs.hh | 6 +++--- mln/core/plain.hh | 2 +- mln/core/pset_array.hh | 4 ++-- mln/core/safe.hh | 2 +- mln/util/branch_iter.hh | 2 +- mln/util/branch_iter_ind.hh | 2 +- mln/value/float01.hh | 2 +- mln/value/graylevel.hh | 2 +- mln/value/graylevel_f.hh | 2 +- mln/value/internal/gray_.hh | 4 ++-- mln/value/internal/gray_f.hh | 6 +++--- mln/value/label.hh | 2 +- mln/value/proxy.hh | 8 ++++---- mln/value/viter.hh | 4 ++-- sandbox/geraud/cs2d/cs2d_morpho.hh | 2 +- sandbox/geraud/cs2d/dbl_neighb.hh | 2 +- sandbox/pellegrin/set/core/p_runs.hh | 6 +++--- 25 files changed, 39 insertions(+), 39 deletions(-) Index: mln/core/pset_array.hh --- mln/core/pset_array.hh (revision 2050) +++ mln/core/pset_array.hh (working copy) @@ -223,13 +223,13 @@ void next_(); - /// Convertion into a point. + /// Conversion into a point. operator point () const; /// Reference to the corresponding point. const point& to_point() const; - /// Convertion into a point-site. + /// Conversion into a point-site. operator psite () const; /// Access to the current point coordinates. Index: mln/core/dpoints_piter.hh --- mln/core/dpoints_piter.hh (revision 2050) +++ mln/core/dpoints_piter.hh (working copy) @@ -61,7 +61,7 @@ dpoints_fwd_piter(const Dps& dps, // FIXME: explicitly set_of_<D>? const Point_Site<Pref>& p_ref); - /// Convertion to point. + /// Conversion to point. operator mln_point(D) () const; /// Reference to the corresponding point. @@ -119,7 +119,7 @@ dpoints_bkd_piter(const Dps& dps, // FIXME: explicitly set_of_<D>? const Point_Site<Pref>& p_ref); - /// Convertion to point. + /// Conversion to point. operator mln_point(D) () const; /// Reference to the corresponding point. Index: mln/core/decorated_image.hh --- mln/core/decorated_image.hh (revision 2050) +++ mln/core/decorated_image.hh (working copy) @@ -107,7 +107,7 @@ mln_value(I) read_(const mln_psite(I)& p) const; - /// Const promotion via convertion. + /// Const promotion via conversion. operator decorated_image<const I, D>() const; /// Give the decoration. Index: mln/core/image_if.hh --- mln/core/image_if.hh (revision 2050) +++ mln/core/image_if.hh (working copy) @@ -107,7 +107,7 @@ /// Give the definition domain. const pset_if<mln_pset(I), F>& domain() const; - /// Const promotion via convertion. + /// Const promotion via conversion. operator image_if<const I, F>() const; }; Index: mln/core/line_piter.hh --- mln/core/line_piter.hh (revision 2050) +++ mln/core/line_piter.hh (working copy) @@ -62,7 +62,7 @@ */ line_piter_(const box_& b); - /// Convertion to point. + /// Conversion to point. operator P() const; /// Reference to the corresponding point. Index: mln/core/image_if_interval.hh --- mln/core/image_if_interval.hh (revision 2050) +++ mln/core/image_if_interval.hh (working copy) @@ -100,7 +100,7 @@ /// Constructor without argument. image_if_interval(); - /// Const promotion via convertion. + /// Const promotion via conversion. operator image_if_interval<const I>() const; }; Index: mln/core/safe.hh --- mln/core/safe.hh (revision 2050) +++ mln/core/safe.hh (working copy) @@ -82,7 +82,7 @@ typedef typename super_::lvalue lvalue; lvalue operator()(const mln_psite(I)& p); - /// Const promotion via convertion. + /// Const promotion via conversion. operator safe_image<const I>() const; }; Index: mln/core/concept/doc/value_iterator.hh --- mln/core/concept/doc/value_iterator.hh (revision 2050) +++ mln/core/concept/doc/value_iterator.hh (working copy) @@ -46,7 +46,7 @@ */ typedef void value; - /*! \brief Convertion into a value. + /*! \brief Conversion into a value. * * \return A value. */ Index: mln/core/concept/doc/point_iterator.hh --- mln/core/concept/doc/point_iterator.hh (revision 2050) +++ mln/core/concept/doc/point_iterator.hh (working copy) @@ -48,7 +48,7 @@ */ typedef void psite; - /*! \brief Convertion into a point-site. + /*! \brief Conversion into a point-site. * * \return A point site. */ Index: mln/core/plain.hh --- mln/core/plain.hh (revision 2050) +++ mln/core/plain.hh (working copy) @@ -99,7 +99,7 @@ plain& operator=(const I& rhs); - /// Convertion into an I image + /// Conversion into an I image operator I () const; }; Index: mln/core/p_runs.hh --- mln/core/p_runs.hh (revision 2050) +++ mln/core/p_runs.hh (working copy) @@ -260,7 +260,7 @@ { public: - /// Convertion into a point. + /// Conversion into a point. operator P () const; /// Reference to the corresponding point. @@ -362,7 +362,7 @@ /// Go to the next point. void next_(); - /// Convertion into a point-site. + /// Conversion into a point-site. operator runs_psite () const; protected: @@ -479,7 +479,7 @@ /// Go to the next point. void next_(); - /// Convertion into a point-site. + /// Conversion into a point-site. operator runs_psite () const; protected: Index: mln/value/proxy.hh --- mln/value/proxy.hh (revision 2050) +++ mln/value/proxy.hh (working copy) @@ -102,11 +102,11 @@ template <typename II> proxy& operator=(const proxy<II>& rhs); - /// Convertion (read access); general version. + /// Conversion (read access); general version. template <typename V> operator V() const; - /// Convertion (read access); precise version. + /// Conversion (read access); precise version. operator mln_value(I)() const; /// Explicit read access. @@ -140,11 +140,11 @@ /// Destructor. ~proxy(); - /// Convertion (read access); general version. + /// Conversion (read access); general version. template <typename V> operator V() const; - /// Convertion (read access); precise version. + /// Conversion (read access); precise version. operator mln_value(I)() const; /// Explicit read access. Index: mln/value/graylevel.hh --- mln/value/graylevel.hh (revision 2050) +++ mln/value/graylevel.hh (working copy) @@ -236,7 +236,7 @@ // |gray|| |gray_f |gray_f |gray_f | // |--------------------------------------------| - // Valid Convertions are : + // Valid Conversions are : // gray_f -> gray_<n> // gray_f -> graylevel<n> Index: mln/value/graylevel_f.hh --- mln/value/graylevel_f.hh (revision 2050) +++ mln/value/graylevel_f.hh (working copy) @@ -233,7 +233,7 @@ graylevel_f& operator=(const literal::white_t&); /// \} - /// Convertion to graylevel<n>. + /// Conversion to graylevel<n>. template <unsigned n> operator graylevel<n>() const; Index: mln/value/internal/gray_.hh --- mln/value/internal/gray_.hh (revision 2050) +++ mln/value/internal/gray_.hh (working copy) @@ -170,11 +170,11 @@ template <unsigned m> operator gray_<m>() const; - /// Convertion to graylevel. + /// Conversion to graylevel. template <unsigned m> operator graylevel<m>() const; - /// Convertion to graylevel_f. + /// Conversion to graylevel_f. operator graylevel_f() const; }; Index: mln/value/internal/gray_f.hh --- mln/value/internal/gray_f.hh (revision 2050) +++ mln/value/internal/gray_f.hh (working copy) @@ -177,15 +177,15 @@ gray_f& operator=(const graylevel_f& val); /// \} - /// Convertion to graylevel<n> + /// Conversion to graylevel<n> template <unsigned m> operator graylevel<m>() const; - /// Convertion to gray_<n> + /// Conversion to gray_<n> template <unsigned m> operator gray_<m>() const; - /// Convertion to graylevel_f + /// Conversion to graylevel_f operator graylevel_f() const; /// Access to std type. Index: mln/value/viter.hh --- mln/value/viter.hh (revision 2050) +++ mln/value/viter.hh (working copy) @@ -57,7 +57,7 @@ /// Constructor. fwd_viter_(const Value_Set<S>& s); - /// Convertion into a value. + /// Conversion into a value. operator mln_value(S) () const; /// Test if the iterator is valid. @@ -94,7 +94,7 @@ /// Constructor. bkd_viter_(const Value_Set<S>& s); - /// Convertion into a value. + /// Conversion into a value. operator mln_value(S) () const; /// Test if the iterator is valid. Index: mln/value/float01.hh --- mln/value/float01.hh (revision 2050) +++ mln/value/float01.hh (working copy) @@ -93,7 +93,7 @@ /// Return an equivalent gray encoded on \p nbits bits. const float01 to_nbits(unsigned nbits) const; - /// Convertion to float. + /// Conversion to float. operator float() const; // template <unsigned n> Index: mln/value/label.hh --- mln/value/label.hh (revision 2050) +++ mln/value/label.hh (working copy) @@ -112,7 +112,7 @@ /// Self decrement. label<n>& operator--(); - /// Convertion to unsigned. + /// Conversion to unsigned. const enc& to_enc() const; /// Unit value. Index: mln/convert/all.hh --- mln/convert/all.hh (revision 2050) +++ mln/convert/all.hh (working copy) @@ -30,13 +30,13 @@ /*! \file mln/convert/all.hh * - * \brief File that includes all convertion-related routines. + * \brief File that includes all conversion-related routines. */ namespace mln { - /// Namespace of convertion routines. + /// Namespace of conversion routines. namespace convert {} } Index: mln/util/branch_iter_ind.hh --- mln/util/branch_iter_ind.hh (revision 2050) +++ mln/util/branch_iter_ind.hh (working copy) @@ -70,7 +70,7 @@ public: branch_iter_ind(branch<T> branch); - /// Convertion to node. + /// Conversion to node. operator util::tree_node<T>&() const; util::tree_node<T>& operator *(); Index: mln/util/branch_iter.hh --- mln/util/branch_iter.hh (revision 2050) +++ mln/util/branch_iter.hh (working copy) @@ -56,7 +56,7 @@ public: branch_iter(branch<T> branch); - /// Convertion to node. + /// Conversion to node. operator util::tree_node<T>&() const; util::tree_node<T>& operator *(); Index: sandbox/pellegrin/set/core/p_runs.hh --- sandbox/pellegrin/set/core/p_runs.hh (revision 2050) +++ sandbox/pellegrin/set/core/p_runs.hh (working copy) @@ -273,7 +273,7 @@ { public: - /// Convertion into a point. + /// Conversion into a point. operator P () const; /// Reference to the corresponding point. @@ -355,7 +355,7 @@ /// Go to the next point. void next_(); - /// Convertion into a point-site. + /// Conversion into a point-site. operator runs_psite () const; protected: @@ -457,7 +457,7 @@ /// Go to the next point. void next_(); - /// Convertion into a point-site. + /// Conversion into a point-site. operator runs_psite () const; protected: Index: sandbox/geraud/cs2d/dbl_neighb.hh --- sandbox/geraud/cs2d/dbl_neighb.hh (revision 2050) +++ sandbox/geraud/cs2d/dbl_neighb.hh (working copy) @@ -91,7 +91,7 @@ invalidate(); } - /// Convertion to point. + /// Conversion to point. operator point () const { mln_precondition(is_valid()); Index: sandbox/geraud/cs2d/cs2d_morpho.hh --- sandbox/geraud/cs2d/cs2d_morpho.hh (revision 2050) +++ sandbox/geraud/cs2d/cs2d_morpho.hh (working copy) @@ -109,7 +109,7 @@ invalidate(); } - /// Convertion to point. + /// Conversion to point. operator point2d () const { mln_precondition(is_valid());

1 0

***SPAM*** L2 cleanup-2008 2050: Make sub_image, image_if, and pw::image work again.
by Thierry Geraud 20 Jun '08

20 Jun '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Make sub_image, image_if, and pw::image work again. * doc/tutorial/examples/sub_image.cc: Augment. * doc/tutorial/examples/image_if.cc: New. * mln/trait/image/status.txt: Update. * mln/trait/image/print.hh: Add default arg. * mln/trait/images.hh (todo): New; about 'nature'. (mln_trait_image_io_from_): Rename as... (mln_internal_trait_image_value_io_from): ...this. (mln_internal_trait_image_speed_from): New. (default_image_morpher_): Add size and speed. * mln/core/internal/site_iterator_base.hh (todo): New. * mln/core/internal/image_morpher.hh: Typo. * mln/core/internal/site_set_iterator_base.hh: Layout. * mln/core/internal/piter_adaptor.hh: Update. Though this class seems useless. * mln/core/box_piter.hh: Overload ctor without arg. * mln/core/sub_image.hh: Typo, layout, and update. * mln/core/pset_if_piter.hh: Update. * mln/core/image_if.hh: Fetch impl from base. Update. * mln/core/alias.hh: New. * mln/core/pset_if.hh (trait): New specialization. (pset_if): Update; remove bbox and npoints. * mln/core/concept/image.hh (nsites): Deactivate check line. * mln/core/concept/gpoint.hh: Inherit from Site. * mln/core/concept/site.hh: New. * mln/pw/image.hh (trait): Update. (has): Remove; it is factored. * mln/fun/internal/selector.hh (point_site): Remove dep. Use both Site and Pseudo_Site. Yet it is not enough since many types can be sites. doc/tutorial/examples/image_if.cc | 23 ++++++++ doc/tutorial/examples/sub_image.cc | 2 mln/core/alias.hh | 43 +++++++++++++++ mln/core/box_piter.hh | 20 ++++++- mln/core/concept/gpoint.hh | 6 +- mln/core/concept/image.hh | 7 +- mln/core/concept/site.hh | 79 ++++++++++++++++++++++++++++ mln/core/image_if.hh | 68 +++++++++++++++++++----- mln/core/internal/image_morpher.hh | 2 mln/core/internal/piter_adaptor.hh | 57 +++----------------- mln/core/internal/site_iterator_base.hh | 6 +- mln/core/internal/site_set_iterator_base.hh | 1 mln/core/pset_if.hh | 56 ++++++------------- mln/core/pset_if_piter.hh | 78 +++++++++++++++++++-------- mln/core/sub_image.hh | 20 +++---- mln/fun/internal/selector.hh | 7 +- mln/pw/image.hh | 40 +++++++------- mln/trait/image/print.hh | 6 +- mln/trait/image/status.txt | 10 +-- mln/trait/images.hh | 28 +++++++-- 20 files changed, 383 insertions(+), 176 deletions(-) Index: doc/tutorial/examples/sub_image.cc --- doc/tutorial/examples/sub_image.cc (revision 2049) +++ doc/tutorial/examples/sub_image.cc (working copy) @@ -17,4 +17,6 @@ sub_image<I, box2d> sub(ima, box2d(2,3)); debug::println(sub); + + trait::image::print(sub); } Index: doc/tutorial/examples/image_if.cc --- doc/tutorial/examples/image_if.cc (revision 0) +++ doc/tutorial/examples/image_if.cc (revision 0) @@ -0,0 +1,23 @@ +# include <mln/core/image2d.hh> +# include <mln/core/image_if.hh> +# include <mln/core/alias.hh> + +# include <mln/debug/iota.hh> +# include <mln/debug/println.hh> +# include <mln/fun/p2b/chess.hh> + + + +int main() +{ + using namespace mln; + + typedef image2d<unsigned> I; + I ima(3, 5); + debug::iota(ima); + + debug::println(ima); + debug::println(ima | fun::p2b::chess); + + trait::image::print(ima | fun::p2b::chess); +} Index: mln/trait/image/status.txt --- mln/trait/image/status.txt (revision 2049) +++ mln/trait/image/status.txt (working copy) @@ -7,20 +7,20 @@ KO image1d ok image2d KO image3d -KO image_if -KO image_if_interval -KO image_if_value + ok image_if + rm image_if_interval + rm image_if_value KO interpolated KO line_graph_image KO mono_obased_rle_image KO mono_rle_image KO obased_rle_image KO plain -KO pw::image + ok pw::image KO rle_image KO safe KO sparse_image -KO sub_image + ok sub_image KO t_image KO tr_image KO translate_image Index: mln/trait/image/print.hh --- mln/trait/image/print.hh (revision 2049) +++ mln/trait/image/print.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 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 @@ -53,10 +53,10 @@ { template <typename I> - void print(std::ostream& ostr); + void print(std::ostream& ostr = std::cout); template <typename I> - void print(const Image& ima, std::ostream& ostr); + void print(const Image& ima, std::ostream& ostr = std::cout); # ifndef MLN_INCLUDE_ONLY Index: mln/trait/images.hh --- mln/trait/images.hh (revision 2049) +++ mln/trait/images.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 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 @@ -33,6 +33,8 @@ * \brief Some base trait types for images. * * \todo Split this file into many. + * + * \todo the 'nature' prop is not set yet in image types. */ # include <iostream> @@ -70,9 +72,20 @@ # define mln_trait_image_quant(I) typename mln::trait::image_::quant -// for io: I const => read_only, otherwise like I -# define mln_trait_image_io_from_(I) \ -mlc_if( mlc_is_const(I), mln::trait::image::value_io::read_only, mln_trait_image_value_io(I) ) +// For value_io: I const => read_only, otherwise like I + +# define mln_internal_trait_image_value_io_from(I) \ + \ + mlc_if( mlc_is_const(I), \ + mln::trait::image::value_io::read_only, \ + mln_trait_image_value_io(I) ) + + +# define mln_internal_trait_image_speed_from(I) \ + \ + mlc_if( mlc_equal( mln_trait_image_speed(I), mln::trait::image::speed::fastest ), \ + mln::trait::image::speed::fast, \ + mln_trait_image_speed(I) ) @@ -164,14 +177,15 @@ template <typename D, typename T, typename I> struct default_image_morpher_ : default_image_<T, I> { - // misc => NO delegation - // for category, speed, and size + // misc => delegation except for 'category' + typedef typename image_<D>::size size; + typedef mln_internal_trait_image_speed_from(D) speed; // un-fastest // value => delegation typedef typename image_<D>::value_access value_access; typedef typename image_<D>::value_storage value_storage; typedef typename image_<D>::value_browsing value_browsing; - typedef typename image_<D>::value_io value_io; + typedef mln_internal_trait_image_value_io_from(D) value_io; // un-write when D is const // site => delegation typedef typename image_<D>::localization localization; Index: mln/core/internal/site_iterator_base.hh --- mln/core/internal/site_iterator_base.hh (revision 2049) +++ mln/core/internal/site_iterator_base.hh (working copy) @@ -31,6 +31,11 @@ /*! \file mln/core/internal/site_iterator_base.hh * * \brief Base class to factor code for site iterator classes. + * + * \todo Make p_ private and add a p() method that can be overridden + * so that a subclass can use some other info than this attribute. + * See for instance start_ and next_ in pset_if_piter.hh: we have + * both pi_ and p_ to designate the current site. */ # include <mln/core/concept/site_iterator.hh> @@ -61,7 +66,6 @@ mln_site(S), E > { - /// The associated site type (as a Site_Proxy). typedef mln_site(S) site; Index: mln/core/internal/image_morpher.hh --- mln/core/internal/image_morpher.hh (revision 2049) +++ mln/core/internal/image_morpher.hh (working copy) @@ -68,7 +68,7 @@ */ bool has_data() const; - /// Convertion to the underlying (morphed) image. + /// Conversion to the underlying (morphed) image. operator I() const; // FIXME: Very dangerous? Remove? protected: Index: mln/core/internal/site_set_iterator_base.hh --- mln/core/internal/site_set_iterator_base.hh (revision 2049) +++ mln/core/internal/site_set_iterator_base.hh (working copy) @@ -50,7 +50,6 @@ template <typename S, typename E> struct site_set_iterator_base : site_iterator_base<S, E> { - /// Give the site set that this iterator browses. const S& site_set() const; Index: mln/core/internal/piter_adaptor.hh --- mln/core/internal/piter_adaptor.hh (revision 2049) +++ mln/core/internal/piter_adaptor.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 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 @@ -33,7 +33,7 @@ * \brief Definition of iterators on points of boxes. */ -# include <mln/core/internal/site_iterator_base.hh> +# include <mln/core/internal/site_set_iterator_base.hh> # include <mln/core/concept/box.hh> @@ -48,34 +48,21 @@ * parameter E is the exact type. */ template <typename Pi, typename E> - class piter_adaptor_ : public internal::site_iterator_base_< mln_psite(Pi), E > + class piter_adaptor_ : public internal::site_set_iterator_base< mln_pset(Pi), E > { - typedef internal::site_iterator_base_< mln_psite(Pi), E > super_; public: - // Make dim definition from super class available. - enum { dim = super_::dim }; - /// Constructor from a point iterator \p piter. piter_adaptor_(const Pi& piter); - /// Convertion to point. - operator mln_point(Pi) () const; - - /// Reference to the corresponding point. - const mln_point(Pi)& to_point() const; - - /// Give the i-th coordinate. - mln_coord(Pi) operator[](unsigned i) const; - /// Test the iterator validity. - bool is_valid() const; + bool is_valid_() const; /// Invalidate the iterator. - void invalidate(); + void invalidate_(); /// Start an iteration. - void start(); + void start_(); /// Go to the next point. void next_(); @@ -95,37 +82,13 @@ piter_adaptor_<Pi,E>::piter_adaptor_(const Pi& piter) : piter_(piter) { - invalidate(); - } - - template <typename Pi, typename E> - inline - piter_adaptor_<Pi,E>::operator mln_point(Pi) () const - { - return piter_; - } - - template <typename Pi, typename E> - inline - const mln_point(Pi)& - piter_adaptor_<Pi,E>::to_point() const - { - return piter_.to_point(); - } - - template <typename Pi, typename E> - inline - mln_coord(Pi) - piter_adaptor_<Pi,E>::operator[](unsigned i) const - { - assert(i < dim); - return piter_[i]; + invalidate_(); } template <typename Pi, typename E> inline bool - piter_adaptor_<Pi,E>::is_valid() const + piter_adaptor_<Pi,E>::is_valid_() const { return piter_.is_valid(); } @@ -133,7 +96,7 @@ template <typename Pi, typename E> inline void - piter_adaptor_<Pi,E>::invalidate() + piter_adaptor_<Pi,E>::invalidate_() { piter_.invalidate(); } @@ -141,7 +104,7 @@ template <typename Pi, typename E> inline void - piter_adaptor_<Pi,E>::start() + piter_adaptor_<Pi,E>::start_() { piter_.start(); } Index: mln/core/box_piter.hh --- mln/core/box_piter.hh (revision 2049) +++ mln/core/box_piter.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 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 @@ -58,6 +58,9 @@ // Make definitions from super class available. enum { dim = P::dim }; + /// Constructor without argument. + box_fwd_piter_(); + /*! \brief Constructor. * * \param[in] b A box. @@ -102,6 +105,9 @@ // Make definitions from super class available. enum { dim = P::dim }; + /// Constructor without argument. + box_bkd_piter_(); + /*! \brief Constructor. * * \param[in] b A box. @@ -136,6 +142,12 @@ template <typename P> inline + box_fwd_piter_::box_fwd_piter_() + { + } + + template <typename P> + inline box_fwd_piter_::box_fwd_piter_(const box_& b) { this->change_target(b); @@ -187,6 +199,12 @@ template <typename P> inline + box_bkd_piter_::box_bkd_piter_() + { + } + + template <typename P> + inline box_bkd_piter_::box_bkd_piter_(const box_& b) { this->change_target(b); Index: mln/core/sub_image.hh --- mln/core/sub_image.hh (revision 2049) +++ mln/core/sub_image.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 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 @@ -33,7 +33,6 @@ * * \brief Definition of morpher that makes an image become restricted * given by a point set. - * */ # include <mln/core/internal/image_domain_morpher.hh> @@ -68,7 +67,8 @@ { template <typename I, typename S> - struct image_< sub_image<I,S> > : default_image_morpher_< I, mln_value(I), + struct image_< sub_image<I,S> > : default_image_morpher_< I, + mln_value(I), sub_image<I,S> > { // private: @@ -82,8 +82,6 @@ typedef trait::image::ext_value::irrelevant ext_value; typedef trait::image::ext_io::irrelevant ext_io; - typedef mln_trait_image_io_from_(I) io; // un-write when I const - typedef trait::image::value_storage::disrupted value_storage; // HOT FIXME: except if S is a Box }; @@ -95,7 +93,9 @@ // FIXME: Doc! template <typename I, typename S> - struct sub_image : public internal::image_domain_morpher_< I, S, sub_image<I,S> > + struct sub_image : public internal::image_domain_morpher_< I, + S, + sub_image<I,S> > { /// Skeleton. typedef sub_image< tag::image_, tag::pset_<S> > skeleton; @@ -112,7 +112,7 @@ /// Give the definition domain. const S& domain() const; - /// Const promotion via convertion. + /// Const promotion via conversion. operator sub_image<const I, S>() const; }; @@ -120,10 +120,12 @@ template <typename I, typename S> - sub_image<const I, S> operator|(const Image& ima, const Site_Set<S>& pset); + sub_image<const I, S> + operator|(const Image& ima, const Site_Set<S>& pset); template <typename I, typename S> - sub_image<I, S> operator|(Image& ima, const Site_Set<S>& pset); + sub_image<I, S> + operator|(Image& ima, const Site_Set<S>& pset); Index: mln/core/pset_if_piter.hh --- mln/core/pset_if_piter.hh (revision 2049) +++ mln/core/pset_if_piter.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 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 @@ -30,11 +30,12 @@ /*! \file mln/core/pset_if_piter.hh * - * \brief Definition of iterators on points of pset_ifes. + * \brief Definition of iterators on pset_if<S,F>. + * + * \todo See todo in site_iterator_base.hh */ -# include <mln/core/concept/site_iterator.hh> -# include <mln/core/internal/piter_adaptor.hh> +# include <mln/core/internal/site_set_iterator_base.hh> # include <mln/core/pset_if.hh> @@ -50,27 +51,34 @@ */ template <typename S, typename F> class pset_if_fwd_piter_ - : public internal::piter_adaptor_< mln_fwd_piter(S), + : public internal::site_set_iterator_base< pset_if<S,F>, pset_if_fwd_piter_<S,F> > { - typedef mln_fwd_piter(S) adaptee_; - typedef pset_if_fwd_piter_<S,F> self_; - typedef internal::piter_adaptor_<adaptee_, self_> super_; - public: - /// Constructor from a subset of points. - pset_if_fwd_piter_(const pset_if<S,F>& subset); + /// Constructor without argument. + pset_if_fwd_piter_(); + + /// Constructor from a site set. + pset_if_fwd_piter_(const pset_if<S,F>& s); + + /// Test if the iterator is valid. + bool is_valid_() const; + + /// Invalidate the iterator. + void invalidate_(); /// Start an iteration. - void start(); + void start_(); /// Go to the next point. void next_(); + mln_fwd_piter(S)& hook_pi_() { return pi_; } + private: - const pset_if<S,F>& subset_; + mln_fwd_piter(S) pi_; }; @@ -90,20 +98,44 @@ template <typename S, typename F> inline - pset_if_fwd_piter_<S,F>::pset_if_fwd_piter_(const pset_if<S,F>& subset) - : super_(adaptee_(subset.overset())), - subset_(subset) + pset_if_fwd_piter_<S,F>::pset_if_fwd_piter_() + { + } + + template <typename S, typename F> + inline + pset_if_fwd_piter_<S,F>::pset_if_fwd_piter_(const pset_if<S,F>& s) + { + pi_.change_target(s.overset()); + this->change_target(s); + } + + template <typename S, typename F> + inline + bool + pset_if_fwd_piter_<S,F>::is_valid_() const + { + return pi_.is_valid(); + } + + template <typename S, typename F> + inline + void + pset_if_fwd_piter_<S,F>::invalidate_() { + pi_.invalidate(); } template <typename S, typename F> inline void - pset_if_fwd_piter_<S,F>::start() + pset_if_fwd_piter_<S,F>::start_() { - this->piter_.start(); - while (this->piter_.is_valid() && ! subset_.pred(this->piter_)) - this->piter_.next(); + pi_.start(); + while (pi_.is_valid() && ! this->s_->pred(pi_)) + pi_.next(); + if (is_valid_()) + this->p_ = pi_; } template <typename S, typename F> @@ -112,8 +144,10 @@ pset_if_fwd_piter_<S,F>::next_() { do - this->piter_.next(); - while (this->piter_.is_valid() && ! subset_.pred(this->piter_)); + pi_.next(); + while (pi_.is_valid() && ! this->s_->pred(pi_)); + if (is_valid_()) + this->p_ = pi_; } Index: mln/core/image_if.hh --- mln/core/image_if.hh (revision 2049) +++ mln/core/image_if.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 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 @@ -33,13 +33,12 @@ * \brief Definition of a image which domain is restricted by a * function. * - * \todo FIXME for theo : add image_if_great_than / less_than + * \todo Relax Function_p2v into Function_v2v. */ -# include <mln/core/internal/image_if_base.hh> - - -# define Super mln::internal::image_if_base_< I, F, image_if<I,F> > +# include <mln/core/internal/image_domain_morpher.hh> +# include <mln/core/pset_if.hh> +# include <mln/pw/all.hh> namespace mln @@ -54,9 +53,12 @@ /// \internal Data structure for \c mln::image_if<I,F>. template <typename I, typename F> - struct data_< image_if<I,F> > : data_< Super > + struct data_< image_if<I,F> > { data_(I& ima, const F& f); + + I ima_; + pset_if<mln_pset(I), F> pset_; }; } // end of namespace mln::internal @@ -66,8 +68,17 @@ { template <typename I, typename F> - struct image_< image_if<I,F> > : trait::image_< Super > + struct image_< image_if<I,F> > : default_image_morpher_< I, + mln_value(I), + image_if<I,F> > { + typedef trait::image::category::domain_morpher category; + + typedef trait::image::ext_domain::none ext_domain; // No extension of domain. + typedef trait::image::ext_value::irrelevant ext_value; + typedef trait::image::ext_io::irrelevant ext_io; + + typedef trait::image::value_storage::disrupted value_storage; }; } // end of namespace mln::trait @@ -78,16 +89,23 @@ * */ template <typename I, typename F> - struct image_if : public Super + struct image_if : public internal::image_domain_morpher_< I, + pset_if<mln_pset(I), F>, + image_if<I, F> > { /// Skeleton. typedef image_if< tag::image_, tag::function_<F> > skeleton; + /// Constructor without argument. + image_if(); + /// Constructor from an image \p ima and a predicate \p f. image_if(I& ima, const F& f); - /// Constructor without argument. - image_if(); + void init_(I& ima, const F& f); + + /// Give the definition domain. + const pset_if<mln_pset(I), F>& domain() const; /// Const promotion via convertion. operator image_if<const I, F>() const; @@ -130,9 +148,10 @@ operator | (const Image& ima, const Function_p2b<F>& f); + # ifndef MLN_INCLUDE_ONLY - /// \internal internal::data_ + // internal::data_< image_if<I,F> > namespace internal { @@ -140,12 +159,14 @@ template <typename I, typename F> inline data_< image_if<I,F> >::data_(I& ima, const F& f) - : data_< Super >(ima, f) + : ima_(ima), + pset_(ima.domain() | f) { } } + // image_if<I,F> template <typename I, typename F> @@ -158,7 +179,25 @@ inline image_if<I,F>::image_if(I& ima, const F& f) { - this->init_(ima, f); + init_(ima, f); + } + + template <typename I, typename F> + inline + void + image_if<I,F>::init_(I& ima, const F& f) + { + mln_precondition(! this->has_data()); + this->data_ = new internal::data_< image_if<I,F> >(ima, f); + } + + template <typename I, typename F> + inline + const pset_if<mln_pset(I), F>& + image_if<I,F>::domain() const + { + mln_precondition(this->has_data()); + return this->data_->pset_; } template <typename I, typename F> @@ -171,6 +210,7 @@ return tmp; } + // Operators. template <typename I, typename F> Index: mln/core/alias.hh --- mln/core/alias.hh (revision 0) +++ mln/core/alias.hh (revision 0) @@ -0,0 +1,43 @@ +// Copyright (C) 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_HH +# define MLN_CORE_ALIAS_HH + +/*! \file mln/core/alias.hh + * + * \brief Definition of FIXME + */ + + +#define mln_alias(Var, Expr) \ + \ + typeof(Expr) Var = Expr; \ + typedef typeof(Expr) Var##_t + + +#endif // ! MLN_CORE_ALIAS_HH Index: mln/core/pset_if.hh --- mln/core/pset_if.hh (revision 2049) +++ mln/core/pset_if.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 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 @@ -45,6 +45,19 @@ template <typename S, typename F> struct pset_if_fwd_piter_; template <typename S, typename F> struct pset_if_bkd_piter_; + namespace trait + { + + template <typename S, typename F> + struct site_set_< pset_if<S,F> > + { + typedef trait::site_set::nsites::unknown nsites; + typedef trait::site_set::bbox::unknown bbox; + typedef trait::site_set::contents::fixed contents; + typedef mln_trait_site_set_arity(S) arity; + }; + + } // end of namespace trait /*! \brief Restrict a point set \p pset to points that verify \p f. @@ -71,11 +84,15 @@ typedef internal::site_set_base_<mln_psite(S), self_> super_; public: - typedef mln_psite(super_) psite; + typedef mln_psite(S) psite; + /// Forward Site_Iterator associated type. typedef pset_if_fwd_piter_<S,F> fwd_piter; + /// Site_Iterator associated type. + typedef fwd_piter piter; + /// Backward Site_Iterator associated type. typedef mln::internal::fixme bkd_piter; @@ -90,12 +107,6 @@ /// Test if \p p belongs to the subset. bool has(const psite& p) const; - /// Give a bounding box of the subset. - const box_<mln_point(S)>& bbox() const; - - /// Give the number of points of the subset. - std::size_t npoints() const; - /// Give the primary overset. const S& overset() const; @@ -138,14 +149,6 @@ template <typename S, typename F> inline - const box_<mln_point(S)>& - pset_if<S,F>::bbox() const - { - return pset_.bbox(); - } - - template <typename S, typename F> - inline const S& pset_if<S,F>::overset() const { @@ -192,25 +195,4 @@ -namespace mln -{ - -# ifndef MLN_INCLUDE_ONLY - - template <typename S, typename F> - std::size_t - pset_if<S,F>::npoints() const - { - std::size_t n = 0; - fwd_piter p(*this); - for_all(p) - ++n; - return n; - } - -# endif // ! MLN_INCLUDE_ONLY - -} // end of namespace mln - - #endif // ! MLN_CORE_PSET_IF_HH Index: mln/core/concept/image.hh --- mln/core/concept/image.hh (revision 2049) +++ mln/core/concept/image.hh (working copy) @@ -126,8 +126,11 @@ bool (E::*m1)(const psite& p) const = & E::has; m1 = 0; - std::size_t (E::*m2)() const = & E::nsites; - m2 = 0; + + // Only some image types feature the 'nsites' method. +// std::size_t (E::*m2)() const = & E::nsites; +// m2 = 0; + bool (E::*m3)() const = & E::has_data; m3 = 0; Index: mln/core/concept/gpoint.hh --- mln/core/concept/gpoint.hh (revision 2049) +++ mln/core/concept/gpoint.hh (working copy) @@ -33,7 +33,7 @@ * \brief Definition of the concept of mln::Gpoint. */ -# include <mln/core/concept/object.hh> +# include <mln/core/concept/site.hh> # include <mln/core/concept/gdpoint.hh> # include <mln/value/concept/scalar.hh> @@ -78,7 +78,7 @@ template <> struct Gpoint<void> { - typedef Object<void> super; + typedef Site<void> super; }; @@ -90,7 +90,7 @@ * discrete square grid of the 2D plane. */ template <typename E> - struct Gpoint : public Object<E> + struct Gpoint : public Site<E> { typedef Gpoint<void> category; Index: mln/core/concept/site.hh --- mln/core/concept/site.hh (revision 0) +++ mln/core/concept/site.hh (revision 0) @@ -0,0 +1,79 @@ +// Copyright (C) 2008 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_CONCEPT_SITE_HH +# define MLN_CORE_CONCEPT_SITE_HH + +/*! \file mln/core/concept/site.hh + * + * \brief Definition of the concept of mln::Site. + */ + +# include <mln/core/concept/object.hh> + + +namespace mln +{ + + // Fwd decl. + template <typename E> struct Site; + + + /// Site category flag type. + template <> + struct Site<void> + { + typedef Object<void> super; + }; + + + /*! \brief Base class for classes that are explicitly sites. + */ + template <typename E> + struct Site : public Object<E> + { + typedef Site<void> category; + + protected: + Site(); + }; + + +# ifndef MLN_INCLUDE_ONLY + + template <typename E> + inline + Site<E>::Site() + { + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + + +#endif // ! MLN_CORE_CONCEPT_SITE_HH Index: mln/pw/image.hh --- mln/pw/image.hh (revision 2049) +++ mln/pw/image.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 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 @@ -31,6 +31,8 @@ /*! \file mln/pw/image.hh * * \brief FIXME. + * + * \todo Relax Function_p2v into Function_v2v. */ # include <mln/core/internal/image_primary.hh> @@ -81,18 +83,25 @@ struct image_< pw::image<F,S> > : default_image_< mlc_unqualif(mln_result(F)), pw::image<F,S> > { + // misc typedef trait::image::category::primary category; - - typedef trait::image::value::fixme value; - - typedef trait::image::access::browsing access; - typedef trait::image::space::fixme_ space; + typedef trait::image::speed::fastest speed; typedef trait::image::size::regular size; - typedef trait::image::support::fixme_ support; - typedef trait::image::border::none border; - typedef trait::image::data::computed data; - typedef trait::image::io::read_only io; + // value + typedef trait::image::value_access::computed value_access; + typedef trait::image::value_storage::disrupted value_storage; + typedef trait::image::value_browsing::site_wise_only value_browsing; + typedef trait::image::value_io::read_only value_io; + + // site / domain + typedef /* FIXME: depends on S */ undef localization; + typedef /* FIXME: depends on S */ undef dimension; + + // extended domain + typedef trait::image::ext_domain::none ext_domain; + typedef trait::image::ext_value::irrelevant ext_value; + typedef trait::image::ext_io::irrelevant ext_io; }; } // end of namespace mln::trait @@ -130,9 +139,7 @@ /// Constructor. image(const Function_p2v<F>& f, const Site_Set<S>& ps); - - /// Test if a pixel value is accessible at \p p. - bool has(const mln_psite(S)& p) const; + // No init_ method here since this image type is not "concrete". /// Give the definition domain. const S& domain() const; @@ -199,13 +206,6 @@ template <typename F, typename S> inline - bool image<F,S>::has(const mln_psite(S)& p) const - { - return this->data_->pset_.has(p); - } - - template <typename F, typename S> - inline const S& image<F,S>::domain() const { Index: mln/fun/internal/selector.hh --- mln/fun/internal/selector.hh (revision 2049) +++ mln/fun/internal/selector.hh (working copy) @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008 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 @@ -34,7 +34,8 @@ */ # include <mln/core/concept/function.hh> -# include <mln/core/concept/point_site.hh> +# include <mln/core/concept/site.hh> +# include <mln/core/concept/pseudo_site.hh> # include <mln/metal/unqualif.hh> # include <mln/metal/if.hh> # include <mln/metal/is_a.hh> @@ -160,7 +161,7 @@ template <typename T> struct tag_ { - enum { value = mlc_is_a(T, Point_Site)::value + enum { value = (mlc_is_a(T, Site)::value || mlc_is_a(T, Pseudo_Site)::value) ? p_ : v_ }; };

1 0

2049: Fix compilation of tools/.
by Roland Levillain 19 Jun '08

19 Jun '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Fix compilation of tools/. * mln/make/voronoi.hh (mln::make::voronoi): Catch up with the new interface of mln::util::graph. voronoi.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: mln/make/voronoi.hh --- mln/make/voronoi.hh (revision 2048) +++ mln/make/voronoi.hh (working copy) @@ -116,7 +116,7 @@ /// Compute the center of label. for (unsigned i = 0; i < nb; ++i) { - gr.add_node (); + gr.add_vertex(); /// FIXME v[i] = make::point2d ((unsigned)tab_mean[i].to_result ()[0],

1 0

2048: Configure files in milena/apps/.
by Roland Levillain 19 Jun '08

19 Jun '08

https://svn.lrde.epita.fr/svn/oln/trunk Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * configure.ac: Configure files in milena/apps/. configure.ac | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) Index: configure.ac --- configure.ac (revision 2047) +++ configure.ac (working copy) @@ -189,4 +189,21 @@ milena/tests/win/Makefile ]) + +## -------------- ## +## Applications. ## +## -------------- ## + +# Ask for the creation of applications' Makefiles. +# FIXME: Should it be achieved through oln.m4 macros, as we did in Olena 0.11? +AC_CONFIG_FILES([ + milena/apps/Makefile + milena/apps/statues/Makefile +]) + +# Configure tests. +AC_CONFIG_FILES([milena/apps/statues/test], + [chmod +x milena/apps/statues/test]) + + AC_OUTPUT

1 0

2047: Add support for Autotools in apps/statues/.
by Roland Levillain 19 Jun '08

19 Jun '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add support for Autotools in apps/statues/. * Makefile.am (SUBDIRS): Add apps. * apps/Makefile.am: New. * apps/statues/test: Rename as... * apps/statues/test.in: ...this. (mesh_dir): Depend on @top_srcdir@. * apps/statues/Makefile: Rename as... * apps/statues/Makefile.am: ...this. Convert this Makefile to Automake. Makefile.am | 2 +- apps/Makefile.am | 3 +++ apps/statues/Makefile.am | 38 +++++++++----------------------------- apps/statues/test.in | 2 +- 4 files changed, 14 insertions(+), 31 deletions(-) Index: Makefile.am --- Makefile.am (revision 2046) +++ Makefile.am (working copy) @@ -1,6 +1,6 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- -SUBDIRS = doc tests tools +SUBDIRS = doc tests tools apps .PHONY: doc doc: Index: apps/statues/test.in --- apps/statues/test.in (revision 2046) +++ apps/statues/test.in (working copy) @@ -2,7 +2,7 @@ set -ex -mesh_dir=../../../mesh +mesh_dir=@top_srcdir@/milena/mesh time ./mesh-segm $mesh_dir/socket.off 25 socket-segm.off time ./mesh-segm $mesh_dir/teapot.off 50 teapot-segm.off Index: apps/statues/Makefile.am --- apps/statues/Makefile.am (revision 2046) +++ apps/statues/Makefile.am (working copy) @@ -1,33 +1,13 @@ -# To be redefined if TriMesh is located elsewhere. -# FIXME: Trimesh could be part of the Olena distribution, as a -# dependency. Or we could just rewrite the required features (I/O & -# curvature computation). -TRIMESH = $(HOME)/opt/trimesh2 - -# Warning: we should use the same compiler as the one that was used to -# compile TriMesh to avoid any ABI-related problems. +## Process this file through Automake to produce Makefile.in -*- Makefile -*- +# Find Milena and trimesh headers. +AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_srcdir)/external/trimesh/include # Produce fast code. -CXXFLAGS = -O3 -DNDEBUG -ggdb -# Produce debuggable code. -#CXXFLAGS = -O0 -ggdb -fno-inline -fno-default-inline - -# Milena and Trimesh paths. -CPPFLAGS = -I../../../ -I$(TRIMESH)/include -# Link with Trimesh. -LDFLAGS = -L$(TRIMESH)/lib.Darwin -ltrimesh - -all: mesh-segm - -mesh-segm.o: mesh-segm.cc io.hh -mesh-segm: mesh-segm.o - $(CXX) -o $@ $(LDFLAGS) $< - -check: mesh-segm test - ./test +AM_CXXFLAGS = -O3 -DNDEBUG -ggdb +# Find trimesh archive. +AM_LDFLAGS = -L$(top_builddir)/external/trimesh/libsrc -ltrimesh -CLEANFILES = mesh-segm.o mesh-segm -clean: - rm -f $(CLEANFILES) +bin_PROGRAMS = mesh-segm +mesh_segm_SOURCES = mesh-segm.cc io.hh -.PHONY: all clean check +TESTS = test Index: apps/Makefile.am --- apps/Makefile.am (revision 0) +++ apps/Makefile.am (revision 0) @@ -0,0 +1,3 @@ +## Process this file through Automake to produce Makefile.in -*- Makefile -*- + +SUBDIRS = statues

1 0

2046: Move the application on the segmentation of statues into Milena.
by Roland Levillain 19 Jun '08

19 Jun '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Move the application on the segmentation of statues into Milena. * apps/: New directory. * sandbox/levillain/statues/: Move... * apps/statues/: ...here. 0 files changed

1 0

2045: Sandbox: ICP: clean-up before milena update.
by Ugo Jardonnet 19 Jun '08

19 Jun '08

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Ugo Jardonnet <jardonnet(a)lrde.epita.fr> Sandbox: ICP: clean-up before milena update. Prepare patch for math and geom modules. * jardonnet/registration/power_it.hh: Add comment . * jardonnet/registration/cov.hh: New: clean math::covariance. * jardonnet/registration/variance.hh: New: clean math::variance. * jardonnet/registration/exp_val.hh: New: clean math::expected value. * jardonnet/registration/cross_cov.hh: Update: clean cross covariance. * jardonnet/registration/center.hh: New: clean geom::center. Update rendering for seminar. * jardonnet/registration/save.hh: Update rendering. * jardonnet/test/img/c5.pbm, * jardonnet/test/img/x5.pbm: Update images . registration/center.hh | 73 ++++++++++++++++++++++++++++++++++++++++ registration/cov.hh | 82 ++++++++++++++++++++++++++++++++++++++++++++++ registration/cross_cov.hh | 6 +-- registration/exp_val.hh | 77 +++++++++++++++++++++++++++++++++++++++++++ registration/power_it.hh | 3 + registration/save.hh | 52 ++++++++++++++--------------- registration/variance.hh | 27 +++++++++++++++ test/icp_ref.cc | 2 - 8 files changed, 292 insertions(+), 30 deletions(-) Index: jardonnet/test/icp_ref.cc --- jardonnet/test/icp_ref.cc (revision 2044) +++ jardonnet/test/icp_ref.cc (working copy) @@ -60,7 +60,7 @@ } //working box - const box_< point_<grid::cube, float> > working_box = enlarge(bigger(c.bbox(),x.bbox()),100); + const box_< point_<grid::cube, float> > working_box = enlarge(bigger(c.bbox(),x.bbox()),50); // FIXME : TODO : map : vec<3,float> -> point closest_point< point_<grid::cube, float> > map(x, working_box); Index: jardonnet/test/img/c5.pbm Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: jardonnet/test/img/x5.pbm Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: jardonnet/registration/cov.hh --- jardonnet/registration/cov.hh (revision 0) +++ jardonnet/registration/cov.hh (revision 0) @@ -0,0 +1,82 @@ +// 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_MATH_COV_HH +# define MLN_MATH_COV_HH + +/*! \file mln/math/cov.hh + * + * \brief Define the covariance (cov) routine. + */ + +# include "exp_val.hh" + +namespace mln +{ + + namespace math + { + + template <typename P> + algebra::mat<P::dim,P::dim,float> + cov(const p_array& a1, + const p_array& a2); + +# ifndef MLN_INCLUDE_ONLY + + template <typename P> + algebra::mat<P::dim,P::dim,float> + cov(const p_array& a1, + const p_array& a2) + { + mln_precondition(a1.npoints() == a2.npoints()); + + //centers of mass + algebra::vec<P::dim,float> mu_a1 = math::exp_value(a1); + algebra::vec<P::dim,float> mu_a2 = math::exp_value(a2); + + //covariance matrix + algebra::mat<P::dim,P::dim,float> Mk(literal::zero); + for (unsigned i = 0; i < a1.npoints(); ++i) + { + // FIXME: ugly cast. + algebra::vec<P::dim,float> a1i = a1[i]; + algebra::vec<P::dim,float> a2i = a2[i]; + Mk += make::mat(a1i - mu_a1) * trans(make::mat(a2i - mu_a2)); + } + + return Mk / a1.npoints(); + } + + # endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::math + +} // end of namespace mln + + +#endif // ! MLN_MATH_COV_HH Index: jardonnet/registration/power_it.hh --- jardonnet/registration/power_it.hh (revision 2044) +++ jardonnet/registration/power_it.hh (working copy) @@ -12,6 +12,9 @@ namespace mln { + /** + * Return the biggest eigen vector. + */ template <uint n> algebra::vec<n,float> power_it(algebra::mat<n,n,float>& A) { Index: jardonnet/registration/variance.hh --- jardonnet/registration/variance.hh (revision 0) +++ jardonnet/registration/variance.hh (revision 0) @@ -0,0 +1,27 @@ +// 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. + Index: jardonnet/registration/save.hh --- jardonnet/registration/save.hh (revision 2044) +++ jardonnet/registration/save.hh (working copy) @@ -5,11 +5,16 @@ # include <mln/io/ppm/save.hh> # include <mln/io/pbm/save.hh> # include <mln/draw/all.hh> +# include <mln/morpho/erosion.hh> +# include <mln/make/window2d.hh> # include <string> # include "quat7.hh" # include "tools.hh" # include "power_it.hh" +# include "center.hh" +# include "cov.hh" + namespace mln { @@ -55,17 +60,11 @@ level::fill(out, literal::white); //plot mu_Ck - algebra::vec<P::dim,float> mu_Ck = center(ck, ck.npoints()); + algebra::vec<P::dim,float> mu_Ck = geom::center(ck); draw::plot(out, point2d(mu_Ck[0], mu_Ck[1]), literal::green); //Ck orientation - algebra::mat<P::dim,P::dim,float> Mk(literal::zero); - for (unsigned i = 0; i < ck.npoints(); ++i) - { - algebra::vec<P::dim,float> Cki = ck[i]; - Mk += make::mat(Cki - mu_Ck) * trans(make::mat(Cki - mu_Ck)); - } - Mk /= c.npoints(); + algebra::mat<P::dim,P::dim,float> Mk = math::cov(ck,ck); algebra::vec<3,float> vck = power_it(Mk); draw::line(out, point2d(mu_Ck[0], mu_Ck[1]), point2d(mu_Ck[0]+vck[0]*10, mu_Ck[1]+vck[1]*10), @@ -77,31 +76,16 @@ xk.append(map(ck[i])); //plot mu_Xk - algebra::vec<P::dim,float> mu_Xk = center(xk, xk.npoints()); + algebra::vec<P::dim,float> mu_Xk = geom::center(xk); draw::plot(out, point2d(mu_Xk[0], mu_Xk[1]), literal::blue); //Xk orientation - algebra::mat<P::dim,P::dim,float> Mxk(literal::zero); - for (unsigned i = 0; i < xk.npoints(); ++i) - { - algebra::vec<P::dim,float> Xki = xk[i]; - Mxk += make::mat(Xki - mu_Xk) * trans(make::mat(Xki - mu_Xk)); - } - Mxk /= c.npoints(); + algebra::mat<P::dim,P::dim,float> Mxk = math::cov(xk,xk); algebra::vec<3,float> vxk = power_it(Mxk); draw::line(out, point2d(mu_Xk[0], mu_Xk[1]), point2d(mu_Xk[0]+vxk[0]*10, mu_Xk[1]+vxk[1]*10), literal::red); - - //ck in green - for (unsigned i = 0; i < ck.npoints(); i++) - { - point2d p(ck[i][0], ck[i][1]); - if (out.has(p)) - out(p) = literal::green; - } - //x in black for (unsigned i = 0; i < x.npoints(); i++) { @@ -110,7 +94,7 @@ out(p) = literal::black; } - //xk in blue + //xk in red for (unsigned i = 0; i < xk.npoints(); i++) { point2d p(xk[i][0], xk[i][1]); @@ -118,6 +102,22 @@ out(p) = literal::red; } + //ck in green + for (unsigned i = 0; i < ck.npoints(); i++) + { + point2d p(ck[i][0], ck[i][1]); + if (out.has(p)) + out(p) = literal::green; + } + + /* + FIXME: + bool vals[] = {1, 1, 1, + 1, 1, 1, + 1, 1, 1}; + morpho::erosion(out, make::window2d(vals)); + */ + //save std::stringstream oss; oss << "step_" << id++ << ".ppm"; Index: jardonnet/registration/exp_val.hh --- jardonnet/registration/exp_val.hh (revision 0) +++ jardonnet/registration/exp_val.hh (revision 0) @@ -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_MATH_EXP_VAL_HH +# define MLN_MATH_EXP_VAL_HH + +/*! \file mln/math/exp_val.hh + * + * \brief Define the expected value (exp_val) routine. + */ + +# include <mln/algebra/vec.hh> + +namespace mln +{ + + namespace math + { + + template <typename P> + algebra::vec<P::dim,float> + exp_value(const p_array& a); + +# ifndef MLN_INCLUDE_ONLY + + template <typename P> + inline + algebra::vec<P::dim,float> + exp_value(const p_array& a) + { + if (a.npoints() == 0) + return P(); + + algebra::vec<P::dim,float> c(literal::zero); + for (unsigned i = 0; i < a.npoints(); ++i) + { + // FIXME : Ugly. + algebra::vec<P::dim,float> ai = a[i]; + c += ai; + } + + return c / a.npoints(); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::math + +} // end of namespace mln + + +#endif // ! MLN_MATH_ABS_HH Index: jardonnet/registration/cross_cov.hh --- jardonnet/registration/cross_cov.hh (revision 2044) +++ jardonnet/registration/cross_cov.hh (working copy) @@ -1,5 +1,5 @@ -#ifndef MLN_ACCU_CROSS_COV_HH_HH -# define MLN_ACCU_CROSS_COV_HH_HH +#ifndef MLN_ACCU_CROSS_COV_HH +# define MLN_ACCU_CROSS_COV_HH namespace mln @@ -15,4 +15,4 @@ } -#endif // ! MLN_ACCU_CROSS_COV_HH_HH +#endif // ! MLN_ACCU_CROSS_COV_HH Index: jardonnet/registration/center.hh --- jardonnet/registration/center.hh (revision 0) +++ jardonnet/registration/center.hh (revision 0) @@ -0,0 +1,73 @@ +// 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_GEOM_CENTER_HH +# define MLN_GEOM_CENTER_HH + +/*! \file mln/math/exp_val.hh + * + * \brief Define the center routine. + */ + +namespace mln +{ + + namespace geom + { + + template <typename P> + P center(const p_array& a); + +# ifndef MLN_INCLUDE_ONLY + + template <typename P> + inline + P exp_value(const p_array& a) + { + if (a.npoints() == 0) + return P(); + + algebra::vec<P::dim,float> c(literal::zero); + for (unsigned i = 0; i < a.npoints(); ++i) + { + // FIXME : Ugly. + algebra::vec<P::dim,float> ai = a[i]; + c += ai; + } + + return algebra::to_point(c / a.npoints()); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::geom + +} // end of namespace mln + + +#endif // ! MLN_MATH_ABS_HH

1 0