- Olena-patches

3671: * configure.ac: configure milena/tests/graph/.
by Guillaume Lazzara 15 Apr '09

15 Apr '09

--- ChangeLog | 4 ++++ configure.ac | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 71ec83b..4b1bf22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-04-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + * configure.ac: configure milena/tests/graph/. + 2009-04-14 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * configure.ac: Configure milena/tests/tiff. diff --git a/configure.ac b/configure.ac index ad824f6..a2b0f13 100644 --- a/configure.ac +++ b/configure.ac @@ -218,6 +218,8 @@ AC_CONFIG_FILES([ milena/tests/fun/vv2v/Makefile milena/tests/fun/x2x/Makefile milena/tests/geom/Makefile + milena/tests/graph/Makefile + milena/tests/graph/attribute/Makefile milena/tests/histo/Makefile milena/tests/io/Makefile milena/tests/io/dump/Makefile -- 1.5.6.5

1 0

3670: Add graph::compute and few related functors.
by Guillaume Lazzara 15 Apr '09

15 Apr '09

* mln/canvas/browsing/depth_first_search.hh: update and add more doc. * mln/graph/attribute/card.hh, * mln/graph/attribute/representative.hh, * mln/graph/compute.hh: enable the possibility of computing data on a graph. * tests/Makefile.am, * tests/graph/Makefile.am, * tests/graph/attribute/Makefile.am, * tests/graph/attribute/card.cc, * tests/graph/attribute/representative.cc: add new tests. --- milena/ChangeLog | 17 +++ milena/mln/canvas/browsing/depth_first_search.hh | 29 +++--- milena/mln/graph/attribute/card.hh | 123 ++++++++++++++++++++++ milena/mln/graph/attribute/representative.hh | 123 ++++++++++++++++++++++ milena/mln/graph/compute.hh | 86 +++++++++++++++ milena/tests/Makefile.am | 1 + milena/tests/graph/Makefile.am | 6 + milena/tests/graph/attribute/Makefile.am | 12 ++ milena/tests/graph/attribute/card.cc | 63 +++++++++++ milena/tests/graph/attribute/representative.cc | 63 +++++++++++ 10 files changed, 510 insertions(+), 13 deletions(-) create mode 100644 milena/mln/graph/attribute/card.hh create mode 100644 milena/mln/graph/attribute/representative.hh create mode 100644 milena/mln/graph/compute.hh create mode 100644 milena/tests/graph/Makefile.am create mode 100644 milena/tests/graph/attribute/Makefile.am create mode 100644 milena/tests/graph/attribute/card.cc create mode 100644 milena/tests/graph/attribute/representative.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 5cd09e3..ef8857b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,22 @@ 2009-04-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add graph::compute and few related functors. + + * mln/canvas/browsing/depth_first_search.hh: update and add more doc. + + * mln/graph/attribute/card.hh, + * mln/graph/attribute/representative.hh, + * mln/graph/compute.hh: enable the possibility of computing data on a + graph. + + * tests/Makefile.am, + * tests/graph/Makefile.am, + * tests/graph/attribute/Makefile.am, + * tests/graph/attribute/card.cc, + * tests/graph/attribute/representative.cc: add new tests. + +2009-04-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Handle bool specialization correctly with util::array. * mln/util/array.hh: update return type of operator() and operator[]. diff --git a/milena/mln/canvas/browsing/depth_first_search.hh b/milena/mln/canvas/browsing/depth_first_search.hh index 179bf1c..2880397 100644 --- a/milena/mln/canvas/browsing/depth_first_search.hh +++ b/milena/mln/canvas/browsing/depth_first_search.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 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 @@ -39,24 +39,27 @@ ** - template <typename G> void init(const Graph<G>& g) ** Will be called at the beginning. ** -** - void next() -** Will be called after all vertices from a component have been treated. -** -** - void update_treated(unsigned id) -** will be called for the first vertex encountered for each component. -** -** - void update_queued(unsigned id) -** Will be called for every vertex encountered in each component, except -** the first one. -** ** - bool to_be_treated(unsigned id) ** Return whether this vertex has already been marked or if it may be a ** a component representative. ** +** - void new_component_from_vertex(unsigned id) +** will be called for the first vertex encountered for each component. +** +** - void process_vertex(unsigned id) +** Will be called for each vertex queued. +** ** - bool to_be_queued(unsigned id) ** Return whether this vertex has already been marked or if it can be added ** to the current component. ** +** - void added_to_queue(unsigned id) +** Will be called for every vertex encountered in each component, except +** the first one. +** +** - void next_component() +** Will be called after all vertices from a component have been treated. +** ** - void final() ** Will be called at the end; ** @@ -99,7 +102,7 @@ namespace mln const G& g = exact(g_); - f.init(g); + f.init(g); // <--- init mln_vertex_iter(G) v(g); for_all(v) @@ -111,7 +114,7 @@ namespace mln while (!queue.empty()) { util::vertex<G> current_v = g.vertex(queue.front()); - f.process_vertex(current_v); + f.process_vertex(current_v); // <--- process_vertex queue.pop(); for (unsigned nv = 0; nv < current_v.nmax_nbh_vertices(); ++nv) if (f.to_be_queued(current_v.ith_nbh_vertex(nv))) // <--- to_be_queued diff --git a/milena/mln/graph/attribute/card.hh b/milena/mln/graph/attribute/card.hh new file mode 100644 index 0000000..fa892ee --- /dev/null +++ b/milena/mln/graph/attribute/card.hh @@ -0,0 +1,123 @@ +// Copyright (C) 2009 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_GRAPH_ATTRIBUTE_CARD_HH +# define MLN_GRAPH_ATTRIBUTE_CARD_HH + +/// \file mln/graph/attribute/card.hh +/// Functor that computes the cardinality of every component in a graph. +/// +/// \sa graph::compute + + +# include <mln/core/concept/graph.hh> +# include <mln/util/array.hh> + + +namespace mln +{ + + namespace graph + { + + namespace attribute + { + + /// Functor that computes the cardinality of every component in a graph. + struct card_t; + + /// This is a global instance of this functor. + extern card_t card; + + +# ifndef MLN_INCLUDE_ONLY + + /// Compute the cardinality of every component in a graph. + /// + /// \return An array with the cardinality for each component. + /// Components are labeled from 0. + struct card_t + { + /// Type of the computed value + typedef util::array<unsigned> result; + + template <typename G> + void init(const Graph<G>& g) + { + data.resize(0); + deja_vu_.resize(exact(g).v_nmax()); + deja_vu_.fill(false); + comp = 0; + } + + bool to_be_treated(unsigned id) + { return !deja_vu_[id]; } + + void new_component_from_vertex(unsigned id) + { + data.append(1); + deja_vu_[id] = true; + } + + void process_vertex(unsigned) + {} + + bool to_be_queued(unsigned id) + { return !deja_vu_[id]; } + + void added_to_queue(unsigned id) + { + deja_vu_[id] = true; + ++data[comp]; + } + + void next_component() + { ++comp; } + + void final() + {} + + unsigned comp; + util::array<bool> deja_vu_; + util::array<unsigned> data; + }; + + card_t card; + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace mln::graph::attribute + + } // end of namespace mln::graph + +} // end of namespace mln + + +#endif // ! MLN_GRAPH_ATTRIBUTE_CARD_HH diff --git a/milena/mln/graph/attribute/representative.hh b/milena/mln/graph/attribute/representative.hh new file mode 100644 index 0000000..88ed258 --- /dev/null +++ b/milena/mln/graph/attribute/representative.hh @@ -0,0 +1,123 @@ +// Copyright (C) 2009 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_GRAPH_ATTRIBUTE_REPRESENTATIVE_HH +# define MLN_GRAPH_ATTRIBUTE_REPRESENTATIVE_HH + +/// \file mln/graph/attribute/representative.hh +/// +/// Functor that computes the representative vertex of every component in +/// a graph. +/// +/// \sa graph::compute + + +# include <mln/core/concept/graph.hh> +# include <mln/util/array.hh> + + +namespace mln +{ + + namespace graph + { + + namespace attribute + { + + /// Functor that computes the representative vertex of every component + /// in a graph. + struct representative_t; + + /// This is a global instance of this functor. + extern representative_t representative; + +# ifndef MLN_INCLUDE_ONLY + + /// Compute the representative vertex of every component in a graph. + /// + /// \return An array with the representative for each component. + /// Components are labeled from 0. + struct representative_t + { + /// Type of the computed value + typedef util::array<unsigned> result; + + template <typename G> + void init(const Graph<G>& g) + { + data.resize(0); + deja_vu_.resize(exact(g).v_nmax()); + deja_vu_.fill(false); + } + + bool to_be_treated(unsigned id) + { return !deja_vu_[id]; } + + void new_component_from_vertex(unsigned id) + { + data.append(id); + deja_vu_[id] = true; + } + + void process_vertex(unsigned id) + {} + + bool to_be_queued(unsigned id) + { return !deja_vu_[id]; } + + void added_to_queue(unsigned id) + { + deja_vu_[id] = true; + } + + void next_component() + {} + + void final() + {} + + util::array<bool> deja_vu_; + util::array<unsigned> data; + }; + + representative_t representative; + + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace mln::graph::attribute + + } // end of namespace mln::graph + +} // end of namespace mln + + +#endif // ! MLN_GRAPH_ATTRIBUTE_REPRESENTATIVE_HH diff --git a/milena/mln/graph/compute.hh b/milena/mln/graph/compute.hh new file mode 100644 index 0000000..ff69a48 --- /dev/null +++ b/milena/mln/graph/compute.hh @@ -0,0 +1,86 @@ +// Copyright (C) 2009 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_GRAPH_COMPUTE_HH +# define MLN_GRAPH_COMPUTE_HH + +/// \file mln/graph/compute.hh +/// +/// Base routine to compute attributes on a graph. +/// +/// Functors must provide the interface described in depth_first_search_t. +/// \sa canvas::browsing::depth_first_search_t + +# include <mln/core/concept/graph.hh> +# include <mln/canvas/browsing/depth_first_search.hh> +# include <mln/util/array.hh> + + +namespace mln +{ + + namespace graph + { + + /// Base routine to compute attributes on a graph. + /// \param[in] g_ A graph. + /// \param[in] functor A functor implementing the right interface. + /// + /// \return The computed data. + /// + /// \sa canvas::browsing::depth_first_search + template <typename G, typename F> + mln_result(F) + compute(const Graph<G>& g_, F& functor); + + +# ifndef MLN_INCLUDE_ONLY + + template <typename G, typename F> + mln_result(F) + compute(const Graph<G>& g_, F& functor) + { + trace::entering("graph::compute"); + const G& g = exact(g_); + mln_precondition(g.is_valid()); + + canvas::browsing::depth_first_search(g, functor); + + trace::exiting("graph::compute"); + return functor.data; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::graph + +} // end of namespace mln + + +#endif // ! MLN_GRAPH_COMPUTE_HH diff --git a/milena/tests/Makefile.am b/milena/tests/Makefile.am index 0e05a0f..9945b19 100644 --- a/milena/tests/Makefile.am +++ b/milena/tests/Makefile.am @@ -19,6 +19,7 @@ SUBDIRS = \ extension \ fun \ geom \ + graph \ histo \ io \ labeling \ diff --git a/milena/tests/graph/Makefile.am b/milena/tests/graph/Makefile.am new file mode 100644 index 0000000..b663a3f --- /dev/null +++ b/milena/tests/graph/Makefile.am @@ -0,0 +1,6 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +include $(top_srcdir)/milena/tests/tests.mk + +SUBDIRS = attribute + diff --git a/milena/tests/graph/attribute/Makefile.am b/milena/tests/graph/attribute/Makefile.am new file mode 100644 index 0000000..520371f --- /dev/null +++ b/milena/tests/graph/attribute/Makefile.am @@ -0,0 +1,12 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + card \ + representative + +card_SOURCES = card.cc +representative_SOURCES = representative.cc + +TESTS = $(check_PROGRAMS) diff --git a/milena/tests/graph/attribute/card.cc b/milena/tests/graph/attribute/card.cc new file mode 100644 index 0000000..eebf82c --- /dev/null +++ b/milena/tests/graph/attribute/card.cc @@ -0,0 +1,63 @@ +// Copyright (C) 2009 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/graph/attribute/card.cc +/// +/// Tests on mln::graph::attribute::card. + +#include <mln/util/graph.hh> +#include <mln/graph/compute.hh> +#include <mln/graph/attribute/card.hh> + +int main() +{ + using namespace mln; + + util::graph g; + + /// Construct the following graph: + /// + /// 0 -- 1 -- 2 + /// + /// 3 -- 4 + /// + /// 5 + /// + /// There are 3 components. + // + g.add_vertices(6); + g.add_edge(0,1); + g.add_edge(1,2); + g.add_edge(3,4); + + util::array<unsigned> result = graph::compute(g, graph::attribute::card); + + mln_assertion(result.size() == 3); + mln_assertion(result[0] == 3); + mln_assertion(result[1] == 2); + mln_assertion(result[2] == 1); +} diff --git a/milena/tests/graph/attribute/representative.cc b/milena/tests/graph/attribute/representative.cc new file mode 100644 index 0000000..77e99a0 --- /dev/null +++ b/milena/tests/graph/attribute/representative.cc @@ -0,0 +1,63 @@ +// Copyright (C) 2009 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/graph/attribute/representative.cc +/// +/// Tests on mln::graph::attribute::representative. + +#include <mln/util/graph.hh> +#include <mln/graph/compute.hh> +#include <mln/graph/attribute/representative.hh> + +int main() +{ + using namespace mln; + + util::graph g; + + /// Construct the following graph: + /// + /// 0 -- 1 -- 2 + /// + /// 3 -- 4 + /// + /// 5 + /// + /// There are 3 components. + // + g.add_vertices(6); + g.add_edge(0,1); + g.add_edge(1,2); + g.add_edge(3,4); + + util::array<unsigned> result = graph::compute(g, graph::attribute::representative); + + mln_assertion(result.size() == 3); + mln_assertion(result[0] == 0); + mln_assertion(result[1] == 3); + mln_assertion(result[2] == 5); +} -- 1.5.6.5

1 0

3669: Handle bool specialization correctly with util::array.
by Guillaume Lazzara 15 Apr '09

15 Apr '09

* mln/util/array.hh: update return type of operator() and operator[]. --- milena/ChangeLog | 6 ++++++ milena/mln/util/array.hh | 42 +++++++++++++++++++++++++++++++++--------- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4ff058c..5cd09e3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2009-04-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Handle bool specialization correctly with util::array. + + * mln/util/array.hh: update return type of operator() and operator[]. + +2009-04-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add make::vertex_image * mln/make/vertex_image: new routine. diff --git a/milena/mln/util/array.hh b/milena/mln/util/array.hh index 5eb5fc4..5d1fed5 100644 --- a/milena/mln/util/array.hh +++ b/milena/mln/util/array.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 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 @@ -37,6 +38,7 @@ # include <vector> # include <iostream> +# include <algorithm> # include <mln/core/concept/function.hh> # include <mln/core/concept/proxy.hh> @@ -165,7 +167,7 @@ namespace mln /// \brief Return the \p i-th element of the array. /// \pre i < nelements() - T& operator()(unsigned i); + mutable_result operator()(unsigned i); /// \brief Return the \p i-th element of the array. /// \pre i < nelements() @@ -173,13 +175,15 @@ namespace mln /// \brief Return the \p i-th element of the array. /// \pre i < nelements() - T& operator[](unsigned i); + mutable_result operator[](unsigned i); /// Empty the array. All elements contained in the array are /// destroyed. \post is_empty() == true void clear(); + /// Fill the whole array with value \p value. + void fill(const T& value); /// Return the corresponding std::vector of elements. const std::vector<T>& std_vector() const; @@ -327,6 +331,8 @@ namespace mln struct subject_impl<util::array<T>&, E> : subject_impl<const util::array<T>&, E> { + typedef typename util::array<T>::mutable_result mutable_result; + void reserve(unsigned n); void resize(unsigned n); void resize(unsigned n, const T& value); @@ -336,11 +342,13 @@ namespace mln template <typename U> util::array<T>& append(const util::array<U>& other); - T& operator()(unsigned i); - T& operator[](unsigned i); + mutable_result operator()(unsigned i); + mutable_result operator[](unsigned i); void clear(); + void fill(const T& value); + std::vector<T>& hook_std_vector_(); private: @@ -463,6 +471,14 @@ namespace mln template <typename T> inline + void + array<T>::fill(const T& value) + { + std::fill(v_.begin(), v_.end(), value); + } + + template <typename T> + inline unsigned array<T>::size() const { @@ -487,7 +503,7 @@ namespace mln template <typename T> inline - T& + typename array<T>::mutable_result array<T>::operator()(unsigned i) { return (*this)(i); @@ -504,7 +520,7 @@ namespace mln template <typename T> inline - T& + typename array<T>::mutable_result array<T>::operator[](unsigned i) { mln_precondition(i < nelements()); @@ -806,7 +822,7 @@ namespace mln template <typename T, typename E> inline - T& + typename util::array<T>::mutable_result subject_impl<util::array<T>&, E>::operator()(unsigned i) { return exact_().get_subject()(i); @@ -814,7 +830,7 @@ namespace mln template <typename T, typename E> inline - T& + typename util::array<T>::mutable_result subject_impl<util::array<T>&, E>::operator[](unsigned i) { return exact_().get_subject()[i]; @@ -830,6 +846,14 @@ namespace mln template <typename T, typename E> inline + void + subject_impl<util::array<T>&, E>::fill(const T& value) + { + exact_().get_subject().fill(value); + } + + template <typename T, typename E> + inline std::vector<T>& subject_impl<util::array<T>&, E>::hook_std_vector_() { -- 1.5.6.5

1 0

3668: Add make::vertex_image
by Guillaume Lazzara 15 Apr '09

15 Apr '09

* mln/make/vertex_image: new routine. --- milena/ChangeLog | 6 +++ milena/mln/make/vertex_image.hh | 88 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 0 deletions(-) create mode 100644 milena/mln/make/vertex_image.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 13558bc..4ff058c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2009-04-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add make::vertex_image + + * mln/make/vertex_image: new routine. + +2009-04-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Fix more tests. * tests/fun/l2l/wrap.cc, diff --git a/milena/mln/make/vertex_image.hh b/milena/mln/make/vertex_image.hh new file mode 100644 index 0000000..c5db7ea --- /dev/null +++ b/milena/mln/make/vertex_image.hh @@ -0,0 +1,88 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_MAKE_VERTEX_IMAGE_HH +# define MLN_MAKE_VERTEX_IMAGE_HH + +/// \file mln/make/vertex_image.hh +/// +/// Routine to create a vertex image. + +# include <mln/core/image/vertex_image.hh> +# include <mln/core/concept/function.hh> +# include <mln/util/internal/id2element.hh> + + +namespace mln +{ + + namespace make + { + + +# ifndef MLN_INCLUDE_ONLY + + template <typename V, typename G> + mln::vertex_image<void,V,G> + vertex_image(const Graph<G>& g, const fun::i2v::array<V>& fv) + { + trace::entering("make::vertex_image"); + mln_precondition(exact(g).is_valid()); + + p_vertices<G> pv(g); + mln::vertex_image<void,V,G> ima(pv, fv); + + trace::exiting("make::vertex_image"); + return ima; + } + + + template <typename FP, typename FV, typename G> + mln::vertex_image<mln_result(FP),mln_result(FV),G> + vertex_image(const Graph<G>& g_, + const Function_i2v<FP>& fp, + const Function_i2v<FV>& fv) + { + trace::entering("make::vertex_image"); + const G& g = exact(g_); + mln_precondition(g.is_valid()); + + p_vertices<G,FP> pv(g,fp); + mln::vertex_image<mln_result(FP),mln_result(FV),G> ima(pv, fv); + + trace::exiting("make::vertex_image"); + return ima; + } + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace mln::make + +} // end of namespace mln + +# endif // ! MLN_MAKE_VERTEX_IMAGE_HH -- 1.5.6.5

1 0

3667: Fix more tests.
by Guillaume Lazzara 15 Apr '09

15 Apr '09

* tests/fun/l2l/wrap.cc, * tests/accu/transform_line.cc: avoid warnings. * tests/core/other/Makefile.am, * tests/core/other/line_graph_elt_neighborhood.cc, * tests/core/other/line_graph_elt_window.cc: remove deprecated tests. * tests/core/other/graph_elt_neighborhood.cc, * tests/core/other/graph_elt_window.cc: update window declarations. * tests/make/graph.cc: rename as... * tests/make/influence_zone_adjacency_graph.cc: ... this. --- milena/ChangeLog | 17 +++ milena/tests/accu/transform_line.cc | 2 +- milena/tests/core/other/Makefile.am | 4 - milena/tests/core/other/graph_elt_neighborhood.cc | 5 +- milena/tests/core/other/graph_elt_window.cc | 5 +- .../core/other/line_graph_elt_neighborhood.cc | 115 -------------------- milena/tests/core/other/line_graph_elt_window.cc | 113 ------------------- milena/tests/fun/l2l/wrap.cc | 12 +- ...{graph.cc => influence_zone_adjacency_graph.cc} | 8 +- 9 files changed, 34 insertions(+), 247 deletions(-) delete mode 100644 milena/tests/core/other/line_graph_elt_neighborhood.cc delete mode 100644 milena/tests/core/other/line_graph_elt_window.cc rename milena/tests/make/{graph.cc => influence_zone_adjacency_graph.cc} (89%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 20968b2..13558bc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,20 @@ +2009-04-15 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Fix more tests. + + * tests/fun/l2l/wrap.cc, + * tests/accu/transform_line.cc: avoid warnings. + + * tests/core/other/Makefile.am, + * tests/core/other/line_graph_elt_neighborhood.cc, + * tests/core/other/line_graph_elt_window.cc: remove deprecated tests. + + * tests/core/other/graph_elt_neighborhood.cc, + * tests/core/other/graph_elt_window.cc: update window declarations. + + * tests/make/graph.cc: rename as... + * tests/make/influence_zone_adjacency_graph.cc: ... this. + 2009-04-14 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Fix tests. diff --git a/milena/tests/accu/transform_line.cc b/milena/tests/accu/transform_line.cc index c87a8f2..192c327 100644 --- a/milena/tests/accu/transform_line.cc +++ b/milena/tests/accu/transform_line.cc @@ -45,7 +45,7 @@ int main() for (unsigned dir = 0; dir < 2; ++dir) { image2d<unsigned> out = accu::transform_line(accu::meta::count(), ima, len, dir); - mln_assertion(out == (pw::cst(3) | ima.domain())); + mln_assertion(out == (pw::cst(3u) | ima.domain())); } } diff --git a/milena/tests/core/other/Makefile.am b/milena/tests/core/other/Makefile.am index 018f1e6..0257f27 100644 --- a/milena/tests/core/other/Makefile.am +++ b/milena/tests/core/other/Makefile.am @@ -11,8 +11,6 @@ check_PROGRAMS = \ dpoints_pixter \ graph_elt_neighborhood \ graph_elt_window \ - line_graph_elt_neighborhood \ - line_graph_elt_window \ neighb \ pixel \ pixter1d \ @@ -32,8 +30,6 @@ category_SOURCES = category.cc dpoints_pixter_SOURCES = dpoints_pixter.cc graph_elt_neighborhood_SOURCES = graph_elt_neighborhood.cc graph_elt_window_SOURCES = graph_elt_window.cc -line_graph_elt_neighborhood_SOURCES = line_graph_elt_neighborhood.cc -line_graph_elt_window_SOURCES = line_graph_elt_window.cc neighb_SOURCES = neighb.cc pixel_SOURCES = pixel.cc pixter1d_SOURCES = pixter1d.cc diff --git a/milena/tests/core/other/graph_elt_neighborhood.cc b/milena/tests/core/other/graph_elt_neighborhood.cc index aafe485..5c9c0fe 100644 --- a/milena/tests/core/other/graph_elt_neighborhood.cc +++ b/milena/tests/core/other/graph_elt_neighborhood.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -101,7 +102,7 @@ int main() mln_psite_(pv_t) p(pg, 1); // ``Sliding'' neighborhood of a psite of PG. - typedef graph_elt_neighborhood<G, F> nbh_t; + typedef graph_elt_neighborhood<G, pv_t> nbh_t; nbh_t nbh; unsigned i = 0; diff --git a/milena/tests/core/other/graph_elt_window.cc b/milena/tests/core/other/graph_elt_window.cc index 62a43e3..86c3228 100644 --- a/milena/tests/core/other/graph_elt_window.cc +++ b/milena/tests/core/other/graph_elt_window.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 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 @@ -101,7 +102,7 @@ int main() mln_psite_(pg_t) p(pg, 1); // ``Sliding'' window of a psite of PG. - typedef graph_elt_window<G, F> win_t; + typedef graph_elt_window<G, pg_t> win_t; win_t win; unsigned i = 0; diff --git a/milena/tests/core/other/line_graph_elt_neighborhood.cc b/milena/tests/core/other/line_graph_elt_neighborhood.cc deleted file mode 100644 index cbc7d75..0000000 --- a/milena/tests/core/other/line_graph_elt_neighborhood.cc +++ /dev/null @@ -1,115 +0,0 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) -// -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. -// -// As a special exception, you may use this file as part of a free -// software library without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to -// produce an executable, this file does not by itself cause the -// resulting executable to be covered by the GNU General Public -// License. This exception does not however invalidate any other -// reasons why the executable file might be covered by the GNU General -// Public License. - -/// \file tests/core/other/line_graph_elt_neighborhood.cc -/// -/// Tests on mln::line_graph_elt_neighborhood. - -#include <vector> - -#include <mln/core/alias/point2d.hh> -#include <mln/core/site_set/p_edges.hh> - -#include <mln/util/graph.hh> -#include <mln/core/image/line_graph_elt_neighborhood.hh> - - -unsigned fwd_neighb[] = { 0, 2, 4 }; -unsigned bkd_neighb[] = { 4, 2, 0 }; - - -int main() -{ - using namespace mln; - - typedef point2d p_t; - - /*--------. - | Graph. | - `--------*/ - - /* The graph and its corresponding line graph are as follows: - - 0 1 2 3 4 0 1 2 3 4 - .----------- .----------- - | | - 0 | 0 2 0 | * * - 1 | \ / | 1 | 0 1 | - 2 | 1 | 2 | * 4 - 3 | \ | 3 | 2 | - 4 | 3-4 4 | *3* - - */ - - // Points associated to vertices. - typedef fun::i2v::array<p_t> F; - F points(5); - points(0) = point2d(0,0); // Point associated to vertex 0. - points(1) = point2d(2,2); // Point associated to vertex 1. - points(2) = point2d(0,4); // Point associated to vertex 2. - points(3) = point2d(4,3); // Point associated to vertex 3. - points(4) = point2d(4,4); // Point associated to vertex 4. - - // Edges. - typedef mln::util::graph G; - G g; - - // Populate the graph with vertices. - g.add_vertices(points.size()); - - // Populate the graph with edges. - g.add_edge(0, 1); - g.add_edge(1, 2); - g.add_edge(1, 3); - g.add_edge(3, 4); - g.add_edge(4, 2); - - /*-------------------------. - | Graph and neighborhood. | - `-------------------------*/ - - // Line graph psite set. - typedef p_edges<G, F> pe_t; - pe_t pe(g, points); - - // Line graph point site. - mln_psite_(pe_t) p(pe, 1); - - // ``Sliding'' neighborhood of a psite of PLG. - typedef line_graph_elt_neighborhood<G, F> nbh_t; - nbh_t nbh; - - unsigned i = 0; - mln_fwd_niter_(nbh_t) fq(nbh, p); - for_all(fq) - mln_assertion(fq.element().id() == fwd_neighb[i++]); - - i = 0; - mln_bkd_niter_(nbh_t) bq(nbh, p); - for_all(bq) - mln_assertion(bq.element().id() == bkd_neighb[i++]); -} diff --git a/milena/tests/core/other/line_graph_elt_window.cc b/milena/tests/core/other/line_graph_elt_window.cc deleted file mode 100644 index 6d6934e..0000000 --- a/milena/tests/core/other/line_graph_elt_window.cc +++ /dev/null @@ -1,113 +0,0 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory (LRDE) -// -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. -// -// As a special exception, you may use this file as part of a free -// software library without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to -// produce an executable, this file does not by itself cause the -// resulting executable to be covered by the GNU General Public -// License. This exception does not however invalidate any other -// reasons why the executable file might be covered by the GNU General -// Public License. - -/// \file tests/core/other/line_graph_elt_window.cc -/// -/// Tests on mln::line_graph_elt_window. - -#include <vector> - -#include <mln/core/alias/point2d.hh> -#include <mln/core/neighb.hh> -#include <mln/core/site_set/p_edges.hh> -#include <mln/core/image/line_graph_elt_window.hh> - -#include <mln/util/graph.hh> - -unsigned fwd_neighb[] = { 0, 2, 4 }; -unsigned bkd_neighb[] = { 4, 2, 0 }; - - -int main() -{ - using namespace mln; - - typedef point2d p_t; - - /*--------. - | Graph. | - `--------*/ - - /* The graph and its corresponding line graph are as follows: - - 0 1 2 3 4 0 1 2 3 4 - .----------- .----------- - | | - 0 | 0 2 0 | * * - 1 | \ / | 1 | 0 1 | - 2 | 1 | 2 | * 4 - 3 | \ | 3 | 2 | - 4 | 3-4 4 | *3* - - */ - - // Points associated to vertices. - typedef fun::i2v::array<p_t> F; - F points(5); - points(0) = point2d(0,0); // Point associated to vertex 0. - points(1) = point2d(2,2); // Point associated to vertex 1. - points(2) = point2d(0,4); // Point associated to vertex 2. - points(3) = point2d(4,3); // Point associated to vertex 3. - points(4) = point2d(4,4); // Point associated to vertex 4. - - // Edges. - typedef mln::util::graph G; - G g; - - // Populate the graph with vertices. - g.add_vertices(points.size()); - - // Populate the graph with edges. - g.add_edge(0, 1); - g.add_edge(1, 2); - g.add_edge(1, 3); - g.add_edge(3, 4); - g.add_edge(4, 2); - - /*------------------. - | Graph and window. | - `------------------*/ - - // Line graph psite set. - p_edges<G, F> pe(g, points); - // Line graph point site. - p_edges_psite<G, F> p(pe, 1); - // ``Sliding'' window of a psite of PLG. - typedef line_graph_elt_window<G, F> win_t; - win_t win; - - unsigned i = 0; - mln_fwd_qiter_(win_t) fq(win, p); - for_all(fq) - mln_assertion(fq.element().id() == fwd_neighb[i++]); - - i = 0; - mln_bkd_qiter_(win_t) bq(win, p); - for_all(bq) - mln_assertion(bq.element().id() == bkd_neighb[i++]); - -} diff --git a/milena/tests/fun/l2l/wrap.cc b/milena/tests/fun/l2l/wrap.cc index 0e92faa..78d339a 100644 --- a/milena/tests/fun/l2l/wrap.cc +++ b/milena/tests/fun/l2l/wrap.cc @@ -49,10 +49,10 @@ int main() l510 = 510, l511 = 511; - mln_assertion( f(l0) == 0 ); - mln_assertion( f(l1) == 1 ); - mln_assertion( f(l255) == 255 ); - mln_assertion( f(l256) == 1 ); - mln_assertion( f(l510) == 255 ); - mln_assertion( f(l511) == 1 ); + mln_assertion(f(l0) == 0u); + mln_assertion(f(l1) == 1u); + mln_assertion(f(l255) == 255u); + mln_assertion(f(l256) == 1u); + mln_assertion(f(l510) == 255u); + mln_assertion(f(l511) == 1u); } diff --git a/milena/tests/make/graph.cc b/milena/tests/make/influence_zone_adjacency_graph.cc similarity index 89% rename from milena/tests/make/graph.cc rename to milena/tests/make/influence_zone_adjacency_graph.cc index bb88706..fe4b172 100644 --- a/milena/tests/make/graph.cc +++ b/milena/tests/make/influence_zone_adjacency_graph.cc @@ -25,14 +25,14 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/make/graph.cc +/// \file tests/make/influence_zone_adjacency_graph.cc /// -/// Tests on mln::make::graph. +/// Tests on mln::make::influence_zone_adjacency_graph. #include <mln/make/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/util/graph.hh> -#include <mln/make/graph.hh> +#include <mln/make/influence_zone_adjacency_graph.hh> #include <mln/value/label_8.hh> @@ -46,7 +46,7 @@ int main() image2d<value::label_8> ima = make::image2d(vals); - util::graph g = make::graph(ima, c4(), 4u); + util::graph g = make::influence_zone_adjacency_graph(ima, c4(), 4u); mln_assertion(g.e_nmax() == 7u); mln_assertion(g.v_nmax() == 5u); -- 1.5.6.5

1 0

r3666: Compute histograms on 3d and generic images. Still not fully working
by Etienne FOLIO 15 Apr '09

15 Apr '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-04-15 Etienne FOLIO <folio(a)lrde.epita.fr> Compute histograms on 3d and generic images. Still not fully working. * folio/mln/histo/compute_histo.hh: New algorithm that computes an histogram on a generic image * folio/mln/histo/compute_histo_3d.hh: New algorithm that computes an histogram on a 3d image. * folio/test/histo/compute_histo_3d.cc: New test file for the compute_histo_3d.hh algorithm. --- mln/histo/compute_histo.hh | 47 +++++++++++++++++++++++++++++++++++ mln/histo/compute_histo_3d.hh | 38 ++++++++++++++++++++++++++++ test/histo/compute_histo_3d.cc | 54 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 139 insertions(+) Index: trunk/milena/sandbox/folio/test/histo/compute_histo_3d.cc =================================================================== --- trunk/milena/sandbox/folio/test/histo/compute_histo_3d.cc (revision 0) +++ trunk/milena/sandbox/folio/test/histo/compute_histo_3d.cc (revision 3666) @@ -0,0 +1,54 @@ +/*! + * \file compute_histo_rgb.cc<2> + * \author etiennefolio <ornthalas(a)gmail.com> + */ + +#include <iostream> +#include <mln/debug/println.hh> +#include <mln/literal/all.hh> +#include <mln/value/rgb8.hh> +#include <mln/value/int_u8.hh> + +#include "../../mln/histo/compute_histo_3d.hh" + +int main() +{ + using namespace mln; + + // build test image + image2d<value::rgb8> ima(10, 10); + + value::rgb8 red = literal::red; + value::rgb8 green = literal::green; + value::rgb8 black = literal::black; + + for (unsigned i = 0; i < 10; ++i) + for (unsigned j = 5; j < 10; ++j) + { + point2d p(j, i); + ima(p) = black; + } + + for (unsigned i = 0; i < 10; ++i) + for (unsigned j = 0; j < 5; ++j) + { + point2d p(j, i); + ima(p) = red; + } + + point2d p(8, 2); + ima(p) = green; + + std::cout << "input :" << std::endl; + debug::println(ima); + + // let's run ! + image3d<value::int_u8> out = histo::compute_histo_3d<value::int_u8>(ima); + + // output ? + std::cout << "out(0, 0, 0) = " << out(point3d(0, 0, 0)) << std::endl; + std::cout << "out(255, 0, 0) = " << out(point3d(255, 0, 0)) << std::endl; + std::cout << "out(0, 255, 0) = " << out(point3d(0, 255, 0)) << std::endl; + + return 0; +} Index: trunk/milena/sandbox/folio/mln/histo/compute_histo.hh =================================================================== --- trunk/milena/sandbox/folio/mln/histo/compute_histo.hh (revision 0) +++ trunk/milena/sandbox/folio/mln/histo/compute_histo.hh (revision 3666) @@ -0,0 +1,47 @@ +/*! + * \file compute_histo.cc + * \author etiennefolio <ornthalas(a)gmail.com> + */ + +#include <mln/core/image/image.hh> +#include <mln/trait/value/comp.hh> + +#include <mln/trait/image_from_grid.hh> + +namespace mln +{ + namespace histo + { + + template <typename C, typename I> + Image<C> compute_histo(Image<I> ima_) + { + I ima = exact(ima); + typedef mln_value(I) V; + typedef mln_regular_grid_from_dim(V::dim + 1) G; + typedef mln_image_from_grid(G, C) O; + O out; + + for (unsigned i = 0; i < V::dim + 1; ++i) + { + typedef mln_trait_value_comp(I, i)::enc enc[i]; + // FIXME: define here the domain of `out'. + // out(mln_max(enc[0]) + abs(mln_min(enc[0])) + 1, + // mln_max(enc[1]) + abs(mln_min(enc[1])) + 1, + // mln_max(enc[2]) + abs(mln_min(enc[2])) + 1); + } + data::fill(out, mln_min(C)); + + // count + mln_fwd_piter(box2d) p(ima.domain()); + for_all(p) + // FIXME: call macro comp()? + // FIXME: pointnd + ++out(point3d(ima(p).comp(0), ima(p).comp(1), ima(p).comp(2))); + + // return + return out; + } + + } +} Index: trunk/milena/sandbox/folio/mln/histo/compute_histo_3d.hh =================================================================== --- trunk/milena/sandbox/folio/mln/histo/compute_histo_3d.hh (revision 0) +++ trunk/milena/sandbox/folio/mln/histo/compute_histo_3d.hh (revision 3666) @@ -0,0 +1,38 @@ +/*! + * \file compute_histo_3d.cc + * \author etiennefolio <ornthalas(a)gmail.com> + */ + +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/trait/value/comp.hh> + +namespace mln +{ + namespace histo + { + + template <typename C, typename T> + image3d<C> compute_histo_3d(image2d<T> ima) + { + // out + typedef mln_trait_value_comp(T, 0)::enc enc_0; + typedef mln_trait_value_comp(T, 1)::enc enc_1; + typedef mln_trait_value_comp(T, 2)::enc enc_2; + image3d<C> out(mln_max(enc_0) + abs(mln_min(enc_0)) + 1, + mln_max(enc_1) + abs(mln_min(enc_1)) + 1, + mln_max(enc_2) + abs(mln_min(enc_2)) + 1); + data::fill(out, mln_min(C)); + + // count + mln_fwd_piter(box2d) p(ima.domain()); + for_all(p) + // FIXME: call macro comp()? + ++out(point3d(ima(p).comp(0), ima(p).comp(1), ima(p).comp(2))); + + // return + return out; + } + + } +}

1 0

scool r150: mini-std: Add "Container" concept
by Warren Seine 14 Apr '09

14 Apr '09

URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng ChangeLog: 2009-04-14 Warren Seine <soow(a)lrde.epita.fr> mini-std: Add "Container" concept. Still non-compiling. * c++/mini-std.hh: Add Container structure and associated traits. --- mini-std.hh | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 96 insertions(+), 8 deletions(-) Index: branches/scool-ng/examples/mini-std/c++/mini-std.hh =================================================================== --- branches/scool-ng/examples/mini-std/c++/mini-std.hh (revision 149) +++ branches/scool-ng/examples/mini-std/c++/mini-std.hh (revision 150) @@ -42,19 +42,16 @@ { namespace internal { + typedef char yes_; + struct no_ { char dummy[2]; }; + } // End of namespace internal } // End of namespace mstd -/*----------------------------. -| Automatic implementations. | -`----------------------------*/ - namespace mstd { - namespace behavior { struct identity; } - - // Forward declarations. + // Forward declaration. template <typename Exact> struct Container; @@ -64,8 +61,64 @@ template <typename Exact> struct Iterator; - // FIXME + // Container category flag type. + template <> + struct Container<void> + { + typedef Object<void> super; + }; +} + + +/*----------------------------. +| Traits. | +`----------------------------*/ + +namespace mstd +{ + namespace trait // mln/core/image/image2d.hh:94 + { + // Undefined property tag + struct undef { std::string name() const { return "undef"; } }; + + + template <typename C> + struct undefined_container_ // mln/trait/images.hh:134 + { + // misc + typedef undef category; + typedef undef speed; + typedef undef size; + + // data (I::value) + typedef undef kind; + typedef undef nature; + typedef undef quant; + }; + + + template <typename C> + struct container_ : undefined_container_<C> + { + }; + + + template <typename T, typename C> + struct default_container_ : undefined_container_<C> + { }; + } +} + + +/*----------------------------. +| Automatic implementations. | +`----------------------------*/ + +namespace mstd +{ +}; + /*---------------. | Abstractions. | @@ -81,6 +134,31 @@ // Container. // // ----------- // + // Base class for implementation of container classes + + template <typename E> + struct Container : public Object< E > + { + typedef Container<void> category; + + /* + // provided by internal::container_base: + + typedef value_t; + typedef size_t; + typedef stdcontainer_t; + + */ + + protected: + Container() + { + // FIXME: Add check just like in mln/core/concept/image.hh + } + }; + + template <typename E> struct Container; + template <typename Exact> struct Container : virtual public Any<Exact>, virtual public automatic::set_impl< Container, behavior::identity, Exact > @@ -189,6 +267,16 @@ template <typename T> struct list; + namespace trait // mln/core/image/image2d.hh:94 + { + template <typename T> + struct container_< list<T> > : default_container_< T, list<T> > + { + // misc + typedef trait::container::category::primary category; + }; + } + // FIXME: List implementation -- :: Warren Seine // SooW :: :: warren.seine @ gmail.com :: :: EPITA CSI 2010 ::

1 0

r3665: Add multivalued image support for components detection
by Edwin Carlinet 14 Apr '09

14 Apr '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-04-14 Edwin Carlinet <carlinet(a)lrde.epita.fr> Add multivalued image support for components detection. * edwin/tree/propagate.hh: Move a propagation routine from sharp.cc to this file. * edwin/tree/sharp.cc: Add multivalued image support. --- propagate.hh | 36 ++++++++++++++++++++++++ sharp.cc | 86 +++++++++++++++++++++++++++++++++++------------------------ 2 files changed, 88 insertions(+), 34 deletions(-) Index: trunk/milena/sandbox/edwin/tree/propagate.hh =================================================================== --- trunk/milena/sandbox/edwin/tree/propagate.hh (revision 3664) +++ trunk/milena/sandbox/edwin/tree/propagate.hh (revision 3665) @@ -55,6 +55,42 @@ } } + /** + ** For each component in the list \p component_list, it + ** propagates the representant value to the remaining nodes of the + ** component. The value of a node that doesn't belong to a component is + ** set to \p null. + ** + ** @param attr_image The attribute image. + ** @param tree The component tree used to propagate value. + ** @param component_list The list of components. + ** @param null The nodes that don't belong to components will be set + ** with this value. + ** + ** @return The resulting component image. + */ + template <typename A, typename T> + inline + A set_value_to_components(const Image<A>& attr_image, + const T& tree, + const p_array< mln_psite(A) >& component_list, + const mln_value(A)& null) + { + const A& attr_img = exact(attr_image); + A out; + initialize(out, attr_img); + data::fill(out, null); + + mln_piter(p_array<mln_psite(A)>) p(component_list); + for_all(p) + { + out(p) = attr_img(p); + morpho::tree::propagate_node_to_descendants(p, tree, out); + } + morpho::tree::propagate_representant(tree, out); + return out; + } + } // end of namespace mln::morpho::tree } // end of namespace mln::morpho } // end of namespace mln Index: trunk/milena/sandbox/edwin/tree/sharp.cc =================================================================== --- trunk/milena/sandbox/edwin/tree/sharp.cc (revision 3664) +++ trunk/milena/sandbox/edwin/tree/sharp.cc (revision 3665) @@ -22,6 +22,7 @@ /* io */ +#include <mln/io/ppm/load.hh> #include <mln/io/pgm/load.hh> #include <mln/io/pgm/save.hh> #include <mln/io/pbm/save.hh> @@ -61,49 +62,53 @@ << "*********************" << std::endl; } +namespace mln +{ + // Distance, stored on pixels, of neighboring colors. -/** -** For each component in the list \p component_list, it -** propagates the representant value to the remaining nodes of the -** component. The value of a node that doesn't belong to a component is -** set to \p null. -** -** @param attr_image The attribute image. -** @param tree The component tree used to propagate value. -** @param component_list The list of components. -** @param null The nodes that don't belong to components will be set -** with this value. -** -** @return The resulting component image. -*/ -template <typename A, typename T> -inline -A set_value_to_components(const Image<A>& attr_image, - const T& tree, - const p_array< mln_psite(A) >& component_list, - const mln_value(A)& null) -{ - const A& attr_img = exact(attr_image); - A out; - initialize(out, attr_img); - data::fill(out, null); + value::int_u8 dist_mean(const value::rgb8& c1, const value::rgb8& c2) + { + unsigned d = 0; + d += (math::diff_abs(c1.red(), c2.red()) + 2) / 3; + d += (math::diff_abs(c1.green(), c2.green()) + 2) / 3; + d += (math::diff_abs(c1.blue(), c2.blue()) + 2) / 3; + if (d > 255) + d = 255; + return d; + } - mln_piter(p_array<mln_psite(A)>) p(component_list); + template <typename N> + image2d<value::int_u8> + dist_on_pixels(const image2d<value::rgb8>& input, const N& nbh) + { + using value::int_u8; + image2d<int_u8> output(input.domain()); + + mln_piter(box2d) p(input.domain()); + mln_niter(N) n(nbh, p); for_all(p) { - out(p) = attr_img(p); - morpho::tree::propagate_node_to_descendants(p, tree, out); + int_u8 d = 0u; + for_all(n) if (input.domain().has(n)) + { + int_u8 d_ = dist_mean(input(p), input(n)); + if (d_ > d) + d = d_; + } + output(p) = 255 - d; + } + return output; } - morpho::tree::propagate_representant(tree, out); - return out; } + int main(int argc, char* argv[]) { using value::int_u8; + using value::rgb8; std::string arg; unsigned nb_components = 0; unsigned card = 0; @@ -131,10 +136,15 @@ /* Image loadin' */ + image2d<rgb8> input_; + io::ppm::load(input_, argv[1]); + typedef image2d<int_u8> I; + I input = dist_on_pixels(input_, c4()); + + if (mydebug) + io::pgm::save(input, "input.pgm"); - I input; - io::pgm::load(input, argv[1]); /* Component tree creation */ typedef p_array< mln_site_(I) > S; @@ -144,6 +154,12 @@ tree_t tree(input, sorted_sites, c4()); /* Compute Attribute On Image */ + + // TODO: l'attribut devrait favoriser les composantes plus larges + // dans son calcul. Ainsi au lieu de faire un sharpness, on aurait + // un ratio sharpness / largeur de composante (reprendre l'idee du + // log utilise pour INIM). + typedef morpho::attribute::sharpness<I> sharp_t; typedef mln_ch_value_(I, double) A; @@ -175,6 +191,9 @@ a = duplicate((fun::p2v::ternary(pw::value(b) > pw::cst(card), pw::value(a), pw::cst(0.0))) | a.domain()); } + if (mydebug) + io::pgm::save(level::stretch(int_u8(), a), "attr_image.pgm"); + /* Run max accumulator */ accumulator::arg_max<A> argmax(a); p_array< mln_psite_(A) > obj_array; // Array of object components. @@ -209,12 +228,11 @@ } /* Now Back Propagate to component */ - if (mydebug) { dsp("Create mask and propagate"); } - A pre_output = set_value_to_components(a, tree, obj_array, 0); + A pre_output = morpho::tree::set_value_to_components(a, tree, obj_array, 0); I output = level::stretch(int_u8(), pre_output); io::pgm::save(output, "components.pgm");

1 0

3664: Fix tests.
by Guillaume Lazzara 14 Apr '09

14 Apr '09

* mln/accu/stat/variance.hh, * mln/io/plot/save.hh: fix missing includes. * mln/level/abs.hh: fix invalid assignment. * mln/make/rag_and_labeled_wsl.hh: add more doc. * mln/util/tree_to_image.hh: fix a typo. * tests/labeling/n_max.cc: use a smaller image. * tests/make/rag_and_labeled_wsl.cc: Fix an invalid test and make the test more readable. --- milena/ChangeLog | 18 ++++++++++++++++++ milena/mln/accu/stat/variance.hh | 1 + milena/mln/io/plot/save.hh | 2 ++ milena/mln/level/abs.hh | 2 +- milena/mln/make/rag_and_labeled_wsl.hh | 24 ++++++++++++++++++++++++ milena/mln/util/tree_to_image.hh | 4 ++-- milena/tests/labeling/n_max.cc | 19 +++++++++---------- milena/tests/make/rag_and_labeled_wsl.cc | 19 +++++++++++-------- 8 files changed, 68 insertions(+), 21 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0e13e64..20968b2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,23 @@ 2009-04-14 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Fix tests. + + * mln/accu/stat/variance.hh, + * mln/io/plot/save.hh: fix missing includes. + + * mln/level/abs.hh: fix invalid assignment. + + * mln/make/rag_and_labeled_wsl.hh: add more doc. + + * mln/util/tree_to_image.hh: fix a typo. + + * tests/labeling/n_max.cc: use a smaller image. + + * tests/make/rag_and_labeled_wsl.cc: Fix an invalid test and make the + test more readable. + +2009-04-14 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add new tests. * tests/make/Makefile.am, diff --git a/milena/mln/accu/stat/variance.hh b/milena/mln/accu/stat/variance.hh index 5c2ca3a..0b4dc0b 100644 --- a/milena/mln/accu/stat/variance.hh +++ b/milena/mln/accu/stat/variance.hh @@ -34,6 +34,7 @@ # include <cmath> # include <mln/accu/internal/base.hh> +# include <mln/util/pix.hh> namespace mln diff --git a/milena/mln/io/plot/save.hh b/milena/mln/io/plot/save.hh index ecec666..a86e3f7 100644 --- a/milena/mln/io/plot/save.hh +++ b/milena/mln/io/plot/save.hh @@ -33,6 +33,8 @@ /// /// Define a routine which saves in a plot format. +# include <iostream> +# include <fstream> # include <mln/core/image/image1d.hh> # include <mln/metal/equal.hh> # include <mln/util/array.hh> diff --git a/milena/mln/level/abs.hh b/milena/mln/level/abs.hh index d2b48b4..8889d1a 100644 --- a/milena/mln/level/abs.hh +++ b/milena/mln/level/abs.hh @@ -72,7 +72,7 @@ namespace mln trace::entering("level::abs"); mln_precondition(exact(input).domain() == exact(output).domain()); - output = level::transform(input, fun::v2v::abs<mln_value(I)>()); + exact(output) = level::transform(input, fun::v2v::abs<mln_value(I)>()); trace::exiting("level::abs"); } diff --git a/milena/mln/make/rag_and_labeled_wsl.hh b/milena/mln/make/rag_and_labeled_wsl.hh index d80b954..7ace36f 100644 --- a/milena/mln/make/rag_and_labeled_wsl.hh +++ b/milena/mln/make/rag_and_labeled_wsl.hh @@ -63,6 +63,30 @@ namespace mln /// /// \return A couple. First element is the graph, second element is an /// image with a labeled watershed line. + /*! + ** + ** |-----------------| |-----------------| \n + ** | 1 1 1 0 2 2 0 3 | | . . . 1 . . 2 . | \n + ** | 1 1 0 2 2 2 0 3 | | . . 1 . . . 2 . | \n + ** | 1 0 4 0 2 0 3 3 | ----> | . 1 . 3 . 4 . . | \n + ** | 0 4 4 4 0 5 0 3 | | 1 . . . 5 . 6 . | \n + ** |-----------------| |-----------------| \n + ** \n + ** Watershed image Labeled watershed line \n + ** (watershed line labeled with 0) \n + ** \n + ** \n + ** | \n + ** | \n + ** | \n + ** v \n + ** \n + ** 1 -- 2 - 3 \n + ** \ / / \n + ** 4 -- 5 \n + ** \n + ** Region Adjacency graph (RAG) \n + */ template <typename I, typename N> util::couple<util::graph,mln_concrete(I)> rag_and_labeled_wsl(const Image<I>& wshd_, diff --git a/milena/mln/util/tree_to_image.hh b/milena/mln/util/tree_to_image.hh index f2364de..55f89e8 100644 --- a/milena/mln/util/tree_to_image.hh +++ b/milena/mln/util/tree_to_image.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory // (LRDE) // // This file is part of the Olena Library. This library is free @@ -56,7 +56,7 @@ namespace mln /// Convert a tree into an image. /// /// \param[in] tree The tree to convert. - /// \param[out] output_ The image containing tree informations. + /// \param[out] output_ The image containing tree information. /// template <typename T, typename I> void diff --git a/milena/tests/labeling/n_max.cc b/milena/tests/labeling/n_max.cc index 10b0ff9..6900f40 100644 --- a/milena/tests/labeling/n_max.cc +++ b/milena/tests/labeling/n_max.cc @@ -32,7 +32,7 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/value/int_u8.hh> -#include <mln/value/label_16.hh> +#include <mln/value/label_8.hh> #include <mln/labeling/flat_zones.hh> #include <mln/labeling/compute.hh> @@ -47,24 +47,23 @@ #include "tests/data.hh" - int main() { using namespace mln; using value::int_u8; - using value::label_16; + using value::label_8; - image2d<int_u8> lena = io::pgm::load<int_u8>(MLN_IMG_DIR "/lena.pgm"); + image2d<int_u8> lena = io::pgm::load<int_u8>(MLN_IMG_DIR "/tiny.pgm"); image2d<bool> threshold = level::transform(lena, fun::v2b::threshold<int_u8>(100)); - label_16 nlabels; - image2d<label_16> labels = labeling::flat_zones(threshold, c4(), nlabels); + label_8 nlabels; + image2d<label_8> labels = labeling::flat_zones(threshold, c4(), nlabels); accu::count<int_u8> a_; util::array<unsigned> a = labeling::compute(a_, threshold, labels, nlabels); - util::array<label_16> arr_big = labeling::n_max<label_16>(a, 3); + util::array<label_8> arr_big = labeling::n_max<label_8>(a, 3); - mln_assertion(arr_big[1] == 4); - mln_assertion(arr_big[2] == 6); - mln_assertion(arr_big[3] == 323); + mln_assertion(arr_big[1] == 1u); + mln_assertion(arr_big[2] == 4u); + mln_assertion(arr_big[3] == 5u); } diff --git a/milena/tests/make/rag_and_labeled_wsl.cc b/milena/tests/make/rag_and_labeled_wsl.cc index 5abb031..602bca6 100644 --- a/milena/tests/make/rag_and_labeled_wsl.cc +++ b/milena/tests/make/rag_and_labeled_wsl.cc @@ -55,11 +55,14 @@ int main() util::couple<util::graph, wst_t> res = make::rag_and_labeled_wsl(ima, c4(), 4u); + wst_t& lwsl = res.second(); + util::graph& g = res.first(); + // check that adjacency labels map edge labels. - mln_piter_(wst_t) p(res.second().domain()); + mln_piter_(wst_t) p(lwsl.domain()); mln_niter_(neighb2d) n(c4(),p); for_all(p) - if (res.second()(p) != mln_max(value::label_8)) + if (lwsl(p) != mln_max(value::label_8).prev()) { value::label_8 l1 = 0, l2 = 0; for_all(n) @@ -77,14 +80,14 @@ int main() } if (l2 < l1) std::swap(l1, l2); - mln_assertion(res.first().v1(res.second()(p)) == l1); - mln_assertion(res.first().v2(res.second()(p)) == l2); + mln_assertion(g.v1(lwsl(p)) == l1); + mln_assertion(g.v2(lwsl(p)) == l2); } - mln_assertion(res.first().e_nmax() == 4u); - mln_assertion(res.first().v_nmax() == 5u); - mln_assertion(res.first().v_nmax_nbh_edges(0) == 0); + mln_assertion(g.e_nmax() == 4u); + mln_assertion(g.v_nmax() == 5u); + mln_assertion(g.v_nmax_nbh_edges(0) == 0); for (unsigned i = 1; i < 4; ++i) - mln_assertion(res.first().v_nmax_nbh_edges(i) == 2); + mln_assertion(g.v_nmax_nbh_edges(i) == 2); } -- 1.5.6.5

1 0

3663: * configure.ac: Configure milena/tests/tiff.
by Guillaume Lazzara 14 Apr '09

14 Apr '09

--- ChangeLog | 4 ++++ configure.ac | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index d14ea6a..71ec83b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-04-14 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + * configure.ac: Configure milena/tests/tiff. + 2009-04-06 Roland Levillain <roland(a)lrde.epita.fr> * configure.ac: Configure milena/apps/statues/test-mesh-complex-skel. diff --git a/configure.ac b/configure.ac index 00a99c0..ad824f6 100644 --- a/configure.ac +++ b/configure.ac @@ -228,6 +228,7 @@ AC_CONFIG_FILES([ milena/tests/io/pgm/Makefile milena/tests/io/pnm/Makefile milena/tests/io/ppm/Makefile + milena/tests/io/tiff/Makefile milena/tests/labeling/Makefile milena/tests/level/Makefile milena/tests/level/approx/Makefile -- 1.5.6.5

1 0