Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

last-svn-commit-250-g5946ef3 Configure milena/apps/generic-skel/Makefile.

by Roland Levillain

--- ChangeLog | 4 ++++ configure.ac | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index f3ef8a4..3b568b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-08-20 Roland Levillain <roland(a)lrde.epita.fr> + + * configure.ac: Configure milena/apps/generic-skel/Makefile. + 2010-06-24 Roland Levillain <roland(a)lrde.epita.fr> * configure.ac: Configure milena/tests/io/vtk/Makefile. diff --git a/configure.ac b/configure.ac index 6fc5465..c75afff 100644 --- a/configure.ac +++ b/configure.ac @@ -493,6 +493,7 @@ AM_CONDITIONAL([ENABLE_APPS], [test "x$enable_apps" = "xyes"]) AC_CONFIG_FILES([ milena/apps/Makefile milena/apps/constrained-connectivity/Makefile + milena/apps/generic-skel/Makefile milena/apps/graph-morpho/Makefile milena/apps/mesh-segm-skel/Makefile milena/apps/papers/Makefile -- 1.5.6.5

13 years, 9 months

branch skeletons deleted: last-svn-commit-207-ga087bc4

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch skeletons has been deleted was a087bc4d5c23b64db8ca8a3fe40c73387419ec70 ----------------------------------------------------------------------- a087bc4d5c23b64db8ca8a3fe40c73387419ec70 Catch up with the renaming to detach_cell. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 9 months

branch more-generic-skel deleted: last-svn-commit-212-g8cbc086

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch more-generic-skel has been deleted was 8cbc0864835adb146da03fde34e7f3328bc580a8 ----------------------------------------------------------------------- 8cbc0864835adb146da03fde34e7f3328bc580a8 Use mln::data::paste to simplify mesh skeleton applications. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 9 months

last-svn-commit-244-gf9882da New apps: max curvature-based thinnings using 2- and 1-collapses.

by Roland Levillain

* apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc, * apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc: New. * apps/mesh-segm-skel/test-mesh-complex-max-curv-2-collapse.in, * apps/mesh-segm-skel/test-mesh-complex-max-curv-1-collapse.in: New. * apps/mesh-segm-skel/Makefile.am (bin_PROGRAMS): Add mesh-complex-max-curv-2-collapse. And mesh-complex-max-curv-1-collapse (mesh_complex_max_curve_2_collapse_SOURCES) (mesh_complex_max_curve_1_collapse_SOURCES): New. (edit): New. (test-mesh-complex-max-curv-2-collapse) (test-mesh-complex-max-curv-1-collapse): New target. (TESTS, CLEANFILES): Add test-mesh-complex-max-curv-2-collapse and test-mesh-complex-max-curv-1-collapse. (MOSTLYCLEANFILES): Add teapot-max-curv-2-collapse.vtk, bunny-holefilled-max-curv-2-collapse.vtk, teapot-max-curv-1-collapse.vtk and bunny-holefilled-max-curv-1-collapse.vtk. --- milena/ChangeLog | 27 ++++ milena/apps/mesh-segm-skel/Makefile.am | 40 +++++ ...skel.cc => mesh-complex-max-curv-1-collapse.cc} | 153 +++++++++++++------- ...skel.cc => mesh-complex-max-curv-2-collapse.cc} | 95 ++++++------- ...in => test-mesh-complex-max-curv-1-collapse.in} | 3 +- ...in => test-mesh-complex-max-curv-2-collapse.in} | 3 +- 6 files changed, 220 insertions(+), 101 deletions(-) copy milena/apps/mesh-segm-skel/{mesh-complex-max-curv-skel.cc => mesh-complex-max-curv-1-collapse.cc} (68%) copy milena/apps/mesh-segm-skel/{mesh-complex-max-curv-skel.cc => mesh-complex-max-curv-2-collapse.cc} (81%) copy milena/apps/mesh-segm-skel/{test-mesh-complex-2-collapse.in => test-mesh-complex-max-curv-1-collapse.in} (77%) copy milena/apps/mesh-segm-skel/{test-mesh-complex-2-collapse.in => test-mesh-complex-max-curv-2-collapse.in} (77%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0f526db..aa71fb7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,32 @@ 2011-03-14 Roland Levillain <roland(a)lrde.epita.fr> + New apps: max curvature-based thinnings using 2- and 1-collapses. + + * apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc, + * apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc: + New. + * apps/mesh-segm-skel/test-mesh-complex-max-curv-2-collapse.in, + * apps/mesh-segm-skel/test-mesh-complex-max-curv-1-collapse.in: + New. + * apps/mesh-segm-skel/Makefile.am (bin_PROGRAMS): + Add mesh-complex-max-curv-2-collapse. + And mesh-complex-max-curv-1-collapse + (mesh_complex_max_curve_2_collapse_SOURCES) + (mesh_complex_max_curve_1_collapse_SOURCES): + New. + (edit): New. + (test-mesh-complex-max-curv-2-collapse) + (test-mesh-complex-max-curv-1-collapse): + New target. + (TESTS, CLEANFILES): Add test-mesh-complex-max-curv-2-collapse + and test-mesh-complex-max-curv-1-collapse. + (MOSTLYCLEANFILES): Add teapot-max-curv-2-collapse.vtk, + bunny-holefilled-max-curv-2-collapse.vtk, + teapot-max-curv-1-collapse.vtk and + bunny-holefilled-max-curv-1-collapse.vtk. + +2011-03-14 Roland Levillain <roland(a)lrde.epita.fr> + Add VTK versions of some OFF meshes. * mesh/bunny-holefilled.vtk, diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index 1b4d20f..4e06baf 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -209,6 +209,46 @@ TESTS += test-mesh-complex-2-collapse CLEANFILES = test-mesh-complex-2-collapse MOSTLYCLEANFILES += pseudo-manifold-2-collapse.vtk +# Program computing the max curvature from a mesh, then performing a +# 2-collapse on it. +bin_PROGRAMS += mesh-complex-max-curv-2-collapse +mesh_complex_max_curv_2_collapse_SOURCES = mesh-complex-max-curv-2-collapse.cc + +# FIXME: Factor action with test-mesh-complex-2-collapse's. +test-mesh-complex-max-curv-2-collapse: test-mesh-complex-max-curv-2-collapse.in Makefile + rm -f $@ $@.tmp + srcdir=''; \ + test -f ./$< || srcdir=$(srcdir)/; \ + $(edit) $${srcdir}$< >>$@.tmp + chmod a-w,a+x $@.tmp + mv $@.tmp $@ + +TESTS += test-mesh-complex-max-curv-2-collapse +CLEANFILES += test-mesh-complex-max-curv-2-collapse +MOSTLYCLEANFILES += \ + teapot-max-curv-2-collapse.vtk \ + bunny-holefilled-max-curv-2-collapse.vtk + +# Program computing the max curvature from a mesh, then performing a +# 1-collapse on it. +bin_PROGRAMS += mesh-complex-max-curv-1-collapse +mesh_complex_max_curv_1_collapse_SOURCES = mesh-complex-max-curv-1-collapse.cc + +# FIXME: Factor action with test-mesh-complex-1-collapse's. +test-mesh-complex-max-curv-1-collapse: test-mesh-complex-max-curv-1-collapse.in Makefile + rm -f $@ $@.tmp + srcdir=''; \ + test -f ./$< || srcdir=$(srcdir)/; \ + $(edit) $${srcdir}$< >>$@.tmp + chmod a-w,a+x $@.tmp + mv $@.tmp $@ + +TESTS += test-mesh-complex-max-curv-1-collapse +CLEANFILES += test-mesh-complex-max-curv-1-collapse +MOSTLYCLEANFILES += \ + teapot-max-curv-1-collapse.vtk \ + bunny-holefilled-max-curv-1-collapse.vtk + ## More complex skeletonization chains. ## ------------------------------------ diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc similarity index 68% copy from milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc copy to milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc index 2d55ff2..0cb29dd 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development // Laboratory (LRDE) // // This file is part of the Milena Library. This library is free @@ -26,13 +26,13 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc +/// \file /// \brief A program computing the maximal curvature values from the -/// surface of the (triangle) mesh of a statue, then computing a -/// skeleton of this surface (by thinning), using a complex-based -/// image. +/// surface of the (triangle) mesh of a statue, then performing a +/// 1-collapse of this surface, using a complex-based image. -// FIXME: Factor with mesh-complex-pinv-curv-skel.cc. +// FIXME: Factor with mesh-complex-max-curv-skel.cc and +// mesh-complex-pinv-curv-skel.cc, mesh-complex-max-curv-2-collapse.cc. #include <iostream> @@ -40,6 +40,7 @@ #include <mln/core/image/complex_neighborhoods.hh> #include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/core/image/dmorph/mutable_extension_ima.hh> #include <mln/core/routine/mutable_extend.hh> #include <mln/data/paste.hh> @@ -50,14 +51,12 @@ #include <mln/morpho/closing/area.hh> #include <mln/topo/is_n_face.hh> -#include <mln/topo/is_simple_cell.hh> -#include <mln/topo/detach_cell.hh> +#include <mln/topo/is_simple_pair.hh> +#include <mln/topo/detach_pair.hh> #include <mln/topo/skeleton/breadth_first_thinning.hh> -#include <mln/io/off/load.hh> -/* FIXME: Remove as soon as mln::io::off::save is able to save a - morphed mln::complex_image (i.e., seen through image_if). */ -#include "save_bin_alt.hh" +#include <mln/io/vtk/load.hh> +#include <mln/io/vtk/save.hh> #include "trimesh/misc.hh" @@ -67,7 +66,7 @@ main(int argc, char* argv[]) { if (argc != 4) { - std::cerr << "usage: " << argv[0] << " input.off lambda output.off" + std::cerr << "usage: " << argv[0] << " input.vtk lambda output.vtk" << std::endl; std::exit(1); } @@ -88,11 +87,11 @@ main(int argc, char* argv[]) typedef mln_geom_(float_ima_t) G; mln::bin_2complex_image3df bin_input; - mln::io::off::load(bin_input, input_filename); + mln::io::vtk::load(bin_input, input_filename); std::pair<float_ima_t, float_ima_t> curv = mln::geom::mesh_curvature(bin_input.domain()); - // Compute the pseudo_inverse curvature at each vertex. + // Compute the max curvature at each vertex. float_ima_t float_ima(bin_input.domain()); mln::p_n_faces_fwd_piter<D, G> v(float_ima.domain(), 0); for_all(v) @@ -103,7 +102,7 @@ main(int argc, char* argv[]) } // Values on triangles. - mln::p_n_faces_fwd_piter<D, G> t(float_ima.domain(), 2); + mln::p_n_faces_fwd_piter<D, G> t(float_ima.domain(), 2); // For each triangle (2-face) T, iterate on the the set of vertices // (0-faces) transitively adjacent to T. typedef mln::complex_m_face_neighborhood<D, G> adj_vertices_nbh_t; @@ -249,15 +248,15 @@ main(int argc, char* argv[]) mln_piter_(bin_ima_t) f(minima.domain()); for_all(f) if (minima(f) != mln::literal::zero) - surface(f) = false; + surface(f) = false; - /*-----------. - | Skeleton. | - `-----------*/ + /*-------------. + | 2-collapse. | + `-------------*/ - // ---------------- // - // Skeleton image. // - // ---------------- // + // ------------------------------- // + // Image restricted to triangles. // + // ------------------------------- // // Predicate type: is a face a triangle (2-face)? typedef mln::topo::is_n_face<mln_psite_(bin_ima_t), D> is_a_triangle_t; @@ -273,58 +272,114 @@ main(int argc, char* argv[]) // Simple point predicate. // // ------------------------ // - // Neighborhood type returning the set of (n-1)- and (n+1)-faces - // adjacent to a an n-face. - typedef mln::complex_lower_higher_neighborhood<D, G> adj_nbh_t; // Neighborhood type returning the set of (n-1)-faces adjacent to a // an n-face. typedef mln::complex_lower_neighborhood<D, G> lower_adj_nbh_t; + lower_adj_nbh_t lower_adj_nbh; // Neighborhood type returning the set of (n+1)-faces adjacent to a // an n-face. typedef mln::complex_higher_neighborhood<D, G> higher_adj_nbh_t; + higher_adj_nbh_t higher_adj_nbh; // Predicate type: is a triangle (2-face) simple? - typedef mln::topo::is_simple_cell< bin_triangle_ima_t, - adj_nbh_t, + typedef mln::topo::is_simple_pair< bin_triangle_ima_t, lower_adj_nbh_t, higher_adj_nbh_t > is_simple_triangle_t; - is_simple_triangle_t is_simple_triangle; + is_simple_triangle_t is_simple_triangle(lower_adj_nbh, higher_adj_nbh); // ------------------------------- // // Simple point detach procedure. // // ------------------------------- // - // Type of adjacency relationships between faces of immediately - // lower and higher dimensions. - adj_nbh_t adj_nbh; // Functor detaching a cell. - mln::topo::detach_cell<bin_triangle_ima_t, adj_nbh_t> detach(adj_nbh); + typedef mln::topo::detach_pair< bin_triangle_ima_t, + lower_adj_nbh_t, + higher_adj_nbh_t > detach_triangle_t; + detach_triangle_t detach_triangle(lower_adj_nbh, higher_adj_nbh); - mln_concrete_(bin_ima_t) skel; - mln::initialize(skel, surface); + // ------------------------ // + // Thinning by 2-collapse. // + // ------------------------ // + + mln_concrete_(bin_ima_t) surface_2_collapse; + mln::initialize(surface_2_collapse, surface); mln::data::paste (mln::topo::skeleton::breadth_first_thinning (mln::mutable_extend((surface | is_a_triangle).rw(), surface), nbh, is_simple_triangle, - detach), - skel); + detach_triangle) + /* Before pasting the result of the computation into + SURFACE_2_COLLAPSE, re-expand its domain to the initial site + set, to ensure data from all faces (i.e., both the 2-faces, + directly processed; and the 1-faces from the extension, + undirectly processed). */ + | surface.domain(), + surface_2_collapse); + + /*-------------. + | 1-collapse. | + `-------------*/ + + // --------------------------- // + // Image restricted to edges. // + // --------------------------- // + + // Predicate type: is a face an edge (1-face)? + typedef mln::topo::is_n_face<mln_psite_(bin_ima_t), D - 1> is_an_edge_t; + is_an_edge_t is_an_edge; + // Surface image type, of which domain is restricted to edges. + typedef mln::image_if<bin_ima_t, is_an_edge_t> bin_edge_only_ima_t; + // Surface image type, of which iteration (not domain) is restricted + // to edges. + typedef mln::mutable_extension_ima<bin_edge_only_ima_t, bin_ima_t> + bin_edge_ima_t; + + // ------------------------ // + // Simple point predicate. // + // ------------------------ // + + // Predicate type: is a edge (1-face) simple? + typedef mln::topo::is_simple_pair< bin_edge_ima_t, + lower_adj_nbh_t, + higher_adj_nbh_t > + is_simple_edge_t; + is_simple_edge_t is_simple_edge(lower_adj_nbh, higher_adj_nbh); + // ------------------------------- // + // Simple point detach procedure. // + // ------------------------------- // + + // Functor detaching a cell. + typedef mln::topo::detach_pair< bin_edge_ima_t, + lower_adj_nbh_t, + higher_adj_nbh_t > detach_edge_t; + detach_edge_t detach_edge(lower_adj_nbh, higher_adj_nbh); + + // ------------------------ // + // Thinning by 1-collapse. // + // ------------------------ // + + mln_concrete_(bin_ima_t) surface_1_collapse; + mln::initialize(surface_1_collapse, surface_2_collapse); + mln::data::paste + (mln::topo::skeleton::breadth_first_thinning + (mln::mutable_extend((surface_2_collapse | is_an_edge).rw(), + surface_2_collapse), + nbh, + is_simple_edge, + detach_edge) + /* Likewise, before pasting the result of the computation into + SURFACE_1_COLLAPSE, re-expand its domain to the initial site + set, to ensure data from all faces (i.e., both the 1-faces, + directly processed; and the 0-faces from the extension, + undirectly processed). */ + | surface_2_collapse.domain(), + surface_1_collapse); /*---------. | Output. | `---------*/ - /* FIXME: This does not work (yet). - Use workaround mln::io::off::save_bin_alt instead (bad!) - - Moreover, even if it worked, it would not have the same meaning - as mln::io::off::save_bin_alt. Maybe the latter is useful, after - all. But we need to factor it with the code of - mln::io::off::save, anyway. */ -#if 0 - mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), - output_filename); -#endif - mln::io::off::save_bin_alt(skel, output_filename); + mln::io::vtk::save(surface_1_collapse, output_filename); } diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc similarity index 81% copy from milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc copy to milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc index 2d55ff2..233756d 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development // Laboratory (LRDE) // // This file is part of the Milena Library. This library is free @@ -26,13 +26,13 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc +/// \file /// \brief A program computing the maximal curvature values from the -/// surface of the (triangle) mesh of a statue, then computing a -/// skeleton of this surface (by thinning), using a complex-based -/// image. +/// surface of the (triangle) mesh of a statue, then performing a +/// 2-collapse of this surface, using a complex-based image. -// FIXME: Factor with mesh-complex-pinv-curv-skel.cc. +// FIXME: Factor with mesh-complex-max-curv-skel.cc and +// mesh-complex-pinv-curv-skel.cc, mesh-complex-max-curv-1-collapse.cc #include <iostream> @@ -40,6 +40,7 @@ #include <mln/core/image/complex_neighborhoods.hh> #include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/image/dmorph/sub_image.hh> #include <mln/core/image/dmorph/mutable_extension_ima.hh> #include <mln/core/routine/mutable_extend.hh> #include <mln/data/paste.hh> @@ -50,14 +51,12 @@ #include <mln/morpho/closing/area.hh> #include <mln/topo/is_n_face.hh> -#include <mln/topo/is_simple_cell.hh> -#include <mln/topo/detach_cell.hh> +#include <mln/topo/is_simple_pair.hh> +#include <mln/topo/detach_pair.hh> #include <mln/topo/skeleton/breadth_first_thinning.hh> -#include <mln/io/off/load.hh> -/* FIXME: Remove as soon as mln::io::off::save is able to save a - morphed mln::complex_image (i.e., seen through image_if). */ -#include "save_bin_alt.hh" +#include <mln/io/vtk/load.hh> +#include <mln/io/vtk/save.hh> #include "trimesh/misc.hh" @@ -67,7 +66,7 @@ main(int argc, char* argv[]) { if (argc != 4) { - std::cerr << "usage: " << argv[0] << " input.off lambda output.off" + std::cerr << "usage: " << argv[0] << " input.vtk lambda output.vtk" << std::endl; std::exit(1); } @@ -88,11 +87,11 @@ main(int argc, char* argv[]) typedef mln_geom_(float_ima_t) G; mln::bin_2complex_image3df bin_input; - mln::io::off::load(bin_input, input_filename); + mln::io::vtk::load(bin_input, input_filename); std::pair<float_ima_t, float_ima_t> curv = mln::geom::mesh_curvature(bin_input.domain()); - // Compute the pseudo_inverse curvature at each vertex. + // Compute the max curvature at each vertex. float_ima_t float_ima(bin_input.domain()); mln::p_n_faces_fwd_piter<D, G> v(float_ima.domain(), 0); for_all(v) @@ -103,7 +102,7 @@ main(int argc, char* argv[]) } // Values on triangles. - mln::p_n_faces_fwd_piter<D, G> t(float_ima.domain(), 2); + mln::p_n_faces_fwd_piter<D, G> t(float_ima.domain(), 2); // For each triangle (2-face) T, iterate on the the set of vertices // (0-faces) transitively adjacent to T. typedef mln::complex_m_face_neighborhood<D, G> adj_vertices_nbh_t; @@ -249,15 +248,15 @@ main(int argc, char* argv[]) mln_piter_(bin_ima_t) f(minima.domain()); for_all(f) if (minima(f) != mln::literal::zero) - surface(f) = false; + surface(f) = false; - /*-----------. - | Skeleton. | - `-----------*/ + /*-------------. + | 2-collapse. | + `-------------*/ - // ---------------- // - // Skeleton image. // - // ---------------- // + // ------------------------------- // + // Image restricted to triangles. // + // ------------------------------- // // Predicate type: is a face a triangle (2-face)? typedef mln::topo::is_n_face<mln_psite_(bin_ima_t), D> is_a_triangle_t; @@ -273,58 +272,54 @@ main(int argc, char* argv[]) // Simple point predicate. // // ------------------------ // - // Neighborhood type returning the set of (n-1)- and (n+1)-faces - // adjacent to a an n-face. - typedef mln::complex_lower_higher_neighborhood<D, G> adj_nbh_t; // Neighborhood type returning the set of (n-1)-faces adjacent to a // an n-face. typedef mln::complex_lower_neighborhood<D, G> lower_adj_nbh_t; + lower_adj_nbh_t lower_adj_nbh; // Neighborhood type returning the set of (n+1)-faces adjacent to a // an n-face. typedef mln::complex_higher_neighborhood<D, G> higher_adj_nbh_t; + higher_adj_nbh_t higher_adj_nbh; // Predicate type: is a triangle (2-face) simple? - typedef mln::topo::is_simple_cell< bin_triangle_ima_t, - adj_nbh_t, + typedef mln::topo::is_simple_pair< bin_triangle_ima_t, lower_adj_nbh_t, higher_adj_nbh_t > is_simple_triangle_t; - is_simple_triangle_t is_simple_triangle; + is_simple_triangle_t is_simple_triangle(lower_adj_nbh, higher_adj_nbh); // ------------------------------- // // Simple point detach procedure. // // ------------------------------- // - // Type of adjacency relationships between faces of immediately - // lower and higher dimensions. - adj_nbh_t adj_nbh; // Functor detaching a cell. - mln::topo::detach_cell<bin_triangle_ima_t, adj_nbh_t> detach(adj_nbh); + typedef mln::topo::detach_pair< bin_triangle_ima_t, + lower_adj_nbh_t, + higher_adj_nbh_t > detach_triangle_t; + detach_triangle_t detach_triangle(lower_adj_nbh, higher_adj_nbh); + + // ------------------------ // + // Thinning by 2-collapse. // + // ------------------------ // - mln_concrete_(bin_ima_t) skel; - mln::initialize(skel, surface); + mln_concrete_(bin_ima_t) surface_2_collapse; + mln::initialize(surface_2_collapse, surface); mln::data::paste (mln::topo::skeleton::breadth_first_thinning (mln::mutable_extend((surface | is_a_triangle).rw(), surface), nbh, is_simple_triangle, - detach), - skel); - + detach_triangle) + /* Before pasting the result of the computation into + SURFACE_2_COLLAPSE, re-expand its domain to the initial site + set, to ensure data from all faces (i.e., both the 2-faces, + directly processed; and the 1-faces from the extension, + undirectly processed). */ + | surface.domain(), + surface_2_collapse); /*---------. | Output. | `---------*/ - /* FIXME: This does not work (yet). - Use workaround mln::io::off::save_bin_alt instead (bad!) - - Moreover, even if it worked, it would not have the same meaning - as mln::io::off::save_bin_alt. Maybe the latter is useful, after - all. But we need to factor it with the code of - mln::io::off::save, anyway. */ -#if 0 - mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), - output_filename); -#endif - mln::io::off::save_bin_alt(skel, output_filename); + mln::io::vtk::save(surface_2_collapse, output_filename); } diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-2-collapse.in b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-1-collapse.in similarity index 77% copy from milena/apps/mesh-segm-skel/test-mesh-complex-2-collapse.in copy to milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-1-collapse.in index d2a286b..0bc967e 100644 --- a/milena/apps/mesh-segm-skel/test-mesh-complex-2-collapse.in +++ b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-1-collapse.in @@ -20,4 +20,5 @@ set -ex mesh_dir=@top_srcdir@/milena/mesh -time ./mesh-complex-2-collapse $mesh_dir/pseudo-manifold.vtk pseudo-manifold-2-collapse.vtk +time ./mesh-complex-max-curv-1-collapse $mesh_dir/teapot.vtk 20 teapot-max-curv-1-collapse.vtk +time ./mesh-complex-max-curv-1-collapse $mesh_dir/bunny-holefilled.vtk 50 bunny-holefilled-max-curv-1-collapse.vtk diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-2-collapse.in b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-2-collapse.in similarity index 77% copy from milena/apps/mesh-segm-skel/test-mesh-complex-2-collapse.in copy to milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-2-collapse.in index d2a286b..4edf55f 100644 --- a/milena/apps/mesh-segm-skel/test-mesh-complex-2-collapse.in +++ b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-2-collapse.in @@ -20,4 +20,5 @@ set -ex mesh_dir=@top_srcdir@/milena/mesh -time ./mesh-complex-2-collapse $mesh_dir/pseudo-manifold.vtk pseudo-manifold-2-collapse.vtk +time ./mesh-complex-max-curv-2-collapse $mesh_dir/teapot.vtk 20 teapot-max-curv-2-collapse.vtk +time ./mesh-complex-max-curv-2-collapse $mesh_dir/bunny-holefilled.vtk 50 bunny-holefilled-max-curv-2-collapse.vtk -- 1.5.6.5

13 years, 9 months

last-svn-commit-245-gb84bea1 Miscellaneous changes in mesh-related operations.

by Roland Levillain

* mln/topo/is_simple_cell.hh: Add static preconditions. Reduce the number of pointer manipulations. Aesthetic changes. * mln/topo/detach_cell.hh: Move a static precondition. Aesthetic changes. * mln/io/vtk/save.hh: Cosmetic changes. --- milena/ChangeLog | 11 +++++++++++ milena/mln/io/vtk/save.hh | 8 ++++++-- milena/mln/topo/detach_cell.hh | 22 ++++++++++++---------- milena/mln/topo/is_simple_cell.hh | 24 ++++++++++++++---------- 4 files changed, 43 insertions(+), 22 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index aa71fb7..63b6054 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2011-03-14 Roland Levillain <roland(a)lrde.epita.fr> + Miscellaneous changes in mesh-related operations. + + * mln/topo/is_simple_cell.hh: Add static preconditions. + Reduce the number of pointer manipulations. + Aesthetic changes. + * mln/topo/detach_cell.hh: Move a static precondition. + Aesthetic changes. + * mln/io/vtk/save.hh: Cosmetic changes. + +2011-03-14 Roland Levillain <roland(a)lrde.epita.fr> + New apps: max curvature-based thinnings using 2- and 1-collapses. * apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc, diff --git a/milena/mln/io/vtk/save.hh b/milena/mln/io/vtk/save.hh index fbe5a85..142608a 100644 --- a/milena/mln/io/vtk/save.hh +++ b/milena/mln/io/vtk/save.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -269,7 +269,7 @@ namespace mln /* ``1. The first part is the file version and identifier. This part contains the single line: - # vtk DataFile Version x.x. + # vtk DataFile Version x.x. This line must be exactly as shown with the exception of the version number x.x, which will vary @@ -492,6 +492,10 @@ namespace mln ostr << std::endl; } + // -------------------- // + // Dataset attributes. // + // -------------------- // + /* ``5. The final part describes the dataset attributes. This part begins with the keywords POINT_DATA or CELL_DATA,followed by an integer number specifying diff --git a/milena/mln/topo/detach_cell.hh b/milena/mln/topo/detach_cell.hh index 761142e..0bf442c 100644 --- a/milena/mln/topo/detach_cell.hh +++ b/milena/mln/topo/detach_cell.hh @@ -30,10 +30,15 @@ /// \file /// \brief Detaching a cell from a binary (probably complex-based) image. +# include <mln/core/concept/function.hh> +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> + # include <mln/core/site_set/p_set.hh> -# include <mln/core/image/complex_image.hh> + # include <mln/make/detachment.hh> + namespace mln { @@ -66,7 +71,7 @@ namespace mln \pre \a ima is an image of Boolean values. \param ima The input image from which the cell is to be - detached. + detached. \param nbh An adjacency relationship between faces (should return the set of (n-1)- and (n+1)-faces adjacent to an n-face). */ @@ -80,14 +85,10 @@ namespace mln \pre \a ima is an image of Boolean values. */ void set_image(mln::Image& ima); - /** Detach the cell corresponding to \a f from \a ima. + /** Detach the cell corresponding to \a f from \a ima_. - \param f The psite corresponding to the cell to detach. - \param nbh An adjacency relationship between faces - (should return the set of (n-1)- and (n+1)-faces - adjacent to an n-face). */ - void - operator()(const mln_psite(I)& f); + \param f The psite corresponding to the cell to detach. */ + void operator()(const mln_psite(I)& f); private: I* ima_; @@ -95,6 +96,7 @@ namespace mln }; + # ifndef MLN_INCLUDE_ONLY template <typename I, typename N> @@ -102,6 +104,7 @@ namespace mln detach_cell<I, N>::detach_cell(const Neighborhood<N>& nbh) : ima_(0), nbh_(exact(nbh)) { + mlc_equal(mln_value(I), bool)::check(); } template <typename I, typename N> @@ -118,7 +121,6 @@ namespace mln void detach_cell<I, N>::set_image(mln::Image& ima) { - mlc_equal(mln_value(I), bool)::check(); ima_ = exact(&ima); } diff --git a/milena/mln/topo/is_simple_cell.hh b/milena/mln/topo/is_simple_cell.hh index 8796c16..9f1491a 100644 --- a/milena/mln/topo/is_simple_cell.hh +++ b/milena/mln/topo/is_simple_cell.hh @@ -34,15 +34,15 @@ # include <mln/core/concept/image.hh> # include <mln/core/site_set/p_set.hh> -# include <mln/core/site_set/complex_psite.hh> -# include <mln/core/site_set/p_complex_piter.hh> -# include <mln/core/image/complex_neighborhoods.hh> -# include <mln/core/image/complex_neighborhood_piter.hh> # include <mln/topo/is_facet.hh> # include <mln/make/attachment.hh> +// FIXME: Have the functor take N, NL and NH neighborhood objects at +// the construction (instead of building them in operator()), as in +// does is_simple_pair. + namespace mln { @@ -69,7 +69,8 @@ namespace mln \tparam NH The neighborhood type returning the set of (n+1)-faces adjacent to a an n-face. */ template <typename I, typename N, typename NL, typename NH> - class is_simple_cell : public mln::Function_v2b< is_simple_cell<I, N, NL, NH> > + class is_simple_cell + : public mln::Function_v2b< is_simple_cell<I, N, NL, NH> > { public: /// Result type of the functor. @@ -108,6 +109,7 @@ namespace mln is_simple_cell<I, N, NL, NH>::is_simple_cell() : ima_(0) { + mlc_equal(mln_value(I), bool)::check(); } template <typename I, typename N, typename NL, typename NH> @@ -115,6 +117,7 @@ namespace mln is_simple_cell<I, N, NL, NH>::is_simple_cell(const mln::Image& ima) : ima_(exact(&ima)) { + mlc_equal(mln_value(I), bool)::check(); } template <typename I, typename N, typename NL, typename NH> @@ -131,23 +134,24 @@ namespace mln is_simple_cell<I, N, NL, NH>::operator()(const mln_psite(I)& p) const { mln_precondition(ima_); - // FIXME: Introduce `const I& ima = *ima_;' and use it instead of - // `ima_'. Or introduce an `ima()' accessor? + // Shortcut. + // FIXME: Introduce an `ima()' accessor instead? + const I& ima = *ima_; // The cell corresponding to P cannot be simple unless P is // facet. { NH higher_adj_nbh; - if (!is_facet(*ima_, p, higher_adj_nbh)) + if (!is_facet(ima, p, higher_adj_nbh)) return false; } typedef p_set<mln_psite(I)> faces_t; // Compute the attachment of the cell corresponding to P to the - // domain of *IMA_. + // domain of IMA. N adj_nbh; - faces_t att = make::attachment(*ima_, p, adj_nbh); + faces_t att = make::attachment(ima, p, adj_nbh); // A cell with an empty attachment is not simple. /* FIXME: Why p_set does not provide an empty() predicate? */ -- 1.5.6.5

13 years, 9 months

last-svn-commit-246-gf714e94 Simplify curvature-based thinnings using 2- and 1-collapses apps.

by Roland Levillain

* apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc, * apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc: Here. --- milena/ChangeLog | 8 + .../mesh-complex-max-curv-1-collapse.cc | 196 +++++++++----------- .../mesh-complex-max-curv-2-collapse.cc | 193 +++++++++---------- 3 files changed, 188 insertions(+), 209 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 63b6054..8c32c8b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2011-03-20 Roland Levillain <roland(a)lrde.epita.fr> + + Simplify curvature-based thinnings using 2- and 1-collapses apps. + + * apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc, + * apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc: + Here. + 2011-03-14 Roland Levillain <roland(a)lrde.epita.fr> Miscellaneous changes in mesh-related operations. diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc index 0cb29dd..8b12030 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc @@ -41,7 +41,7 @@ #include <mln/core/image/dmorph/image_if.hh> #include <mln/core/image/dmorph/sub_image.hh> -#include <mln/core/image/dmorph/mutable_extension_ima.hh> +#include <mln/core/routine/extend.hh> #include <mln/core/routine/mutable_extend.hh> #include <mln/data/paste.hh> @@ -49,6 +49,7 @@ #include <mln/labeling/regional_minima.hh> #include <mln/morpho/closing/area.hh> +#include <mln/morpho/dilation.hh> #include <mln/topo/is_n_face.hh> #include <mln/topo/is_simple_pair.hh> @@ -101,31 +102,57 @@ main(int argc, char* argv[]) mln::math::sqr(curv.second(v))); } + // Neighborhood type returning the set of (n-1)-faces adjacent to a + // an n-face. + typedef mln::complex_lower_neighborhood<D, G> lower_adj_nbh_t; + lower_adj_nbh_t lower_adj_nbh; + + // Values on edges. + /* FIXME: We could probably simplify this by using a + convolution-like operator and morphers (see + apps/graph-morpho). */ + mln::p_n_faces_fwd_piter<D, G> e(float_ima.domain(), 1); + // For each edge (1-face) E, iterate on the the set of vertices + // (0-faces) adjacent to E. + mln_niter_(lower_adj_nbh_t) adj_v(lower_adj_nbh, e); + // Iterate on edges (1-faces). + for_all(e) + { + float s = 0.0f; + unsigned n = 0; + // Iterate on vertices (0-faces). + for_all(adj_v) + { + s += float_ima(adj_v); + ++n; + } + float_ima(e) = s / n; + // An edge should be adjacent to exactly two vertices. + mln_invariant(n == 2); + } + // Values on triangles. + /* FIXME: We could probably simplify this by using a + convolution-like operator and morphers (see + apps/graph-morpho). */ mln::p_n_faces_fwd_piter<D, G> t(float_ima.domain(), 2); - // For each triangle (2-face) T, iterate on the the set of vertices - // (0-faces) transitively adjacent to T. - typedef mln::complex_m_face_neighborhood<D, G> adj_vertices_nbh_t; - adj_vertices_nbh_t adj_vertices_nbh; - mln_niter_(adj_vertices_nbh_t) adj_v(adj_vertices_nbh, t); - /* FIXME: We should be able to pass this value (m) either at the - construction of the neighborhood or at the construction of the - iterator. */ - adj_v.iter().set_m(0); + // For each triangle (2-face) T, iterate on the the set of edges + // (1-faces) adjacent to T. + mln_niter_(lower_adj_nbh_t) adj_e(lower_adj_nbh, t); // Iterate on triangles (2-faces). for_all(t) { float s = 0.0f; unsigned n = 0; - // Iterate on vertices (0-faces). - for_all(adj_v) + // Iterate on edges (1-faces). + for_all(adj_e) { - s += float_ima(adj_v); + s += float_ima(adj_e); ++n; } float_ima(t) = s / n; - // A triangle should be adjacent to exactly two vertices. - mln_invariant(n <= 3); + // A triangle should be adjacent to exactly three edges. + mln_invariant(n == 3); } // Convert the float image into an unsigned image because some @@ -141,14 +168,6 @@ main(int argc, char* argv[]) for_all(t) ima(t) = 1000 * float_ima(t); - /* FIXME: Workaround: Set maximal values on vertices and edges to - exclude them from the set of minimal values. */ - for_all(v) - ima(v) = mln_max(mln_value_(ima_t)); - mln::p_n_faces_fwd_piter<D, G> e(float_ima.domain(), 1); - for_all(e) - ima(e) = mln_max(mln_value_(ima_t)); - /*-----------------. | Simplification. | `-----------------*/ @@ -157,7 +176,15 @@ main(int argc, char* argv[]) typedef mln::complex_lower_dim_connected_n_face_neighborhood<D, G> nbh_t; nbh_t nbh; - ima_t closed_ima = mln::morpho::closing::area(ima, nbh, lambda); + // Predicate type: is a face a triangle (2-face)? + typedef mln::topo::is_n_face<mln_psite_(ima_t), 2> is_a_triangle_t; + is_a_triangle_t is_a_triangle; + + // Consider only triangles. + ima_t closed_ima = mln::duplicate(ima); + mln::data::paste(mln::morpho::closing::area(ima | is_a_triangle, + nbh, lambda), + closed_ima); /*---------------. | Local minima. | @@ -166,68 +193,13 @@ main(int argc, char* argv[]) typedef mln::value::label_16 label_t; label_t nminima; - /* FIXME: We should use something like `ima_t | p_n_faces(2)' instead - of `ima_t' here. Or better: `input' should only associate data - to 2-faces. */ + // Consider only triangles. typedef mln_ch_value_(ima_t, label_t) label_ima_t; - label_ima_t minima = - mln::labeling::regional_minima(closed_ima, nbh, nminima); - - typedef mln::complex_higher_neighborhood<D, G> higher_nbh_t; - higher_nbh_t higher_nbh; - - // Propagate minima values from triangles to edges. - // FIXME: Factor this inside a function. - mln_niter_(higher_nbh_t) adj_t(higher_nbh, e); - for_all(e) - { - label_t ref_adj_minimum = mln::literal::zero; - for_all(adj_t) - if (minima(adj_t) == mln::literal::zero) - { - // If E is adjacent to a non-minimal triangle, then it must - // not belong to a minima. - ref_adj_minimum = mln::literal::zero; - break; - } - else - { - if (ref_adj_minimum == mln::literal::zero) - // If this is the first minimum seen, use it as a reference. - ref_adj_minimum = minima(adj_t); - else - // If this is not the first time a minimum is encountered, - // ensure it is REF_ADJ_MINIMUM. - mln_assertion(minima(adj_t) == ref_adj_minimum); - } - minima(e) = ref_adj_minimum; - } - - // Likewise from edges to edges to vertices. - mln_niter_(higher_nbh_t) adj_e(higher_nbh, v); - for_all(v) - { - label_t ref_adj_minimum = mln::literal::zero; - for_all(adj_e) - if (minima(adj_e) == mln::literal::zero) - { - // If V is adjacent to a non-minimal triangle, then it must - // not belong to a minima. - ref_adj_minimum = mln::literal::zero; - break; - } - else - { - if (ref_adj_minimum == mln::literal::zero) - // If this is the first minimum seen, use it as a reference. - ref_adj_minimum = minima(adj_e); - else - // If this is not the first time a minimum is encountered, - // ensure it is REF_ADJ_MINIMUM. - mln_assertion(minima(adj_e) == ref_adj_minimum); - } - minima(v) = ref_adj_minimum; - } + label_ima_t minima; + mln::initialize(minima, closed_ima); + mln::data::paste(mln::labeling::regional_minima(closed_ima | is_a_triangle, + nbh, nminima), + minima); /*-----------------------. | Initial binary image. | @@ -242,13 +214,39 @@ main(int argc, char* argv[]) typedef mln_ch_value_(ima_t, bool) bin_ima_t; bin_ima_t surface(minima.domain()); - mln::data::fill(surface, true); - // Dig ``holes'' in the surface surface by setting minima faces to false. - // FIXME: Use fill with an image_if instead, when available/working. - mln_piter_(bin_ima_t) f(minima.domain()); - for_all(f) - if (minima(f) != mln::literal::zero) - surface(f) = false; + + // Predicate type: is a face an edge (1-face)? + typedef mln::topo::is_n_face<mln_psite_(ima_t), 1> is_an_edge_t; + is_an_edge_t is_an_edge; + // Predicate type: is a face a vertex (0-face)? + typedef mln::topo::is_n_face<mln_psite_(ima_t), 0> is_a_vertex_t; + is_a_vertex_t is_a_vertex; + + // Neighborhood type returning the set of (n+1)-faces adjacent to a + // an n-face. + typedef mln::complex_higher_neighborhood<D, G> higher_adj_nbh_t; + higher_adj_nbh_t higher_adj_nbh; + + mln::data::fill(surface, false); + // Set non minima triangles to true; + mln::data::fill + ((surface | + mln::pw::value(minima) == mln::pw::cst(mln::literal::zero)).rw(), + true); + // Extend non minima values from triangles to edges. + mln::data::paste (mln::morpho::dilation(mln::extend(surface | is_an_edge, + surface), + /* Dilations require windows, + not neighborhoods. */ + higher_adj_nbh.win()), + surface); + // Extend non minima values from edges to vertices. + mln::data::paste(mln::morpho::dilation(mln::extend(surface | is_a_vertex, + surface), + /* Dilations require windows, + not neighborhoods. */ + higher_adj_nbh.win()), + surface); /*-------------. | 2-collapse. | @@ -258,9 +256,6 @@ main(int argc, char* argv[]) // Image restricted to triangles. // // ------------------------------- // - // Predicate type: is a face a triangle (2-face)? - typedef mln::topo::is_n_face<mln_psite_(bin_ima_t), D> is_a_triangle_t; - is_a_triangle_t is_a_triangle; // Surface image type, of which domain is restricted to triangles. typedef mln::image_if<bin_ima_t, is_a_triangle_t> bin_triangle_only_ima_t; // Surface image type, of which iteration (not domain) is restricted @@ -272,14 +267,6 @@ main(int argc, char* argv[]) // Simple point predicate. // // ------------------------ // - // Neighborhood type returning the set of (n-1)-faces adjacent to a - // an n-face. - typedef mln::complex_lower_neighborhood<D, G> lower_adj_nbh_t; - lower_adj_nbh_t lower_adj_nbh; - // Neighborhood type returning the set of (n+1)-faces adjacent to a - // an n-face. - typedef mln::complex_higher_neighborhood<D, G> higher_adj_nbh_t; - higher_adj_nbh_t higher_adj_nbh; // Predicate type: is a triangle (2-face) simple? typedef mln::topo::is_simple_pair< bin_triangle_ima_t, lower_adj_nbh_t, @@ -325,9 +312,6 @@ main(int argc, char* argv[]) // Image restricted to edges. // // --------------------------- // - // Predicate type: is a face an edge (1-face)? - typedef mln::topo::is_n_face<mln_psite_(bin_ima_t), D - 1> is_an_edge_t; - is_an_edge_t is_an_edge; // Surface image type, of which domain is restricted to edges. typedef mln::image_if<bin_ima_t, is_an_edge_t> bin_edge_only_ima_t; // Surface image type, of which iteration (not domain) is restricted diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc index 233756d..c88f10d 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc @@ -41,7 +41,7 @@ #include <mln/core/image/dmorph/image_if.hh> #include <mln/core/image/dmorph/sub_image.hh> -#include <mln/core/image/dmorph/mutable_extension_ima.hh> +#include <mln/core/routine/extend.hh> #include <mln/core/routine/mutable_extend.hh> #include <mln/data/paste.hh> @@ -49,6 +49,7 @@ #include <mln/labeling/regional_minima.hh> #include <mln/morpho/closing/area.hh> +#include <mln/morpho/dilation.hh> #include <mln/topo/is_n_face.hh> #include <mln/topo/is_simple_pair.hh> @@ -101,31 +102,57 @@ main(int argc, char* argv[]) mln::math::sqr(curv.second(v))); } + // Neighborhood type returning the set of (n-1)-faces adjacent to a + // an n-face. + typedef mln::complex_lower_neighborhood<D, G> lower_adj_nbh_t; + lower_adj_nbh_t lower_adj_nbh; + + // Values on edges. + /* FIXME: We could probably simplify this by using a + convolution-like operator and morphers (see + apps/graph-morpho). */ + mln::p_n_faces_fwd_piter<D, G> e(float_ima.domain(), 1); + // For each edge (1-face) E, iterate on the the set of vertices + // (0-faces) adjacent to E. + mln_niter_(lower_adj_nbh_t) adj_v(lower_adj_nbh, e); + // Iterate on edges (1-faces). + for_all(e) + { + float s = 0.0f; + unsigned n = 0; + // Iterate on vertices (0-faces). + for_all(adj_v) + { + s += float_ima(adj_v); + ++n; + } + float_ima(e) = s / n; + // An edge should be adjacent to exactly two vertices. + mln_invariant(n == 2); + } + // Values on triangles. + /* FIXME: We could probably simplify this by using a + convolution-like operator and morphers (see + apps/graph-morpho). */ mln::p_n_faces_fwd_piter<D, G> t(float_ima.domain(), 2); - // For each triangle (2-face) T, iterate on the the set of vertices - // (0-faces) transitively adjacent to T. - typedef mln::complex_m_face_neighborhood<D, G> adj_vertices_nbh_t; - adj_vertices_nbh_t adj_vertices_nbh; - mln_niter_(adj_vertices_nbh_t) adj_v(adj_vertices_nbh, t); - /* FIXME: We should be able to pass this value (m) either at the - construction of the neighborhood or at the construction of the - iterator. */ - adj_v.iter().set_m(0); + // For each triangle (2-face) T, iterate on the the set of edges + // (1-faces) adjacent to T. + mln_niter_(lower_adj_nbh_t) adj_e(lower_adj_nbh, t); // Iterate on triangles (2-faces). for_all(t) { float s = 0.0f; unsigned n = 0; - // Iterate on vertices (0-faces). - for_all(adj_v) + // Iterate on edges (1-faces). + for_all(adj_e) { - s += float_ima(adj_v); + s += float_ima(adj_e); ++n; } float_ima(t) = s / n; - // A triangle should be adjacent to exactly two vertices. - mln_invariant(n <= 3); + // A triangle should be adjacent to exactly three edges. + mln_invariant(n == 3); } // Convert the float image into an unsigned image because some @@ -141,14 +168,6 @@ main(int argc, char* argv[]) for_all(t) ima(t) = 1000 * float_ima(t); - /* FIXME: Workaround: Set maximal values on vertices and edges to - exclude them from the set of minimal values. */ - for_all(v) - ima(v) = mln_max(mln_value_(ima_t)); - mln::p_n_faces_fwd_piter<D, G> e(float_ima.domain(), 1); - for_all(e) - ima(e) = mln_max(mln_value_(ima_t)); - /*-----------------. | Simplification. | `-----------------*/ @@ -157,7 +176,15 @@ main(int argc, char* argv[]) typedef mln::complex_lower_dim_connected_n_face_neighborhood<D, G> nbh_t; nbh_t nbh; - ima_t closed_ima = mln::morpho::closing::area(ima, nbh, lambda); + // Predicate type: is a face a triangle (2-face)? + typedef mln::topo::is_n_face<mln_psite_(ima_t), 2> is_a_triangle_t; + is_a_triangle_t is_a_triangle; + + // Consider only triangles. + ima_t closed_ima = mln::duplicate(ima); + mln::data::paste(mln::morpho::closing::area(ima | is_a_triangle, + nbh, lambda), + closed_ima); /*---------------. | Local minima. | @@ -166,68 +193,13 @@ main(int argc, char* argv[]) typedef mln::value::label_16 label_t; label_t nminima; - /* FIXME: We should use something like `ima_t | p_n_faces(2)' instead - of `ima_t' here. Or better: `input' should only associate data - to 2-faces. */ + // Consider only triangles. typedef mln_ch_value_(ima_t, label_t) label_ima_t; - label_ima_t minima = - mln::labeling::regional_minima(closed_ima, nbh, nminima); - - typedef mln::complex_higher_neighborhood<D, G> higher_nbh_t; - higher_nbh_t higher_nbh; - - // Propagate minima values from triangles to edges. - // FIXME: Factor this inside a function. - mln_niter_(higher_nbh_t) adj_t(higher_nbh, e); - for_all(e) - { - label_t ref_adj_minimum = mln::literal::zero; - for_all(adj_t) - if (minima(adj_t) == mln::literal::zero) - { - // If E is adjacent to a non-minimal triangle, then it must - // not belong to a minima. - ref_adj_minimum = mln::literal::zero; - break; - } - else - { - if (ref_adj_minimum == mln::literal::zero) - // If this is the first minimum seen, use it as a reference. - ref_adj_minimum = minima(adj_t); - else - // If this is not the first time a minimum is encountered, - // ensure it is REF_ADJ_MINIMUM. - mln_assertion(minima(adj_t) == ref_adj_minimum); - } - minima(e) = ref_adj_minimum; - } - - // Likewise from edges to edges to vertices. - mln_niter_(higher_nbh_t) adj_e(higher_nbh, v); - for_all(v) - { - label_t ref_adj_minimum = mln::literal::zero; - for_all(adj_e) - if (minima(adj_e) == mln::literal::zero) - { - // If V is adjacent to a non-minimal triangle, then it must - // not belong to a minima. - ref_adj_minimum = mln::literal::zero; - break; - } - else - { - if (ref_adj_minimum == mln::literal::zero) - // If this is the first minimum seen, use it as a reference. - ref_adj_minimum = minima(adj_e); - else - // If this is not the first time a minimum is encountered, - // ensure it is REF_ADJ_MINIMUM. - mln_assertion(minima(adj_e) == ref_adj_minimum); - } - minima(v) = ref_adj_minimum; - } + label_ima_t minima; + mln::initialize(minima, closed_ima); + mln::data::paste(mln::labeling::regional_minima(closed_ima | is_a_triangle, + nbh, nminima), + minima); /*-----------------------. | Initial binary image. | @@ -242,13 +214,39 @@ main(int argc, char* argv[]) typedef mln_ch_value_(ima_t, bool) bin_ima_t; bin_ima_t surface(minima.domain()); - mln::data::fill(surface, true); - // Dig ``holes'' in the surface surface by setting minima faces to false. - // FIXME: Use fill with an image_if instead, when available/working. - mln_piter_(bin_ima_t) f(minima.domain()); - for_all(f) - if (minima(f) != mln::literal::zero) - surface(f) = false; + + // Predicate type: is a face an edge (1-face)? + typedef mln::topo::is_n_face<mln_psite_(ima_t), 1> is_an_edge_t; + is_an_edge_t is_an_edge; + // Predicate type: is a face a vertex (0-face)? + typedef mln::topo::is_n_face<mln_psite_(ima_t), 0> is_a_vertex_t; + is_a_vertex_t is_a_vertex; + + // Neighborhood type returning the set of (n+1)-faces adjacent to a + // an n-face. + typedef mln::complex_higher_neighborhood<D, G> higher_adj_nbh_t; + higher_adj_nbh_t higher_adj_nbh; + + mln::data::fill(surface, false); + // Set non minima triangles to true; + mln::data::fill + ((surface | + mln::pw::value(minima) == mln::pw::cst(mln::literal::zero)).rw(), + true); + // Extend non minima values from triangles to edges. + mln::data::paste (mln::morpho::dilation(mln::extend(surface | is_an_edge, + surface), + /* Dilations require windows, + not neighborhoods. */ + higher_adj_nbh.win()), + surface); + // Extend non minima values from edges to vertices. + mln::data::paste(mln::morpho::dilation(mln::extend(surface | is_a_vertex, + surface), + /* Dilations require windows, + not neighborhoods. */ + higher_adj_nbh.win()), + surface); /*-------------. | 2-collapse. | @@ -258,9 +256,6 @@ main(int argc, char* argv[]) // Image restricted to triangles. // // ------------------------------- // - // Predicate type: is a face a triangle (2-face)? - typedef mln::topo::is_n_face<mln_psite_(bin_ima_t), D> is_a_triangle_t; - is_a_triangle_t is_a_triangle; // Surface image type, of which domain is restricted to triangles. typedef mln::image_if<bin_ima_t, is_a_triangle_t> bin_triangle_only_ima_t; // Surface image type, of which iteration (not domain) is restricted @@ -272,14 +267,6 @@ main(int argc, char* argv[]) // Simple point predicate. // // ------------------------ // - // Neighborhood type returning the set of (n-1)-faces adjacent to a - // an n-face. - typedef mln::complex_lower_neighborhood<D, G> lower_adj_nbh_t; - lower_adj_nbh_t lower_adj_nbh; - // Neighborhood type returning the set of (n+1)-faces adjacent to a - // an n-face. - typedef mln::complex_higher_neighborhood<D, G> higher_adj_nbh_t; - higher_adj_nbh_t higher_adj_nbh; // Predicate type: is a triangle (2-face) simple? typedef mln::topo::is_simple_pair< bin_triangle_ima_t, lower_adj_nbh_t, -- 1.5.6.5

13 years, 9 months

last-svn-commit-247-g8ac5e61 Use priority-driven thinning in collapse-based thinnings apps.

by Roland Levillain

* apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc, * apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc: Here. --- milena/ChangeLog | 8 ++++++++ .../mesh-complex-max-curv-1-collapse.cc | 18 +++++++++++++----- .../mesh-complex-max-curv-2-collapse.cc | 13 ++++++++++--- 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8c32c8b..c34431a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2011-03-20 Roland Levillain <roland(a)lrde.epita.fr> + Use priority-driven thinning in collapse-based thinnings apps. + + * apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc, + * apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc: + Here. + +2011-03-20 Roland Levillain <roland(a)lrde.epita.fr> + Simplify curvature-based thinnings using 2- and 1-collapses apps. * apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc, diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc index 8b12030..4716a42 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc @@ -54,7 +54,9 @@ #include <mln/topo/is_n_face.hh> #include <mln/topo/is_simple_pair.hh> #include <mln/topo/detach_pair.hh> -#include <mln/topo/skeleton/breadth_first_thinning.hh> +#include <mln/topo/skeleton/priority_driven_thinning.hh> + +#include <mln/arith/revert.hh> #include <mln/io/vtk/load.hh> #include <mln/io/vtk/save.hh> @@ -288,14 +290,19 @@ main(int argc, char* argv[]) // Thinning by 2-collapse. // // ------------------------ // + // Create a priority function (actually, an image) using the inverse + // of the curvature image. + ima_t priority = mln::arith::revert(closed_ima); + mln_concrete_(bin_ima_t) surface_2_collapse; mln::initialize(surface_2_collapse, surface); mln::data::paste - (mln::topo::skeleton::breadth_first_thinning + (mln::topo::skeleton::priority_driven_thinning (mln::mutable_extend((surface | is_a_triangle).rw(), surface), nbh, is_simple_triangle, - detach_triangle) + detach_triangle, + priority) /* Before pasting the result of the computation into SURFACE_2_COLLAPSE, re-expand its domain to the initial site set, to ensure data from all faces (i.e., both the 2-faces, @@ -347,12 +354,13 @@ main(int argc, char* argv[]) mln_concrete_(bin_ima_t) surface_1_collapse; mln::initialize(surface_1_collapse, surface_2_collapse); mln::data::paste - (mln::topo::skeleton::breadth_first_thinning + (mln::topo::skeleton::priority_driven_thinning (mln::mutable_extend((surface_2_collapse | is_an_edge).rw(), surface_2_collapse), nbh, is_simple_edge, - detach_edge) + detach_edge, + priority) /* Likewise, before pasting the result of the computation into SURFACE_1_COLLAPSE, re-expand its domain to the initial site set, to ensure data from all faces (i.e., both the 1-faces, diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc index c88f10d..7df256e 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc @@ -54,7 +54,9 @@ #include <mln/topo/is_n_face.hh> #include <mln/topo/is_simple_pair.hh> #include <mln/topo/detach_pair.hh> -#include <mln/topo/skeleton/breadth_first_thinning.hh> +#include <mln/topo/skeleton/priority_driven_thinning.hh> + +#include <mln/arith/revert.hh> #include <mln/io/vtk/load.hh> #include <mln/io/vtk/save.hh> @@ -288,14 +290,19 @@ main(int argc, char* argv[]) // Thinning by 2-collapse. // // ------------------------ // + // Create a priority function (actually, an image) using the inverse + // of the curvature image. + ima_t priority = mln::arith::revert(closed_ima); + mln_concrete_(bin_ima_t) surface_2_collapse; mln::initialize(surface_2_collapse, surface); mln::data::paste - (mln::topo::skeleton::breadth_first_thinning + (mln::topo::skeleton::priority_driven_thinning (mln::mutable_extend((surface | is_a_triangle).rw(), surface), nbh, is_simple_triangle, - detach_triangle) + detach_triangle, + priority) /* Before pasting the result of the computation into SURFACE_2_COLLAPSE, re-expand its domain to the initial site set, to ensure data from all faces (i.e., both the 2-faces, -- 1.5.6.5

13 years, 9 months

last-svn-commit-218-gd298681 Use mln::data::paste to simplify mesh skeleton applications.

by Roland Levillain

* apps/mesh-segm-skel/mesh-complex-skel.cc, * apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc, * apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc: Here. --- milena/ChangeLog | 9 ++++++++ .../mesh-segm-skel/mesh-complex-max-curv-skel.cc | 22 ++++++++++---------- .../mesh-segm-skel/mesh-complex-pinv-curv-skel.cc | 22 ++++++++++---------- milena/apps/mesh-segm-skel/mesh-complex-skel.cc | 22 ++++++++++---------- 4 files changed, 42 insertions(+), 33 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 40e876c..279f0a6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2010-09-09 Roland Levillain <roland(a)lrde.epita.fr> + Use mln::data::paste to simplify mesh skeleton applications. + + * apps/mesh-segm-skel/mesh-complex-skel.cc, + * apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc, + * apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc: + Here. + +2010-09-09 Roland Levillain <roland(a)lrde.epita.fr> + Update mesh skeleton applications. * apps/mesh-segm-skel/mesh-complex-skel.cc, diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc index 641b0b4..2d55ff2 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc @@ -42,6 +42,7 @@ #include <mln/core/image/dmorph/image_if.hh> #include <mln/core/image/dmorph/mutable_extension_ima.hh> #include <mln/core/routine/mutable_extend.hh> +#include <mln/data/paste.hh> #include <mln/value/label_16.hh> @@ -267,9 +268,6 @@ main(int argc, char* argv[]) // to triangles. typedef mln::mutable_extension_ima<bin_triangle_only_ima_t, bin_ima_t> bin_triangle_ima_t; - // FIXME: Find a shorter name (skel_ima ? Careful, there is already a `skel' image below). - bin_triangle_ima_t bin_triangle_ima = - mln::mutable_extend((surface | is_a_triangle).rw(), surface); // ------------------------ // // Simple point predicate. // @@ -302,11 +300,15 @@ main(int argc, char* argv[]) // Functor detaching a cell. mln::topo::detach_cell<bin_triangle_ima_t, adj_nbh_t> detach(adj_nbh); - mln_concrete_(bin_triangle_ima_t) skel = - mln::topo::skeleton::breadth_first_thinning(bin_triangle_ima, - nbh, - is_simple_triangle, - detach); + mln_concrete_(bin_ima_t) skel; + mln::initialize(skel, surface); + mln::data::paste + (mln::topo::skeleton::breadth_first_thinning + (mln::mutable_extend((surface | is_a_triangle).rw(), surface), + nbh, + is_simple_triangle, + detach), + skel); /*---------. @@ -324,7 +326,5 @@ main(int argc, char* argv[]) mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), output_filename); #endif - // FIXME: We have to ``unmorph'' (twice!) SKEL first, since save_bin_alt only - // handles complex_image's. - mln::io::off::save_bin_alt(skel.unmorph_().unmorph_(), output_filename); + mln::io::off::save_bin_alt(skel, output_filename); } diff --git a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc index 5096efa..bf92305 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc @@ -42,6 +42,7 @@ #include <mln/core/image/dmorph/image_if.hh> #include <mln/core/image/dmorph/mutable_extension_ima.hh> #include <mln/core/routine/mutable_extend.hh> +#include <mln/data/paste.hh> #include <mln/value/label_16.hh> @@ -272,9 +273,6 @@ main(int argc, char* argv[]) // to triangles. typedef mln::mutable_extension_ima<bin_triangle_only_ima_t, bin_ima_t> bin_triangle_ima_t; - // FIXME: Find a shorter name (skel_ima ? Careful, there is already a `skel' image below). - bin_triangle_ima_t bin_triangle_ima = - mln::mutable_extend((surface | is_a_triangle).rw(), surface); // ------------------------ // // Simple point predicate. // @@ -307,11 +305,15 @@ main(int argc, char* argv[]) // Functor detaching a cell. mln::topo::detach_cell<bin_triangle_ima_t, adj_nbh_t> detach(adj_nbh); - mln_concrete_(bin_triangle_ima_t) skel = - mln::topo::skeleton::breadth_first_thinning(bin_triangle_ima, - nbh, - is_simple_triangle, - detach); + mln_concrete_(bin_ima_t) skel; + mln::initialize(skel, surface); + mln::data::paste + (mln::topo::skeleton::breadth_first_thinning + (mln::mutable_extend((surface | is_a_triangle).rw(), surface), + nbh, + is_simple_triangle, + detach), + skel); /*---------. @@ -329,7 +331,5 @@ main(int argc, char* argv[]) mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), output_filename); #endif - // FIXME: We have to ``unmorph'' (twice!) SKEL first, since save_bin_alt only - // handles complex_image's. - mln::io::off::save_bin_alt(skel.unmorph_().unmorph_(), output_filename); + mln::io::off::save_bin_alt(skel, output_filename); } diff --git a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc index 4f5ca78..fcd37e5 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc @@ -39,6 +39,7 @@ #include <mln/core/image/dmorph/image_if.hh> #include <mln/core/image/dmorph/mutable_extension_ima.hh> #include <mln/core/routine/mutable_extend.hh> +#include <mln/data/paste.hh> #include <mln/value/label_16.hh> @@ -225,9 +226,6 @@ main(int argc, char* argv[]) // to triangles. typedef mln::mutable_extension_ima<bin_triangle_only_ima_t, bin_ima_t> bin_triangle_ima_t; - // FIXME: Find a shorter name (skel_ima ? Careful, there is already a `skel' image below). - bin_triangle_ima_t bin_triangle_ima = - mln::mutable_extend((surface | is_a_triangle).rw(), surface); // ------------------------ // // Simple point predicate. // @@ -260,11 +258,15 @@ main(int argc, char* argv[]) // Functor detaching a cell. mln::topo::detach_cell<bin_triangle_ima_t, adj_nbh_t> detach(adj_nbh); - mln_concrete_(bin_triangle_ima_t) skel = - mln::topo::skeleton::breadth_first_thinning(bin_triangle_ima, - nbh, - is_simple_triangle, - detach); + mln_concrete_(bin_ima_t) skel; + mln::initialize(skel, surface); + mln::data::paste + (mln::topo::skeleton::breadth_first_thinning + (mln::mutable_extend((surface | is_a_triangle).rw(), surface), + nbh, + is_simple_triangle, + detach), + skel); /*---------. @@ -282,7 +284,5 @@ main(int argc, char* argv[]) mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), output_filename); #endif - // FIXME: We have to ``unmorph'' (twice!) SKEL first, since save_bin_alt only - // handles complex_image's. - mln::io::off::save_bin_alt(skel.unmorph_().unmorph_(), output_filename); + mln::io::off::save_bin_alt(skel, output_filename); } -- 1.5.6.5

13 years, 9 months

last-svn-commit-219-g5326c7c State a cell is not simple if it does not correspond to a facet.

by Roland Levillain

* mln/topo/is_simple_cell.hh (mln::topo::is_simple_cell<I, N, NL, NH>::operator()): Here. --- milena/ChangeLog | 7 +++++++ milena/mln/make/attachment.hh | 2 ++ milena/mln/make/detachment.hh | 2 ++ milena/mln/topo/detach_cell.hh | 2 ++ milena/mln/topo/is_facet.hh | 2 ++ milena/mln/topo/is_simple_cell.hh | 26 +++++++++++++++++++++++++- 6 files changed, 40 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 279f0a6..d4d9a23 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2011-02-24 Roland Levillain <roland(a)lrde.epita.fr> + + State a cell is not simple if it does not correspond to a facet. + + * mln/topo/is_simple_cell.hh + (mln::topo::is_simple_cell<I, N, NL, NH>::operator()): Here. + 2010-09-09 Roland Levillain <roland(a)lrde.epita.fr> Use mln::data::paste to simplify mesh skeleton applications. diff --git a/milena/mln/make/attachment.hh b/milena/mln/make/attachment.hh index 3af5332..63eca65 100644 --- a/milena/mln/make/attachment.hh +++ b/milena/mln/make/attachment.hh @@ -74,6 +74,8 @@ namespace mln attachment(const Image& ima_, const mln_psite(I)& f, const Neighborhood<N>& nbh_) { + // FIXME: The current implementation of topo::is_facet is too + // naive: it does not take the values of the image into account. mln_precondition(topo::is_facet(f)); mlc_equal(mln_value(I), bool)::check(); diff --git a/milena/mln/make/detachment.hh b/milena/mln/make/detachment.hh index 6cd01ba..88b70a0 100644 --- a/milena/mln/make/detachment.hh +++ b/milena/mln/make/detachment.hh @@ -81,6 +81,8 @@ namespace mln detachment(const Image& ima_, const mln_psite(I)& f, const Neighborhood<N>& nbh_) { + // FIXME: The current implementation of topo::is_facet is too + // naive: it does not take the values of the image into account. mln_precondition(topo::is_facet(f)); mlc_equal(mln_value(I), bool)::check(); diff --git a/milena/mln/topo/detach_cell.hh b/milena/mln/topo/detach_cell.hh index 9e2a489..250babf 100644 --- a/milena/mln/topo/detach_cell.hh +++ b/milena/mln/topo/detach_cell.hh @@ -131,6 +131,8 @@ namespace mln detach_cell<I, N>::operator()(const mln_psite(I)& f) { mln_precondition(ima_); + // FIXME: The current implementation of topo::is_facet is too + // naive: it does not take the values of the image into account. mln_precondition(topo::is_facet(f)); typedef p_set<mln_psite(I)> faces_t; diff --git a/milena/mln/topo/is_facet.hh b/milena/mln/topo/is_facet.hh index 0b10040..675126c 100644 --- a/milena/mln/topo/is_facet.hh +++ b/milena/mln/topo/is_facet.hh @@ -52,6 +52,8 @@ namespace mln # ifndef MLN_INCLUDE_ONLY + // FIXME: Too naive: this code does not take the values of the + // image into account. template <unsigned D, typename G> inline bool diff --git a/milena/mln/topo/is_simple_cell.hh b/milena/mln/topo/is_simple_cell.hh index bf60c3d..0cf50fb 100644 --- a/milena/mln/topo/is_simple_cell.hh +++ b/milena/mln/topo/is_simple_cell.hh @@ -81,7 +81,12 @@ namespace mln /// Set the underlying image. void set_image(const mln::Image& ima); - /// Based on the algorithm A2 from couprie.08.pami. + /** \brief Test whether a face (expected to be facet) is a + simple cell. + + If \a p is not a facet, return false. + + Based on the algorithm A2 from couprie.08.pami. */ /* FIXME: We probably broke the compatiblity with g++ 3.3, as it seems this compiler does not like an indirect type like the one of the following operator's argument. Check and possibly @@ -124,6 +129,25 @@ namespace mln is_simple_cell<I, N, NL, NH>::operator()(const mln_psite(I)& p) const { mln_precondition(ima_); + // FIXME: Introduce `const I& ima = *ima_;' and use it instead of + // `ima_'. Or introduce an `ima()' accessor? + + // FIXME: We should be using topo::is_facet, but this routine is + // too naive, and does not take the values of the image into + // account. + { + // This (part of) ``algorithm'' considers that looking for + // faces of dimension n+1 is enough (which is the case + // if the image is a complex). + NH higher_adj_nbh; + mln_niter(NH) n(higher_adj_nbh, p); + for_all(n) + // If the higher-dim-faces neighborhood is not empty, then P + // is included in a face of higher dimension. + if (ima_->has(n) && (*ima_)(n)) + return false; + // Otherwise, F is a facet; continue. + } typedef p_set<mln_psite(I)> faces_t; -- 1.5.6.5

13 years, 9 months

last-svn-commit-220-gfc56934 Make the interface of thinning algorithms uniform w.r.t. functors.

by Roland Levillain

* mln/topo/skeleton/priority_driven_thinning.hh (mln::topo::skeleton::priority_driven_thinning): Catch up with mln::topo::skeleton::breadth_first_thinning. * mln/topo/detach_point.hh: Turn into a functor to match the new interface of thinning algorithms. * tests/topo/skeleton/breadth_first_thinning.cc * tests/topo/skeleton/breadth_first_thinning_constrained.cc * tests/topo/skeleton/priority_driven_thinning.cc * tests/topo/skeleton/priority_driven_thinning_constrained.cc: Adjust. --- milena/ChangeLog | 15 +++++ milena/mln/topo/detach_point.hh | 66 +++++++++++++++++--- .../mln/topo/skeleton/priority_driven_thinning.hh | 23 +++++-- .../tests/topo/skeleton/breadth_first_thinning.cc | 6 +- .../skeleton/breadth_first_thinning_constrained.cc | 6 +- .../topo/skeleton/priority_driven_thinning.cc | 6 +- .../priority_driven_thinning_constrained.cc | 6 +- 7 files changed, 104 insertions(+), 24 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d4d9a23..a4a1345 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,20 @@ 2011-02-24 Roland Levillain <roland(a)lrde.epita.fr> + Make the interface of thinning algorithms uniform w.r.t. functors. + + * mln/topo/skeleton/priority_driven_thinning.hh + (mln::topo::skeleton::priority_driven_thinning): Catch up + with mln::topo::skeleton::breadth_first_thinning. + * mln/topo/detach_point.hh: Turn into a functor to match the new + interface of thinning algorithms. + * tests/topo/skeleton/breadth_first_thinning.cc + * tests/topo/skeleton/breadth_first_thinning_constrained.cc + * tests/topo/skeleton/priority_driven_thinning.cc + * tests/topo/skeleton/priority_driven_thinning_constrained.cc: + Adjust. + +2011-02-24 Roland Levillain <roland(a)lrde.epita.fr> + State a cell is not simple if it does not correspond to a facet. * mln/topo/is_simple_cell.hh diff --git a/milena/mln/topo/detach_point.hh b/milena/mln/topo/detach_point.hh index 818f7cd..6e4d22d 100644 --- a/milena/mln/topo/detach_point.hh +++ b/milena/mln/topo/detach_point.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -29,8 +29,7 @@ /// \file /// \brief Detaching a point from a binary image. -// FIXME: Not generic. Swap arguments and use Image and -// mln_psite(I) as types. +# include <mln/metal/equal.hh> # include <mln/core/image/image2d.hh> # include <mln/core/alias/point2d.hh> @@ -41,19 +40,68 @@ namespace mln namespace topo { - /// \brief Detach a point from a binary image. - inline - void - detach_point(const mln::point2d& p, mln::image2d<bool>& ima); + /// \brief Functor detaching a point from a binary image. + template <typename I> + class detach_point + { + public: + /// Build a functor. + detach_point(); + + /// Build a functor, and assign an image to it. + /// + /// \param ima The image. + detach_point(Image& ima); + + /// Set the underlying image. + void set_image(Image& ima); + + /// \brief Detach point \a p from the image. + void operator()(const mln_psite(I)& p) const; + + private: + /// The image. + I* ima_; + }; + # ifndef MLN_INCLUDE_ONLY + template <typename I> + inline + detach_point::detach_point() + : ima_(0) + { + // Ensure I is a binary image type. + /* FIXME: Not compatible with proxy/morphers on values. */ + mlc_equal(mln_value(I), bool)::check(); + } + + template <typename I> + inline + detach_point::detach_point(Image& ima) + : ima_(exact(&ima)) + { + // Ensure I is a binary image type. + /* FIXME: Not compatible with proxy/morphers on values. */ + mlc_equal(mln_value(I), bool)::check(); + } + + template <typename I> + inline + void + detach_point::set_image(Image& ima) + { + ima_ = exact(&ima); + } + + template <typename I> inline void - detach_point(const mln::point2d& p, mln::image2d<bool>& ima) + detach_point::operator()(const mln_psite(I)& p) const { - ima(p) = false; + (*ima_)(p) = false; } # endif // MLN_INCLUDE_ONLY diff --git a/milena/mln/topo/skeleton/priority_driven_thinning.hh b/milena/mln/topo/skeleton/priority_driven_thinning.hh index e29062f..ad8e63d 100644 --- a/milena/mln/topo/skeleton/priority_driven_thinning.hh +++ b/milena/mln/topo/skeleton/priority_driven_thinning.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -62,10 +63,14 @@ namespace mln (sites). This functor must provide a method <tt>void set_image(const Image&)</tt>. \param detach A function used to detach a cell from \a input. + This functor must provide a method + <tt>void set_image(const Image&)</tt>. \param priority A priority function expressed as an image. \param constraint A constraint on point (site); if it returns \c false for a point, this point - will not be removed. */ + will not be removed. + + Keywords: skeletons, simple points. */ template <typename I, typename N, typename F, typename G, typename J, typename H> mln_concrete(I) @@ -87,9 +92,12 @@ namespace mln \param is_simple The predicate on the simplicity of points (sites). This functor must provide a method <tt>void set_image(const Image&)</tt>. - \param detach A function used to detach a cell from - \a input. - \param priority A priority function expressed as an image. */ + \param detach A function used to detach a cell from \a input. + This functor must provide a method + <tt>void set_image(const Image&)</tt>. + \param priority A priority function expressed as an image. + + Keywords: skeletons, simple points. */ template <typename I, typename N, typename F, typename G, typename J> mln_concrete(I) priority_driven_thinning(const Image& input, @@ -121,8 +129,9 @@ namespace mln const H& constraint = exact(constraint_); mln_concrete(I) output = duplicate(input); - // Attach the work image to IS_SIMPLE. + // Attach the work image to IS_SIMPLE and DETACH. is_simple.set_image(output); + detach.set_image(output); typedef mln_psite(I) psite; typedef p_queue_fast<psite> queue_t; @@ -141,7 +150,7 @@ namespace mln psite p = queue.pop_front(); if (output(p) && constraint(p) && is_simple(p)) { - detach(p, output); + detach(p); mln_niter(N) n(nbh, p); for_all(n) { diff --git a/milena/tests/topo/skeleton/breadth_first_thinning.cc b/milena/tests/topo/skeleton/breadth_first_thinning.cc index e77421a..1ed7260 100644 --- a/milena/tests/topo/skeleton/breadth_first_thinning.cc +++ b/milena/tests/topo/skeleton/breadth_first_thinning.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -64,9 +64,11 @@ int main() // Simplicity criterion functor. topo::is_simple_point2d<I, N> is_simple(nbh_fg, nbh_bg); + // Simple point detach procedure. + topo::detach_point detach; I output = topo::skeleton::breadth_first_thinning(input, nbh_fg, is_simple, - topo::detach_point); + detach); io::pbm::save(output, "breadth_first_thinning-small.pbm"); } diff --git a/milena/tests/topo/skeleton/breadth_first_thinning_constrained.cc b/milena/tests/topo/skeleton/breadth_first_thinning_constrained.cc index 8ec213a..c8fbe52 100644 --- a/milena/tests/topo/skeleton/breadth_first_thinning_constrained.cc +++ b/milena/tests/topo/skeleton/breadth_first_thinning_constrained.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -65,12 +65,14 @@ int main() // Simplicity criterion functor. topo::is_simple_point2d<I, N> is_simple(nbh_fg, nbh_bg); + // Simple point detach procedure. + topo::detach_point detach; // Constraint: do not collapse end points. topo::is_not_end_point<I, N> constraint(nbh_fg, input); I output = topo::skeleton::breadth_first_thinning(input, nbh_fg, is_simple, - topo::detach_point, + detach, constraint); io::pbm::save(output, "breadth_first_thinning_constrained-small.pbm"); } diff --git a/milena/tests/topo/skeleton/priority_driven_thinning.cc b/milena/tests/topo/skeleton/priority_driven_thinning.cc index 36470d1..6cfacae 100644 --- a/milena/tests/topo/skeleton/priority_driven_thinning.cc +++ b/milena/tests/topo/skeleton/priority_driven_thinning.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -68,6 +68,8 @@ int main() // Simplicity criterion functor. topo::is_simple_point2d<I, N> is_simple(nbh_fg, nbh_bg); + // Simple point detach procedure. + topo::detach_point detach; // Distance type. typedef value::int_u8 D; @@ -84,7 +86,7 @@ int main() I output = topo::skeleton::priority_driven_thinning(input, nbh_fg, is_simple, - topo::detach_point, + detach, priority); io::pbm::save(output, "priority_driven_thinning-small.pbm"); } diff --git a/milena/tests/topo/skeleton/priority_driven_thinning_constrained.cc b/milena/tests/topo/skeleton/priority_driven_thinning_constrained.cc index 822d5cd..32e17a1 100644 --- a/milena/tests/topo/skeleton/priority_driven_thinning_constrained.cc +++ b/milena/tests/topo/skeleton/priority_driven_thinning_constrained.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -69,6 +69,8 @@ int main() // Simplicity criterion functor. topo::is_simple_point2d<I, N> is_simple(nbh_fg, nbh_bg); + // Simple point detach procedure. + topo::detach_point detach; // Constraint: do not collapse end points. topo::is_not_end_point<I, N> constraint(nbh_fg, input); @@ -87,7 +89,7 @@ int main() I output = topo::skeleton::priority_driven_thinning(input, nbh_fg, is_simple, - topo::detach_point, + detach, priority, constraint); io::pbm::save(output, "priority_driven_thinning_constrained-small.pbm"); -- 1.5.6.5

13 years, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches