Olena-patches November 2008

olena-patches@lrde.epita.fr

14 participants
266 discussions

2958: Start new version using value iteration.

by Ugo Jardonnet

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Start new version using value iteration. * jardonnet/n_cmpt/n_cmpt2.hh: New version. * jardonnet/n_cmpt/n_cmpt2.cc: New version. * jardonnet/n_cmpt/Makefile (n_cmpt2): Add rule. * jardonnet/n_cmpt/n_cmpt.hh: Minor fix. Makefile | 3 + n_cmpt.hh | 5 -- n_cmpt2.cc | 37 +++++++++++++++ n_cmpt2.hh | 148 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 188 insertions(+), 5 deletions(-) Index: jardonnet/n_cmpt/n_cmpt2.hh --- jardonnet/n_cmpt/n_cmpt2.hh (revision 0) +++ jardonnet/n_cmpt/n_cmpt2.hh (revision 0) @@ -0,0 +1,148 @@ +// 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_N_CMPT2_HH +# define MLN_N_CMPT2_HH + +# include <mln/level/fill.hh> +# include <mln/core/site_set/p_vaccess.hh> + +namespace mln +{ + + template <typename I, typename N, typename O> + void n_cmpt(const Image& ima, + const Neighborhood<N>& nbh_, + unsigned limit, + Image<O>& out); + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename I, typename N, typename O> + void n_cmpt(const Image& input_, + const Neighborhood<N>& nbh_, + unsigned limit, + Image<O>& output_) + { + const I& input = exact(input_); + const N& nbh = exact(nbh_); + O& output = exact(output_); + + mln_precondition(output.domain() == input.domain()); + + image2d<unsigned> v_ima = level::compute_volume(input); + + // Local type + typedef mln_psite(I) P; + typedef accu::volume A; + typedef p_vaccess<unsigned, p_array<point2d> > PV; + + // Auxiliary data. + mln_ch_value(O, bool) deja_vu; + mln_ch_value(O, P) parent; + PV arr; + fill(arr, input); + + mln_fwd_piter(PV) v(arr); + for_all(v) + { + std::cout << "lambda=" << v << "-------" << std::endl; + // init + mln_ch_value(O, A) data; + initialize(data, input); + mln::level::fill(deja_vu, false); + { + mln_fwd_piter(S) p(s); + for_all(p) + parent(p) = p; + } + + // process + mln_fwd_piter(S) p(s); // s required. + mln_niter(N) n(nbh, p); + for_all(p) + { + // Make set. + data(p).take_as_init(make::pix(input, p)); // FIXME: algebraic so p! + //data(p).take_as_init(1); + for_all(n) + { + if (input.domain().has(n) && deja_vu(n)) + { + //do_union(n, p); + P r = find_root(parent, n); + if (r != p) + { + //std::cout << data(p).to_result() << std::endl; + if (input(r) == input(p) || (data(p).to_result() <= lambda)) + // Either a flat zone or the component of r is still growing. + { + if(--n_cmpt < limit) + { + std::cout << "find less than " << limit << " cmpts" << std::endl; + std::cout << "Using last lambda" << std::endl; + v--; + last = true; + goto end; + } + data(p).take(data(r)); + parent(r) = p; + } + else + { + data(p).set_value(lambda); + } + } + } + } + } + + if (n_cmpt == limit || last) + goto step2; + end: + n_cmpt = input.domain().nsites(); + } + + // second pass + { + mln_bkd_piter(S) p(s); + for_all(p) + if (parent(p) == p) // p is root. + output(p) = input(p); + else + output(p) = output(parent(p)); + } + } + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln + +#endif /* MLN_N_CMPT2_HH */ + Index: jardonnet/n_cmpt/n_cmpt2.cc --- jardonnet/n_cmpt/n_cmpt2.cc (revision 0) +++ jardonnet/n_cmpt/n_cmpt2.cc (revision 0) @@ -0,0 +1,37 @@ + +#include <iostream> + +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> + + +#include "n_cmpt2.hh" + +using namespace mln; +using namespace mln::value; + +bool usage(int argc, char ** argv) +{ + if (argc != 2) + { + std::cout << argv[0] << " ima.pgm n_cmpt" << std::endl; + return false; + } + return true; +} + +int main(int argc, char ** argv) +{ + if (not usage(argc,argv)) + return 1; + + image2d<int_u8> ima; + io::pgm::load(ima, argv[1]); + + unsigned n_cmpt = atoi(argv[2]); + + n_cmpt(ima, c4(), n_cmpt, out); +} Index: jardonnet/n_cmpt/Makefile --- jardonnet/n_cmpt/Makefile (revision 2957) +++ jardonnet/n_cmpt/Makefile (working copy) @@ -1,5 +1,8 @@ n_cmpt: n_cmpt.hh n_cmpt.cc g++ -I../../.. -Wall -W -Wextra n_cmpt.cc -DNDEBUG -O1 -o n_cmpt +n_cmpt2: n_cmpt2.hh n_cmpt2.cc + g++ -I../../.. -Wall -W -Wextra n_cmpt2.cc -DNDEBUG -O1 -o n_cmpt2 + debug: n_cmpt.hh n_cmpt.cc g++ -I../../.. -Wall -W -Wextra n_cmpt.cc -g -g3 -DNDEBUG -O1 -o n_cmpt Index: jardonnet/n_cmpt/n_cmpt.hh --- jardonnet/n_cmpt/n_cmpt.hh (revision 2957) +++ jardonnet/n_cmpt/n_cmpt.hh (working copy) @@ -64,11 +64,8 @@ unsigned limit, Image<O>& output_) { - trace::entering("canvas::morpho::algebraic_union_find"); - std::cout << "limit = " << limit << std::endl; - const I& input = exact(input_); const N& nbh = exact(nbh_); O& output = exact(output_); @@ -184,8 +181,6 @@ else output(p) = output(parent(p)); } - - trace::exiting("canvas::morpho::algebraic_union_find"); } # endif // ! MLN_INCLUDE_ONLY

16 years

2957: Add missing Makefiles in AC_CONFIG_FILES.

by Guillaume Lazzara

* configure.ac: fix it. --- ChangeLog | 6 ++++++ configure.ac | 3 +++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc72c90..c8b0ed1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-11-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add missing Makefiles in AC_CONFIG_FILES. + + * configure.ac: fix it. + 2008-11-20 Guillaume Lazzara <z(a)lrde.epita.fr> Fix bootstrap. diff --git a/configure.ac b/configure.ac index b6ea1a6..88a24b9 100644 --- a/configure.ac +++ b/configure.ac @@ -208,11 +208,14 @@ AC_CONFIG_FILES([ milena/tests/linear/local/Makefile milena/tests/literal/Makefile milena/tests/logical/Makefile + milena/tests/make/Makefile milena/tests/math/Makefile milena/tests/metal/Makefile milena/tests/metal/make/Makefile milena/tests/metal/math/Makefile milena/tests/morpho/Makefile + milena/tests/morpho/elementary/Makefile + milena/tests/morpho/tree/Makefile milena/tests/neighb/Makefile milena/tests/norm/Makefile milena/tests/pw/Makefile -- 1.5.6.5

16 years

2956: Add a missing Makefile.am.

by Guillaume Lazzara

* milena/tests/morpho/elementary/Makefile.am: new. --- milena/ChangeLog | 6 ++++++ milena/tests/morpho/elementary/Makefile.am | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) create mode 100644 milena/tests/morpho/elementary/Makefile.am diff --git a/milena/ChangeLog b/milena/ChangeLog index 66cd940..57c336f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2008-11-27 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add a missing Makefile.am + + * milena/tests/morpho/elementary/Makefile.am: new. + 2008-11-26 Guillaume Lazzara <z(a)lrde.epita.fr> Temporarily disable the compilation of some examples. diff --git a/milena/tests/morpho/elementary/Makefile.am b/milena/tests/morpho/elementary/Makefile.am new file mode 100644 index 0000000..970996a --- /dev/null +++ b/milena/tests/morpho/elementary/Makefile.am @@ -0,0 +1,26 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + laplacian \ + dilation \ + gradient_internal \ + opening \ + closing \ + top_hat \ + gradient_external \ + gradient \ + erosion + +laplacian_SOURCES = laplacian.cc +dilation_SOURCES = dilation.cc +gradient_internal_SOURCES = gradient_internal.cc +opening_SOURCES = opening.cc +closing_SOURCES = closing.cc +top_hat_SOURCES = top_hat.cc +gradient_external_SOURCES = gradient_external.cc +gradient_SOURCES = gradient.cc +erosion_SOURCES = erosion.cc + +TESTS = $(check_PROGRAMS) -- 1.5.6.5

16 years

2955: Temporarily disable the compilation of some examples.

by Guillaume Lazzara

* Makefile.am: comment non compiling examples. --- milena/ChangeLog | 6 ++++++ milena/Makefile.am | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d007f85..66cd940 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2008-11-26 Guillaume Lazzara <z(a)lrde.epita.fr> + + Temporarily disable the compilation of some examples. + + * Makefile.am: comment non compiling examples. + 2008-11-26 Nicolas Ballas <ballas(a)lrde.epita.fr> Fix a bug in fill_with_image routine. diff --git a/milena/Makefile.am b/milena/Makefile.am index 609628b..61e797e 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -1,6 +1,12 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- -SUBDIRS = mesh doc tests tools apps +##FIXME +SUBDIRS = \ +## mesh \ + doc \ + tests +## tools \ +## apps .PHONY: doc doc: -- 1.5.6.5

16 years

2954: Fix a bug in fill_with_image routine.

by Nicolas Ballas

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> Fix a bug in fill_with_image routine. * mln/level/transform.spe.hh, * mln/level/fill_with_value.spe.hh: Minor updates. * mln/level/fill_with_image.spe.hh: Fix an instantiation error. * mln/morpho/tree/compute_attribute_image.hh: Update. level/fill_with_image.spe.hh | 8 +++++--- level/fill_with_value.spe.hh | 11 +---------- level/transform.spe.hh | 4 +--- morpho/tree/compute_attribute_image.hh | 3 +-- 4 files changed, 8 insertions(+), 18 deletions(-) Index: mln/level/transform.spe.hh --- mln/level/transform.spe.hh (revision 2953) +++ mln/level/transform.spe.hh (working copy) @@ -290,7 +290,7 @@ inline mln_ch_value(I, mln_result(F)) transform_dispatch(trait::image::vw_set::uni, - trait::image::quant::any, + trait::image::quant::low, const Image& input, const Function_v2v<F>& f) { return level::impl::transform_taken(input, f); @@ -308,7 +308,6 @@ } - /// FIXME check that is right template <typename I, typename F> inline mln_ch_value(I, mln_result(F)) @@ -319,7 +318,6 @@ return level::impl::transform_fast(input, f); } - /// FIXME check that is right template <typename I, typename F> inline mln_ch_value(I, mln_result(F)) Index: mln/level/fill_with_value.spe.hh --- mln/level/fill_with_value.spe.hh (revision 2953) +++ mln/level/fill_with_value.spe.hh (working copy) @@ -118,13 +118,10 @@ I& ima = exact(ima_); internal::fill_with_value_tests(ima, val); - mlc_and( mlc_or(mlc_is(mln_trait_image_pw_io(I), trait::image::pw_io::read_write), mlc_is(mln_trait_image_vw_io(I), - trait::image::vw_io::read_write)), - mlc_is(mln_trait_image_value_access(I), - trait::image::value_access::direct))::check(); + trait::image::vw_io::read_write))::check(); ima.val() = val; @@ -145,13 +142,7 @@ void fill_with_value_dispatch(trait::image::value_access::direct, Image& ima, const V& val) { - if (mlc_is(mln_trait_image_pw_io(I), - trait::image::pw_io::read_write)::value || - mlc_is(mln_trait_image_vw_io(I), - trait::image::vw_io::read_write)::value) impl::fill_with_value_one_block(ima, val); - else - impl::generic::fill_with_value(ima, val); } template <typename I, typename V> Index: mln/level/fill_with_image.spe.hh --- mln/level/fill_with_image.spe.hh (revision 2953) +++ mln/level/fill_with_image.spe.hh (working copy) @@ -83,8 +83,8 @@ level::internal::fill_with_image_tests(ima, data); - pixel<const I> src (data); - pixel<J> dst(ima); + pixel<const J> src (data); + pixel dst(ima); *(src.address_()) = data.buffer(); *(dst.address_()) = ima.buffer(); @@ -129,7 +129,7 @@ mln_box_runstart_piter(I) p(ima.domain()); for_all(p) { - pixel<J> dst(ima, p); + pixel dst(ima, p); memcpy_(dst, make::pixel(data, p), p.run_length()); } @@ -143,6 +143,8 @@ trace::entering("level::impl::fill_with_image_singleton"); const J& data = exact(data_); + level::internal::fill_with_image_tests(ima_, data); + level::fill_with_value(ima_, data.val()); trace::exiting("level::impl::fill_with_image_singleton"); Index: mln/morpho/tree/compute_attribute_image.hh --- mln/morpho/tree/compute_attribute_image.hh (revision 2953) +++ mln/morpho/tree/compute_attribute_image.hh (working copy) @@ -105,8 +105,7 @@ typedef typename T::function I; mln_ch_value(I, mln_result(A)) output; initialize(output, acc); - // level::fill(output, acc); - level::paste(acc, output); + level::fill(output, acc); trace::exiting("morpho::tree::compute_attribute_image"); return output;

16 years

2953: Add attribute image computation from a morpho tree.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add attribute image computation from a morpho tree. * mln/morpho/tree/compute_attribute_image.hh: New. * mln/morpho/tree/all.hh: Update. * mln/morpho/tree/data.hh (function): New typedef. (f): New method. * mln/canvas/labeling.hh: Fix indentation. Add dispatch. * tests/morpho/tree/compute_attribute_image.cc: New. * tests/morpho/tree/Makefile.am: Update. * doc/examples/tuto_bis.cc (main): Fix missing update. doc/examples/tuto_bis.cc | 2 mln/canvas/labeling.hh | 93 +++++++++++++++++--- mln/morpho/tree/all.hh | 1 mln/morpho/tree/compute_attribute_image.hh | 124 +++++++++++++++++++++++++++ mln/morpho/tree/data.hh | 9 + tests/morpho/tree/Makefile.am | 2 tests/morpho/tree/compute_attribute_image.cc | 81 +++++++++++++++++ 7 files changed, 299 insertions(+), 13 deletions(-) Index: tests/morpho/tree/compute_attribute_image.cc --- tests/morpho/tree/compute_attribute_image.cc (revision 0) +++ tests/morpho/tree/compute_attribute_image.cc (revision 0) @@ -0,0 +1,81 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/// \file tests/morpho/tree/compute_attribute_image.cc +/// +/// Tests on mln::morpho::tree::compute_attribute_image. + +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/site_set/p_array.hh> +#include <mln/level/sort_psites.hh> + +#include <mln/debug/println.hh> +#include <mln/core/var.hh> + +#include <mln/morpho/tree/data.hh> +#include <mln/morpho/tree/compute_attribute_image.hh> + +#include <mln/accu/count.hh> +#include <mln/accu/volume.hh> + + +int main() +{ + using namespace mln; + + { + unsigned vals[] = { 5, 6, 6, + 8, 9, 9, + 8, 9, 9 }; + + typedef image2d<unsigned> I; + I f = make::image2d(vals); + debug::println(f); + + typedef p_array<point2d> S; + S s = level::sort_psites_increasing(f); + + morpho::tree::data<I,S> t(f, s, c4()); + debug::println(t.parent_image()); + + typedef util::pix Px; + + { + accu::count<Px> a; + image2d<unsigned> area = morpho::tree::compute_attribute_image(a, t); + debug::println(area); + } + + { + accu::volume v; + image2d<unsigned> volume = morpho::tree::compute_attribute_image(v, t); + debug::println(volume); + } + } + +} Index: tests/morpho/tree/Makefile.am --- tests/morpho/tree/Makefile.am (revision 2952) +++ tests/morpho/tree/Makefile.am (working copy) @@ -3,10 +3,12 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ + compute_attribute_image \ compute_tree \ data \ max +compute_attribute_image_SOURCES = compute_attribute_image.cc compute_tree_SOURCES = compute_tree.cc data_SOURCES = data.cc max_SOURCES = max.cc Index: doc/examples/tuto_bis.cc --- doc/examples/tuto_bis.cc (revision 2952) +++ doc/examples/tuto_bis.cc (working copy) @@ -223,7 +223,7 @@ image2d<int> ima(3, 5); mln_VAR(cell, ima | is_cell); - level::fill(cell, fun::p2v::iota); + level::fill(cell, fun::p2v::iota()); debug::println(cell); // 1 2 3 // Index: mln/morpho/tree/compute_attribute_image.hh --- mln/morpho/tree/compute_attribute_image.hh (revision 0) +++ mln/morpho/tree/compute_attribute_image.hh (revision 0) @@ -0,0 +1,124 @@ +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_MORPHO_TREE_COMPUTE_ATTRIBUTE_IMAGE_HH +# define MLN_MORPHO_TREE_COMPUTE_ATTRIBUTE_IMAGE_HH + +/// \file mln/morpho/tree/compute_attribute_image.hh +/// +/// Compute a canonized tree from an image. +/// +/// \todo Specialize for low quant (and try fastest). + +# include <mln/core/concept/image.hh> +# include <mln/util/pix.hh> +# include <mln/level/fill.hh> +# include <mln/level/paste.hh> + + + +namespace mln +{ + + namespace morpho + { + + namespace tree + { + + /// Compute a tree with a parent relationship between sites. + /// + /// Warning: \p s translates the ordering related to the + /// "natural" childhood relationship. The parenthood is thus + /// inverted w.r.t. to \p s. + /// + /// It is very convenient since all processing upon the parent + /// tree are performed following \p s (in the default "forward" + /// way). + /// + /// FIXME: Put it more clearly... + /// + /// The parent result image verifies: \n + /// - p is root iff parent(p) == p \n + /// - p is a node iff either p is root or f(parent(p)) != f(p). + + template <typename A, typename T> + mln_ch_value(typename T::function, mln_result(A)) + compute_attribute_image(const Accumulator<A>& a, const T& t); + + + +# ifndef MLN_INCLUDE_ONLY + + + // Facade. + + template <typename A, typename T> + inline + mln_ch_value(typename T::function, mln_result(A)) + compute_attribute_image(const Accumulator<A>& a_, const T& t) + { + trace::entering("morpho::tree::compute_attribute_image"); + + const A& a = exact(a_); + + typedef typename T::function I; + mln_ch_value(I, A) acc; + initialize(acc, t.f()); + + { + mln_piter(I) p(t.f().domain()); + for_all(p) + acc(p).take_as_init(make::pix(t.f(), p)); + } + { + mln_piter(T) p(t.domain()); + for_all(p) + if (! t.is_root(p)) + acc(t.parent(p)).take(acc(p)); + } + + typedef typename T::function I; + mln_ch_value(I, mln_result(A)) output; + initialize(output, acc); + // level::fill(output, acc); + level::paste(acc, output); + + trace::exiting("morpho::tree::compute_attribute_image"); + return output; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::morpho::tree + + } // end of namespace mln::morpho + +} // end of namespace mln + + +#endif // ! MLN_MORPHO_TREE_COMPUTE_ATTRIBUTE_IMAGE_HH Index: mln/morpho/tree/all.hh --- mln/morpho/tree/all.hh (revision 2952) +++ mln/morpho/tree/all.hh (working copy) @@ -46,6 +46,7 @@ } +# include <mln/morpho/tree/compute_attribute_image.hh> # include <mln/morpho/tree/compute_parent.hh> # include <mln/morpho/tree/data.hh> # include <mln/morpho/tree/max.hh> Index: mln/morpho/tree/data.hh --- mln/morpho/tree/data.hh (revision 2952) +++ mln/morpho/tree/data.hh (working copy) @@ -54,6 +54,10 @@ public: + /// Associated type of the function f. + typedef I function; + + /// Ctor. template <typename N> data(const Image& f, const Site_Set<S>& s, const Neighborhood<N>& nbh); @@ -135,6 +139,11 @@ return nroots_; } + const I& f() const + { + return f_; + } + protected: const I& f_; Index: mln/canvas/labeling.hh --- mln/canvas/labeling.hh (revision 2952) +++ mln/canvas/labeling.hh (working copy) @@ -56,12 +56,42 @@ # ifndef MLN_INCLUDE_ONLY + // Tests. + + namespace internal + { + + template <typename I, typename N, typename F, typename L> + void + labeling_tests(const Image& input_, const Neighborhood<N>& nbh_, + const F& f, const L& nlabels) + { + const I& input = exact(input_); + const N& nbh = exact(nbh_); + + mln_precondition(input.has_data()); + // mln_precondition(nbh.is_valid()); + + (void) input; + (void) nbh; + } + + } // end of namespace mln::canvas::internal + + + + // Implementations. + + namespace impl + { + + namespace generic + { template <typename I> static inline mln_psite(I) - find_root(I& parent, - const mln_psite(I)& x) + find_root(I& parent, const mln_psite(I)& x) { if (parent(x) == x) return x; @@ -74,7 +104,7 @@ labeling(const Image& input_, const Neighborhood<N>& nbh_, F& f, L& nlabels) { - trace::entering("canvas::labeling"); + trace::entering("canvas::impl::generic::labeling"); // FIXME: Test?! @@ -95,7 +125,6 @@ bool status; // Initialization. - { initialize(deja_vu, input); mln::level::fill(deja_vu, false); @@ -110,18 +139,14 @@ } // First Pass. - { mln_fwd_piter(S) p(f.s); mln_niter(N) n(nbh, p); for_all(p) if (f.handles(p)) { - // Make-Set. - { parent(p) = p; f.init_attr(p); - } for_all(n) if (input.domain().has(n) && deja_vu(n)) @@ -143,7 +168,7 @@ } } - // Second Pass. pass_2(); + // Second Pass. { mln_bkd_piter(S) p(f.s); for_all(p) if (f.handles(p)) @@ -164,13 +189,18 @@ output(p) = output(parent(p)); } status = true; - } - trace::exiting("canvas::labeling"); + trace::exiting("canvas::impl::generic::labeling"); return output; } + } // end of namespace mln::canvas::impl::generic + + } // end of namespace mln::canvas::impl + + + @@ -324,9 +354,48 @@ */ -# endif // ! MLN_INCLUDE_ONLY + // Dispatch. + + namespace internal + { + + template <typename I, typename N, typename F, typename L> + inline + mln_ch_value(I, L) + labeling_dispatch(const Image& input, const Neighborhood<N>& nbh, + F& functor, L& nlabels) + { + return impl::generic::labeling(input, nbh, functor, nlabels); + } + + } // end of namespace mln::canvas::internal + + + + // Facade. + + template <typename I, typename N, typename F, typename L> + inline + mln_ch_value(I, L) + labeling(const Image& input, const Neighborhood<N>& nbh, + F& functor, L& nlabels) + { + trace::entering("canvas::labeling"); + + internal::labeling_tests(input, nbh, functor, nlabels); + + mln_ch_value(I, L) output; + output = internal::labeling_dispatch(input, nbh, functor, nlabels); + + trace::exiting("canvas::labeling"); + return output; + } + + +# endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::canvas } // end of namespace mln

16 years

r2952: Try an auto dual area filter using TUFA

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2008-11-26 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Try an auto dual area filter using TUFA. * garrigues/area_filter_auto_dual.cc: New, the test. --- area_filter_auto_dual.cc | 268 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 268 insertions(+) Index: trunk/milena/sandbox/garrigues/area_filter_auto_dual.cc =================================================================== --- trunk/milena/sandbox/garrigues/area_filter_auto_dual.cc (revision 0) +++ trunk/milena/sandbox/garrigues/area_filter_auto_dual.cc (revision 2952) @@ -0,0 +1,268 @@ +// 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. + +#ifndef MLN_AREA_FILTER_HH +# define MLN_AREA_FILTER_HH + +# include <mln/core/image/image2d.hh> +# include <mln/level/fill.hh> +# include <mln/literal/zero.hh> +# include <mln/convert/to_upper_window.hh> +# include <mln/accu/count.hh> +# include <mln/util/pix.hh> + +# include <mln/core/alias/neighb2d.hh> + +# include <mln/io/pbm/save.hh> +# include <mln/io/pbm/load.hh> + +namespace mln +{ + + + template <typename I> + static inline + mln_psite(I) + find_root(I& parent, + const mln_psite(I)& x) + { + if (parent(x) == x) + return x; + else + return parent(x) = find_root(parent, parent(x)); + } + + template <typename I, typename N, typename F, typename O> + void + algebraic_union_find(const Image& input_, + const Neighborhood<N>& nbh_, + F& f, + Image<O>& output_) + { + trace::entering("canvas::morpho::algebraic_union_find"); + + // FIXME: Tests? + + typedef typename F::S S; + typedef typename F::A A; + + const I& input = exact(input_); + const N& nbh = exact(nbh_); + O& output = exact(output_); + + mln_precondition(output.domain() == input.domain()); + + // Local type. + typedef mln_psite(I) P; + + // Auxiliary data. + mln_ch_value(O, bool) deja_vu; + mln_ch_value(O, P) parent; + mln_ch_value(O, A) data; + + // init + { + initialize(deja_vu, input); + mln::level::fill(deja_vu, false); + initialize(parent, input); + initialize(data, input); + f.init(); // init required. + } + + // first pass + { + mln_fwd_piter(I) p(input.domain()); + mln_niter(N) n(nbh, p); + for_all(p) + { + + if (input(p) == true) + // Body for foreground + { + // Make set. + parent(p) = p; + data(p).take_as_init(make::pix(input, p)); + + for_all(n) + if (input.domain().has(n) && input(n) && deja_vu(n)) + { + //do_union(n, p); + P r = find_root(parent, n); + if (r != p) + { + if (input(r) == input(p) || f.is_active(data(r))) // Equiv(r, p) + // Either a flat zone or the component of r is still growing. + { + // p is now the new root. + data(p).take(data(r)); + parent(r) = p; + } + else + // Stop the growing connected component. + f.inactivate(data(p)); + } + } + deja_vu(p) = true; + } + else + // Body for background + { + // Make set. + parent(p) = p; + data(p).take_as_init(make::pix(input, p)); + + for_all(n) + if (input.domain().has(n) && !input(n) && deja_vu(n)) + { + //do_union(n, p); + P r = find_root(parent, n); + if (r != p) + { + if (input(r) == input(p) || f.is_active(data(r))) // Equiv(r, p) + // Either a flat zone or the component of r is still growing. + { + data(p).take(data(r)); + parent(r) = p; + } + else + f.inactivate(data(p)); + } + } + deja_vu(p) = true; + + } + + + } + } + + // second pass + { + mln_bkd_piter(I) p(input.domain()); + for_all(p) + if (input(p)) // Foreground + if (parent(p) == p) + output(p) = !f.is_active(data(p)); + else + output(p) = output(parent(p)); + else // Background. + if (parent(p) == p) + output(p) = f.is_active(data(p)); + else + output(p) = output(parent(p)); + } + + trace::exiting("canvas::morpho::algebraic_union_find"); + } + + + struct area_filter_t + { + // requirements from mln::canvas::morpho::algebraic_union_find + + typedef image2d<bool> I; + typedef util::pix pix_t; + typedef accu::count<pix_t> A; + typedef mln_psite_(I) P; + typedef p_array S; + + mln_result_(A) lambda; + + inline + void init() + { + } + + inline + bool is_active(const A& attr) const + { + return attr.to_result() < lambda; + } + + inline + void inactivate(A& attr) + { + attr.set_value(lambda); + } + + // end of requirements + + inline + area_filter_t(const image2d<bool>& input, mln_result_(A) lambda) + : lambda(lambda) + { + } + + }; + + + + template <typename N> + inline + void area_filter(const image2d<bool>& input, + const Neighborhood<N>& nbh, unsigned lambda, + image2d<bool>& output) + { + typedef area_filter_t F; + F f(input, lambda); + algebraic_union_find(input, nbh, f, output); + } + +} // end of namespace mln + +int main(int argc, char** argv) +{ + using namespace mln; + image2d<bool> input; + + if (argc < 2) + { + std::cerr << "Usage: " << argv[0] << " in.pbm area out.pbm" << std::endl; + return 1; + } + + io::pbm::load(input, argv[1]); + + + image2d<bool> output1(input.domain()); + image2d<bool> output2(input.domain()); + image2d<bool> output3(input.domain()); + image2d<bool> output4(input.domain()); + + area_filter(input, c4(), atoi(argv[2]), output1); + area_filter(output1, c4(), atoi(argv[2]), output2); + area_filter(output2, c4(), atoi(argv[2]), output3); + area_filter(output3, c4(), atoi(argv[2]), output4); + + io::pbm::save(output1, "out1.pgm"); + io::pbm::save(output2, "out2.pgm"); + io::pbm::save(output3, "out3.pgm"); + io::pbm::save(output3, "out4.pgm"); +} + +#endif // ! MLN_AREA_FILTER_HH

16 years

r2951: Test skeletonization with pixel superiority index

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2008-11-25 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Test skeletonization with pixel superiority index. * garrigues/ocr/ocr_with_preprocess.cc: Apply the skeletonisation using infomation of the grayscale image. * garrigues/ocr/skeleton.hh: Use the pixel superiority index criteria to detect crests. --- ocr_with_preprocess.cc | 75 ++++++++++++++++++++++++------------------------- skeleton.hh | 10 +++++- 2 files changed, 45 insertions(+), 40 deletions(-) Index: trunk/milena/sandbox/garrigues/ocr/skeleton.hh =================================================================== --- trunk/milena/sandbox/garrigues/ocr/skeleton.hh (revision 2950) +++ trunk/milena/sandbox/garrigues/ocr/skeleton.hh (revision 2951) @@ -92,6 +92,7 @@ unsigned nb_eq = 0; unsigned nb_gt = 0; + unsigned nb_lt = 0; for_all(n) if (input.domain().has(n)) { @@ -99,10 +100,15 @@ nb_eq++; else if (dist_map(n) > dist_map(p)) nb_gt++; + else + nb_lt++; } - if ((nb_gt == 1 && nb_eq == 0) || - (nb_gt == 0)) + +// if ((nb_gt == 1 && nb_eq == 0) || +// (nb_gt == 0)) + + if ((nb_lt + nb_eq) > 5) // Pixel Superiority index is_crest(p) = true; } return is_crest; Index: trunk/milena/sandbox/garrigues/ocr/ocr_with_preprocess.cc =================================================================== --- trunk/milena/sandbox/garrigues/ocr/ocr_with_preprocess.cc (revision 2950) +++ trunk/milena/sandbox/garrigues/ocr/ocr_with_preprocess.cc (revision 2951) @@ -95,7 +95,6 @@ mln::border::thickness = 0; io::pbm::load(input, argv[1]); -// OCR_TEST(input); // Resize image2d<int_u8> enlarged = enlarge(logical::not_(input), 2); @@ -105,64 +104,64 @@ // Blur. image2d<int_u8> blur = linear::gaussian(enlarged, 2); - io::pgm::save(blur, std::string(argv[2]) + "_2_gaussian.pgm"); OCR_TEST(blur); - // Threshold - image2d<bool> binary; - { - initialize(binary, blur); - mln_piter_(image2d<int_u8>) p(blur.domain()); - for_all(p) - binary(p) = blur(p) > 100; - - io::pbm::save(binary, std::string(argv[2]) + "_3_threshold.pbm"); - OCR_TEST(binary); - } +// // Threshold +// image2d<bool> binary; +// { +// initialize(binary, blur); +// mln_piter_(image2d<int_u8>) p(blur.domain()); +// for_all(p) +// binary(p) = blur(p) > 100; + +// io::pbm::save(binary, std::string(argv[2]) + "_3_threshold.pbm"); +// OCR_TEST(binary); +// } + +// // Skeleton +// image2d<bool> skel = skeleton(binary, 4); +// io::pbm::save(skel, std::string(argv[2]) + "_4_skeleton.pbm"); +// OCR_TEST(skel); + +// // Dilation +// win::octagon2d oct(5); +// image2d<bool> dilate = morpho::dilation(skel, oct); +// border::resize(dilate, 0); +// io::pbm::save(dilate, std::string(argv[2]) + "_5_dilation.pbm"); +// OCR_TEST(dilate); + +// // Subsampling +// image2d<bool> subsampled = subsampling::subsampling(dilate, dpoint2d(1,1), 2); +// io::pbm::save(subsampled, std::string(argv[2]) + "_6_subsampling.pbm"); +// OCR_TEST(subsampled); - // Skeleton - image2d<bool> skel = skeleton(binary, 4); - io::pbm::save(skel, std::string(argv[2]) + "_4_skeleton.pbm"); - OCR_TEST(skel); +// io::pbm::save(subsampled, argv[2]); - // Dilation - win::octagon2d oct(5); - image2d<bool> dilate = morpho::dilation(skel, oct); - border::resize(dilate, 0); - io::pbm::save(dilate, std::string(argv[2]) + "_5_dilation.pbm"); - OCR_TEST(dilate); - // Subsampling - image2d<bool> subsampled = subsampling::subsampling(dilate, dpoint2d(1,1), 2); - io::pbm::save(subsampled, std::string(argv[2]) + "_6_subsampling.pbm"); - OCR_TEST(subsampled); - - io::pbm::save(subsampled, argv[2]); - - - image2d<bool> K = crest(big, blur, c4()); + image2d<bool> K = crest(big, blur, c8()); OCR_TEST(K); - io::pbm::save(K, std::string(argv[2]) + "_7_K.pbm"); + io::pbm::save(K, std::string(argv[2]) + "_6_K.pbm"); - image2d<bool> skel_on_gaussian = skeleton_with_constraint(big, 4, K, arith::revert(blur)); + image2d<bool> skel_on_gaussian = skeleton_with_constraint(big, 8, K, arith::revert(blur)); OCR_TEST(skel_on_gaussian); - io::pbm::save(skel_on_gaussian, std::string(argv[2]) + "_8_skeleton_on_blur.pbm"); + io::pbm::save(skel_on_gaussian, std::string(argv[2]) + "_7_skeleton_on_gaussian.pbm"); // Dilation + win::octagon2d oct(5); image2d<bool> dilate_on_gaussian = morpho::dilation(skel_on_gaussian, oct); border::resize(dilate_on_gaussian, 0); - io::pbm::save(dilate_on_gaussian, std::string(argv[2]) + "_9_dilation_on_gaussian.pbm"); + io::pbm::save(dilate_on_gaussian, std::string(argv[2]) + "_8_dilation_on_gaussian.pbm"); OCR_TEST(dilate_on_gaussian); // Subsampling image2d<bool> subsampled_on_gaussian = subsampling::subsampling(dilate_on_gaussian, dpoint2d(1,1), 2); - io::pbm::save(subsampled_on_gaussian, std::string(argv[2]) + "_91_subsampling_on_gaussian.pbm"); + io::pbm::save(subsampled_on_gaussian, std::string(argv[2]) + "_9_subsampling_on_gaussian.pbm"); OCR_TEST(subsampled_on_gaussian); { float score = 0; - char* s = tesseract("fra", subsampled, &score); + char* s = tesseract("fra", subsampled_on_gaussian, &score); std::cerr << "Tesseract result: (score " << score << ")" << std::endl; std::cout << s; delete[] s;

16 years, 1 month

2950: Update n_cmpt.

by Ugo Jardonnet

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> Update n_cmpt. * jardonnet/n_cmpt/Makefile: Add warning. * jardonnet/n_cmpt/check/test.pgm, * jardonnet/n_cmpt/check/test2.pgm, * jardonnet/n_cmpt/check/test3.pgm: New test images. * jardonnet/n_cmpt/n_cmpt.hh: Go back to last lambda if not enought components. Makefile | 4 ++-- n_cmpt.hh | 60 ++++++++++++++++++++++++++++++++++++++++++------------------ 2 files changed, 44 insertions(+), 20 deletions(-) Index: jardonnet/n_cmpt/Makefile --- jardonnet/n_cmpt/Makefile (revision 2949) +++ jardonnet/n_cmpt/Makefile (working copy) @@ -1,5 +1,5 @@ n_cmpt: n_cmpt.hh n_cmpt.cc - g++ -I../../.. n_cmpt.cc -DNDEBUG -O1 -o n_cmpt + g++ -I../../.. -Wall -W -Wextra n_cmpt.cc -DNDEBUG -O1 -o n_cmpt debug: n_cmpt.hh n_cmpt.cc - g++ -I../../.. n_cmpt.cc -g -g3 -DNDEBUG -O1 -o n_cmpt + g++ -I../../.. -Wall -W -Wextra n_cmpt.cc -g -g3 -DNDEBUG -O1 -o n_cmpt Index: jardonnet/n_cmpt/check/test.pgm Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: jardonnet/n_cmpt/check/test.pgm ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: jardonnet/n_cmpt/check/test2.pgm Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: jardonnet/n_cmpt/check/test2.pgm ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: jardonnet/n_cmpt/check/test3.pgm Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: jardonnet/n_cmpt/check/test3.pgm ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Index: jardonnet/n_cmpt/n_cmpt.hh --- jardonnet/n_cmpt/n_cmpt.hh (revision 2949) +++ jardonnet/n_cmpt/n_cmpt.hh (working copy) @@ -33,6 +33,8 @@ # include <mln/level/fill.hh> # include <mln/util/pix.hh> # include <mln/level/sort_psites.hh> +# include <mln/accu/count.hh> +# include <mln/accu/volume.hh> namespace mln { @@ -77,6 +79,7 @@ typedef mln_psite(I) P; typedef accu::volume A; + //typedef accu::count<unsigned> A; typedef mln_psite(I) P; typedef p_array S; @@ -87,8 +90,10 @@ mln_ch_value(O, P) parent; int n_cmpt = input.domain().nsites(); - int lambda = 10; - std::cout << "trying lambda = 10" << std::endl; + + std::cout << "Number of sites = " << n_cmpt << std::endl; + + unsigned lambda = 2; // init { @@ -96,61 +101,80 @@ initialize(parent, input); } - // first pass - { + bool last = false; + // first pass do { + std::cout << "lambda=" << lambda << "-------" << std::endl; + + // init mln_ch_value(O, A) data; initialize(data, input); - mln::level::fill(deja_vu, false); - { mln_fwd_piter(S) p(s); for_all(p) parent(p) = p; } + // process mln_fwd_piter(S) p(s); // s required. mln_niter(N) n(nbh, p); for_all(p) { // Make set. - { data(p).take_as_init(make::pix(input, p)); // FIXME: algebraic so p! - } - + //data(p).take_as_init(1); for_all(n) + { if (input.domain().has(n) && deja_vu(n)) { //do_union(n, p); P r = find_root(parent, n); if (r != p) { - if (input(r) == input(p) || (data(p).to_result() < lambda)) + //std::cout << data(p).to_result() << std::endl; + if (input(r) == input(p) || (data(p).to_result() <= lambda)) // Either a flat zone or the component of r is still growing. { - data(p).take(data(r)); - parent(r) = p; - if(--n_cmpt <= limit) + if(--n_cmpt < limit) { - std::cout << "limit reached at " << n_cmpt << std::endl; - goto step2; + std::cout << "find less than " << limit << " cmpts" << std::endl; + std::cout << "Using last lambda" << std::endl; + lambda /= 1.5; + last = true; + goto end; } + data(p).take(data(r)); + parent(r) = p; } else + { data(p).set_value(lambda); } + + } + } } deja_vu(p) = true; } + + if (n_cmpt == limit) + { + std::cout << "EXACT MATCH. n_cpmt = " << n_cmpt << std::endl; + goto step2; + } + + if (last) + goto step2; + + lambda *= 1.5; + end: n_cmpt = input.domain().nsites(); - lambda *= 1.1; - std::cout << "trying lambda = " << lambda << std::endl; }while (1); - } step2: + std::cout << "FINAL. n_cpmt = " << n_cmpt << std::endl; // second pass { mln_bkd_piter(S) p(s);

16 years, 1 month

2949: Fix line_graph (formerly dual_graph)

by Guillaume Lazzara

* mln/make/graph.hh: Fix use of label<n>. * mln/util/edge.hh: cleanup comment. * mln/util/dual_graph.hh: rename as... * mln/util/line_graph.hh: ... this. Fiw wrong initialization. * tests/util/Makefile.am: update. * tests/util/dual_graph.cc: rename as... * tests/util/line_graph.cc: ... this. Enable all the tests. * mln/core/concept/graph.hh, * mln/util/internal/graph_base.hh, * mln/util/graph.hh: rename graph_id to id. --- milena/ChangeLog | 20 +++ milena/mln/core/concept/graph.hh | 24 ++-- milena/mln/make/graph.hh | 2 +- milena/mln/util/edge.hh | 2 +- milena/mln/util/graph.hh | 23 +++- milena/mln/util/internal/graph_base.hh | 6 +- milena/mln/util/{dual_graph.hh => line_graph.hh} | 152 ++++++++++++++------ milena/tests/util/Makefile.am | 4 +- milena/tests/util/{dual_graph.cc => line_graph.cc} | 109 +++++++------- 9 files changed, 224 insertions(+), 118 deletions(-) rename milena/mln/util/{dual_graph.hh => line_graph.hh} (68%) rename milena/tests/util/{dual_graph.cc => line_graph.cc} (61%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 959337a..cf63c58 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,25 @@ 2008-11-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix line_graph (formerly dual_graph) + + * mln/make/graph.hh: Fix use of label<n>. + + * mln/util/edge.hh: cleanup comment. + + * mln/util/dual_graph.hh: rename as... + * mln/util/line_graph.hh: ... this. Fiw wrong initialization. + + * tests/util/Makefile.am: update. + + * tests/util/dual_graph.cc: rename as... + * tests/util/line_graph.cc: ... this. Enable all the tests. + + * mln/core/concept/graph.hh, + * mln/util/internal/graph_base.hh, + * mln/util/graph.hh: rename graph_id to id. + +2008-11-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix labeling::compute tests. * mln/labeling/compute.hh: Check if the image is a labeled image and diff --git a/milena/mln/core/concept/graph.hh b/milena/mln/core/concept/graph.hh index 8339531..80c2ae2 100644 --- a/milena/mln/core/concept/graph.hh +++ b/milena/mln/core/concept/graph.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory +// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -28,15 +28,15 @@ #ifndef MLN_CORE_CONCEPT_GRAPH_HH # define MLN_CORE_CONCEPT_GRAPH_HH -/*! \file mln/core/concept/graph.hh - * \brief Definition of the concept of mln::Graph. - */ +/// \file mln/core/concept/graph.hh +/// +/// Definition of the concept of mln::Graph. namespace mln { - // Fwd decl. + // Forward declaration. template <typename E> struct Graph; // Graph category flag type. @@ -46,11 +46,11 @@ namespace mln typedef Object<void> super; }; - /*! \brief Base class for implementation of graph classes. - * - * \see mln::doc::Graph for a complete documentation of this class - * contents. - */ + /// Base class for implementation of graph classes. + /// + /// \see mln::doc::Graph for a complete documentation of this class + /// contents. + /// template <typename E> struct Graph : public Object<E> { @@ -67,7 +67,7 @@ namespace mln typedef bkd_piter; // Misc. - const E& graph_id() const; + const E& id() const; template<typename G2> bool is_subgraph_of(const G2& gr) const; @@ -109,7 +109,7 @@ namespace mln //typedef mln_bkd_piter(E) bkd_piter; // Check methods - const void* (E::*m1)() const = & E::graph_id; + const void* (E::*m1)() const = & E::id; m1 = 0; unsigned (E::*m2)(unsigned id_e, unsigned id_v) const = & E::v_other; m2 = 0; diff --git a/milena/mln/make/graph.hh b/milena/mln/make/graph.hh index c3ae618..ac232e8 100644 --- a/milena/mln/make/graph.hh +++ b/milena/mln/make/graph.hh @@ -88,7 +88,7 @@ namespace mln const I& iz = exact(iz_); util::graph g; - g.add_vertices(nlabels + 1); + g.add_vertices(nlabels.next()); mln_piter(I) p(iz.domain()); for_all(p) diff --git a/milena/mln/util/edge.hh b/milena/mln/util/edge.hh index ba34a12..0390be4 100644 --- a/milena/mln/util/edge.hh +++ b/milena/mln/util/edge.hh @@ -41,7 +41,7 @@ namespace mln namespace util { - /*-------. + /*-------. | Edge. | `-------*/ diff --git a/milena/mln/util/graph.hh b/milena/mln/util/graph.hh index 7c003a2..a3f5df5 100644 --- a/milena/mln/util/graph.hh +++ b/milena/mln/util/graph.hh @@ -231,6 +231,9 @@ namespace mln }; + std::ostream& + operator<<(std::ostream& ostr, const graph& g); + } // end of namespace mln::util } // end of namespace mln @@ -480,7 +483,25 @@ namespace mln bool graph::is_subgraph_of(const G2& g) const { - return g.graph_id() == this->graph_id(); + return g.id() == this->id(); + } + + // FIXME: move to graph_Base. + inline + std::ostream& + operator<<(std::ostream& ostr, const graph& g) + { + mln_vertex_iter_(graph) v(g); + mln_vertex_nbh_edge_iter_(graph) e(v); + for_all(v) + { + ostr << "v(" << v << ") : "; + for_all(e) + ostr << e << " "; + ostr << std::endl; + } + + return ostr; } } // end of namespace mln::util diff --git a/milena/mln/util/internal/graph_base.hh b/milena/mln/util/internal/graph_base.hh index f659b54..ac6099e 100644 --- a/milena/mln/util/internal/graph_base.hh +++ b/milena/mln/util/internal/graph_base.hh @@ -82,7 +82,7 @@ namespace mln /// Misc. methods /// \{ /// Returns the graph id, the "this" pointer. - const void* graph_id() const; + const void* id() const; /// \} /// Vertex oriented methods @@ -158,7 +158,7 @@ namespace mln template<typename E> inline const void* - graph_base<E>::graph_id() const + graph_base<E>::id() const { return static_cast<const void*>(data_.ptr_); } @@ -248,7 +248,7 @@ namespace mln operator==(const util::internal::graph_base<E>& lhs, const util::internal::graph_base<E>& rhs) { - return lhs.graph_id() == rhs.graph_id(); + return lhs.id() == rhs.id(); } } // end of namespace mln diff --git a/milena/mln/util/dual_graph.hh b/milena/mln/util/line_graph.hh similarity index 68% rename from milena/mln/util/dual_graph.hh rename to milena/mln/util/line_graph.hh index 3533e7c..6ae1c5b 100644 --- a/milena/mln/util/dual_graph.hh +++ b/milena/mln/util/line_graph.hh @@ -26,10 +26,10 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_UTIL_DUAL_GRAPH_HH -# define MLN_UTIL_DUAL_GRAPH_HH +#ifndef MLN_UTIL_LINE_GRAPH_HH +# define MLN_UTIL_LINE_GRAPH_HH -/// \file mln/util/dual_graph.hh +/// \file mln/util/line_graph.hh /// Definitions of undirected graphs. # include <mln/util/internal/graph_base.hh> @@ -44,7 +44,7 @@ namespace mln { /// Fwd declaration. template <typename G> - class dual_graph; + class line_graph; } @@ -53,7 +53,7 @@ namespace mln /// Data structure for \c mln::image2d<T>. template <typename G> - struct data< util::dual_graph<G> > + struct data< util::line_graph<G> > { typedef std::vector<std::vector<unsigned> > vertices_t; @@ -76,12 +76,12 @@ namespace mln namespace util { - /// Undirected dual graph of a graph of type \tparam G. + /// Undirected line graph of a graph of type \tparam G. template <typename G> - class dual_graph : public internal::graph_base< dual_graph<G> > + class line_graph : public internal::graph_base< line_graph<G> > { /// The super class. - typedef internal::graph_base< dual_graph<G> > super; + typedef internal::graph_base< line_graph<G> > super; typedef typename super::vertex_t vertex_t; typedef typename super::edge_t edge_t; @@ -100,23 +100,52 @@ namespace mln /// \{ /// Vertex iterators /// \{ - typedef mln::internal::vertex_fwd_iterator< dual_graph<G> > + typedef mln::internal::vertex_fwd_iterator< line_graph<G> > vertex_fwd_iter; - typedef mln::internal::vertex_bkd_iterator< dual_graph<G> > + typedef mln::internal::vertex_bkd_iterator< line_graph<G> > vertex_bkd_iter; typedef vertex_fwd_iter vertex_iter; + /// \} - typedef mln::internal::edge_fwd_iterator< dual_graph<G> > + /// Edge iterators + /// \{ + typedef mln::internal::edge_fwd_iterator< line_graph<G> > edge_fwd_iter; - typedef mln::internal::edge_bkd_iterator< dual_graph<G> > + typedef mln::internal::edge_bkd_iterator< line_graph<G> > edge_bkd_iter; typedef edge_fwd_iter edge_iter; + /// \} + + /// Edge nbh edge iterators + /// \{ + typedef mln::internal::edge_nbh_edge_fwd_iterator< line_graph<G> > + edge_nbh_edge_fwd_iter; + typedef mln::internal::edge_nbh_edge_bkd_iterator< line_graph<G> > + edge_nbh_edge_bkd_iter; + typedef edge_nbh_edge_fwd_iter edge_nbh_edge_iter; + /// \} + + /// Vertex nbh vertex iterators + /// \{ + typedef mln::internal::vertex_nbh_vertex_fwd_iterator< line_graph<G> > + vertex_nbh_vertex_fwd_iter; + typedef mln::internal::vertex_nbh_vertex_bkd_iterator< line_graph<G> > + vertex_nbh_vertex_bkd_iter; + typedef vertex_nbh_vertex_fwd_iter vertex_nbh_vertex_iter; + /// \} + /// Vertex nbh edge iterators + /// \{ + typedef mln::internal::vertex_nbh_edge_fwd_iterator< line_graph<G> > + vertex_nbh_edge_fwd_iter; + typedef mln::internal::vertex_nbh_edge_bkd_iterator< line_graph<G> > + vertex_nbh_edge_bkd_iter; + typedef vertex_nbh_edge_fwd_iter vertex_nbh_edge_iter; /// \} /// \} - dual_graph(); - dual_graph(const G& g); + line_graph(); + line_graph(const G& g); /// Vertex oriented. /// \{ @@ -190,6 +219,10 @@ namespace mln using super::data_; }; + template <typename G> + std::ostream& + operator<<(std::ostream& ostr, const line_graph<G>& g); + } // end of namespace mln::util } // end of namespace mln @@ -204,15 +237,18 @@ namespace mln template <typename G> inline - data< util::dual_graph<G> >::data() + data< util::line_graph<G> >::data() { } template <typename G> inline - data< util::dual_graph<G> >::data(const G& g) + data< util::line_graph<G> >::data(const G& g) { g_ = g; + + // Initialize vertices and edges. + std::set<util::ord_pair<unsigned> > edges_set; vertices_.resize(g.e_nmax()); mln_edge_iter(G) e(g); mln_edge_nbh_edge_iter(G) ne(e); @@ -220,14 +256,20 @@ namespace mln for_all(e) for_all(ne) { - vertices_[e].push_back(edges_.size()); - edges_.push_back(util::ord_pair<unsigned>(e, ne)); + util::ord_pair<unsigned> edge(e, ne); + if (edges_set.find(edge) == edges_set.end()) + { + vertices_[e].push_back(edges_.size()); + vertices_[ne].push_back(edges_.size()); + edges_set.insert(edge); + edges_.push_back(edge); + } } } template <typename G> inline - data< util::dual_graph<G> >::~data() + data< util::line_graph<G> >::~data() { } @@ -238,16 +280,16 @@ namespace mln template <typename G> inline - dual_graph<G>::dual_graph() + line_graph<G>::line_graph() { - this->data_ = new mln::internal::data< util::dual_graph<G> >(); + this->data_ = new mln::internal::data< util::line_graph<G> >(); } template <typename G> inline - dual_graph<G>::dual_graph(const G& g) + line_graph<G>::line_graph(const G& g) { - this->data_ = new mln::internal::data< util::dual_graph<G> >(g); + this->data_ = new mln::internal::data< util::line_graph<G> >(g); } /*---------------. @@ -256,8 +298,8 @@ namespace mln template <typename G> inline - typename dual_graph<G>::vertex_t - dual_graph<G>::vertex(unsigned id_v) const + typename line_graph<G>::vertex_t + line_graph<G>::vertex(unsigned id_v) const { mln_assertion(has_v(id_v)); return vertex_t(*this, id_v); @@ -267,7 +309,7 @@ namespace mln template <typename G> inline size_t - dual_graph<G>::v_nmax() const + line_graph<G>::v_nmax() const { return data_->g_.e_nmax(); } @@ -275,7 +317,7 @@ namespace mln template <typename G> inline bool - dual_graph<G>::has_v(unsigned id_v) const + line_graph<G>::has_v(unsigned id_v) const { return data_->g_.has_e(id_v); } @@ -284,7 +326,7 @@ namespace mln template <typename G2> inline bool - dual_graph<G>::has_v(const util::vertex<G2>& v) const + line_graph<G>::has_v(const util::vertex<G2>& v) const { //FIXME: not sure... return v.graph().is_subgraph_of(*this) && has_v(v.id()); @@ -293,16 +335,16 @@ namespace mln template <typename G> inline size_t - dual_graph<G>::v_nmax_nbh_edges(unsigned id_v) const + line_graph<G>::v_nmax_nbh_edges(unsigned id_v) const { mln_precondition(has_v(id_v)); - return data_->g_.e_nmax_nbh_edges(id_v); + return data_->vertices_[id_v].size(); } template <typename G> inline unsigned - dual_graph<G>::v_ith_nbh_edge(unsigned id_v, unsigned i) const + line_graph<G>::v_ith_nbh_edge(unsigned id_v, unsigned i) const { mln_precondition(has_v(id_v)); if (i >= v_nmax_nbh_edges(id_v)) @@ -313,7 +355,7 @@ namespace mln template <typename G> inline size_t - dual_graph<G>::v_nmax_nbh_vertices(unsigned id_v) const + line_graph<G>::v_nmax_nbh_vertices(unsigned id_v) const { mln_precondition(has_v(id_v)); return v_nmax_nbh_edges(id_v); @@ -322,7 +364,7 @@ namespace mln template <typename G> inline unsigned - dual_graph<G>::v_ith_nbh_vertex(unsigned id_v, unsigned i) const + line_graph<G>::v_ith_nbh_vertex(unsigned id_v, unsigned i) const { mln_precondition(has_v(id_v)); @@ -337,8 +379,8 @@ namespace mln template <typename G> inline - typename dual_graph<G>::edge_t - dual_graph<G>::edge(unsigned e) const + typename line_graph<G>::edge_t + line_graph<G>::edge(unsigned e) const { mln_assertion(e < e_nmax()); return edge_t(*this, e); @@ -347,7 +389,7 @@ namespace mln template <typename G> inline size_t - dual_graph<G>::e_nmax() const + line_graph<G>::e_nmax() const { return data_->edges_.size(); } @@ -355,7 +397,7 @@ namespace mln template <typename G> inline bool - dual_graph<G>::has_e(unsigned id_e) const + line_graph<G>::has_e(unsigned id_e) const { return id_e < data_->edges_.size(); } @@ -364,7 +406,7 @@ namespace mln template <typename G2> inline bool - dual_graph<G>::has_e(const util::edge<G2>& e) const + line_graph<G>::has_e(const util::edge<G2>& e) const { return e.graph().is_subgraph_of(*this) && has_e(e.id()); } @@ -372,7 +414,7 @@ namespace mln template <typename G> inline unsigned - dual_graph<G>::v1(unsigned id_e) const + line_graph<G>::v1(unsigned id_e) const { mln_precondition(has_e(id_e)); return data_->edges_[id_e].first(); @@ -381,7 +423,7 @@ namespace mln template <typename G> inline unsigned - dual_graph<G>::v2(unsigned id_e) const + line_graph<G>::v2(unsigned id_e) const { mln_precondition(has_e(id_e)); return data_->edges_[id_e].second(); @@ -390,7 +432,7 @@ namespace mln template <typename G> inline size_t - dual_graph<G>::e_nmax_nbh_edges(unsigned id_e) const + line_graph<G>::e_nmax_nbh_edges(unsigned id_e) const { mln_precondition(has_e(id_e)); return v_nmax_nbh_edges(v1(id_e)) + v_nmax_nbh_edges(v2(id_e)); @@ -399,7 +441,7 @@ namespace mln template <typename G> inline unsigned - dual_graph<G>::e_ith_nbh_edge(unsigned id_e, unsigned i) const + line_graph<G>::e_ith_nbh_edge(unsigned id_e, unsigned i) const { mln_precondition(has_e(id_e)); if (i >= e_nmax_nbh_edges(id_e)) @@ -416,9 +458,29 @@ namespace mln template <typename G2> inline bool - dual_graph<G>::is_subgraph_of(const G2& g) const + line_graph<G>::is_subgraph_of(const G2& g) const + { + return g.id() == this->id(); + } + + // FIXME: move to graph_base + template <typename G> + inline + std::ostream& + operator<<(std::ostream& ostr, const line_graph<G>& g) { - return g.graph_id() == this->graph_id(); + typedef line_graph<G> LG; + mln_vertex_iter(LG) v(g); + mln_vertex_nbh_edge_iter(LG) e(v); + for_all(v) + { + ostr << "v(" << v << ") : "; + for_all(e) + ostr << e << " "; + ostr << std::endl; + } + + return ostr; } } // end of namespace mln::util @@ -428,4 +490,4 @@ namespace mln # endif // ! MLN_INCLUDE_ONLY -#endif // ! MLN_UTIL_DUAL_GRAPH_HH +#endif // ! MLN_UTIL_LINE_GRAPH_HH diff --git a/milena/tests/util/Makefile.am b/milena/tests/util/Makefile.am index fcfb902..07abfab 100644 --- a/milena/tests/util/Makefile.am +++ b/milena/tests/util/Makefile.am @@ -6,7 +6,7 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ branch_iter \ branch_iter_ind \ - dual_graph \ + line_graph \ eat \ graph \ lazy_set \ @@ -20,7 +20,7 @@ check_PROGRAMS = \ branch_iter_SOURCES = branch_iter.cc branch_iter_ind_SOURCES = branch_iter_ind.cc -dual_graph_SOURCES = dual_graph.cc +line_graph_SOURCES = line_graph.cc eat_SOURCES = eat.cc graph_SOURCES = graph.cc lazy_set_SOURCES = lazy_set.cc diff --git a/milena/tests/util/dual_graph.cc b/milena/tests/util/line_graph.cc similarity index 61% rename from milena/tests/util/dual_graph.cc rename to milena/tests/util/line_graph.cc index ff8c8ad..655007c 100644 --- a/milena/tests/util/dual_graph.cc +++ b/milena/tests/util/line_graph.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright(C) 2008 EPITA Research and Development Laboratory(LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,71 +25,71 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file tests/util/dual_graph.cc -/// test of mln::util::dual_graph +/// \file tests/util/line_graph.cc +/// test of mln::util::line_graph #include <mln/util/graph.hh> -#include <mln/util/dual_graph.hh> +#include <mln/util/line_graph.hh> #include <iostream> -int main () +int main() { using namespace mln; util::graph g; - g.add_vertex (); // 0 - g.add_vertex (); // 1 - g.add_vertex (); // 2 - g.add_vertex (); // 3 - g.add_vertex (); // 4 - g.add_vertex (); // 5 - g.add_edge (0, 1); - g.add_edge (1, 0); // Not inserted twice - g.add_edge (0, 2); - g.add_edge (3, 4); - g.add_edge (4, 5); - g.add_edge (5, 4); // Not inserted twice - g.add_edge (5, 3); - g.add_edge (2, 1); + g.add_vertex(); // 0 + g.add_vertex(); // 1 + g.add_vertex(); // 2 + g.add_vertex(); // 3 + g.add_vertex(); // 4 + g.add_vertex(); // 5 + g.add_edge(0, 1); + g.add_edge(1, 0); // Not inserted twice + g.add_edge(0, 2); + g.add_edge(3, 4); + g.add_edge(4, 5); + g.add_edge(5, 4); // Not inserted twice + g.add_edge(5, 3); + g.add_edge(2, 1); - typedef util::dual_graph<util::graph> DG; - DG dg(g); + typedef util::line_graph<util::graph> LG; + LG lg(g); - // Vertex iter and edge iter + // Vertex and edge forward iterators. { unsigned i = 0; - mln_vertex_fwd_iter_(DG) v(dg); + mln_vertex_fwd_iter_(LG) v(lg); for_all(v) - std::cout << v.index() << std::endl; -// mln_assertion(i++ == v.index()); - //mln_assertion(i != 0); + mln_assertion(i++ == v.index()); + mln_assertion(i != 0); i = 0; - mln_edge_fwd_iter_(util::graph) e(g); + mln_edge_fwd_iter_(LG) e(lg); for_all(e) - std::cout << e << std::endl; -// mln_assertion(i++ == e.index()); -// mln_assertion(i != 0);*/ + mln_assertion(i++ == e.index()); + mln_assertion(i != 0); } -/* { - unsigned i = g.v_nmax() - 1; - mln_vertex_bkd_iter_(util::graph) v(g); + + // Vertex and edge backward iterators. + { + unsigned i = lg.v_nmax() - 1; + mln_vertex_bkd_iter_(LG) v(lg); for_all(v) mln_assertion(i-- == v.index()); - mln_assertion(i != g.v_nmax() - 1); + mln_assertion(i != lg.v_nmax() - 1); - i = g.e_nmax() - 1; - mln_edge_bkd_iter_(util::graph) e(g); + i = lg.e_nmax() - 1; + mln_edge_bkd_iter_(LG) e(lg); for_all(e) mln_assertion(i-- == e.index()); - mln_assertion(i != g.e_nmax() - 1); + mln_assertion(i != lg.e_nmax() - 1); } - // vertex iter + Edge nbh iter + // Vertex and edge nbh forward iterators { - mln_vertex_fwd_iter_(util::graph) v(g); - mln_vertex_nbh_edge_fwd_iter_(util::graph) n(v); + mln_vertex_fwd_iter_(LG) v(lg); + mln_vertex_nbh_edge_fwd_iter_(LG) n(v); for_all(v) { unsigned i = 0; @@ -98,9 +98,11 @@ int main () mln_assertion(i != 0); } } + + // Vertex and edge nbh backward iterators. { - mln_vertex_bkd_iter_(util::graph) v(g); - mln_vertex_nbh_edge_bkd_iter_(util::graph) e(v); + mln_vertex_bkd_iter_(LG) v(lg); + mln_vertex_nbh_edge_bkd_iter_(LG) e(v); for_all(v) { unsigned i = v.nmax_nbh_edges(); @@ -109,10 +111,12 @@ int main () mln_assertion((v.nmax_nbh_edges() == 0 && i == 0) || i != v.nmax_nbh_edges()); } } - + std::cout << g << std::endl; + std::cout << "----" << std::endl; + std::cout << lg << std::endl; { - mln_edge_fwd_iter_(util::graph) e(g); - mln_edge_nbh_edge_fwd_iter_(util::graph) n(e); + mln_edge_fwd_iter_(LG) e(lg); + mln_edge_nbh_edge_fwd_iter_(LG) n(e); for_all(e) { unsigned i = 0; @@ -124,8 +128,8 @@ int main () } } { - mln_edge_bkd_iter_(util::graph) e(g); - mln_edge_nbh_edge_bkd_iter_(util::graph) n(e); + mln_edge_bkd_iter_(LG) e(lg); + mln_edge_nbh_edge_bkd_iter_(LG) n(e); for_all(e) { //std::cout << "== e.id() = " << e.id() << std::endl; @@ -138,10 +142,9 @@ int main () } } - { - mln_vertex_fwd_iter_(util::graph) v(g); - mln_vertex_nbh_vertex_fwd_iter_(util::graph) n(v); + mln_vertex_fwd_iter_(LG) v(lg); + mln_vertex_nbh_vertex_fwd_iter_(LG) n(v); for_all(v) { unsigned i = 0; @@ -151,8 +154,8 @@ int main () } } { - mln_vertex_bkd_iter_(util::graph) v(g); - mln_vertex_nbh_vertex_bkd_iter_(util::graph) n(v); + mln_vertex_bkd_iter_(LG) v(lg); + mln_vertex_nbh_vertex_bkd_iter_(LG) n(v); for_all(v) { unsigned i = v.nmax_nbh_vertices(); @@ -160,5 +163,5 @@ int main () --i; mln_assertion(i == 0); } - }*/ + } } -- 1.5.6.5

16 years, 1 month

← Newer
1
...
4
5
6
7
8
9
10
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches November 2008