October 2008 - Olena-patches

2684: Update morpho classif for LN.
by Guillaume Lazzara 24 Oct '08

24 Oct '08

* geraud/laurent/classif.cc: Update. --- milena/sandbox/ChangeLog | 6 +++++ milena/sandbox/geraud/laurent/classif.cc | 33 +++++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index bdf39b5..074d329 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,5 +1,11 @@ 2008-10-24 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + Update morpho classif for LN. + + * geraud/laurent/classif.cc: Update. + +2008-10-24 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> + Update morphological classification for LN. * geraud/laurent/classif.cc: Update. diff --git a/milena/sandbox/geraud/laurent/classif.cc b/milena/sandbox/geraud/laurent/classif.cc index af2a410..7958427 100644 --- a/milena/sandbox/geraud/laurent/classif.cc +++ b/milena/sandbox/geraud/laurent/classif.cc @@ -58,6 +58,8 @@ #include <mln/norm/l2.hh> #include <mln/morpho/closing_area.hh> +#include <mln/morpho/closing_volume.hh> +#include <mln/morpho/closing_height.hh> #include <mln/morpho/meyer_wst.hh> @@ -116,9 +118,17 @@ namespace mln } +void usage(char* argv[]) +{ + std::cerr << argv[0] << " lambda" << std::endl; + abort(); +} -int main() +int main(int argc, char* argv[]) { + if (argc != 2) + usage(argv); + using namespace mln; using mln::value::int_u8; @@ -156,7 +166,20 @@ int main() unsigned nlabels; image2d<unsigned> label = labeling::blobs(seeds, c4(), nlabels); + + std::cout << "n seeds = " << nlabels << std::endl; + { + image2d<int_u8> lab(label.domain()); + level::paste(label, lab); + io::pgm::save(lab, "label.pgm"); + } + image2d<unsigned> iz = influence_zones(label, c4()); + { + image2d<int_u8> IZ(iz.domain()); + level::paste(iz, IZ); + io::pgm::save(IZ, "iz.pgm"); + } // debug::println( (pw::value(iz) - pw::cst(1)) | iz.domain() ); @@ -217,6 +240,8 @@ int main() } } + std::cout << "v size = " << v.size() << std::endl; + // 1-faces (edges). std::vector<edge> e; { @@ -226,6 +251,8 @@ int main() e.push_back( c.add_face(-v[l-1] + v[ll-1]) ); } + std::cout << "e size = " << e.size() << std::endl; + } @@ -284,7 +311,7 @@ int main() v.next(); mln_invariant(!v.is_valid()); - dist_ima(e) = norm::l2_distance(p1.to_vec(), p2.to_vec()); + dist_ima(e) = norm::l2_distance(p1.to_vec(), p2.to_vec()) / 2; dist_max.take(dist_ima(e)); draw::line(canvas, p1, p2, dist_ima(e)); @@ -332,7 +359,7 @@ int main() // Currently, does nothing (lambda = 1). dist_ima_t closed_dist_ima (dist_ima.domain()); - morpho::closing_area(dist_ima, nbh, 1, closed_dist_ima); + morpho::closing_height(dist_ima, nbh, atoi(argv[1]), closed_dist_ima); /*------. | WST. | -- 1.5.6.5

1 0

cleanup-2008 2683: Update morphological classification for LN.
by Thierry Geraud 24 Oct '08

24 Oct '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Update morphological classification for LN. * geraud/laurent/classif.cc: Update. classif.cc | 325 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 301 insertions(+), 24 deletions(-) Index: geraud/laurent/classif.cc --- geraud/laurent/classif.cc (revision 2682) +++ geraud/laurent/classif.cc (working copy) @@ -1,3 +1,35 @@ +// 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/core/image/complex_image_swt.cc +/// \brief Testing Meyer's Watershed Transform on mln::complex_image. + +#include <iostream> + #include <vector> #include <mln/core/image/image2d.hh> #include <mln/core/routine/clone.hh> @@ -5,7 +37,28 @@ #include <mln/core/site_set/p_queue_fast.hh> #include <mln/labeling/blobs.hh> #include <mln/io/pbm/load.hh> +#include <mln/io/pgm/save.hh> #include <mln/debug/println.hh> +#include <mln/draw/line.hh> +#include <mln/pw/all.hh> + + +#include <mln/value/int_u8.hh> +#include <mln/core/alias/point2d.hh> + +#include <mln/core/site_set/p_faces.hh> +#include <mln/core/image/complex_image.hh> + +// FIXME: Include these elsewhere? (In complex_image.hh?) +#include <mln/core/image/complex_neighborhoods.hh> +#include <mln/core/image/complex_neighborhood_piter.hh> + +#include <mln/debug/iota.hh> +#include <mln/level/fill.hh> +#include <mln/norm/l2.hh> + +#include <mln/morpho/closing_area.hh> +#include <mln/morpho/meyer_wst.hh> namespace mln @@ -19,8 +72,8 @@ p_queue_fast<mln_site(I)> q; - // Init. { + // Initialization. mln_piter(I) p(input.domain()); mln_niter(N) n(nbh, p); for_all(p) @@ -32,9 +85,8 @@ break; } } - - // Body. { + // Body. mln_site(I) p; mln_niter(N) n(nbh, p); while (! q.is_empty()) @@ -59,57 +111,282 @@ void mk_graph(const I& iz, unsigned nlabels) { + } + +} + + + +int main() +{ + using namespace mln; + using mln::value::int_u8; + + /*----------------------------------------. + | Complex + complex geometry (location). | + `----------------------------------------*/ + + /* A (simplicial) 1-complex and its adjacency graph. + + c 0 1 2 3 + r .------------------------ + | v0 e3 v3 + 0 | o-----------o v0----e3----v3 + | / \ / / \ / + | / \ / / \ / + 1 | e0 / e1 / e4 e0 e1 e4 + | / \ / / \ / + | / \ / / \ / + 2 | o-----------o v1----e2----v2 + | v1 e2 v2 + + v = vertex + e = edge + */ + + + + + border::thickness = 0; + + image2d<bool> seeds; + io::pbm::load(seeds, "+seeds.pbm"); + +// debug::println(seeds); + + unsigned nlabels; + image2d<unsigned> label = labeling::blobs(seeds, c4(), nlabels); + image2d<unsigned> iz = influence_zones(label, c4()); +// debug::println( (pw::value(iz) - pw::cst(1)) | iz.domain() ); + + + // mk_graph + std::vector< std::vector<bool> > adj(nlabels + 1); for (unsigned l = 1; l <= nlabels; ++l) - adj[l].resize(l, false); + adj[l].resize(nlabels + 1, false); - mln_piter(I) p(iz.domain()); + { + box2d::piter p(iz.domain()); for_all(p) { - mln_site(I) r = p + right, b = p + down; + point2d r = p + right, b = p + down; if (iz.has(r) && iz(p) != iz(r)) { - if (iz(p) < iz(r)) + if (iz(p) <= iz(r)) adj[iz(p)][iz(r)] = true; else adj[iz(r)][iz(p)] = true; } if (iz.has(b) && iz(p) != iz(b)) { - if (iz(p) < iz(b)) + if (iz(p) <= iz(b)) adj[iz(p)][iz(b)] = true; else adj[iz(b)][iz(p)] = true; } } + } + + // end of mk_graph + + + const unsigned D = 1; + + topo::complex<D> c; + + typedef point2d P; + typedef geom::complex_geometry<D, P> G; + G geom; + + // Convenience typedefs. + typedef topo::n_face<0, D> vertex; + typedef topo::n_face<1, D> edge; + + { + + // 0-faces (vertices). + std::vector<vertex> v; + { + box2d::piter p(label.domain()); + for_all(p) + if (label(p) != 0) + { + geom.add_location(p); + v.push_back(c.add_face()); + } + } - for (unsigned l1 = 1; l1 <= nlabels; ++l1) - for (unsigned l2 = 1; l2 <= nlabels; ++l2) - if (adj[l1][l2]) - std::cout << l1 << ' ' << l2 << std::endl; + // 1-faces (edges). + std::vector<edge> e; + { + for (unsigned l = 1; l <= nlabels; ++l) + for (unsigned ll = l + 1; ll <= nlabels; ++ll) + if (adj[l][ll]) + e.push_back( c.add_face(-v[l-1] + v[ll-1]) ); } } +// { +// for (unsigned l = 1; l <= nlabels; ++l) +// for (unsigned ll = l + 1; ll <= nlabels; ++ll) +// if (adj[l][ll]) +// std::cout << l-1 << ' ' << ll-1 << std::endl; +// } -int main() + + +// std::cout << c << std::endl; + + + image2d<int_u8> canvas(seeds.domain()); + level::fill(canvas, 0); + + + /*---------------------. + | Complex-based pset. | + `---------------------*/ + + p_complex<D, G> pc(c, geom); + + /*----------------------. + | Complex-based image. | + `----------------------*/ + + // An image type built on a 1-complex with unsigned values on each + // face (both vertices and edges). + typedef complex_image<D, G, unsigned> dist_ima_t; + + // Create and initialize an image based on PC. + dist_ima_t dist_ima(pc); + level::fill(dist_ima, 0u); + + /*--------------------------------. + | Complex-based image iterators. | + `--------------------------------*/ + + accu::max<unsigned> dist_max; + + // For each edge (1-face), compute the distance between the two + // adjacent vertices (0-faces). + p_n_faces_fwd_piter<D, G> e(dist_ima.domain(), 1); + typedef complex_lower_neighborhood<D, G> v_nbh_t; + v_nbh_t v_nbh; + mln_niter_(v_nbh_t) v(v_nbh, e); + for_all(e) { - using namespace mln; + v.start(); + point2d p1 = v.to_site().front(); + v.next(); + point2d p2 = v.to_site().front(); + v.next(); + mln_invariant(!v.is_valid()); - border::thickness = 0; + dist_ima(e) = norm::l2_distance(p1.to_vec(), p2.to_vec()); + dist_max.take(dist_ima(e)); - image2d<bool> seeds; - io::pbm::load(seeds, "+seeds.pbm"); + draw::line(canvas, p1, p2, dist_ima(e)); + canvas(p1) = 255; + canvas(p2) = 255; + } - debug::println(seeds); + std::cout << "distance max = " << dist_max << std::endl; - unsigned n; - image2d<unsigned> label = labeling::blobs(seeds, c4(), n); - debug::println(label); - image2d<unsigned> iz = influence_zones(label, c4()); - debug::println(iz); + io::pgm::save(canvas, "canvas.pgm"); + + +// // Initialize 0-faces to a dummy value, to prevent the watershed from +// // finding minima on 0-faces. +// p_n_faces_fwd_piter<D, G> v_(dist_ima.domain(), 0); +// for_all(v_) +// { +// // FIXME: canvas(v_.to_site().front()) = 255; +// dist_ima(v_) = mln_max(mln_value_(dist_ima_t)); +// } + + + + +// // For all edges, iterate on adjacent edges (i.e., on edges sharing +// // an adjacent vertex). + typedef complex_lower_dim_connected_n_face_neighborhood<D, G> nbh_t; + nbh_t nbh; +// // Neighbor edge. +// mln_niter_(nbh_t) ne(nbh, e); +// for_all(e) +// { +// std::cout << "dist_ima(" << e << ") = " << dist_ima(e) +// << " -- adjacent edges :" << std::endl; +// for_all(ne) +// std::cout << " " << ne << std::endl; +// } + + + + /*-----------------. + | Simplification. | + `-----------------*/ + + // Currently, does nothing (lambda = 1). + dist_ima_t closed_dist_ima (dist_ima.domain()); + morpho::closing_area(dist_ima, nbh, 1, closed_dist_ima); + + /*------. + | WST. | + `------*/ + + // Perform a Watershed Transform. + typedef unsigned wst_val_t; + wst_val_t nbasins; + typedef complex_image<D, G, wst_val_t> wst_ima_t; + wst_ima_t wshed = morpho::meyer_wst(closed_dist_ima, nbh, nbasins); + /* Note that since the image is based not only on the 1-faces but + also on the 0-faces of the complex, and given the above + neighborhood, the domain seen by the WST is not connected! It is + actually composed of five components : + + - a component containing all the 1-faces (egdes) which are all + connected through + mln::complex_lower_dim_connected_n_face_neighborhood; + + - four (singleton) components corresponding to the 0-faces + (vertices), connected to no other part of the complex according to + mln::complex_lower_dim_connected_n_face_neighborhood. + + Since the component made of the edges contains two local minima, + the number of basins is equal to 6: + + 2 minima for the edges' component + + 4 * 1 minima for the vertices's components + -------------------------------------------- + 6 basins. + + Hence the result. + + + We definitely need a complex_image that can accept a subset of a + complex as domain (or at least a p_face<N, D, P>. */ + std::cout << "nbasins = " << nbasins - c.nfaces(0) << std::endl; + + + image2d<int_u8> canvas_wst(seeds.domain()); + level::fill(canvas_wst, 255); + + for_all(e) + { + v.start(); + point2d p1 = v.to_site().front(); + v.next(); + point2d p2 = v.to_site().front(); + v.next(); + mln_invariant(!v.is_valid()); + + draw::line(canvas_wst, p1, p2, wshed(e)); + } + + io::pgm::save(canvas_wst, "canvas_wst.pgm"); - mk_graph(iz, n); }

1 0

cleanup-2008 2681: Update transform routine interface.
by Nicolas Ballas 24 Oct '08

24 Oct '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Nicolas Ballas <ballas(a)lrde.epita.fr> Update transform routine interface. * tests/level/transform.cc: Update test. * mln/trait/ch_value.hh: Add a specialization for flat image. * mln/level/transform.hh: Update transform interface. mln/level/transform.hh | 19 +++++---- mln/trait/ch_value.hh | 16 ++++++-- tests/level/transform.cc | 93 +++++++++++++++++++++++++++++------------------ 3 files changed, 83 insertions(+), 45 deletions(-) Index: tests/level/transform.cc --- tests/level/transform.cc (revision 2681) +++ tests/level/transform.cc (working copy) @@ -32,15 +32,24 @@ #include <cmath> +#include <mln/core/image/image1d.hh> #include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/pw/image.hh> #include <mln/core/image/flat_image.hh> #include <mln/core/image/image_if.hh> +#include <mln/level/fill.hh> #include <mln/level/transform.hh> -#include <mln/debug/iota.hh> +#include <mln/level/paste.hh> + #include <mln/core/var.hh> #include <mln/fun/p2b/chess.hh> +#include <mln/fun/p2v/iota.hh> + +#include <mln/debug/iota.hh> +#include <mln/debug/println.hh> struct mysqrt : mln::Function_v2v<mysqrt> { @@ -56,56 +65,79 @@ int main() { using namespace mln; - const unsigned size = 1000; + const unsigned size = 50; + /// image 1d test + { + image1d<unsigned short> ima(size); + image1d<unsigned short> out(size); + + debug::iota(ima); + out = level::transform(ima, mysqrt()); + + box_fwd_piter_<point1d> p(out.domain()); + for_all(p) + mln_assertion((unsigned short)std::sqrt(ima(p)) == out(p)); + } + + + /// image 2d test { image2d<unsigned short> ima(size, size); image2d<unsigned short> out(size, size); - (std::cout << "iota... ").flush(); debug::iota(ima); - std::cout << "done" << std::endl; + out = level::transform(ima, mysqrt()); - (std::cout << "transform... ").flush(); - level::transform(ima, mysqrt(), out); - std::cout << "done" << std::endl; - - (std::cout << "checking... ").flush(); box_fwd_piter_<point2d> p(out.domain()); for_all(p) mln_assertion((unsigned short)std::sqrt(ima(p)) == out(p)); - std::cout << "done" << std::endl; } + /// Another image2d test { - flat_image<short, box2d> ima(5, make::box2d(size, size)); - image2d<unsigned short> out(size, size); + image2d<unsigned short> ima(size, size); - (std::cout << "fill... ").flush(); level::fill_with_value(ima, 51); - std::cout << "done" << std::endl; + level::transform(ima, mysqrt()); - (std::cout << "transform... ").flush(); - level::transform(ima, mysqrt(), out); - std::cout << "done" << std::endl; + } - (std::cout << "checking... ").flush(); - box2d::piter p(out.domain()); + /// image 3d test + { + image3d<unsigned short> ima(size, size, size); + image3d<unsigned short> out(size, size, size); + + debug::iota(ima); + out = level::transform(ima, mysqrt()); + + box_fwd_piter_<point3d> p(out.domain()); for_all(p) mln_assertion((unsigned short)std::sqrt(ima(p)) == out(p)); - std::cout << "done" << std::endl; } + /// pw image test { - image2d<unsigned short> ima(size, size); - (std::cout << "fill... ").flush(); + const pw::image<fun::p2v::iota_t, box2d> ima(fun::p2v::iota, + make::box2d(2,2, 5,5)); + image2d<short unsigned int> out(8, 8); + + level::fill(out, 0); + out = level::transform(ima, mysqrt()); + } + + // flat image test + { + flat_image<short, box2d> ima(5, make::box2d(size, size)); + image2d<unsigned short> out(size, size); + level::fill_with_value(ima, 51); - std::cout << "done" << std::endl; + out = level::transform(ima, mysqrt()); - (std::cout << "transform... ").flush(); - level::transform(ima, mysqrt()); - std::cout << "done" << std::endl; + box2d::piter p(out.domain()); + for_all(p) + mln_assertion((unsigned short)std::sqrt(ima(p)) == out(p)); } { @@ -117,19 +149,12 @@ II ima_if = ima | fun::p2b::chess; level::fill_with_value(ima, 0); - (std::cout << "iota... ").flush(); debug::iota(ima); - std::cout << "done" << std::endl;; - - (std::cout << "transform... ").flush(); - level::transform(ima_if, mysqrt(), out); - std::cout << "done" << std::endl; + out = level::transform(ima_if, mysqrt()); - (std::cout << "checking... ").flush(); II::piter p(ima_if.domain()); for_all(p) mln_assertion((unsigned short)std::sqrt(ima_if(p)) == out(p)); - std::cout << "done" << std::endl; } } Index: mln/trait/ch_value.hh --- mln/trait/ch_value.hh (revision 2681) +++ mln/trait/ch_value.hh (working copy) @@ -157,11 +157,21 @@ typename V > struct ch_value_< M< tag::function_<F>, tag::pset_<S> >, V > { - typedef typename S::mesh mesh; - // FIXME: from_psite instead? coord=int!? - typedef typename image_from_mesh< mesh, V >::ret ret; + // FIXME: what about S::site having no grid? + typedef mln_deduce(S, site, grid) grid; + typedef typename image_from_mesh< grid, V >::ret ret; }; + template < template <class, class> class M, typename T, typename S, + typename V > + struct ch_value_< M< tag::value_<T>, tag::pset_<S> >, V > + { + // FIXME: what about S::site having no grid? + typedef mln_deduce(S, site, grid) grid; + typedef typename image_from_mesh< grid, V >::ret ret; + }; + + template < template <class, class> class M, typename I, typename F, typename V > struct ch_value_< M< tag::image_, tag::function_<F> >, V > Index: mln/level/transform.hh --- mln/level/transform.hh (revision 2681) +++ mln/level/transform.hh (working copy) @@ -132,37 +132,40 @@ level::internal::transform_tests(input, f, output); - // FIXME: Re-activate! -// mlc_is(mln_trait_image_pw_io(O), -// trait::image::pw_io::read_write)::check(); + mlc_is(mln_trait_image_pw_io(O), + trait::image::pw_io::read_write)::check(); mln_piter(I) p(input.domain()); for_all(p) output(p) = f( input(p) ); + trace::exiting("level::impl::generic::transform"); } } // end of namespace mln::level::impl::generic - } // end of namespace mln::level::impl // Facade. + namespace internal + { template <typename I, typename F, typename O> inline - void transform(const Image& input, const Function_v2v<F>& f, + void transform_(const Image& input, const Function_v2v<F>& f, Image<O>& output) { trace::entering("level::transform"); mln_precondition(exact(output).domain() >= exact(input).domain()); - impl::internal::transform_dispatch(exact(input), exact(f), - exact(output)); + transform_dispatch(exact(input), exact(f), exact(output)); trace::exiting("level::transform"); } + } + + } // end of namespace mln::level::impl template <typename I, typename F> @@ -175,7 +178,7 @@ mln_precondition(exact(input).has_data()); mln_ch_value(I, mln_result(F)) output; initialize(output, input); - transform(input, f, output); + impl::internal::transform_(input, f, output); trace::exiting("level::transform"); return output;

1 0

2681: Test Meyer's WST on complex-based images.
by Roland Levillain 24 Oct '08

24 Oct '08

* tests/morpho/complex_image_wst.cc: New. * tests/morpho/Makefile.am (check_PROGRAMS): Add complex_image_wst. (complex_image_wst_SOURCES): New. --- milena/ChangeLog | 8 + milena/tests/morpho/Makefile.am | 2 + milena/tests/morpho/complex_image_wst.cc | 207 ++++++++++++++++++++++++++++++ 3 files changed, 217 insertions(+), 0 deletions(-) create mode 100644 milena/tests/morpho/complex_image_wst.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 2da6062..cd5b784 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2008-10-24 Roland Levillain <roland(a)lrde.epita.fr> + Test Meyer's WST on complex-based images. + + * tests/morpho/complex_image_wst.cc: New. + * tests/morpho/Makefile.am (check_PROGRAMS): Add complex_image_wst. + (complex_image_wst_SOURCES): New. + +2008-10-24 Roland Levillain <roland(a)lrde.epita.fr> + Fix a bug in iterators on n-faces. * mln/topo/n_face_iter.hh diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am index 747d55d..b2f060a 100644 --- a/milena/tests/morpho/Makefile.am +++ b/milena/tests/morpho/Makefile.am @@ -9,6 +9,7 @@ check_PROGRAMS = \ closing_volume \ combined \ complex_image_morpho \ + complex_image_wst \ contrast \ dilation \ dilation_max_h \ @@ -62,6 +63,7 @@ line_graph_image_morpho_SOURCES = line_graph_image_morpho.cc line_graph_image_wst_SOURCES = line_graph_image_wst.cc complex_image_morpho_SOURCES = complex_image_morpho.cc +complex_image_wst_SOURCES = complex_image_wst.cc meyer_wst_SOURCES = meyer_wst.cc diff --git a/milena/tests/morpho/complex_image_wst.cc b/milena/tests/morpho/complex_image_wst.cc new file mode 100644 index 0000000..88e5bc9 --- /dev/null +++ b/milena/tests/morpho/complex_image_wst.cc @@ -0,0 +1,207 @@ +// 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/core/image/complex_image_swt.cc +/// \brief Testing Meyer's Watershed Transform on mln::complex_image. + +#include <iostream> + +#include <mln/value/int_u8.hh> +#include <mln/core/alias/point2d.hh> + +#include <mln/core/site_set/p_faces.hh> +#include <mln/core/image/complex_image.hh> + +// FIXME: Include these elsewhere? (In complex_image.hh?) +#include <mln/core/image/complex_neighborhoods.hh> +#include <mln/core/image/complex_neighborhood_piter.hh> + +#include <mln/debug/iota.hh> +#include <mln/level/fill.hh> +#include <mln/norm/l2.hh> + +#include <mln/morpho/closing_area.hh> +#include <mln/morpho/meyer_wst.hh> + + +int main() +{ + using namespace mln; + using mln::value::int_u8; + + /*----------------------------------------. + | Complex + complex geometry (location). | + `----------------------------------------*/ + + /* A (simplicial) 1-complex and its adjacency graph. + + c 0 1 2 3 + r .------------------------ + | v0 e3 v3 + 0 | o-----------o v0----e3----v3 + | / \ / / \ / + | / \ / / \ / + 1 | e0 / e1 / e4 e0 e1 e4 + | / \ / / \ / + | / \ / / \ / + 2 | o-----------o v1----e2----v2 + | v1 e2 v2 + + v = vertex + e = edge + */ + + + const unsigned D = 1; + + topo::complex<D> c; + + typedef point2d P; + typedef geom::complex_geometry<D, P> G; + G geom; + + // Convenience typedefs. + typedef topo::n_face<0, D> vertex; + typedef topo::n_face<1, D> edge; + + // 0-faces (vertices). + vertex v0 = c.add_face(); geom.add_location(point2d(0,1)); + vertex v1 = c.add_face(); geom.add_location(point2d(2,0)); + vertex v2 = c.add_face(); geom.add_location(point2d(2,2)); + vertex v3 = c.add_face(); geom.add_location(point2d(0,3)); + + // 1-faces (edges). + edge e0 = c.add_face(-v1 + v0); + edge e1 = c.add_face(-v2 + v0); + edge e2 = c.add_face(-v2 + v1); + edge e3 = c.add_face(-v0 + v3); + edge e4 = c.add_face(-v3 + v2); + + /*---------------------. + | Complex-based pset. | + `---------------------*/ + + p_complex<D, G> pc(c, geom); + + /*----------------------. + | Complex-based image. | + `----------------------*/ + + // An image type built on a 1-complex with unsigned values on each + // face (both vertices and edges). + typedef complex_image<D, G, unsigned> dist_ima_t; + + // Create and initialize an image based on PC. + dist_ima_t dist_ima(pc); + level::fill(dist_ima, 0u); + + /*--------------------------------. + | Complex-based image iterators. | + `--------------------------------*/ + + // For each edge (1-face), compute the distance between the two + // adjacent vertices (0-faces). + p_n_faces_fwd_piter<D, G> e(dist_ima.domain(), 1); + typedef complex_lower_neighborhood<D, G> v_nbh_t; + v_nbh_t v_nbh; + mln_niter_(v_nbh_t) v(v_nbh, e); + for_all(e) + { + v.start(); + point2d p1 = v.to_site().front(); + v.next(); + point2d p2 = v.to_site().front(); + v.next(); + mln_invariant(!v.is_valid()); + + dist_ima(e) = 10 * norm::l2_distance(p1.to_vec(), p2.to_vec()); + } + // Initialize 0-faces to a dummy value, to prevent the watershed from + // finding minima on 0-faces. + p_n_faces_fwd_piter<D, G> v_(dist_ima.domain(), 0); + for_all(v_) + dist_ima(v_) = mln_max(mln_value_(dist_ima_t)); + + // For all edges, iterate on adjacent edges (i.e., on edges sharing + // an adjacent vertex). + typedef complex_lower_dim_connected_n_face_neighborhood<D, G> nbh_t; + nbh_t nbh; + // Neighbor edge. + mln_niter_(nbh_t) ne(nbh, e); + for_all(e) + { + std::cout << "dist_ima(" << e << ") = " << dist_ima(e) + << " -- adjacent edges :" << std::endl; + for_all(ne) + std::cout << " " << ne << std::endl; + } + + /*-----------------. + | Simplification. | + `-----------------*/ + + // Currently, does nothing (lambda = 1). + dist_ima_t closed_dist_ima (dist_ima.domain()); + morpho::closing_area(dist_ima, nbh, 1, closed_dist_ima); + + /*------. + | WST. | + `------*/ + + // Perform a Watershed Transform. + typedef unsigned wst_val_t; + wst_val_t nbasins; + typedef complex_image<D, G, wst_val_t> wst_ima_t; + wst_ima_t wshed = morpho::meyer_wst(closed_dist_ima, nbh, nbasins); + /* Note that since the image is based not only on the 1-faces but + also on the 0-faces of the complex, and given the above + neighborhood, the domain seen by the WST is not connected! It is + actually composed of five components : + + - a component containing all the 1-faces (egdes) which are all + connected through + mln::complex_lower_dim_connected_n_face_neighborhood; + + - four (singleton) components corresponding to the 0-faces + (vertices), connected to no other part of the complex according to + mln::complex_lower_dim_connected_n_face_neighborhood. + + Since the component made of the edges contains two local minima, + the number of basins is equal to 6: + + 2 minima for the edges' component + + 4 * 1 minima for the vertices's components + -------------------------------------------- + 6 basins. + + Hence the result. + + + We definitely need a complex_image that can accept a subset of a + complex as domain (or at least a p_face<N, D, P>. */ + std::cout << "nbasins = " << nbasins << std::endl; +} -- 1.5.6.5

1 0

2680: Fix a bug in iterators on n-faces.
by Roland Levillain 24 Oct '08

24 Oct '08

* mln/topo/n_face_iter.hh (mln::n_face_fwd_iter<D>::invalidate_face_id_) (mln::n_face_bkd_iter<D>::invalidate_face_id_): New methods. (mln::n_face_fwd_iter<D>::next_) (mln::n_face_bkd_iter<D>::next_): Use it here, instead of invalidate(). (mln::n_face_fwd_iter<D>::start_): Don't set n_. --- milena/ChangeLog | 13 +++++++++++++ milena/mln/topo/n_face_iter.hh | 35 ++++++++++++++++++++++++++++++++--- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2cb56bd..2da6062 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,18 @@ 2008-10-24 Roland Levillain <roland(a)lrde.epita.fr> + Fix a bug in iterators on n-faces. + + * mln/topo/n_face_iter.hh + (mln::n_face_fwd_iter<D>::invalidate_face_id_) + (mln::n_face_bkd_iter<D>::invalidate_face_id_): + New methods. + (mln::n_face_fwd_iter<D>::next_) + (mln::n_face_bkd_iter<D>::next_): + Use it here, instead of invalidate(). + (mln::n_face_fwd_iter<D>::start_): Don't set n_. + +2008-10-24 Roland Levillain <roland(a)lrde.epita.fr> + Add operator== on mln::util::multi_site to please mln::p_queue_fast. * mln/util/multi_site.hh diff --git a/milena/mln/topo/n_face_iter.hh b/milena/mln/topo/n_face_iter.hh index 4b658bb..f12c511 100644 --- a/milena/mln/topo/n_face_iter.hh +++ b/milena/mln/topo/n_face_iter.hh @@ -97,6 +97,10 @@ namespace mln /// \} private: + /// Partially invalidate the iterator (don't alter its dimension). + void invalidate_face_id_(); + + private: using super_::f_; }; @@ -147,6 +151,10 @@ namespace mln /// \} private: + /// Partially invalidate the iterator (don't alter its dimension). + void invalidate_face_id_(); + + private: using super_::f_; }; @@ -194,12 +202,23 @@ namespace mln if (f_.face_id() + 1 < f_.cplx().nfaces(n())) f_.inc_face_id(); else - invalidate(); + /* Don't invalidate the whole face if we have reached the + last face of the dimension---this would lose the + dimension. Instead, invalidate the face_id only. */ + invalidate_face_id_(); } } template <unsigned D> inline + void + n_face_fwd_iter<D>::invalidate_face_id_() + { + f_.set_face_id(f_.cplx().nfaces(n())); + } + + template <unsigned D> + inline unsigned n_face_fwd_iter<D>::n() const { @@ -243,7 +262,6 @@ namespace mln void n_face_bkd_iter<D>::start() { - f_.set_n(n()); f_.set_face_id(f_.cplx().nfaces(n()) - 1); } @@ -257,12 +275,23 @@ namespace mln if (f_.face_id() > 0) f_.dec_face_id(); else - invalidate(); + /* Don't invalidate the whole face if we have reached the + last face of the dimension---this would lose the + dimension. Instead, invalidate the face_id only. */ + invalidate_face_id_(); } } template <unsigned D> inline + void + n_face_bkd_iter<D>::invalidate_face_id_() + { + f_.set_face_id(f_.cplx().nfaces(n())); + } + + template <unsigned D> + inline unsigned n_face_bkd_iter<D>::n() const { -- 1.5.6.5

1 0

2679: Add operator== on mln::util::multi_site to please mln::p_queue_fast.
by Roland Levillain 24 Oct '08

24 Oct '08

* mln/util/multi_site.hh (operator==(const multi_site&, const multi_site&)): New. --- milena/ChangeLog | 7 +++++++ milena/mln/util/multi_site.hh | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 94a09bc..2cb56bd 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2008-10-24 Roland Levillain <roland(a)lrde.epita.fr> + Add operator== on mln::util::multi_site to please mln::p_queue_fast. + + * mln/util/multi_site.hh + (operator==(const multi_site&, const multi_site&)): New. + +2008-10-24 Roland Levillain <roland(a)lrde.epita.fr> + Update mln/trait/ch_value.hh w.r.t. mln::complex_image. * mln/trait/ch_value.hh diff --git a/milena/mln/util/multi_site.hh b/milena/mln/util/multi_site.hh index 6eb046d..2480369 100644 --- a/milena/mln/util/multi_site.hh +++ b/milena/mln/util/multi_site.hh @@ -75,6 +75,13 @@ namespace mln }; + /* FIXME: Required by an assertion in mln::p_queue_fast::has(); + shouldn't there be no requirements on sites? */ + template <typename P> + bool + operator==(const multi_site& lhs, const multi_site& rhs); + + # ifndef MLN_INCLUDE_ONLY @@ -129,6 +136,14 @@ namespace mln return sites[0]; } + + template <typename P> + bool + operator==(const multi_site& lhs, const multi_site& rhs) + { + return lhs.sites == rhs.sites; + } + # endif // ! MLN_INCLUDE_ONLY } // end of mln::util -- 1.5.6.5

1 0

2678: Update mln/trait/ch_value.hh w.r.t. mln::complex_image.
by Roland Levillain 24 Oct '08

24 Oct '08

* mln/trait/ch_value.hh (mln::trait::impl::ch_value_<M< D,tag::psite_,tag::value_<T> >, V>): Catch up with current parameter names, and turn into... (mln::trait::impl::ch_value_<M< D,tag::psite_<G>,tag::value_<T> >, V>): ...this. --- milena/ChangeLog | 10 ++++++++++ milena/mln/trait/ch_value.hh | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c8d3e1d..94a09bc 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,13 @@ +2008-10-24 Roland Levillain <roland(a)lrde.epita.fr> + + Update mln/trait/ch_value.hh w.r.t. mln::complex_image. + + * mln/trait/ch_value.hh + (mln::trait::impl::ch_value_<M< D,tag::psite_,tag::value_<T> >, V>): + Catch up with current parameter names, and turn into... + (mln::trait::impl::ch_value_<M< D,tag::psite_<G>,tag::value_<T> >, V>): + ...this. + 2008-10-24 Guillaume Lazzara <z(a)lrde.epita.fr> Update tutorial. diff --git a/milena/mln/trait/ch_value.hh b/milena/mln/trait/ch_value.hh index 8f7f384..f1f33bc 100644 --- a/milena/mln/trait/ch_value.hh +++ b/milena/mln/trait/ch_value.hh @@ -130,12 +130,12 @@ namespace mln typedef mln_ch_value(I, V) ret; }; - // For mln::complex_image<D, P, T>. + // For mln::complex_image<D, G, T>. template < template <unsigned, class, class> class M, - unsigned D, typename P, typename T, typename V > - struct ch_value_< M< D, tag::psite_, tag::value_<T> >, V > + unsigned D, typename G, typename T, typename V > + struct ch_value_< M< D, tag::psite_<G>, tag::value_<T> >, V > { - typedef M< D, P, V > ret; + typedef M< D, G, V > ret; }; // For mln::neighb::image<I, N>. -- 1.5.6.5

1 0

r2677: Add some debug infos and an uber-simple getopt
by Maxime van Noppen 24 Oct '08

24 Oct '08

From: Maxime van Noppen <yabo(a)lrde.epita.fr> To: olena-patches(a)lrde.epita.fr Subject: r2677: Add some debug infos and an uber-simple getopt URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox ChangeLog: 2008-10-24 Maxime van Noppen <yabo(a)lrde.epita.fr> Add some debug infos and an uber-simple getopt. * iccvg04.cc: Here. --- iccvg04.cc | 46 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 9 deletions(-) Index: branches/cleanup-2008/milena/sandbox/classif/iccvg04.cc =================================================================== --- branches/cleanup-2008/milena/sandbox/classif/iccvg04.cc (revision 2676) +++ branches/cleanup-2008/milena/sandbox/classif/iccvg04.cc (revision 2677) @@ -30,6 +30,7 @@ #include <sys/stat.h> #include <sstream> #include <string.h> +#include <stdlib.h> using namespace mln; @@ -119,15 +120,20 @@ for_all(p) { point3d p3(ima(p).red() / f, ima(p).green() / f, ima(p).blue() / f); + int w = ws(p3); - count[ws(p3)] += histo(p3); - sum[ws(p3)] += histo(p3) * convert::to<algebra::vec<3, value::int_u8> >(p3) * f; - + // Check if we are not on a border of the WS + if (w != 0) + { + count[w] += histo(p3); + sum[w] += histo(p3) * convert::to< algebra::vec<3, value::int_u8> >(p3); + } std::cerr << "p3 : " << p3 << " == " << convert::to<algebra::vec<3, value::int_u8> >(p3) << std::endl; } for (int i = 1; i < nbasins + 1; ++i) { + sum[i] *= f; sum[i] /= count[i]; //std::cout << "count[" << i << "] = " << count[i] << std::endl; std::cout << "sum[" << i << "] = " << sum[i] << std::endl; @@ -136,27 +142,50 @@ mln_piter(I) pi(ima.domain()); I out(ima.domain()); + I ws_out(ima.domain()); + for_all(pi) { value::rgb8 coul = ima(pi); int w = ws(point3d(coul.red() / f, coul.green() / f, coul.blue() / f)); + if (w != 0) // If w == 0 it means that the current point is part of a border of the watershed + { + std::cerr << "out(" << pi << ") = sum[" << w << "]; //" << sum[w] << std::endl; out(pi) = convert::to<value::rgb8>(sum[w]); + //out(pi) = value::rgb8(sum[w][0], sum[w][1], sum[w][2]); + ws_out(pi) = value::rgb8(0, 0, 0); + } + else + { + std::cerr << "Border : " << pi << std::endl; + ws_out(pi) = value::rgb8(255, 255, 255); - std::cerr << "(" << coul << ") -> (" << out(pi) << "); sum[" << w << "] = " << sum[w] << " -> " << convert::to<value::rgb8>(sum[w]) << std::endl; + // FIXME + // ima(pi) is a border in the histogram and therefore lacks of a mean color. + // Choosing a good value for out(pi) is not so easy. One idea could be to randomly + // choose a color from one of the surrounding classes, but it's not the best idea + // because of large Â« border Â» zones. + out(pi) = value::rgb8(255, 255, 255); + } + + //std::cerr << "(" << coul << ") -> (" << out(pi) << "); sum[" << w << "] = " << sum[w] << " -> " << convert::to<value::rgb8>(sum[w]) << std::endl; } // 1- La valeur contenue dans sum n'est pas correctement Ã©crite dans out.ppm. Ã vÃ©rifier ! // 2- Le cast de sum[w] en rgb8 se passe trÃ¨s bizarrement. Ã vÃ©rifier ! // 3- Rajoute le std::cout de count change le comportement du programme. Ã vÃ©rifier ! + // 4- Le WS semble faire des pÃ¢tÃ©s (beaucoup de points de classe 0) io::ppm::save(out, "out.ppm"); + io::ppm::save(ws_out, "out-ws.ppm"); } int main(int argc, char **argv) { - const int div_factor = 8; + const int div_factor = atoi(argv[2]); + const int lambda = atoi(argv[3]); image2d<value::rgb8> ima; ima = io::ppm::load<value::rgb8>(argv[1]); @@ -169,6 +198,7 @@ std::cout << "histo : " << m << ' ' << M << std::endl; } +// Normalize histogram frequences #if 0 image3d<value::int_u8> nhisto(histo.domain()); level::stretch(histo, nhisto); @@ -190,18 +220,16 @@ std::cout << "rhisto : " << m << ' ' << M << std::endl; } //display(rhisto, "rhisto"); - //compute closing_area of histo + //compute closing_area of histo image3d<unsigned> histo_closure(histo.domain()); - morpho::closing_area(rhisto, c6(), 20, histo_closure); + morpho::closing_area(rhisto, c6(), lambda, histo_closure); { unsigned m, M; estim::min_max(histo_closure, m, M); std::cout << "histo_closure : " << m << ' ' << M << std::endl; } - - //display_proj_revert(histo_closure, "chisto.ppm"); //watershed over histo_closure

1 0

2676: Update tutorial.
by Guillaume Lazzara 24 Oct '08

24 Oct '08

* doc/tutorial/samples/borderthickness-output.tex, * doc/tutorial/samples/borderthickness.tex, * doc/tutorial/samples/ima2d-4.tex, * doc/tutorial/samples/point-1-output.tex, * doc/tutorial/samples/point-1.tex: Fix mistakes in code sample. * doc/tutorial/samples/ima2d-6-clone.tex: clone() is not a method. Use a routine instead. * doc/tutorial/samples/logical-not-output.tex, * doc/tutorial/samples/logical-not.tex: new sample code. * doc/tutorial/tutorial.tex: Update tutorial. - Add a section about useful macros. - Emphazise keywords such as variable names, method names, type names,... - Add a section about logical::not() routine. --- milena/ChangeLog | 22 + .../tutorial/samples/borderthickness-output.tex | 24 +- milena/doc/tutorial/samples/borderthickness.tex | 23 +- milena/doc/tutorial/samples/ima2d-4.tex | 9 +- milena/doc/tutorial/samples/ima2d-6-clone.tex | 2 +- milena/doc/tutorial/samples/logical-not-output.tex | 17 + milena/doc/tutorial/samples/logical-not.tex | 31 ++ milena/doc/tutorial/samples/point-1-output.tex | 4 +- milena/doc/tutorial/samples/point-1.tex | 17 +- milena/doc/tutorial/tutorial.tex | 522 +++++++++++++------- 10 files changed, 470 insertions(+), 201 deletions(-) create mode 100644 milena/doc/tutorial/samples/logical-not-output.tex create mode 100644 milena/doc/tutorial/samples/logical-not.tex diff --git a/milena/ChangeLog b/milena/ChangeLog index aaab1dd..c8d3e1d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,25 @@ +2008-10-24 Guillaume Lazzara <z(a)lrde.epita.fr> + + Update tutorial. + + * doc/tutorial/samples/borderthickness-output.tex, + * doc/tutorial/samples/borderthickness.tex, + * doc/tutorial/samples/ima2d-4.tex, + * doc/tutorial/samples/point-1-output.tex, + * doc/tutorial/samples/point-1.tex: Fix mistakes in code sample. + + * doc/tutorial/samples/ima2d-6-clone.tex: clone() is not a + method. Use a routine instead. + + * doc/tutorial/samples/logical-not-output.tex, + * doc/tutorial/samples/logical-not.tex: new sample code. + + * doc/tutorial/tutorial.tex: Update tutorial. + - Add a section about useful macros. + - Emphazise keywords such as variable names, method names, type + names,... + - Add a section about logical::not() routine. + 2008-10-24 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> De-activate not compiling tests in level transform. diff --git a/milena/doc/tutorial/samples/borderthickness-output.tex b/milena/doc/tutorial/samples/borderthickness-output.tex index e1db166..201aedb 100644 --- a/milena/doc/tutorial/samples/borderthickness-output.tex +++ b/milena/doc/tutorial/samples/borderthickness-output.tex @@ -1,13 +1,13 @@ -ima_def - border = 3 -- - - - - - - - -- - - - - - - - -- - - - - - - - -- - - - | - - - -- - - | - - - - -- - - - - - - - -- - - - - - - - -- - - - - - - - +- - - - - - - - +- - - - - - - - +- - - - - - - - +- - - - | - - - +- - - | - - - - +- - - - - - - - +- - - - - - - - +- - - - - - - - -ima_bt0 - border = 0 -- | -| - +=========== + +- | +| - diff --git a/milena/doc/tutorial/samples/borderthickness.tex b/milena/doc/tutorial/samples/borderthickness.tex index d491f16..a059ba3 100644 --- a/milena/doc/tutorial/samples/borderthickness.tex +++ b/milena/doc/tutorial/samples/borderthickness.tex @@ -1,8 +1,17 @@ -bool vals[2][2] = { {0, 1}, - {1, 0} }; -image2d<bool> ima_def = make::image2d(vals); -display::format(ima_def); +#include <mln/core/image/image2d.hh> +#include <mln/debug/println_with_border.hh> +int main() +{ + using namespace mln; -border::thickness = 0; -image2d<bool> ima_bt0 = make::image2d(vals); -display::format(ima_bt0); + bool vals[2][2] = { {0, 1}, + {1, 0} }; + image2d<bool> ima_def = make::image2d(vals); + debug::println_with_border(ima_def); + + std::cout << "===========" << std::endl << std::endl; + + border::thickness = 0; + image2d<bool> ima_bt0 = make::image2d(vals); + debug::println_with_border(ima_bt0); +} diff --git a/milena/doc/tutorial/samples/ima2d-4.tex b/milena/doc/tutorial/samples/ima2d-4.tex index 2add937..b5417fc 100644 --- a/milena/doc/tutorial/samples/ima2d-4.tex +++ b/milena/doc/tutorial/samples/ima2d-4.tex @@ -1,5 +1,6 @@ -// At index (9, 9), both values change. -imga(p) = 'M', imgb(p) = 'W'; +point2d p(9,9); + +// At (9, 9), both values change. +imga(p) = 'M'; +imgb(p) = 'W'; -debug::println(imga); -debug::println(imgb); diff --git a/milena/doc/tutorial/samples/ima2d-6-clone.tex b/milena/doc/tutorial/samples/ima2d-6-clone.tex index 396306a..872b93d 100644 --- a/milena/doc/tutorial/samples/ima2d-6-clone.tex +++ b/milena/doc/tutorial/samples/ima2d-6-clone.tex @@ -1,4 +1,4 @@ -image2d<int> ima3 = ima1.clone(); // Makes a deep copy. +image2d<int> ima3 = clone(ima1); // Makes a deep copy. ima3(p) = 3; diff --git a/milena/doc/tutorial/samples/logical-not-output.tex b/milena/doc/tutorial/samples/logical-not-output.tex new file mode 100644 index 0000000..27c6ceb --- /dev/null +++ b/milena/doc/tutorial/samples/logical-not-output.tex @@ -0,0 +1,17 @@ +ima: +| - +- | + +---- +ima_neg: +- | +| - + +ima: +| - +- | + +---- +not_inplace(ima) +- | +| - diff --git a/milena/doc/tutorial/samples/logical-not.tex b/milena/doc/tutorial/samples/logical-not.tex new file mode 100644 index 0000000..ecb7748 --- /dev/null +++ b/milena/doc/tutorial/samples/logical-not.tex @@ -0,0 +1,31 @@ +#include <mln/core/image/image2d.hh> +#include <mln/logical/not.hh> +#include <mln/debug/println.hh> +int main() +{ + using namespace mln; + + bool vals[2][2] = { + {1, 0}, + {0, 1} + }; + image2d<bool> ima = make::image2d(vals); + std::cout << "ima:" << std::endl; + debug::println(ima); + + std::cout << "----" << std::endl; + + image2d<bool> ima_neg = logical::not_(ima); + + std::cout << "ima_neg:" << std::endl; + debug::println(ima_neg); + std::cout << "ima:" << std::endl; + debug::println(ima); + + std::cout << "----" << std::endl; + + logical::not_inplace(ima); + + std::cout << "not_inplace(ima)" << std::endl; + debug::println(ima); +} diff --git a/milena/doc/tutorial/samples/point-1-output.tex b/milena/doc/tutorial/samples/point-1-output.tex index d5a3da6..39f77d0 100644 --- a/milena/doc/tutorial/samples/point-1-output.tex +++ b/milena/doc/tutorial/samples/point-1-output.tex @@ -1,2 +1,2 @@ -has(p1)? true -has(p2)? false +has(p1)? false +has(p2)? true diff --git a/milena/doc/tutorial/samples/point-1.tex b/milena/doc/tutorial/samples/point-1.tex index 01163df..9efb7ec 100644 --- a/milena/doc/tutorial/samples/point-1.tex +++ b/milena/doc/tutorial/samples/point-1.tex @@ -1,18 +1,21 @@ -#include <core/image/image2d.hh> -#include <core/alias/box2d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/box2d.hh> int main() { using namespace mln; - image2d<bool> ima(box2d(0,0, 10,10)); - mln_site(image2d<bool>) p1(9, 9); - mln_site(image2d<bool>) p2(10, 10); + // Create an image on a 2D box + // with 10 columns and 10 rows. + image2d<bool> ima(make::box2d(10, 10)); + + mln_site_(image2d<bool>) p1(20, 20); + mln_site_(image2d<bool>) p2(3, 3); std::cout << "has(p1)? " - << (img.has(p1) ? "true" : "false") + << (ima.has(p1) ? "true" : "false") << std::endl; std::cout << "has(p2)? " - << (img.has(p2) ? "true" : "false") + << (ima.has(p2) ? "true" : "false") << std::endl; } diff --git a/milena/doc/tutorial/tutorial.tex b/milena/doc/tutorial/tutorial.tex index d6a9226..25e9862 100644 --- a/milena/doc/tutorial/tutorial.tex +++ b/milena/doc/tutorial/tutorial.tex @@ -99,6 +99,25 @@ $$ %\end{latexonly} +\newcommand{\code}[1]{% +\textit{#1}% +} +\newcommand{\var}[1]{% +\textit{$#1$}% +} +\newcommand{\type}[1]{% +\textit{#1}% +} +\newcommand{\namespace}[1]{% +\textit{#1}% +} +\newcommand{\header}[1]{% +\textit{#1}% +} +\newcommand{\hpath}[1]{% +\textit{#1}% +} + \usetikzlibrary{er} \newcommand{\neighcfour}{% @@ -244,9 +263,9 @@ Here is also a list of common variable name conventions: Olena is organized in a namespace hierarchy. Everything is declared by Olena within the 'oln::' namespace, and possibly a sub-namespace such as -'oln::arith::' (arithmetic operations on images), 'oln::morpho::' (morphological +'\namespace{oln::arith::}' (arithmetic operations on images), '\namespace{oln::morpho::}' (morphological operations), etc. Usually, the namespace hierarchy is mapped to the mln -directory tree. For the sake of simplicity, we will neglect the 'oln::' +directory tree. For the sake of simplicity, we will neglect the '\namespace{oln::}' prefix in all the code examples. Methods provided by objects in the library are in constant time. If you need @@ -296,7 +315,7 @@ This concept allows us to divide a pixel into two information: \item The value. \end{itemize} -Let's say we have 2D grid like this: +Let's say we have a 2D grid like this: //FIXME [dessin de grille 2d, colonnes/lignes numerotees + repere x/y] @@ -334,11 +353,11 @@ Sites may have a different types, depending on the image type: \begin{tabular}{l|l} Name & Description \\ \hline -point2d & 2D point on a regular grid \\ -point & Generic point ($n-D$) on a regular grid \\ -util::vec & Algebraic vector \\ -util::vertex & Graph vertex \\ -util::edge & Graph edge \\ +\type{point2d} & 2D point on a regular grid \\ +\type{point} & Generic point ($n-D$) on a regular grid \\ +\type{util::vec} & Algebraic vector \\ +\type{util::vertex} & Graph vertex \\ +\type{util::edge} & Graph edge \\ \end{tabular} [Illustration : grille + intersection + pmin() + pmax() + distance entre 2 @@ -424,12 +443,12 @@ is it's own bounding box. \doxycode{box2d-1} -A p\_array does not have this -method since sites do not have to be adjacent. Maintaining such information, in +A \type{p\_array} does not have the bbox +method since its sites do not have to be adjacent. Maintaining such information, in order to keep getting the bbox in constant time, would be time and memory -consuming. Instead of providing a method directly in p\_array, an algorithm is +consuming. Instead of providing a method directly in \type{p\_array}, an algorithm is available if this information is needed. -p\_array and box both have a nsites method since the internal structure allows a +\type{p\_array} and \type{box} both have a nsites method since the internal structure allows a constant time retrieval. \doxycode{box2d-2} @@ -468,11 +487,11 @@ Olena: \\ \begin{tabular}{l|l} Name & Description \\ \hline -image1d & 1D image \\ -image2d & 2D image \\ -image3d & 3D image \\ -flat\_image & Constant value image \\ -image\_if & Image defined by a function \\ +\type{image1d} & 1D image \\ +\type{image2d} & 2D image \\ +\type{image3d} & 3D image \\ +\type{flat\_image} & Constant value image \\ +\type{image\_if} & Image defined by a function \\ FIXME & FIXME \\ \end{tabular} @@ -482,14 +501,14 @@ FIXME & FIXME \\ Every image type must take its type of value as parameter. The value type can be one of the builtins one: \begin{itemize} - \item bool - \item char - \item unsigned - \item int - \item short - \item long - \item float - \item double + \item \type{bool} + \item \type{char} + \item \type{unsigned} + \item \type{int} + \item \type{short} + \item \type{long} + \item \type{float} + \item \type{double} \end{itemize} Other data types are also available: @@ -497,73 +516,78 @@ Other data types are also available: \begin{tabular}{l|l} Value type & underlying data type \\ \hline -float01\_8 & unsigned long \\ -float01\_16 & unsigned long \\ -float01\_f & float \\ -gl8 & unsigned char \\ -gl16 & unsigned short \\ -glf & float \\ -hsi\_d & double \\ -hsi\_f & float \\ -int\_s8 & char \\ -int\_s16 & short \\ -int\_s32 & int \\ -int\_u8 & unsigned char \\ -int\_u16 & unsigned short \\ -int\_u32 & unsigned int \\ -rgb16 & mln::util::vec$<$unsigned short$>$ \\ -rgb8 & mln::util::vec$<$unsigned char$>$ \\ +\type{float01\_8} & \type{unsigned long} \\ +\type{float01\_16} & \type{unsigned long} \\ +\type{float01\_f} & \type{float} \\ +\type{gl8} & \type{unsigned char} \\ +\type{gl16} & \type{unsigned short} \\ +\type{glf} & \type{float} \\ +\type{hsi\_d} & \type{double} \\ +\type{hsi\_f} & \type{float} \\ +\type{int\_s8} & \type{char} \\ +\type{int\_s16} & \type{short} \\ +\type{int\_s32} & \type{int} \\ +\type{int\_u8} & \type{unsigned char} \\ +\type{int\_u16} & \type{unsigned short} \\ +\type{int\_u32} & \type{unsigned int} \\ +\type{rgb16} & \type{mln::util::vec$<$unsigned short$>$} \\ +\type{rgb8} & \type{mln::util::vec$<$unsigned char$>$} \\ \end{tabular} \\ -All these types are available in mln/value and accessible in the mln::value namespace. +All these types are available in mln/value and accessible in the +\namespace{mln::value} namespace. Most of the time, the name of the header which must be included to use one of these data -types is actually ``type\_name.hh". For instance, for rgb8 the header will be -rgb8.hh. +types is actually ``type\_name.hh". For instance, for \type{rgb8} the header will be +\header{rgb8.hh}. %---------------- \doxysubsection{imavalues}{About value, rvalue and lvalue} +//FIXME: to be rewritten or removed. + Since the values are of a specific type, it exists a set of all the possible site values. This set is called "destination" set. It may be iterable and printable if it is finite and not too huge. -Image types provide a method to access values, namely "operator() const". -Yet, its signature is NOT "value operator()(const site\& p) const" -but "rvalue operator()(const psite\& p) const" +Image types provide a method to access values, namely "\code{operator() const}". +Yet, its signature is NOT "\code{value operator()(const site\& p) const}" +but "\code{rvalue operator()(const psite\& p) const}". -For instance, with I being image2d$<$int\_u8$>$, we have : +For instance, with \type{I} being \type{image2d$<$int\_u8$>$}, we have : \begin{center} - I::value == int\_u8 but I::rvalue == const int\_u8\& + \type{I::value} == i\type{nt\_u8} but \type{I::rvalue} ==\type{const + int\_u8\&} \end{center} -so copying the value when the call "f(p)" returns is avoided. +So copying the value when the call "\code{f(p)}" returns is avoided. In that case, it is a low-level implementation issue that makes rvalue be different from value. In some other cases, the difference can be more fundamental. For instance, a proxy is returned so that some extra code is performed if this value is eventually read. -Likewise, lvalue is also used as return type for methods such as "operator()". +Likewise, lvalue is also used as return type for methods such as +"\code{operator()}". The difference is that lvalue allows the data to be modified. -With I being image2d$<$int\_u8$>$, we have : +With \type{I} being \type{image2d$<$int\_u8$>$}, we have : \begin{center} - I::value == int\_u8 but I::lvalue == int\_u8\& + \type{I::value} == \type{int\_u8} but \type{I::lvalue} == \type{int\_u8\&} \end{center} %************************** \doxysection{imadomain}{Domain} The site set contains the sites which compose the image. Sites are based on a grid so the image depends on that grid as well. -It means that an image 2D can only be defined by sites based on a 2D grid. -Likewise, an image2d will always have its bouding box defined by a box2d. +It means that a 2D images can only be defined by sites based on a 2D grid. +Likewise, an \type{image2d} will always have its bouding box defined by a \type{box2d}. Being defined on a grid means that the image can be defined anywhere. -For instance, defining a 2D image with a box2d starting from point (-20, -20) +For instance, defining a 2D image with a \type{box2d} starting from point (-20, -20) to (-3, 5) is completely valid. The following example shows that the definition domain and the site set are @@ -574,7 +598,7 @@ Output: \doxycode{ima2d-1-output} -To know if a site belongs to an image domain or not, a method ``has()'' is +To know if a site belongs to an image domain or not, a method ``\code{has()}'' is available. \doxycode{point-1} Output: @@ -593,9 +617,9 @@ These concepts are useful in many algorithms and can avoid costly tests while working with sites located on image edges. A border is a finite extension provided to a basic image type, such as -image2d. By default, every image is created with a border. The default width is -defined through the global variable border::thickness defined in -mln/border/thickness.hh. Since this is a variable, it can be changed +\type{image2d}. By default, every image is created with a border. The default width is +defined through the global variable \var{border::thickness} defined in +\header{mln/border/thickness.hh}. Since this is a variable, it can be changed as shown in the following example. \doxycode{borderthickness} @@ -605,12 +629,14 @@ Output: \doxycode{borderthickness-output} It is important to note that to display the border in the ouput, we use a -special debug function, debug::print\_with\_border. Indeed, the border and the +special debug function, \code{debug::println\_with\_border}. Indeed, the border and the extension are considered as part of an image only in the algorithms. They are ignored while saving or printing an image. Some operations can be performed on the border. The functions are located in -mln/border.\\ +\hpath{mln/border}.\\ + +FIXME: More details about border manipulation! border:get(), \ldots % \bigskip @@ -634,7 +660,7 @@ On morphed images, decribed in section \ref{imamorphed}, the border concept does not exist and is generalized to the extension concept. A simple example of a morphed image is a sub-image. A sub image does not have border nor extension by default. -Thanks to mln/core/routine/extend.hh, an extension can be defined through a +Thanks to \header{mln/core/routine/extend.hh}, an extension can be defined through a function. This means that the extension can be infinite. Another point is that an image can be used as extension. For instance, in the case of a sub-image, you may be interested in extending the sub-image with the @@ -643,7 +669,7 @@ image itself. [FIXME: schema - voir cahier] The extension supports the following operations. These functions are located in -mln/extension.\\ +\hpath{mln/extension}.\\ % \bigskip @@ -657,12 +683,16 @@ fill & Fill the extension with a given value.\\ %---------------- \subsection*{IMPORTANT NOTE} Many times, you may want to check if a site is part of the image before applying -a treatment. All images provide a method ``has(Site)'' which can return this +a treatment. All images provide a method ``\code{has(Site)}'' which can return this information. -Be careful though, calling has() on the image returns true if the given site is -part of the domain \textbf{OR} the the extension/border. All algorithms in Olena -call that method which means that all the algorithms take in consideration the -extension/border if it exists. +\textbf{Be careful though, calling \code{has()} on the image returns ``true'' if + the given site is part of the domain OR the the extension/border}. All + algorithms in Olena call that method which means that all the algorithms take + in consideration the extension/border if it exists. The default border + thickness is set to 3 as shown by the following example. + +[FIXME: Add example has(p) when p is in the border and border::thickness +modified.] Most of the time, this is the good behavior. For instance, if a rotation of 20 degrees is applied to an image, sites which were not previously in the domain @@ -675,15 +705,16 @@ Sometimes taking the domain in consideration may not be the expected behavior. If you do not want to use the extension/border for a specific routine, simply restrict the image to its domain. + \doxycode{extension-ignore} Note that: \begin{center} -ima.domain().has() $\equiv$ (ima | ima.domain()).has() +\code{ima.domain().has()} $\equiv$ \code{(ima | ima.domain()).has()} and -border::get(ima.domain()) == border::get(ima | ima.domain()) == 0 +\code{border::get(ima.domain())} == \code{border::get(ima | ima.domain())} == 0 \end{center} So it is also valid to write: @@ -735,14 +766,15 @@ Currently, Olena supports the following input image formats: \item PPM \end{itemize} -This support is provided through two headers for each type, save.hh and load.hh. -They are located in mln/io/$<$image-format$>$/. +This support is provided through two headers for each type, \header{save.hh} and +\header{load.hh}. +They are located in \hpath{mln/io/$<$image-format$>$/}. Once the right header is included, the image can be loaded: \doxycode{ima-load} -Note that for the PBM format, you \textbf{MUST} use ``bool'' as value type. +Note that for the PBM format, you \textbf{MUST} use ``\type{bool}'' as value type. No special value type is required for other formats though. \doxycode{ima-save} @@ -768,10 +800,10 @@ Img1b is defined on a domain but does not have data yet.\\ %================================================ \doxysection{imaaccessmodval}{Access and modify values} -There are several ways to access/modify an image ``ima'': +There are several ways to access/modify an image ``\var{ima}'': \begin{itemize} -\item ima.at(x, y, \dots) -\item ima(Site) +\item \code{ima.at(x, y, \dots)} +\item \code{ima(Site)} \end{itemize} Most of the time, images can be modified and these two methods can be used both @@ -780,13 +812,13 @@ to read a value and modify it. Both methods are equivalent. Output: \doxycode{ima2d-3-output} -Usually, you will want to use the functional way, ``ima(Site)'', more +Usually, you will want to use the functional way, ``\code{ima(Site)}'', more particularly while iterating over all the sites through an iterator. This use case will be detailed further in section \ref{iterators}. -s%================================================ +%================================================ \doxysection{imasize}{Image size} Most typical image types owns special methods to retrieve the image size. @@ -799,11 +831,11 @@ image3d & ncols(), nrows(), nslis() \\ \end{tabular} If you need a more generic way to get the size, you can use the routines -provided in mln/geom in the following files: +provided in \hpath{mln/geom} in the following files: \begin{itemize} - \item ncols.hh - \item nrows.hh - \item nslis.hh + \item \header{ncols.hh} + \item \header{nrows.hh} + \item \header{nslis.hh} \end{itemize} \doxycode{ima-size} @@ -811,10 +843,20 @@ Output: \doxycode{ima-size-output} +%================================================ +\doxysection{imaconvvals}{Conversion of image values} + +parler de level::compute/level::apply. +parler de i2v et v2v. +Voir les vset => attendre que ca soit ameliore? %==================================== \clearpage \newpage +%Ugly workaround to avoid missing chapter references in doxygen. +\begin{htmlonly} +\doxychapter{1}{} +\end{htmlonly} \doxychapter{winneigh}{Structural elements: Window and neighborhood} In Olena, there are both the window and neighborhood concept. A window can be @@ -824,7 +866,7 @@ Therefore these two concepts are really similar and are detailed together in this section. By default, structural elements are centered. The central site is located at the -origin of the grid: ``literal::origin''. With image2d, the central site is +origin of the grid: ``\var{literal::origin}''. With image2d, the central site is (0,0). @@ -882,7 +924,7 @@ cuboid3d & Cuboid & - \\ \end{tabular} These predefined windows can be passed directly to a function. The headers are -located in mln/core/alias/window*.hh. +located in \header{mln/core/alias/window*.hh}. @@ -898,7 +940,7 @@ c8 & 8-connectivity & \neighceight \\ \end{tabular} These predefined neighborhood can be passed directly to a function. The headers are -located in mln/core/alias/neigh*.hh. +located in \header{mln/core/alias/neigh*.hh}. Use case example: \doxycode{ima2d-decl-2-blobs} @@ -918,7 +960,8 @@ which the window is computed: Another way to define the same window is to provide a bool array: \doxycode{win-create-2} -Note that ``win'' == ``win2''. +\textbf{Note that despite the different ways of defining these windows, + ``'var{win}'' == ``\var{win2}''}. The boolean array must always have an odd size. While creating a windows thanks to a bool array/matrix, the window's center is the central site of the array/matrix. @@ -934,7 +977,7 @@ central site of the array/matrix. Windows are not convertible to a Neighborhood. Neighborhood are convertible to a window though. -A neighborhood has a method ``win()'' which returns the definition window. +A neighborhood has a method ``\code{win()}'' which returns the definition window. Be ware that this window is not centered, thus does not include the central point. @@ -954,19 +997,19 @@ data and a site set which defines the domain of the image on that grid. Usually, we need to access a value by its coordinates. With default images it can be done easily, at no cost. -Example with an image2d: +Example with an \type{image2d}: \doxycode{ima2d-display-1} -The site x is the point (0, 1). The image values are stored in a +The site \var{x} is the point (0, 1). The image values are stored in a multi-dimensional array. The point coordinates can be used directly. The site (0, 1) \textbf{is} the point (0, 1) and the data is stored at row 0 and column 1. Here we have: - I::site == I::psite == point2d + \type{I::site} == \type{I::psite} == \type{point2d} -where, roughly, point2d = \{ row, column \}. +where, roughly, \type{point2d} = \{ row, column \}. %************************** \doxysection{sitespsite}{Need for psite} @@ -982,31 +1025,34 @@ point: So, for each point having (0, x) as coordinate, this function will return 8, otherwise it will be 9. -Then, define a p\_array with few point2d: +Then, define a \type{p\_array} with few \type{point2d}: \doxycode{parray-append} -Now, create a point-wise image from this function and this p\_array: +Now, create a point-wise image from this function and this \type{p\_array}: \doxycode{mln_var-1} Ima is actually that image: \doxycode{ima2d-display-2} -However, in memory, since it is based on a p\_array, sites are stored in a +However, in memory, since it is based on a \type{p\_array}, sites are stored in a vector. -The site x is the point (3, 7) which corresponds to the cell 1 in the p\_array. +The site x is the point (3, 7) which corresponds to the cell 1 in the +\type{p\_array}. \doxycode{parray-display-1} -Obviously, we cannot check in constant time whether the site x, point2d here, +Obviously, we cannot check in constant time whether the site \var{x}, + \type{point2d} here, is part of that image or not: knowing the point coordinates is not enough. That's why we need a different mechanism in order to access this information: the psites. Here we have: - I::site $==$ point2d but I::psite $==$ pseudo\_site$<$point2d$>$ + \type{I::site} $==$ \type{point2d} but \type{I::psite} $==$ + \type{pseudo\_site$<$point2d$>$} -where, roughly, pseudo\_site$<$point2d$>$ $=$ \{ i\_in\_p\_array, p\_array\_ptr +where, roughly, \type{pseudo\_site$<$point2d$>$} $=$ \{ i\_in\_p\_array, p\_array\_ptr \}. Psites contains all the needed information to access the values in @@ -1015,25 +1061,27 @@ constant-time. %************************** \doxysection{sitespsitensite}{From psite to site} -In the last example there was an image of type I such as I::site != I::psite. -In that case, an object of type I::psite is actually convertible towards an -object of type I::site. Furthermore, a psite shall behave as if it was a -site. +In the last example there was an image of type \type{I} such as \type{I::site} +!= \type{I::psite}. +In that case, an object of type \type{I::psite} is actually convertible towards an +object of type \type{I::site}. Furthermore, a \type{psite} shall behave as if it was a +\type{site}. Design note: it seems impossible to offer through the interface of -some psite what is expected from its corresponding site. For instance, when a -site has a given feature, say a method "m", then this -method has to appear in the psite interface. However, thanks to +some \type{psite} what is expected from its corresponding \type{site}. For instance, when a +site has a given feature, say a method "\code{m}", then this +method has to appear in the \type{psite} interface. However, thanks to inheritance, we fetch an interface and an implementation that delegates to the site. -For instance, in the last example, I::psite has a method ::row() because -I::site, point2d, provides such a method. +For instance, in the last example, \type{I::psite} has a method \code{row(}) because +\type{I::site}, \type{point2d}, provides such a method. -How it works: a psite inherits from internal::site\_impl$<$site$>$ which is -specialized for every site type; for instance, internal::site\_impl$<$point2d$>$ -owns the method "coord row() const" which is defined as -"return exact(this)-$>$to\_site().row()" +How it works: a \type{psite} inherits from \type{internal::site\_impl$<$site$>$} which is +specialized for every site type; for instance, + \type{internal::site\_impl$<$point2d$>$} +owns the method ``\code{coord row() const}'' which is defined as +``\code{return exact(this)-$>$to\_site().row()}''. %************************** \doxysection{sitesdpoint}{Dpoint} @@ -1050,10 +1098,6 @@ Output: %==================================== \clearpage \newpage -%Ugly workaround to avoid missing chapter references in doxygen. -\begin{htmlonly} -\doxychapter{1}{} -\end{htmlonly} \doxychapter{iterators}{Iterators} Each container object in Olena like site sets or images have iterators. @@ -1079,11 +1123,12 @@ The iterator type name depends on the data pointed by it: \\ Data type & Iterator Names \\ \hline Site & fwd\_piter, bkd\_piter, piter \\ \hline Value & fwd\_viter, bkd\_viter, viter \\ \hline +Neighboors & fwd\_niter, bkd\_niter, niter \\ \hline \end{tabular} \\ -As you may have noticed, according to the data type, the word "iter" is prefixed +As you may have noticed, according to the data type, the word ``iter'' is prefixed by the usual name variable used for that data type. Sites variables are usually -called 'p' so the proper iterator is "piter". (See the foreword)\\ +called ``p'' so the proper iterator is ``type{piter}''. (See the foreword)\\ An iterator has the following interface: \\ @@ -1105,22 +1150,29 @@ Example of different forward iterations: \item p\_array$<$point2d$>$: from left to right. \end{itemize} -A for\_all() macro is available to iterate over all the sites: \\ +A \code{for\_all()} macro is available to iterate over all the sites: \\ \doxycode{forall-piter-1} -Note that when you declare an iterator, prefer using the "mln\_*iter" macros. +Note that when you declare an iterator, prefer using the ``\code{mln\_*iter}'' macros. They resolve the iterator type automatically from the given container type passed as parameter. These macros can be used with any container like images or site sets. -Here follow an example with the implemantions of the most basic routines which use the for\_all -loop: fill and paste. +Here follow an example with the implemantions of the most basic routines which +use the \code{for\_all} loop: \code{level::fill()} and \code{level::paste()}. \doxycode{fill} \doxycode{paste} +Important note: macros for iterators exist in two versions: +``\code{mln\_*iter}'' and ``\code{mln\_*iter\_}''. The difference is that the +first version must be used in templated function whereas the second one must be +used in non templated functions. + +If you want a list of all the macros available in Olena, please refert to +section \ref{macros}. %================================================ @@ -1158,7 +1210,7 @@ variable behaves like some mathematical variable. Put differently it is just a name to designate an image: \doxycode{ima2d-5} -If a deep copy of the image is needed, a method clone() is available: +If a deep copy of the image is needed, a clone() routine is available: \doxycode{ima2d-6-clone} @@ -1166,11 +1218,9 @@ If a deep copy of the image is needed, a method clone() is available: %==================================== \clearpage \newpage -\doxychapter{basicops}{Basic operations} +\doxychapter{basicops}{Basic routines} //FIXME : illustrer -%************************** -\doxysection{basicroutines}{Basic routines} \begin{tabular}{l|p{8cm}} \hline Routine name & Description \\ \hline @@ -1183,6 +1233,9 @@ level::paste() & paste object data to another object. \\ labeling::blobs() & find and label the different components of an image. \\ +logical::not\_() +logical::not\_inplace() & Point-wise "logical not" \\ + *::compute() & compute an accumulator on specific elements. \\ \hline \end{tabular} \\ @@ -1193,21 +1246,21 @@ First, create an image: \doxycode{ima2d-decl-1} Memory has been allocated so data can be stored but site values -have not been initialized yet. So we fill imga with the value 'a': +have not been initialized yet. So we fill \var{imga} with the value 'a': \doxycode{fill-call-1} -The "fill" algorithm is located in the sub-namespace "level" since this -algorithm deals with the "level" of site values. +The ``\code{fill}'' algorithm is located in the sub-namespace "\namespace{mln::level}" since this +algorithm deals with the ``level'' of site values. Note that the term "level" refers to the fact that an image can be considered as a landscape where the elevation at a particular location/site is given by the corresponding site value. -The full name of this routine is "oln::level::fill". To access to a particular -algorithm, the proper file shall be included. The file names of algorithms -strictly map their C++ name; so oln::level::fill is defined in the file -"oln/level/fill.hh". +The full name of this routine is ``\namespace{mln::level::fill}''. +To access to a particular algorithm, the proper file shall be included. +The file names of algorithms strictly map their C++ name; so +\namespace{mln::level::fill} is defined in the file \header{mln/level/fill.hh}. %---------------- \subsection*{Note} @@ -1215,8 +1268,8 @@ Most algorithms in Olena are constructed following the classical scheme: "output algo(input)", where the input image is only read. However some few algorithms take an input image in order to modify it. To enforce this particular feature, the user shall explicitly state that the image is provided so that its data is -modified "read/write". The algorithm call shall be "level::fill(ima.rw(), -val)". When forgetting the "rw()" call it does not compile. +modified "read/write". The algorithm call shall be ``\code{level::fill(ima.rw(), +val)}''. When forgetting the ``\code{rw()}'' call it does not compile. %************************** @@ -1258,14 +1311,14 @@ For instance, the algorithm level::paste tests that the set of sites of imgb %==================================== \doxysection{blobs}{Blobs} -Labeling::blobs() is used to label an image. It returns a new image with the +\code{Labeling::blobs()} is used to label an image. It returns a new image with the component id as value for each site. The background has 0 as id therefore the component ids start from 1. Consider the following image: \doxycode{ima2d-decl-2} -Then label this image thanks to labeling::blobs: +Then label this image thanks to \code{labeling::blobs()}: \doxycode{ima2d-decl-2-blobs} Output: \doxycode{ima2d-decl-2-blobs-output} @@ -1275,6 +1328,32 @@ This parameter \textbf{must} be of the same type as the returned image value. %************************** +\doxysection{logicalnot}{Logical not} +\begin{center} + \begin{tabular}{|l|l|} + \hline + \textbf{Header} & mln/logical/not.hh \\ + + \textbf{Full namespace} & mln::logical \\ + + \textbf{Routine(s)} & not\_(), + not\_inplace() \\ + \hline + \end{tabular} +\end{center} + +\bigskip + +This small routine only works on binary images. It performs a point-wise +"logical not" and therefore "negates" the image. There are two versions of that +algorithm a version which returns a new image and another which works in place. + +Sample code: +\doxycode{logical-not} +Output: +\doxycode{logical-not-output} + +%************************** \doxysection{compute}{Compute} There are several flavour of the compute routine, depending on what the kind of @@ -1334,21 +1413,20 @@ pair & Pair of accumulators\\ tuple & $n$-uplets of accumulators\\ \end{tabular} -Each accumulator can be used in *::compute(). +Each accumulator can be used in \code{*::compute()}. It exists two versions of each accumulator. \begin{itemize} - \item mln::accu::*, this version require the site or value type as parameter. + \item \namespace{mln::accu::*}, this version require the site or value type as parameter. For instance, for the bbox accumulator, the type would be - accu::bbox<mln\_psite(I)>, where I is the type of the image on which it will be + \type{accu::bbox<mln\_psite(I)>}, where \type{I} is the type of the image on which it will be computed. - \item mln::accu::meta::*, this is usually the easiest version to use. The type + \item \namespace{mln::accu::meta::*}, this is usually the easiest version to use. The type of site or value do not need to be specified and will be deduced at compile time. For the bbox accumulator, the accumulator type would be - accu::meta::bbox. + \type{accu::meta::bbox}. \end{itemize} -Note that when an accumulator is passed to *::compute, it must be instanciated. -You cannot write: +Note that when an accumulator is passed to \code{*::compute()}, it must be instanciated.You cannot write: \doxycode{accu-wrong-instanciation} Instead, you must write: \doxycode{accu-right-instanciation} @@ -1361,19 +1439,19 @@ image. Consider the following image: \doxycode{ima2d-decl-2} -Then label this image thanks to labeling::blobs: +Then label this image thanks to \code{labeling::blobs()}: \doxycode{ima2d-decl-2-blobs} Output: \doxycode{ima2d-decl-2-blobs-output} -Then, use labeling::compute() with the bbox accumulator: +Then, use \code{labeling::compute()} with the bbox accumulator: \doxycode{labeling-compute-call} -Labeling::compute() hold an accumulator for each component, which means it +\code{Labeling::compute()} hold an accumulator for each component, which means it returns an array of accumulator results. -In this case, it returns an array of box2d. +In this case, it returns an array of \type{box2d}. -\textbf{Important note:} since labeling::blobs() labels the component from 1 and +\textbf{Important note:} since \code{labeling::blobs()} labels the component from 1 and set the background to 0, we will want to iterate from 1 to nlabels included. \doxycode{labeling-compute-result} Output: @@ -1395,8 +1473,8 @@ min\_max & Return the min and max values of the values of an image.\\ sum & Return the sum of the values of an image. \end{tabular} -These routines can be found in mln/estim. -For example, with estim::nsites() simply write: +These routines can be found in \hpath{mln/estim}. +For example, with \code{estim::nsites()} simply write: \doxycode{estim-sites} %==================================== @@ -1421,25 +1499,25 @@ Function\_p2v $|$ Sub Domain & Do not create a new image but create a morpher.\\ A Sub Domain can be a site set, an image or any value returned by this operator. -For a given site, Function\_p2v returns a Value and Function\_p2b returns a +For a given site, \type{Function\_p2v} returns a value and \type{Function\_p2b} returns a boolean. These functions. are actually a sort of predicate. A common -function\_p2v is pw::value(Image). It returns the +\type{Function\_p2v} is \code{pw::value(Image)}. It returns the point to value function used in the given image. C functions can also be used as predicate by passing the function pointer. -You can easily get a function\_p2b by comparing the value returned -by a function\_p2v to another Value. +You can easily get a \type{Function\_p2b} by comparing the value returned +by a \type{Function\_p2v} to another Value. The following sample codes illustrate this feature. In order to use C functions as predicate, they must have one of the following prototype if you work on 2D images: \doxycode{predicate-1} Of course, you just need to change the point type if you use another image -type. For instance, you would use point3d with 3D images. -The returned value type V for function\_p2v depends on the image value type. -With image2d$<$int$>$, V would be int. +type. For instance, you would use \type{point3d} with 3D images. +The returned value type \type{V} for \type{Function\_p2v} depends on the image value type. +With \type{image2d$<$int$>$}, \type{V} would be \type{int}. -In this section, all along the examples, the image "ima" will refer to the +In this section, all along the examples, the image "\var{ima}" will refer to the following declaration: \doxycode{ima2d-decl-2} @@ -1468,14 +1546,14 @@ When writing: \doxycode{ima2d-restricted-1} -sub\_D must be included in ima.domain(). +\var{sub\_D} must be included in \code{ima.domain()}. -Let's have an image, \textit{imab}, like this: +Let's have an image, \var{imab}, like this: \doxycode{ima2d-display-output-1} -Extract a sub image from \textit{imab} with sites having their value set to 1. +Extract a sub image from \var{imab} with sites having their value set to 1. \doxycode{mln_var-2} -Then, \textit{imab1} looks like: +Then, \var{imab1} looks like: \doxycode{ima2d-display-output-2} Now, if we want to extract a sub image it may fail, depending on the site set @@ -1498,7 +1576,9 @@ site set. \newpage \clearpage %Ugly workaround to avoid missing chapter references in doxygen. +\begin{htmlonly} \doxychapter{2}{} +\end{htmlonly} \doxychapter{graphandima}{Graphes and images} FIXME: REWRITE @@ -1539,7 +1619,8 @@ g.add_edge(4, 2); // Associated to edge 4. Now there is a graph topology and we want to associate elements of this graph to a site in the image. -The idea is to use specific site sets such as p\_vertices and p\_edges. +The idea is to use specific site sets such as \type{p\_vertices} and +\type{p\_edges}. Let's associate the vertices with sites. To do so we need to create a functor which for a given vertex returns a site. @@ -1557,15 +1638,16 @@ struct assoc_fun : public Function_v2v< assoc_fun > }; \end{lstlisting} -Then declare a p\_vertices: +Then declare a \type{p\_vertices}: \begin{lstlisting}[frame=single] p_vertices<util::graph, assoc_fun> pv(g, assoc_fun()); \end{lstlisting} -Thanks to the p\_vertices there is now a mapping between vertices and sites. +Thanks to the \type{p\_vertices} there is now a mapping between vertices and sites. We may like to map data to it. The idea is to provide a function which returns the associated data according to the site given as parameter. Combining this function and the -p\_vertices, we get an image. Since this is an image, you can use it with algorithms and for\_all loops. +\type{p\_vertices}, we get an image. Since this is an image, you can use it with +algorithms and \code{for\_all} loops. \begin{lstlisting}[frame=single] @@ -1593,7 +1675,7 @@ Note that like any image in Olena, graph images share their data. Therefore, while constructing a graph image from a graph and a function, the graph is not copied and this is NOT a costly operation. -Like other images, graph images also have an overloaded operator() to access the +Like other images, graph images also have an overloaded \code{operator()} to access the data associated to a vertex or an edge. \begin{lstlisting} //Prints each edge's associated value. @@ -1696,4 +1778,108 @@ border::thickness & Set the default border thickness of images & $[0-UINT_MAX]$\ trace::quiet & Enable trace printing & true/false \\ \end{tabular} +%==================================== +\newpage +\clearpage +\doxychapter{macros}{Useful Macros} + +\doxysection{macrositerators}{Iterator type macros} + +\doxysubsection{macrosdefit}{Default iterator types} +\renewcommand{\arraystretch}{2} +\begin{tabular}{l|p{4cm}|p{6cm}} +Name & Arguments & Description \\ +\hline +mln\_eiter(T) & T : iterable container type & Type of the element + iterator of T \\ + +mln\_niter(T) & T : iterable container/Image type & Type of the neighborhood + iterator of T \\ + +mln\_piter(T) & T : iterable container/image type & Type of the site + iterator \\ + +mln\_qiter(T) & T : iterable container/image type & Type of the window + neighbors iterator of T \\ + +mln\_viter(T) & T : iterable value container type & Type of the value + iterator of T \\ + +mln\_pixter(I) & I : image & Type of the pixel + iterator of I \\ + +mln\_qixter(I, W) & I : image type, & \\ + & W : window Type & Type of the pixel iterator of a + window on an image of type I. \\ + +mln\_nixter(I, N) & I : image type, & \\ + & N : neighborhood type & Type of the pixel iterator of a + neighborhood on an image of type I. \\ +\end{tabular} + + + +\doxysubsection{macrosfwdit}{Forward iterator types} +\begin{tabular}{l|p{4cm}|p{6cm}} +Name & Arguments & Description \\ +\hline +mln\_fwd\_eiter(T) & T : iterable container type & Type of the + element forward iterator of T \\ + +mln\_fwd\_niter(T) & T : iterable container/Image type & Type of the + neighborhood forward iterator of T \\ + +mln\_fwd\_piter(T) & T : iterable container/image type & Type of the site + forward iterator \\ + +mln\_fwd\_qiter(T) & T : iterable container/image type & Type of the window + neighbors forward iterator of T \\ + +mln\_fwd\_viter(T) & T : iterable value container type & Type of the value + forward iterator of T \\ + +mln\_fwd\_pixter(I) & I : image & Type of the pixel + forward iterator of I \\ + +mln\_fwd\_qixter(I, W) & I : image type, & \\ + & W : window Type & Type of the pixel + forward iterator of a window on an image of type I. \\ + +mln\_fwd\_nixter(I, N) & I : image type, & \\ + & N : neighborhood type & Type of the pixel + forward iterator of a neighborhood on an image of type I. \\ +\end{tabular} + + +\doxysubsection{macrosbkdit}{Backward iterators} +\begin{tabular}{l|p{4cm}|p{6cm}} +Name & Arguments & Description \\ +\hline +mln\_bkd\_eiter(T) & T : iterable container type & Type of the + element backward iterator of T \\ + +mln\_bkd\_niter(T) & T : iterable container/Image type & Type of the + neighborhood backward iterator of T \\ + +mln\_bkd\_piter(T) & T : iterable container/image type & Type of the site + backward iterator \\ + +mln\_bkd\_qiter(T) & T : iterable container/image type & Type of the window + neighbors backward iterator of T \\ + +mln\_bkd\_viter(T) & T : iterable value container type & Type of the value + backward iterator of T \\ + +mln\_bkd\_pixter(I) & I : image & Type of the pixel + backward iterator of I \\ + +mln\_bkd\_qixter(I, W) & I : image type, & \\ + & W : window Type & Type of the pixel + backward iterator of a window on an image of type I. \\ + +mln\_bkd\_nixter(I, N) & I : image type, & \\ + & N : neighborhood type & Type of the pixel + backward iterator of a neighborhood on an image of type I. \\ +\end{tabular} + \end{document} -- 1.5.6.5

1 0

cleanup-2008 2675: Add demo code for Laurent N.
by Thierry Geraud 24 Oct '08

24 Oct '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add demo code for Laurent N. * geraud/toto: Remove. * geraud/laurent: New. * geraud/laurent/wst2d.cc: New. * geraud/laurent/wst3d.cc: New. * geraud/laurent/classif.cc: New. * geraud/laurent/segmentation.hh: New. classif.cc | 115 +++++++++++++++++++++++++++++++++++++++++ segmentation.hh | 14 +++++ wst2d.cc | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ wst3d.cc | 79 ++++++++++++++++++++++++++++ 4 files changed, 362 insertions(+) Index: geraud/laurent/wst2d.cc --- geraud/laurent/wst2d.cc (revision 0) +++ geraud/laurent/wst2d.cc (revision 0) @@ -0,0 +1,154 @@ +# include <cstdlib> + +# include <mln/value/int_u8.hh> +# include <mln/value/rgb8.hh> + +# include <mln/io/pgm/load.hh> +# include <mln/io/ppm/save.hh> + +# include <mln/core/var.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/alias/neighb2d.hh> +# include <mln/make/double_neighb2d.hh> + +# include <mln/level/transform.hh> +# include <mln/literal/black.hh> +# include <mln/debug/println.hh> + +# include <mln/morpho/closing_area.hh> +# include <mln/morpho/gradient.hh> +# include <mln/accu/min_max.hh> +# include <mln/morpho/meyer_wst.hh> + + +using namespace mln; +using value::int_u8; + + +template <typename I, typename N> +mln_concrete(I) +morpho_gradient(const Image& input_, const Neighborhood<N>& nbh_) +{ + const I& input = exact(input_); + const N& nbh = exact(nbh_); + + mln_concrete(I) output; + initialize(output, input); + accu::min_max<mln_value(I)> mm; + + mln_piter(I) p(input.domain()); + mln_niter(N) n(nbh, p); + + for_all(p) + { + mm.take_as_init(input(p)); + for_all(n) + mm.take(input(n)); + output(p) = mm.second() - mm.first(); + } + + return output; +} + +struct colorize : Function_v2v< colorize > +{ + typedef value::rgb8 result; + colorize(unsigned max) + : lut(max + 1) + { + lut[0] = literal::black; + for (unsigned i = 1; i <= max; ++i) + lut[i] = result(100 + std::rand() % 150, + 100 + std::rand() % 150, + 100 + std::rand() % 150); + } + result operator()(unsigned i) const + { + return lut[i]; + } + std::vector<result> lut; +}; + + +bool is_chess(const point2d& p) +{ + return p.col() % 2 == p.row() % 2; +} + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.pgm nbh lambda output.ppm" << std::endl; + std::cerr << " nbh in {4, 6, 8}; lambda >= 0" << std::endl; + abort(); +} + + +template <typename I, typename N> +void do_it(const I& ima, + const N& nbh, + int lambda, + const std::string& filename) +{ + I grad = morpho_gradient(ima, nbh); + + I clo; + if (lambda > 1) + clo = morpho::closing_area(grad, nbh, lambda); + else + clo = grad; + + unsigned l; + mln_ch_value(I, unsigned) wst = morpho::meyer_wst(clo, nbh, l); + + std::cout << "nbasins = " << l << std::endl; +// debug::println(labeling::regional_minima(clo, nbh, l)); +// debug::println(wst); + + io::ppm::save(level::transform(wst, colorize(l)), filename); +} + + +int main(int argc, char* argv[]) +{ + if (argc != 5) + usage(argv); + + image2d<int_u8> ima; + + io::pgm::load(ima, argv[1]); + + int nbh_ = atoi(argv[2]); + if (! (nbh_ == 4 || nbh_ == 6 || nbh_ == 8)) + usage(argv); + + int lambda = atoi(argv[3]); + if (lambda < 0) + usage(argv); + + std::string filename(argv[4]); + + if (nbh_ == 4) + { + mln_VAR(nbh, c4()); + do_it(ima, nbh, lambda, filename); + } + else if (nbh_ == 8) + { + mln_VAR(nbh, c8()); + do_it(ima, nbh, lambda, filename); + } + else if (nbh_ == 6) + { + bool vert[] = { 1, 1, 0, + 1, 0, 1, + 0, 1, 1 }; + + bool hori[] = { 0, 1, 1, + 1, 0, 1, + 1, 1, 0 }; + + mln_VAR(nbh, make::double_neighb2d(is_chess, vert, hori)); + do_it(ima, nbh, lambda, filename); + } +} Index: geraud/laurent/wst3d.cc --- geraud/laurent/wst3d.cc (revision 0) +++ geraud/laurent/wst3d.cc (revision 0) @@ -0,0 +1,79 @@ +# include <cstdlib> +# include <cstdio> + +# include <mln/value/int_u16.hh> +# include <mln/value/int_u8.hh> +# include <mln/level/stretch.hh> + +# include <mln/io/pgm/load.hh> +# include <mln/io/ppm/save.hh> + +# include <mln/core/var.hh> +# include <mln/core/image/image3d.hh> +# include <mln/core/alias/neighb3d.hh> + +# include <mln/morpho/meyer_wst.hh> +# include <mln/morpho/closing_area.hh> +# include <mln/morpho/closing_volume.hh> + + + +using namespace mln; +using value::int_u8; + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.raw lambda output.ppm" << std::endl; + std::cerr << " lambda >= 0" << std::endl; + abort(); +} + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + using value::int_u16; + + if (argc != 3) + usage(argv); + + trace::quiet = false; + + image3d<int_u16> ima16(256, 256, 256, 0); + int size = 256 * 256 * 256 * 2; + + std::FILE* file = std::fopen(argv[1], "r"); + std::fread(ima16.buffer(), size, 1, file); + +// typedef image3d<int_u16> I; +// mln_piter_(I) p(ima16.domain()); +// for_all(p) +// if (ima16(p) != 0) +// std::cout << ima16(p) << std::endl; + +// abort(); + + int_u16 min_, max_; + estim::min_max(ima16, min_, max_); + std::cout << min_ << ' ' << max_ << std::endl; + + abort(); + + image3d<int_u8> ima(ima16.domain()); + level::stretch(ima16, ima); + ima16.destroy(); + + int lambda = atoi(argv[2]); + if (lambda < 0) + usage(argv); + + image3d<int_u8> clo(ima.domain()); + morpho::closing_volume(ima, c6(), lambda, clo); + + unsigned nbasins; + image3d<unsigned> wst = morpho::meyer_wst(clo, c6(), nbasins); + std::cout << "nbasins = " << nbasins << std::endl; +} Index: geraud/laurent/classif.cc --- geraud/laurent/classif.cc (revision 0) +++ geraud/laurent/classif.cc (revision 0) @@ -0,0 +1,115 @@ +#include <vector> +#include <mln/core/image/image2d.hh> +#include <mln/core/routine/clone.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/site_set/p_queue_fast.hh> +#include <mln/labeling/blobs.hh> +#include <mln/io/pbm/load.hh> +#include <mln/debug/println.hh> + + +namespace mln +{ + + template <typename I, typename N> + mln_concrete(I) + influence_zones(const I& input, const N& nbh) + { + mln_concrete(I) output = clone(input); + + p_queue_fast<mln_site(I)> q; + + // Init. + { + mln_piter(I) p(input.domain()); + mln_niter(N) n(nbh, p); + for_all(p) + if (input(p) != 0) + for_all(n) if (input.has(n)) + if (input(n) == 0) + { + q.push(p); + break; + } + } + + // Body. + { + mln_site(I) p; + mln_niter(N) n(nbh, p); + while (! q.is_empty()) + { + p = q.pop_front(); + mln_invariant(output(p) != 0); + for_all(n) if (input.has(n)) + if (output(n) == 0) + { + output(n) = output(p); + q.push(n); + } + } + } + + return output; + + } // IZ + + + template <typename I> + void + mk_graph(const I& iz, unsigned nlabels) + { + std::vector< std::vector<bool> > adj(nlabels + 1); + for (unsigned l = 1; l <= nlabels; ++l) + adj[l].resize(l, false); + + mln_piter(I) p(iz.domain()); + for_all(p) + { + mln_site(I) r = p + right, b = p + down; + if (iz.has(r) && iz(p) != iz(r)) + { + if (iz(p) < iz(r)) + adj[iz(p)][iz(r)] = true; + else + adj[iz(r)][iz(p)] = true; + } + if (iz.has(b) && iz(p) != iz(b)) + { + if (iz(p) < iz(b)) + adj[iz(p)][iz(b)] = true; + else + adj[iz(b)][iz(p)] = true; + } + } + + for (unsigned l1 = 1; l1 <= nlabels; ++l1) + for (unsigned l2 = 1; l2 <= nlabels; ++l2) + if (adj[l1][l2]) + std::cout << l1 << ' ' << l2 << std::endl; + } + +} + + + +int main() +{ + using namespace mln; + + border::thickness = 0; + + image2d<bool> seeds; + io::pbm::load(seeds, "+seeds.pbm"); + + debug::println(seeds); + + unsigned n; + image2d<unsigned> label = labeling::blobs(seeds, c4(), n); + debug::println(label); + + image2d<unsigned> iz = influence_zones(label, c4()); + debug::println(iz); + + mk_graph(iz, n); +} Index: geraud/laurent/segmentation.hh --- geraud/laurent/segmentation.hh (revision 0) +++ geraud/laurent/segmentation.hh (revision 0) @@ -0,0 +1,14 @@ + + +template <typename I, typename N> +mln_ch_value(I, rgb8) segmentation(const I& ima, + const N& nbh, + unsigned area) +{ + mln_concrete(I) filtered = morpho::closing_area(ima, nbh, area); + + unsigned nbasins; + mln_ch_value(I, unsigned) wst = morpho::wst_meyer(filtered, nbh, nbasins); + + return level::transform(wst, colorize(nbasins)); +}

1 0