Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

olena: olena-2.0-759-ge9bf0a6 Fix header inclusions in Milena's apps/mesh-segm-skel.

by Roland Levillain

* apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc, * apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc, * apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc, * apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc, * apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc, * apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc: Here. --- milena/ChangeLog | 12 ++++++++++++ .../mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc | 4 ++-- .../mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc | 4 ++-- .../apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc | 4 ++-- milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc | 4 ++-- milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc | 4 ++-- milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc | 4 ++-- 7 files changed, 24 insertions(+), 12 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9a638de..58df7ec 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,15 @@ +2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + + Fix header inclusions in Milena's apps/mesh-segm-skel. + + * apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc, + * apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc, + * apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc, + * apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc, + * apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc, + * apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc: + Here. + 2012-02-17 Roland Levillain <roland(a)lrde.epita.fr> Add tests to generate figures for the WADGMM 2010/LNCS submission. 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 47a5a20..300b201 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 @@ -1,4 +1,4 @@ -// Copyright (C) 2008-2012 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008-2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Milena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -62,7 +62,7 @@ #include <mln/util/timer.hh> -#include "trimesh/misc.hh" +#include "misc.hh" int 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 7c779e3..30bf8e5 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 @@ -1,4 +1,4 @@ -// Copyright (C) 2008-2012 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008-2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Milena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -62,7 +62,7 @@ #include <mln/util/timer.hh> -#include "trimesh/misc.hh" +#include "misc.hh" int diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc index 8f68b3d..e17c477 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of the Milena Library. This library is free @@ -62,7 +62,7 @@ #include <mln/io/off/load.hh> #include <mln/io/off/save.hh> -#include "trimesh/misc.hh" +#include "misc.hh" // Doesn't C++ have a better way to express Pi? 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 2d55ff2..a3c4364 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 @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of the Milena Library. This library is free @@ -59,7 +59,7 @@ morphed mln::complex_image (i.e., seen through image_if). */ #include "save_bin_alt.hh" -#include "trimesh/misc.hh" +#include "misc.hh" int diff --git a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc index fe7ee70..ced95a0 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of the Milena Library. This library is free @@ -53,7 +53,7 @@ #include <mln/io/off/load.hh> #include <mln/io/off/save.hh> -#include "trimesh/misc.hh" +#include "misc.hh" // Doesn't C++ have a better way to express Pi? 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 c4b9bb8..d9e6ae4 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 @@ -1,4 +1,4 @@ -// Copyright (C) 2008-2010, 2012 EPITA Research and Development +// Copyright (C) 2008-2010, 2012-2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of the Milena Library. This library is free @@ -61,7 +61,7 @@ morphed mln::complex_image (i.e., seen through image_if). */ #include "save_bin_alt.hh" -#include "trimesh/misc.hh" +#include "misc.hh" // Doesn't C++ have a better way to express Pi? -- 1.7.10.4

11 years, 4 months

olena: olena-2.0-769-g2cbfa7d Fix 3D simple point generators in Milena tools.

by Roland Levillain

* tools/Makefile.am: Fix build rules of optional programs. * tools/simple_point3d_lut_tbb.cc: Rename as... * tools/simple_point_3d_lut_tbb.cc: ...this. s/point_3d/point3d/. --- milena/ChangeLog | 9 ++++++++ milena/tools/Makefile.am | 24 ++++++++++++++------ ...int_3d_lut_tbb.cc => simple_point3d_lut_tbb.cc} | 12 +++++----- 3 files changed, 32 insertions(+), 13 deletions(-) rename milena/tools/{simple_point_3d_lut_tbb.cc => simple_point3d_lut_tbb.cc} (78%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 48d5c46..7cfb2ac 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + Fix 3D simple point generators in Milena tools. + + * tools/Makefile.am: Fix build rules of optional programs. + * tools/simple_point3d_lut_tbb.cc: Rename as... + * tools/simple_point_3d_lut_tbb.cc: ...this. + s/point_3d/point3d/. + +2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + Kill warnings about unused variables. * mln/io/vtk/save.hh, diff --git a/milena/tools/Makefile.am b/milena/tools/Makefile.am index 504d1b0..dce1cad 100644 --- a/milena/tools/Makefile.am +++ b/milena/tools/Makefile.am @@ -58,10 +58,8 @@ simple_point3d_lut_tbb_LDFLAGS = $(LDFLAGS_TBB) simple_point_luts: simple_point3d_lut_26_6.hh CLEANFILES = simple_point3d_lut_26_6.txt -# Careful, there is no dependency on the generator (on purpose, -# because regenerating these files takes time). -simple_point3d_lut_26_6.txt: - ./simple_point3d_lut_tbb$(EXEEXT) 26_6 >$@ +simple_point3d_lut_26_6.txt: simple_point3d_lut_tbb$(EXEEXT) + ./$< 26_6 >$@ EXTRA_DIST = gen_cxx_lut CLEANFILES += simple_point3d_lut_26_6.hh @@ -73,9 +71,21 @@ simple_point3d_lut_26_6.hh: simple_point3d_lut_26_6.txt $(srcdir)/gen_cxx_lut # Very long (both to compile and execute) optional test, checking the # consistency of the LUT in simple_point3d_lut_26_6.hh. Moreover, it # should be turned into a parallel program. -noinst_LTLIBRARIES = libsimple_point3d_lut_26_6.la -libsimple_point3d_lut_26_6_la_SOURCES = \ - simple_point3d_lut_26_6.hh simple_point3d_lut_26_6.cc + +.PHONY: check-extra +check-extra: test_simple_point3d_lut_26_6$(EXEEXT) + ./$< + +EXTRA_LTLIBRARIES = libsimple_point3d_lut_26_6.la +libsimple_point3d_lut_26_6_la_SOURCES = simple_point3d_lut_26_6.cc +nodist_libsimple_point3d_lut_26_6_la_SOURCES = simple_point3d_lut_26_6.hh +# Generate this build dependency of libsimple_point3d_lut_26_6.la. +simple_point3d_lut_26_6.lo: simple_point3d_lut_26_6.hh + EXTRA_PROGRAMS += test_simple_point3d_lut_26_6 test_simple_point3d_lut_26_6_SOURCES = test_simple_point3d_lut_26_6.cc test_simple_point3d_lut_26_6_LDADD = libsimple_point3d_lut_26_6.la +# Generate this build dependency of test_simple_point3d_lut_26_6. +test_simple_point3d_lut_26_6.o: simple_point3d_lut_26_6.hh + +CLEANFILES += $(EXTRA_PROGRAMS) $(EXTRA_LTLIBRARIES) diff --git a/milena/tools/simple_point_3d_lut_tbb.cc b/milena/tools/simple_point3d_lut_tbb.cc similarity index 78% rename from milena/tools/simple_point_3d_lut_tbb.cc rename to milena/tools/simple_point3d_lut_tbb.cc index 57a44dd..7ba9654 100644 --- a/milena/tools/simple_point_3d_lut_tbb.cc +++ b/milena/tools/simple_point3d_lut_tbb.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -27,7 +27,7 @@ /// 3D point is simple or not, in parallel, using Intel Threading /// Building Blocks. -#include "simple_point_3d_lut_tbb.hh" +#include "simple_point3d_lut_tbb.hh" int main(int argc, char* argv[]) @@ -37,10 +37,10 @@ main(int argc, char* argv[]) std::string nbhs = argv[1]; simple_point_lut_t simple_point_lut; - if (nbhs == "6_26") simple_point_lut = simple_point_3d_lut_tbb__6_26(); - else if (nbhs == "26_6") simple_point_lut = simple_point_3d_lut_tbb__26_6(); - else if (nbhs == "6p_18") simple_point_lut = simple_point_3d_lut_tbb__6p_18(); - else if (nbhs == "18_6p") simple_point_lut = simple_point_3d_lut_tbb__18_6p(); + if (nbhs == "6_26") simple_point_lut = simple_point3d_lut_tbb__6_26(); + else if (nbhs == "26_6") simple_point_lut = simple_point3d_lut_tbb__26_6(); + else if (nbhs == "6p_18") simple_point_lut = simple_point3d_lut_tbb__6p_18(); + else if (nbhs == "18_6p") simple_point_lut = simple_point3d_lut_tbb__18_6p(); else usage(argv[0]); -- 1.7.10.4

11 years, 4 months

olena: olena-2.0-768-ge20e410 Kill warnings about unused variables.

by Roland Levillain

* mln/io/vtk/save.hh, * tools/connectivity_numbers_3d_tbb.hh, * tools/simple_point3d_lut_tbb.hh: Here. --- milena/ChangeLog | 9 +++++++++ milena/mln/io/vtk/save.hh | 2 +- milena/tools/connectivity_numbers_3d_tbb.hh | 6 +----- milena/tools/simple_point3d_lut_tbb.hh | 6 +----- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e43f313..48d5c46 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + Kill warnings about unused variables. + + * mln/io/vtk/save.hh, + * tools/connectivity_numbers_3d_tbb.hh, + * tools/simple_point3d_lut_tbb.hh: + Here. + +2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + Kill warnings about signed vs unsigned values. * mln/topo/is_not_1d_isthmus.hh diff --git a/milena/mln/io/vtk/save.hh b/milena/mln/io/vtk/save.hh index e8c8e09..0971f2d 100644 --- a/milena/mln/io/vtk/save.hh +++ b/milena/mln/io/vtk/save.hh @@ -231,7 +231,7 @@ namespace mln // Concept checking. void (E::*m1)(std::ostream&, const I&) const = &E::write_face_data; - m1 = 0; + (void) m1; } diff --git a/milena/tools/connectivity_numbers_3d_tbb.hh b/milena/tools/connectivity_numbers_3d_tbb.hh index edea434..514bb6d 100644 --- a/milena/tools/connectivity_numbers_3d_tbb.hh +++ b/milena/tools/connectivity_numbers_3d_tbb.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -63,10 +63,6 @@ struct connectivity_numbers_3d_tbb_range I ima(b, 0); P p(0, 0, 0); - const unsigned dim = 3; - const unsigned max_nneighbs = mlc_pow_int(3, dim) - 1; - const unsigned nconfigs = mlc_pow_int(2, max_nneighbs); - for (config_3d_t i = r.begin(); i != r.end(); ++i) { /* Create the local i-th configuration around P. diff --git a/milena/tools/simple_point3d_lut_tbb.hh b/milena/tools/simple_point3d_lut_tbb.hh index b8c0a15..670394f 100644 --- a/milena/tools/simple_point3d_lut_tbb.hh +++ b/milena/tools/simple_point3d_lut_tbb.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -67,10 +67,6 @@ struct simple_point3d_lut_tbb_range I bg_ima(b, 0); P p(0, 0, 0); - const unsigned dim = 3; - const unsigned max_nneighbs = mlc_pow_int(3, dim) - 1; - const unsigned nconfigs = mlc_pow_int(2, max_nneighbs); - for (config_3d_t i = r.begin(); i != r.end(); ++i) { /* Create the local i-th configuration around P. -- 1.7.10.4

11 years, 4 months

olena: olena-2.0-767-gc01c174 Fix inclusion paths in Swilena.

by Roland Levillain

* python/Makefile.am (AM_CPPFLAGS): Add -I$(top_builddir)/milena. --- swilena/ChangeLog | 6 ++++++ swilena/python/Makefile.am | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 292b4c7..38ccc2b 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,9 @@ +2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + + Fix inclusion paths in Swilena. + + * python/Makefile.am (AM_CPPFLAGS): Add -I$(top_builddir)/milena. + 2013-04-12 Roland Levillain <roland(a)lrde.epita.fr> Adjust Swilena to Automake parallel tests. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 2d8dfa7..66630b9 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -22,7 +22,7 @@ ## FIXME: Factor as much as possible. See how we handled this in TC. -AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/milena +AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/milena -I$(top_builddir)/milena TOOLS_CXXFLAGS = @TOOLS_CXXFLAGS@ AM_CXXFLAGS = $(TOOLS_CXXFLAGS) AM_SWIGFLAGS = -Wall -c++ -python -I$(top_srcdir)/milena -- 1.7.10.4

11 years, 4 months

olena: olena-2.0-766-g314a240 Fix inclusion paths in Scribo.

by Roland Levillain

* demo/viewer/Makefile.am: Here. --- scribo/ChangeLog | 6 ++++++ scribo/demo/viewer/Makefile.am | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index ab98d1e..77ca627 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,9 @@ +2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + + Fix inclusion paths in Scribo. + + * demo/viewer/Makefile.am: Here. + 2013-08-27 Roland Levillain <roland(a)lrde.epita.fr> Use mln::math::pi instead of a macro-based definition in Scribo. diff --git a/scribo/demo/viewer/Makefile.am b/scribo/demo/viewer/Makefile.am index d79abcf..60a8fd5 100644 --- a/scribo/demo/viewer/Makefile.am +++ b/scribo/demo/viewer/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2010, 2011 EPITA Research and Development +# Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -15,6 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. +include $(top_srcdir)/scribo/scribo.mk include $(top_srcdir)/build-aux/autotroll.mk -- 1.7.10.4

11 years, 4 months

olena: olena-2.0-765-gbdade6e Kill warnings about signed vs unsigned values.

by Roland Levillain

* mln/topo/is_not_1d_isthmus.hh (mln::topo::is_not_1d_isthmus<I, N>::operator()): Here. --- milena/ChangeLog | 7 +++++++ milena/mln/topo/is_not_1d_isthmus.hh | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f8c7388..e43f313 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + Kill warnings about signed vs unsigned values. + + * mln/topo/is_not_1d_isthmus.hh + (mln::topo::is_not_1d_isthmus<I, N>::operator()): Here. + +2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + Catch up with the current interface of breadth_first_thinning. * apps/morphers/recorder-bft.cc: Here. diff --git a/milena/mln/topo/is_not_1d_isthmus.hh b/milena/mln/topo/is_not_1d_isthmus.hh index 9ed7468..03ab080 100644 --- a/milena/mln/topo/is_not_1d_isthmus.hh +++ b/milena/mln/topo/is_not_1d_isthmus.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Milena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -198,7 +198,7 @@ namespace mln is_not_1d_isthmus<I, N>::operator()(const mln_psite(I)& p) const { mln_precondition(ima_); - return connectivity_number_fg_(*ima_, p, true) < 2; + return connectivity_number_fg_(*ima_, p, true) < 2u; } # endif // MLN_INCLUDE_ONLY -- 1.7.10.4

11 years, 4 months

olena: olena-2.0-764-g1cbfcbe Catch up with the current interface of breadth_first_thinning.

by Roland Levillain

* apps/morphers/recorder-bft.cc: Here. --- milena/ChangeLog | 6 ++++++ milena/apps/morphers/recorder-bft.cc | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ba5cf63..f8c7388 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + Catch up with the current interface of breadth_first_thinning. + + * apps/morphers/recorder-bft.cc: Here. + +2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + Catch up with the current interface of mln::image3d. * apps/generic-skel/image3d-skel-unconstrained.cc, diff --git a/milena/apps/morphers/recorder-bft.cc b/milena/apps/morphers/recorder-bft.cc index be7eae7..be60388 100644 --- a/milena/apps/morphers/recorder-bft.cc +++ b/milena/apps/morphers/recorder-bft.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2011, 2012 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2012, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -54,6 +55,8 @@ #include <mln/topo/skeleton/breadth_first_thinning.hh> +#include <mln/topo/detach_point.hh> + #include <mln/test/predicate.hh> #include <mln/pw/value.hh> @@ -85,11 +88,13 @@ int main() N nbh = make::dual_neighb(picasso, c4(), c8()); // Simplicity criterion functor. ::is_simple_2d<J, N> is_simple(nbh); + // Simple point detach procedure. + topo::detach_point<J> detach; // Constraint. ::is_not_end_point<J, neighb2d> constraint(c4(), picasso_rec); J bft_rec = topo::skeleton::breadth_first_thinning(picasso_rec, nbh, - is_simple, ::detach<J>, + is_simple, detach, constraint); // Dump recorded frames. -- 1.7.10.4

11 years, 4 months

olena: olena-2.0-763-gd05185f Catch up with the current interface of mln::image3d.

by Roland Levillain

* apps/generic-skel/image3d-skel-unconstrained.cc, * apps/generic-skel/image3d-skel.hh: Here. --- milena/ChangeLog | 8 ++++++++ milena/apps/generic-skel/image3d-skel-unconstrained.cc | 7 ++++--- milena/apps/generic-skel/image3d-skel.hh | 8 ++++---- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8f33654..ba5cf63 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + Catch up with the current interface of mln::image3d. + + * apps/generic-skel/image3d-skel-unconstrained.cc, + * apps/generic-skel/image3d-skel.hh: + Here. + +2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + Replace meyer_wst with watershed::flooding. * apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc: Here. diff --git a/milena/apps/generic-skel/image3d-skel-unconstrained.cc b/milena/apps/generic-skel/image3d-skel-unconstrained.cc index 986782f..1f94e9f 100644 --- a/milena/apps/generic-skel/image3d-skel-unconstrained.cc +++ b/milena/apps/generic-skel/image3d-skel-unconstrained.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2011-2012 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2012, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -75,8 +76,8 @@ int main() // criterion. I input = make_triple_torus(20); std::cout - << input.nslices() << " x " << input.nrows() << " x " << input.ncols() - << " = " << input.nslices() * input.nrows() * input.ncols() << " voxels" + << input.nslis() << " x " << input.nrows() << " x " << input.ncols() + << " = " << input.nslis() * input.nrows() * input.ncols() << " voxels" << std::endl; std::cerr << input.domain() << std::endl; diff --git a/milena/apps/generic-skel/image3d-skel.hh b/milena/apps/generic-skel/image3d-skel.hh index 2db9a5a..7b40833 100644 --- a/milena/apps/generic-skel/image3d-skel.hh +++ b/milena/apps/generic-skel/image3d-skel.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -286,9 +286,9 @@ subsampling_3d(const mln::image3d<bool>& input, unsigned factor) /* This subsampling procedure may not take into account pixels at the end of each sloce/row/column if the corresponding dimension is not a multiple of FACTOR. */ - I output(input.nslices() / factor, - input.nrows() / factor, - input.ncols() / factor); + I output(input.nslis() / factor, + input.nrows() / factor, + input.ncols() / factor); mln_piter_(I) po(output.domain()); for_all(po) { -- 1.7.10.4

11 years, 4 months

olena: olena-2.0-762-g8caa6a0 Replace meyer_wst with watershed::flooding.

by Roland Levillain

* apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc: Here. --- milena/ChangeLog | 6 ++++++ milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9d24f2c..8f33654 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + Replace meyer_wst with watershed::flooding. + + * apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc: Here. + +2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + Convert remaining Milena code to mln_trace. * doc/examples/devel/facade.cc.raw, diff --git a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc index 97b731c..d69959e 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc @@ -43,7 +43,7 @@ #include <mln/core/image/complex_neighborhoods.hh> #include <mln/morpho/closing/area.hh> -#include <mln/morpho/meyer_wst.hh> +#include <mln/morpho/watershed/flooding.hh> #include <mln/math/pi.hh> #include <mln/math/max.hh> @@ -160,7 +160,7 @@ int main(int argc, char* argv[]) wst_val_t nbasins; typedef mln::unsigned_2complex_image3df wst_ima_t; wst_ima_t wshed = - mln::morpho::meyer_wst(closed_ima, adj_edges_nbh, nbasins); + mln::morpho::watershed::flooding(closed_ima, adj_edges_nbh, nbasins); std::cout << "nbasins = " << nbasins << std::endl; // Label polygons (i.e., propagate labels from edges to polygons). -- 1.7.10.4

11 years, 4 months

olena: olena-2.0-761-g5028921 Convert remaining Milena code to mln_trace.

by Roland Levillain

* doc/examples/devel/facade.cc.raw, * doc/examples/devel/impl.cc.raw, * mln/io/vtk/save.hh, * mln/topo/skeleton/breadth_first_thinning.hh, * mln/topo/skeleton/priority_driven_thinning.hh, * new-header: Here. --- milena/ChangeLog | 12 ++++++++++++ milena/doc/examples/devel/facade.cc.raw | 4 +--- milena/doc/examples/devel/impl.cc.raw | 7 ++----- milena/mln/io/vtk/save.hh | 17 ++++++----------- milena/mln/topo/skeleton/breadth_first_thinning.hh | 5 ++--- milena/mln/topo/skeleton/priority_driven_thinning.hh | 5 ++--- milena/new-header | 4 +--- milena/trash/display_color_pretty.hh | 15 +++++---------- milena/trash/display_remove.hh | 13 +++++-------- milena/trash/display_save.hh | 14 ++++---------- milena/trash/display_save_and_show.hh | 10 +++------- milena/trash/display_show.hh | 10 +++------- milena/trash/neighb_get.hh | 6 ++---- 13 files changed, 48 insertions(+), 74 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 82beada..9d24f2c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + Convert remaining Milena code to mln_trace. + + * doc/examples/devel/facade.cc.raw, + * doc/examples/devel/impl.cc.raw, + * mln/io/vtk/save.hh, + * mln/topo/skeleton/breadth_first_thinning.hh, + * mln/topo/skeleton/priority_driven_thinning.hh, + * new-header: + Here. + +2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> + Fix the use of Pi in Milena's apps/mesh-segm-skel. * apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc, diff --git a/milena/doc/examples/devel/facade.cc.raw b/milena/doc/examples/devel/facade.cc.raw index 0ef0196..0a8fc00 100644 --- a/milena/doc/examples/devel/facade.cc.raw +++ b/milena/doc/examples/devel/facade.cc.raw @@ -4,7 +4,7 @@ mln_concrete(I) erosion_tolerant(const Image<I>& input, const Neighborhood<N>& nbh, unsigned rank) { - trace::entering("morpho::erosion_tolerant"); + mln_trace("morpho::erosion_tolerant"); mln_precondition(exact(input).is_valid()); mln_precondition(exact(nbh).is_valid()); @@ -12,7 +12,5 @@ erosion_tolerant(const Image<I>& input, const Neighborhood<N>& nbh, = internal::erosion_tolerant_dispatch(input, nbh, rank); - - trace::exiting("morpho::erosion_tolerant"); return output; } diff --git a/milena/doc/examples/devel/impl.cc.raw b/milena/doc/examples/devel/impl.cc.raw index eb9ea05..9f6e366 100644 --- a/milena/doc/examples/devel/impl.cc.raw +++ b/milena/doc/examples/devel/impl.cc.raw @@ -10,11 +10,10 @@ namespace impl const Neighborhood<N>& nbh_, unsigned rank) { - trace::entering("impl::generic::erosion_tolerant"); + mln_trace("impl::generic::erosion_tolerant"); // Do it... - trace::exiting("impl::generic::erosion_tolerant"); return output; } @@ -27,12 +26,10 @@ namespace impl const Neighborhood<N>& nbh_, unsigned rank) { - trace::entering("impl::erosion_tolerant_on_set_fastest"); - + mln_trace("impl::erosion_tolerant_on_set_fastest"); // Do it... - trace::exiting("impl::erosion_tolerant_on_set_fastest"); return output; } diff --git a/milena/mln/io/vtk/save.hh b/milena/mln/io/vtk/save.hh index e3b8893..e8c8e09 100644 --- a/milena/mln/io/vtk/save.hh +++ b/milena/mln/io/vtk/save.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2008, 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -181,41 +181,36 @@ namespace mln void save(const bin_2complex_image3df& ima, const std::string& filename) { - trace::entering("mln::io::vtk::save"); + mln_trace("mln::io::vtk::save"); internal::bin_vtk_saver()(ima, filename); - trace::exiting("mln::io::vtk::save"); } void save(const int_u8_2complex_image3df& ima, const std::string& filename) { - trace::entering("mln::io::vtk::save"); + mln_trace("mln::io::vtk::save"); internal::int_u8_vtk_saver()(ima, filename); - trace::exiting("mln::io::vtk::save"); } void save(const unsigned_2complex_image3df& ima, const std::string& filename) { - trace::entering("mln::io::vtk::save"); + mln_trace("mln::io::vtk::save"); internal::unsigned_vtk_saver()(ima, filename); - trace::exiting("mln::io::vtk::save"); } void save(const float_2complex_image3df& ima, const std::string& filename) { - trace::entering("mln::io::vtk::save"); + mln_trace("mln::io::vtk::save"); internal::float_vtk_saver()(ima, filename); - trace::exiting("mln::io::vtk::save"); } void save(const rgb8_2complex_image3df& ima, const std::string& filename) { - trace::entering("mln::io::vtk::save"); + mln_trace("mln::io::vtk::save"); internal::rgb8_vtk_saver()(ima, filename); - trace::exiting("mln::io::vtk::save"); } diff --git a/milena/mln/topo/skeleton/breadth_first_thinning.hh b/milena/mln/topo/skeleton/breadth_first_thinning.hh index 9277773..d91ad36 100644 --- a/milena/mln/topo/skeleton/breadth_first_thinning.hh +++ b/milena/mln/topo/skeleton/breadth_first_thinning.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -121,7 +121,7 @@ namespace mln G& detach, const Function_v2b<H>& constraint_) { - trace::entering("topo::skeleton::breadth_first_thinning"); + mln_trace("topo::skeleton::breadth_first_thinning"); const I& input = exact(input_); const N& nbh = exact(nbh_); @@ -174,7 +174,6 @@ namespace mln } } - trace::exiting("topo::skeleton::breadth_first_thinning"); return output; } diff --git a/milena/mln/topo/skeleton/priority_driven_thinning.hh b/milena/mln/topo/skeleton/priority_driven_thinning.hh index 4239047..96a4eac 100644 --- a/milena/mln/topo/skeleton/priority_driven_thinning.hh +++ b/milena/mln/topo/skeleton/priority_driven_thinning.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -129,7 +129,7 @@ namespace mln const Image<J>& priority_, const Function_v2b<H>& constraint_) { - trace::entering("topo::skeleton::priority_driven_thinning"); + mln_trace("topo::skeleton::priority_driven_thinning"); const I& input = exact(input_); const N& nbh = exact(nbh_); @@ -184,7 +184,6 @@ namespace mln } } - trace::exiting("topo::skeleton::priority_driven_thinning"); return output; } diff --git a/milena/new-header b/milena/new-header index 296095c..54c41c4 100755 --- a/milena/new-header +++ b/milena/new-header @@ -137,13 +137,11 @@ inline mln_concrete(I) @FUNCTION@(const Image<I>& input) { - trace::entering("@QUAL_NAME@"); + mln_trace("@QUAL_NAME@"); // FIXME: Replace this dummy statement with actual code. mln_concrete(I) output = duplicate(input); // ... - - trace::exiting("@QUAL_NAME@"); return output; } diff --git a/milena/trash/display_color_pretty.hh b/milena/trash/display_color_pretty.hh index 9431fc7..9e2a8ea 100644 --- a/milena/trash/display_color_pretty.hh +++ b/milena/trash/display_color_pretty.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2013 EPITA Research and Development Laboratory // // This file is part of Olena. // @@ -117,7 +117,7 @@ namespace mln typename trait::image_from_grid < mln_mesh(I), value::rgb8 >::ret color_pretty(const Image<I>& input_) { - trace::entering("display::impl::color_pretty"); + mln_trace("display::impl::color_pretty"); const I& input = exact (input_); @@ -131,7 +131,6 @@ namespace mln output(p) = value::rgb8(color_value(input(p))); } - trace::exiting("display::impl::color_pretty"); return output; } @@ -143,7 +142,7 @@ namespace mln const p_set<mln_psite(I) >& s2_, const p_set<mln_psite(I) >& s3_) { - trace::entering("display::impl::color_pretty_rgb"); + mln_trace("display::impl::color_pretty_rgb"); const I& input = exact (input_); @@ -171,7 +170,6 @@ namespace mln output(p).blue() = 255; } - trace::exiting("display::impl::color_pretty_rgb"); return output; } @@ -186,7 +184,7 @@ namespace mln typename trait::image_from_grid < mln_mesh(I), value::rgb8 >::ret color_pretty(const Image<I>& input_) { - trace::entering("display::color_pretty"); + mln_trace("display::color_pretty"); const I& input = exact(input_); mln_precondition(input.is_valid()); @@ -196,7 +194,6 @@ namespace mln image2d<value::rgb8> output = impl::color_pretty(input); - trace::exiting("display::color_pretty"); return output; } @@ -208,11 +205,9 @@ namespace mln const p_set<mln_psite(I) >& s2_, const p_set<mln_psite(I) >& s3_) { - trace::entering("display::color_pretty_rgb"); + mln_trace("display::color_pretty_rgb"); image2d<value::rgb8> output = impl::color_pretty_rgb(input_, s1_, s2_, s3_); - - trace::exiting("display::color_pretty_rgb"); return output; } diff --git a/milena/trash/display_remove.hh b/milena/trash/display_remove.hh index 59a4a80..96e990e 100644 --- a/milena/trash/display_remove.hh +++ b/milena/trash/display_remove.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2013 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -33,7 +33,8 @@ # include <map> # include <string> -# include <mln/trace/all.hh> + +# include <mln/debug/trace.hh> namespace mln @@ -56,7 +57,7 @@ namespace mln void remove() { - trace::entering("display::impl::remove"); + mln_trace("display::impl::remove"); for (std::map<void*, std::string>::const_iterator it = map_saved_image_tmp_.begin (); it != map_saved_image_tmp_.end (); @@ -65,8 +66,6 @@ namespace mln std::string s = "rm -f " + (*it).second; system (s.c_str ()); } - - trace::exiting("display::impl::remove"); } } // end of namespace mln::display::impl @@ -76,11 +75,9 @@ namespace mln void remove() { - trace::entering("display::remove"); + mln_trace("display::remove"); impl::remove(); - - trace::exiting("display::remove"); } # endif // !MLN_INCLUDE_ONLY diff --git a/milena/trash/display_save.hh b/milena/trash/display_save.hh index 1406d6f..e51e14d 100644 --- a/milena/trash/display_save.hh +++ b/milena/trash/display_save.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2013 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -69,7 +69,7 @@ namespace mln void save(trait::value::kind::any, const Image<I>& input_) { - trace::entering("display::impl::save"); + mln_trace("display::impl::save"); const I& input = exact (input_); image2d<value::rgb8> out = display::color_pretty(input); @@ -84,8 +84,6 @@ namespace mln io::ppm::save(out, path_tmp); map_saved_image_tmp_[(void*)input.id_ ()] = path_tmp; - - trace::exiting("display::impl::save"); } template <typename I> @@ -93,7 +91,7 @@ namespace mln void save(trait::value::kind::color, const Image<I>& input_) { - trace::entering("display::impl::save"); + mln_trace("display::impl::save"); const I& input = exact (input_); @@ -107,8 +105,6 @@ namespace mln io::ppm::save(input, path_tmp); map_saved_image_tmp_[(void*)input.id_ ()] = path_tmp; - - trace::exiting("display::impl::save"); } } // end of namespace mln::display::impl @@ -119,13 +115,11 @@ namespace mln void save(const Image<I>& input_) { - trace::entering("display::save"); + mln_trace("display::save"); const I& input = exact(input_); mln_precondition(input.is_valid()); impl::save(mln_trait_value_kind(mln_value(I)) (), input); - - trace::exiting("display::save"); } # endif // !MLN_INCLUDE_ONLY diff --git a/milena/trash/display_save_and_show.hh b/milena/trash/display_save_and_show.hh index 2d69db1..8685114 100644 --- a/milena/trash/display_save_and_show.hh +++ b/milena/trash/display_save_and_show.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2013 EPITA Research and Development Laboratory // // This file is part of Olena. // @@ -68,12 +68,10 @@ namespace mln save_and_show_(const Image<I>& input, std::string cmd, int time) { - trace::entering("display::impl::save_and_show_"); + mln_trace("display::impl::save_and_show_"); display::save(input); show(input, cmd, time); - - trace::exiting("display::impl::save_and_show_"); } } // end of namespace mln::display::impl @@ -84,11 +82,9 @@ namespace mln void save_and_show(const Image<I>& input_, std::string cmd = "display", int time = 0) { - trace::entering("display::save_and_show"); + mln_trace("display::save_and_show"); impl::save_and_show_(input_, cmd, time); - - trace::exiting("display::save_and_show"); } # endif // !MLN_INCLUDE_ONLY diff --git a/milena/trash/display_show.hh b/milena/trash/display_show.hh index 02e2cb6..8fab8fe 100644 --- a/milena/trash/display_show.hh +++ b/milena/trash/display_show.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2013 EPITA Research and Development Laboratory // // This file is part of Olena. // @@ -87,7 +87,7 @@ namespace mln void show(const Image<I>& input_, std::string cmd, int time) { - trace::entering("display::impl::show"); + mln_trace("display::impl::show"); const I& input = exact(input_); @@ -105,8 +105,6 @@ namespace mln st << cmd << " " << map_saved_image_tmp_[(void*)input.id_()]; system(st.str().c_str()); } - - trace::exiting("display::impl::show"); } } // end of namespace mln::display::impl @@ -117,12 +115,10 @@ namespace mln void show(const Image<I>& input_, std::string cmd = "display", int time = 0) { - trace::entering("display::show"); + mln_trace("display::show"); mln_precondition(impl::check_saved(input_)); impl::show(input_, cmd, time); - - trace::entering("display::show"); } # endif // !MLN_INCLUDE_ONLY diff --git a/milena/trash/neighb_get.hh b/milena/trash/neighb_get.hh index ce1d524..25ae909 100644 --- a/milena/trash/neighb_get.hh +++ b/milena/trash/neighb_get.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -172,13 +172,11 @@ namespace mln typename get_helper<I>::type get(const Image<I>& ima) { - trace::entering("neighb::get"); + mln_trace("neighb::get"); mln_precondition(exact(ima).is_valid()); typename neighb::get_helper<I>::type res = neighb::get_helper<I>::run(exact(ima)); - - trace::exiting("neighb::get"); return res; } -- 1.7.10.4

11 years, 4 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