October 2008 - Olena-patches

2481: Add missing methods to vertex and edge.
by Guillaume Lazzara 03 Oct '08

03 Oct '08

--- milena/mln/util/internal/graph_edge.hh | 30 +++++++++++++++++++++++++----- milena/mln/util/internal/graph_vertex.hh | 20 ++++++++++++++++++++ 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/milena/mln/util/internal/graph_edge.hh b/milena/mln/util/internal/graph_edge.hh index 24bb716..18f9858 100644 --- a/milena/mln/util/internal/graph_edge.hh +++ b/milena/mln/util/internal/graph_edge.hh @@ -69,7 +69,10 @@ namespace mln void update_id(unsigned id); /// Return pointer of the graph holding this edge. - const graph_t * const g() const; + const graph_t * g() const; + + /// Set \att g_ with \p g; + void change_graph(const graph_t& g); /// \} @@ -99,7 +102,7 @@ namespace mln /// \} private: - graph_t * const g_; + graph_t * g_; unsigned id_; }; @@ -123,7 +126,7 @@ namespace mln struct subject_impl< const util::edge<G>, E > { unsigned id() const; - const mlc_const(G) * const g() const; + const mlc_const(G) * g() const; unsigned v_other(unsigned id_v) const; bool is_valid() const; unsigned v1() const; @@ -141,6 +144,7 @@ namespace mln subject_impl< const util::edge<G>, E > { void update_id(unsigned id); + void change_graph(const mlc_const(G)& g); private: E& exact_(); @@ -199,7 +203,7 @@ namespace mln template <typename G> inline - const typename edge<G>::graph_t * const + const typename edge<G>::graph_t * edge<G>::g() const { return g_; @@ -207,6 +211,14 @@ namespace mln template <typename G> inline + void + edge<G>::change_graph(const graph_t& g) + { + g_ = & g; + } + + template <typename G> + inline unsigned edge<G>::v_other(unsigned id_v) const { @@ -303,7 +315,7 @@ namespace mln template <typename G, typename E> inline - const mlc_const(G) * const + const mlc_const(G) * subject_impl< const util::edge<G>, E >::g() const { return exact_().get_subject().g(); @@ -370,6 +382,14 @@ namespace mln return exact_().get_subject().update_id(id); } + template <typename G, typename E> + inline + void + subject_impl< util::edge<G>, E >::change_graph(const mlc_const(G)& g) + { + return exact_().get_subject().change_graph(&g); + } + } // End of namespace mln::internal # endif // !MLN_INCLUDE_ONLY diff --git a/milena/mln/util/internal/graph_vertex.hh b/milena/mln/util/internal/graph_vertex.hh index 02dee6d..8d35282 100644 --- a/milena/mln/util/internal/graph_vertex.hh +++ b/milena/mln/util/internal/graph_vertex.hh @@ -56,6 +56,8 @@ namespace mln /// Check whether the vertex is still part of the graph. bool is_valid() const; + /// Invalidate that vertex. + void invalidate(); unsigned other(unsigned id_e) const; @@ -118,6 +120,7 @@ namespace mln struct subject_impl< util::vertex<G>, E > : subject_impl< const util::vertex<G>, E > { + void invalidate(); void change_graph(const G& g); void update_id(unsigned id); @@ -171,6 +174,15 @@ namespace mln template<typename G> inline + void + vertex<G>::invalidate() + { + id_ = g_->v_nmax(); + } + + + template<typename G> + inline unsigned vertex<G>::other(unsigned id_e) const { @@ -338,6 +350,14 @@ namespace mln template <typename G, typename E> inline void + subject_impl< util::vertex<G>, E >::invalidate() + { + exact_().get_subject().invalidate(); + } + + template <typename G, typename E> + inline + void subject_impl< util::vertex<G>, E >::change_graph(const G& g) { exact_().get_subject().change_graph(g); -- 1.5.6.5

1 0

2480: Add p_vertices.
by Guillaume Lazzara 03 Oct '08

03 Oct '08

--- milena/mln/core/site_set/p_vertices.hh | 281 ++++++++++++++++++++++++ milena/mln/util/internal/graph_vertex_psite.hh | 190 ++++++++++++++++ milena/tests/core/site_set/Makefile.am | 4 +- milena/tests/core/site_set/p_vertices.cc | 91 ++++++++ 4 files changed, 565 insertions(+), 1 deletions(-) create mode 100644 milena/mln/core/site_set/p_vertices.hh create mode 100644 milena/mln/util/internal/graph_vertex_psite.hh create mode 100644 milena/tests/core/site_set/p_vertices.cc diff --git a/milena/mln/core/site_set/p_vertices.hh b/milena/mln/core/site_set/p_vertices.hh new file mode 100644 index 0000000..461bd51 --- /dev/null +++ b/milena/mln/core/site_set/p_vertices.hh @@ -0,0 +1,281 @@ + // 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. + // reasons why the executable file might be covered by the GNU General + // Public License. + +#ifndef MLN_CORE_SITE_SET_P_VERTICES_HH +# define MLN_CORE_SITE_SET_P_VERTICES_HH + + /// \file mln/core/site_set/p_vertices.hh + /// \brief Definition of a point set based on a graph. + +# include <mln/core/internal/site_set_base.hh> +# include <mln/core/site_set/p_graph_piter.hh> +# include <mln/util/internal/graph_vertex_psite.hh> +# include <mln/util/graph.hh> + + //# include <mln/util/tracked_ptr.hh> + + //# include <mln/core/image/graph_psite.hh> + //# include <mln/core/site_set/p_vertices_piter.hh> + +namespace mln +{ + // Forward declaration. + template <typename G, typename F> struct p_vertices; + + namespace trait + { + template <typename G, typename F> + struct site_set_< p_vertices<G, F> > + { + typedef trait::site_set::nsites::known nsites; + // FIXME: ! + typedef trait::site_set::bbox::unknown bbox; + typedef trait::site_set::contents::fixed contents; + typedef trait::site_set::arity::unique arity; + }; + } // end of namespace mln::trait + + + template <typename G, typename F> + class p_vertices + : public internal::site_set_base_< typename F::result, p_vertices<G, F> > + { + typedef util::vertex<G> vertex_t; + + typedef p_vertices<G, F> self_; + typedef internal::site_set_base_< typename F::result, self_ > super_; + + typedef G graph_t; + + public: + /// \brief Construct a graph psite set from a graph of points. + /// + /// \param gr The graph upon which the graph psite set is built. + /// + /// \a gr is \em copied internally, so that the graph psite set is + /// still valid after the initial graph has been removed. + p_vertices(const graph_t& gr, const F& f); + + /// Associated types. + /// \{ + /// Element associated type. + typedef mln_site(super_) element; + /// Point_Site associated type. + typedef internal::vertex_psite<G, F> psite; + + /// Forward Site_Iterator associated type. + typedef p_graph_piter< self_, mln_vertex_fwd_iter(G) > fwd_piter; + + /// Backward Site_Iterator associated type. + typedef p_graph_piter< self_, mln_vertex_bkd_iter(G) > bkd_piter; + + /// Site_Iterator associated type. + typedef fwd_piter piter; + /// \} + + /// \brief Return The number of points (sites) of the set, i.e., + /// the number of \em vertices. + /// + /// Required by the mln::Point_Set concept. + /* FIXME: Return type should be std::size_t (see + mln/core/concept/site_set.hh). */ + size_t nsites() const; + + /// Return The number of vertices in the graph. + std::size_t nvertices() const; + + /// Is this site set valid? + bool is_valid() const; + /// Invalidate this site set. + void invalidate(); + + /// Does this site set has \a p? + bool has(const psite& p) const; + + /// Does this site set has \a v? + template <typename G2> + bool has(const util::vertex<G2>& p) const; + + // FIXME: Dummy. + std::size_t memory_size() const; + + /// Accessors. + /// \{ + /// Return the graph associated to this site set (const version) + const graph_t& g() const; + /// Return the association function. + F function() const; + /// \} + + private: + mlc_const(graph_t)* g_; + F f_; + }; + + + /// \brief Comparison between two mln::p_vertices's. + /// + /// Two mln::p_vertices's are considered equal if they share the + /// same graph. + template <typename G, typename F> + bool + operator==(const p_vertices<G, F>& lhs, const p_vertices<G, F>& rhs); + + + /* FIXME: Extend the `ord' mechanism instead of this ill-defined + pseudo-order. */ + + /// \brief Inclusion of a mln::p_vertices in another one. + /// + /// This inclusion relation is very strict for the moment, since our + /// infrastructure for graphs is simple: a mln::p_vertices is included + /// in another one if their are equal. + /// + /// \todo Refine this later, when we are able to express subgraph + /// relations. + template <typename G, typename F> + bool + operator<=(const p_vertices<G, F>& lhs, const p_vertices<G, F>& rhs); + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename G, typename F> + inline + p_vertices<G, F>::p_vertices(const graph_t& g, const F& f) + : g_ (&g), f_(f) + { + } + + template <typename G, typename F> + inline + size_t + p_vertices<G, F>::nsites() const + { + return nvertices(); + } + + template <typename G, typename F> + inline + std::size_t + p_vertices<G, F>::nvertices() const + { + return this->g_->v_nmax(); + } + + template <typename G, typename F> + inline + bool + p_vertices<G, F>::is_valid() const + { + return g_ != 0; + } + + template <typename G, typename F> + inline + void + p_vertices<G, F>::invalidate() + { + g_ = 0; + } + + template <typename G, typename F> + inline + bool + p_vertices<G, F>::has(const psite& p) const + { + mln_precondition(is_valid()); + return has(p.v()); + } + + template <typename G, typename F> + template <typename G2> + inline + bool + p_vertices<G, F>::has(const util::vertex<G2>& p) const + { + mln_precondition(is_valid()); + return + // Check whether P is compatible with this psite set. + (p.g() == g_) && + // Check that the vertex id of P belongs to the range of valid + // vertex ids. + (p.is_valid()); + } + + template <typename G, typename F> + inline + std::size_t + p_vertices<G, F>::memory_size() const + { + // FIXME: Dummy; implement (see other site sets). + abort(); + return 0; + } + + template <typename G, typename F> + inline + const typename p_vertices<G, F>::graph_t& + p_vertices<G, F>::g() const + { + mln_precondition(is_valid()); + return *g_; + } + + template <typename G, typename F> + inline + F + p_vertices<G, F>::function() const + { + return f_; + } + + template <typename G, typename F> + bool + operator==(const p_vertices<G, F>& lhs, const p_vertices<G, F>& rhs) + { + /* FIXME: We should not rely on pointer equality here, as graph + will soon become shells using (shared) tracked pointers to + actual data. So, delegate the equality test to the graphs + themselves. */ + return (*lhs.g_) == (*rhs.g_); + } + + template <typename G, typename F> + bool + operator<=(const p_vertices<G, F>& lhs, const p_vertices<G, F>& rhs) + { + return lhs == rhs; + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of mln + + +#endif // MLN_CORE_SITE_SET_P_VERTICES_HH diff --git a/milena/mln/util/internal/graph_vertex_psite.hh b/milena/mln/util/internal/graph_vertex_psite.hh new file mode 100644 index 0000000..b2fadf9 --- /dev/null +++ b/milena/mln/util/internal/graph_vertex_psite.hh @@ -0,0 +1,190 @@ +// 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. +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_UTIL_INTERNAL_GRAPH_VERTEX_PSITE_HH +# define MLN_UTIL_INTERNAL_GRAPH_VERTEX_PSITE_HH + +# include <mln/core/concept/pseudo_site.hh> + +namespace mln +{ + + template <typename G, typename F> class p_vertices; + +} // end of namespace mln + +/// \file mln/util/internal/graph_vertex_psite.hh +/// \brief Implementation of p_vertices psite. + +namespace mln +{ + + namespace internal + { + + template <typename G, typename F> + class vertex_psite : public mln::Pseudo_Site< vertex_psite<G, F> >, + public internal::proxy_impl< const typename F::result&, vertex_psite<G, F> > + { + typedef Pseudo_Site< vertex_psite<G, F> > super; + + public: + typedef p_vertices<G, F> site_set; + typedef mlc_const(site_set) target; + typedef typename F::result site; + + vertex_psite(); + vertex_psite(const target& t); + + void change_target(const target& new_target); + void change_vertex_id(unsigned id_v); + void update_id(unsigned v_id); + + const target* target_() const; // Hook to the target. + + bool is_valid() const; + void invalidate(); + + typedef const site& q_subject; + const site& subj_(); + const site& to_site() const; + + const util::vertex<G>& v() const; + + protected: + target* t_; + util::vertex<G> v_; + }; + + } // end of namespace internal + +} // end of namespace mln + + +# ifndef MLN_INCLUDE_ONLY + +namespace mln +{ + + namespace internal + { + + template <typename G, typename F> + inline + vertex_psite<G, F>::vertex_psite() + : t_(0) + { + } + + template <typename G, typename F> + inline + vertex_psite<G, F>::vertex_psite(const target& t) + : t_(0) + { + change_target(t); + } + + template <typename G, typename F> + inline + void + vertex_psite<G, F>::change_target(const target& new_target) + { + t_ = &new_target; + v_.change_graph(new_target.g()); + } + + template <typename G, typename F> + inline + void + vertex_psite<G, F>::change_vertex_id(unsigned id_v) + { + v_.update_id(id_v); + } + + template <typename G, typename F> + inline + void + vertex_psite<G, F>::update_id(unsigned v_id) + { + v_.update_id(v_id); + } + + template <typename G, typename F> + inline + const typename vertex_psite<G, F>::target* + vertex_psite<G, F>::target_() const + { + return t_; + } + + template <typename G, typename F> + inline + bool + vertex_psite<G, F>::is_valid() const + { + return t_ != 0 && t_->is_valid(); + } + + template <typename G, typename F> + inline + void + vertex_psite<G, F>::invalidate() + { + t_ = 0; + } + + template <typename G, typename F> + inline + const typename vertex_psite<G, F>::site& + vertex_psite<G, F>::subj_() + { + return to_site(); + } + + template <typename G, typename F> + inline + const typename vertex_psite<G, F>::site& + vertex_psite<G, F>::to_site() const + { + return t_->function()(v_); + } + + template <typename G, typename F> + inline + const util::vertex<G>& + vertex_psite<G, F>::v() const + { + return v_; + } + + } // end of namespace internal + +} // end of namespace mln +# endif // !MLN_INCLUDE_ONLY + +#endif // !MLN_UTIL_INTERNAL_GRAPH_VERTEX_PSITE_HH + diff --git a/milena/tests/core/site_set/Makefile.am b/milena/tests/core/site_set/Makefile.am index c1f1e14..d1b2cf6 100644 --- a/milena/tests/core/site_set/Makefile.am +++ b/milena/tests/core/site_set/Makefile.am @@ -10,7 +10,8 @@ check_PROGRAMS = \ p_queue \ p_queue_fast \ p_set \ - pset_if + pset_if \ + p_vertices p_array_SOURCES = p_array.cc ##p_bgraph_SOURCES = p_bgraph.cc @@ -20,5 +21,6 @@ p_queue_SOURCES = p_queue.cc p_queue_fast_SOURCES = p_queue_fast.cc p_set_SOURCES = p_set.cc pset_if_SOURCES = pset_if.cc +p_vertices_SOURCES = p_vertices.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/core/site_set/p_vertices.cc b/milena/tests/core/site_set/p_vertices.cc new file mode 100644 index 0000000..6db4609 --- /dev/null +++ b/milena/tests/core/site_set/p_vertices.cc @@ -0,0 +1,91 @@ +// 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. + +/*! \file tests/core/site_set/p_vertices.cc + * + * \brief Tests on mln::p_vertices. + */ + +#include <mln/util/graph.hh> +#include <mln/core/alias/point2d.hh> +#include <mln/core/site_set/p_vertices.hh> + +template <typename G> +struct my_fun +{ + typedef mln::point2d result; + + const result& operator()(const mln::util::vertex<G>& v) const + { + static mln::point2d res(0, 0); + res.row() = v.id(); + return res; + } + +}; + +int main() +{ + using namespace mln; + + util::graph g; + g.add_vertex (); // 0 + g.add_vertex (); // 1 + g.add_vertex (); // 2 + g.add_vertex (); // 3 + g.add_vertex (); // 4 + g.add_vertex (); // 5 + g.add_edge (0, 1); + g.add_edge (0, 2); + g.add_edge (3, 4); + g.add_edge (4, 5); + g.add_edge (5, 4); + g.add_edge (1, 0); + g.add_edge (5, 3); + g.add_edge (2, 1); + +// typedef point2d (*fun_t)(const util::vertex<util::graph>&); + typedef p_vertices<util::graph, my_fun<util::graph> > p_vertices; + p_vertices pv(g, my_fun<util::graph>()); + + { + mln_fwd_piter_(p_vertices) p(pv); + unsigned i = 0; + for_all(p) + mln_assertion(p.p_hook_().v().id() == i++); + mln_assertion(i == g.v_nmax()); + } + { + mln_bkd_piter_(p_vertices) p(pv); + unsigned i = g.v_nmax() - 1; + for_all(p) + mln_assertion(p.p_hook_().v().id() == i--); + mln_assertion(i == UINT_MAX); + } + + return 0; +} -- 1.5.6.5

1 0

2479: Add a missing update_graph method.
by Guillaume Lazzara 03 Oct '08

03 Oct '08

--- milena/mln/util/internal/graph_vertex_iter.hh | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/milena/mln/util/internal/graph_vertex_iter.hh b/milena/mln/util/internal/graph_vertex_iter.hh index 9d2f3df..da564e7 100644 --- a/milena/mln/util/internal/graph_vertex_iter.hh +++ b/milena/mln/util/internal/graph_vertex_iter.hh @@ -71,6 +71,8 @@ namespace mln unsigned index() const; /// \} + void update_graph(const G& g); + /// Proxy. /// \{ /// Proxy subject @@ -136,8 +138,8 @@ namespace mln template<typename G> inline vertex_fwd_iterator<G>::vertex_fwd_iterator(const G& g) - : v_(util::vertex<G>(&g)) { + update_graph(g); invalidate(); } @@ -175,6 +177,14 @@ namespace mln template<typename G> inline + void + vertex_fwd_iterator<G>::update_graph(const G& g) + { + v_ = util::vertex<G>(&g); + } + + template<typename G> + inline unsigned vertex_fwd_iterator<G>::index() const { -- 1.5.6.5

1 0

2478: Update graph_vertex
by Guillaume Lazzara 03 Oct '08

03 Oct '08

Remove useless const and a useless precondition. --- milena/mln/util/internal/graph_vertex.hh | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/milena/mln/util/internal/graph_vertex.hh b/milena/mln/util/internal/graph_vertex.hh index fc4ff2b..02dee6d 100644 --- a/milena/mln/util/internal/graph_vertex.hh +++ b/milena/mln/util/internal/graph_vertex.hh @@ -80,13 +80,13 @@ namespace mln void update_id(unsigned id); /// Returns the graph pointer this vertex belongs to. - const graph_t * const g() const; + const graph_t * g() const; /// Returns vertex id. unsigned id() const; private: - graph_t * const g_; + graph_t * g_; unsigned id_; }; @@ -101,7 +101,7 @@ namespace mln struct subject_impl< const util::vertex<G>, E > { bool is_valid() const; - const mlc_const(G) * const g() const; + const mlc_const(G) * g() const; unsigned id() const; unsigned other(unsigned id_e) const; @@ -221,7 +221,6 @@ namespace mln void vertex<G>::change_graph(const G& g) { - mln_precondition(g_->has_v(id_)); g_ = &g; } @@ -235,7 +234,7 @@ namespace mln template<typename G> inline - const typename vertex<G>::graph_t * const + const typename vertex<G>::graph_t * vertex<G>::g() const { return g_; @@ -272,7 +271,7 @@ namespace mln template <typename G, typename E> inline - const mlc_const(G)* const + const mlc_const(G)* subject_impl< const util::vertex<G>, E >::g() const { return exact_().get_subject().g(); -- 1.5.6.5

1 0

2477: Add missing has() operators.
by Guillaume Lazzara 03 Oct '08

03 Oct '08

Add has(vertex) and has(edge) to graph_base. --- milena/mln/util/internal/graph_base.hh | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/milena/mln/util/internal/graph_base.hh b/milena/mln/util/internal/graph_base.hh index 17143c5..9f2e6e2 100644 --- a/milena/mln/util/internal/graph_base.hh +++ b/milena/mln/util/internal/graph_base.hh @@ -113,7 +113,10 @@ namespace mln /// \brief Return the number of vertices in the graph. size_t v_nmax() const; - /// Check whether a vertex id \p id_v is valid in the graph. + /// Check whether a vertex \p v exists in the graph. + bool has(const util::vertex<E>& v) const; + + /// Check whether a vertex id \p id_v exists in the graph. bool has_v(unsigned id_v) const; /// Return the number of adjacent edges of vertex \p id_v. @@ -148,6 +151,9 @@ namespace mln /// \brief Return the number of edges in the graph. size_t e_nmax() const; + /// Check whether an edge \p e exists in the graph. + bool has(const util::edge<E>& e) const; + /// Return whether \p id_e is in the graph. bool has_e(unsigned id_e) const; @@ -284,6 +290,14 @@ namespace mln template<typename E> inline bool + graph_base<E>::has(const util::vertex<E>& v) const + { + return has_v(v.id()); + } + + template<typename E> + inline + bool graph_base<E>::has_v(unsigned id_v) const { return id_v < vertices_.size(); @@ -385,6 +399,14 @@ namespace mln template<typename E> inline bool + graph_base<E>::has(const util::edge<E>& e) const + { + return has_e(e.id()); + } + + template<typename E> + inline + bool graph_base<E>::has_e(unsigned id_e) const { return id_e < edges_.size(); -- 1.5.6.5

1 0

2476: Make p_graph_piter work with the new graph iterators.
by Guillaume Lazzara 03 Oct '08

03 Oct '08

--- milena/mln/core/site_set/p_graph_piter.hh | 181 ++++++++++++++++++----------- 1 files changed, 113 insertions(+), 68 deletions(-) diff --git a/milena/mln/core/site_set/p_graph_piter.hh b/milena/mln/core/site_set/p_graph_piter.hh index 7ef1859..2a235c5 100644 --- a/milena/mln/core/site_set/p_graph_piter.hh +++ b/milena/mln/core/site_set/p_graph_piter.hh @@ -32,8 +32,8 @@ /// \brief Definition of point iterator on graph-based point set. # include <mln/core/internal/site_set_iterator_base.hh> -# include <mln/core/site_set/p_graph.hh> -# include <mln/core/image/graph_psite.hh> +//# include <mln/core/site_set/p_graph.hh> +//# include <mln/core/image/graph_psite.hh> /* FIXME: Iterators on p_graph and p_line_graph share common code. Factor as much as possible. */ @@ -42,28 +42,28 @@ namespace mln { // Fwd decls. - template <typename P> class p_graph; - template <typename P> class graph_psite; + template <typename S, typename I> class graph_psite; /*------------------------. - | p_graph_fwd_piter_. | + | p_graph_piter<S,I>. | `------------------------*/ - /// \brief Forward iterator on point sites of a mln::p_graph. - template <typename P> - class p_graph_fwd_piter_ - : public internal::site_set_iterator_base< p_graph, - p_graph_fwd_piter_ > + /// \brief Forward iterator on point sites of a mln::S. + template <typename S, typename I> + class p_graph_piter + : public internal::site_set_iterator_base< S, + p_graph_piter<S, I> > { - typedef p_graph_fwd_piter_ self_; - typedef internal::site_set_iterator_base< p_graph, self_ > super_; + typedef p_graph_piter<S,I> self_; + typedef internal::site_set_iterator_base< S, self_ > super_; + typedef I iter; public: /// Construction and assignment. /// \{ - p_graph_fwd_piter_(); - p_graph_fwd_piter_(const p_graph& pg); + p_graph_piter(); + p_graph_piter(const S& pv); /// \} /// Manipulation. @@ -80,36 +80,44 @@ namespace mln /// \} private: + /// Update the psite corresponding to this iterator. + void update_(); + + private: /// The psite corresponding to this iterator. using super_::p_; + + /// The underlying vertex iterator. + iter iter_; }; - /// Print an mln::p_graph_fwd_piter_. - template <typename P> + /// Print an mln::p_graph_piter<S,I>. + template <typename S, typename I> inline std::ostream& - operator<<(std::ostream& ostr, const p_graph_fwd_piter_& p); + operator<<(std::ostream& ostr, const p_graph_piter<S,I>& p); /*------------------------. - | p_graph_bkd_piter_. | + | p_graph_bkd_piter_<S,I>. | `------------------------*/ - /// \brief Backward iterator on point sites of a mln::p_graph. - template <typename P> + /// \brief Backward iterator on point sites of a mln::S. +/* template <typename S, typename I> class p_graph_bkd_piter_ - : public internal::site_set_iterator_base< p_graph, - p_graph_bkd_piter_ > + : public internal::site_set_iterator_base< S, + p_graph_bkd_piter_<S,I> > { - typedef p_graph_bkd_piter_ self_; - typedef internal::site_set_iterator_base< p_graph, self_ > super_; + typedef p_graph_bkd_piter_<S,I> self_; + typedef internal::site_set_iterator_base< S, self_ > super_; + typedef I iter; public: /// Construction and assignment. /// \{ p_graph_bkd_piter_(); - p_graph_bkd_piter_(const p_graph& pg); + p_graph_bkd_piter_(const S& pv); /// \} /// Manipulation. @@ -126,142 +134,179 @@ namespace mln /// \} private: + /// Update the psite corresponding to this iterator. + void update_(); + + private: /// The psite corresponding to this iterator. using super_::p_; + + /// The underlying vertex iterator. + iter iter_; }; - /// Print an mln::p_graph_bkd_piter_. - template <typename P> + /// Print an mln::p_graph_bkd_piter_<S,I>. + template <typename S, typename I> inline std::ostream& - operator<<(std::ostream& ostr, const p_graph_bkd_piter_& p); - + operator<<(std::ostream& ostr, const p_graph_bkd_piter_<S,I>& p); +*/ # ifndef MLN_INCLUDE_ONLY /*------------------------. - | p_graph_fwd_piter_. | + | p_graph_piter<S,I>. | `------------------------*/ - template <typename P> + template <typename S, typename I> inline - p_graph_fwd_piter_::p_graph_fwd_piter_() + p_graph_piter<S,I>::p_graph_piter() { mln_postcondition(!this->is_valid()); } - template <typename P> + template <typename S, typename I> inline - p_graph_fwd_piter_::p_graph_fwd_piter_(const p_graph& pg) + p_graph_piter<S,I>::p_graph_piter(const S& pv) + : iter_(pv.g()) { - this->change_target(pg); + this->change_target(pv); mln_postcondition(!this->is_valid()); } - template <typename P> + template <typename S, typename I> inline bool - p_graph_fwd_piter_::is_valid_() const + p_graph_piter<S,I>::is_valid_() const { - return p_.is_valid(); + return iter_.is_valid(); } - template <typename P> + template <typename S, typename I> inline void - p_graph_fwd_piter_::invalidate_() + p_graph_piter<S,I>::invalidate_() { - p_.invalidate(); + iter_.invalidate(); + } + + template <typename S, typename I> + inline + void + p_graph_piter<S,I>::start_() + { + iter_.start(); + if (this->is_valid()) + update_(); } - template <typename P> + template <typename S, typename I> inline void - p_graph_fwd_piter_::start_() + p_graph_piter<S,I>::next_() { - p_.change_vertex_id(0); + iter_.next(); + if (this->is_valid()) + update_(); } - template <typename P> + template <typename S, typename I> inline void - p_graph_fwd_piter_::next_() + p_graph_piter<S,I>::update_() { - p_.inc_vertex_id(); + mln_precondition(this->is_valid()); + // Update psite_. + p_.update_id(iter_.id()); } - template <typename P> + + template <typename S, typename I> inline std::ostream& - operator<<(std::ostream& ostr, const p_graph_fwd_piter_& p) + operator<<(std::ostream& ostr, const p_graph_piter<S,I>& p) { return ostr << p.unproxy_(); } /*------------------------. - | p_graph_bkd_piter_. | + | p_graph_bkd_piter_<S,I>. | `------------------------*/ - template <typename P> +/* template <typename S, typename I> inline - p_graph_bkd_piter_::p_graph_bkd_piter_() + p_graph_bkd_piter_<S,I>::p_graph_bkd_piter_() { mln_postcondition(!this->is_valid()); } - template <typename P> + template <typename S, typename I> inline - p_graph_bkd_piter_::p_graph_bkd_piter_(const p_graph& pg) + p_graph_bkd_piter_<S,I>::p_graph_bkd_piter_(const S& pv) + : iter_(pv.g()) { - this->change_target(pg); + this->change_target(pv); mln_postcondition(!this->is_valid()); } - template <typename P> + template <typename S, typename I> inline bool - p_graph_bkd_piter_::is_valid_() const + p_graph_bkd_piter_<S,I>::is_valid_() const { return p_.is_valid(); } - template <typename P> + template <typename S, typename I> inline void - p_graph_bkd_piter_::invalidate_() + p_graph_bkd_piter_<S,I>::invalidate_() { p_.invalidate(); } - template <typename P> + template <typename S, typename I> inline void - p_graph_bkd_piter_::start_() + p_graph_bkd_piter_<S,I>::start_() { - p_.change_vertex_id(this->site_set().nvertices() - 1); + iter_.start(); + if (this->is_valid()) + update_(); } - template <typename P> + template <typename S, typename I> inline void - p_graph_bkd_piter_::next_() + p_graph_bkd_piter_<S,I>::next_() { - p_.dec_vertex_id(); + iter_.next(); + if (this->is_valid()) + update_(); } + template <typename S, typename I> + inline + void + p_graph_bkd_piter_<S,I>::update_() + { + mln_precondition(this->is_valid()); + // Update psite_. + p_.update_id(iter_.id()); + } - template <typename P> + template <typename S, typename I> inline std::ostream& - operator<<(std::ostream& ostr, const p_graph_bkd_piter_& p) + operator<<(std::ostream& ostr, const p_graph_bkd_piter_<S,I>& p) { return ostr << p.unproxy_(); } - +*/ # endif // ! MLN_INCLUDE_ONLY } // end of mln -- 1.5.6.5

1 0

cleanup-2008 2475: Start to integrate registration in Milena.
by Ugo Jardonnet 02 Oct '08

02 Oct '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Start to integrate registration in Milena. * mln/binarization/binarization.hh: Remove whitesapce. * mln/registration: New. * mln/registration/multiscale.hh: Multiscale registration of tow images. * mln/registration/registration.hh: Simple registration of tow images. * mln/registration/icp.hh: ICP registration of two p_array. icp.hh | 159 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ multiscale.hh | 114 ++++++++++++++++++++++++++++++++++++++++ registration.hh | 119 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 392 insertions(+) Index: mln/binarization/binarization.hh Index: mln/registration/multiscale.hh --- mln/registration/multiscale.hh (revision 0) +++ mln/registration/multiscale.hh (revision 0) @@ -0,0 +1,114 @@ +// 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_REGISTRATION_MULTISCALE_HH +# define MLN_REGISTRATION_MULTISCALE_HH + +# include <mln/registration/icp.hh> + +namespace mln +{ + + namespace registration + { + + template <typename I, typename J> + inline + composed< rotation<I::psite::dim, float>, translation<I::Psite::dim, float> > + multiscale(const Image& cloud, + const Image<J>& surface, + const float q, + const unsigned nb_it); + + +# ifndef MLN_INCLUDE_ONLY + + namespace impl + { + + template <typename I, typename J> + inline + composed< rotation<P::dim, float>, translation<P::dim, float> > + multiscale_(const Image& cloud, + const Image<J>& surface, + const float q, + const unsigned nb_it) + { + // Shuffle cloud + shuffle(cloud); + + //working box + const box<point2d> working_box = + enlarge(bigger(geom::bbox(c), geom::bbox(x)), 100); + + //make a lazy_image map via function closest_point + closest_point<mln_psite_(image2db)> fun(x, working_box); //FIXME: to port + lazy_image<image2d<bool>, closest_point<mln_psite_(image2db)>, box2d > + map(fun, fun.domain()); + + //init rigid transform qk + composed< rotation<I::psite::dim, float>, translation<I::psite::dim, float> > qk; + + //run registration + for (int e = nb_it-1; e >= 0; e--) + { + unsigned l = cloud.nsites() / std::pow(q, e); + l = (l<1) ? 1 : l; + impl::registration_(cloud, map, qk, l, 1e-3); + } + return qk; + } + + } + + template <typename I, typename J> + inline + composed< rotation<P::dim, float>, translation<P::dim, float> > + multiscale(const Image& cloud, + const Image<J>& surface, + const float q, + const unsigned nb_it) + { + trace::entering("registration::registration"); + + mln_precondition(P::dim == 3 || P::dim == 2); + + impl::multiscale_(cloud, surface, q, nb_it); + + trace::exiting("registration::registration"); + + return qk; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::registration + +} // end of namespace mln + + +#endif // ! MLN_REGISTRATION_MULTISCALE_HH Index: mln/registration/registration.hh --- mln/registration/registration.hh (revision 0) +++ mln/registration/registration.hh (revision 0) @@ -0,0 +1,119 @@ +// 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_REGISTRATION_REGISTRATION_HH +# define MLN_REGISTRATION_REGISTRATION_HH + +/*! \file mln/registration/registration.hh + * + * \brief image registration + */ + +# include <mln/registration/icp.hh> +# include <mln/core/image/lazy_image.hh> + +namespace mln +{ + + namespace registration + { + + + using namespace fun::x2x::geom; + + /*! Register an image \p cloud over the image \p surface. + */ + template <typename I, typename J> + inline + composed< rotation<I::psite::dim, float>, translation<I::psite::dim, float> > + registration(const Image& cloud, + const Image<J>& surface); + + +# ifndef MLN_INCLUDE_ONLY + + namespace impl + { + + template <typename I, typename J> + inline + composed< rotation<I::psite::dim, float>, translation<I::psite::dim, float> > + registration_(const Image& cloud, + const Image<J>& surface) + { + p_array<mln_psite(I)> c = convert::to< p_array<mln_psite(I)> >(cloud); + p_array<mln_psite(J)> x = convert::to< p_array<mln_psite(I)> >(surface); + + //init rigid transform qk + composed< rotation<I::P::dim, float>, translation<I::P::dim, float> > qk; + + //working box + const box<point2d> working_box = + enlarge(bigger(geom::bbox(c), geom::bbox(x)), 100); + + //make a lazy_image map via function closest_point + closest_point<mln_psite(I)> fun(x, working_box); //FIXME: to port + lazy_image<mln_ch_value(I,bool), closest_point<mln_psite(I)>, box2d > + map(fun, fun.domain()); + + //run registration + registration::icp(c, map, qk, l, 1e-3); + + } + + } + + template <typename I, typename J> + inline + composed< rotation<I::psite::dim, float>, translation<I::psite::dim, float> > + registration(const Image& cloud, + const Image<J>& surface) + { + trace::entering("registration::registration"); + + mln_precondition(I::psite::dim == J::psite::dim); + mln_precondition(I::psite::dim == 3 || J::psite::dim == 2); + + composed< rotation<I::psite::dim, float>, translation<I::psite::dim, float> > + qk = impl::registration_(cloud, surface); + + trace::exiting("registration::registration"); + + return qk; + } + + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace mln::registration + + +} // end of namespace mln + + +#endif // ! MLN_REGISTRATION_REGISTRATION_HH Index: mln/registration/icp.hh --- mln/registration/icp.hh (revision 0) +++ mln/registration/icp.hh (revision 0) @@ -0,0 +1,159 @@ +// 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_REGISTRATION_ICP_HH +# define MLN_REGISTRATION_ICP_HH + +/*! \file mln/registration/icp.hh + * + * \brief Register an image over an another using the ICP algorithm. + */ + +#include <mln/fun/x2x/all.hh> + +namespace mln +{ + + namespace registration + { + + using namespace fun::x2x::geom; + + /*! Register point in \p c using a map of closest points \p map + * + * \param[in] c The cloud of points. + * \param[in] map The map of closest points. + * \param[in] epsilon ICP stops if sqr_norm(qk - qk-1) / + * sqr_norm(qk) > epsilon + * \param[out] qk The rigid transformation obtained. + * + * \pre \p ima has to be initialized. + */ + template <typename P, typename M> + inline + composed<rotation<2u, float>, translation<2u, float> > + icp(const p_array& c, const M& map, + const float epsilon = 1e-3); + + /*! + * \fixme + */ + template <typename P, typename M, typename T> + inline + void + icp_subset(const p_array& c, + const M& map, + T& qk, + const unsigned c_length, + const float epsilon = 1e-3); + + +# ifndef MLN_INCLUDE_ONLY + + namespace impl + { + + template <typename P, typename M, typename T> + inline + void + icp_(const p_array& c, + const unsigned c_length, + const M& map, + T& qk, + const float epsilon = 1e-3) + { + trace::entering("registration::impl::icp_"); + + buffer<4,T> buf_qk; + buffer<3,float> buf_dk; + + float d_k = 10000; + p_array Ck(c); + + algebra::vec<P::dim,float> mu_C = center(c, c_length), mu_Xk; + + buf_qk.store(qk); + + qk.apply_on(c, Ck, c_length); + + unsigned int k = 0; + do { + buf_dk.store(d_k); + + //compute qk + qk = match(c, mu_C, Ck, map, c_length); + buf_qk.store(qk); + + //Ck+1 = qk(c) + qk.apply_on(c, Ck, c_length); + + // d_k = d(Yk, Pk+1) + // = d(closest(qk-1(P)), qk(P)) + d_k = rms(c, map, c_length, buf_qk[1], qk); + + k++; + } while ((qk - buf_qk[1]).sqr_norm() / qk.sqr_norm() > epsilon); + + trace::exiting("registration::impl::icp_"); + } + + } // end of namespace mln::registration::impl + + + template <typename P, typename M, typename T> + inline + T + icp(const p_array& c, + const M& map, + const float epsilon = 1e-3) + { + T qk; + impl::icp_(c, map, qk, c.length(), epsilon); + return qk; + } + + template <typename P, typename M, typename T> + inline + void + icp_subset(const p_array& c, + const unsigned c_length, + const M& map, + T& qk, + const float epsilon = 1e-3) + { + impl::icp_(c, map, qk, c_length, epsilon); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::registration + +} // end of namespace mln + + + +#endif // ! MLN_REGISTRATION_ICP_HH

1 0

cleanup-2008 2474: Make tutorial examples compile.
by Thierry Geraud 02 Oct '08

02 Oct '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Make tutorial examples compile. * doc/tutorial/examples/image_safe.cc: Fix missing update. * mln/core/site_set/p_priority.hh (q_type_): New. Use it instead of explicit type name, so fix bugs. * mln/core/image/safe.hh (init_): Remove extra overload, so fix bug in this method presence checking. * mln/convert/from_to.hh: Move overload vec->Gpoint... * mln/core/concept/gpoint.hh: ...here. (from_to): New overload for Gpoint->vec. * mln/convert/from_to.hxx: Update. * mln/core/window.hh (delta_): New. (delta): Fix the case where D is a delta-index. * mln/border/fill.hh: Fix warning. * mln/util/dindex.hh (literal::zero): Handle constructor and assignment. (literal::one): Likewise. doc/tutorial/examples/image_safe.cc | 2 - mln/border/fill.hh | 3 +- mln/convert/from_to.hh | 16 +------------- mln/convert/from_to.hxx | 5 ++++ mln/core/concept/gpoint.hh | 33 ++++++++++++++++++++++++++++++ mln/core/image/safe.hh | 10 --------- mln/core/site_set/p_priority.hh | 10 +++++---- mln/core/window.hh | 27 +++++++++++++++++++++--- mln/util/dindex.hh | 39 +++++++++++++++++++++++++++++++++--- 9 files changed, 108 insertions(+), 37 deletions(-) Index: doc/tutorial/examples/image_safe.cc --- doc/tutorial/examples/image_safe.cc (revision 2473) +++ doc/tutorial/examples/image_safe.cc (working copy) @@ -1,5 +1,5 @@ # include <mln/core/image/image2d.hh> -# include <mln/core/site_set/line2d.hh> +# include <mln/core/site_set/p_line2d.hh> # include <mln/core/image/safe.hh> # include <mln/debug/println.hh> # include <mln/level/fill.hh> Index: mln/core/site_set/p_priority.hh --- mln/core/site_set/p_priority.hh (revision 2473) +++ mln/core/site_set/p_priority.hh (working copy) @@ -177,8 +177,10 @@ protected: + typedef std::map<P, Q, util::ord > q_type_; + util::set p_; - std::map<P, Q, util::ord > q_; + q_type_ q_; unsigned n_; // Run invariance tests and return the result. @@ -308,7 +310,7 @@ { mln_invariant(run_()); std::size_t mem_q = 0; - typename std::map<P, Q>::const_iterator i; + typename q_type_::const_iterator i; for (i = q_.begin(); i != q_.end(); ++i) mem_q += i->second.memory_size(); return p_.memory_size() + sizeof(q_) + sizeof(n_); @@ -322,7 +324,7 @@ static const Q nil_ = Q(); if (exists_priority(priority)) // Also test invariants. { - std::map<P,Q>& mq = const_cast<std::map<P,Q>&>(q_); + q_type_& mq = const_cast<q_type_&>(q_); mln_assertion(mq[priority].nsites() > 0); return mq[priority]; } @@ -380,7 +382,7 @@ p_priority<P,Q>::set_2_(const P& priority) const { mln_precondition(p_.has(priority)); - std::map<P,Q>& mq = const_cast<std::map<P,Q>&>(q_); + q_type_& mq = const_cast<q_type_&>(q_); mln_precondition(mq[priority].nsites() > 0); return mq[priority]; } Index: mln/core/image/safe.hh --- mln/core/image/safe.hh (revision 2473) +++ mln/core/image/safe.hh (working copy) @@ -94,7 +94,6 @@ safe_image(I& ima, const mln_value(I)& default_value); // Initialize an empty image. - void init_(I& ima); void init_(I& ima, const mln_value(I)& default_value); mln_rvalue(I) operator()(const mln_psite(I)& p) const; @@ -161,15 +160,6 @@ template <typename I> inline void - safe_image::init_(I& ima) - { - mln_precondition(ima.has_data()); - this->data_ = new internal::data< safe_image >(ima, mln_value(I)()); - } - - template <typename I> - inline - void safe_image::init_(I& ima, const mln_value(I)& default_value) { mln_precondition(ima.has_data()); Index: mln/core/concept/gpoint.hh --- mln/core/concept/gpoint.hh (revision 2473) +++ mln/core/concept/gpoint.hh (working copy) @@ -36,6 +36,7 @@ # include <mln/core/concept/site.hh> # include <mln/core/concept/gdpoint.hh> # include <mln/value/concept/scalar.hh> +# include <mln/algebra/vec.hh> # include <mln/util/ord.hh> @@ -120,6 +121,14 @@ void from_to(const Gpoint& from, mln_delta(P)& to); + template <typename P, unsigned n, typename T> + void + from_to(const Gpoint& from, algebra::vec<n,T>& to); + + template <unsigned n, typename T, typename P> + void + from_to(const algebra::vec<n,T>& from, Gpoint& to); + } // end of namespace::convert @@ -282,6 +291,7 @@ namespace convert { + // Gpoint -> delta template <typename P> inline void @@ -296,6 +306,29 @@ dp[i] = p[i]; } + // Gpoint -> algebra::vec. + template <typename P, unsigned n, typename T> + void + from_to(const Gpoint& from_, algebra::vec<n,T>& to) + { + mlc_bool(n == P::dim)::check(); + const P& from = exact(from_); + for (unsigned i = 0; i < n; ++i) + to[i] = static_cast< T >(from[i]); // FIXME: cast -> best effort... + } + + // algebra::vec -> Gpoint. + template <unsigned n, typename T, typename P> + inline + void + from_to(const algebra::vec<n,T>& from, Gpoint& to_) + { + mlc_bool(P::dim == n)::check(); + P& to = exact(to_); + for (unsigned i = 0; i < n; ++i) + to[i] = static_cast< typename P::coord >(from[i]); // FIXME: cast -> best effort... + } + } // end of namespace::convert Index: mln/core/window.hh --- mln/core/window.hh (revision 2473) +++ mln/core/window.hh (working copy) @@ -43,11 +43,13 @@ */ # include <mln/core/internal/window_base.hh> +# include <mln/core/concept/gdpoint.hh> # include <mln/metal/is_a.hh> # include <mln/util/set.hh> # include <mln/fun/i2v/all_to.hh> # include <mln/norm/linfty.hh> +# include <mln/literal/zero.hh> namespace mln @@ -181,6 +183,9 @@ private: util::set<D> dps_; + + unsigned delta_(int i) const; // For indices. + unsigned delta_(const Gdpoint<D>& dp) const; // For grids delta-points. }; @@ -221,8 +226,7 @@ bool window<D>::is_centered() const { - static const D origin = all_to(0); - return this->dps_.has(origin); // FIXME: Use literal::origin. + return this->dps_.has(literal::zero); } template <typename D> @@ -258,12 +262,11 @@ unsigned window<D>::delta() const { - // FIXME: Is-it correct? unsigned d = 0; const unsigned n = size(); for (unsigned i = 0; i < n; ++i) { - unsigned dd = norm::linfty(dp(i).to_vec()); + unsigned dd = delta_(dp(i)); if (dd > d) d = dd; } @@ -273,6 +276,22 @@ template <typename D> inline unsigned + window<D>::delta_(int i) const + { + return i; + } + + template <typename D> + inline + unsigned + window<D>::delta_(const Gdpoint<D>& dp) const + { + return norm::linfty(exact(dp).to_vec()); + } + + template <typename D> + inline + unsigned window<D>::size() const { return dps_.nelements(); Index: mln/border/fill.hh --- mln/border/fill.hh (revision 2473) +++ mln/border/fill.hh (working copy) @@ -67,9 +67,10 @@ template <typename I> inline - void fill_tests(const Image& ima, const mln_value(I)& v) + void fill_tests(const Image& ima, const mln_value(I)&) { mln_precondition(exact(ima).has_data()); + (void) ima; } } // end of namespace mln::border::internal Index: mln/convert/from_to.hh --- mln/convert/from_to.hh (revision 2473) +++ mln/convert/from_to.hh (working copy) @@ -32,8 +32,6 @@ * * \brief General conversion procedure between two objects. * - * \todo Use 'round' instead of static_cast in vec->Gpoint. - * * \todo Test the effectiveness of guards. * \todo Add fwd decls. * \todo Dispatch code in appropriate files. @@ -74,6 +72,7 @@ from_to(const int& from, Object<T>& to); + # ifndef MLN_INCLUDE_ONLY @@ -102,18 +101,6 @@ mln::convert::impl::from_image_to_site_set(from, to); } - // algebra::vec -> Gpoint. - template <unsigned n, typename T, typename P> - inline - void - from_to(const algebra::vec<n,T>& from, Gpoint& to_) - { - mlc_bool(P::dim == n)::check(); - P& to = exact(to_); - for (unsigned i = 0; i < n; ++i) - to[i] = static_cast< typename P::coord >(from[i]); - } - // Value -> Value template <typename F, typename T> inline @@ -123,6 +110,7 @@ mln::convert::impl::from_value_to_value(from, to); } + // float -> Object template <typename T> inline Index: mln/convert/from_to.hxx --- mln/convert/from_to.hxx (revision 2473) +++ mln/convert/from_to.hxx (working copy) @@ -93,6 +93,11 @@ void from_to(const Image& from, Site_Set<S>& to); + // Gpoint -> algebra::vec. + template <typename P, unsigned n, typename T> + void + from_to(const Gpoint& from, algebra::vec<n,T>& to); + // algebra::vec -> Gpoint. template <unsigned n, typename T, typename P> void Index: mln/util/dindex.hh --- mln/util/dindex.hh (revision 2473) +++ mln/util/dindex.hh (working copy) @@ -38,6 +38,8 @@ */ # include <mln/util/index.hh> +# include <mln/literal/zero.hh> +# include <mln/literal/one.hh> namespace mln @@ -66,15 +68,46 @@ int i_; - dindex_() {} - dindex_(int i) : i_(i) {} + dindex_() + { + } + + dindex_(int i) + : i_(i) + { + } + + /// \{ Constructors/assignments with literals. + dindex_(const literal::zero_t&) + : i_(0) + { + } + dindex_<Tag>& operator=(const literal::zero_t&) + { + i_ = 0; + return *this; + } + + dindex_(const literal::one_t&) + : i_(1) + { + } + dindex_<Tag>& operator=(const literal::one_t&) + { + i_ = 1; + return *this; + } + /// \} bool operator<(const dindex_& rhs) const { return i_ < rhs.i_; } - operator int() const { return i_; } + operator int() const + { + return i_; + } }; typedef dindex_<void> dindex;

1 0

scool r105: Start work on where clauses : handle inheritance
by Maxime van Noppen 02 Oct '08

02 Oct '08

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-10-02 Maxime van Noppen <yabo(a)lrde.epita.fr> Start work on where clauses : handle inheritance * Declaration.str: Handle where clauses for simple classes * (ie non-template). * Class.str: Handle the inheritance relationship taking care of using * the correct 'Exact' parameter depending on the class being 'final' * or not. Class.str | 45 +++++++++++++++++++++++++++++++++++++++++++++ Declaration.str | 10 +++++++--- 2 files changed, 52 insertions(+), 3 deletions(-) Index: branches/scool-ng/src/scoolt/Class.str =================================================================== --- branches/scool-ng/src/scoolt/Class.str (revision 104) +++ branches/scool-ng/src/scoolt/Class.str (revision 105) @@ -48,3 +48,48 @@ cqualif -> [(CxxType("typename"), "Exact")] where <?Some("abstract") <+ ?None()> cqualif + + AddExactParameter(| cqualif, cxx_idf): + SimpleType(type) -> StaticFunctionCall(Identifier(type), Parameters([params])) + where + <ExactParameter(| cqualif, cxx_idf)> [] => params + + ExactParameter(| cqualif, cxx_idf): + _ -> Identifier(idf) + where + <? Some("final")> cqualif + ; <? CxxId(idf)> cxx_idf + // FIXME : I only have the cxx_idf and rather want the scl_idf to build my SFC + + ExactParameter(| cqualif, cxx_idf): + _ -> Identifier("Exact") + where + <? None()> cqualif + + CheckDaughter(| scl_idf): + daughter -> 42 // The result isn't used + where + <?Identifier(idf)> scl_idf + ; <eq> (daughter, idf) + + CheckDaughter(| scl_idf): + daughter -> <say(<concat-strings> [ "Error: class name \"", daughter, "\" doest not match with \"", idf, "\"" ]); fail> + where + <?Identifier(idf)> scl_idf + + // FIXME: allow other inheritances than the public one + InheritanceToCxx(| cqualif, cxx_idf): + mother -> ("public", cxx_mother) + where + <AddExactParameter(| cqualif, cxx_idf)> mother => cxx_mother + + // Handle where clauses + + ClassWhereClauseToCxx(|cqualif, idf, body): + Inherits(daughter, mother) -> CxxClassDecl(cxx_params, cxx_idf, cxx_mother, cxx_body) + where + <CheckDaughter(| idf)> daughter // Check if we are the daughter + ; <AddExactType(| cqualif)> [] => cxx_params + ; <IdentifierToCxx> idf => cxx_idf + ; <InheritanceToCxx(| cqualif, cxx_idf)> mother => cxx_mother + ; <ClassBodyToCxx> body => cxx_body Index: branches/scool-ng/src/scoolt/Declaration.str =================================================================== --- branches/scool-ng/src/scoolt/Declaration.str (revision 104) +++ branches/scool-ng/src/scoolt/Declaration.str (revision 105) @@ -60,14 +60,18 @@ //////////////////////////////////////////////////////////////////////////////// - // Class // + // Classes // //////////////////////////////////////////////////////////////////////////////// DeclarationToCxx: - ClassDefinition(cqualif, idf, wclause, ClassBlock(body)) -> CxxClassDecl(cxx_params, cxx_idf, [], cxx_body) + ClassDefinition(cqualif, idf, None(), ClassBlock(body)) -> CxxClassDecl(cxx_params, cxx_idf, [], cxx_body) where <AddExactType(|cqualif)> [] => cxx_params ; <IdentifierToCxx> idf => cxx_idf - ; <?None> wclause ; <ClassBodyToCxx> body => cxx_body + DeclarationToCxx: + ClassDefinition(cqualif, idf, Some(ClassWhereClause([wclause])), ClassBlock(body)) -> cxx_code + where + <ClassWhereClauseToCxx(|cqualif, idf, body)> wclause => cxx_code + -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

1 0

scool r104: Add tests on classes
by Maxime van Noppen 02 Oct '08

02 Oct '08

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2008-10-02 Maxime van Noppen <yabo(a)lrde.epita.fr> Add tests on classes * class/scool_ast/inheritance_001.aterm, * class/scool_ast/inheritance_002.aterm: Update regarding grammar * changes. * class/scool_ast/inheritance_004.aterm: New. * class/scool_src/inheritance_004.scl: New. scool_ast/inheritance_001.aterm | 2 +- scool_ast/inheritance_002.aterm | 2 +- scool_ast/inheritance_004.aterm | 1 + scool_src/inheritance_004.scl | 3 +++ 4 files changed, 6 insertions(+), 2 deletions(-) Index: branches/scool-ng/tests/class/scool_ast/inheritance_001.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/inheritance_001.aterm (revision 103) +++ branches/scool-ng/tests/class/scool_ast/inheritance_001.aterm (revision 104) @@ -1 +1 @@ -Program([ClassDefinition(None,Identifier("Bar"),None,ClassBlock([])),ClassDefinition(None,Identifier("Foo"),Some(ClassWhereClause([Inherits("Foo","Bar")])),ClassBlock([]))]) +Program([ClassDefinition(None,Identifier("Bar"),None,ClassBlock([])),ClassDefinition(None,Identifier("Foo"),Some(ClassWhereClause([Inherits("Foo",SimpleType("Bar"))])),ClassBlock([]))]) Index: branches/scool-ng/tests/class/scool_ast/inheritance_002.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/inheritance_002.aterm (revision 103) +++ branches/scool-ng/tests/class/scool_ast/inheritance_002.aterm (revision 104) @@ -1 +1 @@ -Program([ClassDefinition(None,Identifier("Animal"),None,ClassBlock([])),ClassDefinition(None,Identifier("Mammal"),Some(ClassWhereClause([Inherits("Mammal","Animal")])),ClassBlock([])),ClassDefinition(Some("final"),Identifier("Monkey"),Some(ClassWhereClause([Inherits("Monkey","Mammal")])),ClassBlock([]))]) +Program([ClassDefinition(None,Identifier("Animal"),None,ClassBlock([])),ClassDefinition(None,Identifier("Mammal"),Some(ClassWhereClause([Inherits("Mammal",SimpleType("Animal"))])),ClassBlock([])),ClassDefinition(Some("final"),Identifier("Monkey"),Some(ClassWhereClause([Inherits("Monkey",SimpleType("Mammal"))])),ClassBlock([]))]) Index: branches/scool-ng/tests/class/scool_ast/inheritance_004.aterm =================================================================== --- branches/scool-ng/tests/class/scool_ast/inheritance_004.aterm (revision 0) +++ branches/scool-ng/tests/class/scool_ast/inheritance_004.aterm (revision 104) @@ -0,0 +1 @@ +Program([ClassDefinition(None,Identifier("Cat"),Some(ClassWhereClause([Inherits("Cat",StaticFunctionCall(Identifier("Foo"),Parameters([Integer("42")])))])),ClassBlock([]))]) Index: branches/scool-ng/tests/class/scool_src/inheritance_004.scl =================================================================== --- branches/scool-ng/tests/class/scool_src/inheritance_004.scl (revision 0) +++ branches/scool-ng/tests/class/scool_src/inheritance_004.scl (revision 104) @@ -0,0 +1,3 @@ +Cat : class where Cat -> Foo[42] = +{ +} -- \__/ \__/ (00) Maxime `yabo` van Noppen (00) ___) \ Epita 2009 / (___ (_____/ \_____)

1 0