Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

cleanup-2008 2697: INIM: Classif: Add projection.

by Ugo Jardonnet

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> INIM: Classif: Add projection. * classif/iccvg04.cc: Fix wrong init. * classif/proj.hh: Add generic proj. iccvg04.cc | 6 +++-- proj.hh | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 2 deletions(-) Index: classif/iccvg04.cc --- classif/iccvg04.cc (revision 2696) +++ classif/iccvg04.cc (working copy) @@ -31,6 +31,7 @@ #include <string.h> #include <stdlib.h> +#include "proj.hh" using namespace mln; @@ -102,7 +103,7 @@ memset(count, 0, (nbasins + 1) * sizeof(unsigned)); algebra::vec<3, unsigned> sum[nbasins + 1]; - for (int i = 1; i < nbasins + 1; ++i) + for (int i = 0; i < nbasins + 1; ++i) sum[i] = literal::zero; // Compute representatives of every class @@ -127,7 +128,6 @@ I out(ima.domain()); for_all(pi) { - //retrieve color class value::rgb8 coul = ima(pi); int w = ws(point3d(coul.red() / f, coul.green() / f, coul.blue() / f)); @@ -177,4 +177,6 @@ //classify image classify_image(ima, histo, ws, nbasins, div_factor); + + save_class(histo_closure, "histo.ppm"); } Index: classif/proj.hh --- classif/proj.hh (revision 0) +++ classif/proj.hh (revision 0) @@ -0,0 +1,64 @@ +// 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_PROJ_HH +# define MLN_PROJ_HH + +#include <mln/io/ppm/save.hh> +#include <mln/io/pgm/save.hh> +#include <mln/level/paste.hh> +#include <mln/accu/mean.hh> + +namespace mln +{ + + template <typename T, typename A> + image2d<mln_result(A)> + proj(const image3d<T>& input, A a) + { + image2d<A> acc(geom::nslis(input), geom::nrows(input)); + mln_piter(image3d<T>) p(input.domain()); + for_all(p) // 3d + acc.at(p.sli(), p.row()).take(input(p)); + + image2d<mln_result(A)> output(acc.domain()); + level::paste(acc, output); + return output; + } + + template <typename T> + void + save_class(const image3d<T>& histo, const char * fn) + { + accu::mean<unsigned, unsigned long, value::int_u8> mean; + io::pgm::save(proj(histo, mean), fn); + } + +} // end of namespace mln + +#endif /* MLN_PROJ_HH */ +

16 years, 2 months

cleanup-2008 2696: Add fun::v2v::convert and level::convert.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008 Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add fun::v2v::convert and level::convert. * milena/mln/fun/v2v/convert.hh: New. * milena/mln/fun/v2v/cast.hh (todo): New. * milena/mln/level/convert.hh: New. * milena/tests/level/convert.cc: New. * milena/tests/level/Makefile.am: Update. * milena/mln/value/rgb.hh (todo): New. (from_to): New overload for bool->rgbn. * milena/mln/convert/from_to.hxx (from_to): New decl for bool->rgbn. * milena/sandbox/scribo/demat.hh (include): Remove obsolete dependency. mln/convert/from_to.hxx | 5 ++ mln/fun/v2v/cast.hh | 5 ++ mln/fun/v2v/convert.hh | 85 ++++++++++++++++++++++++++++++++++++++++++++++ mln/level/convert.hh | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ mln/value/rgb.hh | 21 +++++++++++ sandbox/scribo/demat.hh | 2 - tests/level/Makefile.am | 2 + tests/level/convert.cc | 56 ++++++++++++++++++++++++++++++ 8 files changed, 260 insertions(+), 3 deletions(-) Index: milena/tests/level/convert.cc --- milena/tests/level/convert.cc (revision 0) +++ milena/tests/level/convert.cc (revision 0) @@ -0,0 +1,56 @@ +// 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/level/convert.cc + * + * \brief Tests on mln::level::convert + */ + +#include <mln/core/image/image2d.hh> +#include <mln/level/convert.hh> + +#include <mln/value/rgb8.hh> +#include <mln/literal/grays.hh> + + +int main() +{ + using namespace mln; + using value::rgb8; + +// trace::quiet = false; + + // bool -> rgb8 + { + image2d<bool> ima(1, 2); + ima.at(0, 0) = false; + ima.at(0, 1) = true; + image2d<rgb8> out = level::convert(rgb8(), ima); + mln_assertion(out.at(0, 0) == literal::black); + mln_assertion(out.at(0, 1) == literal::white); + } +} Index: milena/tests/level/Makefile.am --- milena/tests/level/Makefile.am (revision 2695) +++ milena/tests/level/Makefile.am (working copy) @@ -11,6 +11,7 @@ assign \ compare \ compute \ + convert \ fill \ fill_with_value \ fill_with_image \ @@ -35,6 +36,7 @@ assign_SOURCES = assign.cc compare_SOURCES = compare.cc compute_SOURCES = compute.cc +convert_SOURCES = convert.cc fill_SOURCES = fill.cc fill_with_value_SOURCES = fill_with_value.cc fill_with_image_SOURCES = fill_with_image.cc Index: milena/mln/level/convert.hh --- milena/mln/level/convert.hh (revision 0) +++ milena/mln/level/convert.hh (revision 0) @@ -0,0 +1,87 @@ +// 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_LEVEL_CONVERT_HH +# define MLN_LEVEL_CONVERT_HH + +/*! \file mln/level/convert.hh + * + * \brief Convert the contents of an image into another one. + * + * \todo Re-write doc. + */ + +# include <mln/fun/v2v/convert.hh> +# include <mln/level/transform.hh> + + +namespace mln +{ + + namespace level + { + + /*! Convert the image \p input by changing the value type. + * + * \param[in] v A value of the destination type. + * \param[in] input The input image. + * \param[out] output The result image. + */ + template <typename V, typename I> + mln_ch_value(I, V) + convert(const V&, const Image<I>& input); + + + +# ifndef MLN_INCLUDE_ONLY + + // Facade. + + template <typename V, typename I> + inline + mln_ch_value(I, V) + convert(const V&, const Image<I>& input) + { + trace::entering("level::convert"); + + mln_precondition(exact(input).has_data()); + fun::v2v::convert<V> f; + mln_ch_value(I, V) output = level::transform(input, f); + + trace::exiting("level::convert"); + return output; + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::level + +} // end of namespace mln + + +#endif // ! MLN_LEVEL_CONVERT_HH Index: milena/mln/value/rgb.hh --- milena/mln/value/rgb.hh (revision 2695) +++ milena/mln/value/rgb.hh (working copy) @@ -32,6 +32,11 @@ * * \brief Color class for red-green-blue where every component is * n-bit encoded. + * + * \todo Split decl and def for from_to. + * + * \todo Introduce the concept of Color, then generalize from_to to + * colors. */ # include <mln/value/ops.hh> @@ -515,6 +520,22 @@ to = value::rgb<m>(tmp); } + // bool -> rgb. + template <unsigned m> + void + from_to(bool from, value::rgb<m>& to) + { + static literal::white_t* white_ = 0; + static literal::black_t* black_ = 0; + // We do not use literal::white (the object) so that we + // do not introduce any coupling with the file where + // literals are defined. + if (from) + to = *white_; + else + to = *black_; + } + } // end of namespace mln::convert } // end of namespace mln Index: milena/mln/convert/from_to.hxx --- milena/mln/convert/from_to.hxx (revision 2695) +++ milena/mln/convert/from_to.hxx (working copy) @@ -108,6 +108,11 @@ void from_to(const algebra::vec<3,T>& from, value::rgb<m>& to); + // bool -> rgb. + template <unsigned m> + void + from_to(bool from, value::rgb<m>& to); + // Value -> Value template <typename F, typename T> void Index: milena/mln/fun/v2v/cast.hh --- milena/mln/fun/v2v/cast.hh (revision 2695) +++ milena/mln/fun/v2v/cast.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,9 @@ /*! \file mln/fun/v2v/cast.hh * * \brief FIXME. + * + * \todo The function is intrisically meta; how to handle that + * particular case? */ # include <mln/core/concept/function.hh> Index: milena/mln/fun/v2v/convert.hh --- milena/mln/fun/v2v/convert.hh (revision 0) +++ milena/mln/fun/v2v/convert.hh (revision 0) @@ -0,0 +1,85 @@ +// 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_FUN_V2V_CONVERT_HH +# define MLN_FUN_V2V_CONVERT_HH + +/*! \file mln/fun/v2v/convert.hh + * + * \brief FIXME. + * + * \todo The function is intrisically meta; how to handle that + * particular case? + */ + +# include <mln/core/concept/function.hh> +# include <mln/convert/to.hh> + + + +namespace mln +{ + + namespace fun + { + + namespace v2v + { + + // FIXME: Doc! + + template <typename V> + struct convert : public Function_v2v< convert<V> > + { + typedef V result; + + template <typename W> + V operator()(const W& w) const; + }; + + +# ifndef MLN_INCLUDE_ONLY + + template <typename V> + template <typename W> + inline + V + convert<V>::operator()(const W& w) const + { + return mln::convert::to<V>(w); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::fun::v2v + + } // end of namespace mln::fun + +} // end of namespace mln + + +#endif // ! MLN_FUN_V2V_CONVERT_HH Index: milena/sandbox/scribo/demat.hh --- milena/sandbox/scribo/demat.hh (revision 2695) +++ milena/sandbox/scribo/demat.hh (working copy) @@ -55,8 +55,6 @@ # include <mln/draw/box.hh> -# include <mln/estim/nsites.hh> - # include <mln/fun/i2v/array.hh> # include <mln/io/pbm/load.hh>

16 years, 2 months

(no subject)

by z＠plasma.lrde.epita.fr

16 years, 2 months

(no subject)

by z＠plasma.lrde.epita.fr

16 years, 2 months

(no subject)

by z＠plasma.lrde.epita.fr

16 years, 2 months

(no subject)

by z＠plasma.lrde.epita.fr

16 years, 2 months

(no subject)

by z＠plasma.lrde.epita.fr

16 years, 2 months

2695: Add missing methods in graph related classes.

by Guillaume Lazzara

* mln/core/site_set/p_vertices.hh: Add missing operator()(unsigned). * mln/util/graph.hh: Add missing has_v(util::vertex) and has_e(util::edge). Fix is_subgraph_of(). * mln/util/internal/graph_vertex_psite.hh, * mln/util/internal/graph_edge_psite.hh: Add a missing constructor. * mln/util/internal/graph_psite_base.hh: Add missing graph() and site_set() methods. --- milena/ChangeLog | 16 ++++++ milena/mln/core/site_set/p_vertices.hh | 17 +++++- milena/mln/util/graph.hh | 28 +++++++++- milena/mln/util/internal/graph_edge_psite.hh | 10 +++- milena/mln/util/internal/graph_psite_base.hh | 70 ++++++++++++++++++++---- milena/mln/util/internal/graph_vertex_psite.hh | 10 +++- 6 files changed, 132 insertions(+), 19 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 048b97a..26dca4b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -14,6 +14,22 @@ 2008-10-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Add missing methods in graph related classes. + + * mln/core/site_set/p_vertices.hh: Add missing operator()(unsigned). + + * mln/util/graph.hh: Add missing has_v(util::vertex) and + has_e(util::edge). + Fix is_subgraph_of(). + + * mln/util/internal/graph_vertex_psite.hh, + * mln/util/internal/graph_edge_psite.hh: Add a missing constructor. + + * mln/util/internal/graph_psite_base.hh: Add missing graph() and + site_set() methods. + +2008-10-27 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix assertion failures on Mac. * mln/core/contract.hh: Cast expression to bool. diff --git a/milena/mln/core/site_set/p_vertices.hh b/milena/mln/core/site_set/p_vertices.hh index a54b62a..cbae9fd 100644 --- a/milena/mln/core/site_set/p_vertices.hh +++ b/milena/mln/core/site_set/p_vertices.hh @@ -69,9 +69,11 @@ namespace mln typedef p_vertices<G, F> self_; typedef internal::site_set_base_< typename F::result, self_ > super_; + public: + + /// Type of the graph this site set is based on. typedef G graph_t; - public: /// \brief Construct a graph psite set from a graph of points. /// \{ p_vertices(); @@ -128,6 +130,7 @@ namespace mln /// \{ const mln_result(F)& operator()(const psite& p) const; const mln_result(F)& operator()(const util::vertex<G>& p) const; + const mln_result(F)& operator()(unsigned id_v) const; /// \} /// Accessors. @@ -266,9 +269,17 @@ namespace mln const mln_result(F)& p_vertices<G, F>::operator()(const util::vertex<G>& v) const { - std::cout << v.id() << std::endl; mln_precondition(g_->has_v(v)); - return f_(v.id()); + return (*this)(v.id()); + } + + template <typename G, typename F> + inline + const mln_result(F)& + p_vertices<G, F>::operator()(unsigned id_v) const + { + mln_precondition(g_->has_v(id_v)); + return f_(id_v); } template <typename G, typename F> diff --git a/milena/mln/util/graph.hh b/milena/mln/util/graph.hh index 1cafb19..236edd2 100644 --- a/milena/mln/util/graph.hh +++ b/milena/mln/util/graph.hh @@ -152,6 +152,10 @@ namespace mln /// Check whether a vertex id \p id_v exists in the graph. bool has_v(unsigned id_v) const; + /// Check whether an edge \p v exists in the graph. + template <typename G> + bool has_v(const util::vertex<G>& v) const; + /// Return the number of adjacent edges of vertex \p id_v. size_t v_nmax_nbh_edges(unsigned id_v) const; @@ -185,6 +189,10 @@ namespace mln /// Return whether \p id_e is in the graph. bool has_e(unsigned id_e) const; + /// Return whether \p e is in the graph. + template <typename G> + bool has_e(const util::edge<G>& e) const; + /// Return the first vertex associated to the edge \p id_e. unsigned v1(unsigned id_e) const; @@ -199,7 +207,7 @@ namespace mln unsigned e_ith_nbh_edge(unsigned id_e, unsigned i) const; /// Return whether this graph is a subgraph - /// Return always false here. + /// Return true if g and *this have the same graph_id. template <typename G2> bool is_subgraph_of(const G2& g) const; /// \} @@ -277,6 +285,14 @@ namespace mln return id_v < data_->vertices_.size(); } + template <typename G> + inline + bool + graph::has_v(const util::vertex<G>& v) const + { + return v.graph().is_subgraph_of(*this) && has_v(v.id()); + } + inline size_t graph::v_nmax_nbh_edges(unsigned id_v) const @@ -368,6 +384,14 @@ namespace mln return id_e < data_->edges_.size(); } + template <typename G> + inline + bool + graph::has_e(const util::edge<G>& e) const + { + return e.graph().is_subgraph_of(*this) && has_e(e.id()); + } + inline unsigned graph::v1(unsigned id_e) const @@ -412,7 +436,7 @@ namespace mln bool graph::is_subgraph_of(const G2& g) const { - return &g == this; + return g.graph_id() == this->graph_id(); } } // end of namespace mln::util diff --git a/milena/mln/util/internal/graph_edge_psite.hh b/milena/mln/util/internal/graph_edge_psite.hh index 3861af6..05ad74f 100644 --- a/milena/mln/util/internal/graph_edge_psite.hh +++ b/milena/mln/util/internal/graph_edge_psite.hh @@ -69,6 +69,7 @@ namespace mln /// \{ edge_psite(); edge_psite(const target_t& t); + edge_psite(const target_t& t, unsigned); /// \} /// Accessors @@ -104,8 +105,15 @@ namespace mln template <typename G, typename F> inline edge_psite<G, F>::edge_psite(const target_t& t) + : super_(t) + { + } + + template <typename G, typename F> + inline + edge_psite<G, F>::edge_psite(const target_t& t, unsigned id) + : super_(id) { - this->change_target(t); } template <typename G, typename F> diff --git a/milena/mln/util/internal/graph_psite_base.hh b/milena/mln/util/internal/graph_psite_base.hh index 5a73135..38431a8 100644 --- a/milena/mln/util/internal/graph_psite_base.hh +++ b/milena/mln/util/internal/graph_psite_base.hh @@ -51,6 +51,7 @@ namespace mln public internal::proxy_impl<const P&, E> { typedef Pseudo_Site< graph_psite_base<V, P, S, E> > super; + typedef typename S::graph_t graph_t; public: /// Associated types. @@ -59,15 +60,6 @@ namespace mln typedef S target; /// \} - - /// Constructors. - /// \{ - graph_psite_base(); - /// \p t A site set. - /// \sa p_vertices, p_edges. - graph_psite_base(const target& t); - /// \} - /// Setters. /// \{ /// Change the targe site set. @@ -80,6 +72,12 @@ namespace mln /// Return the target (the site set). const target* target_() const; // Hook to the target. + /// Return the site set (the target). + const target& site_set() const; + + /// Return the graph associated to the target of this psite. + const graph_t& graph() const; + /// Check whether it is valid. bool is_valid() const; /// Invalidate this psite. @@ -96,12 +94,28 @@ namespace mln /// \} protected: + /// Constructors. + /// \{ + graph_psite_base(); + /// \p t A site set. + /// \sa p_vertices, p_edges. + graph_psite_base(const target& t); + /// \p t A site set. + /// \sa p_vertices, p_edges. + /// \p id The id of the element associated to this psite. + graph_psite_base(const target& t, unsigned id); + /// \} + mlc_const(target)* t_; V v_; }; } // end of namespace internal + template <typename V, typename P, typename S, typename E> + std::ostream& + operator<<(std::ostream& ostr, internal::graph_psite_base<V, P, S, E>& p); + } // end of namespace mln @@ -130,6 +144,15 @@ namespace mln template <typename V, typename P, typename S, typename E> inline + graph_psite_base<V, P, S, E>::graph_psite_base(const target& t, unsigned id) + : t_(0) + { + change_target(t); + update_id(id); + } + + template <typename V, typename P, typename S, typename E> + inline void graph_psite_base<V, P, S, E>::change_target(const target& new_target) { @@ -145,14 +168,30 @@ namespace mln v_.update_id(id); } - template <typename V, typename P, typename S, typename E> + template <typename v, typename p, typename s, typename e> inline - const typename graph_psite_base<V, P, S, E>::target* - graph_psite_base<V, P, S, E>::target_() const + const typename graph_psite_base<v, p, s, e>::target* + graph_psite_base<v, p, s, e>::target_() const { return t_; } + template <typename v, typename p, typename s, typename e> + inline + const typename graph_psite_base<v, p, s, e>::target& + graph_psite_base<v, p, s, e>::site_set() const + { + return *t_; + } + + template <typename v, typename p, typename s, typename e> + inline + const typename graph_psite_base<v, p, s, e>::graph_t& + graph_psite_base<v, p, s, e>::graph() const + { + return t_->graph(); + } + template <typename V, typename P, typename S, typename E> inline bool @@ -188,6 +227,13 @@ namespace mln } // end of namespace internal + template <typename V, typename P, typename S, typename E> + std::ostream& + operator<<(std::ostream& ostr, internal::graph_psite_base<V, P, S, E>& p) + { + return ostr << p.subj_(); + } + } // end of namespace mln # endif // !MLN_INCLUDE_ONLY diff --git a/milena/mln/util/internal/graph_vertex_psite.hh b/milena/mln/util/internal/graph_vertex_psite.hh index 3db903c..5f233e2 100644 --- a/milena/mln/util/internal/graph_vertex_psite.hh +++ b/milena/mln/util/internal/graph_vertex_psite.hh @@ -64,6 +64,7 @@ namespace mln vertex_psite(); vertex_psite(const target_t& t); + vertex_psite(const target_t& t, unsigned id); const vertex_t& v() const; @@ -93,8 +94,15 @@ namespace mln template <typename G, typename F> inline vertex_psite<G, F>::vertex_psite(const target_t& t) + : super_(t) + { + } + + template <typename G, typename F> + inline + vertex_psite<G, F>::vertex_psite(const target_t& t, unsigned i) + : super_(t, i) { - this->change_target(t); } template <typename G, typename F> -- 1.5.6.5

16 years, 2 months

2694: Fix assertion failures on Mac.

by Guillaume Lazzara

* mln/core/contract.hh: Cast expression to bool. --- milena/ChangeLog | 6 ++++++ milena/mln/core/contract.hh | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index aa7d3fa..048b97a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -12,6 +12,12 @@ * mln/level/transform.hh, * mln/level/paste.hh: Rename routines. +2008-10-27 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix assertion failures on Mac. + + * mln/core/contract.hh: Cast expression to bool. + 2008-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> Use a more explicit name for the method used to retrieve the graph diff --git a/milena/mln/core/contract.hh b/milena/mln/core/contract.hh index e7a1a3b..5d03057 100644 --- a/milena/mln/core/contract.hh +++ b/milena/mln/core/contract.hh @@ -46,16 +46,16 @@ #endif /// Assertion. -# define mln_assertion(expr) assert(expr) +# define mln_assertion(expr) assert((bool)(expr)) /// Invariant. -# define mln_invariant(expr) assert(expr) +# define mln_invariant(expr) assert((bool)(expr)) /// Precondition. -# define mln_precondition(expr) assert(expr) +# define mln_precondition(expr) assert((bool)(expr)) /// Postcondition. -# define mln_postcondition(expr) assert(expr) +# define mln_postcondition(expr) assert((bool)(expr)) namespace mln -- 1.5.6.5

16 years, 2 months

2693: Use a more explicit name for the method used to retrieve the graph pointer.

by Guillaume Lazzara

* mln/core/site_set/p_edges.hh, * mln/core/site_set/p_graph_piter.hh, * mln/core/site_set/p_vertices.hh, * mln/util/internal/graph_edge.hh, * mln/util/internal/graph_iter.hh, * mln/util/internal/graph_nbh_iter.hh, * mln/util/internal/graph_nbh_iter_base.hh, * mln/util/internal/graph_psite_base.hh, * mln/util/internal/graph_vertex.hh: Change the method name from g() to graph() and update method calls. --- milena/ChangeLog | 16 ++++++++ milena/mln/core/site_set/p_edges.hh | 6 +- milena/mln/core/site_set/p_graph_piter.hh | 2 +- milena/mln/core/site_set/p_vertices.hh | 47 +++++++++++++++++++--- milena/mln/util/internal/graph_edge.hh | 10 ++-- milena/mln/util/internal/graph_iter.hh | 4 +- milena/mln/util/internal/graph_nbh_iter.hh | 12 +++--- milena/mln/util/internal/graph_nbh_iter_base.hh | 4 +- milena/mln/util/internal/graph_psite_base.hh | 2 +- milena/mln/util/internal/graph_vertex.hh | 10 ++-- 10 files changed, 81 insertions(+), 32 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4535ac6..aa7d3fa 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -14,6 +14,22 @@ 2008-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Use a more explicit name for the method used to retrieve the graph + pointer. + + * mln/core/site_set/p_edges.hh, + * mln/core/site_set/p_graph_piter.hh, + * mln/core/site_set/p_vertices.hh, + * mln/util/internal/graph_edge.hh, + * mln/util/internal/graph_iter.hh, + * mln/util/internal/graph_nbh_iter.hh, + * mln/util/internal/graph_nbh_iter_base.hh, + * mln/util/internal/graph_psite_base.hh, + * mln/util/internal/graph_vertex.hh: + Change the method name from g() to graph() and update method calls. + +2008-10-26 Guillaume Lazzara <z(a)lrde.epita.fr> + Various small Fixes and cleanup. * mln/util/internal/graph_edge.hh, diff --git a/milena/mln/core/site_set/p_edges.hh b/milena/mln/core/site_set/p_edges.hh index 16d7c45..6a62f8b 100644 --- a/milena/mln/core/site_set/p_edges.hh +++ b/milena/mln/core/site_set/p_edges.hh @@ -116,7 +116,7 @@ namespace mln /// Accessors. /// \{ /// Return the graph associated to this site set - const graph_t& g() const; + const graph_t& graph() const; /// Return the mapping function. F function() const; /// \} @@ -207,7 +207,7 @@ namespace mln p_edges<G, F>::has(const util::edge<G2>& e) const { mln_precondition(is_valid()); - return e.g().is_subgraph_of(*g_) && g_->has(e) && e.is_valid(); + return e.graph().is_subgraph_of(*g_) && g_->has(e) && e.is_valid(); } template <typename G, typename F> @@ -223,7 +223,7 @@ namespace mln template <typename G, typename F> inline const typename p_edges<G, F>::graph_t& - p_edges<G, F>::g() const + p_edges<G, F>::graph() const { mln_precondition(is_valid()); return *g_; diff --git a/milena/mln/core/site_set/p_graph_piter.hh b/milena/mln/core/site_set/p_graph_piter.hh index da5ae3d..886be0d 100644 --- a/milena/mln/core/site_set/p_graph_piter.hh +++ b/milena/mln/core/site_set/p_graph_piter.hh @@ -111,7 +111,7 @@ namespace mln template <typename S, typename I> inline p_graph_piter<S,I>::p_graph_piter(const S& pv) - : iter_(pv.g()) + : iter_(pv.graph()) { this->change_target(pv); mln_postcondition(!this->is_valid()); diff --git a/milena/mln/core/site_set/p_vertices.hh b/milena/mln/core/site_set/p_vertices.hh index 371c581..a54b62a 100644 --- a/milena/mln/core/site_set/p_vertices.hh +++ b/milena/mln/core/site_set/p_vertices.hh @@ -73,12 +73,13 @@ namespace mln public: /// \brief Construct a graph psite set from a graph of points. - /// + /// \{ + p_vertices(); + /// \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. + /// \param f the function which maps a vertex to a site. p_vertices(const graph_t& gr, const F& f); + /// \} /// Associated types. /// \{ @@ -123,10 +124,16 @@ namespace mln // FIXME: Dummy. std::size_t memory_size() const; + /// Return the value associated to an element of this site set. + /// \{ + const mln_result(F)& operator()(const psite& p) const; + const mln_result(F)& operator()(const util::vertex<G>& p) const; + /// \} + /// Accessors. /// \{ /// Return the graph associated to this site set (const version) - const graph_t& g() const; + const graph_t& graph() const; /// Return the association function. F function() const; /// \} @@ -167,6 +174,13 @@ namespace mln template <typename G, typename F> inline + p_vertices<G, F>::p_vertices() + : f_(0) + { + } + + template <typename G, typename F> + inline p_vertices<G, F>::p_vertices(const graph_t& g, const F& f) : g_ (&g), f_(f) { @@ -222,7 +236,7 @@ namespace mln mln_precondition(is_valid()); return // Check whether P is compatible with this psite set. - (p.g() == *g_) && + (p.graph() == *g_) && // Check that the vertex id of P belongs to the range of valid // vertex ids. (p.is_valid()); @@ -240,8 +254,27 @@ namespace mln template <typename G, typename F> inline + const mln_result(F)& + p_vertices<G, F>::operator()(const psite& p) const + { + mln_precondition(g_.has(p.v())); + return (*this)(p.v().id()); + } + + template <typename G, typename F> + inline + const mln_result(F)& + p_vertices<G, F>::operator()(const util::vertex<G>& v) const + { + std::cout << v.id() << std::endl; + mln_precondition(g_->has_v(v)); + return f_(v.id()); + } + + template <typename G, typename F> + inline const typename p_vertices<G, F>::graph_t& - p_vertices<G, F>::g() const + p_vertices<G, F>::graph() const { mln_precondition(is_valid()); return *g_; diff --git a/milena/mln/util/internal/graph_edge.hh b/milena/mln/util/internal/graph_edge.hh index 510bfd9..06e39d4 100644 --- a/milena/mln/util/internal/graph_edge.hh +++ b/milena/mln/util/internal/graph_edge.hh @@ -74,7 +74,7 @@ namespace mln void update_id(unsigned id); /// Return a reference to the graph holding this edge. - const graph_t& g() const; + const graph_t& graph() const; /// Set g_ with \p g; void change_graph(const graph_t& g); @@ -129,7 +129,7 @@ namespace mln struct subject_impl< const util::edge<G>, E > { unsigned id() const; - const mlc_const(G)& g() const; + const mlc_const(G)& graph() const; unsigned v_other(unsigned id_v) const; bool is_valid() const; unsigned v1() const; @@ -208,7 +208,7 @@ namespace mln template <typename G> inline const typename edge<G>::graph_t& - edge<G>::g() const + edge<G>::graph() const { return g_; } @@ -329,9 +329,9 @@ namespace mln template <typename G, typename E> inline const mlc_const(G)& - subject_impl< const util::edge<G>, E >::g() const + subject_impl< const util::edge<G>, E >::graph() const { - return exact_().get_subject().g(); + return exact_().get_subject().graph(); } template <typename G, typename E> diff --git a/milena/mln/util/internal/graph_iter.hh b/milena/mln/util/internal/graph_iter.hh index ab62582..dfd1333 100644 --- a/milena/mln/util/internal/graph_iter.hh +++ b/milena/mln/util/internal/graph_iter.hh @@ -207,7 +207,7 @@ namespace mln unsigned vertex_bkd_iterator<G>::start_id_() const { - return p_.g().v_nmax() - 1; + return p_.graph().v_nmax() - 1; } template <typename G> @@ -277,7 +277,7 @@ namespace mln unsigned edge_bkd_iterator<G>::start_id_() const { - return p_.g().e_nmax() - 1; + return p_.graph().e_nmax() - 1; } template <typename G> diff --git a/milena/mln/util/internal/graph_nbh_iter.hh b/milena/mln/util/internal/graph_nbh_iter.hh index 5edecef..9b7aa3a 100644 --- a/milena/mln/util/internal/graph_nbh_iter.hh +++ b/milena/mln/util/internal/graph_nbh_iter.hh @@ -314,7 +314,7 @@ namespace mln void vertex_nbh_vertex_fwd_iterator<G>::invalidate_() { - this->i_ = this->p_.g().v_nmax(); + this->i_ = this->p_.graph().v_nmax(); } template <typename G> @@ -367,7 +367,7 @@ namespace mln void vertex_nbh_vertex_bkd_iterator<G>::invalidate_() { - this->i_ = this->p_.g().v_nmax(); + this->i_ = this->p_.graph().v_nmax(); } template <typename G> @@ -420,7 +420,7 @@ namespace mln void vertex_nbh_edge_fwd_iterator<G>::invalidate_() { - this->i_ = this->p_.g().e_nmax(); + this->i_ = this->p_.graph().e_nmax(); } template <typename G> @@ -472,7 +472,7 @@ namespace mln void vertex_nbh_edge_bkd_iterator<G>::invalidate_() { - this->i_ = this->p_.g().e_nmax(); + this->i_ = this->p_.graph().e_nmax(); } template <typename G> @@ -526,7 +526,7 @@ namespace mln void edge_nbh_edge_fwd_iterator<G>::invalidate_() { - this->i_ = this->p_.g().e_nmax(); + this->i_ = this->p_.graph().e_nmax(); } template <typename G> @@ -588,7 +588,7 @@ namespace mln void edge_nbh_edge_bkd_iterator<G>::invalidate_() { - this->i_ = this->p_.g().e_nmax(); + this->i_ = this->p_.graph().e_nmax(); } template <typename G> diff --git a/milena/mln/util/internal/graph_nbh_iter_base.hh b/milena/mln/util/internal/graph_nbh_iter_base.hh index 8cfcdd6..14950a1 100644 --- a/milena/mln/util/internal/graph_nbh_iter_base.hh +++ b/milena/mln/util/internal/graph_nbh_iter_base.hh @@ -90,9 +90,9 @@ namespace mln template <typename C2> inline nbh_iterator_base<G, C, P, E>::nbh_iterator_base(const C2& c) - : p_(c.g()), i_(0) + : p_(c.graph()), i_(0) { - //FIXME: Check if typeof(e.g()) == G + //FIXME: Check if typeof(c.graph()) == G center_at(c); } diff --git a/milena/mln/util/internal/graph_psite_base.hh b/milena/mln/util/internal/graph_psite_base.hh index fa0fb80..5a73135 100644 --- a/milena/mln/util/internal/graph_psite_base.hh +++ b/milena/mln/util/internal/graph_psite_base.hh @@ -134,7 +134,7 @@ namespace mln graph_psite_base<V, P, S, E>::change_target(const target& new_target) { t_ = &new_target; - v_.change_graph(new_target.g()); + v_.change_graph(new_target.graph()); } template <typename V, typename P, typename S, typename E> diff --git a/milena/mln/util/internal/graph_vertex.hh b/milena/mln/util/internal/graph_vertex.hh index 61b589f..2de8dde 100644 --- a/milena/mln/util/internal/graph_vertex.hh +++ b/milena/mln/util/internal/graph_vertex.hh @@ -82,7 +82,7 @@ namespace mln void update_id(unsigned id); /// Returns the graph pointer this vertex belongs to. - const graph_t& g() const; + const graph_t& graph() const; /// Returns vertex id. unsigned id() const; @@ -113,7 +113,7 @@ namespace mln struct subject_impl< const util::vertex<G>, E > { bool is_valid() const; - const mlc_const(G)& g() const; + const mlc_const(G)& graph() const; unsigned id() const; unsigned other(unsigned id_e) const; @@ -275,7 +275,7 @@ namespace mln template<typename G> inline const typename vertex<G>::graph_t& - vertex<G>::g() const + vertex<G>::graph() const { return g_; } @@ -312,9 +312,9 @@ namespace mln template <typename G, typename E> inline const mlc_const(G)& - subject_impl< const util::vertex<G>, E >::g() const + subject_impl< const util::vertex<G>, E >::graph() const { - return exact_().get_subject().g(); + return exact_().get_subject().graph(); } template <typename G, typename E> -- 1.5.6.5

16 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches