- Olena-patches

2685: First attempt at generating a GraphViz' neato output.
by Guillaume Lazzara 24 Oct '08

24 Oct '08

* tests/morpho/complex_image_wst.cc: Generate a neato graph. --- milena/ChangeLog | 6 ++ milena/tests/morpho/complex_image_wst.cc | 111 +++++++++++++++++++++++++++++- 2 files changed, 116 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9994d8b..47a4f3a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2008-10-24 Roland Levillain <roland(a)lrde.epita.fr> + + First attempt at generating a GraphViz' neato output. + + * tests/morpho/complex_image_wst.cc: Generate a neato graph. + 2008-10-24 Nicolas Ballas <ballas(a)lrde.epita.fr> Update transform routine interface. diff --git a/milena/tests/morpho/complex_image_wst.cc b/milena/tests/morpho/complex_image_wst.cc index 88e5bc9..8060cee 100644 --- a/milena/tests/morpho/complex_image_wst.cc +++ b/milena/tests/morpho/complex_image_wst.cc @@ -29,8 +29,15 @@ /// \brief Testing Meyer's Watershed Transform on mln::complex_image. #include <iostream> +#include <fstream> +#include <sstream> +#include <iomanip> #include <mln/value/int_u8.hh> +#include <mln/value/rgb8.hh> +#include <mln/literal/black.hh> +#include <mln/literal/white.hh> + #include <mln/core/alias/point2d.hh> #include <mln/core/site_set/p_faces.hh> @@ -47,6 +54,29 @@ #include <mln/morpho/closing_area.hh> #include <mln/morpho/meyer_wst.hh> +#include <mln/core/concept/function.hh> + +// FIXME: To be put elsewhere (from milena/sandbox/geraud/wst_edge.cc). +struct colorize : mln::Function_v2v< colorize > +{ + typedef mln::value::rgb8 result; + colorize(unsigned max) + : lut(max + 1) + { + lut[0] = mln::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; +}; + + int main() { @@ -203,5 +233,84 @@ int main() 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; + wst_val_t actual_nbasins = nbasins - c.nfaces<0>(); + std::cout << "nbasins = " << actual_nbasins << std::endl; + + + colorize color(nbasins); + + std::ofstream g("wst.neato"); + g << "graph wst" << std::endl + << "{" << std::endl + << " graph [bgcolor = \"#000000\"]" << std::endl + << " edge [color = \"#FFFFFF\"]" << std::endl + << " node [color = \"#FFFFFF\", fontcolor = \"#FFFFFF\" ]" << std::endl; + + // Vertices. + typedef complex_higher_neighborhood<D, G> e_nbh_t; + e_nbh_t e_nbh; + mln_niter_(e_nbh_t) v_e(e_nbh, v_); + for_all(v_) + { + // Find the adjacent basin (color). + value::rgb8 basin_color = literal::white; + for_all(v_e) + if (wshed(v_e) != 0) + { + basin_color = color(wshed(v_e)); + break; + } + std::ostringstream basin_color_str; + basin_color_str << '#' + << std::hex + << std::setfill('0') + << std::setw(2) << basin_color.red() + << std::setw(2) << basin_color.green() + << std::setw(2) << basin_color.blue() + << std::dec; + + g << " v" << v_.unproxy_().face_id() + << " [pos = \"" + << std::fixed << std::setprecision(1) + << (float)v_.to_site().front()[1] << ", " + << -(float)v_.to_site().front()[0] + << "\", color = \"" << basin_color_str.str() + << "\", fillcolor = \"" << basin_color_str.str() + << "\", pin = \"true\", style=\"filled,setlinewidth(3)\"];" + << std::endl; + } + + for_all(e) + { + value::rgb8 basin_color = color(wshed(e)); + std::ostringstream basin_color_str; + basin_color_str << '#' + << std::hex + << std::setfill('0') + << std::setw(2) << basin_color.red() + << std::setw(2) << basin_color.green() + << std::setw(2) << basin_color.blue() + << std::dec; + + // Adjacent vertices. + v.start(); + topo::face<1> v1 = v.unproxy_().face(); + point2d p1 = v.to_site().front(); + v.next(); + topo::face<1> v2 = v.unproxy_().face(); + point2d p2 = v.to_site().front(); + v.next(); + mln_invariant(!v.is_valid()); + + // Edges. + g << " v" << v1.face_id() << " -- v" << v2.face_id() << " "; + if (wshed(e) == 0) + g << "[color = \"#FFFFFF\"];" << std::endl; + else + g << "[color = \"" << basin_color_str.str() + << "\", style=\"setlinewidth(3)\"];" << std::endl; + } + + g << "}" << std::endl; + g.close(); } -- 1.5.6.5

1 0

cleanup-2008 2684: Update morpho classif 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 morpho classif for LN. * geraud/laurent/classif.cc: Update. classif.cc | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) Index: geraud/laurent/classif.cc --- geraud/laurent/classif.cc (revision 2683) +++ geraud/laurent/classif.cc (working copy) @@ -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 @@ } +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 @@ 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 @@ } } + std::cout << "v size = " << v.size() << std::endl; + // 1-faces (edges). std::vector<edge> e; { @@ -226,6 +251,8 @@ e.push_back( c.add_face(-v[l-1] + v[ll-1]) ); } + std::cout << "e size = " << e.size() << std::endl; + } @@ -284,7 +311,7 @@ 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 @@ // 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 0

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