- Olena-patches

olena: olena-2.0-783-gabdd5eb Do not run test-mixed in Milena apps with the `check' target.
by Roland Levillain 02 Sep '13

02 Sep '13

* 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(a)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(a)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 -- 1.7.10.4

1 0

olena: branch next updated: olena-2.0-782-g010f8aa
by git＠lrde.epita.fr 31 Aug '13

31 Aug '13

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 010f8aa5fa3a09d58bb4a872f199384e18b51974 (commit) via 6b18b5041243d56e03da45a779f1a50446785276 (commit) via 71717ea0aa2e527ef9cf6b6667b026d101e54fc7 (commit) via e6fe7d359db0a18c8f37dd29f06bfa1d9fead977 (commit) via 450410e982d7c9abbd5d0b4c3d834284a504d138 (commit) via 4998bf92ef1bd4a382768a9b9abcb925fc1bfe7b (commit) via 0774f862907bf1f3b751cbd8e8124daa6ab58cea (commit) via 346ed701130cb8bf46386ce95ac35b15d65fa3d7 (commit) via a40ac76c172a4cedfaa305baa9776408a060d481 (commit) via f8090ed81ed6a495faff8ce918139ce05d8c38a4 (commit) via 32fe23ae1923b358cac3a9e1ab1b82ce7bc49f8c (commit) via 917fa3dc9d19267535b783c4e5fd834542ce175a (commit) via 7c470abe909031667f8fb466958aa3f189ef3086 (commit) via 2cbfa7dcb92861252795028c0c8fc366757dbf72 (commit) via e20e410934110ac86fe6d2590657a25a29c0034c (commit) via c01c17406ae476e0e89407dc6db013110a4121da (commit) via 314a240db85747e9822ed9494a497d312a0bdbde (commit) via bdade6e5643b8c974e1b6c7e99db070600c6259a (commit) via 1cbfcbe8bcaa34925f7a0d24ffaab0ddaedf293d (commit) via d05185f51003f72f0d3d530b97adca245fadc998 (commit) via 8caa6a0fbb8fbcf1acfc55712abf1b0ddfa9a7e3 (commit) via 5028921e3633fa750f78434344b4a7c76d443582 (commit) via 5d8a12598439482ccd53c596bb7e0690bf960ab8 (commit) via e9bf0a68327ee187aad6616038d5661e8bf440a6 (commit) via b77aca0a9a5c5c514ce258c853ee55ad6678d0a9 (commit) via fe72eddb49c039d57bd3c778937e97c867c2530e (commit) via 91582ecbeb5ce3a6885aada08a09f445dea9651d (commit) via fea1bdb0b38b2f265838f332137c9e4f22711801 (commit) via d06e84f05872eb7ba686f43384a68fb014c4af8c (commit) via 66dc444e5b61893ef6ed78dcad9c2178228b4c7d (commit) via 4b84c24f6bf2641a82d6eff062f55eab0cd06443 (commit) via 5d26c00af6003c608a1c04be40851ca34ac38a63 (commit) via d3965a63e8470b121892146ced02946aa1a3c068 (commit) via dadfbf8950ef83c64755eaa15a9b469cb2d70ae3 (commit) via b8c5c642918812a1b8b9b2c09d65fb4bef2d41cb (commit) via a97476569ceb8f6ed597a87fb27bafd412970efa (commit) via 7044058ab5a375b2e582ebad82621228e8030d48 (commit) via c7b2885c2aaefecda885eabd0a3e8491aa373925 (commit) via 8c2373f81c5660b119c96fecbddae0abbbc5d29d (commit) via b815f9e2faf5ce7fe0deda0f4a7b9d07713f9b90 (commit) via c54ade0529937a4d66187dea311a67dd49527597 (commit) via e3d31288ebed111747116932b6056550f7229b72 (commit) via 989f64c914db17c4381adbff449f799b46e981f7 (commit) via caafe2757aa4412f8e61bc6528feb88d35129141 (commit) via fd81df408806ec032d613c91f6aced2eab5e239d (commit) via 2a45daf1baa56780ee68c4d42c4e575e8ad693c2 (commit) via adbe79b77bfb5daef430d2a003891458ab27f5f4 (commit) via 92370252d966b05de95b4f4e1ba8cdefbd589513 (commit) via d31555ad4cc07979b43873987b3cf7ec10d4c1e0 (commit) via a746768a222aa1b3ec885099818b6d6efc824dea (commit) via 1692704a4e5905ac03d7c96f21d2ba10c7bd704c (commit) via 8c6f47af691c0616259a54ca1710c98c6826731c (commit) via 176f3fd8be2f5eb18d832c4cf19d8f3efa8abaa7 (commit) via 5f10622a1e4e2ebd6c611be95802cad42ab6f7aa (commit) via 8a48d8079b603e627237f7ca8524528e9ccdd714 (commit) via 8f6e58708365263bf6198bc567994fea7879a6e7 (commit) via dcb65af6925d22936a721ddd17ce91c834f1dcbb (commit) via 26d28a507403bced81ccbbfb8cfc1d008f33f648 (commit) via b40c467c3953682c550a820510252473cb9bbade (commit) via 0feab07fa0cc4de58a9aa36aa63031416dea49f5 (commit) via e3b70ab14ce95e19449395a38f037c902e3cf9d7 (commit) via 0d75e39af1931bb05c1621a0b51861a73f8c97eb (commit) via cd1d4e984a9b56e21f6b1f67a34487254ba0b40c (commit) via 064910dbb2f8d70b87c1d78836386b32928dff68 (commit) via d56e10be0cef21a014909aedc73f4409ee3c3402 (commit) via ac04251919bfb607b5da55d91b505c387c945e6c (commit) via c8994ac388a94521fb1cd0eb95baf73c6a79bdbf (commit) via ae5b2f2067ba6a8a389acd3bd6c063315905af44 (commit) via aa7f3d1c34dd90c3c1c968fbad9517156a11940a (commit) via 887a3fe17b396633af4611076e69bb5c76c3413f (commit) via 2ab706df5d8edb964d6fcae88148f6f105027aed (commit) via 050eff13f8b5c8bbd8406b6dab922d1b8574c561 (commit) via b97c12aee11a2e516237b02412914e5f4bfc2e17 (commit) via 6cb33ef7ca56427fa323fe11ff40bda0be9b163f (commit) via 2bc617f494e7c5bb8e2a93b6778fca1a085456d0 (commit) via 5f4400b17bbaf4ee0dbfc0ed4e80bf2a376b76d0 (commit) via e52aac02b156fd06b7de45959c8bf55024d98959 (commit) via 8f71dbf3fb8f07798274336ef38ed4ec452e8cfc (commit) via ed99a96992fcb4ebc2f2a416bae04c97b074a8b7 (commit) via e3799361c833404830f88ac40091998bab1340d3 (commit) via de6c91cef4c10e3dbb66f63092d3c1a983d39cc2 (commit) via 8ea78356187b68e314e2e6bf915c2c1e652edcd5 (commit) via d06dc7960770317f00270ea1db8066fbbab14358 (commit) via e56dcf932acc99554acf6a57325c9b5f4de331dd (commit) via d95b8eb4bca61df6982e7b738ee3b5f689334c2e (commit) via c607b2b473ea041164765d74761665f7cd16679f (commit) via 8da07c1ba16fd7e2f3efc0da7c24cf6892cabea4 (commit) via f6c0e86048ab35abf56eec1d8dc16332fc3bdf03 (commit) via b4795e30ef8c1cdfe67c8d7ec3591aec9da5eb16 (commit) via 0abd35d7c909bef44614fea9483b0a7c8e65a76a (commit) via 178d9766cf611cba88150f776cd0487af9af8d06 (commit) via 9b0c072e6285ab9b3a7ad98db3c7bd311d7339dc (commit) via 468f30937f07f5516e36220248bb50f549f3013a (commit) via 26697559f82f078325ddaa979176ffec509726ae (commit) via 095d4d83c7ae469708f1da8e0df191b96c5195e4 (commit) via 306940e5bcac4ab11a2ecf04b35e171b23212367 (commit) via aec0b06e61c989df7ba3a3c89fece4c10d4c035a (commit) via e0308f46eeb95a3d133b81ae21ecfc3e85561e73 (commit) via df7ee00617e417f3e3782f296317180aab397c68 (commit) via 359105b5373ba839805b1198597e3049fae509f5 (commit) via 3f55de7920b3b6ca92e4d6b7f80c7a69f48060f5 (commit) via 94167940366c76ce3d8fa8fc71bcef6366336f5c (commit) via 9a84a00e71be26f15a4cb026563b83b058f191fc (commit) via faeffbfac0157771d8afbb181ddf1aa6ce62bd64 (commit) via 848be92889506f3522e0063d19b942e9e26e1429 (commit) via 65e27d4f181270bdf32ccd70623b02f8c6515d7b (commit) via 75d014789ef295f49c144e41b3388d1965f3b003 (commit) via 5f6cc931ac246ce107794adb0812dfcadab90c65 (commit) via 5da629f7d9ab5cea4acf78daae3f4ec46f710111 (commit) via 641fb1845b4afaf3d7be707b9eab9757ebd9848e (commit) via 10886bb0bd1026a72b13212602008d34a1e6a26c (commit) via 5c51ffe52ba4551362ab8a77be720b5afc856cc6 (commit) via 1af4682ac3441c1e45c1e0c192b0991e2ba8e563 (commit) via 202bac27de2b47341f76e44bef7cb1ddf671a79a (commit) via e9c085e05f15fdd3e30287c26db7cf3d659baff7 (commit) via 959b10e6917b071d17bfa765e715cefa47a94c0e (commit) via 958cb5799166a785a8db956a20f44547c0c8e022 (commit) via 4b83d9c6b4e22789c1069e5f147ac9f674995a8c (commit) via 29bf3b02e00c4d7e65586f935fda3849f2067d27 (commit) via 7c649ab73e632b9399b2824a75529f95b530f168 (commit) via 9faa94823c7a7bae018f944ab17e79f5d0774ac3 (commit) via 279c33718e3dcaba50a6efc29c45ff63a0713cda (commit) via 81f0006071a6fda8295c75c48dd7df0c3f5d8c19 (commit) via afa46ab741c9b611d0817ab18e04c8c658c83ddf (commit) via 955984a153a407f807549bc2b147e9a149861c05 (commit) via a412a54529f79027659b8c3fd723556b77cfd2ed (commit) via 4ebb5d640799b7ce299d4a573a42d0eb48b1c9df (commit) from 7e43020f1b94958d6287965abf4cb4cab901895b (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: .dir-locals.el | 5 + ChangeLog | 40 + configure.ac | 24 +- milena/ChangeLog | 1266 + milena/Makefile.am | 1 + milena/apps/Makefile.am | 5 +- milena/apps/generic-skel/Makefile.am | 104 + .../generic-skel/image2d-skel-unconstrained.cc | 92 + .../generic-skel/image2d-skel-with-end-points.cc | 94 + .../generic-skel/image3d-skel-unconstrained.cc | 109 + .../generic-skel/image3d-skel-with-1d-isthmuses.cc | 114 + .../generic-skel/image3d-skel-with-end-points.cc | 114 + milena/apps/generic-skel/image3d-skel.hh | 399 + .../test-image2d-skel-unconstrained.in} | 14 +- .../test-image2d-skel-with-end-points.in} | 14 +- .../generic-skel/test-mixed.in} | 17 +- milena/apps/graph-morpho/morpho.hh | 8 +- milena/apps/mesh-segm-skel/Makefile.am | 167 +- .../apps/mesh-segm-skel/mesh-complex-2-collapse.cc | 153 + .../mesh-complex-max-curv-1-collapse.cc | 386 + .../mesh-complex-max-curv-2-collapse.cc | 328 + ...ax-curv.cc => mesh-complex-max-curv-extrema.cc} | 104 +- .../mesh-segm-skel/mesh-complex-max-curv-segm.cc | 54 +- .../mesh-segm-skel/mesh-complex-max-curv-skel.cc | 328 + .../apps/mesh-segm-skel/mesh-complex-max-curv.cc | 12 +- ...curv-segm.cc => mesh-complex-pinv-curv-segm.cc} | 55 +- .../mesh-segm-skel/mesh-complex-pinv-curv-skel.cc | 344 + milena/apps/mesh-segm-skel/mesh-complex-segm.cc | 26 +- milena/apps/mesh-segm-skel/mesh-complex-skel.cc | 126 +- milena/apps/mesh-segm-skel/misc.hh | 15 +- .../mesh-segm-skel/off-to-vtk-bin.cc} | 47 +- milena/apps/mesh-segm-skel/save_bin_alt.hh | 310 +- .../test-mesh-complex-2-collapse.in} | 13 +- .../test-mesh-complex-max-curv-1-collapse.in} | 16 +- .../test-mesh-complex-max-curv-2-collapse.in} | 16 +- .../test-mesh-complex-max-curv-extrema.in} | 16 +- .../test-mesh-complex-max-curv-skel.in} | 16 +- .../test-mesh-complex-pinv-curv-segm.in} | 17 +- .../test-mesh-complex-pinv-curv-skel.in} | 16 +- .../mesh-segm-skel/test-mixed.in} | 15 +- milena/apps/morphers/recorder-bft.cc | 9 +- milena/doc/examples/devel/facade.cc.raw | 4 +- milena/doc/examples/devel/impl.cc.raw | 7 +- milena/doc/figures/extend-1.ppm | Bin 12406 -> 12407 bytes milena/doc/figures/extend-2.ppm | Bin 16546 -> 16547 bytes milena/doc/figures/extend-3.ppm | Bin 16546 -> 16547 bytes milena/doc/figures/extend-4.ppm | 2 +- milena/doc/figures/extend-5.ppm | Bin 12406 -> 12407 bytes milena/doc/figures/fill-1.ppm | Bin 12406 -> 12407 bytes milena/doc/figures/fill-2.ppm | Bin 12406 -> 12407 bytes milena/doc/figures/fill-imageif-cfun-1.ppm | Bin 206 -> 207 bytes milena/doc/figures/fill-subdomain-1.pbm | 2 +- milena/doc/figures/fill-subdomain-2.ppm | Bin 206 -> 207 bytes milena/doc/figures/fill-subdomain-3.ppm | Bin 206 -> 207 bytes milena/doc/figures/fill-subdomain-4.ppm | Bin 206 -> 207 bytes milena/doc/figures/ima2d-rot-1.ppm | Bin 235320 -> 235321 bytes milena/doc/figures/ima2d-rot-2.ppm | Bin 235320 -> 235321 bytes milena/doc/figures/ima_save.pbm | 2 +- milena/doc/figures/labeling-compute-1.pbm | 2 +- milena/doc/figures/labeling-compute-2.ppm | Bin 206 -> 207 bytes milena/doc/figures/logical-not-1.pbm | 2 +- milena/doc/figures/logical-not-2.pbm | 2 +- milena/doc/figures/logical-not-3.pbm | 2 +- milena/doc/figures/tuto2_first_image-1.pbm | 2 +- milena/doc/figures/tuto3_colorize-1.pgm | Bin 141 -> 142 bytes milena/doc/figures/tuto3_colorize-2.ppm | Bin 191 -> 192 bytes milena/doc/figures/tuto3_rw_image-1.ppm | Bin 4918 -> 4919 bytes milena/doc/figures/tuto3_rw_image-2.ppm | 2 +- milena/doc/figures/tuto3_rw_image-3.ppm | Bin 12406 -> 12407 bytes .../figures/tuto4_genericity_and_algorithms-1.ppm | Bin 12406 -> 12407 bytes .../figures/tuto4_genericity_and_algorithms-2.ppm | Bin 12406 -> 12407 bytes .../figures/tuto4_genericity_and_algorithms-3.pbm | 2 +- .../figures/tuto4_genericity_and_algorithms-4.ppm | Bin 12406 -> 12407 bytes .../figures/tuto4_genericity_and_algorithms-5.ppm | Bin 12406 -> 12407 bytes .../figures/tuto4_genericity_and_algorithms-6.ppm | Bin 12406 -> 12407 bytes milena/headers.mk | 18 +- milena/img/README | 6 + milena/img/bunny.pgm | Bin 0 -> 27000043 bytes milena/mesh/Makefile.am | 26 +- milena/mesh/bunny-holefilled.vtk |458714 ++++++++++++++++++++ milena/mesh/pseudo-manifold.vtk | 188 + milena/mesh/teapot.vtk |25008 ++ milena/mesh/tetrahedron.vtk | 48 + milena/mln/core/alias/complex_image.hh | 18 +- .../mln/core/image/dmorph/mutable_extension_ima.hh | 272 + .../antilogy.hh => core/routine/mutable_extend.hh} | 61 +- milena/mln/fun/p2b/antilogy.hh | 1 - milena/mln/fun/p2b/tautology.hh | 1 - milena/mln/geom/complex_geometry.hh | 16 +- milena/mln/io/fld/write_header.hh | 9 +- milena/mln/io/off/load.hh | 27 +- milena/mln/io/off/save.hh | 6 +- milena/mln/io/pnm/save_header.hh | 10 +- .../core/alias/dpoint2d.cc => mln/io/vtk/all.hh} | 32 +- milena/mln/io/vtk/load.hh | 615 + milena/mln/io/vtk/save.hh | 649 + milena/mln/make/attachment.hh | 53 +- milena/mln/make/cell.hh | 11 +- milena/mln/make/detachment.hh | 56 +- milena/mln/topo/connectivity_number_2d.hh | 130 + milena/mln/topo/connectivity_number_3d.hh | 309 + milena/mln/topo/detach.hh | 83 - milena/mln/topo/detach_cell.hh | 154 + milena/mln/topo/detach_pair.hh | 191 + milena/mln/topo/detach_point.hh | 114 + milena/mln/topo/is_facet.hh | 52 +- milena/mln/topo/is_n_face.hh | 16 +- milena/mln/topo/is_not_1d_isthmus.hh | 208 + milena/mln/topo/is_not_end_point.hh | 121 + milena/mln/topo/is_simple_2d.hh | 135 +- milena/mln/topo/is_simple_cell.hh | 114 +- milena/mln/topo/is_simple_pair.hh | 225 + milena/mln/topo/is_simple_point2d.hh | 142 + milena/mln/topo/is_simple_point3d.hh | 191 + milena/mln/topo/{is_n_face.hh => no_constraint.hh} | 46 +- milena/mln/topo/skeleton/breadth_first_thinning.hh | 171 +- .../mln/topo/skeleton/priority_driven_thinning.hh | 215 + milena/mln/version.hh.in | 19 +- milena/new-header | 4 +- milena/tests/core/alias/Makefile.am | 3 +- milena/tests/core/alias/dpoint2d.cc | 4 +- .../tests/core/alias/{dpoint2d.cc => neighb2d.cc} | 33 +- milena/tests/core/image/complex_image.hh | 20 +- milena/tests/io/Makefile.am | 5 +- milena/tests/io/dump/Makefile.am | 4 +- milena/tests/io/dump/dump.cc | 32 + milena/tests/io/{dump => vtk}/Makefile.am | 18 +- .../{core/alias/dpoint2d.cc => io/vtk/load_bin.cc} | 47 +- .../alias/dpoint2d.cc => io/vtk/load_save_bin.cc} | 33 +- milena/tests/io/vtk/save.cc | 106 + milena/tests/make/Makefile.am | 4 +- milena/tests/make/attachment.cc | 77 + milena/tests/make/detachment.cc | 98 + milena/tests/topo/Makefile.am | 13 +- milena/tests/topo/connectivity_numbers_2d.cc | 87 + milena/tests/topo/detach_pair.cc | 73 + milena/tests/topo/is_facet.cc | 80 + milena/tests/topo/is_simple_pair.cc | 73 + milena/tests/topo/skeleton/Makefile.am | 12 +- .../tests/topo/skeleton/breadth_first_thinning.cc | 74 + .../skeleton/breadth_first_thinning_constrained.cc | 78 + .../topo/skeleton/priority_driven_thinning.cc | 92 + .../priority_driven_thinning_constrained.cc | 96 + milena/tests/transform/Makefile.am | 3 +- milena/tests/unit_test/unit-tests.mk | 18 +- milena/tests/value/Makefile.am | 7 +- .../{core/alias/dpoint2d.cc => value/int_u32.cc} | 28 +- milena/tools/Makefile.am | 66 +- milena/tools/compute_local_configurations.cc | 109 + .../connectivity_numbers_3d.cc} | 39 +- milena/tools/connectivity_numbers_3d.hh | 407 + .../connectivity_numbers_3d_tbb.cc} | 40 +- milena/tools/connectivity_numbers_3d_tbb.hh | 163 + milena/tools/gen_cxx_lut | 103 + .../dpoint2d.cc => tools/simple_point3d_lut.cc} | 41 +- milena/tools/simple_point3d_lut.hh | 190 + .../simple_point3d_lut_26_6.cc} | 29 +- .../simple_point3d_lut_tbb.cc} | 42 +- milena/tools/simple_point3d_lut_tbb.hh | 185 + milena/tools/test_simple_point3d_lut_26_6.cc | 136 + milena/tools/tools.mk | 7 +- milena/trash/display_color_pretty.hh | 15 +- milena/trash/display_remove.hh | 13 +- milena/trash/display_save.hh | 14 +- milena/trash/display_save_and_show.hh | 10 +- milena/trash/display_show.hh | 10 +- milena/trash/neighb_get.hh | 6 +- scribo/ChangeLog | 14 + scribo/demo/viewer/Makefile.am | 3 +- scribo/src/Makefile.am | 1 - scribo/src/binarization/Makefile.am | 5 - swilena/ChangeLog | 6 + swilena/python/Makefile.am | 2 +- 173 files changed, 495436 insertions(+), 963 deletions(-) create mode 100644 .dir-locals.el create mode 100644 milena/apps/generic-skel/Makefile.am create mode 100644 milena/apps/generic-skel/image2d-skel-unconstrained.cc create mode 100644 milena/apps/generic-skel/image2d-skel-with-end-points.cc create mode 100644 milena/apps/generic-skel/image3d-skel-unconstrained.cc create mode 100644 milena/apps/generic-skel/image3d-skel-with-1d-isthmuses.cc create mode 100644 milena/apps/generic-skel/image3d-skel-with-end-points.cc create mode 100644 milena/apps/generic-skel/image3d-skel.hh copy milena/{tests/topo/skeleton/Makefile.am => apps/generic-skel/test-image2d-skel-unconstrained.in} (68%) copy milena/{tests/topo/skeleton/Makefile.am => apps/generic-skel/test-image2d-skel-with-end-points.in} (67%) copy milena/{tests/topo/Makefile.am => apps/generic-skel/test-mixed.in} (65%) create mode 100644 milena/apps/mesh-segm-skel/mesh-complex-2-collapse.cc create mode 100644 milena/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc create mode 100644 milena/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc copy milena/apps/mesh-segm-skel/{mesh-complex-max-curv.cc => mesh-complex-max-curv-extrema.cc} (63%) create mode 100644 milena/apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc copy milena/apps/mesh-segm-skel/{mesh-complex-max-curv-segm.cc => mesh-complex-pinv-curv-segm.cc} (74%) create mode 100644 milena/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc copy milena/{tests/core/alias/dpoint2d.cc => apps/mesh-segm-skel/off-to-vtk-bin.cc} (58%) copy milena/{tests/topo/skeleton/Makefile.am => apps/mesh-segm-skel/test-mesh-complex-2-collapse.in} (73%) copy milena/{tests/topo/Makefile.am => apps/mesh-segm-skel/test-mesh-complex-max-curv-1-collapse.in} (64%) copy milena/{tests/topo/Makefile.am => apps/mesh-segm-skel/test-mesh-complex-max-curv-2-collapse.in} (64%) copy milena/{tests/topo/skeleton/Makefile.am => apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema.in} (54%) copy milena/{tests/topo/skeleton/Makefile.am => apps/mesh-segm-skel/test-mesh-complex-max-curv-skel.in} (55%) copy milena/{tests/topo/Makefile.am => apps/mesh-segm-skel/test-mesh-complex-pinv-curv-segm.in} (60%) copy milena/{tests/topo/skeleton/Makefile.am => apps/mesh-segm-skel/test-mesh-complex-pinv-curv-skel.in} (55%) copy milena/{tests/topo/skeleton/Makefile.am => apps/mesh-segm-skel/test-mixed.in} (57%) create mode 100755 milena/img/bunny.pgm create mode 100644 milena/mesh/bunny-holefilled.vtk create mode 100644 milena/mesh/pseudo-manifold.vtk create mode 100644 milena/mesh/teapot.vtk create mode 100644 milena/mesh/tetrahedron.vtk create mode 100644 milena/mln/core/image/dmorph/mutable_extension_ima.hh copy milena/mln/{fun/p2b/antilogy.hh => core/routine/mutable_extend.hh} (58%) copy milena/{tests/core/alias/dpoint2d.cc => mln/io/vtk/all.hh} (73%) create mode 100644 milena/mln/io/vtk/load.hh create mode 100644 milena/mln/io/vtk/save.hh create mode 100644 milena/mln/topo/connectivity_number_2d.hh create mode 100644 milena/mln/topo/connectivity_number_3d.hh delete mode 100644 milena/mln/topo/detach.hh create mode 100644 milena/mln/topo/detach_cell.hh create mode 100644 milena/mln/topo/detach_pair.hh create mode 100644 milena/mln/topo/detach_point.hh create mode 100644 milena/mln/topo/is_not_1d_isthmus.hh create mode 100644 milena/mln/topo/is_not_end_point.hh create mode 100644 milena/mln/topo/is_simple_pair.hh create mode 100644 milena/mln/topo/is_simple_point2d.hh create mode 100644 milena/mln/topo/is_simple_point3d.hh copy milena/mln/topo/{is_n_face.hh => no_constraint.hh} (64%) create mode 100644 milena/mln/topo/skeleton/priority_driven_thinning.hh copy milena/tests/core/alias/{dpoint2d.cc => neighb2d.cc} (68%) copy milena/tests/io/{dump => vtk}/Makefile.am (70%) copy milena/tests/{core/alias/dpoint2d.cc => io/vtk/load_bin.cc} (61%) copy milena/tests/{core/alias/dpoint2d.cc => io/vtk/load_save_bin.cc} (72%) create mode 100644 milena/tests/io/vtk/save.cc create mode 100644 milena/tests/make/attachment.cc create mode 100644 milena/tests/make/detachment.cc create mode 100644 milena/tests/topo/connectivity_numbers_2d.cc create mode 100644 milena/tests/topo/detach_pair.cc create mode 100644 milena/tests/topo/is_facet.cc create mode 100644 milena/tests/topo/is_simple_pair.cc create mode 100644 milena/tests/topo/skeleton/breadth_first_thinning.cc create mode 100644 milena/tests/topo/skeleton/breadth_first_thinning_constrained.cc create mode 100644 milena/tests/topo/skeleton/priority_driven_thinning.cc create mode 100644 milena/tests/topo/skeleton/priority_driven_thinning_constrained.cc copy milena/tests/{core/alias/dpoint2d.cc => value/int_u32.cc} (74%) create mode 100644 milena/tools/compute_local_configurations.cc copy milena/{tests/core/alias/dpoint2d.cc => tools/connectivity_numbers_3d.cc} (63%) create mode 100644 milena/tools/connectivity_numbers_3d.hh copy milena/{tests/core/alias/dpoint2d.cc => tools/connectivity_numbers_3d_tbb.cc} (61%) create mode 100644 milena/tools/connectivity_numbers_3d_tbb.hh create mode 100755 milena/tools/gen_cxx_lut copy milena/{tests/core/alias/dpoint2d.cc => tools/simple_point3d_lut.cc} (60%) create mode 100644 milena/tools/simple_point3d_lut.hh copy milena/{tests/core/alias/dpoint2d.cc => tools/simple_point3d_lut_26_6.cc} (73%) copy milena/{tests/core/alias/dpoint2d.cc => tools/simple_point3d_lut_tbb.cc} (58%) create mode 100644 milena/tools/simple_point3d_lut_tbb.hh create mode 100644 milena/tools/test_simple_point3d_lut_26_6.cc hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch mesh-segm-skel updated: olena-2.0-782-g010f8aa
by git＠lrde.epita.fr 31 Aug '13

31 Aug '13

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 mesh-segm-skel has been updated via 010f8aa5fa3a09d58bb4a872f199384e18b51974 (commit) via 6b18b5041243d56e03da45a779f1a50446785276 (commit) via 71717ea0aa2e527ef9cf6b6667b026d101e54fc7 (commit) from e6fe7d359db0a18c8f37dd29f06bfa1d9fead977 (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 ----------------------------------------------------------------- 010f8aa Aesthetic changes in Milena apps Makefiles. 6b18b50 Factor the generation of tests in Milena's apps/mesh-segm-skel. 71717ea Distribute sources of generated tests in Milena apps. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 25 +++++++++ milena/apps/generic-skel/Makefile.am | 23 ++++---- milena/apps/mesh-segm-skel/Makefile.am | 95 ++++++++++++-------------------- 3 files changed, 72 insertions(+), 71 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-782-g010f8aa Aesthetic changes in Milena apps Makefiles.
by Roland Levillain 31 Aug '13

31 Aug '13

* apps/generic-skel/Makefile.am, * apps/mesh-segm-skel/Makefile.am: Here. --- milena/ChangeLog | 8 ++++++++ milena/apps/generic-skel/Makefile.am | 22 ++++++++++------------ milena/apps/mesh-segm-skel/Makefile.am | 2 +- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 78bf909..7d65502 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2013-08-31 Roland Levillain <roland(a)lrde.epita.fr> + Aesthetic changes in Milena apps Makefiles. + + * apps/generic-skel/Makefile.am, + * apps/mesh-segm-skel/Makefile.am: + Here. + +2013-08-31 Roland Levillain <roland(a)lrde.epita.fr> + Factor the generation of tests in Milena's apps/mesh-segm-skel. * apps/mesh-segm-skel/Makefile.am: Here. diff --git a/milena/apps/generic-skel/Makefile.am b/milena/apps/generic-skel/Makefile.am index 06f6cf8..7724ef1 100644 --- a/milena/apps/generic-skel/Makefile.am +++ b/milena/apps/generic-skel/Makefile.am @@ -39,20 +39,11 @@ noinst_PROGRAMS += \ image3d-skel-with-end-points \ image3d-skel-with-1d-isthmuses -EXTRA_DIST = \ - test-image2d-skel-unconstrained.in \ - test-image2d-skel-with-end-points.in - -# Use Make to generate Doxyfile instead of `configure', as advised by +# Use Make to generate tests instead of `configure', as advised by # Autoconf's manual (see section ``Installation Directory # Variables''). edit = sed -e 's|@top_srcdir[@]|$(top_srcdir)|g' -# Tests for the 2D case. -generated_tests = \ - test-image2d-skel-unconstrained \ - test-image2d-skel-with-end-points - $(generated_tests): Makefile rm -f $@ $@.tmp srcdir=''; \ @@ -62,12 +53,19 @@ $(generated_tests): Makefile chmod a-w $@.tmp mv $@.tmp $@ +# Tests for the 2D case. +generated_tests = \ + test-image2d-skel-unconstrained \ + test-image2d-skel-with-end-points + +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 -CLEANFILES = $(generated_tests) - TESTS = $(generated_tests) +CLEANFILES = $(generated_tests) # Tests for the 3D case. # FIXME: Create real test cases with inputs passed as argument. diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index 57bf632..ea0ed50 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -24,9 +24,9 @@ APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) noinst_PROGRAMS = -TESTS = generated_tests = EXTRA_DIST = +TESTS = MOSTLYCLEANFILES = # Use Make to generate tests instead of `configure', as advised by -- 1.7.10.4

1 0

olena: olena-2.0-781-g6b18b50 Factor the generation of tests in Milena's apps/mesh-segm-skel.
by Roland Levillain 31 Aug '13

31 Aug '13

* apps/mesh-segm-skel/Makefile.am: Here. --- milena/ChangeLog | 6 +++ milena/apps/mesh-segm-skel/Makefile.am | 88 +++++++++++--------------------- 2 files changed, 36 insertions(+), 58 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5f74f04..78bf909 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2013-08-31 Roland Levillain <roland(a)lrde.epita.fr> + Factor the generation of tests in Milena's apps/mesh-segm-skel. + + * apps/mesh-segm-skel/Makefile.am: Here. + +2013-08-31 Roland Levillain <roland(a)lrde.epita.fr> + Distribute sources of generated tests in Milena apps. * apps/generic-skel/Makefile.am (EXTRA_DIST): Add test-mixed.in. diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index 5ff1796..57bf632 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -25,9 +25,28 @@ AM_CXXFLAGS = $(APPS_CXXFLAGS) noinst_PROGRAMS = TESTS = +generated_tests = EXTRA_DIST = MOSTLYCLEANFILES = +# Use Make to generate tests instead of `configure', as advised by +# Autoconf's manual (see section ``Installation Directory +# Variables''). +edit = sed \ + -e 's|@top_srcdir[@]|$(top_srcdir)|g' \ + -e 's|@abs_srcdir[@]|$(abs_srcdir)|g' \ + -e 's|@abs_builddir[@]|$(abs_builddir)|g' \ + -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' + +$(generated_tests): Makefile + rm -f $@ $@.tmp + srcdir=''; \ + test -f ./$@.in || srcdir=$(srcdir)/; \ + $(edit) $${srcdir}$@.in >$@.tmp + chmod +x $@.tmp + chmod a-w $@.tmp + mv $@.tmp $@ + # FIXME: Have program names embed the type of structure used (either # graph or complex). @@ -112,49 +131,21 @@ MOSTLYCLEANFILES += \ ## Collapses. ## ---------- -## FIXME: Generalize the generation of tests by make instead of -## configure. -# Use Make to generate tests instead of `configure', as advised by -# Autoconf's manual (see section ``Installation Directory -# Variables''). -edit = sed \ - -e 's|@top_srcdir[@]|$(top_srcdir)|g' \ - -e 's|@abs_srcdir[@]|$(abs_srcdir)|g' \ - -e 's|@abs_builddir[@]|$(abs_builddir)|g' \ - -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' - # Performing a 2-collapse on a pseudo-manifold. noinst_PROGRAMS += mesh-complex-2-collapse +generated_tests += test-mesh-complex-2-collapse EXTRA_DIST += test-mesh-complex-2-collapse.in -test-mesh-complex-2-collapse: test-mesh-complex-2-collapse.in Makefile - rm -f $@ $@.tmp - srcdir=''; \ - test -f ./$< || srcdir=$(srcdir)/; \ - $(edit) $${srcdir}$< >>$@.tmp - chmod a-w,a+x $@.tmp - mv $@.tmp $@ - -TESTS += test-mesh-complex-2-collapse -CLEANFILES = test-mesh-complex-2-collapse +test-mesh-complex-2-collapse: $(srcdir)/test-mesh-complex-2-collapse.in MOSTLYCLEANFILES += pseudo-manifold-2-collapse.vtk # Program computing the max curvature from a mesh, then performing a # 2-collapse on it. noinst_PROGRAMS += mesh-complex-max-curv-2-collapse +generated_tests += test-mesh-complex-max-curv-2-collapse EXTRA_DIST += test-mesh-complex-max-curv-2-collapse.in -# FIXME: Factor action with test-mesh-complex-2-collapse's. -test-mesh-complex-max-curv-2-collapse: test-mesh-complex-max-curv-2-collapse.in Makefile - rm -f $@ $@.tmp - srcdir=''; \ - test -f ./$< || srcdir=$(srcdir)/; \ - $(edit) $${srcdir}$< >>$@.tmp - chmod a-w,a+x $@.tmp - mv $@.tmp $@ - -TESTS += test-mesh-complex-max-curv-2-collapse -CLEANFILES += test-mesh-complex-max-curv-2-collapse +test-mesh-complex-max-curv-2-collapse: $(srcdir)/test-mesh-complex-max-curv-2-collapse.in MOSTLYCLEANFILES += \ teapot-max-curv-2-collapse.vtk \ bunny-holefilled-max-curv-2-collapse.vtk @@ -163,18 +154,9 @@ MOSTLYCLEANFILES += \ # 1-collapse on it. noinst_PROGRAMS += mesh-complex-max-curv-1-collapse +generated_tests += test-mesh-complex-max-curv-1-collapse EXTRA_DIST += test-mesh-complex-max-curv-1-collapse.in -# FIXME: Factor action with test-mesh-complex-1-collapse's. -test-mesh-complex-max-curv-1-collapse: test-mesh-complex-max-curv-1-collapse.in Makefile - rm -f $@ $@.tmp - srcdir=''; \ - test -f ./$< || srcdir=$(srcdir)/; \ - $(edit) $${srcdir}$< >>$@.tmp - chmod a-w,a+x $@.tmp - mv $@.tmp $@ - -TESTS += test-mesh-complex-max-curv-1-collapse -CLEANFILES += test-mesh-complex-max-curv-1-collapse +test-mesh-complex-max-curv-1-collapse: $(srcdir)/test-mesh-complex-max-curv-1-collapse.in MOSTLYCLEANFILES += \ teapot-max-curv-1-collapse.vtk \ bunny-holefilled-max-curv-1-collapse.vtk @@ -219,26 +201,16 @@ noinst_PROGRAMS += off-to-vtk-bin ## Mixed tests. ## ## ------------- ## -# Use Make to generate Doxyfile instead of `configure', as advised by -# Autoconf's manual (see section ``Installation Directory -# Variables''). -# FIXME: Generalize this approach to other tests. - -$(generated_tests): Makefile - rm -f $@ $@.tmp - srcdir=''; \ - test -f ./$@.in || srcdir=$(srcdir)/; \ - $(edit) $${srcdir}$@.in >$@.tmp - chmod +x $@.tmp - chmod a-w $@.tmp - mv $@.tmp $@ - # Mixed tests corresponding to illustrations of the WADGMM 2010/LNCS # submission. Not part of the `check' target; triggered by the # `check-mixed' target. -generated_tests = test-mixed +generated_tests += test-mixed EXTRA_DIST += test-mixed.in test-mixed: $(srcdir)/test-mixed.in .PHONY: check-mixed check-mixed: test-mixed $(noinst_PROGRAMS) ./test-mixed + + +TESTS += $(generated_tests) +CLEANFILES = $(generated_tests) -- 1.7.10.4

1 0

olena: olena-2.0-780-g71717ea Distribute sources of generated tests in Milena apps.
by Roland Levillain 31 Aug '13

31 Aug '13

* apps/generic-skel/Makefile.am (EXTRA_DIST): Add test-mixed.in. * apps/mesh-segm-skel/Makefile.am (EXTRA_DIST): Add test-mesh-complex-2-collapse.in, test-mesh-complex-max-curv-2-collapse.in, test-mesh-complex-max-curv-1-collapse.in and test-mixed.in. --- milena/ChangeLog | 11 +++++++++++ milena/apps/generic-skel/Makefile.am | 1 + milena/apps/mesh-segm-skel/Makefile.am | 5 +++++ 3 files changed, 17 insertions(+) diff --git a/milena/ChangeLog b/milena/ChangeLog index 76ee722..5f74f04 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2013-08-31 Roland Levillain <roland(a)lrde.epita.fr> + Distribute sources of generated tests in Milena apps. + + * apps/generic-skel/Makefile.am (EXTRA_DIST): Add test-mixed.in. + * apps/mesh-segm-skel/Makefile.am (EXTRA_DIST): Add + test-mesh-complex-2-collapse.in, + test-mesh-complex-max-curv-2-collapse.in, + test-mesh-complex-max-curv-1-collapse.in and + test-mixed.in. + +2013-08-31 Roland Levillain <roland(a)lrde.epita.fr> + Do not install Milena apps. * apps/generic-skel/Makefile.am, diff --git a/milena/apps/generic-skel/Makefile.am b/milena/apps/generic-skel/Makefile.am index 3b7a6bf..06f6cf8 100644 --- a/milena/apps/generic-skel/Makefile.am +++ b/milena/apps/generic-skel/Makefile.am @@ -99,6 +99,7 @@ MOSTLYCLEANFILES = \ # submission. Not part of the `check' target; triggered by the # `check-mixed' target. generated_tests += test-mixed +EXTRA_DIST += test-mixed.in test-mixed: $(srcdir)/test-mixed.in .PHONY: check-mixed check-mixed: test-mixed $(noinst_PROGRAMS) diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index e78b56d..5ff1796 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -25,6 +25,7 @@ AM_CXXFLAGS = $(APPS_CXXFLAGS) noinst_PROGRAMS = TESTS = +EXTRA_DIST = MOSTLYCLEANFILES = # FIXME: Have program names embed the type of structure used (either @@ -125,6 +126,7 @@ edit = sed \ # Performing a 2-collapse on a pseudo-manifold. noinst_PROGRAMS += mesh-complex-2-collapse +EXTRA_DIST += test-mesh-complex-2-collapse.in test-mesh-complex-2-collapse: test-mesh-complex-2-collapse.in Makefile rm -f $@ $@.tmp srcdir=''; \ @@ -141,6 +143,7 @@ MOSTLYCLEANFILES += pseudo-manifold-2-collapse.vtk # 2-collapse on it. noinst_PROGRAMS += mesh-complex-max-curv-2-collapse +EXTRA_DIST += test-mesh-complex-max-curv-2-collapse.in # FIXME: Factor action with test-mesh-complex-2-collapse's. test-mesh-complex-max-curv-2-collapse: test-mesh-complex-max-curv-2-collapse.in Makefile rm -f $@ $@.tmp @@ -160,6 +163,7 @@ MOSTLYCLEANFILES += \ # 1-collapse on it. noinst_PROGRAMS += mesh-complex-max-curv-1-collapse +EXTRA_DIST += test-mesh-complex-max-curv-1-collapse.in # FIXME: Factor action with test-mesh-complex-1-collapse's. test-mesh-complex-max-curv-1-collapse: test-mesh-complex-max-curv-1-collapse.in Makefile rm -f $@ $@.tmp @@ -233,6 +237,7 @@ $(generated_tests): Makefile # submission. Not part of the `check' target; triggered by the # `check-mixed' target. generated_tests = test-mixed +EXTRA_DIST += test-mixed.in test-mixed: $(srcdir)/test-mixed.in .PHONY: check-mixed check-mixed: test-mixed $(noinst_PROGRAMS) -- 1.7.10.4

1 0

olena: branch mesh-segm-skel updated: olena-2.0-779-ge6fe7d3
by git＠lrde.epita.fr 31 Aug '13

31 Aug '13

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 mesh-segm-skel has been updated via e6fe7d359db0a18c8f37dd29f06bfa1d9fead977 (commit) via 450410e982d7c9abbd5d0b4c3d834284a504d138 (commit) from 4998bf92ef1bd4a382768a9b9abcb925fc1bfe7b (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 ----------------------------------------------------------------- e6fe7d3 Do not install Milena apps. 450410e Fix the distribution. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 15 +++++++++++++++ milena/apps/generic-skel/Makefile.am | 10 ++++++---- milena/apps/mesh-segm-skel/Makefile.am | 28 ++++++++++++++-------------- 3 files changed, 35 insertions(+), 18 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-779-ge6fe7d3 Do not install Milena apps.
by Roland Levillain 31 Aug '13

31 Aug '13

* apps/generic-skel/Makefile.am, * apps/mesh-segm-skel/Makefile.am: s/bin_PROGRAMS/noinst_PROGRAMS/. --- milena/ChangeLog | 8 ++++++++ milena/apps/generic-skel/Makefile.am | 7 +++---- milena/apps/mesh-segm-skel/Makefile.am | 28 ++++++++++++++-------------- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f7a0911..76ee722 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2013-08-31 Roland Levillain <roland(a)lrde.epita.fr> + Do not install Milena apps. + + * apps/generic-skel/Makefile.am, + * apps/mesh-segm-skel/Makefile.am: + s/bin_PROGRAMS/noinst_PROGRAMS/. + +2013-08-31 Roland Levillain <roland(a)lrde.epita.fr> + Fix the distribution. * apps/generic-skel/Makefile.am (noinst_HEADERS): diff --git a/milena/apps/generic-skel/Makefile.am b/milena/apps/generic-skel/Makefile.am index 3cdf4c4..3b7a6bf 100644 --- a/milena/apps/generic-skel/Makefile.am +++ b/milena/apps/generic-skel/Makefile.am @@ -28,14 +28,13 @@ AM_CXXFLAGS = $(APPS_CXXFLAGS) # FIXME: To be integrated into the library. noinst_HEADERS = image3d-skel.hh -# FIXME: Really install these programs? # 2D cases. -bin_PROGRAMS = \ +noinst_PROGRAMS = \ image2d-skel-unconstrained \ image2d-skel-with-end-points # 3D cases, slow versions. -bin_PROGRAMS += \ +noinst_PROGRAMS += \ image3d-skel-unconstrained \ image3d-skel-with-end-points \ image3d-skel-with-1d-isthmuses @@ -102,5 +101,5 @@ MOSTLYCLEANFILES = \ generated_tests += test-mixed test-mixed: $(srcdir)/test-mixed.in .PHONY: check-mixed -check-mixed: test-mixed $(bin_PROGRAMS) +check-mixed: test-mixed $(noinst_PROGRAMS) ./test-mixed diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index 2faefb9..e78b56d 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -23,7 +23,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) -bin_PROGRAMS = +noinst_PROGRAMS = TESTS = MOSTLYCLEANFILES = @@ -60,7 +60,7 @@ noinst_HEADERS = misc.hh # A small program exercising the curvature computation routines ported # from Trimesh to Milena. -bin_PROGRAMS += mesh-complex-max-curv +noinst_PROGRAMS += mesh-complex-max-curv TESTS += test-mesh-complex-max-curv MOSTLYCLEANFILES += teapot-complex-max-curv.off @@ -69,7 +69,7 @@ MOSTLYCLEANFILES += teapot-complex-max-curv.off # 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 +noinst_PROGRAMS += mesh-complex-max-curv-extrema TESTS += test-mesh-complex-max-curv-extrema MOSTLYCLEANFILES += \ socket-complex-max-curv-extrema.off \ @@ -83,7 +83,7 @@ MOSTLYCLEANFILES += \ # 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 +noinst_PROGRAMS += mesh-complex-segm TESTS += test-mesh-complex-segm MOSTLYCLEANFILES += \ socket-max-curv-segm.off \ @@ -95,14 +95,14 @@ MOSTLYCLEANFILES += \ # vertices, then average values are computed on edges (in the case of # `mesh-complex-segm', data are read from polygons, which implies an # extra averaging step). -bin_PROGRAMS += mesh-complex-max-curv-segm +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 # Likewise, but using pseudo-inverse curvature. -bin_PROGRAMS += mesh-complex-pinv-curv-segm +noinst_PROGRAMS += mesh-complex-pinv-curv-segm TESTS += test-mesh-complex-pinv-curv-segm MOSTLYCLEANFILES += \ socket-complex-pinv-curv-segm.off \ @@ -123,7 +123,7 @@ edit = sed \ -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' # Performing a 2-collapse on a pseudo-manifold. -bin_PROGRAMS += mesh-complex-2-collapse +noinst_PROGRAMS += mesh-complex-2-collapse test-mesh-complex-2-collapse: test-mesh-complex-2-collapse.in Makefile rm -f $@ $@.tmp @@ -139,7 +139,7 @@ MOSTLYCLEANFILES += pseudo-manifold-2-collapse.vtk # Program computing the max curvature from a mesh, then performing a # 2-collapse on it. -bin_PROGRAMS += mesh-complex-max-curv-2-collapse +noinst_PROGRAMS += mesh-complex-max-curv-2-collapse # FIXME: Factor action with test-mesh-complex-2-collapse's. test-mesh-complex-max-curv-2-collapse: test-mesh-complex-max-curv-2-collapse.in Makefile @@ -158,7 +158,7 @@ MOSTLYCLEANFILES += \ # Program computing the max curvature from a mesh, then performing a # 1-collapse on it. -bin_PROGRAMS += mesh-complex-max-curv-1-collapse +noinst_PROGRAMS += mesh-complex-max-curv-1-collapse # FIXME: Factor action with test-mesh-complex-1-collapse's. test-mesh-complex-max-curv-1-collapse: test-mesh-complex-max-curv-1-collapse.in Makefile @@ -179,7 +179,7 @@ MOSTLYCLEANFILES += \ ## ------------------------------------ # Skeletonization program working on precomputed meshes with curvatures data. -bin_PROGRAMS += mesh-complex-skel +noinst_PROGRAMS += mesh-complex-skel mesh_complex_skel_SOURCES = mesh-complex-skel.cc save_bin_alt.hh TESTS += test-mesh-complex-skel MOSTLYCLEANFILES += \ @@ -187,7 +187,7 @@ MOSTLYCLEANFILES += \ teapot-max-curv-skel.off \ three-triangles-skel.off -bin_PROGRAMS += mesh-complex-max-curv-skel +noinst_PROGRAMS += mesh-complex-max-curv-skel mesh_complex_max_curv_skel_SOURCES = \ mesh-complex-max-curv-skel.cc save_bin_alt.hh TESTS += test-mesh-complex-max-curv-skel @@ -195,7 +195,7 @@ MOSTLYCLEANFILES += \ socket-complex-max-curv-skel.off \ teapot-complex-max-curv-skel.off -bin_PROGRAMS += mesh-complex-pinv-curv-skel +noinst_PROGRAMS += mesh-complex-pinv-curv-skel mesh_complex_pinv_curv_skel_SOURCES = \ mesh-complex-pinv-curv-skel.cc save_bin_alt.hh TESTS += test-mesh-complex-pinv-curv-skel @@ -209,7 +209,7 @@ MOSTLYCLEANFILES += \ # Convert a binary OFF file (e.g. no value attached to faces) into a # VTK file. -bin_PROGRAMS += off-to-vtk-bin +noinst_PROGRAMS += off-to-vtk-bin ## ------------- ## ## Mixed tests. ## @@ -235,5 +235,5 @@ $(generated_tests): Makefile generated_tests = test-mixed test-mixed: $(srcdir)/test-mixed.in .PHONY: check-mixed -check-mixed: test-mixed $(bin_PROGRAMS) +check-mixed: test-mixed $(noinst_PROGRAMS) ./test-mixed -- 1.7.10.4

1 0

olena: olena-2.0-778-g450410e Fix the distribution.
by Roland Levillain 31 Aug '13

31 Aug '13

* apps/generic-skel/Makefile.am (noinst_HEADERS): Add image3d-skel.hh. --- milena/ChangeLog | 7 +++++++ milena/apps/generic-skel/Makefile.am | 3 +++ 2 files changed, 10 insertions(+) diff --git a/milena/ChangeLog b/milena/ChangeLog index 676d54e..f7a0911 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2013-08-31 Roland Levillain <roland(a)lrde.epita.fr> + Fix the distribution. + + * apps/generic-skel/Makefile.am (noinst_HEADERS): + Add image3d-skel.hh. + +2013-08-31 Roland Levillain <roland(a)lrde.epita.fr> + Fix a Makefile inclusion in Milena's apps/generic-skel. * apps/generic-skel/Makefile.am: Include diff --git a/milena/apps/generic-skel/Makefile.am b/milena/apps/generic-skel/Makefile.am index 6a3c458..3cdf4c4 100644 --- a/milena/apps/generic-skel/Makefile.am +++ b/milena/apps/generic-skel/Makefile.am @@ -24,6 +24,9 @@ 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 # FIXME: Really install these programs? # 2D cases. -- 1.7.10.4

1 0

olena: branch mesh-segm-skel updated: olena-2.0-777-g4998bf9
by git＠lrde.epita.fr 30 Aug '13

30 Aug '13

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 mesh-segm-skel has been updated via 4998bf92ef1bd4a382768a9b9abcb925fc1bfe7b (commit) from 0774f862907bf1f3b751cbd8e8124daa6ab58cea (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 ----------------------------------------------------------------- 4998bf9 Fix a Makefile inclusion in Milena's apps/generic-skel. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 7 +++++++ milena/apps/generic-skel/Makefile.am | 2 ++ 2 files changed, 9 insertions(+) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0