* apps/generic-skel/test-mixed.in, * apps/mesh-segm-skel/test-mixed.in: Add a `-wadgmm-2010' suffix to saved images to distinguish them from outputs of other tests. * apps/generic-skel/Makefile.am, * apps/mesh-segm-skel/Makefile.am (MOSTLYCLEANFILES): Adjust. Add files generated by disabled test cases. (generated_checked_tests): New. Contain all generated checked tests. (generated_tests): Set it to contain all test (checked automatically and run manually). (TESTS): Set it to $(generated_checked_tests). Aesthetic changes. --- milena/ChangeLog | 19 +++++++++ milena/apps/generic-skel/Makefile.am | 67 +++++++++++++++++------------- milena/apps/generic-skel/test-mixed.in | 6 +-- milena/apps/mesh-segm-skel/Makefile.am | 42 ++++++++++++------- milena/apps/mesh-segm-skel/test-mixed.in | 8 ++-- 5 files changed, 93 insertions(+), 49 deletions(-)

diff --git a/milena/ChangeLog b/milena/ChangeLog index 7d65502..cf5d053 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,22 @@ +2013-09-02 Roland Levillain roland@lrde.epita.fr + + Do not run test-mixed in Milena apps with the `check' target. + + * apps/generic-skel/test-mixed.in, + * apps/mesh-segm-skel/test-mixed.in: + Add a `-wadgmm-2010' suffix to saved images to distinguish them + from outputs of other tests. + * apps/generic-skel/Makefile.am, + * apps/mesh-segm-skel/Makefile.am + (MOSTLYCLEANFILES): Adjust. + Add files generated by disabled test cases. + (generated_checked_tests): New. + Contain all generated checked tests. + (generated_tests): Set it to contain all test (checked + automatically and run manually). + (TESTS): Set it to $(generated_checked_tests). + Aesthetic changes. + 2013-08-31 Roland Levillain roland@lrde.epita.fr

Aesthetic changes in Milena apps Makefiles. diff --git a/milena/apps/generic-skel/Makefile.am b/milena/apps/generic-skel/Makefile.am index 7724ef1..eb4f8ba 100644 --- a/milena/apps/generic-skel/Makefile.am +++ b/milena/apps/generic-skel/Makefile.am @@ -24,20 +24,11 @@ AM_CPPFLAGS += -I$(top_builddir)/milena APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS)

-# Routines used in the computation of binary skeletons of 3D images. -# FIXME: To be integrated into the library. -noinst_HEADERS = image3d-skel.hh - -# 2D cases. -noinst_PROGRAMS = \ - image2d-skel-unconstrained \ - image2d-skel-with-end-points - -# 3D cases, slow versions. -noinst_PROGRAMS += \ - image3d-skel-unconstrained \ - image3d-skel-with-end-points \ - image3d-skel-with-1d-isthmuses +generated_checked_tests = +generated_tests = $(generated_checked_tests) +TESTS = +EXTRA_DIST = +MOSTLYCLEANFILES =

# Use Make to generate tests instead of `configure', as advised by # Autoconf's manual (see section ``Installation Directory @@ -53,21 +44,36 @@ $(generated_tests): Makefile chmod a-w $@.tmp mv $@.tmp $@

-# Tests for the 2D case. -generated_tests = \ +# Routines used in the computation of binary skeletons of 3D images. +# FIXME: To be integrated into the library. +noinst_HEADERS = image3d-skel.hh + +# 2D cases. +noinst_PROGRAMS = \ + image2d-skel-unconstrained \ + image2d-skel-with-end-points + +generated_checked_tests += \ test-image2d-skel-unconstrained \ test-image2d-skel-with-end-points - -EXTRA_DIST = \ +EXTRA_DIST += \ test-image2d-skel-unconstrained.in \ test-image2d-skel-with-end-points.in test-image2d-skel-unconstrained: $(srcdir)/test-image2d-skel-unconstrained.in test-image2d-skel-with-end-points: $(srcdir)/test-image2d-skel-with-end-points.in +MOSTLYCLEANFILES += \ + tiny-skel-unconstrained.pbm \ + picasso-skel-unconstrained.pbm \ + tiny-skel-with-end-points.pbm \ + picasso-skel-with-end-points.pbm

-TESTS = $(generated_tests) -CLEANFILES = $(generated_tests)

-# Tests for the 3D case. +# 3D cases, slow versions. +noinst_PROGRAMS += \ + image3d-skel-unconstrained \ + image3d-skel-with-end-points \ + image3d-skel-with-1d-isthmuses + # FIXME: Create real test cases with inputs passed as argument. TESTS += \ image3d-skel-unconstrained \ @@ -75,7 +81,7 @@ TESTS += \ image3d-skel-with-1d-isthmuses

# FIXME: Rename all outputs to have their names use their generator as prefix. -MOSTLYCLEANFILES = \ +MOSTLYCLEANFILES += \ image3d-skel-unconstrained-input.raw \ image3d-skel-unconstrained-input.vtk \ image3d-skel-unconstrained-skel.raw \ @@ -87,14 +93,10 @@ MOSTLYCLEANFILES = \ image3d-skel-with-1d-isthmuses-input.raw \ image3d-skel-with-1d-isthmuses-input.vtk \ image3d-skel-with-1d-isthmuses-skel.raw \ - image3d-skel-with-1d-isthmuses-skel.vtk \ - picasso-skel-unconstrained.pbm \ - picasso-skel-with-end-points.pbm \ - tiny-skel-unconstrained.pbm \ - tiny-skel-with-end-points.pbm + image3d-skel-with-1d-isthmuses-skel.vtk

# Mixed tests corresponding to illustrations of the WADGMM 2010/LNCS -# submission. Not part of the `check' target; triggered by the +# paper. Not part of the `check' target; triggered by the # `check-mixed' target. generated_tests += test-mixed EXTRA_DIST += test-mixed.in @@ -102,3 +104,12 @@ test-mixed: $(srcdir)/test-mixed.in .PHONY: check-mixed check-mixed: test-mixed $(noinst_PROGRAMS) ./test-mixed +MOSTLYCLEANFILES += \ + picasso-skel-unconstrained-wadgmm-2010.pbm \ + picasso-skel-with-end-points-wadgmm-2010.pbm + + +# Check tests from generated_checked_tests (which is a subset of +# generated_tests). +TESTS += $(generated_checked_tests) +CLEANFILES = $(generated_tests) diff --git a/milena/apps/generic-skel/test-mixed.in b/milena/apps/generic-skel/test-mixed.in index 4fa67bb..6581e94 100644 --- a/milena/apps/generic-skel/test-mixed.in +++ b/milena/apps/generic-skel/test-mixed.in @@ -1,6 +1,6 @@ #! /bin/sh

-# Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2012, 2013 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -20,6 +20,6 @@ set -ex

img_dir=@top_srcdir@/milena/img

-./image2d-skel-unconstrained $img_dir/picasso.pbm picasso-skel-unconstrained.pbm -./image2d-skel-with-end-points $img_dir/picasso.pbm picasso-skel-with-end-points.pbm +./image2d-skel-unconstrained $img_dir/picasso.pbm picasso-skel-unconstrained-wadgmm-2010.pbm +./image2d-skel-with-end-points $img_dir/picasso.pbm picasso-skel-with-end-points-wadgmm-2010.pbm ./image3d-skel-unconstrained diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index ea0ed50..afde381 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -24,7 +24,8 @@ APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS)

noinst_PROGRAMS = -generated_tests = +generated_checked_tests = +generated_tests = $(generated_checked_tests) EXTRA_DIST = TESTS = MOSTLYCLEANFILES = @@ -91,9 +92,10 @@ MOSTLYCLEANFILES += teapot-complex-max-curv.off # (in blue) and maxima (in red). noinst_PROGRAMS += mesh-complex-max-curv-extrema TESTS += test-mesh-complex-max-curv-extrema -MOSTLYCLEANFILES += \ +MOSTLYCLEANFILES += \ socket-complex-max-curv-extrema.off \ - teapot-complex-max-curv-extrema.off + teapot-complex-max-curv-extrema.off \ + bunny-holefilled-complex-max-curv-extrema.off

# FIXME: Implement (and exercise) mesh-complex-pinv-curv-extrema.

@@ -107,7 +109,8 @@ noinst_PROGRAMS += mesh-complex-segm TESTS += test-mesh-complex-segm MOSTLYCLEANFILES += \ socket-max-curv-segm.off \ - teapot-max-curv-segm.off + teapot-max-curv-segm.off \ + bunny-holefilled-pinv-curv-segm.off

# Program computing the max curvature from a mesh, then segmenting it. # The advantage of this program over `mesh-complex-segm' is that the @@ -119,14 +122,16 @@ noinst_PROGRAMS += mesh-complex-max-curv-segm TESTS += test-mesh-complex-max-curv-segm MOSTLYCLEANFILES += \ socket-complex-max-curv-segm.off \ - teapot-complex-max-curv-segm.off + teapot-complex-max-curv-segm.off \ + bunny-holefilled-complex-max-curv-segm.off

# Likewise, but using pseudo-inverse curvature. noinst_PROGRAMS += mesh-complex-pinv-curv-segm TESTS += test-mesh-complex-pinv-curv-segm MOSTLYCLEANFILES += \ socket-complex-pinv-curv-segm.off \ - teapot-complex-pinv-curv-segm.off + teapot-complex-pinv-curv-segm.off \ + bunny-holefilled-complex-pinv-curv-segm.off

## Collapses. ## ---------- @@ -134,7 +139,7 @@ MOSTLYCLEANFILES += \ # Performing a 2-collapse on a pseudo-manifold. noinst_PROGRAMS += mesh-complex-2-collapse

-generated_tests += test-mesh-complex-2-collapse +generated_checked_tests += test-mesh-complex-2-collapse EXTRA_DIST += test-mesh-complex-2-collapse.in test-mesh-complex-2-collapse: $(srcdir)/test-mesh-complex-2-collapse.in MOSTLYCLEANFILES += pseudo-manifold-2-collapse.vtk @@ -143,7 +148,7 @@ MOSTLYCLEANFILES += pseudo-manifold-2-collapse.vtk # 2-collapse on it. noinst_PROGRAMS += mesh-complex-max-curv-2-collapse

-generated_tests += test-mesh-complex-max-curv-2-collapse +generated_checked_tests += test-mesh-complex-max-curv-2-collapse EXTRA_DIST += test-mesh-complex-max-curv-2-collapse.in test-mesh-complex-max-curv-2-collapse: $(srcdir)/test-mesh-complex-max-curv-2-collapse.in MOSTLYCLEANFILES += \ @@ -154,7 +159,7 @@ MOSTLYCLEANFILES += \ # 1-collapse on it. noinst_PROGRAMS += mesh-complex-max-curv-1-collapse

-generated_tests += test-mesh-complex-max-curv-1-collapse +generated_checked_tests += test-mesh-complex-max-curv-1-collapse EXTRA_DIST += test-mesh-complex-max-curv-1-collapse.in test-mesh-complex-max-curv-1-collapse: $(srcdir)/test-mesh-complex-max-curv-1-collapse.in MOSTLYCLEANFILES += \ @@ -171,7 +176,8 @@ TESTS += test-mesh-complex-skel MOSTLYCLEANFILES += \ socket-max-curv-skel.off \ teapot-max-curv-skel.off \ - three-triangles-skel.off + three-triangles-skel.off \ + bunny-holefilled-pinv-curv-skel.off

noinst_PROGRAMS += mesh-complex-max-curv-skel mesh_complex_max_curv_skel_SOURCES = \ @@ -179,7 +185,8 @@ mesh_complex_max_curv_skel_SOURCES = \ TESTS += test-mesh-complex-max-curv-skel MOSTLYCLEANFILES += \ socket-complex-max-curv-skel.off \ - teapot-complex-max-curv-skel.off + teapot-complex-max-curv-skel.off \ + bunny-holefilled-complex-max-curv-skel.off

noinst_PROGRAMS += mesh-complex-pinv-curv-skel mesh_complex_pinv_curv_skel_SOURCES = \ @@ -187,7 +194,8 @@ mesh_complex_pinv_curv_skel_SOURCES = \ TESTS += test-mesh-complex-pinv-curv-skel MOSTLYCLEANFILES += \ socket-complex-pinv-curv-skel.off \ - teapot-complex-pinv-curv-skel.off + teapot-complex-pinv-curv-skel.off \ + bunny-holefilled-complex-pinv-curv-skel.off

## ------------------------- ## ## Conversion applications. ## @@ -202,7 +210,7 @@ noinst_PROGRAMS += off-to-vtk-bin ## ------------- ##

# Mixed tests corresponding to illustrations of the WADGMM 2010/LNCS -# submission. Not part of the `check' target; triggered by the +# paper. Not part of the `check' target; triggered by the # `check-mixed' target. generated_tests += test-mixed EXTRA_DIST += test-mixed.in @@ -210,7 +218,13 @@ test-mixed: $(srcdir)/test-mixed.in .PHONY: check-mixed check-mixed: test-mixed $(noinst_PROGRAMS) ./test-mixed +MOSTLYCLEANFILES += \ + bunny-holefilled-complex-pinv-curv-skel-wadgmm-2010.off \ + bunny-holefilled-max-curv-2-collapse-wadgmm-2010.vtk \ + bunny-holefilled-max-curv-1-collapse-wadgmm-2010.vtk

-TESTS += $(generated_tests) +# Check tests from generated_checked_tests (which is a subset of +# generated_tests). +TESTS += $(generated_checked_tests) CLEANFILES = $(generated_tests) diff --git a/milena/apps/mesh-segm-skel/test-mixed.in b/milena/apps/mesh-segm-skel/test-mixed.in index 1bc2f0e..b10e15a 100644 --- a/milena/apps/mesh-segm-skel/test-mixed.in +++ b/milena/apps/mesh-segm-skel/test-mixed.in @@ -1,6 +1,6 @@ #! /bin/sh

-# Copyright (C) 2012 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2012, 2013 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -20,6 +20,6 @@ set -ex

mesh_dir=@top_srcdir@/milena/mesh

-./mesh-complex-pinv-curv-skel $mesh_dir/bunny-holefilled.off 50 bunny-holefilled-complex-pinv-curv-skel.off -./mesh-complex-max-curv-2-collapse $mesh_dir/bunny-holefilled.vtk 50 bunny-holefilled-max-curv-2-collapse.vtk -./mesh-complex-max-curv-1-collapse $mesh_dir/bunny-holefilled.vtk 50 bunny-holefilled-max-curv-1-collapse.vtk +./mesh-complex-pinv-curv-skel $mesh_dir/bunny-holefilled.off 50 bunny-holefilled-complex-pinv-curv-skel-wadgmm-2010.off +./mesh-complex-max-curv-2-collapse $mesh_dir/bunny-holefilled.vtk 50 bunny-holefilled-max-curv-2-collapse-wadgmm-2010.vtk +./mesh-complex-max-curv-1-collapse $mesh_dir/bunny-holefilled.vtk 50 bunny-holefilled-max-curv-1-collapse-wadgmm-2010.vtk