June 2010 - Olena-patches

last-svn-commit-181-g8194448 Simplify build_unit_test.sh thanks to AM_DEFAULT_SOURCE_EXT.
by Roland Levillain 24 Jun '10

24 Jun '10

* build-aux/build_unit_test.sh: No longer output `*_SOURCES' variables. --- ChangeLog | 7 +++++++ build-aux/build_unit_test.sh | 9 +-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index db0457c..d0067c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-04-22 Roland Levillain <roland(a)lrde.epita.fr> + + Simplify build_unit_test.sh thanks to AM_DEFAULT_SOURCE_EXT. + + * build-aux/build_unit_test.sh: No longer output `*_SOURCES' + variables. + 2010-02-17 Roland Levillain <roland(a)lrde.epita.fr> Require Automake 1.11. diff --git a/build-aux/build_unit_test.sh b/build-aux/build_unit_test.sh index 8080ef2..6436b27 100755 --- a/build-aux/build_unit_test.sh +++ b/build-aux/build_unit_test.sh @@ -82,11 +82,4 @@ EOF $ECHO_N "${TARGET}" >>"$output" done -# Build "$output". -echo "" >>"$output" -echo "" >>"$output" -for i in $HEADERS; do - FILE_CC=`echo $i | sed 's/[/.]/_/g' | sed 's/_hh/\.cc/g'` - NAME=`echo $FILE_CC | sed 's/\.cc//g'` - echo "${NAME}_SOURCES = $FILE_CC" >>"$output" -done +echo >>"$output" -- 1.5.6.5

1 0

last-svn-commit-180-gb6d7062 Use AM_DEFAULT_SOURCE_EXT to simplify Milena's Makefiles.
by Roland Levillain 24 Jun '10

24 Jun '10

* common.mk: New. Include it... * tests/tests.mk, * tools/tools.mk: ...here. * tests/Makefile.am, * tests/accu/Makefile.am, * tests/accu/image/Makefile.am, * tests/accu/math/Makefile.am, * tests/accu/shape/Makefile.am, * tests/accu/site_set/Makefile.am, * tests/accu/stat/Makefile.am, * tests/algebra/Makefile.am, * tests/arith/Makefile.am, * tests/binarization/Makefile.am, * tests/border/Makefile.am, * tests/canvas/Makefile.am, * tests/canvas/browsing/Makefile.am, * tests/canvas/morpho/Makefile.am, * tests/convert/Makefile.am, * tests/convert/impl/Makefile.am, * tests/core/alias/Makefile.am, * tests/core/image/Makefile.am, * tests/core/image/dmorph/Makefile.am, * tests/core/image/imorph/Makefile.am, * tests/core/image/vmorph/Makefile.am, * tests/core/other/Makefile.am, * tests/core/routine/Makefile.am, * tests/core/site_set/Makefile.am, * tests/data/Makefile.am, * tests/data/approx/Makefile.am, * tests/data/naive/Makefile.am, * tests/debug/Makefile.am, * tests/draw/Makefile.am, * tests/estim/Makefile.am, * tests/extension/Makefile.am, * tests/extract/Makefile.am, * tests/fun/Makefile.am, * tests/fun/i2v/Makefile.am, * tests/fun/p2p/Makefile.am, * tests/fun/stat/Makefile.am, * tests/fun/v2i/Makefile.am, * tests/fun/v2v/Makefile.am, * tests/fun/vv2v/Makefile.am, * tests/fun/x2x/Makefile.am, * tests/geom/Makefile.am, * tests/graph/Makefile.am, * tests/graph/attribute/Makefile.am, * tests/histo/Makefile.am, * tests/io/dicom/Makefile.am, * tests/io/dump/Makefile.am, * tests/io/fits/Makefile.am, * tests/io/fld/Makefile.am, * tests/io/magick/Makefile.am, * tests/io/off/Makefile.am, * tests/io/pbm/Makefile.am, * tests/io/pbms/Makefile.am, * tests/io/pgm/Makefile.am, * tests/io/pgms/Makefile.am, * tests/io/ppm/Makefile.am, * tests/io/ppms/Makefile.am, * tests/io/tiff/Makefile.am, * tests/labeling/Makefile.am, * tests/linear/Makefile.am, * tests/linear/gaussian/Makefile.am, * tests/linear/local/Makefile.am, * tests/literal/Makefile.am, * tests/logical/Makefile.am, * tests/make/Makefile.am, * tests/metal/Makefile.am, * tests/metal/math/Makefile.am, * tests/morpho/Makefile.am, * tests/morpho/approx/Makefile.am, * tests/morpho/attribute/Makefile.am, * tests/morpho/closing/Makefile.am, * tests/morpho/closing/approx/Makefile.am, * tests/morpho/elementary/Makefile.am, * tests/morpho/opening/Makefile.am, * tests/morpho/opening/approx/Makefile.am, * tests/morpho/reconstruction/by_dilation/Makefile.am, * tests/morpho/reconstruction/by_erosion/Makefile.am, * tests/morpho/tree/Makefile.am, * tests/morpho/tree/filter/Makefile.am, * tests/morpho/watershed/Makefile.am, * tests/opt/Makefile.am, * tests/pw/Makefile.am, * tests/registration/Makefile.am, * tests/set/Makefile.am, * tests/test/Makefile.am, * tests/topo/Makefile.am, * tests/topo/skeleton/Makefile.am, * tests/trait/Makefile.am, * tests/trait/image/Makefile.am, * tests/trait/op/Makefile.am, * tests/trait/value/Makefile.am, * tests/transform/Makefile.am, * tests/upscaling/art/Makefile.am, * tests/util/Makefile.am, * tests/value/Makefile.am, * tests/value/builtin/Makefile.am, * tests/win/Makefile.am, * tests/world/binary_2d/Makefile.am, * tests/world/inter_pixel/Makefile.am, * tests/world/inter_pixel/dim2/Makefile.am: Remove (now useless) `*_SOURCES' variables using sed -ri '/^(\s|#)*\S+_SOURCES\s*=\s*\S+.cc\s*$/d'. * apps/constrained-connectivity/Makefile.am, * apps/graph-morpho/Makefile.am, * apps/mesh-segm-skel/Makefile.am, * apps/papers/levillain.09.ismm/Makefile.am * tools/Makefile.am: Likewise. Include common.mk. --- milena/ChangeLog | 118 ++++++++++++++++++++ milena/apps/constrained-connectivity/Makefile.am | 5 +- milena/apps/graph-morpho/Makefile.am | 8 +- milena/apps/mesh-segm-skel/Makefile.am | 8 +- milena/apps/papers/levillain.09.ismm/Makefile.am | 8 +- milena/common.mk | 22 ++++ milena/tests/Makefile.am | 4 +- milena/tests/accu/Makefile.am | 15 +--- milena/tests/accu/image/Makefile.am | 9 +-- milena/tests/accu/math/Makefile.am | 3 +- milena/tests/accu/shape/Makefile.am | 3 +- milena/tests/accu/site_set/Makefile.am | 3 +- milena/tests/accu/stat/Makefile.am | 11 +-- milena/tests/algebra/Makefile.am | 10 +-- milena/tests/arith/Makefile.am | 9 +- milena/tests/binarization/Makefile.am | 1 - milena/tests/border/Makefile.am | 24 +---- milena/tests/canvas/Makefile.am | 6 +- milena/tests/canvas/browsing/Makefile.am | 11 +-- milena/tests/canvas/morpho/Makefile.am | 4 +- milena/tests/convert/Makefile.am | 10 +-- milena/tests/convert/impl/Makefile.am | 3 +- milena/tests/core/alias/Makefile.am | 18 +--- milena/tests/core/image/Makefile.am | 14 +-- milena/tests/core/image/dmorph/Makefile.am | 10 +-- milena/tests/core/image/imorph/Makefile.am | 7 +- milena/tests/core/image/vmorph/Makefile.am | 4 +- milena/tests/core/other/Makefile.am | 22 +---- milena/tests/core/routine/Makefile.am | 8 +- milena/tests/core/site_set/Makefile.am | 16 +--- milena/tests/data/Makefile.am | 25 +---- milena/tests/data/approx/Makefile.am | 3 +- milena/tests/data/naive/Makefile.am | 3 +- milena/tests/debug/Makefile.am | 7 +- milena/tests/draw/Makefile.am | 6 +- milena/tests/estim/Makefile.am | 6 +- milena/tests/extension/Makefile.am | 4 +- milena/tests/extract/Makefile.am | 8 +- milena/tests/fun/Makefile.am | 3 +- milena/tests/fun/i2v/Makefile.am | 6 +- milena/tests/fun/p2p/Makefile.am | 4 +- milena/tests/fun/stat/Makefile.am | 3 +- milena/tests/fun/v2i/Makefile.am | 3 +- milena/tests/fun/v2v/Makefile.am | 10 +-- milena/tests/fun/vv2v/Makefile.am | 5 +- milena/tests/fun/x2x/Makefile.am | 7 +- milena/tests/geom/Makefile.am | 23 +---- milena/tests/graph/Makefile.am | 3 +- milena/tests/graph/attribute/Makefile.am | 4 +- milena/tests/histo/Makefile.am | 5 +- milena/tests/io/dicom/Makefile.am | 3 +- milena/tests/io/dump/Makefile.am | 1 - milena/tests/io/fits/Makefile.am | 1 - milena/tests/io/fld/Makefile.am | 6 +- milena/tests/io/magick/Makefile.am | 2 - milena/tests/io/off/Makefile.am | 3 - milena/tests/io/pbm/Makefile.am | 2 - milena/tests/io/pbms/Makefile.am | 1 - milena/tests/io/pgm/Makefile.am | 5 - milena/tests/io/pgms/Makefile.am | 1 - milena/tests/io/ppm/Makefile.am | 3 - milena/tests/io/ppms/Makefile.am | 1 - milena/tests/io/tiff/Makefile.am | 3 +- milena/tests/labeling/Makefile.am | 20 +--- milena/tests/linear/Makefile.am | 8 +- milena/tests/linear/gaussian/Makefile.am | 2 - milena/tests/linear/local/Makefile.am | 5 +- milena/tests/literal/Makefile.am | 9 +- milena/tests/logical/Makefile.am | 9 +- milena/tests/make/Makefile.am | 18 +--- milena/tests/metal/Makefile.am | 7 +- milena/tests/metal/math/Makefile.am | 6 +- milena/tests/morpho/Makefile.am | 27 +---- milena/tests/morpho/approx/Makefile.am | 2 - milena/tests/morpho/attribute/Makefile.am | 6 +- milena/tests/morpho/closing/Makefile.am | 8 -- milena/tests/morpho/closing/approx/Makefile.am | 1 - milena/tests/morpho/elementary/Makefile.am | 12 +-- milena/tests/morpho/opening/Makefile.am | 8 -- milena/tests/morpho/opening/approx/Makefile.am | 1 - .../morpho/reconstruction/by_dilation/Makefile.am | 3 +- .../morpho/reconstruction/by_erosion/Makefile.am | 3 +- milena/tests/morpho/tree/Makefile.am | 8 +- milena/tests/morpho/tree/filter/Makefile.am | 3 +- milena/tests/morpho/watershed/Makefile.am | 3 - milena/tests/opt/Makefile.am | 4 +- milena/tests/pw/Makefile.am | 6 +- milena/tests/registration/Makefile.am | 4 +- milena/tests/set/Makefile.am | 12 +-- milena/tests/test/Makefile.am | 4 +- milena/tests/tests.mk | 3 +- milena/tests/topo/Makefile.am | 4 +- milena/tests/topo/skeleton/Makefile.am | 4 +- milena/tests/trait/Makefile.am | 6 +- milena/tests/trait/image/Makefile.am | 5 +- milena/tests/trait/op/Makefile.am | 6 +- milena/tests/trait/value/Makefile.am | 6 +- milena/tests/transform/Makefile.am | 11 +-- milena/tests/upscaling/art/Makefile.am | 4 +- milena/tests/util/Makefile.am | 20 +--- milena/tests/value/Makefile.am | 25 +---- milena/tests/value/builtin/Makefile.am | 5 +- milena/tests/win/Makefile.am | 20 +--- milena/tests/world/binary_2d/Makefile.am | 4 +- milena/tests/world/inter_pixel/Makefile.am | 7 +- milena/tests/world/inter_pixel/dim2/Makefile.am | 3 +- milena/tools/Makefile.am | 6 +- milena/tools/tools.mk | 3 +- 108 files changed, 290 insertions(+), 615 deletions(-) create mode 100644 milena/common.mk diff --git a/milena/ChangeLog b/milena/ChangeLog index 214b7e6..8178b2e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,121 @@ +2010-04-22 Roland Levillain <roland(a)lrde.epita.fr> + + Use AM_DEFAULT_SOURCE_EXT to simplify Milena's Makefiles. + + * common.mk: New. + Include it... + * tests/tests.mk, + * tools/tools.mk: + ...here. + * tests/Makefile.am, + * tests/accu/Makefile.am, + * tests/accu/image/Makefile.am, + * tests/accu/math/Makefile.am, + * tests/accu/shape/Makefile.am, + * tests/accu/site_set/Makefile.am, + * tests/accu/stat/Makefile.am, + * tests/algebra/Makefile.am, + * tests/arith/Makefile.am, + * tests/binarization/Makefile.am, + * tests/border/Makefile.am, + * tests/canvas/Makefile.am, + * tests/canvas/browsing/Makefile.am, + * tests/canvas/morpho/Makefile.am, + * tests/convert/Makefile.am, + * tests/convert/impl/Makefile.am, + * tests/core/alias/Makefile.am, + * tests/core/image/Makefile.am, + * tests/core/image/dmorph/Makefile.am, + * tests/core/image/imorph/Makefile.am, + * tests/core/image/vmorph/Makefile.am, + * tests/core/other/Makefile.am, + * tests/core/routine/Makefile.am, + * tests/core/site_set/Makefile.am, + * tests/data/Makefile.am, + * tests/data/approx/Makefile.am, + * tests/data/naive/Makefile.am, + * tests/debug/Makefile.am, + * tests/draw/Makefile.am, + * tests/estim/Makefile.am, + * tests/extension/Makefile.am, + * tests/extract/Makefile.am, + * tests/fun/Makefile.am, + * tests/fun/i2v/Makefile.am, + * tests/fun/p2p/Makefile.am, + * tests/fun/stat/Makefile.am, + * tests/fun/v2i/Makefile.am, + * tests/fun/v2v/Makefile.am, + * tests/fun/vv2v/Makefile.am, + * tests/fun/x2x/Makefile.am, + * tests/geom/Makefile.am, + * tests/graph/Makefile.am, + * tests/graph/attribute/Makefile.am, + * tests/histo/Makefile.am, + * tests/io/dicom/Makefile.am, + * tests/io/dump/Makefile.am, + * tests/io/fits/Makefile.am, + * tests/io/fld/Makefile.am, + * tests/io/magick/Makefile.am, + * tests/io/off/Makefile.am, + * tests/io/pbm/Makefile.am, + * tests/io/pbms/Makefile.am, + * tests/io/pgm/Makefile.am, + * tests/io/pgms/Makefile.am, + * tests/io/ppm/Makefile.am, + * tests/io/ppms/Makefile.am, + * tests/io/tiff/Makefile.am, + * tests/labeling/Makefile.am, + * tests/linear/Makefile.am, + * tests/linear/gaussian/Makefile.am, + * tests/linear/local/Makefile.am, + * tests/literal/Makefile.am, + * tests/logical/Makefile.am, + * tests/make/Makefile.am, + * tests/metal/Makefile.am, + * tests/metal/math/Makefile.am, + * tests/morpho/Makefile.am, + * tests/morpho/approx/Makefile.am, + * tests/morpho/attribute/Makefile.am, + * tests/morpho/closing/Makefile.am, + * tests/morpho/closing/approx/Makefile.am, + * tests/morpho/elementary/Makefile.am, + * tests/morpho/opening/Makefile.am, + * tests/morpho/opening/approx/Makefile.am, + * tests/morpho/reconstruction/by_dilation/Makefile.am, + * tests/morpho/reconstruction/by_erosion/Makefile.am, + * tests/morpho/tree/Makefile.am, + * tests/morpho/tree/filter/Makefile.am, + * tests/morpho/watershed/Makefile.am, + * tests/opt/Makefile.am, + * tests/pw/Makefile.am, + * tests/registration/Makefile.am, + * tests/set/Makefile.am, + * tests/test/Makefile.am, + * tests/topo/Makefile.am, + * tests/topo/skeleton/Makefile.am, + * tests/trait/Makefile.am, + * tests/trait/image/Makefile.am, + * tests/trait/op/Makefile.am, + * tests/trait/value/Makefile.am, + * tests/transform/Makefile.am, + * tests/upscaling/art/Makefile.am, + * tests/util/Makefile.am, + * tests/value/Makefile.am, + * tests/value/builtin/Makefile.am, + * tests/win/Makefile.am, + * tests/world/binary_2d/Makefile.am, + * tests/world/inter_pixel/Makefile.am, + * tests/world/inter_pixel/dim2/Makefile.am: + Remove (now useless) `*_SOURCES' variables using + sed -ri '/^(\s|#)*\S+_SOURCES\s*=\s*\S+.cc\s*$/d'. + * apps/constrained-connectivity/Makefile.am, + * apps/graph-morpho/Makefile.am, + * apps/mesh-segm-skel/Makefile.am, + * apps/papers/levillain.09.ismm/Makefile.am + * tools/Makefile.am: + Likewise. + Include common.mk. + 2010-04-26 Roland Levillain <roland(a)lrde.epita.fr> Clean Milena's tests' outputs during `make mostlyclean'. diff --git a/milena/apps/constrained-connectivity/Makefile.am b/milena/apps/constrained-connectivity/Makefile.am index 84a6ed2..9c3e9bf 100644 --- a/milena/apps/constrained-connectivity/Makefile.am +++ b/milena/apps/constrained-connectivity/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -14,6 +14,8 @@ # 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)/milena/common.mk + # Find Milena headers. AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena # Produce fast code. @@ -21,7 +23,6 @@ APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) noinst_PROGRAMS = constrained-connectivity -constrained_connectivity_SOURCES = constrained-connectivity.cc TESTS = test-constrained-connectivity diff --git a/milena/apps/graph-morpho/Makefile.am b/milena/apps/graph-morpho/Makefile.am index 7e3d4db..d85a9ca 100644 --- a/milena/apps/graph-morpho/Makefile.am +++ b/milena/apps/graph-morpho/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -14,6 +14,8 @@ # 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)/milena/common.mk + # Find Milena headers. AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena # Produce fast code. @@ -24,10 +26,6 @@ STRICT_ALIASING_CXXFLAGS = @STRICT_ALIASING_CXXFLAGS@ noinst_HEADERS = convert.hh debug.hh make.hh morpho.hh make_complex2d.hh noinst_PROGRAMS = samples-complex1d samples-image2d asf-complex1d asf-image2d -samples_complex1d_SOURCES = samples-complex1d.cc -samples_image2d_SOURCES = samples-image2d.cc -asf_complex1d_SOURCES = asf-complex1d.cc -asf_image2d_SOURCES = asf-image2d.cc samples_image2d_CXXFLAGS = $(AM_CXXFLAGS) $(STRICT_ALIASING_CXXFLAGS) TESTS = samples-complex1d samples-image2d diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index 9768f25..0ebdc9c 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -14,6 +15,8 @@ # 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)/milena/common.mk + # Linking with gluit and GLUT/OpenGL. gluit_builddir = $(top_builddir)/external/trimesh/gluit include $(top_srcdir)/external/trimesh/gluit/gluit.mk @@ -104,7 +107,6 @@ EXTRA_DIST = trimesh/README # A small program exercising the curvature computation routines ported # from Trimesh to Milena. bin_PROGRAMS += mesh-complex-max-curv -mesh_complex_max_curv_SOURCES = mesh-complex-max-curv.cc TESTS += test-mesh-complex-max-curv MOSTLYCLEANFILES += teapot-complex-max-curv.off @@ -114,7 +116,6 @@ MOSTLYCLEANFILES += teapot-complex-max-curv.off # Segmentation program working on precomputed meshes with curvatures data. bin_PROGRAMS += mesh-complex-segm -mesh_complex_segm_SOURCES = mesh-complex-segm.cc TESTS += test-mesh-complex-segm MOSTLYCLEANFILES += \ socket-max-curv-segm.off \ @@ -127,7 +128,6 @@ MOSTLYCLEANFILES += \ # `mesh-complex-segm', data are read from polygons, which implies an # extra averaging step). bin_PROGRAMS += mesh-complex-max-curv-segm -mesh_complex_max_curv_segm_SOURCES = mesh-complex-max-curv-segm.cc TESTS += test-mesh-complex-max-curv-segm MOSTLYCLEANFILES += \ socket-complex-max-curv-segm.off \ diff --git a/milena/apps/papers/levillain.09.ismm/Makefile.am b/milena/apps/papers/levillain.09.ismm/Makefile.am index ec5d328..fe4167b 100644 --- a/milena/apps/papers/levillain.09.ismm/Makefile.am +++ b/milena/apps/papers/levillain.09.ismm/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -16,6 +17,8 @@ # Illustrations from the ISMM 2009 paper. +include $(top_srcdir)/milena/common.mk + # Find Milena headers. AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena # Produce fast code. @@ -25,9 +28,6 @@ AM_CXXFLAGS = $(APPS_CXXFLAGS) noinst_HEADERS = chain.hh noinst_PROGRAMS = image2d graph complex -image2d_SOURCES = image2d.cc -graph_SOURCES = graph.cc -complex_SOURCES = complex.cc # Input images. # FIXME: Move them to milena/img/? diff --git a/milena/common.mk b/milena/common.mk new file mode 100644 index 0000000..3623290 --- /dev/null +++ b/milena/common.mk @@ -0,0 +1,22 @@ +## common.mk -*- Makefile-Automake -*- + +## Common Automake parameters. + +## Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +## +## This file is part of Olena. +## +## Olena is free software: you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free +## Software Foundation, version 2 of the License. +## +## Olena 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 Olena. If not, see <http://www.gnu.org/licenses/>. + +# C++ sources. +AM_DEFAULT_SOURCE_EXT = .cc diff --git a/milena/tests/Makefile.am b/milena/tests/Makefile.am index 83f946e..6d6b4bf 100644 --- a/milena/tests/Makefile.am +++ b/milena/tests/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -74,13 +74,11 @@ check_PROGRAMS = \ essential_headers \ global_vars -all_headers_SOURCES = all_headers.cc all_headers_CPPFLAGS = $(AM_CPPFLAGS) \ $(CFITSIO_CPPFLAGS) $(GDCM_CPPFLAGS) $(MAGICKXX_CPPFLAGS) $(TIFF_CPPFLAGS) all_headers_LDFLAGS = \ $(CFITSIO_LDFLAGS) $(GDCM_LDFLAGS) $(MAGICKXX_LDFLAGS) $(TIFF_LDFLAGS) -essential_headers_SOURCES = essential_headers.cc global_vars_SOURCES = global_vars1.cc global_vars2.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/accu/Makefile.am b/milena/tests/accu/Makefile.am index 60beb52..983f45f 100644 --- a/milena/tests/accu/Makefile.am +++ b/milena/tests/accu/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -39,18 +39,5 @@ check_PROGRAMS = \ transform_snake \ tuple -all_accus_SOURCES = all_accus.cc -compute_SOURCES = compute.cc -histo_SOURCES = histo.cc -line_SOURCES = line.cc -max_site_SOURCES = max_site.cc -nil_SOURCES = nil.cc -pair_SOURCES = pair.cc -transform_SOURCES = transform.cc -transform_diagonal_SOURCES = transform_diagonal.cc -transform_directional_SOURCES = transform_directional.cc -transform_line_SOURCES = transform_line.cc -transform_snake_SOURCES = transform_snake.cc -tuple_SOURCES = tuple.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/accu/image/Makefile.am b/milena/tests/accu/image/Makefile.am index 141300f..649f220 100644 --- a/milena/tests/accu/image/Makefile.am +++ b/milena/tests/accu/image/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -25,12 +25,5 @@ check_PROGRAMS = \ to_result \ untake -init_SOURCES = init.cc -set_value_SOURCES = set_value.cc -take_SOURCES = take.cc -take_as_init_SOURCES = take_as_init.cc -take_n_times_SOURCES = take_n_times.cc -to_result_SOURCES = to_result.cc -untake_SOURCES = untake.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/accu/math/Makefile.am b/milena/tests/accu/math/Makefile.am index ca5358b..43b2581 100644 --- a/milena/tests/accu/math/Makefile.am +++ b/milena/tests/accu/math/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -19,6 +19,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ count -count_SOURCES = count.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/accu/shape/Makefile.am b/milena/tests/accu/shape/Makefile.am index 374ce89..b791892 100644 --- a/milena/tests/accu/shape/Makefile.am +++ b/milena/tests/accu/shape/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -19,6 +19,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ bbox -bbox_SOURCES = bbox.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/accu/site_set/Makefile.am b/milena/tests/accu/site_set/Makefile.am index a44676e..e2810d2 100644 --- a/milena/tests/accu/site_set/Makefile.am +++ b/milena/tests/accu/site_set/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -19,6 +19,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ rectangularity -rectangularity_SOURCES = rectangularity.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/accu/stat/Makefile.am b/milena/tests/accu/stat/Makefile.am index c331db0..fae9a65 100644 --- a/milena/tests/accu/stat/Makefile.am +++ b/milena/tests/accu/stat/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -27,15 +27,6 @@ check_PROGRAMS = \ mean \ rank -var_SOURCES = var.cc -mean_SOURCES = mean.cc -median_h_SOURCES = median_h.cc -min_SOURCES = min.cc -min_h_SOURCES = min_h.cc -max_SOURCES = max.cc -max_h_SOURCES = max_h.cc -min_max_SOURCES = min_max.cc -rank_SOURCES = rank.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/algebra/Makefile.am b/milena/tests/algebra/Makefile.am index 471389e..d1f55ca 100644 --- a/milena/tests/algebra/Makefile.am +++ b/milena/tests/algebra/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -25,12 +26,5 @@ check_PROGRAMS = \ vec \ vec2 -h_mat_SOURCES = h_mat.cc -h_vec_SOURCES = h_vec.cc -mat_SOURCES = mat.cc -mat2_SOURCES = mat2.cc -quat_SOURCES = quat.cc -vec_SOURCES = vec.cc -vec2_SOURCES = vec2.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/arith/Makefile.am b/milena/tests/arith/Makefile.am index 89dfc9e..4a89da2 100644 --- a/milena/tests/arith/Makefile.am +++ b/milena/tests/arith/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -24,10 +24,5 @@ check_PROGRAMS = \ revert \ times -diff_abs_SOURCES = diff_abs.cc -minus_SOURCES = minus.cc -plus_SOURCES = plus.cc -revert_SOURCES = revert.cc -times_SOURCES = times.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/binarization/Makefile.am b/milena/tests/binarization/Makefile.am index 601d163..27144e4 100644 --- a/milena/tests/binarization/Makefile.am +++ b/milena/tests/binarization/Makefile.am @@ -20,7 +20,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ threshold -threshold_SOURCES = threshold.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/border/Makefile.am b/milena/tests/border/Makefile.am index 80241ad..1c358d7 100644 --- a/milena/tests/border/Makefile.am +++ b/milena/tests/border/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -39,25 +39,5 @@ check_PROGRAMS = \ resize_sub_image \ resize -adjust_SOURCES = adjust.cc -duplicate_SOURCES = duplicate.cc -equalize_SOURCES = equalize.cc -fill_SOURCES = fill.cc -find_SOURCES = find.cc -get_SOURCES = get.cc -mirror_SOURCES = mirror.cc -resize_equal_SOURCES = resize_equal.cc -resize_image1d_1_SOURCES = resize_image1d_1.cc -resize_image1d_2_SOURCES = resize_image1d_2.cc -resize_image1d_3_SOURCES = resize_image1d_3.cc -resize_image2d_1_SOURCES = resize_image2d_1.cc -resize_image2d_2_SOURCES = resize_image2d_2.cc -resize_image2d_3_SOURCES = resize_image2d_3.cc -resize_image3d_1_SOURCES = resize_image3d_1.cc -resize_image3d_2_SOURCES = resize_image3d_2.cc -resize_image3d_3_SOURCES = resize_image3d_3.cc -resize_image_if_SOURCES = resize_image_if.cc -resize_sub_image_SOURCES = resize_sub_image.cc -resize_SOURCES = resize.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/canvas/Makefile.am b/milena/tests/canvas/Makefile.am index d8db016..491654b 100644 --- a/milena/tests/canvas/Makefile.am +++ b/milena/tests/canvas/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -21,5 +21,3 @@ SUBDIRS = browsing morpho check_PROGRAMS = \ chamfer - -chamfer_SOURCES = chamfer.cc diff --git a/milena/tests/canvas/browsing/Makefile.am b/milena/tests/canvas/browsing/Makefile.am index 66b5b44..7832f66 100644 --- a/milena/tests/canvas/browsing/Makefile.am +++ b/milena/tests/canvas/browsing/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -26,12 +26,5 @@ check_PROGRAMS = \ depth_first_search \ breadth_first_search -fwd_SOURCES = fwd.cc -snake_fwd_SOURCES = snake_fwd.cc -snake_vert_SOURCES = snake_vert.cc -hyper_directional_SOURCES = hyper_directional.cc -dir_struct_elt_incr_update_SOURCES = dir_struct_elt_incr_update.cc -depth_first_search_SOURCES = depth_first_search.cc -breadth_first_search_SOURCES = breadth_first_search.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/canvas/morpho/Makefile.am b/milena/tests/canvas/morpho/Makefile.am index 0504c8e..a7f2509 100644 --- a/milena/tests/canvas/morpho/Makefile.am +++ b/milena/tests/canvas/morpho/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -18,4 +19,3 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS=attribute_filter -attribute_filter_SOURCES=attribute_filter.cc diff --git a/milena/tests/convert/Makefile.am b/milena/tests/convert/Makefile.am index 856c143..326863c 100644 --- a/milena/tests/convert/Makefile.am +++ b/milena/tests/convert/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -26,16 +26,10 @@ check_PROGRAMS = \ to_rgb \ to_window -to_image_SOURCES = to_image.cc -to_p_array_SOURCES = to_p_array.cc -to_p_set_SOURCES = to_p_set.cc -to_rgb_SOURCES = to_rgb.cc -to_window_SOURCES = to_window.cc #<<lrde # FIXME: Not distributed (yet). check_PROGRAMS += to_hsl -to_hsl_SOURCES = to_hsl.cc #>> TESTS = $(check_PROGRAMS) diff --git a/milena/tests/convert/impl/Makefile.am b/milena/tests/convert/impl/Makefile.am index a7cb10c..84c3aba 100644 --- a/milena/tests/convert/impl/Makefile.am +++ b/milena/tests/convert/impl/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -19,6 +19,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ from_site_set_to_image -from_site_set_to_image_SOURCES = from_site_set_to_image.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/core/alias/Makefile.am b/milena/tests/core/alias/Makefile.am index 9c47da2..7817068 100644 --- a/milena/tests/core/alias/Makefile.am +++ b/milena/tests/core/alias/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -33,20 +34,5 @@ window1d \ window2d \ window3d -box1d_SOURCES = box1d.cc -box2d_SOURCES = box2d.cc -box3d_SOURCES = box3d.cc -dpoint1d_SOURCES = dpoint1d.cc -dpoint2d_SOURCES = dpoint2d.cc -dpoint3d_SOURCES = dpoint3d.cc -point1d_SOURCES = point1d.cc -point2d_SOURCES = point2d.cc -point3d_SOURCES = point3d.cc -w_window1d_int_SOURCES = w_window1d_int.cc -w_window2d_int_SOURCES = w_window2d_int.cc -w_window3d_int_SOURCES = w_window3d_int.cc -window1d_SOURCES = window1d.cc -window2d_SOURCES = window2d.cc -window3d_SOURCES = window3d.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am index 5ac8889..74fe36d 100644 --- a/milena/tests/core/image/Makefile.am +++ b/milena/tests/core/image/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory -# (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -37,15 +37,5 @@ check_PROGRAMS = \ noinst_HEADERS = complex_image.hh -complex_image_SOURCES = complex_image.cc -edge_image_SOURCES = edge_image.cc -flat_image_SOURCES = flat_image.cc -graph_image_SOURCES = graph_image.cc -image1d_SOURCES = image1d.cc -image2d_SOURCES = image2d.cc -image3d_SOURCES = image3d.cc -line_graph_image_SOURCES = line_graph_image.cc -vertex_and_edge_image_SOURCES = vertex_and_edge_image.cc -vertex_image_SOURCES = vertex_image.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/core/image/dmorph/Makefile.am b/milena/tests/core/image/dmorph/Makefile.am index 3faee32..3d65548 100644 --- a/milena/tests/core/image/dmorph/Makefile.am +++ b/milena/tests/core/image/dmorph/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -26,13 +26,5 @@ check_PROGRAMS = \ transformed_image \ unproject_image -hexa_SOURCES = hexa.cc -image_if_SOURCES = image_if.cc -image2d_h_SOURCES = image2d_h.cc -p2p_image_SOURCES = p2p_image.cc -slice_image_SOURCES = slice_image.cc -sub_image_SOURCES = sub_image.cc -transformed_image_SOURCES = transformed_image.cc -unproject_image_SOURCES = unproject_image.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/core/image/imorph/Makefile.am b/milena/tests/core/image/imorph/Makefile.am index b019f1c..ddfc8b0 100644 --- a/milena/tests/core/image/imorph/Makefile.am +++ b/milena/tests/core/image/imorph/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -23,10 +23,5 @@ check_PROGRAMS = \ safe_image \ tr_image -decorated_image_SOURCES = decorated_image.cc -interpolated_SOURCES = interpolated.cc -labeled_image_SOURCES = labeled_image.cc -safe_image_SOURCES = safe_image.cc -tr_image_SOURCES = tr_image.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/core/image/vmorph/Makefile.am b/milena/tests/core/image/vmorph/Makefile.am index 5f7eb98..46b5752 100644 --- a/milena/tests/core/image/vmorph/Makefile.am +++ b/milena/tests/core/image/vmorph/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -20,7 +20,5 @@ check_PROGRAMS = \ cast_image \ fun_image -cast_image_SOURCES = cast_image.cc -fun_image_SOURCES = fun_image.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/core/other/Makefile.am b/milena/tests/core/other/Makefile.am index 85ce865..fc95f42 100644 --- a/milena/tests/core/other/Makefile.am +++ b/milena/tests/core/other/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -37,24 +38,5 @@ check_PROGRAMS = \ var \ w_window -box_runstart_piter_SOURCES = box_runstart_piter.cc -box_runend_piter_SOURCES = box_runend_piter.cc -category_SOURCES = category.cc -dpoints_pixter_SOURCES = dpoints_pixter.cc -graph_elt_neighborhood_SOURCES = graph_elt_neighborhood.cc -graph_elt_neighborhood_if_SOURCES = graph_elt_neighborhood_if.cc -graph_elt_window_SOURCES = graph_elt_window.cc -graph_elt_window_if_SOURCES = graph_elt_window_if.cc -neighb_SOURCES = neighb.cc -pixel_SOURCES = pixel.cc -pixter1d_SOURCES = pixter1d.cc -pixter1d_more_SOURCES = pixter1d_more.cc -pixter2d_SOURCES = pixter2d.cc -pixter2d_more_SOURCES = pixter2d_more.cc -pixter3d_SOURCES = pixter3d.cc -pixter3d_more_SOURCES = pixter3d_more.cc -point_set_compatibility_SOURCES = point_set_compatibility.cc -var_SOURCES = var.cc -w_window_SOURCES = w_window.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/core/routine/Makefile.am b/milena/tests/core/routine/Makefile.am index 2640c47..c1ba546 100644 --- a/milena/tests/core/routine/Makefile.am +++ b/milena/tests/core/routine/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -23,10 +24,5 @@ check_PROGRAMS = \ initialize \ primary -duplicate_SOURCES = duplicate.cc -exact_SOURCES = exact.cc -extend_SOURCES = extend.cc -initialize_SOURCES = initialize.cc -primary_SOURCES = primary.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/core/site_set/Makefile.am b/milena/tests/core/site_set/Makefile.am index 8d7c317..bf12965 100644 --- a/milena/tests/core/site_set/Makefile.am +++ b/milena/tests/core/site_set/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -31,18 +32,5 @@ check_PROGRAMS = \ p_vaccess \ p_vertices -operators_SOURCES = operators.cc -p_array_SOURCES = p_array.cc -p_complex_SOURCES = p_complex.cc -p_image_SOURCES = p_image.cc -p_priority_queue_SOURCES = p_priority_queue.cc -p_queue_SOURCES = p_queue.cc -p_queue_fast_SOURCES = p_queue_fast.cc -p_set_SOURCES = p_set.cc -p_if_SOURCES = p_if.cc -p_transformed_SOURCES = p_transformed.cc -p_vaccess_SOURCES = p_vaccess.cc -p_vertices_SOURCES = p_vertices.cc -p_edges_SOURCES = p_edges.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/data/Makefile.am b/milena/tests/data/Makefile.am index b9c132e..8ad3fd9 100644 --- a/milena/tests/data/Makefile.am +++ b/milena/tests/data/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -39,29 +40,9 @@ check_PROGRAMS = \ transform_inplace \ update -abs_SOURCES = abs.cc -apply_SOURCES = apply.cc -compare_SOURCES = compare.cc -compute_SOURCES = compute.cc -convert_SOURCES = convert.cc -fill_SOURCES = fill.cc -fill_with_image_SOURCES = fill_with_image.cc -fill_with_value_SOURCES = fill_with_value.cc -median_SOURCES = median.cc -median_fast_SOURCES = median_fast.cc -memcpy__SOURCES = memcpy_.cc -memset__SOURCES = memset_.cc -paste_SOURCES = paste.cc -saturate_SOURCES = saturate.cc -sort_psites_SOURCES = sort_psites.cc -stretch_SOURCES = stretch.cc -transform_SOURCES = transform.cc -transform_inplace_SOURCES = transform_inplace.cc -update_SOURCES = update.cc # Lengthy tests. -# FIXME: enable it when make full-check is enabled. -#fill_full_SOURCES = fill_full.cc +# FIXME: Enable `fill_full' it when make full-check is enabled. TESTS = $(check_PROGRAMS) diff --git a/milena/tests/data/approx/Makefile.am b/milena/tests/data/approx/Makefile.am index 6f94721..12fc8cc 100644 --- a/milena/tests/data/approx/Makefile.am +++ b/milena/tests/data/approx/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -19,7 +19,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ median -median_SOURCES = median.cc # FIXME: The current median test is way too long to run. Break it # into two tests: a fast one, executed during `make check', compiled # with no optimization, using a small kernel and a small image; and a diff --git a/milena/tests/data/naive/Makefile.am b/milena/tests/data/naive/Makefile.am index d42bcc6..7fab28d 100644 --- a/milena/tests/data/naive/Makefile.am +++ b/milena/tests/data/naive/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -19,7 +19,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ median -median_SOURCES = median.cc # FIXME: The current median test is way too long to run. Break it # into two tests: a fast one, executed during `make check', compiled # with no optimization, using a small kernel and a small image; and a diff --git a/milena/tests/debug/Makefile.am b/milena/tests/debug/Makefile.am index 0346f1a..0ee1557 100644 --- a/milena/tests/debug/Makefile.am +++ b/milena/tests/debug/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -22,9 +23,5 @@ check_PROGRAMS = \ iota \ slices_2d -println_SOURCES = println.cc -println_with_border_SOURCES = println_with_border.cc -iota_SOURCES = iota.cc -slices_2d_SOURCES = slices_2d.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/draw/Makefile.am b/milena/tests/draw/Makefile.am index c823cfb..0ef96b5 100644 --- a/milena/tests/draw/Makefile.am +++ b/milena/tests/draw/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -21,7 +21,5 @@ check_PROGRAMS = \ line \ graph -line_SOURCES = line.cc -graph_SOURCES = graph.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/estim/Makefile.am b/milena/tests/estim/Makefile.am index 2490ef9..de7bc18 100644 --- a/milena/tests/estim/Makefile.am +++ b/milena/tests/estim/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -21,7 +21,5 @@ check_PROGRAMS = \ mean \ min_max -mean_SOURCES = mean.cc -min_max_SOURCES = min_max.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/extension/Makefile.am b/milena/tests/extension/Makefile.am index 85f9835..9a57572 100644 --- a/milena/tests/extension/Makefile.am +++ b/milena/tests/extension/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -19,6 +20,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ fill -fill_SOURCES = fill.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/extract/Makefile.am b/milena/tests/extract/Makefile.am index 2168f8d..7f51533 100644 --- a/milena/tests/extract/Makefile.am +++ b/milena/tests/extract/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -26,12 +26,6 @@ check_PROGRAMS = \ red \ sat -blue_SOURCES = blue.cc -green_SOURCES = green.cc -hue_SOURCES = hue.cc -lum_SOURCES = lum.cc -red_SOURCES = red.cc -sat_SOURCES = sat.cc #>> TESTS = $(check_PROGRAMS) diff --git a/milena/tests/fun/Makefile.am b/milena/tests/fun/Makefile.am index 82d6e89..cec325e 100644 --- a/milena/tests/fun/Makefile.am +++ b/milena/tests/fun/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -31,4 +31,3 @@ SUBDIRS = \ check_PROGRAMS = \ ops -ops_SOURCES = ops.cc diff --git a/milena/tests/fun/i2v/Makefile.am b/milena/tests/fun/i2v/Makefile.am index a3de8f9..d98b0fd 100644 --- a/milena/tests/fun/i2v/Makefile.am +++ b/milena/tests/fun/i2v/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -21,8 +22,5 @@ check_PROGRAMS = \ array \ value_at_index -all_to_SOURCES = all_to.cc -array_SOURCES = array.cc -value_at_index_SOURCES = value_at_index.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/fun/p2p/Makefile.am b/milena/tests/fun/p2p/Makefile.am index 862c78b..9a85e98 100644 --- a/milena/tests/fun/p2p/Makefile.am +++ b/milena/tests/fun/p2p/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -20,7 +20,5 @@ check_PROGRAMS = \ fold \ translation -fold_SOURCES = fold.cc -translation_SOURCES = translation.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/fun/stat/Makefile.am b/milena/tests/fun/stat/Makefile.am index aac5327..f70b046 100644 --- a/milena/tests/fun/stat/Makefile.am +++ b/milena/tests/fun/stat/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -19,6 +19,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ mahalanobis -mahalanobis_SOURCES = mahalanobis.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/fun/v2i/Makefile.am b/milena/tests/fun/v2i/Makefile.am index e67e7d0..29de7e8 100644 --- a/milena/tests/fun/v2i/Makefile.am +++ b/milena/tests/fun/v2i/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -19,6 +19,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ index_of_value -index_of_value_SOURCES = index_of_value.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/fun/v2v/Makefile.am b/milena/tests/fun/v2v/Makefile.am index d45fc4c..2de9bc3 100644 --- a/milena/tests/fun/v2v/Makefile.am +++ b/milena/tests/fun/v2v/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -22,9 +22,6 @@ check_PROGRAMS = \ projection \ wrap -norm_SOURCES = norm.cc -projection_SOURCES = projection.cc -wrap_SOURCES = wrap.cc #<<lrde # FIXME: Not distributed (yet). @@ -33,9 +30,6 @@ check_PROGRAMS += \ hsl_to_rgb \ rgb_to_hsl -component_SOURCES = component.cc -hsl_to_rgb_SOURCES = hsl_to_rgb.cc -rgb_to_hsl_SOURCES = rgb_to_hsl.cc #>> TESTS = $(check_PROGRAMS) diff --git a/milena/tests/fun/vv2v/Makefile.am b/milena/tests/fun/vv2v/Makefile.am index d180e3d..835699c 100644 --- a/milena/tests/fun/vv2v/Makefile.am +++ b/milena/tests/fun/vv2v/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -20,7 +21,5 @@ check_PROGRAMS = \ max \ min -max_SOURCES = max.cc -min_SOURCES = min.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/fun/x2x/Makefile.am b/milena/tests/fun/x2x/Makefile.am index 6ac5c22..e9a9c98 100644 --- a/milena/tests/fun/x2x/Makefile.am +++ b/milena/tests/fun/x2x/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -22,8 +22,5 @@ check_PROGRAMS = \ rotation \ translation -composed_SOURCES = composed.cc -rotation_SOURCES = rotation.cc -translation_SOURCES = translation.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/geom/Makefile.am b/milena/tests/geom/Makefile.am index 91fac5c..1a790aa 100644 --- a/milena/tests/geom/Makefile.am +++ b/milena/tests/geom/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -39,24 +39,5 @@ seed2tiling_roundness \ translate -bbox_SOURCES = bbox.cc -max_col_SOURCES = max_col.cc -max_ind_SOURCES = max_ind.cc -max_row_SOURCES = max_row.cc -max_sli_SOURCES = max_sli.cc -min_col_SOURCES = min_col.cc -min_ind_SOURCES = min_ind.cc -min_row_SOURCES = min_row.cc -min_sli_SOURCES = min_sli.cc -ncols_SOURCES = ncols.cc -ninds_SOURCES = ninds.cc -nrows_SOURCES = nrows.cc -nsites_SOURCES = nsites.cc -nslis_SOURCES = nslis.cc -pmin_pmax_SOURCES = pmin_pmax.cc -rotate_SOURCES = rotate.cc -seed2tiling_SOURCES = seed2tiling.cc -seed2tiling_roundness_SOURCES = seed2tiling_roundness.cc -translate_SOURCES = translate.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/graph/Makefile.am b/milena/tests/graph/Makefile.am index 608b6d9..582eb55 100644 --- a/milena/tests/graph/Makefile.am +++ b/milena/tests/graph/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -21,6 +21,5 @@ SUBDIRS = attribute check_PROGRAMS = \ labeling -labeling_SOURCES = labeling.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/graph/attribute/Makefile.am b/milena/tests/graph/attribute/Makefile.am index cb07318..163d66e 100644 --- a/milena/tests/graph/attribute/Makefile.am +++ b/milena/tests/graph/attribute/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -20,7 +20,5 @@ check_PROGRAMS = \ card \ representative -card_SOURCES = card.cc -representative_SOURCES = representative.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/histo/Makefile.am b/milena/tests/histo/Makefile.am index b5f7e7e..876e898 100644 --- a/milena/tests/histo/Makefile.am +++ b/milena/tests/histo/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -22,8 +22,5 @@ check_PROGRAMS = \ point_from_value \ to_image1d -compute_SOURCES = compute.cc -point_from_value_SOURCES = point_from_value.cc -to_image1d_SOURCES = to_image1d.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/dicom/Makefile.am b/milena/tests/io/dicom/Makefile.am index d8a4ea8..4016b16 100644 --- a/milena/tests/io/dicom/Makefile.am +++ b/milena/tests/io/dicom/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -23,6 +23,5 @@ AM_LDFLAGS = $(GDCM_LDFLAGS) # FIXME: Upon completion, if this test only read (not write) images, # rename it as load.cc -dicom_SOURCES = dicom.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/dump/Makefile.am b/milena/tests/io/dump/Makefile.am index dedd818..5be5bca 100644 --- a/milena/tests/io/dump/Makefile.am +++ b/milena/tests/io/dump/Makefile.am @@ -19,7 +19,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ dump -dump_SOURCES = dump.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/fits/Makefile.am b/milena/tests/io/fits/Makefile.am index f692f35..3759b49 100644 --- a/milena/tests/io/fits/Makefile.am +++ b/milena/tests/io/fits/Makefile.am @@ -22,7 +22,6 @@ AM_LDFLAGS = $(CFITSIO_LDFLAGS) check_PROGRAMS = fits -fits_SOURCES = fits.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/fld/Makefile.am b/milena/tests/io/fld/Makefile.am index 7cbe50b..dc4d036 100644 --- a/milena/tests/io/fld/Makefile.am +++ b/milena/tests/io/fld/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -21,8 +22,5 @@ check_PROGRAMS = \ fld1d \ fld3d -fld2d_SOURCES = fld2d.cc -fld3d_SOURCES = fld3d.cc -fld1d_SOURCES = fld1d.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/magick/Makefile.am b/milena/tests/io/magick/Makefile.am index f2d5f48..6060be9 100644 --- a/milena/tests/io/magick/Makefile.am +++ b/milena/tests/io/magick/Makefile.am @@ -23,8 +23,6 @@ check_PROGRAMS = \ load \ save -load_SOURCES = load.cc -save_SOURCES = save.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/off/Makefile.am b/milena/tests/io/off/Makefile.am index 4029729..12938da 100644 --- a/milena/tests/io/off/Makefile.am +++ b/milena/tests/io/off/Makefile.am @@ -22,10 +22,7 @@ check_PROGRAMS = \ load_save_bin \ load_float -load_bin_SOURCES = load_bin.cc -load_save_bin_SOURCES = load_save_bin.cc -load_float_SOURCES = load_float.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/pbm/Makefile.am b/milena/tests/io/pbm/Makefile.am index 690c895..3d5e67b 100644 --- a/milena/tests/io/pbm/Makefile.am +++ b/milena/tests/io/pbm/Makefile.am @@ -21,8 +21,6 @@ check_PROGRAMS = \ pbm \ pbm_ascii -pbm_SOURCES = pbm.cc -pbm_ascii_SOURCES = pbm_ascii.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/pbms/Makefile.am b/milena/tests/io/pbms/Makefile.am index f6d9770..4d54371 100644 --- a/milena/tests/io/pbms/Makefile.am +++ b/milena/tests/io/pbms/Makefile.am @@ -19,7 +19,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ load -load_SOURCES = load.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/pgm/Makefile.am b/milena/tests/io/pgm/Makefile.am index 8fdc560..90906cb 100644 --- a/milena/tests/io/pgm/Makefile.am +++ b/milena/tests/io/pgm/Makefile.am @@ -24,11 +24,6 @@ check_PROGRAMS = \ pgm_ascii \ pgm -pgm16_SOURCES = pgm16.cc -pgm19_SOURCES = pgm19.cc -pgm27_SOURCES = pgm27.cc -pgm_ascii_SOURCES = pgm_ascii.cc -pgm_SOURCES = pgm.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/pgms/Makefile.am b/milena/tests/io/pgms/Makefile.am index c5ac784..7e33abc 100644 --- a/milena/tests/io/pgms/Makefile.am +++ b/milena/tests/io/pgms/Makefile.am @@ -19,7 +19,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ load -load_SOURCES = load.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/ppm/Makefile.am b/milena/tests/io/ppm/Makefile.am index 695e5d7..771c84d 100644 --- a/milena/tests/io/ppm/Makefile.am +++ b/milena/tests/io/ppm/Makefile.am @@ -22,9 +22,6 @@ check_PROGRAMS = \ ppm23 \ ppm -ppm16_SOURCES = ppm16.cc -ppm23_SOURCES = ppm23.cc -ppm_SOURCES = ppm.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/ppms/Makefile.am b/milena/tests/io/ppms/Makefile.am index b11b52b..38d9cc7 100644 --- a/milena/tests/io/ppms/Makefile.am +++ b/milena/tests/io/ppms/Makefile.am @@ -19,7 +19,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ load -load_SOURCES = load.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/io/tiff/Makefile.am b/milena/tests/io/tiff/Makefile.am index 356214b..fe0fabc 100644 --- a/milena/tests/io/tiff/Makefile.am +++ b/milena/tests/io/tiff/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -21,6 +21,5 @@ AM_LDFLAGS = $(TIFF_LDFLAGS) check_PROGRAMS = load -load_SOURCES = load.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/labeling/Makefile.am b/milena/tests/labeling/Makefile.am index d7515fa..3a3721d 100644 --- a/milena/tests/labeling/Makefile.am +++ b/milena/tests/labeling/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -35,21 +35,5 @@ check_PROGRAMS = \ value \ wrap -background_SOURCES = background.cc -blobs_SOURCES = blobs.cc -blobs_and_compute_SOURCES = blobs_and_compute.cc -colorize_SOURCES = colorize.cc -compute_SOURCES = compute.cc -fill_holes_SOURCES = fill_holes.cc -flat_zones_SOURCES = flat_zones.cc -foreground_SOURCES = foreground.cc -mean_values_SOURCES = mean_values.cc -n_max_SOURCES = n_max.cc -pack_SOURCES = pack.cc -regional_maxima_SOURCES = regional_maxima.cc -regional_minima_SOURCES = regional_minima.cc -relabel_SOURCES = relabel.cc -value_SOURCES = value.cc -wrap_SOURCES = wrap.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/linear/Makefile.am b/milena/tests/linear/Makefile.am index 8842b8d..aaccee6 100644 --- a/milena/tests/linear/Makefile.am +++ b/milena/tests/linear/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -33,12 +33,6 @@ check_PROGRAMS = \ log \ sobel_2d -convolve_SOURCES = convolve.cc -lap_SOURCES = lap.cc -convolve_directional_SOURCES = convolve_directional.cc -convolve_2x1d_SOURCES = convolve_2x1d.cc -log_SOURCES = log.cc -sobel_2d_SOURCES = sobel_2d.cc #<<lrde # FIXME: Not distributed (yet). diff --git a/milena/tests/linear/gaussian/Makefile.am b/milena/tests/linear/gaussian/Makefile.am index 952a711..94316d0 100644 --- a/milena/tests/linear/gaussian/Makefile.am +++ b/milena/tests/linear/gaussian/Makefile.am @@ -21,8 +21,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ filter -filter_SOURCES = filter.cc - MOSTLYCLEANFILES = filter-out.pgm #>> diff --git a/milena/tests/linear/local/Makefile.am b/milena/tests/linear/local/Makefile.am index 9f53cfb..dff7dcf 100644 --- a/milena/tests/linear/local/Makefile.am +++ b/milena/tests/linear/local/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -20,6 +20,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ convolve -convolve_SOURCES = convolve.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/literal/Makefile.am b/milena/tests/literal/Makefile.am index ef86851..4af488a 100644 --- a/milena/tests/literal/Makefile.am +++ b/milena/tests/literal/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -24,10 +24,5 @@ check_PROGRAMS = \ white \ zero -black_SOURCES = black.cc -medium_gray_SOURCES = medium_gray.cc -one_SOURCES = one.cc -white_SOURCES = white.cc -zero_SOURCES = zero.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/logical/Makefile.am b/milena/tests/logical/Makefile.am index ca59622..406702c 100644 --- a/milena/tests/logical/Makefile.am +++ b/milena/tests/logical/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -24,10 +24,5 @@ check_PROGRAMS = \ or \ xor -and_SOURCES = and.cc -and_not_SOURCES = and_not.cc -not_SOURCES = not.cc -or_SOURCES = or.cc -xor_SOURCES = xor.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/make/Makefile.am b/milena/tests/make/Makefile.am index 34e0eff..139f62a 100644 --- a/milena/tests/make/Makefile.am +++ b/milena/tests/make/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -33,19 +33,5 @@ check_PROGRAMS = \ w_window \ w_window_directional -dual_neighb_SOURCES = dual_neighb.cc -dummy_p_edges_SOURCES = dummy_p_edges.cc -dummy_p_vertices_SOURCES = dummy_p_vertices.cc -influence_zone_adjacency_graph_SOURCES = influence_zone_adjacency_graph.cc -h_mat_SOURCES = h_mat.cc -image2d_SOURCES = image2d.cc -image3d_SOURCES = image3d.cc -mat_SOURCES = mat.cc -p_edges_with_mass_centers_SOURCES = p_edges_with_mass_centers.cc -p_vertices_with_mass_centers_SOURCES = p_vertices_with_mass_centers.cc -region_adjacency_graph_SOURCES = region_adjacency_graph.cc -rag_and_labeled_wsl_SOURCES = rag_and_labeled_wsl.cc -w_window_SOURCES = w_window.cc -w_window_directional_SOURCES = w_window_directional.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/metal/Makefile.am b/milena/tests/metal/Makefile.am index bc24893..cf4be2d 100644 --- a/milena/tests/metal/Makefile.am +++ b/milena/tests/metal/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -24,8 +24,5 @@ check_PROGRAMS = \ is \ unconst -converts_to_SOURCES = converts_to.cc -is_SOURCES = is.cc -unconst_SOURCES = unconst.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/metal/math/Makefile.am b/milena/tests/metal/math/Makefile.am index cc48940..a0ea02f 100644 --- a/milena/tests/metal/math/Makefile.am +++ b/milena/tests/metal/math/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -21,7 +21,5 @@ check_PROGRAMS = \ pow \ root -pow_SOURCES = pow.cc -root_SOURCES = root.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am index a2e460e..3d6e264 100644 --- a/milena/tests/morpho/Makefile.am +++ b/milena/tests/morpho/Makefile.am @@ -58,45 +58,22 @@ check_PROGRAMS = \ # -------------- # # FIXME: Have erosion and dilation perform symmetric tests. -erosion_SOURCES = erosion.cc -contrast_SOURCES = contrast.cc -general_SOURCES = general.cc -gradient_SOURCES = gradient.cc -hit_or_miss_SOURCES = hit_or_miss.cc -laplacian_SOURCES = laplacian.cc -thinning_SOURCES = thinning.cc - -graph_image_morpho_SOURCES = graph_image_morpho.cc -graph_image_wst_SOURCES = graph_image_wst.cc -line_graph_image_morpho_SOURCES = line_graph_image_morpho.cc -line_graph_image_wst_SOURCES = line_graph_image_wst.cc -complex_image_morpho_SOURCES = complex_image_morpho.cc -complex_image_wst_SOURCES = complex_image_wst.cc - -meyer_wst_SOURCES = meyer_wst.cc -rank_filter_SOURCES = rank_filter.cc -skeleton_constrained_SOURCES = skeleton_constrained.cc -top_hat_SOURCES = top_hat.cc -Rd_SOURCES = Rd.cc + + # --------------- # # Complex tests. # # --------------- # -artificial_line_graph_image_wst_SOURCES = artificial_line_graph_image_wst.cc artificial_line_graph_image_wst_CXXFLAGS = $(TESTS_CXXFLAGS_SPEED) -dilation_SOURCES = dilation.cc dilation_CXXFLAGS = $(TESTS_CXXFLAGS_SPEED) -lena_line_graph_image_wst1_SOURCES = lena_line_graph_image_wst1.cc lena_line_graph_image_wst1_CXXFLAGS = $(TESTS_CXXFLAGS_SPEED) -lena_line_graph_image_wst2_SOURCES = lena_line_graph_image_wst2.cc lena_line_graph_image_wst2_CXXFLAGS = $(TESTS_CXXFLAGS_SPEED) -meyer_wst_long_SOURCES = meyer_wst_long.cc meyer_wst_long_CXXFLAGS = $(TESTS_CXXFLAGS_SPEED) diff --git a/milena/tests/morpho/approx/Makefile.am b/milena/tests/morpho/approx/Makefile.am index fcc347e..d1c7253 100644 --- a/milena/tests/morpho/approx/Makefile.am +++ b/milena/tests/morpho/approx/Makefile.am @@ -20,8 +20,6 @@ check_PROGRAMS = \ dilation \ erosion -dilation_SOURCES = dilation.cc -erosion_SOURCES = erosion.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/morpho/attribute/Makefile.am b/milena/tests/morpho/attribute/Makefile.am index ae0a5e5..ea7bf22 100644 --- a/milena/tests/morpho/attribute/Makefile.am +++ b/milena/tests/morpho/attribute/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -22,9 +22,5 @@ check_PROGRAMS = \ volume \ height -card_SOURCES = card.cc -sum_SOURCES = sum.cc -volume_SOURCES = volume.cc -height_SOURCES = height.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/morpho/closing/Makefile.am b/milena/tests/morpho/closing/Makefile.am index 8502e59..d4d96a0 100644 --- a/milena/tests/morpho/closing/Makefile.am +++ b/milena/tests/morpho/closing/Makefile.am @@ -29,14 +29,6 @@ check_PROGRAMS = \ structural \ sum -area_on_vertices_SOURCES = area_on_vertices.cc -leveling_SOURCES = leveling.cc -algebraic_SOURCES = algebraic.cc -height_SOURCES = height.cc -area_SOURCES = area.cc -volume_SOURCES = volume.cc -structural_SOURCES = structural.cc -sum_SOURCES = sum.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/morpho/closing/approx/Makefile.am b/milena/tests/morpho/closing/approx/Makefile.am index 101bbe5..b3fb18a 100644 --- a/milena/tests/morpho/closing/approx/Makefile.am +++ b/milena/tests/morpho/closing/approx/Makefile.am @@ -19,7 +19,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ structural -structural_SOURCES = structural.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/morpho/elementary/Makefile.am b/milena/tests/morpho/elementary/Makefile.am index 37a726a..2514373 100644 --- a/milena/tests/morpho/elementary/Makefile.am +++ b/milena/tests/morpho/elementary/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -27,14 +28,5 @@ check_PROGRAMS = \ gradient \ erosion -laplacian_SOURCES = laplacian.cc -dilation_SOURCES = dilation.cc -gradient_internal_SOURCES = gradient_internal.cc -opening_SOURCES = opening.cc -closing_SOURCES = closing.cc -top_hat_SOURCES = top_hat.cc -gradient_external_SOURCES = gradient_external.cc -gradient_SOURCES = gradient.cc -erosion_SOURCES = erosion.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/morpho/opening/Makefile.am b/milena/tests/morpho/opening/Makefile.am index 4c06dc4..8f24eae 100644 --- a/milena/tests/morpho/opening/Makefile.am +++ b/milena/tests/morpho/opening/Makefile.am @@ -29,14 +29,6 @@ check_PROGRAMS = \ structural \ sum -area_on_vertices_SOURCES = area_on_vertices.cc -leveling_SOURCES = leveling.cc -algebraic_SOURCES = algebraic.cc -height_SOURCES = height.cc -area_SOURCES = area.cc -volume_SOURCES = volume.cc -structural_SOURCES = structural.cc -sum_SOURCES = sum.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/morpho/opening/approx/Makefile.am b/milena/tests/morpho/opening/approx/Makefile.am index 101bbe5..b3fb18a 100644 --- a/milena/tests/morpho/opening/approx/Makefile.am +++ b/milena/tests/morpho/opening/approx/Makefile.am @@ -19,7 +19,6 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ structural -structural_SOURCES = structural.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/morpho/reconstruction/by_dilation/Makefile.am b/milena/tests/morpho/reconstruction/by_dilation/Makefile.am index 48f1460..b9ee76f 100644 --- a/milena/tests/morpho/reconstruction/by_dilation/Makefile.am +++ b/milena/tests/morpho/reconstruction/by_dilation/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -21,7 +21,6 @@ check_PROGRAMS = \ union_find -union_find_SOURCES = union_find.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/morpho/reconstruction/by_erosion/Makefile.am b/milena/tests/morpho/reconstruction/by_erosion/Makefile.am index 48f1460..b9ee76f 100644 --- a/milena/tests/morpho/reconstruction/by_erosion/Makefile.am +++ b/milena/tests/morpho/reconstruction/by_erosion/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -21,7 +21,6 @@ check_PROGRAMS = \ union_find -union_find_SOURCES = union_find.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/morpho/tree/Makefile.am b/milena/tests/morpho/tree/Makefile.am index 303bd7c..a2dfb94 100644 --- a/milena/tests/morpho/tree/Makefile.am +++ b/milena/tests/morpho/tree/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -23,11 +24,6 @@ check_PROGRAMS = \ data \ max -compute_attribute_image_SOURCES = compute_attribute_image.cc -compute_parent_SOURCES = compute_parent.cc -dual_input_tree_SOURCES = dual_input_tree.cc -data_SOURCES = data.cc -max_SOURCES = max.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/morpho/tree/filter/Makefile.am b/milena/tests/morpho/tree/filter/Makefile.am index 41a0603..e8a3429 100644 --- a/milena/tests/morpho/tree/filter/Makefile.am +++ b/milena/tests/morpho/tree/filter/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -19,6 +19,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ filter -filter_SOURCES = filter.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/morpho/watershed/Makefile.am b/milena/tests/morpho/watershed/Makefile.am index 01a28bc..4917190 100644 --- a/milena/tests/morpho/watershed/Makefile.am +++ b/milena/tests/morpho/watershed/Makefile.am @@ -21,9 +21,6 @@ check_PROGRAMS = \ superpose \ topological -flooding_SOURCES = flooding.cc -superpose_SOURCES = superpose.cc -topological_SOURCES = topological.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/opt/Makefile.am b/milena/tests/opt/Makefile.am index 27f0f0d..a9f7606 100644 --- a/milena/tests/opt/Makefile.am +++ b/milena/tests/opt/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -19,6 +20,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ at -at_SOURCES = at.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/pw/Makefile.am b/milena/tests/pw/Makefile.am index ae5a829..16bfa30 100644 --- a/milena/tests/pw/Makefile.am +++ b/milena/tests/pw/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -21,7 +21,5 @@ check_PROGRAMS = \ image \ value -image_SOURCES = image.cc -value_SOURCES = value.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/registration/Makefile.am b/milena/tests/registration/Makefile.am index 2910259..6b68b22 100644 --- a/milena/tests/registration/Makefile.am +++ b/milena/tests/registration/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -19,7 +20,6 @@ include $(top_srcdir)/milena/tests/tests.mk #<<lrde # FIXME: Not distributed (yet) and currently disabled. # check_PROGRAMS = registration -# registration_SOURCES = registration.cc #>> TESTS = $(check_PROGRAMS) diff --git a/milena/tests/set/Makefile.am b/milena/tests/set/Makefile.am index ab6e345..94b848e 100644 --- a/milena/tests/set/Makefile.am +++ b/milena/tests/set/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -27,13 +27,5 @@ check_PROGRAMS = \ uni \ unique -card_SOURCES = card.cc -compute_SOURCES = compute.cc -compute_with_weights_SOURCES = compute_with_weights.cc -diff_SOURCES = diff.cc -inter_SOURCES = inter.cc -sym_diff_SOURCES = sym_diff.cc -uni_SOURCES = uni.cc -unique_SOURCES = unique.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/test/Makefile.am b/milena/tests/test/Makefile.am index 6e42c2c..7c057ba 100644 --- a/milena/tests/test/Makefile.am +++ b/milena/tests/test/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -19,6 +20,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ positive -positive_SOURCES = positive.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/tests.mk b/milena/tests/tests.mk index 85ee5d5..b331615 100644 --- a/milena/tests/tests.mk +++ b/milena/tests/tests.mk @@ -2,7 +2,7 @@ ## Shared configuration for tests. -## Copyright (C) 2007, 2008, 2009 EPITA Research and Development +## Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development ## Laboratory (LRDE) ## ## This file is part of Olena. @@ -19,6 +19,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)/milena/common.mk # FIXME: Revamp (see Olena 0.11's test suite). diff --git a/milena/tests/topo/Makefile.am b/milena/tests/topo/Makefile.am index b8684bf..54f7d7f 100644 --- a/milena/tests/topo/Makefile.am +++ b/milena/tests/topo/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -21,6 +22,5 @@ SUBDIRS = skeleton check_PROGRAMS = \ complex -complex_SOURCES = complex.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/topo/skeleton/Makefile.am b/milena/tests/topo/skeleton/Makefile.am index 0e60ff6..39bd7e2 100644 --- a/milena/tests/topo/skeleton/Makefile.am +++ b/milena/tests/topo/skeleton/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -20,7 +20,5 @@ check_PROGRAMS = \ crest \ is_simple_point -crest_SOURCES = crest.cc -is_simple_point_SOURCES = is_simple_point.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/trait/Makefile.am b/milena/tests/trait/Makefile.am index f3411f9..6f95c28 100644 --- a/milena/tests/trait/Makefile.am +++ b/milena/tests/trait/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -23,7 +23,5 @@ check_PROGRAMS = \ ch_value \ super -ch_value_SOURCES = ch_value.cc -super_SOURCES = super.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/trait/image/Makefile.am b/milena/tests/trait/image/Makefile.am index a428a33..cb61ebe 100644 --- a/milena/tests/trait/image/Makefile.am +++ b/milena/tests/trait/image/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -20,6 +20,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ images -images_SOURCES = images.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/trait/op/Makefile.am b/milena/tests/trait/op/Makefile.am index 8d83dd2..0f3626e 100644 --- a/milena/tests/trait/op/Makefile.am +++ b/milena/tests/trait/op/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -21,7 +21,5 @@ check_PROGRAMS = \ plus \ uminus -plus_SOURCES = plus.cc -uminus_SOURCES = uminus.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/trait/value/Makefile.am b/milena/tests/trait/value/Makefile.am index 30e6d67..0480b3a 100644 --- a/milena/tests/trait/value/Makefile.am +++ b/milena/tests/trait/value/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -21,7 +21,5 @@ check_PROGRAMS = \ comp \ values -comp_SOURCES = comp.cc -values_SOURCES = values.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/transform/Makefile.am b/milena/tests/transform/Makefile.am index 933483d..40de7f1 100644 --- a/milena/tests/transform/Makefile.am +++ b/milena/tests/transform/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -26,13 +27,5 @@ check_PROGRAMS = \ influence_zone_geodesic \ influence_zone_geodesic_saturated -bench_closest_point_geodesic_SOURCES = bench_closest_point_geodesic.cc -distance_and_closest_point_geodesic_SOURCES = distance_and_closest_point_geodesic.cc -distance_front_SOURCES = distance_front.cc -distance_geodesic_SOURCES = distance_geodesic.cc -hough_SOURCES = hough.cc -influence_zone_front_SOURCES = influence_zone_front.cc -influence_zone_geodesic_SOURCES = influence_zone_geodesic.cc -influence_zone_geodesic_saturated_SOURCES = influence_zone_geodesic_saturated.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/upscaling/art/Makefile.am b/milena/tests/upscaling/art/Makefile.am index 01900f4..e852f25 100644 --- a/milena/tests/upscaling/art/Makefile.am +++ b/milena/tests/upscaling/art/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -22,8 +22,6 @@ check_PROGRAMS = \ scale3x -scale2x_SOURCES = scale2x.cc -scale3x_SOURCES = scale3x.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/util/Makefile.am b/milena/tests/util/Makefile.am index 0a1119e..7bab9b3 100644 --- a/milena/tests/util/Makefile.am +++ b/milena/tests/util/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -36,21 +36,5 @@ check_PROGRAMS = \ tree_fast \ tree_to_fast -adjacency_matrix_SOURCES = adjacency_matrix.cc -branch_iter_SOURCES = branch_iter.cc -branch_iter_ind_SOURCES = branch_iter_ind.cc -eat_SOURCES = eat.cc -fibonacci_heap_SOURCES = fibonacci_heap.cc -graph_SOURCES = graph.cc -lazy_set_SOURCES = lazy_set.cc -lemmings_SOURCES = lemmings.cc -line_graph_SOURCES = line_graph.cc -ord_SOURCES = ord.cc -ord_pair_SOURCES = ord_pair.cc -set_SOURCES = set.cc -soft_heap_SOURCES = soft_heap.cc -tree_SOURCES = tree.cc -tree_fast_SOURCES = tree_fast.cc -tree_to_fast_SOURCES = tree_to_fast.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/value/Makefile.am b/milena/tests/value/Makefile.am index 975d471..08a1f53 100644 --- a/milena/tests/value/Makefile.am +++ b/milena/tests/value/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -41,28 +41,10 @@ check_PROGRAMS = \ # graylevel # graylevel_f -bool_SOURCES = bool.cc -equiv_SOURCES = equiv.cc -#float01_SOURCES = float01.cc -#float01_bis_SOURCES = float01_bis.cc -#float01_f_SOURCES = float01_f.cc -#graylevel_SOURCES = graylevel.cc -#graylevel_f_SOURCES = graylevel_f.cc -int_s_SOURCES = int_s.cc -int_s16_SOURCES = int_s16.cc -int_u8_SOURCES = int_u8.cc -interop_SOURCES = interop.cc -label_SOURCES = label.cc -proxy_SOURCES = proxy.cc -rgb8_SOURCES = rgb8.cc -scalar_SOURCES = scalar.cc -set_SOURCES = set.cc -sign_SOURCES = sign.cc #<<lrde # FIXME: Not distributed (yet). check_PROGRAMS += stack -stack_SOURCES = stack.cc #>> # FIXME: Enable when make check_full works. @@ -71,9 +53,6 @@ stack_SOURCES = stack.cc # graylevel_f_full \ # rgb_full # -# graylevel_f_full_SOURCES = graylevel_f_full.cc -# graylevel_full_SOURCES = graylevel_full.cc -# rgb_full_SOURCES = rgb_full.cc TESTS = $(check_PROGRAMS) # FIXME: Enable when make check_full works. diff --git a/milena/tests/value/builtin/Makefile.am b/milena/tests/value/builtin/Makefile.am index fd5347d..c842192 100644 --- a/milena/tests/value/builtin/Makefile.am +++ b/milena/tests/value/builtin/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -21,6 +21,5 @@ check_PROGRAMS = \ builtin # FIXME: Rename this test, as `builtin' is not enough relevant. -builtin_SOURCES = builtin.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/win/Makefile.am b/milena/tests/win/Makefile.am index 9c58718..53f7e73 100644 --- a/milena/tests/win/Makefile.am +++ b/milena/tests/win/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -35,21 +35,5 @@ check_PROGRAMS = \ sym \ vline2d -backdiag2d_SOURCES = backdiag2d.cc -ball_SOURCES = ball.cc -cube3d_SOURCES = cube3d.cc -cuboid3d_SOURCES = cuboid3d.cc -diag2d_SOURCES = diag2d.cc -diff_SOURCES = diff.cc -disk2d_SOURCES = disk2d.cc -hline2d_SOURCES = hline2d.cc -inter_SOURCES = inter.cc -octagon2d_SOURCES = octagon2d.cc -rectangle2d_SOURCES = rectangle2d.cc -segment1d_SOURCES = segment1d.cc -shift_SOURCES = shift.cc -sphere3d_SOURCES = sphere3d.cc -sym_SOURCES = sym.cc -vline2d_SOURCES = vline2d.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/world/binary_2d/Makefile.am b/milena/tests/world/binary_2d/Makefile.am index a52757c..c741183 100644 --- a/milena/tests/world/binary_2d/Makefile.am +++ b/milena/tests/world/binary_2d/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -20,7 +20,5 @@ check_PROGRAMS = \ enlarge # enlarge_hq2x -enlarge_SOURCES = enlarge.cc -#enlarge_hq2x_SOURCES = enlarge_hq2x.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/world/inter_pixel/Makefile.am b/milena/tests/world/inter_pixel/Makefile.am index 2d08ba2..3d11958 100644 --- a/milena/tests/world/inter_pixel/Makefile.am +++ b/milena/tests/world/inter_pixel/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -26,10 +26,5 @@ check_PROGRAMS = \ is_separator \ separator_to_pixels -compute_SOURCES = compute.cc -immerse_SOURCES = immerse.cc -is_pixel_SOURCES = is_pixel.cc -is_separator_SOURCES = is_separator.cc -separator_to_pixels_SOURCES = separator_to_pixels.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/world/inter_pixel/dim2/Makefile.am b/milena/tests/world/inter_pixel/dim2/Makefile.am index 10ac0fb..5edcaa8 100644 --- a/milena/tests/world/inter_pixel/dim2/Makefile.am +++ b/milena/tests/world/inter_pixel/dim2/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -19,6 +19,5 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ make_edge_image -make_edge_image_SOURCES = make_edge_image.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tools/Makefile.am b/milena/tools/Makefile.am index f7114d0..47347de 100644 --- a/milena/tools/Makefile.am +++ b/milena/tools/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -20,7 +21,4 @@ bin_PROGRAMS = \ seed2tiling \ area_flooding -area_flooding_SOURCES = area_flooding.cc -seed2tiling_SOURCES = seed2tiling.cc - # FIXME: Add some tests for these tools. diff --git a/milena/tools/tools.mk b/milena/tools/tools.mk index 9d9a046..35eeaf5 100644 --- a/milena/tools/tools.mk +++ b/milena/tools/tools.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) # # This file is part of Olena. # @@ -14,6 +14,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)/milena/common.mk ## FIXME: Revamp (see Olena 0.11's test suite). -- 1.5.6.5

1 0

last-svn-commit-179-g15ff635 Require Automake 1.11.
by Roland Levillain 24 Jun '10

24 Jun '10

* bootstrap, configure.ac: Here. --- ChangeLog | 6 ++++++ bootstrap | 2 +- configure.ac | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44386d3..db0457c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-02-17 Roland Levillain <roland(a)lrde.epita.fr> + + Require Automake 1.11. + + * bootstrap, configure.ac: Here. + 2010-06-24 Roland Levillain <roland(a)lrde.epita.fr> Add `mesh-segm-skel' to the branches to be uploaded (as snapshot). diff --git a/bootstrap b/bootstrap index a9decca..d0e8b58 100755 --- a/bootstrap +++ b/bootstrap @@ -141,7 +141,7 @@ done # Requirements over bootstrap tools. require autoconf 2.61 -require automake 1.10 +require automake 1.11 libtoolize=libtoolize for l in "$LIBTOOLIZE" glibtoolize libtoolize; do diff --git a/configure.ac b/configure.ac index 20efb20..80207df 100644 --- a/configure.ac +++ b/configure.ac @@ -34,7 +34,7 @@ AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_FILES([build-aux/Makefile]) # Automake. -AM_INIT_AUTOMAKE([1.10 subdir-objects check-news dist-bzip2 nostdinc -Wall]) +AM_INIT_AUTOMAKE([1.11 subdir-objects check-news dist-bzip2 nostdinc -Wall]) # Package metadata. AC_CONFIG_FILES([milena/mln/version.hh]) -- 1.5.6.5

1 0

branch automake-1.11 updated: last-svn-commit-185-g1632a8f
by git＠lrde.epita.fr 24 Jun '10

24 Jun '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch automake-1.11 has been updated discards 7aacb61a0046adfcd926193d2a78de91cdbbb9d0 (commit) discards 4def5f0d7d19e7dd01c7ed42b1dc6019689c56f5 (commit) discards 5c1e70424e2d99a22cad909500f167b6189466d2 (commit) discards d134e182361389ad6c3e00a6a4a8fd50fe30c03a (commit) discards 74142adbc2697eeb721f42e6104a311b0aa23fbb (commit) discards 3240a14f9500348960cfe86b465182bac885780e (commit) discards ea5d26525d6e6db053348d79c86b3e0699d882ed (commit) discards d916229ffca1d1611531146d96757c40265f3508 (commit) discards b0d18239af4e6840aa131abab08d16248b684e2f (commit) via 1632a8f59efe364ecc9366be99bbe59b5de139c6 (commit) via aa63bcb2576049200512f85e8ab584b6f149d24c (commit) via b64adfacb31e03d3debb788964337972250df5bb (commit) via 4bcc5bc53c219fd75895502d465116dc32e1b949 (commit) via 8194448d493450e3156d76a8903b7646abb1a961 (commit) via b6d70623f4ebe72255fb522c585c89dfe31d593f (commit) via 15ff6353f95db7159eb8b3b74aad3940e25d6cef (commit) via 71c9c144f233770f1b9652ba98d6137053e8ab47 (commit) via 0d502d0cf9f3571471768db4f3833b0701ef39a0 (commit) via ba369b62ba9d59fb093d4247284f2c437f42754e (commit) via 165770feeac77f1dfab40f3173c3e6e483709df1 (commit) via 4ef67060e4a70bf4af46d54548b4dafdbd04dcf9 (commit) via ace04a4f7d94756ce9a1f128c67b2a8cb840d549 (commit) via 51c347f97f743e56262f65acd5bc6658c2a99439 (commit) via 75c57adc2959683d4549bf36a0a12c08c1266760 (commit) via ceed614319364a103d4c7c15afd2ea2a3b6d2186 (commit) via ccc4a321e56015b6d2824f0f67236bdad14990c4 (commit) via 5758dd72a0d8fe7849e99ad6f5dbf6f0b97c1c6d (commit) via a32f582d8894e37cb18614521c262ab5ae49c1a7 (commit) via 635ff15ca3cc548f282d4bb96587bb6d3b2e8c7f (commit) via 70dedf8ba8537b7d8081641e15553637317f4e03 (commit) via 68624e4c54dd06c46428b7dd914bdbd1e8c06678 (commit) via bfdea8debb5538103da4cc28ca092309850fd597 (commit) via 69ce9faae9f4efb9de5b7f0bb413e467d6b10882 (commit) via 2b5bd163c6290a5e6125b338212ac97bc5963dce (commit) via 94486e40acf3355b24eece538313f3ec9edd5f20 (commit) via 916df4279f248a6fb5c85a129229f57e71f036eb (commit) via 664b361a5b75efba6b472d1028abad8d267c3628 (commit) via 9ced0495ec829f942f3abffe7077d472efff96f6 (commit) via d53b4271ddc93c8fa098f4ef4c2fc7432f808357 (commit) via 17734ea5b269b3a71fc2138a270454a80b0ed6ae (commit) via 4c42b800077d0dda5fde111d0e4761661c9a52c3 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (7aacb61a0046adfcd926193d2a78de91cdbbb9d0) \ N -- N -- N (1632a8f59efe364ecc9366be99bbe59b5de139c6) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 1632a8f Enable parallel tests. aa63bcb Factor Makefiles' helpers. b64adfa Use AM_DEFAULT_SOURCE_EXT to simplify Scribo's Makefiles. 4bcc5bc tests/unit_test/unit-tests.mk: Regen. 8194448 Simplify build_unit_test.sh thanks to AM_DEFAULT_SOURCE_EXT. b6d7062 Use AM_DEFAULT_SOURCE_EXT to simplify Milena's Makefiles. 15ff635 Require Automake 1.11. ----------------------------------------------------------------------- Summary of changes: AUTHORS | 3 + ChangeLog | 65 ++++++ Makefile.am | 7 +- build-aux/devtools.sh | 16 ++ build-aux/devtools_utils.sh | 16 ++ build-aux/generate_dist_headers.sh | 17 ++ build-aux/make_report_utils.sh | 18 ++- configure.ac | 79 ++++++-- external/Makefile.am | 3 - external/trimesh/ChangeLog | 15 ++ external/trimesh/Makefile.am | 19 -- external/trimesh/configure.ac | 3 - external/trimesh/gluit/Makefile.am | 19 -- external/trimesh/include/Makefile.am | 19 -- external/trimesh/libsrc/Makefile.am | 19 -- external/trimesh/utilsrc/Makefile.am | 19 -- lrde-upload.sh | 77 +++++-- milena/ChangeLog | 237 ++++++++++++++++++-- milena/Makefile.am | 3 - .../test-constrained-connectivity.in | 16 ++ milena/apps/mesh-segm-skel/Makefile.am | 14 +- .../test-mesh-complex-max-curv-segm.in | 16 ++ .../mesh-segm-skel/test-mesh-complex-max-curv.in | 16 ++ .../apps/mesh-segm-skel/test-mesh-complex-segm.in | 16 ++ .../apps/mesh-segm-skel/test-mesh-complex-skel.in | 16 ++ milena/apps/mesh-segm-skel/test-mesh-max-curv.in | 16 ++ milena/apps/mesh-segm-skel/test-mesh-segm.in | 16 ++ milena/apps/papers/levillain.09.ismm/Makefile.am | 2 +- milena/doc/graphicx.hva | 16 ++ milena/doc/tools/clearbanner.sh | 16 ++ milena/doc/tools/split_sample.sh | 17 ++ milena/mesh/Makefile.am | 3 - milena/mln/core/image/edge_image.hh | 8 +- milena/mln/core/image/vertex_image.hh | 8 +- milena/mln/make/edge_image.hh | 27 +-- .../mln/topo/internal/complex_set_iterator_base.hh | 14 +- milena/mln/util/edge.hh | 30 +-- milena/mln/util/graph.hh | 25 ++- milena/mln/util/line_graph.hh | 20 +- milena/mln/util/vertex.hh | 26 ++- milena/tests/Makefile.am | 3 - milena/tests/accu/Makefile.am | 3 - milena/tests/accu/image/Makefile.am | 3 - milena/tests/accu/math/Makefile.am | 3 - milena/tests/accu/shape/Makefile.am | 3 - milena/tests/accu/site_set/Makefile.am | 3 - milena/tests/accu/stat/Makefile.am | 3 - milena/tests/algebra/Makefile.am | 3 - milena/tests/arith/Makefile.am | 3 - milena/tests/binarization/Makefile.am | 3 +- milena/tests/border/Makefile.am | 3 - milena/tests/canvas/Makefile.am | 5 - milena/tests/canvas/browsing/Makefile.am | 3 - milena/tests/canvas/morpho/Makefile.am | 3 - milena/tests/convert/Makefile.am | 3 - milena/tests/convert/impl/Makefile.am | 3 - milena/tests/core/Makefile.am | 6 +- milena/tests/core/alias/Makefile.am | 3 - milena/tests/core/image/Makefile.am | 3 - milena/tests/core/image/dmorph/Makefile.am | 3 - milena/tests/core/image/imorph/Makefile.am | 3 - milena/tests/core/image/vmorph/Makefile.am | 3 - milena/tests/core/other/Makefile.am | 3 - milena/tests/core/routine/Makefile.am | 3 - milena/tests/core/site_set/Makefile.am | 3 - milena/tests/debug/Makefile.am | 3 - milena/tests/display/Makefile.am | 6 +- milena/tests/draw/Makefile.am | 3 - milena/tests/estim/Makefile.am | 3 - milena/tests/extension/Makefile.am | 3 - milena/tests/extract/Makefile.am | 3 - milena/tests/fun/Makefile.am | 3 - milena/tests/fun/i2v/Makefile.am | 3 - milena/tests/fun/p2b/Makefile.am | 3 - milena/tests/fun/p2p/Makefile.am | 3 - milena/tests/fun/p2v/Makefile.am | 3 - milena/tests/fun/stat/Makefile.am | 3 - milena/tests/fun/v2i/Makefile.am | 3 - milena/tests/fun/v2v/Makefile.am | 3 - milena/tests/fun/vv2v/Makefile.am | 3 - milena/tests/fun/x2x/Makefile.am | 3 - milena/tests/geom/Makefile.am | 3 - milena/tests/graph/Makefile.am | 3 - milena/tests/graph/attribute/Makefile.am | 3 - milena/tests/histo/Makefile.am | 3 - milena/tests/io/Makefile.am | 6 +- milena/tests/io/dicom/Makefile.am | 3 - milena/tests/io/dump/Makefile.am | 3 +- milena/tests/io/fits/Makefile.am | 3 +- milena/tests/io/fld/Makefile.am | 5 +- milena/tests/io/magick/Makefile.am | 3 +- milena/tests/io/off/Makefile.am | 4 +- milena/tests/io/pbm/Makefile.am | 3 +- milena/tests/io/pbms/Makefile.am | 3 +- milena/tests/io/pfm/Makefile.am | 3 - milena/tests/io/pgm/Makefile.am | 3 +- milena/tests/io/pgms/Makefile.am | 3 +- milena/tests/io/pnm/Makefile.am | 3 - milena/tests/io/ppm/Makefile.am | 3 +- milena/tests/io/ppms/Makefile.am | 3 +- milena/tests/io/tiff/Makefile.am | 3 - milena/tests/labeling/Makefile.am | 3 - milena/tests/linear/gaussian/Makefile.am | 2 +- milena/tests/linear/local/Makefile.am | 3 - milena/tests/literal/Makefile.am | 3 - milena/tests/logical/Makefile.am | 3 - milena/tests/make/Makefile.am | 3 - milena/tests/math/Makefile.am | 3 - milena/tests/metal/Makefile.am | 3 - milena/tests/metal/make/Makefile.am | 3 - milena/tests/metal/math/Makefile.am | 3 - milena/tests/morpho/Makefile.am | 4 +- milena/tests/morpho/approx/Makefile.am | 3 +- milena/tests/morpho/attribute/Makefile.am | 3 - milena/tests/morpho/closing/Makefile.am | 3 +- milena/tests/morpho/closing/approx/Makefile.am | 3 +- milena/tests/morpho/closing/sum.cc | 2 +- milena/tests/morpho/closing/volume.cc | 2 +- milena/tests/morpho/elementary/Makefile.am | 3 - milena/tests/morpho/line_graph_image_morpho.cc | 4 +- milena/tests/morpho/opening/Makefile.am | 3 +- milena/tests/morpho/opening/approx/Makefile.am | 3 +- milena/tests/morpho/opening/sum.cc | 2 +- milena/tests/morpho/rank_filter.cc | 5 +- milena/tests/morpho/reconstruction/Makefile.am | 5 - .../morpho/reconstruction/by_dilation/Makefile.am | 5 - .../morpho/reconstruction/by_erosion/Makefile.am | 5 - milena/tests/morpho/skeleton_constrained.cc | 83 ++++---- milena/tests/morpho/tree/Makefile.am | 5 +- milena/tests/morpho/tree/filter/Makefile.am | 3 - milena/tests/morpho/watershed/Makefile.am | 3 +- milena/tests/norm/Makefile.am | 3 - milena/tests/opt/Makefile.am | 3 - milena/tests/pw/Makefile.am | 3 - milena/tests/registration/Makefile.am | 3 - milena/tests/set/Makefile.am | 3 - milena/tests/subsampling/Makefile.am | 3 - milena/tests/tag/Makefile.am | 3 - milena/tests/test/Makefile.am | 3 - milena/tests/topo/Makefile.am | 3 - milena/tests/topo/skeleton/Makefile.am | 3 - milena/tests/trace/Makefile.am | 3 - milena/tests/trait/Makefile.am | 3 - milena/tests/trait/image/Makefile.am | 3 - milena/tests/trait/op/Makefile.am | 3 - milena/tests/trait/value/Makefile.am | 3 - milena/tests/transform/Makefile.am | 3 - milena/tests/unit_test/Makefile.am | 3 - milena/tests/upscaling/Makefile.am | 4 - milena/tests/upscaling/art/Makefile.am | 3 - milena/tests/util/Makefile.am | 4 - milena/tests/value/Makefile.am | 3 - milena/tests/value/builtin/Makefile.am | 3 - milena/tests/value/concept/Makefile.am | 3 - milena/tests/win/Makefile.am | 3 - milena/tests/world/Makefile.am | 3 - milena/tests/world/binary_2d/Makefile.am | 3 - milena/tests/world/inter_pixel/Makefile.am | 3 - milena/tests/world/inter_pixel/dim2/Makefile.am | 3 - milena/tools/Makefile.am | 3 - scribo/ChangeLog | 45 ++++ scribo/Doxyfile | 16 ++ scribo/Doxyfile_tex | 16 ++ scribo/Makefile.am | 2 - scribo/demo/Makefile.am | 16 ++- scribo/scribo.mk | 5 +- scribo/src/Makefile.am | 3 - scribo/src/binarization/Makefile.am | 5 - scribo/src/debug/Makefile.am | 3 - scribo/src/filter/Makefile.am | 3 - scribo/src/misc/Makefile.am | 5 - scribo/src/multi_scale/Makefile.am | 5 - scribo/src/preprocessing/Makefile.am | 3 - scribo/src/primitive/Makefile.am | 3 - scribo/src/primitive/extract/Makefile.am | 5 - scribo/src/primitive/find/Makefile.am | 6 - scribo/src/primitive/group/Makefile.am | 3 - scribo/src/table/Makefile.am | 3 - scribo/src/text/Makefile.am | 3 - scribo/tests/Makefile.am | 2 - scribo/tests/filter/Makefile.am | 3 - scribo/tests/preprocessing/Makefile.am | 3 - scribo/tests/table/Makefile.am | 3 - scribo/tests/tests.mk | 5 +- scribo/tests/text/Makefile.am | 3 - scribo/tests/unit_test/Makefile.am | 3 - swilena/ChangeLog | 8 +- swilena/Makefile.am | 3 - swilena/python/Makefile.am | 3 - 189 files changed, 950 insertions(+), 692 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-184-gead83a9 Clean up and new FIXMES in in apps/mesh-segm-skel.
by Roland Levillain 24 Jun '10

24 Jun '10

* apps/mesh-segm-skel/mesh-complex-max-curv.cc: Remove dead code. * apps/mesh-segm-skel/mesh-complex-skel.cc: Typo. * apps/mesh-segm-skel/Makefile.am: Add titles and FIXMES. --- milena/ChangeLog | 8 ++++ milena/apps/mesh-segm-skel/Makefile.am | 36 ++++++++++++++++++-- .../apps/mesh-segm-skel/mesh-complex-max-curv.cc | 13 +------ milena/apps/mesh-segm-skel/mesh-complex-skel.cc | 2 +- 4 files changed, 44 insertions(+), 15 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 50edae0..64370e9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> + Clean up and new FIXMES in in apps/mesh-segm-skel. + + * apps/mesh-segm-skel/mesh-complex-max-curv.cc: Remove dead code. + * apps/mesh-segm-skel/mesh-complex-skel.cc: Typo. + * apps/mesh-segm-skel/Makefile.am: Add titles and FIXMES. + +2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> + New application: mesh-complex-max-curv-extrema. * apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc: New. diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index eaf7bb2..6853f76 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -79,11 +79,13 @@ endif ENABLE_TRIMESH if ENABLE_TRIMESH bin_PROGRAMS += mesh-pinv-curv mesh-max-curv + # FIXME: Rename as mesh-trimesh-pinv-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) + # FIXME: Rename as mesh-trimesh-max-curv? mesh_max_curv_SOURCES = mesh-max-curv.cc io.hh mesh_max_curv_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_trimesh) mesh_max_curv_LDFLAGS = $(LDFLAGS_trimesh) @@ -93,17 +95,34 @@ if ENABLE_TRIMESH endif ENABLE_TRIMESH ## ---------------------------------------------------- ## +## Graph-based applications, independent of Trimesh. ## +## ---------------------------------------------------- ## + +# FIXME: To be written (and factored, of course): +# +# mesh-graph-{max,pinv}-curv +# +# mesh-graph-segm +# mesh-graph-{max,pinv}-curv-segm +# +# mesh-graph-skel +# mesh-graph-{max,pinv}-curv-skel +# +# ... + +## ---------------------------------------------------- ## ## Complex-based applications, independent of Trimesh. ## ## ---------------------------------------------------- ## # A Milena re-implementation of some features from Trimesh. This code # is completely independent from the Trimesh library. # FIXME: Change the name of this directory, as it is confusing. +# FIXME: Integrate this header into Milena. noinst_HEADERS = trimesh/misc.hh EXTRA_DIST = trimesh/README -## Segmentation. -## ------------ +## Curvature computation. +## ---------------------- # A small program exercising the curvature computation routines ported # from Trimesh to Milena. @@ -112,6 +131,7 @@ mesh_complex_max_curv_SOURCES = mesh-complex-max-curv.cc TESTS += test-mesh-complex-max-curv MOSTLYCLEANFILES += teapot-complex-max-curv.off +# FIXME: Implement (and exercise) mesh-complex-pinv-curv. # A program computing the max curvature at each (2-)face of the # surface of a triangle mesh and displaying its local minima @@ -123,7 +143,14 @@ CLEANFILES += \ socket-complex-max-curv-extrema.off \ teapot-complex-max-curv-extrema.off -# Segmentation program working on precomputed meshes with curvatures data. +# FIXME: Implement (and exercise) mesh-complex-pinv-curv-extrema. + +## Segmentation. +## ------------- + +# Segmentation program working on precomputed meshes with curvature +# data. Less accurate, since curvature is stored on triangles +# (polygons), whereas the segmentation is performed on edges. bin_PROGRAMS += mesh-complex-segm mesh_complex_segm_SOURCES = mesh-complex-segm.cc TESTS += test-mesh-complex-segm @@ -159,3 +186,6 @@ MOSTLYCLEANFILES += \ socket-max-curv-skel.off \ teapot-max-curv.off \ three-triangles-skel.off + +# FIXME: Implement `mesh-complex-{max,pinv}-curv-skel'. +# ... diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc index 8d79839..79ac4ea 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 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 @@ -86,16 +87,6 @@ int main(int argc, char* argv[]) mln::bin_2complex_image3df input; mln::io::off::load(input, input_filename); -// // ------------------------------------------------------------ -// // FIXME: TEST. -// mln::complex_image< 2, mln::space_2complex_geometry, mln::algebra::vec<3, float> > -// normal = mesh_normal(input.domain()); -// mln::p_n_faces_fwd_piter<D, G> v_(normal.domain(), 0); -// for_all(v_) -// std::cout << normal(v_) << std::endl; -// std::exit(0); -// // ------------------------------------------------------------ - std::pair<ima_t, ima_t> curv = mln::geom::mesh_curvature(input.domain()); // Compute the max curvature at each vertex. diff --git a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc index a4df815..b7e1f1f 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-skel.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-skel.cc @@ -209,7 +209,7 @@ main(int argc, char* argv[]) `---------*/ /* FIXME: This does not work (yet). - Use workaround mln::io::off::save_bin_salt instead (bad!) */ + Use workaround mln::io::off::save_bin_alt instead (bad!) */ #if 0 mln::io::off::save(skel | mln::pw::value(skel) == mln::pw::cst(true), output_filename); -- 1.5.6.5

1 0

last-svn-commit-183-g45fcb19 Configure milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema.
by Roland Levillain 24 Jun '10

24 Jun '10

* configure.ac: Here. --- ChangeLog | 6 ++++++ configure.ac | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 44386d3..bfce0d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> + + Configure milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema. + + * configure.ac: Here. + 2010-06-24 Roland Levillain <roland(a)lrde.epita.fr> Add `mesh-segm-skel' to the branches to be uploaded (as snapshot). diff --git a/configure.ac b/configure.ac index 20efb20..4d6bfaf 100644 --- a/configure.ac +++ b/configure.ac @@ -505,6 +505,8 @@ AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-max-curv], [chmod +x milena/apps/mesh-segm-skel/test-mesh-max-curv]) AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv], [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv]) +AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema], + [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema]) AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-segm], [chmod +x milena/apps/mesh-segm-skel/test-mesh-segm]) AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-segm], -- 1.5.6.5

1 0

last-svn-commit-182-g56c4e2c New application: mesh-complex-max-curv-extrema.
by Roland Levillain 24 Jun '10

24 Jun '10

* apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc: New. * apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema.in: New. * apps/mesh-segm-skel/Makefile.am (bin_PROGRAMS): Add mesh-complex-max-curv-extrema. (mesh_complex_max_curv_extrema_SOURCES): New. (TESTS): Add test-mesh-complex-max-curv-segm-extrema. (CLEANFILES): Add socket-complex-max-curv-segm-extrema.off, teapot-complex-max-curv-segm-extrema.off and bunny-holefilled-complex-max-curv-segm-extrema.off. --- milena/ChangeLog | 14 +++ milena/apps/mesh-segm-skel/Makefile.am | 13 ++- ...ax-curv.cc => mesh-complex-max-curv-extrema.cc} | 105 +++++++++++++------- .../test-mesh-complex-max-curv-extrema.in | 10 ++ 4 files changed, 102 insertions(+), 40 deletions(-) copy milena/apps/mesh-segm-skel/{mesh-complex-max-curv.cc => mesh-complex-max-curv-extrema.cc} (64%) create mode 100644 milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema.in diff --git a/milena/ChangeLog b/milena/ChangeLog index b2f2330..50edae0 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> + New application: mesh-complex-max-curv-extrema. + + * apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc: New. + * apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema.in: New. + * apps/mesh-segm-skel/Makefile.am (bin_PROGRAMS): Add + mesh-complex-max-curv-extrema. + (mesh_complex_max_curv_extrema_SOURCES): New. + (TESTS): Add test-mesh-complex-max-curv-segm-extrema. + (CLEANFILES): Add socket-complex-max-curv-segm-extrema.off, + teapot-complex-max-curv-segm-extrema.off and + bunny-holefilled-complex-max-curv-segm-extrema.off. + +2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> + Revive, fix and update application mesh-segm. * apps/mesh-segm-skel/mesh-segm.cc: Catch up with the new diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index 501dec0..eaf7bb2 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -112,9 +112,16 @@ mesh_complex_max_curv_SOURCES = mesh-complex-max-curv.cc TESTS += test-mesh-complex-max-curv MOSTLYCLEANFILES += teapot-complex-max-curv.off -# FIXME: Write a program showing the local minima (and maxima) of -# scalar-valued complex-based mesh (to see the curvature extrema). -# ... + +# A program computing the max curvature at each (2-)face of the +# surface of a triangle mesh and displaying its local minima +# (in blue) and maxima (in red). +bin_PROGRAMS += mesh-complex-max-curv-extrema +mesh_complex_max_curv_extrema_SOURCES = mesh-complex-max-curv-extrema.cc +TESTS += test-mesh-complex-max-curv-extrema +CLEANFILES += \ + socket-complex-max-curv-extrema.off \ + teapot-complex-max-curv-extrema.off # Segmentation program working on precomputed meshes with curvatures data. bin_PROGRAMS += mesh-complex-segm diff --git a/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc similarity index 64% copy from milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc copy to milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc index 8d79839..8f68b3d 100644 --- a/milena/apps/mesh-segm-skel/mesh-complex-max-curv.cc +++ b/milena/apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 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 @@ -25,10 +26,11 @@ // reasons why the executable file might be covered by the GNU General // Public License. -/// \file apps/mesh-segm-skel/mesh-complex-max-curv.cc +/// \file apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc /// \brief A program computing the max curvature at each (2-)face of -/// the surface of the (triangle) mesh of a statue, using a -/// complex-based image. +/// the surface of the (triangle) mesh of a statue, using +/// complex-based image, and displaying its local minima (in blue) and +/// maxima (in red). #include <cstdlib> #include <cmath> @@ -42,13 +44,20 @@ #include <mln/data/fill.hh> #include <mln/literal/zero.hh> +#include <mln/labeling/regional_minima.hh> +#include <mln/labeling/regional_maxima.hh> + #include <mln/math/max.hh> #include <mln/math/sqr.hh> #include <mln/accu/stat/min_max.hh> #include <mln/fun/v2v/linear.hh> #include <mln/data/transform.hh> +#include <mln/value/label_16.hh> + #include <mln/literal/white.hh> +#include <mln/literal/grays.hh> +#include <mln/literal/colors.hh> #include <mln/io/off/load.hh> #include <mln/io/off/save.hh> @@ -86,16 +95,6 @@ int main(int argc, char* argv[]) mln::bin_2complex_image3df input; mln::io::off::load(input, input_filename); -// // ------------------------------------------------------------ -// // FIXME: TEST. -// mln::complex_image< 2, mln::space_2complex_geometry, mln::algebra::vec<3, float> > -// normal = mesh_normal(input.domain()); -// mln::p_n_faces_fwd_piter<D, G> v_(normal.domain(), 0); -// for_all(v_) -// std::cout << normal(v_) << std::endl; -// std::exit(0); -// // ------------------------------------------------------------ - std::pair<ima_t, ima_t> curv = mln::geom::mesh_curvature(input.domain()); // Compute the max curvature at each vertex. @@ -133,29 +132,61 @@ int main(int argc, char* argv[]) mln_invariant(n <= 3); } - // Normalize values between 0 and 1. - /* 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. */ - ima_t output(max_curv.domain()); - mln::data::fill(output, mln::literal::zero); - std::pair<float, float> min_max(acc); - // FIXME: Taken from mln/data/stretch.hh (this should be factored). - float min = min_max.first; - float max = min_max.second; - std::cout << min << std::endl; - std::cout << max << std::endl; - // Don't normalize actually if the curvature is constant (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); - output = mln::data::transform(max_curv, f); - } + /*----------------. + | Local extrema. | + `----------------*/ + + /// Adjacent triangles are connected by shared edges. + typedef mln::complex_lower_dim_connected_n_face_neighborhood<D, G> nbh_t; + nbh_t nbh; + + typedef mln::value::label_16 label_t; + typedef mln_ch_value_(ima_t, label_t) label_ima_t; + + /* FIXME: We should use something like `ima_t | p_n_faces(2)' instead + of `ima_t' here. Or better: `input' should only associate data + to 2-faces. */ + label_t nminima; + label_ima_t minima = + mln::labeling::regional_minima(max_curv, nbh, nminima); + std::cout << "nminima = " << nminima << std::endl; + + label_t nmaxima; + label_ima_t maxima = + mln::labeling::regional_maxima(max_curv, nbh, nmaxima); + std::cout << "nmaxima = " << nmaxima << std::endl; + + /*-----------------. + | Colored output. | + `-----------------*/ + + typedef mln::rgb8_2complex_image3df output_t; + output_t output(max_curv.domain()); + + for_all(t) + { + if (minima(t) != mln::literal::zero) + { + // Special (unexpected) case: T is both a minimum and a + // maximum. Paint it in magenta (blue + red). + if (maxima(t) != mln::literal::zero) + { + std::cerr + << "warning: " << t << " is both a minimum and a maximum." + << std::endl; + output(t) = mln::literal::magenta; + } + else + // Paint minimum T in blue. + output(t) = mln::literal::blue; + } + else if (maxima(t) != mln::literal::zero) + // Paint maximum T in red. + output(t) = mln::literal::red; + else + // Default color. + output(t) = mln::literal::medium_gray; + } // Output. mln::io::off::save(output, output_filename); diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema.in b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema.in new file mode 100644 index 0000000..c6fa1e8 --- /dev/null +++ b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema.in @@ -0,0 +1,10 @@ +#! /bin/sh + +set -ex + +mesh_dir=@top_srcdir@/milena/mesh + +time ./mesh-complex-max-curv-extrema $mesh_dir/socket.off socket-complex-max-curv-extrema.off +time ./mesh-complex-max-curv-extrema $mesh_dir/teapot.off teapot-complex-max-curv-extrema.off +# FIXME: Too long. Should be run with (future) target `check-full'. +#time ./mesh-complex-max-curv-extrema $mesh_dir/bunny-holefilled.off bunny-holefilled-complex-max-curv-extrema.off -- 1.5.6.5

1 0

branch next updated: last-svn-commit-178-g71c9c14
by git＠lrde.epita.fr 24 Jun '10

24 Jun '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via 71c9c144f233770f1b9652ba98d6137053e8ab47 (commit) from 0d502d0cf9f3571471768db4f3833b0701ef39a0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 ++++++ lrde-upload.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-181-gb359f8b Revive, fix and update application mesh-segm.
by Roland Levillain 24 Jun '10

24 Jun '10

* apps/mesh-segm-skel/mesh-segm.cc: Catch up with the new interface of graphs. Use mln::edge_image instead of mln::line_graph_image. Turn a test into an invariant. Use mln::morpho::watershed::flooding instead of mln::morpho::meyer_wst. * apps/mesh-segm-skel/Makefile.am (bin_PROGRAMS): Re-enable mesg-segm. (mesh_segm_SOURCES, mesh_segm_CPPFLAGS) (mesh_segm_LDFLAGS, mesh_segm_LDADD): Re-enable. (TESTS): Reenable test-mesh-segm. (MOSTLYCLEANFILES): Reenable socket-segm.off and teapot-segm.off. --- milena/ChangeLog | 18 +++++ milena/apps/mesh-segm-skel/Makefile.am | 28 +++++---- milena/apps/mesh-segm-skel/mesh-segm.cc | 110 +++++++++++++++++++------------ 3 files changed, 103 insertions(+), 53 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2d28537..b2f2330 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,21 @@ +2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> + + Revive, fix and update application mesh-segm. + + * apps/mesh-segm-skel/mesh-segm.cc: Catch up with the new + interface of graphs. + Use mln::edge_image instead of mln::line_graph_image. + Turn a test into an invariant. + Use mln::morpho::watershed::flooding instead of + mln::morpho::meyer_wst. + * apps/mesh-segm-skel/Makefile.am (bin_PROGRAMS): + Re-enable mesg-segm. + (mesh_segm_SOURCES, mesh_segm_CPPFLAGS) + (mesh_segm_LDFLAGS, mesh_segm_LDADD): + Re-enable. + (TESTS): Reenable test-mesh-segm. + (MOSTLYCLEANFILES): Reenable socket-segm.off and teapot-segm.off. + 2010-05-10 Roland Levillain <roland(a)lrde.epita.fr> Fix a bug in the reimplementation of Trimesh algorithms. diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index 9768f25..501dec0 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -49,19 +50,22 @@ MOSTLYCLEANFILES = ## ------------------------------------------------ ## if ENABLE_TRIMESH -# bin_PROGRAMS += mesh-segm mesh-skel -# -# 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) -# -# TESTS += test-mesh-segm -# MOSTLYCLEANFILES += socket-segm.off teapot-segm.off - -# FIXME: mesh_skel is unfinished. Anyway, it should be superseded by -# another program, using no Trimesh code. - +## FIXME: Rename as mesh-trimesh-graph-{max,pinv}-curv-segm? +bin_PROGRAMS += mesh-segm +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) + +TESTS += test-mesh-segm +# FIXME: Likewise. +MOSTLYCLEANFILES += socket-segm.off teapot-segm.off + +# FIXME: mesh_skel is unfinished. Anyway, it has been be superseded +# by `mesh-complex-skel' (see below), using no Trimesh code. + +## FIXME: Rename as mesh-trimesh-graph-{max,pinv}-curv-skel? +# bin_PROGRAMS += mesh-skel # mesh_skel_SOURCES = mesh-skel.cc io.hh # mesh_skel_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_trimesh) # mesh_skel_LDFLAGS = $(LDFLAGS_trimesh) diff --git a/milena/apps/mesh-segm-skel/mesh-segm.cc b/milena/apps/mesh-segm-skel/mesh-segm.cc index bf87249..06ddc93 100644 --- a/milena/apps/mesh-segm-skel/mesh-segm.cc +++ b/milena/apps/mesh-segm-skel/mesh-segm.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 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 @@ -40,14 +41,18 @@ #include <TriMesh.h> #include <mln/core/alias/point3d.hh> -#include <mln/core/alias/point3d.hh> + +#include <mln/fun/i2v/array.hh> +#include <mln/convert/from_to.hh> #include <mln/util/graph.hh> -#include <mln/core/image/line_graph_image.hh> -#include <mln/core/image/line_graph_elt_neighborhood.hh> +#include <mln/util/line_graph.hh> +#include <mln/util/site_pair.hh> +#include <mln/core/image/edge_image.hh> +#include <mln/make/edge_image.hh> #include <mln/morpho/closing/area.hh> -#include <mln/morpho/meyer_wst.hh> +#include <mln/morpho/watershed/flooding.hh> #include "io.hh" @@ -116,12 +121,9 @@ int main(int argc, char* argv[]) std::vector<curv_t> vertex_values (mesh.faces.size(), 0.f); std::vector<curv_t> edge_values; - /* FIXME: We don't have the required site type yet. Simulate with a - dummy type (point3d). */ - mln::util::graph<mln::point3d> g; + mln::util::graph g; // Populate the graph with vertices. - for (unsigned i = 0; i < mesh.faces.size(); ++i) - g.add_vertex (mln::point3d(i, i, i)); + g.add_vertices(mesh.faces.size()); // Populate the graph with edges. mesh.need_across_edge(); @@ -132,25 +134,26 @@ int main(int argc, char* argv[]) if (f_adj != -1) { // Add an edge into the graph. - if (g.add_edge(f, f_adj) != mln_max(mln::util::edge_id::equiv)) - { - // Find the edge (i.e., the two vertices) common to faces - // F and F_ADJ. - /* FIXME: We lack a proper interface from the TriMesh - structure to do this elegantly. */ - std::vector<int> adj_vertices; - adj_vertices.reserve(2); - for (unsigned i = 0; i < 3; ++i) - for (unsigned j = 0; j < 3; ++j) - if (mesh.faces[f][i] == mesh.faces[f_adj][j]) - adj_vertices.push_back(mesh.faces[f][i]); - mln_assertion(adj_vertices.size() == 2); - - // Compute the mean curvature on the edge. - edge_values.push_back((vertex_h_inv[adj_vertices[0]] + - vertex_h_inv[adj_vertices[1]]) - / 2); - } + mln::util::edge_id_t new_edge = g.add_edge(f, f_adj); + mln_invariant(new_edge.is_valid()); + + /* Among the edges adjacent to F and F_ADJ, find the one + they share. In practice, find the two vertices shared + by F and F_ADJ. */ + /* FIXME: We lack a proper interface from the TriMesh + structure to do this elegantly. */ + std::vector<int> adj_vertices; + adj_vertices.reserve(2); + for (unsigned i = 0; i < 3; ++i) + for (unsigned j = 0; j < 3; ++j) + if (mesh.faces[f][i] == mesh.faces[f_adj][j]) + adj_vertices.push_back(mesh.faces[f][i]); + mln_assertion(adj_vertices.size() == 2); + + // Compute the mean curvature on the edge. + edge_values.push_back((vertex_h_inv[adj_vertices[0]] + + vertex_h_inv[adj_vertices[1]]) + / 2); // Check the consistency of the two arrays. mln_assertion(g.edges().size() == edge_values.size()); @@ -161,19 +164,38 @@ int main(int argc, char* argv[]) | Line graph image. | `-------------------*/ - mln::p_line_graph<mln::point3d> plg(g); + // Points associated to the line graph vertices (edges in the graph). + typedef mln::util::site_pair<mln::point3df> P; + typedef mln::fun::i2v::array<P> fsite_t; + fsite_t sites(g.e_nmax()); + for (unsigned i = 0; i < g.e_nmax(); ++i) + /* FIXME: Add a dummy location information for the moment. This + doesn't really matter as we won't use it to produce the output. + However, we may need it later: do not forget to add relevant + locations (obtained from the mesh) in a future version of this + program. */ + sites(i) = P(mln::point3df(0, 0, 0), mln::point3df(1, 1, 1)); + + // FIXME: This intermediate structure costs us a copy. + typedef mln::fun::i2v::array<curv_t> values_t; + values_t values; + mln::convert::from_to(edge_values, values); + + typedef mln::edge_image<P, curv_t, mln::util::graph> ima_t; + ima_t graph_ima(g, sites, values); - typedef mln::line_graph_image<mln::point3d, curv_t> ima_t; - ima_t lg_ima(plg, vertex_values, edge_values); /*-----------------. | Simplification. | `-----------------*/ - typedef mln::line_graph_elt_neighborhood<mln::point3d> nbh_t; + typedef ima_t::nbh_t nbh_t; nbh_t nbh; - ima_t closed_lg_ima = mln::morpho::closing::area(lg_ima, nbh, lambda); + // ``Area'' is not a proper term here, since it is defined to the + // number of edges in the graph. Taking into account the actual + // area of triangles would be a more clever choice. + ima_t closed_graph_ima = mln::morpho::closing::area(graph_ima, nbh, lambda); /*------. | WST. | @@ -181,24 +203,30 @@ int main(int argc, char* argv[]) typedef unsigned wst_val_t; wst_val_t nbasins; - typedef mln::line_graph_image<mln::point3d, wst_val_t> wst_ima_t; - wst_ima_t wshed = mln::morpho::meyer_wst(closed_lg_ima, nbh, nbasins); + typedef mln_ch_value_(ima_t, wst_val_t) wst_ima_t; + wst_ima_t wshed = + mln::morpho::watershed::flooding(closed_graph_ima, nbh, nbasins); std::cout << "nbasins = " << nbasins << std::endl; /*------------------------------------------. | Label graph vertices (i.e., mesh faces). | `------------------------------------------*/ - /* FIXME: We should be using wshed.vertex_values_ if - mln::line_graph_image were fully functional... */ - std::vector<unsigned> vertex_label(wshed.domain().nvertices(), 0); + // FIXME: Use a vertex_image and a e2v neighborhood instead? + + /* FIXME: p_edges does not provide nvertices(), so we cannot write + + std::vector<unsigned> vertex_label(wshed.domain().nvertices(), 0); + + Likewise, p_vertices does not provide n_edges(). */ + std::vector<unsigned> vertex_label(wshed.domain().graph().v_nmax(), 0); mln_piter_(wst_ima_t) pw(wshed.domain()); for_all(pw) if (wshed(pw) != 0) { mln_psite_(wst_ima_t) pp(pw); - vertex_label[pp.first_id().to_equiv()] = wshed(pw); - vertex_label[pp.second_id().to_equiv()] = wshed(pw); + vertex_label[pp.v1().id()] = wshed(pw); + vertex_label[pp.v2().id()] = wshed(pw); } /*---------. -- 1.5.6.5

1 0

last-svn-commit-180-g0d9aa9c Fix a bug in the reimplementation of Trimesh algorithms.
by Roland Levillain 24 Jun '10

24 Jun '10

* apps/mesh-segm-skel/trimesh/misc.hh (mln::geom::mesh_curvature): Always call algebra::ldlt_decomp, even when NDEBUG is defined. Typo. Avoid a warning about an undefined variable when NDEBUG is not defined. --- milena/ChangeLog | 10 ++++++++++ milena/apps/mesh-segm-skel/trimesh/misc.hh | 15 +++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f1c1386..2d28537 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,13 @@ +2010-05-10 Roland Levillain <roland(a)lrde.epita.fr> + + Fix a bug in the reimplementation of Trimesh algorithms. + + * apps/mesh-segm-skel/trimesh/misc.hh (mln::geom::mesh_curvature): + Always call algebra::ldlt_decomp, even when NDEBUG is defined. + Typo. + Avoid a warning about an undefined variable when NDEBUG is not + defined. + 2010-05-04 Roland Levillain <roland(a)lrde.epita.fr> Improve topo::skeleton::breadth_first_thinning. diff --git a/milena/apps/mesh-segm-skel/trimesh/misc.hh b/milena/apps/mesh-segm-skel/trimesh/misc.hh index 5084632..79eea14 100644 --- a/milena/apps/mesh-segm-skel/trimesh/misc.hh +++ b/milena/apps/mesh-segm-skel/trimesh/misc.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2008, 2009, 2010 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 @@ -623,10 +623,13 @@ namespace mln // Least squares solution. vec3f diag; -#ifndef NDEBUG - bool ldlt_decomp_sucess_p = algebra::ldlt_decomp(w, diag); -#endif // ! NDEBUG - mln_assertion(ldlt_decomp_sucess_p); + // Note that algebra::ldlt_decomp has side effects on its + // arguments; this call is not ``just an assertion''. + bool ldlt_decomp_success_p = algebra::ldlt_decomp(w, diag); + mln_assertion(ldlt_decomp_success_p); + // Avoid a warning about an undefined variable when NDEBUG + // is not defined. + (void) ldlt_decomp_success_p; algebra::ldlt_solve(w, diag, m, m); // Push it back out to the vertices -- 1.5.6.5

1 0