November 2008 - Olena-patches

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

18 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 18 Nov '08

18 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 18 Nov '08

18 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 18 Nov '08

18 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 18 Nov '08

18 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

2901: Fix and clean up apps/statues/mesh-curv.
by Roland Levillain 18 Nov '08

18 Nov '08

* apps/statues/mesh-curv.cc (main): Fix the formula used to compute the curvature. No longer normalize h_inv (inverse curvature) values, and ensure they are in the range 0..1. Remove useless code. --- milena/ChangeLog | 10 ++++++++++ milena/apps/statues/mesh-curv.cc | 35 +++++------------------------------ 2 files changed, 15 insertions(+), 30 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index fb85633..59065a6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,13 @@ +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 + compute the curvature. + No longer normalize h_inv (inverse curvature) values, and ensure + they are in the range 0..1. + Remove useless code. + 2008-11-18 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix connectivity number values for c4. diff --git a/milena/apps/statues/mesh-curv.cc b/milena/apps/statues/mesh-curv.cc index bba4d38..b9915b7 100644 --- a/milena/apps/statues/mesh-curv.cc +++ b/milena/apps/statues/mesh-curv.cc @@ -39,10 +39,6 @@ #include <TriMesh.h> -#include <mln/accu/min_max.hh> -#include <mln/fun/v2v/linear.hh> -#include <mln/math/abs.hh> - #include "io.hh" @@ -73,47 +69,26 @@ int main(int argc, char* argv[]) // Computes faces (triangles). mesh.need_faces(); - // Computation of the mean curvature on each vertex of the mesh. + // Computation of the curvature on each vertex of the mesh. mesh.need_curvatures(); std::vector<float> vertex_h_inv(mesh.vertices.size(), 0.f); for (unsigned v = 0; v < mesh.vertices.size(); ++v) { float h = (mesh.curv1[v] + mesh.curv2[v]) / 2; - float h_inv = 1 / pi * atan(-h) + pi / 2; + float h_inv = 1 / pi * (atan(-h) + pi / 2); vertex_h_inv[v] = h_inv; } // For each face of the mesh, computean an average curvature value // from the mean curvature at its vertices. std::vector<float> face_h_inv(mesh.faces.size(), 42.f); - mln::accu::min_max<float> acc; for (unsigned f = 0; f < mesh.faces.size(); ++f) { float h_inv = (vertex_h_inv[mesh.faces[f][0]] + vertex_h_inv[mesh.faces[f][1]] + vertex_h_inv[mesh.faces[f][2]]) / 3; + mln_invariant(0.f <= h_inv); + mln_invariant(h_inv <= 1.f); face_h_inv[f] = h_inv; - acc.take(h_inv); - } - - /* Shrink the values of FACE_H_INV 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_h_inv(face_h_inv.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_h_inv.begin(), face_h_inv.end(), - normalized_face_h_inv.begin(), f); } // Taken and adapted from TriMesh_io.cc @@ -124,7 +99,7 @@ int main(int argc, char* argv[]) << " for writing." << std::endl; exit(2); } - write_off_float(mesh_ptr, normalized_face_h_inv, f_out); + write_off_float(mesh_ptr, face_h_inv, f_out); fclose(f_out); delete mesh_ptr; -- 1.6.0.1

1 0

cleanup-2008 2900: Fix connectivity number values for c4.
by Thierry Geraud 18 Nov '08

18 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix connectivity number values for c4. * tests/morpho/skeleton_constrained.cc: Use tiny image. * mln/topo/is_simple_2d.hh (connectivity_number_c4): Fix values. mln/topo/is_simple_2d.hh | 39 +++++++++++++++++------------------ tests/morpho/skeleton_constrained.cc | 2 - 2 files changed, 21 insertions(+), 20 deletions(-) Index: tests/morpho/skeleton_constrained.cc --- tests/morpho/skeleton_constrained.cc (revision 2899) +++ tests/morpho/skeleton_constrained.cc (working copy) @@ -89,7 +89,7 @@ border::thickness = 1; image2d<bool> pic; - io::pbm::load(pic, MLN_IMG_DIR "/fly.pbm"); + io::pbm::load(pic, MLN_IMG_DIR "/tiny.pbm"); mln_VAR( nbh, make::dual_neighb(pic, c4(), c8()) ); Index: mln/topo/is_simple_2d.hh --- mln/topo/is_simple_2d.hh (revision 2899) +++ mln/topo/is_simple_2d.hh (working copy) @@ -100,27 +100,28 @@ 1, 2, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; + static const unsigned char connectivity_number_c4[256] = { - 0, 1, 1, 1, 1, 2, 1, 1, 1, 1, 2, 1, 2, 2, 2, 1, - 1, 2, 2, 2, 1, 2, 1, 1, 2, 2, 3, 2, 2, 2, 2, 1, - 1, 2, 2, 2, 2, 3, 2, 2, 1, 1, 2, 1, 2, 2, 2, 1, - 2, 3, 3, 3, 2, 3, 2, 2, 2, 2, 3, 2, 2, 2, 2, 1, - - 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 3, 2, 3, 3, 3, 2, - 2, 3, 3, 3, 2, 3, 2, 2, 3, 3, 4, 3, 3, 3, 3, 2, - 1, 2, 2, 2, 2, 3, 2, 2, 1, 1, 2, 1, 2, 2, 2, 1, - 2, 3, 3, 3, 2, 3, 2, 2, 2, 2, 3, 2, 2, 2, 2, 1, - - 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 3, 2, 3, 3, 3, 2, - 1, 2, 2, 2, 1, 2, 1, 1, 2, 2, 3, 2, 2, 2, 2, 1, - 2, 3, 3, 3, 3, 4, 3, 3, 2, 2, 3, 2, 3, 3, 3, 2, - 2, 3, 3, 3, 2, 3, 2, 2, 2, 2, 3, 2, 2, 2, 2, 1, - - 1, 2, 2, 2, 2, 3, 2, 2, 2, 2, 3, 2, 3, 3, 3, 2, - 1, 2, 2, 2, 1, 2, 1, 1, 2, 2, 3, 2, 2, 2, 2, 1, - 1, 2, 2, 2, 2, 3, 2, 2, 1, 1, 2, 1, 2, 2, 2, 1, - 1, 2, 2, 2, 1, 2, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1 + 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, + 1, 1, 2, 2, 1, 1, 1, 1, 2, 2, 3, 2, 2, 2, 2, 1, + 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, + 1, 1, 2, 2, 1, 1, 1, 1, 2, 2, 3, 2, 2, 2, 2, 1, + + 1, 1, 2, 2, 1, 1, 2, 2, 2, 2, 3, 2, 2, 2, 3, 2, + 2, 2, 3, 3, 2, 2, 2, 2, 3, 3, 4, 3, 3, 3, 3, 2, + 1, 1, 2, 2, 1, 1, 2, 2, 1, 1, 2, 1, 1, 1, 2, 1, + 2, 2, 3, 3, 2, 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 1, + + 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, + 1, 1, 2, 2, 1, 1, 1, 1, 2, 2, 3, 2, 2, 2, 2, 1, + 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, + 1, 1, 2, 2, 1, 1, 1, 1, 2, 2, 3, 2, 2, 2, 2, 1, + + 1, 1, 2, 2, 1, 1, 2, 2, 2, 2, 3, 2, 2, 2, 3, 2, + 1, 1, 2, 2, 1, 1, 1, 1, 2, 2, 3, 2, 2, 2, 2, 1, + 1, 1, 2, 2, 1, 1, 2, 2, 1, 1, 2, 1, 1, 1, 2, 1, + 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1 };

1 0

cleanup-2008 2899: Fix the code that computes connexity numbers.
by Thierry Geraud 18 Nov '08

18 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Fix the code that computes connexity numbers. * garrigues/ocr/compute_local_configurations.cc: Fix. compute_local_configurations.cc | 65 +++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 34 deletions(-) Index: garrigues/ocr/compute_local_configurations.cc --- garrigues/ocr/compute_local_configurations.cc (revision 2898) +++ garrigues/ocr/compute_local_configurations.cc (working copy) @@ -6,23 +6,27 @@ #include <mln/debug/println.hh> #include <iomanip> + int main() { using namespace mln; - using namespace mln::value; + using value::int_u8; typedef image2d<bool> I; - image2d<bool> ima(3,3); - point2d p(1,1); - std::cout << "----- Object in C8 ------" << std::endl; + box2d b = make::box2d(-1,-1, 1,1); + image2d<bool> ima(b, 0); + point2d p(0, 0); + + std::vector<int_u8> x8(256), x4(256); + for (unsigned i = 0; i < 256; i++) { level::fill(ima, false); - int_u8 tmp = i; - mln_niter_(neighb2d) n(c8() , p); + int_u8 tmp = i; + mln_fwd_niter_(neighb2d) n(c8(), p); for_all(n) { if (tmp % 2) @@ -30,16 +34,28 @@ tmp = tmp >> 1; } + labeling::blobs(ima, c8(), x8[i]); - unsigned x; - labeling::blobs(ima, c8(), x); + { + int_u8 nl; + image2d<int_u8> lab = labeling::blobs(ima, c4(), nl); + std::set<int_u8> s; + mln_fwd_niter_(neighb2d) n(c4(), p); + for_all(n) + if (lab(n) != 0) + s.insert(lab(n)); + x4[i] = s.size(); + } + } -// std::cout << "----- conf no " << i << "------" << std::endl; -// debug::println(ima); -// std::cout << "----- " << x << " cc------" << std::endl; -// std::cout << "-----------" << std::endl; - std::cout << std::setw(2) << x << ", "; + // Now printing! + + std::cout << "----- Object in C8 ------" << std::endl; + + for (unsigned i = 0; i < 256; i++) + { + std::cout << std::setw(2) << x8[i] << ", "; if (! ((i + 1) % 4)) std::cout << " "; if (! ((i + 1) % 16)) std::cout << std::endl; if (! ((i + 1) % 64)) std::cout << std::endl; @@ -49,29 +65,10 @@ for (unsigned i = 0; i < 256; i++) { - level::fill(ima, false); - int_u8 tmp = i; - - mln_niter_(neighb2d) n(c8() , p); - for_all(n) - { - if (tmp % 2) - ima(n) = true; - tmp = tmp >> 1; - } - - - unsigned x; - labeling::blobs(ima, c4(), x); - -// std::cout << "----- conf no " << i << "------" << std::endl; -// debug::println(ima); -// std::cout << "----- " << x << " cc------" << std::endl; -// std::cout << "-----------" << std::endl; - - std::cout << std::setw(2) << x << ", "; + std::cout << std::setw(2) << x4[i] << ", "; if (! ((i + 1) % 4)) std::cout << " "; if (! ((i + 1) % 16)) std::cout << std::endl; if (! ((i + 1) % 64)) std::cout << std::endl; } + }

1 0

cleanup-2008 2898: Prepare to debug morpho skeleton_constrained.
by Thierry Geraud 18 Nov '08

18 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Prepare to debug morpho skeleton_constrained. * tests/morpho/skeleton_constrained.cc: Add extra echos. * mln/topo/is_simple_2d.hh: Relax test on domain extension. * mln/morpho/skeleton_constrained.hh: Likewise. Prefer adjust duplicate over adjust fill. mln/morpho/skeleton_constrained.hh | 20 ++++++++++++-------- mln/topo/is_simple_2d.hh | 4 ++-- tests/morpho/skeleton_constrained.cc | 13 +++++++++---- 3 files changed, 23 insertions(+), 14 deletions(-) Index: tests/morpho/skeleton_constrained.cc --- tests/morpho/skeleton_constrained.cc (revision 2897) +++ tests/morpho/skeleton_constrained.cc (working copy) @@ -47,6 +47,7 @@ #include <mln/pw/value.hh> #include <mln/core/image/image_if.hh> +#include <mln/extension/adjust_duplicate.hh> #include <mln/logical/not.hh> #include <mln/arith/revert.hh> @@ -62,7 +63,9 @@ void show_connectivity_numbers(const image2d<bool>& ima, const N& nbh) { - extension::adjust_fill(ima, nbh, false); + extension::adjust_duplicate(ima, nbh); + + debug::println_with_border(ima); image2d<unsigned> when_true(ima.domain()), when_false(ima.domain()); mln_piter(box2d) p(ima.domain()); @@ -83,11 +86,13 @@ using namespace mln; using value::int_u8; + border::thickness = 1; + image2d<bool> pic; - io::pbm::load(pic, MLN_IMG_DIR "/tiny.pbm"); + io::pbm::load(pic, MLN_IMG_DIR "/fly.pbm"); mln_VAR( nbh, - make::dual_neighb(pic, c8(), c4()) ); + make::dual_neighb(pic, c4(), c8()) ); show_connectivity_numbers(pic, nbh); @@ -99,7 +104,7 @@ image2d<int_u8> dmap = transform::distance_geodesic(logical::not_(pic), nbh.foreground(), mln_max(int_u8)); - debug::println("dst =", dmap); + debug::println("dst =", dmap | pw::value(pic)); dmap = arith::revert(dmap); mln_VAR( skl, Index: mln/topo/is_simple_2d.hh --- mln/topo/is_simple_2d.hh (revision 2897) +++ mln/topo/is_simple_2d.hh (working copy) @@ -135,11 +135,11 @@ unsigned res = 0; - mln_bkd_niter(neighb2d) n(c8(), p); + mln_fwd_niter(neighb2d) n(c8(), p); for_all(n) { res = (res << 1); - if (ima.domain().has(n) && ima(n) == b) + if (ima.has(n) && ima(n) == b) res = res | 1; } Index: mln/morpho/skeleton_constrained.hh --- mln/morpho/skeleton_constrained.hh (revision 2897) +++ mln/morpho/skeleton_constrained.hh (working copy) @@ -31,12 +31,14 @@ /// \file mln/morpho/skeleton_constrained.hh /// /// Compute a skeleton under constraints. +/// +/// \todo Add an extension handling policy for the user to set it. # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> # include <mln/core/site_set/p_queue_fast.hh> # include <mln/core/site_set/p_priority.hh> -# include <mln/extension/adjust_fill.hh> +# include <mln/extension/adjust_duplicate.hh> # include <mln/level/fill.hh> @@ -72,7 +74,7 @@ const K& constraint = exact(constraint_); const R& priority = exact(priority_); - extension::adjust_fill(input, nbh, false); + extension::adjust_duplicate(input, nbh); // FIXME: Tests! @@ -86,16 +88,17 @@ { initialize(output, input); level::fill(output, input); + extension::adjust_duplicate(output, nbh); mln_piter(I) p(input.domain()); for_all(p) - if ( input(p) == false ) -// if ( input(p) == false && -// is_simple(input, nbh, p) ) // p is a simple point of the background. + if ( input(p) == false && + is_simple(input, nbh, p) ) // p is a simple point of the background. { q.push(priority(p), p); - // std::cout << "push " << p << std::endl; + // std::cout << p << " "; } + std::cout << std::endl; } // std::cout << std::endl << "propagation..." << std::endl; @@ -108,16 +111,17 @@ { p = q.pop_front(); for_all(n) - if ( output.domain().has(n) && + if ( output.has(n) && output(n) == true && constraint(n) == false && is_simple(output, nbh, n) ) { output(n) = false; // Remove n from object. q.push(priority(n), n); - // std::cout << "push " << n << std::endl; + // std::cout << n << " "; } } + std::cout << std::endl; } return output;

1 0

cleanup-2008 2897: Have for tests morpho skeleton an example that works.
by Thierry Geraud 18 Nov '08

18 Nov '08

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Have for tests morpho skeleton an example that works. * tests/morpho/skeleton_constrained.cc (main): Use distance as the priority. Swap c4 and c8; otherwise it does not work properly... skeleton_constrained.cc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) Index: tests/morpho/skeleton_constrained.cc --- tests/morpho/skeleton_constrained.cc (revision 2896) +++ tests/morpho/skeleton_constrained.cc (working copy) @@ -48,6 +48,10 @@ #include <mln/pw/value.hh> #include <mln/core/image/image_if.hh> +#include <mln/logical/not.hh> +#include <mln/arith/revert.hh> +#include <mln/transform/distance_geodesic.hh> + #include "tests/data.hh" @@ -83,7 +87,7 @@ io::pbm::load(pic, MLN_IMG_DIR "/tiny.pbm"); mln_VAR( nbh, - make::dual_neighb(pic, c4(), c8()) ); + make::dual_neighb(pic, c8(), c4()) ); show_connectivity_numbers(pic, nbh); @@ -91,13 +95,17 @@ image2d<bool> K(pic.domain()); level::fill(K, false); - image2d<int_u8> prior(pic.domain()); - level::fill(prior, 1); + + image2d<int_u8> dmap = transform::distance_geodesic(logical::not_(pic), + nbh.foreground(), + mln_max(int_u8)); + debug::println("dst =", dmap); + dmap = arith::revert(dmap); mln_VAR( skl, morpho::skeleton_constrained(pic, nbh, is_simple_2d_t(), - K, prior) ); + K, dmap) ); debug::println("pic =", pic); debug::println("skl =", skl);

1 0