- Olena-patches

2913: Fix clients of mln::canvas::labeling.
by Roland Levillain 19 Nov '08

19 Nov '08

* mln/labeling/flat_zones.hh (mln::labeling::impl::generic::flat_zones) * mln/labeling/regional_maxima.hh (mln::labeling::impl::generic::regional_maxima) * mln/labeling/regional_minima.hh (mln::labeling::impl::generic::regional_minima): Catch up with the current implementation of mln::canvas::labeling as a routine. --- milena/ChangeLog | 13 +++++++++++++ milena/mln/labeling/flat_zones.hh | 5 ++--- milena/mln/labeling/regional_maxima.hh | 7 +++---- milena/mln/labeling/regional_minima.hh | 7 +++---- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e35b296..1684e97 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,18 @@ 2008-11-19 Roland Levillain <roland(a)lrde.epita.fr> + Fix clients of mln::canvas::labeling. + + * mln/labeling/flat_zones.hh + (mln::labeling::impl::generic::flat_zones) + * mln/labeling/regional_maxima.hh + (mln::labeling::impl::generic::regional_maxima) + * mln/labeling/regional_minima.hh + (mln::labeling::impl::generic::regional_minima): + Catch up with the current implementation of mln::canvas::labeling + as a routine. + +2008-11-19 Roland Levillain <roland(a)lrde.epita.fr> + New application: surface segmentation using complex-based images. * apps/statues/mesh-complex-segm.cc: New. diff --git a/milena/mln/labeling/flat_zones.hh b/milena/mln/labeling/flat_zones.hh index 2552816..7fb32ff 100644 --- a/milena/mln/labeling/flat_zones.hh +++ b/milena/mln/labeling/flat_zones.hh @@ -113,11 +113,10 @@ namespace mln typedef flat_zones_functor<I,N,L> F; F f(exact(input), exact(nbh)); - canvas::labeling<F> run(f); - nlabels = run.nlabels; + mln_ch_value(I, L) output = canvas::labeling(input, nbh, f, nlabels); trace::exiting("labeling::impl::generic::flat_zones"); - return run.output; + return output; } } // end of namespace mln::labeling::impl::generic diff --git a/milena/mln/labeling/regional_maxima.hh b/milena/mln/labeling/regional_maxima.hh index 7ca103c..57acc1b 100644 --- a/milena/mln/labeling/regional_maxima.hh +++ b/milena/mln/labeling/regional_maxima.hh @@ -127,12 +127,11 @@ namespace mln // maxima. typedef impl::regional_maxima_functor<I,N,L> F; - F f(input, nbh); - canvas::labeling<F> run(f); - nlabels = run.nlabels; + F f(exact(input), exact(nbh)); + mln_ch_value(I, L) output = canvas::labeling(input, nbh, f, nlabels); trace::exiting("labeling::impl::generic::regional_maxima"); - return run.output; + return output; } } // end of namespace mln::labeling::impl::generic diff --git a/milena/mln/labeling/regional_minima.hh b/milena/mln/labeling/regional_minima.hh index bf7cd21..07ac158 100644 --- a/milena/mln/labeling/regional_minima.hh +++ b/milena/mln/labeling/regional_minima.hh @@ -132,12 +132,11 @@ namespace mln // minima. typedef impl::regional_minima_functor<I,N,L> F; - F f(input, nbh); - canvas::labeling<F> run(f); - nlabels = run.nlabels; + F f(exact(input), exact(nbh)); + mln_ch_value(I, L) output = canvas::labeling(input, nbh, f, nlabels); trace::exiting("labeling::impl::generic::regional_minima"); - return run.output; + return output; } } // end of namespace mln::labeling::impl::generic -- 1.5.6.5

1 0

cleanup-2008 2912: Little fixes.
by Alexandre Abraham 19 Nov '08

19 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> Little fixes. * markov/markov.hh: . markov.hh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) Index: markov/markov.hh --- markov/markov.hh (revision 2911) +++ markov/markov.hh (working copy) @@ -22,14 +22,19 @@ // u(x) is cst so we don't care double diff_sum = 0; + double coeff = 0; mln_niter(N) n(nbh, p); for_all(n) + if (ima.domain().has(n)) { diff_sum += abs(xi - out(n)); + coeff ++; } - return u + 0.25 * diff_sum; + diff_sum /= coeff; + + return 0.5 * (u + diff_sum); } template <typename I, typename N> // I == int_u8

1 0

cleanup-2008 2911: Fix bad comparison sign.
by Alexandre Abraham 19 Nov '08

19 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> Fix bad comparison sign. * markov/markov.hh: . markov.hh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Index: markov/markov.hh --- markov/markov.hh (revision 2910) +++ markov/markov.hh (working copy) @@ -26,10 +26,10 @@ mln_niter(N) n(nbh, p); for_all(n) { - diff_sum += abs(out(p) - out(n)); + diff_sum += abs(xi - out(n)); } - return u + 100 * diff_sum; + return u + 0.25 * diff_sum; } template <typename I, typename N> // I == int_u8 @@ -66,9 +66,9 @@ double d_u = up - u; double proba = exp(-d_u / temp); - // std::cout << "Difference : " << d_u << std::endl; + // std::cout << "u : " << u << " up : " << up << "Difference : " << d_u << std::endl; - if (d_u < 0 || !gradient && (p_random.get() < proba)) + if (d_u < 0 || !gradient && (p_random.get() > proba)) { out(p) = v; modifications ++;

1 0

2910: New application: surface segmentation using complex-based images.
by Roland Levillain 19 Nov '08

19 Nov '08

* apps/statues/mesh-complex-segm.cc: New. * apps/statues/Makefile.am (bin_PROGRAMS): Add mesh-complex-segm. (mesh_complex_segm_SOURCES): New. * apps/statues/test.in: Exercise mesh-complex-segm. * mln/core/alias/complex_image.hh (mln::unsigned_2complex_image3df): New typedef. --- milena/ChangeLog | 11 ++ milena/apps/statues/Makefile.am | 8 ++ milena/apps/statues/mesh-complex-segm.cc | 163 ++++++++++++++++++++++++++++++ milena/apps/statues/test.in | 4 + milena/mln/core/alias/complex_image.hh | 11 ++- 5 files changed, 195 insertions(+), 2 deletions(-) create mode 100644 milena/apps/statues/mesh-complex-segm.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 9224c7f..e35b296 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2008-11-19 Roland Levillain <roland(a)lrde.epita.fr> + New application: surface segmentation using complex-based images. + + * apps/statues/mesh-complex-segm.cc: New. + * apps/statues/Makefile.am (bin_PROGRAMS): Add mesh-complex-segm. + (mesh_complex_segm_SOURCES): New. + * apps/statues/test.in: Exercise mesh-complex-segm. + * mln/core/alias/complex_image.hh + (mln::unsigned_2complex_image3df): New typedef. + +2008-11-19 Roland Levillain <roland(a)lrde.epita.fr> + * mln/core/site_set/p_array.hh (nsites): Fix return type. 2008-11-18 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/apps/statues/Makefile.am b/milena/apps/statues/Makefile.am index 971a4ec..d1e65f7 100644 --- a/milena/apps/statues/Makefile.am +++ b/milena/apps/statues/Makefile.am @@ -53,4 +53,12 @@ mesh_max_curv_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_trimesh) mesh_max_curv_LDFLAGS = $(LDFLAGS_trimesh) mesh_max_curv_LDADD = $(LDADD_trimesh) +## ---------------------------------------------------- ## +## Complex-based applications, independent of Trimesh. ## +## ---------------------------------------------------- ## + +bin_PROGRAMS += mesh-complex-segm +mesh_complex_segm_SOURCES = mesh-complex-segm.cc + + TESTS = test diff --git a/milena/apps/statues/mesh-complex-segm.cc b/milena/apps/statues/mesh-complex-segm.cc new file mode 100644 index 0000000..05fffe0 --- /dev/null +++ b/milena/apps/statues/mesh-complex-segm.cc @@ -0,0 +1,163 @@ +// 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 apps/statues/mesh-complex-segm.cc +/// \brief A program performing a WST-based segmentation of the +/// surface of the (triangle) mesh of a statue, using a complex-based +/// image. + +#include <cstdlib> +#include <cmath> + +#include <utility> +#include <iostream> + +#include <mln/core/image/complex_image.hh> +#include <mln/core/image/complex_neighborhoods.hh> + +#include <mln/morpho/closing_area.hh> +#include <mln/morpho/meyer_wst.hh> + +#include <mln/literal/white.hh> + +#include <mln/io/off/load.hh> +#include <mln/io/off/save.hh> + + + +int main(int argc, char* argv[]) +{ + if (argc != 4) + { + std::cerr << "usage: " << argv[0] << " input.off lambda output.off" + << std::endl; + exit(1); + } + + std::string input_filename = argv[1]; + unsigned lambda = atoi(argv[2]); + std::string output_filename = argv[3]; + + /*----------------. + | Complex image. | + `----------------*/ + + // Image type. + typedef mln::float_2complex_image3df ima_t; + // Dimension of the image (and therefore of the complex). + static const unsigned D = ima_t::dim; + // Geometry of the image. + typedef mln_geom_(ima_t) G; + + ima_t input; + mln::io::off::load(input, input_filename); + + // Values on edges. + + /* FIXME: To be improved: instead of computing the curvature on + edges from a mean of the curvature on adjacent polygons, compute + it directly from the curvature on vertices. We should probably + integrate Trimesh's curvature computation into Milena. */ + mln::p_n_faces_fwd_piter<D, G> e(input.domain(), 1); + typedef mln::complex_higher_neighborhood<D, G> adj_polygons_nbh_t; + adj_polygons_nbh_t adj_polygons_nbh; + mln_niter_(adj_polygons_nbh_t) p(adj_polygons_nbh, e); + // Iterate on edges (1-faces). + for_all(e) + { + float s = 0.0f; + unsigned n = 0; + for_all(p) + { + s += input(p); + ++n; + } + input(e) = s / n; + // An edge should be adjacent to two polygons at most. + mln_invariant(n <= 2); + } + + /*-----------------. + | Simplification. | + `-----------------*/ + + /// Adjancent edges are connected by shared polygons. + typedef + mln::complex_higher_dim_connected_n_face_neighborhood<D, G> + adj_edges_nbh_t; + adj_edges_nbh_t adj_edges_nbh; + + ima_t closed_input(input.domain()); + mln::morpho::closing_area(input, adj_edges_nbh, lambda, closed_input); + + /*------. + | WST. | + `------*/ + + /* FIXME: Note that the WST is either doing too much work, since we + have not constrained the domain of the image to 1-faces only. + + It would be great if we could use something like this: + + closed_input | mln::p_faces<1, D, G>(closed_input.domain()) + + as input of the WST. */ + + // Compute the WST on edges. + typedef unsigned wst_val_t; + wst_val_t nbasins; + typedef mln::unsigned_2complex_image3df wst_ima_t; + wst_ima_t wshed = + mln::morpho::meyer_wst(closed_input, adj_edges_nbh, nbasins); + std::cout << "nbasins = " << nbasins << std::endl; + + // Label polygons (i.e., propagate labels from edges to polygons). + for_all(e) + if (wshed(e) != 0) + for_all(p) + wshed(p) = wshed(e); + + /*---------. + | Output. | + `---------*/ + + mln::rgb8_2complex_image3df output(wshed.domain()); + mln::level::fill(output, mln::literal::white); + + // FIXME: Use a colorize functor instead. + // Choose random colors for each basin number. + std::vector<mln::value::rgb8> basin_color (nbasins + 1); + for (unsigned i = 0; i <= nbasins; ++i) + basin_color[i] = mln::value::rgb8(random() % 256, + random() % 256, + random() % 256); + mln_piter_(ima_t) f(wshed.domain()); + for_all(f) + output(f) = basin_color[wshed(f)]; + + mln::io::off::save(output, output_filename); +} diff --git a/milena/apps/statues/test.in b/milena/apps/statues/test.in index 181a1fd..92c9d31 100755 --- a/milena/apps/statues/test.in +++ b/milena/apps/statues/test.in @@ -7,3 +7,7 @@ mesh_dir=@top_srcdir@/milena/mesh time ./mesh-segm $mesh_dir/socket.off 25 socket-segm.off time ./mesh-segm $mesh_dir/teapot.off 50 teapot-segm.off time ./mesh-segm $mesh_dir/bunny-holefilled.off 500 bunny-holefilled-segm.off + +time ./mesh-complex-segm $mesh_dir/socket-max-curv.off 25 socket-max-curv-segm.off +time ./mesh-complex-segm $mesh_dir/teapot-max-curv.off 50 teapot-max-curv-segm.off +time ./mesh-complex-segm $mesh_dir/bunny-holefilled-pinv-curv.off 500 bunny-holefilled-pinv-curv-segm.off diff --git a/milena/mln/core/alias/complex_image.hh b/milena/mln/core/alias/complex_image.hh index 9dc5956..6336d6b 100644 --- a/milena/mln/core/alias/complex_image.hh +++ b/milena/mln/core/alias/complex_image.hh @@ -47,12 +47,19 @@ namespace mln mln::complex_image<2, mln::space_2complex_geometry, bool> bin_2complex_image3df; + /// \brief Type alias for an 8-bit grey-level image based on a + /// 2-complex, where 0-faces are located at floating-point + /// 3-dimensional points. + typedef + mln::complex_image<2, mln::space_2complex_geometry, mln::value::int_u8> + int_u8_2complex_image3df; + /// \brief Type alias for a grey-level image based on a 2-complex, /// where 0-faces are located at floating-point 3-dimensional /// points. typedef - mln::complex_image<2, mln::space_2complex_geometry, mln::value::int_u8> - int_u8_2complex_image3df; + mln::complex_image<2, mln::space_2complex_geometry, unsigned> + unsigned_2complex_image3df; /// \brief Type alias for a floating-point image based on a /// 2-complex, where 0-faces are located at floating-point -- 1.6.0.1

1 0

2909: mln/core/site_set/p_array.hh (nsites): Fix return type.
by Roland Levillain 19 Nov '08

19 Nov '08

--- milena/ChangeLog | 4 ++++ milena/mln/core/site_set/p_array.hh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e02b029..9224c7f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2008-11-19 Roland Levillain <roland(a)lrde.epita.fr> + + * mln/core/site_set/p_array.hh (nsites): Fix return type. + 2008-11-18 Roland Levillain <roland(a)lrde.epita.fr> Reorganize apps/statues/Makefile.am. diff --git a/milena/mln/core/site_set/p_array.hh b/milena/mln/core/site_set/p_array.hh index db380bd..f4cb85b 100644 --- a/milena/mln/core/site_set/p_array.hh +++ b/milena/mln/core/site_set/p_array.hh @@ -384,7 +384,7 @@ namespace mln template <typename P> inline - std::size_t + unsigned p_array<P>::nsites() const { return vect_.size(); -- 1.6.0.1

1 0

2908: Reorganize apps/statues/Makefile.am.
by Roland Levillain 19 Nov '08

19 Nov '08

* apps/statues/Makefile.am (AM_CPPFLAGS): Move Trimesh-related part... (CPPFLAGS_trimesh): ...here (new variable). (AM_LDFLAGS, LDADD): Rename variables as... (LDFLAGS_trimesh, LDADD_trimesh): ...these. (mesh_segm_CPPFLAGS, mesh_segm_LDFLAGS, mesh_segm_LDADD) (mesh_skel_CPPFLAGS, mesh_skel_LDFLAGS, mesh_skel_LDADD) (mesh_pinv_curv_CPPFLAGS, mesh_pinv_curv_LDFLAGS, mesh_pinv_curv_LDADD) (mesh_max_curv_CPPFLAGS, mesh_max_curv_LDFLAGS, mesh_max_curv_LDADD): New variables. --- milena/ChangeLog | 15 ++++++++++++ milena/apps/statues/Makefile.am | 46 +++++++++++++++++++++++++++++++++------ 2 files changed, 54 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3f777de..e02b029 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,20 @@ 2008-11-18 Roland Levillain <roland(a)lrde.epita.fr> + Reorganize apps/statues/Makefile.am. + + * apps/statues/Makefile.am (AM_CPPFLAGS): + Move Trimesh-related part... + (CPPFLAGS_trimesh): ...here (new variable). + (AM_LDFLAGS, LDADD): Rename variables as... + (LDFLAGS_trimesh, LDADD_trimesh): ...these. + (mesh_segm_CPPFLAGS, mesh_segm_LDFLAGS, mesh_segm_LDADD) + (mesh_skel_CPPFLAGS, mesh_skel_LDFLAGS, mesh_skel_LDADD) + (mesh_pinv_curv_CPPFLAGS, mesh_pinv_curv_LDFLAGS, mesh_pinv_curv_LDADD) + (mesh_max_curv_CPPFLAGS, mesh_max_curv_LDFLAGS, mesh_max_curv_LDADD): + New variables. + +2008-11-18 Roland Levillain <roland(a)lrde.epita.fr> + Add computed meshes (with curvature). * mesh/bunny-holefilled-max-curv.off, diff --git a/milena/apps/statues/Makefile.am b/milena/apps/statues/Makefile.am index d41ead6..971a4ec 100644 --- a/milena/apps/statues/Makefile.am +++ b/milena/apps/statues/Makefile.am @@ -4,21 +4,53 @@ gluit_builddir = $(top_builddir)/external/trimesh/gluit include $(top_srcdir)/external/trimesh/gluit/gluit.mk - # Find Milena and trimesh headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_srcdir)/external/trimesh/include +AM_CPPFLAGS = -I$(top_srcdir)/milena +CPPFLAGS_trimesh = -I$(top_srcdir)/external/trimesh/include # Produce fast code. AM_CXXFLAGS = -O3 -DNDEBUG -ggdb # Find the trimesh library and its dependencies. -AM_LDFLAGS = $(GLFLAGS) -LDADD = -L$(top_builddir)/external/trimesh/libsrc -ltrimesh $(GLLIBS) +# +# Don't use TRIMESH_LDFLAGS, since it looks like the LDFLAGS of the +# program `TRIMESH' and triggers Automake warnings; use +# LDFLAGS_trimesh instead. Likewise for CPPFLAGS_trimesh and +# LDADD_trimesh, for symmetry reasons. +LDFLAGS_trimesh = $(GLFLAGS) +LDADD_trimesh = -L$(top_builddir)/external/trimesh/libsrc -ltrimesh $(GLLIBS) +# FIXME: Have program names embed the type of structure used (either +# graph or complex). -bin_PROGRAMS = mesh-pinv-curv mesh-max-curv mesh-segm mesh-skel +## ------------------------------------------------ ## +## Graph-based applications, depending on Trimesh. ## +## ------------------------------------------------ ## + +bin_PROGRAMS = mesh-segm mesh-skel -mesh_pinv_curv_SOURCES = mesh-pinv-curv.cc io.hh -mesh_max_curv_SOURCES = mesh-max-curv.cc io.hh mesh_segm_SOURCES = mesh-segm.cc io.hh +mesh_segm_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_trimesh) +mesh_segm_LDFLAGS = $(LDFLAGS_trimesh) +mesh_segm_LDADD = $(LDADD_trimesh) + mesh_skel_SOURCES = mesh-skel.cc io.hh +mesh_skel_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_trimesh) +mesh_skel_LDFLAGS = $(LDFLAGS_trimesh) +mesh_skel_LDADD = $(LDADD_trimesh) + +## -------------------------------------------------- ## +## Complex-based applications, depending on Trimesh. ## +## -------------------------------------------------- ## + +bin_PROGRAMS += mesh-pinv-curv mesh-max-curv + +mesh_pinv_curv_SOURCES = mesh-pinv-curv.cc io.hh +mesh_pinv_curv_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_trimesh) +mesh_pinv_curv_LDFLAGS = $(LDFLAGS_trimesh) +mesh_pinv_curv_LDADD = $(LDADD_trimesh) + +mesh_max_curv_SOURCES = mesh-max-curv.cc io.hh +mesh_max_curv_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_trimesh) +mesh_max_curv_LDFLAGS = $(LDFLAGS_trimesh) +mesh_max_curv_LDADD = $(LDADD_trimesh) TESTS = test -- 1.6.0.1

1 0

2906: configure.ac: Configure milena/mesh/Makefile.
by Roland Levillain 19 Nov '08

19 Nov '08

--- ChangeLog | 4 ++++ configure.ac | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index fabc2f3..cc742bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-11-18 Roland Levillain <roland(a)lrde.epita.fr> + + * configure.ac: Configure milena/mesh/Makefile. + 2008-11-06 Guillaume Lazzara <z(a)lrde.epita.fr> Update configure.ac for the tutorial. diff --git a/configure.ac b/configure.ac index 0a407d2..b6ea1a6 100644 --- a/configure.ac +++ b/configure.ac @@ -146,6 +146,7 @@ AC_CONFIG_FILES([ milena/doc/Makefile milena/doc/tutorial/Makefile milena/doc/tutorial/samples/Makefile + milena/mesh/Makefile milena/tools/Makefile ]) -- 1.6.0.1

1 0

2905: Generate meshes with curvature.
by Roland Levillain 19 Nov '08

19 Nov '08

* mesh/Makefile.am (pinv_curv): New. * Makefile.am (SUBDIRS): Add mesh. --- milena/ChangeLog | 7 +++++ milena/Makefile.am | 2 +- milena/mesh/Makefile.am | 58 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 1 deletions(-) create mode 100644 milena/mesh/Makefile.am diff --git a/milena/ChangeLog b/milena/ChangeLog index a6d0f1e..bcbe277 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2008-11-18 Roland Levillain <roland(a)lrde.epita.fr> + Generate meshes with curvature. + + * mesh/Makefile.am (pinv_curv): New. + * Makefile.am (SUBDIRS): Add mesh. + +2008-11-18 Roland Levillain <roland(a)lrde.epita.fr> + Remove previously computed meshes (with curvature). * mesh/bunny-holefilled-curv.off, diff --git a/milena/Makefile.am b/milena/Makefile.am index 97c91e3..609628b 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -1,6 +1,6 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- -SUBDIRS = doc tests tools apps +SUBDIRS = mesh doc tests tools apps .PHONY: doc doc: diff --git a/milena/mesh/Makefile.am b/milena/mesh/Makefile.am new file mode 100644 index 0000000..b342a6a --- /dev/null +++ b/milena/mesh/Makefile.am @@ -0,0 +1,58 @@ +## Process this file through Automake to create Makefile.in -*- Makefile -*- + +## This Makefile makes use of GNU Make extensions (%-patterns, +## patsubst). We might want to turn it into something more portable +## when Olena is released. + +meshdir = $(pkgdatadir)/images +dist_mesh_DATA = + +## -------- ## +## Meshes. ## +## -------- ## + +meshes = \ + bunny-holefilled.off \ + cone.off \ + cube.off \ + socket.off \ + teapot.off \ + tetrahedron.off +dist_mesh_DATA += $(meshes) + +## ------------------------------------ ## +## Pseudo-inverse curvature of meshes. ## +## ------------------------------------ ## + +mesh_pinv_curv = $(top_builddir)/milena/apps/statues/mesh-pinv-curv +mesh_pinv_curv: $(top_srcdir)/milena/apps/statues/mesh-pinv-curv.cc + cd $(top_builddir)/milena/apps/statues/mesh-pinv-curv && \ + $(MAKE) $(AM_MAKEFLAGS) mesh_pinv_curv + +$(srcdir)/%-pinv-curv.off: %.off $(mesh_pinv_curv) + $(mesh_pinv_curv) $< $@ + +# pinv_curv = $(meshes:.off=-pinv-curv.off) +pinv_curv = $(patsubst %.off,$(srcdir)/%-pinv-curv.off,$(meshes)) +dist_mesh_DATA += $(pinv_curv) + +## ----------------------------- ## +## Maximum curvature of meshes. ## +## ----------------------------- ## + +mesh_max_curv = $(top_builddir)/milena/apps/statues/mesh-max-curv +mesh_max_curv: $(top_srcdir)/milena/apps/statues/mesh-max-curv.cc + cd $(top_builddir)/milena/apps/statues/mesh-max-curv && \ + $(MAKE) $(AM_MAKEFLAGS) mesh_max_curv + +$(srcdir)/%-max-curv.off: %.off $(mesh_max_curv) + $(mesh_max_curv) $< $@ + +#max_curv = $(meshes:.off=-max-curv.off) +max_curv = $(patsubst %.off,$(srcdir)/%-max-curv.off,$(meshes)) +dist_mesh_DATA += $(max_curv) + +.PHONY: debug +debug: + @echo $(pinv_curv) + @echo $(max_curv) -- 1.6.0.1

1 0

2903: Add a program computing the maximum curvature on a mesh.
by Roland Levillain 19 Nov '08

19 Nov '08

* apps/statues/mesh-max-curv.cc: New. * apps/statues/Makefile.am (bin_PROGRAMS): Add mesh-max-curv. (mesh_max_curv_SOURCES): New. --- milena/ChangeLog | 8 ++ milena/apps/statues/Makefile.am | 3 +- milena/apps/statues/mesh-max-curv.cc | 131 ++++++++++++++++++++++++++++++++++ 3 files changed, 141 insertions(+), 1 deletions(-) create mode 100644 milena/apps/statues/mesh-max-curv.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 7de2bd7..fa83a63 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2008-11-18 Roland Levillain <roland(a)lrde.epita.fr> + Add a program computing the maximum curvature on a mesh. + + * apps/statues/mesh-max-curv.cc: New. + * apps/statues/Makefile.am (bin_PROGRAMS): Add mesh-max-curv. + (mesh_max_curv_SOURCES): New. + +2008-11-18 Roland Levillain <roland(a)lrde.epita.fr> + Rename apps/statues/mesh-curv as apps/statues/mesh-pinv-curv. * apps/statues/mesh-curv.cc: Rename as... diff --git a/milena/apps/statues/Makefile.am b/milena/apps/statues/Makefile.am index 9a5c9a1..d41ead6 100644 --- a/milena/apps/statues/Makefile.am +++ b/milena/apps/statues/Makefile.am @@ -14,9 +14,10 @@ AM_LDFLAGS = $(GLFLAGS) LDADD = -L$(top_builddir)/external/trimesh/libsrc -ltrimesh $(GLLIBS) -bin_PROGRAMS = mesh-pinv-curv mesh-segm mesh-skel +bin_PROGRAMS = mesh-pinv-curv mesh-max-curv mesh-segm mesh-skel mesh_pinv_curv_SOURCES = mesh-pinv-curv.cc io.hh +mesh_max_curv_SOURCES = mesh-max-curv.cc io.hh mesh_segm_SOURCES = mesh-segm.cc io.hh mesh_skel_SOURCES = mesh-skel.cc io.hh diff --git a/milena/apps/statues/mesh-max-curv.cc b/milena/apps/statues/mesh-max-curv.cc new file mode 100644 index 0000000..8fc9a06 --- /dev/null +++ b/milena/apps/statues/mesh-max-curv.cc @@ -0,0 +1,131 @@ +// 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 apps/statues/mesh-max-curv.cc +/// \brief A program computing the max curvature at each (2-)face of +/// a mesh. + +#include <cstdlib> +#include <cmath> + +#include <algorithm> +#include <vector> +#include <iostream> +#include <utility> + +#include <TriMesh.h> + +#include <mln/math/max.hh> +#include <mln/math/sqr.hh> +#include <mln/accu/min_max.hh> +#include <mln/fun/v2v/linear.hh> + +#include "io.hh" + + +// Doesn't C++ have a better way to express Pi? +const float pi = 4 * atanf(1); + + +int main(int argc, char* argv[]) +{ + if (argc != 3) + { + std::cerr << "usage: " << argv[0] << " input.off output.off" + << std::endl; + exit(1); + } + + std::string input_filename = argv[1]; + std::string output_filename = argv[2]; + + + // TriMesh is a pain: it systematically allocates on the heap. + // Introduce another name to manipulate the mesh as a (non-pointer) + // object. + TriMesh* mesh_ptr = TriMesh::read(input_filename.c_str()); + if (!mesh_ptr) + exit(2); + TriMesh& mesh = *mesh_ptr; + + // Computes faces (triangles). + mesh.need_faces(); + // Computation of the curvature on each vertex of the mesh. + mesh.need_curvatures(); + std::vector<float> vertex_m(mesh.vertices.size(), 0.f); + for (unsigned v = 0; v < mesh.vertices.size(); ++v) + // Max curvature. + vertex_m[v] = mln::math::max(mln::math::sqr(mesh.curv1[v]), + mln::math::sqr(mesh.curv2[v])); + + // For each face of the mesh, computean an average curvature value + // from the mean curvature at its vertices. + std::vector<float> face_m(mesh.faces.size(), 42.f); + mln::accu::min_max<float> acc; + for (unsigned f = 0; f < mesh.faces.size(); ++f) + { + float m = (vertex_m[mesh.faces[f][0]] + + vertex_m[mesh.faces[f][1]] + + vertex_m[mesh.faces[f][2]]) / 3; + face_m[f] = m; + acc.take(m); + } + + /* Shrink the values of FACE_M into the range 0..1, as these are + the only values accepted a an RGB floating-point component in the + OFF file format. */ + std::vector<float> normalized_face_m(face_m.size(), 0.0f); + std::pair<float, float> min_max(acc); + // FIXME: Taken from mln/level/stretch.hh (this should be factored). + float min = min_max.first; + float max = min_max.second; + // Don't normalize actually if the curvature is constants (i.e., + // if min == max). + if (min != max) + { + float m = 0.0f; + float M = 1.0f; + float a = (M - m) / (max - min); + float b = (m * max - M * min) / (max - min); + mln::fun::v2v::linear<float, float, float> f(a, b); + std::transform(face_m.begin(), face_m.end(), + normalized_face_m.begin(), f); + } + + // Taken and adapted from TriMesh_io.cc + FILE* f_out = fopen(output_filename.c_str(), "wb"); + if (!f_out) + { + std::cerr << "Error opening " << output_filename.c_str() + << " for writing." << std::endl; + exit(2); + } + write_off_float(mesh_ptr, normalized_face_m, f_out); + fclose(f_out); + + delete mesh_ptr; +} -- 1.6.0.1

1 0

2902: Rename apps/statues/mesh-curv as apps/statues/mesh-pinv-curv.
by Roland Levillain 19 Nov '08

19 Nov '08

* apps/statues/mesh-curv.cc: Rename as... * apps/statues/mesh-pinv-curv.cc: ...this. Adjust. * apps/statues/Makefile.am: Adjust. --- milena/ChangeLog | 9 +++++++++ milena/apps/statues/Makefile.am | 4 ++-- .../statues/{mesh-curv.cc => mesh-pinv-curv.cc} | 7 ++++--- 3 files changed, 15 insertions(+), 5 deletions(-) rename milena/apps/statues/{mesh-curv.cc => mesh-pinv-curv.cc} (95%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 59065a6..7de2bd7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2008-11-18 Roland Levillain <roland(a)lrde.epita.fr> + Rename apps/statues/mesh-curv as apps/statues/mesh-pinv-curv. + + * apps/statues/mesh-curv.cc: Rename as... + * apps/statues/mesh-pinv-curv.cc: ...this. + Adjust. + * apps/statues/Makefile.am: Adjust. + +2008-11-18 Roland Levillain <roland(a)lrde.epita.fr> + Fix and clean up apps/statues/mesh-curv. * apps/statues/mesh-curv.cc (main): Fix the formula used to diff --git a/milena/apps/statues/Makefile.am b/milena/apps/statues/Makefile.am index 9b07a62..9a5c9a1 100644 --- a/milena/apps/statues/Makefile.am +++ b/milena/apps/statues/Makefile.am @@ -14,9 +14,9 @@ AM_LDFLAGS = $(GLFLAGS) LDADD = -L$(top_builddir)/external/trimesh/libsrc -ltrimesh $(GLLIBS) -bin_PROGRAMS = mesh-curv mesh-segm mesh-skel +bin_PROGRAMS = mesh-pinv-curv mesh-segm mesh-skel -mesh_curv_SOURCES = mesh-curv.cc io.hh +mesh_pinv_curv_SOURCES = mesh-pinv-curv.cc io.hh mesh_segm_SOURCES = mesh-segm.cc io.hh mesh_skel_SOURCES = mesh-skel.cc io.hh diff --git a/milena/apps/statues/mesh-curv.cc b/milena/apps/statues/mesh-pinv-curv.cc similarity index 95% rename from milena/apps/statues/mesh-curv.cc rename to milena/apps/statues/mesh-pinv-curv.cc index b9915b7..8f38c57 100644 --- a/milena/apps/statues/mesh-curv.cc +++ b/milena/apps/statues/mesh-pinv-curv.cc @@ -25,9 +25,9 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file apps/statues/mesh-curv.cc -/// \brief A program computing the mean curvature at each (2-)face of -/// a mesh. +/// \file apps/statues/mesh-pinv-curv.cc +/// \brief A program computing the pseudo-inverse curvature at each +/// (2-)face of a mesh. #include <cstdlib> #include <cmath> @@ -75,6 +75,7 @@ int main(int argc, char* argv[]) for (unsigned v = 0; v < mesh.vertices.size(); ++v) { float h = (mesh.curv1[v] + mesh.curv2[v]) / 2; + // Pseudo-inverse curvature. float h_inv = 1 / pi * (atan(-h) + pi / 2); vertex_h_inv[v] = h_inv; } -- 1.6.0.1

1 0