[Olena-patches] last-svn-commit-161-ga0e1151 Canonize Milena's tests' output file names to support parallel tests.

* tests/binarization/threshold.cc, * tests/data/approx/median.cc, * tests/data/median.cc, * tests/data/median_fast.cc, * tests/data/naive/median.cc, * tests/io/dump/dump.cc, * tests/io/fits/fits.cc, * tests/io/magick/save.cc, * tests/io/off/load_save_bin.cc, * tests/io/pbm/pbm.cc, * tests/io/pbm/pbm_ascii.cc, * tests/io/pbms/load.cc, * tests/io/pgm/pgm.cc, * tests/io/pgm/pgm16.cc, * tests/io/pgm/pgm19.cc, * tests/io/pgm/pgm27.cc, * tests/io/pgm/pgm_ascii.cc, * tests/io/pgms/load.cc, * tests/io/ppm/ppm.cc, * tests/io/ppm/ppm16.cc, * tests/io/ppm/ppm23.cc, * tests/io/ppms/load.cc, * tests/linear/convolve.cc, * tests/linear/convolve_2x1d.cc, * tests/linear/convolve_directional.cc, * tests/linear/gaussian.cc, * tests/linear/gaussian/filter.cc, * tests/linear/lap.cc, * tests/linear/log.cc, * tests/linear/sobel_2d.cc, * tests/morpho/approx/dilation.cc, * tests/morpho/approx/erosion.cc, * tests/morpho/artificial_line_graph_image_wst.cc, * tests/morpho/closing/algebraic.cc, * tests/morpho/closing/approx/structural.cc, * tests/morpho/closing/height.cc, * tests/morpho/closing/leveling.cc, * tests/morpho/closing/structural.cc, * tests/morpho/closing/sum.cc, * tests/morpho/closing/volume.cc, * tests/morpho/complex_image_wst.cc, * tests/morpho/contrast.cc, * tests/morpho/dilation.cc, * tests/morpho/general.cc, * tests/morpho/gradient.cc, * tests/morpho/hit_or_miss.cc, * tests/morpho/laplacian.cc, * tests/morpho/lena_line_graph_image_wst1.cc, * tests/morpho/lena_line_graph_image_wst2.cc, * tests/morpho/meyer_wst.cc, * tests/morpho/meyer_wst_long.cc, * tests/morpho/opening/algebraic.cc, * tests/morpho/opening/approx/structural.cc, * tests/morpho/opening/area.cc, * tests/morpho/opening/height.cc, * tests/morpho/opening/leveling.cc, * tests/morpho/opening/structural.cc, * tests/morpho/opening/sum.cc, * tests/morpho/opening/volume.cc, * tests/morpho/thinning.cc, * tests/morpho/watershed/flooding.cc, * tests/morpho/watershed/topological.cc: Add the name of the test as prefix of its output file names. * tests/binarization/Makefile.am, * tests/data/Makefile.am, * tests/data/approx/Makefile.am, * tests/data/naive/Makefile.am, * tests/io/dump/Makefile.am, * tests/io/fits/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/linear/Makefile.am, * tests/linear/gaussian/Makefile.am, * tests/morpho/Makefile.am, * tests/morpho/approx/Makefile.am, * tests/morpho/closing/Makefile.am, * tests/morpho/closing/approx/Makefile.am, * tests/morpho/opening/Makefile.am, * tests/morpho/opening/approx/Makefile.am, * tests/morpho/watershed/Makefile.am (CLEANFILES): Adjust. Rename as... (MOSTLYCLEANFILES): ...this. --- milena/ChangeLog | 94 ++++++++++++++++++++ milena/tests/binarization/Makefile.am | 13 +-- milena/tests/binarization/threshold.cc | 7 +- milena/tests/data/Makefile.am | 16 +--- milena/tests/data/approx/Makefile.am | 12 +-- milena/tests/data/approx/median.cc | 7 +- milena/tests/data/median.cc | 7 +- milena/tests/data/median_fast.cc | 5 +- milena/tests/data/naive/Makefile.am | 9 +-- milena/tests/data/naive/median.cc | 5 +- milena/tests/io/dump/Makefile.am | 14 ++-- milena/tests/io/dump/dump.cc | 24 +++--- milena/tests/io/fits/Makefile.am | 14 +--- milena/tests/io/fits/fits.cc | 11 ++- milena/tests/io/magick/Makefile.am | 14 +--- milena/tests/io/magick/save.cc | 9 +- milena/tests/io/off/Makefile.am | 12 +--- milena/tests/io/off/load_save_bin.cc | 5 +- milena/tests/io/pbm/Makefile.am | 15 +-- milena/tests/io/pbm/pbm.cc | 7 +- milena/tests/io/pbm/pbm_ascii.cc | 6 +- milena/tests/io/pbms/Makefile.am | 8 +-- milena/tests/io/pbms/load.cc | 6 +- milena/tests/io/pgm/Makefile.am | 34 ++++---- milena/tests/io/pgm/pgm.cc | 11 ++- milena/tests/io/pgm/pgm16.cc | 13 ++-- milena/tests/io/pgm/pgm19.cc | 9 +- milena/tests/io/pgm/pgm27.cc | 9 +- milena/tests/io/pgm/pgm_ascii.cc | 10 +- milena/tests/io/pgms/Makefile.am | 9 +-- milena/tests/io/pgms/load.cc | 6 +- milena/tests/io/ppm/Makefile.am | 25 ++---- milena/tests/io/ppm/ppm.cc | 7 +- milena/tests/io/ppm/ppm16.cc | 11 ++- milena/tests/io/ppm/ppm23.cc | 11 ++- milena/tests/io/ppms/Makefile.am | 9 +-- milena/tests/io/ppms/load.cc | 8 +- milena/tests/linear/Makefile.am | 16 ++-- milena/tests/linear/convolve.cc | 5 +- milena/tests/linear/convolve_2x1d.cc | 5 +- milena/tests/linear/convolve_directional.cc | 5 +- milena/tests/linear/gaussian.cc | 5 +- milena/tests/linear/gaussian/Makefile.am | 4 +- milena/tests/linear/gaussian/filter.cc | 5 +- milena/tests/linear/lap.cc | 5 +- milena/tests/linear/log.cc | 5 +- milena/tests/linear/sobel_2d.cc | 5 +- milena/tests/morpho/Makefile.am | 35 ++++---- milena/tests/morpho/approx/Makefile.am | 16 +--- milena/tests/morpho/approx/dilation.cc | 6 +- milena/tests/morpho/approx/erosion.cc | 6 +- .../morpho/artificial_line_graph_image_wst.cc | 5 +- milena/tests/morpho/closing/Makefile.am | 40 ++++----- milena/tests/morpho/closing/algebraic.cc | 6 +- milena/tests/morpho/closing/approx/Makefile.am | 13 +-- milena/tests/morpho/closing/approx/structural.cc | 6 +- milena/tests/morpho/closing/height.cc | 5 +- milena/tests/morpho/closing/leveling.cc | 6 +- milena/tests/morpho/closing/structural.cc | 4 +- milena/tests/morpho/closing/sum.cc | 5 +- milena/tests/morpho/closing/volume.cc | 7 +- milena/tests/morpho/complex_image_wst.cc | 5 +- milena/tests/morpho/contrast.cc | 5 +- milena/tests/morpho/dilation.cc | 13 ++-- milena/tests/morpho/general.cc | 5 +- milena/tests/morpho/gradient.cc | 7 +- milena/tests/morpho/hit_or_miss.cc | 10 +-- milena/tests/morpho/laplacian.cc | 7 +- milena/tests/morpho/lena_line_graph_image_wst1.cc | 5 +- milena/tests/morpho/lena_line_graph_image_wst2.cc | 5 +- milena/tests/morpho/meyer_wst.cc | 5 +- milena/tests/morpho/meyer_wst_long.cc | 6 +- milena/tests/morpho/opening/Makefile.am | 39 ++++---- milena/tests/morpho/opening/algebraic.cc | 6 +- milena/tests/morpho/opening/approx/Makefile.am | 8 +- milena/tests/morpho/opening/approx/structural.cc | 6 +- milena/tests/morpho/opening/area.cc | 5 +- milena/tests/morpho/opening/height.cc | 5 +- milena/tests/morpho/opening/leveling.cc | 6 +- milena/tests/morpho/opening/structural.cc | 4 +- milena/tests/morpho/opening/sum.cc | 5 +- milena/tests/morpho/opening/volume.cc | 5 +- milena/tests/morpho/thinning.cc | 7 +- milena/tests/morpho/watershed/Makefile.am | 15 +--- milena/tests/morpho/watershed/flooding.cc | 13 ++- milena/tests/morpho/watershed/topological.cc | 5 +- 86 files changed, 473 insertions(+), 441 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f30028e..f354a86 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,97 @@ +2010-04-26 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Canonize Milena's tests' output file names to support parallel tests. + + * tests/binarization/threshold.cc, + * tests/data/approx/median.cc, + * tests/data/median.cc, + * tests/data/median_fast.cc, + * tests/data/naive/median.cc, + * tests/io/dump/dump.cc, + * tests/io/fits/fits.cc, + * tests/io/magick/save.cc, + * tests/io/off/load_save_bin.cc, + * tests/io/pbm/pbm.cc, + * tests/io/pbm/pbm_ascii.cc, + * tests/io/pbms/load.cc, + * tests/io/pgm/pgm.cc, + * tests/io/pgm/pgm16.cc, + * tests/io/pgm/pgm19.cc, + * tests/io/pgm/pgm27.cc, + * tests/io/pgm/pgm_ascii.cc, + * tests/io/pgms/load.cc, + * tests/io/ppm/ppm.cc, + * tests/io/ppm/ppm16.cc, + * tests/io/ppm/ppm23.cc, + * tests/io/ppms/load.cc, + * tests/linear/convolve.cc, + * tests/linear/convolve_2x1d.cc, + * tests/linear/convolve_directional.cc, + * tests/linear/gaussian.cc, + * tests/linear/gaussian/filter.cc, + * tests/linear/lap.cc, + * tests/linear/log.cc, + * tests/linear/sobel_2d.cc, + * tests/morpho/approx/dilation.cc, + * tests/morpho/approx/erosion.cc, + * tests/morpho/artificial_line_graph_image_wst.cc, + * tests/morpho/closing/algebraic.cc, + * tests/morpho/closing/approx/structural.cc, + * tests/morpho/closing/height.cc, + * tests/morpho/closing/leveling.cc, + * tests/morpho/closing/structural.cc, + * tests/morpho/closing/sum.cc, + * tests/morpho/closing/volume.cc, + * tests/morpho/complex_image_wst.cc, + * tests/morpho/contrast.cc, + * tests/morpho/dilation.cc, + * tests/morpho/general.cc, + * tests/morpho/gradient.cc, + * tests/morpho/hit_or_miss.cc, + * tests/morpho/laplacian.cc, + * tests/morpho/lena_line_graph_image_wst1.cc, + * tests/morpho/lena_line_graph_image_wst2.cc, + * tests/morpho/meyer_wst.cc, + * tests/morpho/meyer_wst_long.cc, + * tests/morpho/opening/algebraic.cc, + * tests/morpho/opening/approx/structural.cc, + * tests/morpho/opening/area.cc, + * tests/morpho/opening/height.cc, + * tests/morpho/opening/leveling.cc, + * tests/morpho/opening/structural.cc, + * tests/morpho/opening/sum.cc, + * tests/morpho/opening/volume.cc, + * tests/morpho/thinning.cc, + * tests/morpho/watershed/flooding.cc, + * tests/morpho/watershed/topological.cc: + Add the name of the test as prefix of its output file names. + * tests/binarization/Makefile.am, + * tests/data/Makefile.am, + * tests/data/approx/Makefile.am, + * tests/data/naive/Makefile.am, + * tests/io/dump/Makefile.am, + * tests/io/fits/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/linear/Makefile.am, + * tests/linear/gaussian/Makefile.am, + * tests/morpho/Makefile.am, + * tests/morpho/approx/Makefile.am, + * tests/morpho/closing/Makefile.am, + * tests/morpho/closing/approx/Makefile.am, + * tests/morpho/opening/Makefile.am, + * tests/morpho/opening/approx/Makefile.am, + * tests/morpho/watershed/Makefile.am + (CLEANFILES): Adjust. + Rename as... + (MOSTLYCLEANFILES): ...this. + 2010-04-22 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; * tests/unit_test/unit-tests.mk: Regen. diff --git a/milena/tests/binarization/Makefile.am b/milena/tests/binarization/Makefile.am index bcac019..555450b 100644 --- a/milena/tests/binarization/Makefile.am +++ b/milena/tests/binarization/Makefile.am @@ -14,21 +14,14 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ threshold - TESTS = $(check_PROGRAMS) - -# FIXME: each test should clean its output, temporary output should -# not be cleaned up by make. -CLEANFILES = \ -out1.pgm \ -out2.pgm +MOSTLYCLEANFILES = \ + threshold-out1.pgm \ + threshold-out2.pgm diff --git a/milena/tests/binarization/threshold.cc b/milena/tests/binarization/threshold.cc index fecf1b7..3a34f91 100644 --- a/milena/tests/binarization/threshold.cc +++ b/milena/tests/binarization/threshold.cc @@ -1,4 +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. // @@ -42,7 +43,7 @@ int main() image2d<int_u8> lena; io::pgm::load(lena, MLN_IMG_DIR "/lena.pgm"); - io::pbm::save(binarization::threshold(lena, 50), "out1.pgm"); + io::pbm::save(binarization::threshold(lena, 50), "threshold-out1.pgm"); } { @@ -53,7 +54,7 @@ int main() data::paste(l, lena); - io::pbm::save(binarization::threshold(lena, 50), "out2.pgm"); + io::pbm::save(binarization::threshold(lena, 50), "threshold-out2.pgm"); } } diff --git a/milena/tests/data/Makefile.am b/milena/tests/data/Makefile.am index 7be7438..8ad3fd9 100644 --- a/milena/tests/data/Makefile.am +++ b/milena/tests/data/Makefile.am @@ -14,9 +14,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk @@ -47,13 +44,10 @@ check_PROGRAMS = \ # Lengthy tests. # FIXME: Enable `fill_full' it when make full-check is enabled. -TESTS = $(check_PROGRAMS) - +TESTS = $(check_PROGRAMS) -# FIXME: each test should clean its output, temporary output should -# not be cleaned up by make. -CLEANFILES = \ - out_line.pgm \ - out.pgm \ - out_rect.pgm +MOSTLYCLEANFILES = \ + median-out_line.pgm \ + median-out_rect.pgm \ + median_fast-out.pgm diff --git a/milena/tests/data/approx/Makefile.am b/milena/tests/data/approx/Makefile.am index 654932c..12fc8cc 100644 --- a/milena/tests/data/approx/Makefile.am +++ b/milena/tests/data/approx/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk @@ -35,9 +32,6 @@ median_CXXFLAGS = $(LONG_TESTS_CXXFLAGS) TESTS = $(check_PROGRAMS) - -# FIXME: each test should clean its output, temporary output should -# not be cleaned up by make. -CLEANFILES = \ - out_oct.pgm \ - out_rec.pgm +MOSTLYCLEANFILES = \ + median-out_oct.pgm \ + median-out_rec.pgm diff --git a/milena/tests/data/approx/median.cc b/milena/tests/data/approx/median.cc index 45806ce..4ebb838 100644 --- a/milena/tests/data/approx/median.cc +++ b/milena/tests/data/approx/median.cc @@ -1,4 +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. // @@ -45,11 +46,11 @@ int main() { win::octagon2d oct(49); image2d<int_u8> out = data::approx::median(lena, oct); - io::pgm::save(out, "out_oct.pgm"); + io::pgm::save(out, "median-out_oct.pgm"); } { win::rectangle2d rec(51, 51); image2d<int_u8> out = data::approx::median(lena, rec); - io::pgm::save(out, "out_rec.pgm"); + io::pgm::save(out, "median-out_rec.pgm"); } } diff --git a/milena/tests/data/median.cc b/milena/tests/data/median.cc index dd85364..29fb061 100644 --- a/milena/tests/data/median.cc +++ b/milena/tests/data/median.cc @@ -1,4 +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. // @@ -46,7 +47,7 @@ int main() { win::rectangle2d rect(51, 51); image2d<int_u8> out = data::median(lena, rect); - io::pgm::save(out, "out_rect.pgm"); + io::pgm::save(out, "median-out_rect.pgm"); } { win::rectangle2d rect(1, 51); @@ -55,6 +56,6 @@ int main() ref = data::median(lena, rect), out = data::median(lena, line); mln_assertion(out == ref); - io::pgm::save(out, "out_line.pgm"); + io::pgm::save(out, "median-out_line.pgm"); } } diff --git a/milena/tests/data/median_fast.cc b/milena/tests/data/median_fast.cc index e206f88..7a17766 100644 --- a/milena/tests/data/median_fast.cc +++ b/milena/tests/data/median_fast.cc @@ -1,4 +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. // @@ -94,7 +95,7 @@ int main() image2d<int_u8> out(lena.domain()); data::fast_median(lena, rect, out); - io::pgm::save(out, "out.pgm"); + io::pgm::save(out, "median_fast-out.pgm"); } } diff --git a/milena/tests/data/naive/Makefile.am b/milena/tests/data/naive/Makefile.am index e6d3986..7fab28d 100644 --- a/milena/tests/data/naive/Makefile.am +++ b/milena/tests/data/naive/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk @@ -35,8 +32,4 @@ median_CXXFLAGS = $(TESTS_CXXFLAGS_SPEED) TESTS = $(check_PROGRAMS) - -# FIXME: each test should clean its output, temporary output should -# not be cleaned up by make. -CLEANFILES = \ - out.pgm +MOSTLYCLEANFILES = median-out.pgm diff --git a/milena/tests/data/naive/median.cc b/milena/tests/data/naive/median.cc index aed27db..a544775 100644 --- a/milena/tests/data/naive/median.cc +++ b/milena/tests/data/naive/median.cc @@ -1,4 +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. // @@ -49,5 +50,5 @@ int main() image2d<int_u8> out(lena.domain()); data::naive::median(lena, rec, out); - io::pgm::save(out, "out.pgm"); + io::pgm::save(out, "median-out.pgm"); } diff --git a/milena/tests/io/dump/Makefile.am b/milena/tests/io/dump/Makefile.am index bf11271..40b5983 100644 --- a/milena/tests/io/dump/Makefile.am +++ b/milena/tests/io/dump/Makefile.am @@ -13,19 +13,17 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ dump - TESTS = $(check_PROGRAMS) - -# FIXME: each test should clean its output, temporary output should -# not be cleaned up by make. -CLEANFILES = pic.dump \ No newline at end of file +MOSTLYCLEANFILES = \ + dump-bool.dump \ + dump-float.dump \ + dump-int_u8.dump \ + dump-rgb8.dump \ + dump-unsigned.dump diff --git a/milena/tests/io/dump/dump.cc b/milena/tests/io/dump/dump.cc index a49541a..f8b8f66 100644 --- a/milena/tests/io/dump/dump.cc +++ b/milena/tests/io/dump/dump.cc @@ -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. // @@ -40,16 +40,18 @@ int main() { using namespace mln; + // FIXME: Factor. + /// Value: bool { bool data[4] = { 0, 1, 1, 0 }; image2d<bool> pic = make::image2d(data); - io::dump::save(pic, "pic.dump"); + io::dump::save(pic, "dump-bool.dump"); image2d<bool> pic2; - io::dump::load(pic2, "pic.dump"); + io::dump::load(pic2, "dump-bool.dump"); mln_assertion(pic.domain() == pic2.domain()); mln_assertion(pic == pic2); @@ -60,9 +62,9 @@ int main() value::int_u8 data[4] = { 5, 1, 1, 9 }; image2d<value::int_u8> pic = make::image2d(data); - io::dump::save(pic, "pic.dump"); + io::dump::save(pic, "dump-int_u8.dump"); image2d<value::int_u8> pic2; - io::dump::load(pic2, "pic.dump"); + io::dump::load(pic2, "dump-int_u8.dump"); mln_assertion(pic.domain() == pic2.domain()); mln_assertion(pic == pic2); @@ -73,9 +75,9 @@ int main() unsigned data[4] = { 5, 1, 1, 9 }; image2d<unsigned> pic = make::image2d(data); - io::dump::save(pic, "pic.dump"); + io::dump::save(pic, "dump-unsigned.dump"); image2d<unsigned> pic2; - io::dump::load(pic2, "pic.dump"); + io::dump::load(pic2, "dump-unsigned.dump"); mln_assertion(pic.domain() == pic2.domain()); mln_assertion(pic == pic2); @@ -86,9 +88,9 @@ int main() float data[4] = { 5, 1, 1, 9 }; image2d<float> pic = make::image2d(data); - io::dump::save(pic, "pic.dump"); + io::dump::save(pic, "dump-float.dump"); image2d<float> pic2; - io::dump::load(pic2, "pic.dump"); + io::dump::load(pic2, "dump-float.dump"); mln_assertion(pic.domain() == pic2.domain()); mln_assertion(pic == pic2); @@ -101,10 +103,10 @@ int main() value::rgb8 data[4] = { rgb8(2,4,5), rgb8(1,23,255), rgb8(64,41,150), rgb8(23,53,49) }; image2d<value::rgb8> pic = make::image2d(data); - io::dump::save(pic, "pic.dump"); + io::dump::save(pic, "dump-rgb8.dump"); image2d<value::rgb8> pic2; - io::dump::load(pic2, "pic.dump"); + io::dump::load(pic2, "dump-rgb8.dump"); mln_assertion(pic.domain() == pic2.domain()); mln_assertion(pic == pic2); diff --git a/milena/tests/io/fits/Makefile.am b/milena/tests/io/fits/Makefile.am index e4210e9..9b9b8e3 100644 --- a/milena/tests/io/fits/Makefile.am +++ b/milena/tests/io/fits/Makefile.am @@ -14,9 +14,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk @@ -25,13 +22,8 @@ AM_LDFLAGS = $(CFITSIO_LDFLAGS) check_PROGRAMS = fits - TESTS = $(check_PROGRAMS) - - -# FIXME: each test should clean its output, temporary output should -# not be cleaned up by make. -CLEANFILES = \ - out.pfm \ - out2.pfm +MOSTLYCLEANFILES = \ + fits-out.pfm \ + fits-out2.pfm diff --git a/milena/tests/io/fits/fits.cc b/milena/tests/io/fits/fits.cc index a2ffb91..47d7938 100644 --- a/milena/tests/io/fits/fits.cc +++ b/milena/tests/io/fits/fits.cc @@ -1,4 +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. // @@ -40,12 +41,12 @@ int main() { image2d<float> fits_in = io::fits::load(MLN_IMG_DIR "/test.fits"); - io::pfm::save(fits_in, "out.pfm"); - image2d<float> pfm = io::pfm::load("out.pfm"); + io::pfm::save(fits_in, "fits-out.pfm"); + image2d<float> pfm = io::pfm::load("fits-out.pfm"); mln_assertion(pfm == fits_in); - io::pfm::save(fits_in, "out2.pfm"); - image2d<float> pfm2 = io::pfm::load("out2.pfm"); + io::pfm::save(fits_in, "fits-out2.pfm"); + image2d<float> pfm2 = io::pfm::load("fits-out2.pfm"); mln_assertion(fits_in == pfm2); } } diff --git a/milena/tests/io/magick/Makefile.am b/milena/tests/io/magick/Makefile.am index 97628fb..7a49397 100644 --- a/milena/tests/io/magick/Makefile.am +++ b/milena/tests/io/magick/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk @@ -26,13 +23,8 @@ check_PROGRAMS = \ load \ save - TESTS = $(check_PROGRAMS) - - -# FIXME: each test should clean its output, temporary output should -# not be cleaned up by make. -CLEANFILES = \ - tiny.ppm \ - tiny.png +MOSTLYCLEANFILES = \ + save-tiny.ppm \ + save-tiny.png diff --git a/milena/tests/io/magick/save.cc b/milena/tests/io/magick/save.cc index 666e953..a4efd12 100644 --- a/milena/tests/io/magick/save.cc +++ b/milena/tests/io/magick/save.cc @@ -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. // @@ -44,15 +44,14 @@ int main() io::ppm::load(lena_mln, MLN_IMG_DIR "/tiny.ppm"); value::rgb8 c = lena_mln(p); - io::magick::save(lena_mln, "tiny.png"); + io::magick::save(lena_mln, "save-tiny.png"); image2d<value::rgb8> lena_im; - io::magick::load(lena_im, "tiny.png"); + io::magick::load(lena_im, "save-tiny.png"); mln_assertion(lena_im(p) == c); - io::ppm::save(lena_im, "tiny.ppm"); + io::ppm::save(lena_im, "save-tiny.ppm"); mln_assertion(lena_im.domain() == lena_mln.domain()); mln_assertion(lena_im == lena_mln); - } diff --git a/milena/tests/io/off/Makefile.am b/milena/tests/io/off/Makefile.am index 071e5e1..d5dcc9d 100644 --- a/milena/tests/io/off/Makefile.am +++ b/milena/tests/io/off/Makefile.am @@ -14,24 +14,14 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ load_bin \ load_save_bin \ - \ load_float - - TESTS = $(check_PROGRAMS) - -# FIXME: each test should clean its output, temporary output should -# not be cleaned up by make. -CLEANFILES = \ - out.off +MOSTLYCLEANFILES = load_save_bin-out.off diff --git a/milena/tests/io/off/load_save_bin.cc b/milena/tests/io/off/load_save_bin.cc index 9526575..3287910 100644 --- a/milena/tests/io/off/load_save_bin.cc +++ b/milena/tests/io/off/load_save_bin.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 Olena. // @@ -40,5 +41,5 @@ int main() typedef bin_2complex_image3df ima_t; ima_t ima; io::off::load(ima, MLN_MESH_DIR "/tetrahedron.off"); - io::off::save(ima, "out.off"); + io::off::save(ima, "load_save_bin-out.off"); } diff --git a/milena/tests/io/pbm/Makefile.am b/milena/tests/io/pbm/Makefile.am index a09ce83..dfc6b0d 100644 --- a/milena/tests/io/pbm/Makefile.am +++ b/milena/tests/io/pbm/Makefile.am @@ -14,20 +14,15 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - pbm \ - pbm_ascii - + pbm \ + pbm_ascii TESTS = $(check_PROGRAMS) - -# FIXME: each test should clean its output, temporary output should -# not be cleaned up by make. -CLEANFILES = out.pbm \ No newline at end of file +MOSTLYCLEANFILES = \ + pbm-out.pbm \ + pbm_ascii-out.pbm diff --git a/milena/tests/io/pbm/pbm.cc b/milena/tests/io/pbm/pbm.cc index 7c03d06..abf8ea2 100644 --- a/milena/tests/io/pbm/pbm.cc +++ b/milena/tests/io/pbm/pbm.cc @@ -1,4 +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. // @@ -40,8 +41,8 @@ int main() using namespace mln; image2d<bool> pic = io::pbm::load(MLN_IMG_DIR "/picasso.pbm"); - io::pbm::save(pic, "out.pbm"); - image2d<bool> pic2 = io::pbm::load("out.pbm"); + io::pbm::save(pic, "pbm-out.pbm"); + image2d<bool> pic2 = io::pbm::load("pbm-out.pbm"); mln_assertion(pic == pic2); diff --git a/milena/tests/io/pbm/pbm_ascii.cc b/milena/tests/io/pbm/pbm_ascii.cc index d4da23e..a9427e9 100644 --- a/milena/tests/io/pbm/pbm_ascii.cc +++ b/milena/tests/io/pbm/pbm_ascii.cc @@ -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. // @@ -60,10 +60,10 @@ int main() { image2d<bool> lena_ascii; io::pbm::load(lena_ascii, MLN_TESTS_IMG_DIR "/lena_ascii.pbm"); - io::pbm::save(lena_ascii, "out.pbm"); + io::pbm::save(lena_ascii, "pbm_ascii-out.pbm"); image2d<bool> out; - io::pbm::load(out, "out.pbm"); + io::pbm::load(out, "pbm_ascii-out.pbm"); mln_assertion(out == lena_ascii); mln_assertion(out == lena_raw); diff --git a/milena/tests/io/pbms/Makefile.am b/milena/tests/io/pbms/Makefile.am index eeb5f18..5d075ef 100644 --- a/milena/tests/io/pbms/Makefile.am +++ b/milena/tests/io/pbms/Makefile.am @@ -13,18 +13,12 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ load - TESTS = $(check_PROGRAMS) -# FIXME: each test should clean its output, temporary output should -# not be cleaned up by make. -CLEANFILES = out.pbm \ No newline at end of file +MOSTLYCLEANFILES = pbms-out.pbm diff --git a/milena/tests/io/pbms/load.cc b/milena/tests/io/pbms/load.cc index 7712590..991909f 100644 --- a/milena/tests/io/pbms/load.cc +++ b/milena/tests/io/pbms/load.cc @@ -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. // @@ -45,11 +45,11 @@ int main() image2d<bool> pic2 = duplicate(pic); pic2(point2d(0,0)) = true; - io::pbm::save(pic2, "out.pbm"); + io::pbm::save(pic2, "pbms-out.pbm"); util::array<std::string> files(2); files[0] = MLN_IMG_DIR "/tiny.pbm"; - files[1] = "out.pbm"; + files[1] = "pbms-out.pbm"; image3d<bool> ima3d; io::pbms::load(ima3d, files); diff --git a/milena/tests/io/pgm/Makefile.am b/milena/tests/io/pgm/Makefile.am index 75cab7b..c9a4784 100644 --- a/milena/tests/io/pgm/Makefile.am +++ b/milena/tests/io/pgm/Makefile.am @@ -14,28 +14,26 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - pgm16 \ - pgm19 \ - pgm27 \ - pgm_ascii \ - pgm - + pgm16 \ + pgm19 \ + pgm27 \ + pgm_ascii \ + pgm TESTS = $(check_PROGRAMS) - -# FIXME: each test should clean its output, temporary output should -# not be cleaned up by make. -CLEANFILES = \ - out8.pgm \ - out27.pgm \ - out19.pgm \ - out16.pgm \ - out.pgm +MOSTLYCLEANFILES = \ + pgm16-out16.pgm \ + pgm16-out8.pgm \ + pgm19-out19.pgm \ + pgm19-out8.pgm \ + pgm27-out27.pgm \ + pgm27-out8.pgm \ + pgm_ascii-out.pgm \ + pgm_ascii-out2.pgm \ + pgm-out.pgm \ + pgm-out2.pgm diff --git a/milena/tests/io/pgm/pgm.cc b/milena/tests/io/pgm/pgm.cc index 9fb97df..539eba0 100644 --- a/milena/tests/io/pgm/pgm.cc +++ b/milena/tests/io/pgm/pgm.cc @@ -1,4 +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. // @@ -47,9 +48,9 @@ int main() { image2d<int_u8> lena = io::pgm::load<int_u8>(MLN_IMG_DIR "/lena.pgm"); - io::pgm::save(lena, "out.pgm"); + io::pgm::save(lena, "pgm-out.pgm"); - image2d<int_u8> lena2 = io::pgm::load<int_u8>("out.pgm"); + image2d<int_u8> lena2 = io::pgm::load<int_u8>("pgm-out.pgm"); mln_assertion(lena2 == lena); } @@ -57,9 +58,9 @@ int main() image2d< value::int_u<8> > lena, lena2; io::pgm::load(lena, MLN_IMG_DIR "/lena.pgm"); - io::pgm::save(lena, "out.pgm"); + io::pgm::save(lena, "pgm-out2.pgm"); - io::pgm::load(lena2, "out.pgm"); + io::pgm::load(lena2, "pgm-out2.pgm"); mln_assertion(lena2 == lena); } diff --git a/milena/tests/io/pgm/pgm16.cc b/milena/tests/io/pgm/pgm16.cc index 4cb1e1a..b88886e 100644 --- a/milena/tests/io/pgm/pgm16.cc +++ b/milena/tests/io/pgm/pgm16.cc @@ -1,4 +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. // @@ -76,13 +77,13 @@ int main() image2d<int_u16> out(lena.domain()); out = data::transform(lena, to16bits()); - io::pgm::save(out, "out16.pgm"); + io::pgm::save(out, "pgm16-out16.pgm"); - image2d<int_u16> lena2 = io::pgm::load<int_u16>("out16.pgm"); + image2d<int_u16> lena2 = io::pgm::load<int_u16>("pgm16-out16.pgm"); image2d<int_u8> out2(lena.domain()); out2 = data::transform(lena2, to8bits()); - io::pgm::save(out2, "out8.pgm"); + io::pgm::save(out2, "pgm16-out8.pgm"); } @@ -90,10 +91,10 @@ int main() /* FIXME: Is this dead code, or code not working? Be more specific. */ // Abort // image2d< value::int_u<8> > a; -// io::pgm::load(a, "out16.pgm"); +// io::pgm::load(a, "pgm16-out16.pgm"); image2d< value::int_u<16> > b; - io::pgm::load(b, "out16.pgm"); + io::pgm::load(b, "pgm16-out16.pgm"); } } diff --git a/milena/tests/io/pgm/pgm19.cc b/milena/tests/io/pgm/pgm19.cc index 457547e..7be0fd3 100644 --- a/milena/tests/io/pgm/pgm19.cc +++ b/milena/tests/io/pgm/pgm19.cc @@ -1,4 +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. // @@ -74,12 +75,12 @@ int main() image2d<int_u19> out(lena.domain()); out = data::transform(lena, to19bits()); - io::pgm::save(out, "out19.pgm"); + io::pgm::save(out, "pgm19-out19.pgm"); - image2d<int_u19> lena2 = io::pgm::load<int_u19>("out19.pgm"); + image2d<int_u19> lena2 = io::pgm::load<int_u19>("pgm19-out19.pgm"); image2d<int_u8> out2(lena.domain()); out2 = data::transform(lena2, to8bits()); - io::pgm::save(out2, "out8.pgm"); + io::pgm::save(out2, "pgm19-out8.pgm"); assert(out2 == lena); } diff --git a/milena/tests/io/pgm/pgm27.cc b/milena/tests/io/pgm/pgm27.cc index 2972bb8..e16fbeb 100644 --- a/milena/tests/io/pgm/pgm27.cc +++ b/milena/tests/io/pgm/pgm27.cc @@ -1,4 +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. // @@ -72,14 +73,14 @@ int main() image2d<int_u27> out(lena.domain()); out = data::transform(lena, to27bits()); - io::pgm::save(out, "out27.pgm"); + io::pgm::save(out, "pgm27-out27.pgm"); image2d<int_u27> lena2; - io::pgm::load(lena2, "out27.pgm"); + io::pgm::load(lena2, "pgm27-out27.pgm"); image2d<int_u8> out2(lena.domain()); out2 = data::transform(lena2, to8bits()); - io::pgm::save(out2, "out8.pgm"); + io::pgm::save(out2, "pgm27-out8.pgm"); assert(out2 == lena); } diff --git a/milena/tests/io/pgm/pgm_ascii.cc b/milena/tests/io/pgm/pgm_ascii.cc index f0a29b9..991ee79 100644 --- a/milena/tests/io/pgm/pgm_ascii.cc +++ b/milena/tests/io/pgm/pgm_ascii.cc @@ -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. // @@ -55,10 +55,10 @@ int main() { image2d<unsigned char> lena_ascii; io::pgm::load(lena_ascii, MLN_TESTS_IMG_DIR "/lena_ascii.pgm"); - io::pgm::save(lena_ascii, "out.pgm"); + io::pgm::save(lena_ascii, "pgm_ascii-out.pgm"); image2d<unsigned char> out; - io::pgm::load(out, "out.pgm"); + io::pgm::load(out, "pgm_ascii-out.pgm"); mln_assertion(out == lena_ascii); mln_assertion(lena_raw == out); @@ -74,10 +74,10 @@ int main() { image2d<int_u8> lena_ascii; io::pgm::load(lena_ascii, MLN_TESTS_IMG_DIR "/lena_ascii.pgm"); - io::pgm::save(lena_ascii, "out.pgm"); + io::pgm::save(lena_ascii, "pgm_ascii-out2.pgm"); image2d<unsigned char> out; - io::pgm::load(out, "out.pgm"); + io::pgm::load(out, "pgm_ascii-out2.pgm"); mln_assertion(out == lena_ascii); mln_assertion(lena_raw == out); diff --git a/milena/tests/io/pgms/Makefile.am b/milena/tests/io/pgms/Makefile.am index 9957690..6f89bc9 100644 --- a/milena/tests/io/pgms/Makefile.am +++ b/milena/tests/io/pgms/Makefile.am @@ -13,19 +13,12 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ load - TESTS = $(check_PROGRAMS) - -# FIXME: each test should clean its output, temporary output should -# not be cleaned up by make. -CLEANFILES = out.pgm \ No newline at end of file +MOSTLYCLEANFILES = pgms-out.pgm diff --git a/milena/tests/io/pgms/load.cc b/milena/tests/io/pgms/load.cc index 8380506..d3c3cd7 100644 --- a/milena/tests/io/pgms/load.cc +++ b/milena/tests/io/pgms/load.cc @@ -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. // @@ -52,11 +52,11 @@ int main() image2d<int_u8> lena2 = duplicate(lena); lena2(point2d(0,0)) = 200; - io::pgm::save(lena2, "out.pgm"); + io::pgm::save(lena2, "pgms-out.pgm"); util::array<std::string> files(2); files[0] = MLN_IMG_DIR "/tiny.pgm"; - files[1] = "out.pgm"; + files[1] = "pgms-out.pgm"; image3d<int_u8> ima3d; io::pgms::load(ima3d, files); diff --git a/milena/tests/io/ppm/Makefile.am b/milena/tests/io/ppm/Makefile.am index f7e0431..0afb906 100644 --- a/milena/tests/io/ppm/Makefile.am +++ b/milena/tests/io/ppm/Makefile.am @@ -14,26 +14,19 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ - ppm16 \ - ppm23 \ - ppm - + ppm16 \ + ppm23 \ + ppm TESTS = $(check_PROGRAMS) - - -# FIXME: each test should clean its output, temporary output should -# not be cleaned up by make. -CLEANFILES = \ - out.ppm \ - out16.ppm \ - out23.ppm \ - out8.ppm +MOSTLYCLEANFILES = \ + ppm16-out16.ppm \ + ppm16-out8.ppm \ + ppm23-out23.ppm \ + ppm23-out8.ppm \ + ppm-out.ppm diff --git a/milena/tests/io/ppm/ppm.cc b/milena/tests/io/ppm/ppm.cc index c2dac07..191fba3 100644 --- a/milena/tests/io/ppm/ppm.cc +++ b/milena/tests/io/ppm/ppm.cc @@ -1,4 +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. // @@ -46,9 +47,9 @@ int main() using value::rgb8; image2d<rgb8> lena = io::ppm::load<rgb8>(MLN_IMG_DIR "/lena.ppm"); - io::ppm::save(lena, "out.ppm"); + io::ppm::save(lena, "ppm-out.ppm"); image2d<rgb8> lena2; - io::ppm::load(lena2, "out.ppm"); + io::ppm::load(lena2, "ppm-out.ppm"); mln_assertion(lena2 == lena); } diff --git a/milena/tests/io/ppm/ppm16.cc b/milena/tests/io/ppm/ppm16.cc index f8bdae6..ef21a10 100644 --- a/milena/tests/io/ppm/ppm16.cc +++ b/milena/tests/io/ppm/ppm16.cc @@ -1,4 +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. // @@ -84,10 +85,10 @@ int main() to16bits f; for_all(p) b(p) = f(a(p)); - io::ppm::save(b, "out16.ppm"); + io::ppm::save(b, "ppm16-out16.ppm"); // reload B into C - image2d<rgb16> c = io::ppm::load<rgb16>("out16.ppm"); + image2d<rgb16> c = io::ppm::load<rgb16>("ppm16-out16.ppm"); image2d<rgb8> d(a.domain()); @@ -95,9 +96,9 @@ int main() to8bits g; for_all(p) d(p) = g(c(p)); - io::ppm::save(d, "out8.ppm"); + io::ppm::save(d, "ppm16-out8.ppm"); - // D should equals A + // D shall equal A mln_assertion(d == a); } diff --git a/milena/tests/io/ppm/ppm23.cc b/milena/tests/io/ppm/ppm23.cc index 38759bd..041f7fd 100644 --- a/milena/tests/io/ppm/ppm23.cc +++ b/milena/tests/io/ppm/ppm23.cc @@ -1,4 +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. // @@ -84,11 +85,11 @@ int main() to23bits f; for_all(p) b(p) = f(a(p)); - io::ppm::save(b, "out23.ppm"); + io::ppm::save(b, "ppm23-out23.ppm"); // reload B into C image2d<rgb23> - c = io::ppm::load<rgb23>("out23.ppm"); + c = io::ppm::load<rgb23>("ppm23-out23.ppm"); image2d<rgb8> d(a.domain()); @@ -96,9 +97,9 @@ int main() to8bits g; for_all(p) d(p) = g(c(p)); - io::ppm::save(d, "out8.ppm"); + io::ppm::save(d, "ppm23-out8.ppm"); - // D should equals A + // D shall equal A mln_assertion(d == a); } diff --git a/milena/tests/io/ppms/Makefile.am b/milena/tests/io/ppms/Makefile.am index 2efbbbc..338ab23 100644 --- a/milena/tests/io/ppms/Makefile.am +++ b/milena/tests/io/ppms/Makefile.am @@ -13,19 +13,12 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ load - TESTS = $(check_PROGRAMS) - -# FIXME: each test should clean its output, temporary output should -# not be cleaned up by make. -CLEANFILES = out.ppm \ No newline at end of file +MOSTLYCLEANFILES = load-out.ppm diff --git a/milena/tests/io/ppms/load.cc b/milena/tests/io/ppms/load.cc index d5149cf..8aafd90 100644 --- a/milena/tests/io/ppms/load.cc +++ b/milena/tests/io/ppms/load.cc @@ -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. // @@ -49,16 +49,16 @@ int main() using value::rgb8; image2d<rgb8> ima = io::ppm::load<rgb8>(MLN_IMG_DIR "/fly.ppm"); - io::ppm::save(ima, "out.ppm"); + io::ppm::save(ima, "load-out.ppm"); image2d<rgb8> ima2 = duplicate(ima); ima2(point2d(0,0)) = literal::green; - io::ppm::save(ima2, "out.ppm"); + io::ppm::save(ima2, "load-out.ppm"); util::array<std::string> files(2); files[0] = MLN_IMG_DIR "/fly.ppm"; - files[1] = "out.ppm"; + files[1] = "load-out.ppm"; image3d<rgb8> ima3d; io::ppms::load(ima3d, files); diff --git a/milena/tests/linear/Makefile.am b/milena/tests/linear/Makefile.am index 34991ab..aaccee6 100644 --- a/milena/tests/linear/Makefile.am +++ b/milena/tests/linear/Makefile.am @@ -14,9 +14,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk @@ -45,7 +42,14 @@ gaussian__SOURCES = gaussian.cc TESTS = $(check_PROGRAMS) +MOSTLYCLEANFILES = \ + convolve_2x1d-out.pgm \ + convolve-out.pgm \ + convolve_directional-out.pgm \ + lap-out.pgm \ + log-out.pgm \ + sobel_2d-out.pgm -# FIXME: each test should clean its output, temporary output should -# not be cleaned up by make. -CLEANFILES = out.pgm \ No newline at end of file +#<<lrde +MOSTLYCLEANFILES += gaussian-out.pgm +#>> diff --git a/milena/tests/linear/convolve.cc b/milena/tests/linear/convolve.cc index 6ce41b5..f01096b 100644 --- a/milena/tests/linear/convolve.cc +++ b/milena/tests/linear/convolve.cc @@ -1,4 +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. // @@ -58,5 +59,5 @@ int main() image2d<float> tmp = linear::convolve(lena, w_win); io::pgm::save(data::transform(tmp, math::round<int_u8>()), - "out.pgm"); + "convolve-out.pgm"); } diff --git a/milena/tests/linear/convolve_2x1d.cc b/milena/tests/linear/convolve_2x1d.cc index b923562..17e8c45 100644 --- a/milena/tests/linear/convolve_2x1d.cc +++ b/milena/tests/linear/convolve_2x1d.cc @@ -1,4 +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. // @@ -56,5 +57,5 @@ int main() image2d<float> tmp = linear::convolve_2x1d(lena, hws, vws); io::pgm::save(data::transform(tmp, math::round<int_u8>()), - "out.pgm"); + "convolve_2x1d-out.pgm"); } diff --git a/milena/tests/linear/convolve_directional.cc b/milena/tests/linear/convolve_directional.cc index d5e54f2..7ddb358 100644 --- a/milena/tests/linear/convolve_directional.cc +++ b/milena/tests/linear/convolve_directional.cc @@ -1,4 +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. // @@ -53,5 +54,5 @@ int main() image2d<float> tmp = linear::convolve_directional(lena, 1, ws); io::pgm::save(data::transform(tmp, math::round<int_u8>()), - "out.pgm"); + "convolve_directional-out.pgm"); } diff --git a/milena/tests/linear/gaussian.cc b/milena/tests/linear/gaussian.cc index 324962e..e18959e 100644 --- a/milena/tests/linear/gaussian.cc +++ b/milena/tests/linear/gaussian.cc @@ -1,4 +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. // @@ -50,7 +51,7 @@ int main() io::pgm::load(lena, MLN_IMG_DIR "/lena.pgm"); image2d<value::int_u8> out = linear::gaussian(lena, 5.1f); - io::pgm::save(out, "out.pgm"); + io::pgm::save(out, "gaussian-out.pgm"); image2d<float> lenaf(lena.domain()); diff --git a/milena/tests/linear/gaussian/Makefile.am b/milena/tests/linear/gaussian/Makefile.am index d84628a..8e2897d 100644 --- a/milena/tests/linear/gaussian/Makefile.am +++ b/milena/tests/linear/gaussian/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk @@ -24,6 +21,7 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ filter +MOSTLYCLEANFILES = filter-out.pgm #>> TESTS = $(check_PROGRAMS) diff --git a/milena/tests/linear/gaussian/filter.cc b/milena/tests/linear/gaussian/filter.cc index 27fcb96..52daed4 100644 --- a/milena/tests/linear/gaussian/filter.cc +++ b/milena/tests/linear/gaussian/filter.cc @@ -1,4 +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. // @@ -43,5 +44,5 @@ int main() io::pgm::load(lena, MLN_IMG_DIR "/lena.pgm"); image2d<value::int_u8> out = linear::gaussian::filter(lena, 5.1f); - io::pgm::save(out, "out.pgm"); + io::pgm::save(out, "filter-out.pgm"); } diff --git a/milena/tests/linear/lap.cc b/milena/tests/linear/lap.cc index 6272aed..2c0a2c7 100644 --- a/milena/tests/linear/lap.cc +++ b/milena/tests/linear/lap.cc @@ -1,4 +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. // @@ -46,5 +47,5 @@ int main() io::pgm::load(lena, MLN_IMG_DIR "/lena.pgm"); io::pgm::save(data::stretch(int_u8(), linear::lap_4(lena)), - "out.pgm"); + "lap-out.pgm"); } diff --git a/milena/tests/linear/log.cc b/milena/tests/linear/log.cc index 7b8c5af..5631ea2 100644 --- a/milena/tests/linear/log.cc +++ b/milena/tests/linear/log.cc @@ -1,4 +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. // @@ -56,7 +57,7 @@ int main() } out = data::stretch(int_u8(), tmp); - io::pgm::save(out, "out.pgm"); + io::pgm::save(out, "log-out.pgm"); { int_u8 min, max; estim::min_max(out, min, max); diff --git a/milena/tests/linear/sobel_2d.cc b/milena/tests/linear/sobel_2d.cc index ba274c2..060eaa0 100644 --- a/milena/tests/linear/sobel_2d.cc +++ b/milena/tests/linear/sobel_2d.cc @@ -1,4 +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. // @@ -48,5 +49,5 @@ int main() io::pgm::load(input, MLN_IMG_DIR "/tiny.pgm"); image2d<float> output = linear::sobel_2d_l1_norm(input); - io::pgm::save(data::stretch(int_u8(), output), "out.pgm"); + io::pgm::save(data::stretch(int_u8(), output), "sobel_2d-out.pgm"); } diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am index 468c1df..24b0b06 100644 --- a/milena/tests/morpho/Makefile.am +++ b/milena/tests/morpho/Makefile.am @@ -14,9 +14,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk @@ -63,8 +60,6 @@ check_PROGRAMS = \ # FIXME: Have erosion and dilation perform symmetric tests. - - # --------------- # # Complex tests. # # --------------- # @@ -82,14 +77,22 @@ meyer_wst_long_CXXFLAGS = $(TESTS_CXXFLAGS_SPEED) TESTS = $(check_PROGRAMS) - -# FIXME: each test should clean its output, temporary output should -# not be cleaned up by make. -CLEANFILES = \ - out.ppm \ - out.pbm \ - out3.pgm \ - wst.neato \ - out1.pgm \ - out2.pgm \ - out.pgm +MOSTLYCLEANFILES = \ + artificial_line_graph_image_wst-out.ppm \ + complex_image_wst-wst.neato \ + constrast-out.pgm \ + dilation-out1.pgm \ + dilation-out2.pgm \ + dilation-out3.pgm \ + dilation-out4.pgm \ + dilation-out5.pgm \ + general-out_oct_ref.pgm \ + gradient-out.pgm \ + hit_or_miss-out.pbm \ + laplacian-out.pgm \ + lena_line_graph_image_wst1-out.ppm \ + lena_line_graph_image_wst2-out.ppm \ + meyer_wst-out.pgm \ + meyer_wst_long-out.ppm \ + thinning-out.pbm \ + thinning-out.pgm diff --git a/milena/tests/morpho/approx/Makefile.am b/milena/tests/morpho/approx/Makefile.am index e75ad84..0401d65 100644 --- a/milena/tests/morpho/approx/Makefile.am +++ b/milena/tests/morpho/approx/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk @@ -23,13 +20,10 @@ check_PROGRAMS = \ dilation \ erosion - TESTS = $(check_PROGRAMS) - -# FIXME: each test should clean its output, temporary output should -# not be cleaned up by make. -CLEANFILES = \ - out.pbm \ - ref.pbm - +MOSTLYCLEANFILES = \ + dilation-out.pbm \ + dilation-ref.pbm \ + erosion-out.pbm \ + erosion-ref.pbm diff --git a/milena/tests/morpho/approx/dilation.cc b/milena/tests/morpho/approx/dilation.cc index ddbbf6b..87112dd 100644 --- a/milena/tests/morpho/approx/dilation.cc +++ b/milena/tests/morpho/approx/dilation.cc @@ -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. // @@ -46,12 +46,12 @@ int main() { image2d<bool> ref = morpho::dilation(lena, dsk); - io::pbm::save(ref, "ref.pbm"); + io::pbm::save(ref, "dilation-ref.pbm"); } { image2d<bool> out = morpho::approx::dilation(lena, dsk); - io::pbm::save(out, "out.pbm"); + io::pbm::save(out, "dilation-out.pbm"); } } diff --git a/milena/tests/morpho/approx/erosion.cc b/milena/tests/morpho/approx/erosion.cc index 2913fe7..f0d8b54 100644 --- a/milena/tests/morpho/approx/erosion.cc +++ b/milena/tests/morpho/approx/erosion.cc @@ -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. // @@ -46,12 +46,12 @@ int main() { image2d<bool> ref = morpho::erosion(lena, dsk); - io::pbm::save(ref, "ref.pbm"); + io::pbm::save(ref, "erosion-ref.pbm"); } { image2d<bool> out = morpho::approx::erosion(lena, dsk); - io::pbm::save(out, "out.pbm"); + io::pbm::save(out, "erosion-out.pbm"); } } diff --git a/milena/tests/morpho/artificial_line_graph_image_wst.cc b/milena/tests/morpho/artificial_line_graph_image_wst.cc index 3b019ba..99fce7f 100644 --- a/milena/tests/morpho/artificial_line_graph_image_wst.cc +++ b/milena/tests/morpho/artificial_line_graph_image_wst.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 Olena. // @@ -217,5 +218,5 @@ int main() if (nwsheds >= 2) output(p_out) = literal::red; } - io::ppm::save(output, "out.ppm"); + io::ppm::save(output, "artificial_line_graph_image_wst-out.ppm"); } diff --git a/milena/tests/morpho/closing/Makefile.am b/milena/tests/morpho/closing/Makefile.am index a2fde5c..48c317e 100644 --- a/milena/tests/morpho/closing/Makefile.am +++ b/milena/tests/morpho/closing/Makefile.am @@ -13,33 +13,31 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk SUBDIRS = \ approx -check_PROGRAMS = \ - area_on_vertices \ - leveling \ - algebraic \ - height \ - area \ - volume \ - structural \ - sum - +check_PROGRAMS = \ + area_on_vertices \ + leveling \ + algebraic \ + height \ + area \ + volume \ + structural \ + sum TESTS = $(check_PROGRAMS) - -# FIXME: each test should clean its output, temporary output should -# not be cleaned up by make. -CLEANFILES = \ - ref.pgm \ - out.pbm \ - ref.pbm \ - out.pgm +MOSTLYCLEANFILES = \ + algebraic-out.pgm \ + algebraic-ref.pgm \ + height-out.pgm \ + leveling-out.pgm \ + leveling-ref.pgm \ + structural-out.pgm \ + sum-out.pgm \ + volume-out.pgm \ + volume-ref.pgm diff --git a/milena/tests/morpho/closing/algebraic.cc b/milena/tests/morpho/closing/algebraic.cc index 3714ea1..4853b81 100644 --- a/milena/tests/morpho/closing/algebraic.cc +++ b/milena/tests/morpho/closing/algebraic.cc @@ -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. // @@ -52,11 +52,11 @@ int main() // { // accu::math::count<point2d> a; // io::pgm::save(morpho::closing::algebraic(lena, c4(), a, 10), -// "ref.pgm"); +// "algebraic-ref.pgm"); // } { morpho::attribute::card<I> a; io::pgm::save(morpho::closing::algebraic(lena, c4(), a, 10), - "out.pgm"); + "algebraic-out.pgm"); } } diff --git a/milena/tests/morpho/closing/approx/Makefile.am b/milena/tests/morpho/closing/approx/Makefile.am index cd6e8a2..4bd5c35 100644 --- a/milena/tests/morpho/closing/approx/Makefile.am +++ b/milena/tests/morpho/closing/approx/Makefile.am @@ -13,21 +13,14 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ structural - TESTS = $(check_PROGRAMS) - -# FIXME: each test should clean its output, temporary output should -# not be cleaned up by make. -CLEANFILES = \ - out.pbm \ - ref.pbm +MOSTLYCLEANFILES = \ + structural-out.pbm \ + structural-ref.pbm diff --git a/milena/tests/morpho/closing/approx/structural.cc b/milena/tests/morpho/closing/approx/structural.cc index 8e6d85a..a617d16 100644 --- a/milena/tests/morpho/closing/approx/structural.cc +++ b/milena/tests/morpho/closing/approx/structural.cc @@ -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. // @@ -45,12 +45,12 @@ int main() { ref = morpho::closing::structural(lena, dsk); - io::pbm::save(ref, "ref.pbm"); + io::pbm::save(ref, "structural-ref.pbm"); } { out = morpho::closing::approx::structural(lena, dsk); - io::pbm::save(out, "out.pbm"); + io::pbm::save(out, "structural-out.pbm"); } } diff --git a/milena/tests/morpho/closing/height.cc b/milena/tests/morpho/closing/height.cc index 67e7fb4..6863355 100644 --- a/milena/tests/morpho/closing/height.cc +++ b/milena/tests/morpho/closing/height.cc @@ -1,4 +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. // @@ -42,5 +43,5 @@ int main() image2d<int_u8> lena; io::pgm::load(lena, MLN_IMG_DIR "/tiny.pgm"); - io::pgm::save(morpho::closing::height(lena, c4(), 20), "out.pgm"); + io::pgm::save(morpho::closing::height(lena, c4(), 20), "height-out.pgm"); } diff --git a/milena/tests/morpho/closing/leveling.cc b/milena/tests/morpho/closing/leveling.cc index 409a6ba..32aaf2c 100644 --- a/milena/tests/morpho/closing/leveling.cc +++ b/milena/tests/morpho/closing/leveling.cc @@ -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. // @@ -50,11 +50,11 @@ int main() // { // accu::shape::volume<I> a; // io::pgm::save(morpho::closing::leveling(lena, c4(), a, 10), -// "ref.pgm"); +// "leveling-ref.pgm"); // } { morpho::attribute::volume<I> a; io::pgm::save(morpho::closing::leveling(lena, c4(), a, 10), - "out.pgm"); + "leveling-out.pgm"); } } diff --git a/milena/tests/morpho/closing/structural.cc b/milena/tests/morpho/closing/structural.cc index d28c440..ac925c5 100644 --- a/milena/tests/morpho/closing/structural.cc +++ b/milena/tests/morpho/closing/structural.cc @@ -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. // @@ -49,5 +49,5 @@ int main() out = morpho::closing::structural(lena, convert::to<window2d>(w)); - io::pgm::save(out, "out.pgm"); + io::pgm::save(out, "structural-out.pgm"); } diff --git a/milena/tests/morpho/closing/sum.cc b/milena/tests/morpho/closing/sum.cc index 678681e..258a644 100644 --- a/milena/tests/morpho/closing/sum.cc +++ b/milena/tests/morpho/closing/sum.cc @@ -1,4 +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. // @@ -48,5 +49,5 @@ int main() typedef morpho::attribute::sum<I> A; io::pgm::save(morpho::closing::leveling(lena, c4(), A(), 10000), - "out.pgm"); + "sum-out.pgm"); } diff --git a/milena/tests/morpho/closing/volume.cc b/milena/tests/morpho/closing/volume.cc index 4ae79ab..07bcdcc 100644 --- a/milena/tests/morpho/closing/volume.cc +++ b/milena/tests/morpho/closing/volume.cc @@ -1,4 +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. // @@ -50,9 +51,9 @@ int main() border::resize(lena, 0); io::pgm::save(morpho::closing::volume(lena, c4(), 10000), - "ref.pgm"); + "volume-ref.pgm"); typedef morpho::attribute::volume<I> A; io::pgm::save(morpho::closing::leveling(lena, c4(), A(), 10000), - "out.pgm"); + "volume-out.pgm"); } diff --git a/milena/tests/morpho/complex_image_wst.cc b/milena/tests/morpho/complex_image_wst.cc index ef7adea..843b9dd 100644 --- a/milena/tests/morpho/complex_image_wst.cc +++ b/milena/tests/morpho/complex_image_wst.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 Olena. // @@ -239,7 +240,7 @@ int main() colorize color(nbasins); - std::ofstream g("wst.neato"); + std::ofstream g("complex_image_wst-wst.neato"); g << "graph wst" << std::endl << "{" << std::endl << " graph [bgcolor = \"#000000\"]" << std::endl diff --git a/milena/tests/morpho/contrast.cc b/milena/tests/morpho/contrast.cc index 9daa1e6..5617114 100644 --- a/milena/tests/morpho/contrast.cc +++ b/milena/tests/morpho/contrast.cc @@ -1,4 +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. // @@ -51,7 +52,7 @@ int main() does), and fill it with min_value(V), sot that the post-condition in opening works. */ image2d<int_u8> out = morpho::contrast(lena, rect); - io::pgm::save(out, "out.pgm"); + io::pgm::save(out, "constrast-out.pgm"); { // Self-duality test. diff --git a/milena/tests/morpho/dilation.cc b/milena/tests/morpho/dilation.cc index 7a00f8d..0860653 100644 --- a/milena/tests/morpho/dilation.cc +++ b/milena/tests/morpho/dilation.cc @@ -1,4 +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. // @@ -67,13 +68,13 @@ int main() { image2d<int_u8> out = morpho::dilation(lena, rec); - io::pgm::save(out, "out1.pgm"); + io::pgm::save(out, "dilation-out1.pgm"); } { win::octagon2d oct(7); image2d<int_u8> out = morpho::dilation(lena, oct); - io::pgm::save(out, "out2.pgm"); + io::pgm::save(out, "dilation-out2.pgm"); } { @@ -85,7 +86,7 @@ int main() image2d<int_u8>::fwd_piter p(lena.domain()); for_all(p) test(p) = out(p) ? 255 : 0; - io::pgm::save(test, "out3.pgm"); + io::pgm::save(test, "dilation-out3.pgm"); } /* FIXME: Re-enable these tests for Olena 1.1, when associated @@ -94,12 +95,12 @@ int main() #if 0 { image2d<int_u8> out = morpho::dilation(lena + c4()); - io::pgm::save(out, "out4.pgm"); + io::pgm::save(out, "dilation-out4.pgm"); } { image2d<int_u8> out = morpho::dilation(lena + c8()); - io::pgm::save(out, "out5.pgm"); + io::pgm::save(out, "dilation-out5.pgm"); } #endif } diff --git a/milena/tests/morpho/general.cc b/milena/tests/morpho/general.cc index 97f91b9..d0e935a 100644 --- a/milena/tests/morpho/general.cc +++ b/milena/tests/morpho/general.cc @@ -1,4 +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. // @@ -120,7 +121,7 @@ int main() // Octagon ref = morpho::impl::generic::erosion_on_function(lena, oct); - // io::pgm::save(ref, "out_oct_ref.pgm"); + // io::pgm::save(ref, "general-out_oct_ref.pgm"); */ } diff --git a/milena/tests/morpho/gradient.cc b/milena/tests/morpho/gradient.cc index 132c2d4..75121a4 100644 --- a/milena/tests/morpho/gradient.cc +++ b/milena/tests/morpho/gradient.cc @@ -1,4 +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. // @@ -46,6 +47,6 @@ int main() image2d<int_u8> lena; io::pgm::load(lena, MLN_IMG_DIR "/tiny.pgm"); - io::pgm::save( morpho::gradient(lena, rect), - "out.pgm" ); + io::pgm::save(morpho::gradient(lena, rect), + "gradient-out.pgm"); } diff --git a/milena/tests/morpho/hit_or_miss.cc b/milena/tests/morpho/hit_or_miss.cc index 49ab1ab..551e413 100644 --- a/milena/tests/morpho/hit_or_miss.cc +++ b/milena/tests/morpho/hit_or_miss.cc @@ -1,4 +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. // @@ -75,12 +76,7 @@ int main() image2d<bool> pic; io::pbm::load(pic, MLN_IMG_DIR "/picasso.pbm"); image2d<bool> out = morpho::hit_or_miss(pic, win_hit, win_miss); - // FIXME: We shall handle out images as well as input images. - // Currently, output images are named `out.*', and each test - // overwrites the product(s) of the previous one. Moreover, nothing - // is cleaned upon `make clean', which will probably bother `make - // distcheck'. - io::pbm::save(out, "out.pbm"); + io::pbm::save(out, "hit_or_miss-out.pbm"); mln_postcondition(morpho::hit_or_miss(morpho::complementation(pic), win_miss, win_hit) == out); diff --git a/milena/tests/morpho/laplacian.cc b/milena/tests/morpho/laplacian.cc index 192cdb1..4c4ce58 100644 --- a/milena/tests/morpho/laplacian.cc +++ b/milena/tests/morpho/laplacian.cc @@ -1,4 +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. // @@ -53,6 +54,6 @@ int main() image2d<int> lap(tiny.domain()); morpho::laplacian(tiny, rect, lap); - io::pgm::save( arith::plus_cst< value::int_u_sat<8> >(lap, 128), - "out.pgm" ); + io::pgm::save(arith::plus_cst< value::int_u_sat<8> >(lap, 128), + "laplacian-out.pgm"); } diff --git a/milena/tests/morpho/lena_line_graph_image_wst1.cc b/milena/tests/morpho/lena_line_graph_image_wst1.cc index aef5cc3..0c73e6c 100644 --- a/milena/tests/morpho/lena_line_graph_image_wst1.cc +++ b/milena/tests/morpho/lena_line_graph_image_wst1.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 Olena. // @@ -246,5 +247,5 @@ int main() if (nwsheds >= 2) output(p_out) = literal::red; } - io::ppm::save(output, "out.ppm"); + io::ppm::save(output, "lena_line_graph_image_wst1-out.ppm"); } diff --git a/milena/tests/morpho/lena_line_graph_image_wst2.cc b/milena/tests/morpho/lena_line_graph_image_wst2.cc index ab650b6..6f3aea0 100644 --- a/milena/tests/morpho/lena_line_graph_image_wst2.cc +++ b/milena/tests/morpho/lena_line_graph_image_wst2.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 Olena. // @@ -210,5 +211,5 @@ int main() if (nwsheds >= 2) output(p_out) = literal::red; } - io::ppm::save(output, "out.ppm"); + io::ppm::save(output, "lena_line_graph_image_wst2-out.ppm"); } diff --git a/milena/tests/morpho/meyer_wst.cc b/milena/tests/morpho/meyer_wst.cc index 280ef89..bb5de84 100644 --- a/milena/tests/morpho/meyer_wst.cc +++ b/milena/tests/morpho/meyer_wst.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 Olena. // @@ -51,5 +52,5 @@ int main() L nbasins; image2d<L> output = morpho::meyer_wst(input, c4(), nbasins); - io::pgm::save(output, "out.pgm"); + io::pgm::save(output, "meyer_wst-out.pgm"); } diff --git a/milena/tests/morpho/meyer_wst_long.cc b/milena/tests/morpho/meyer_wst_long.cc index be4a307..7b9ead9 100644 --- a/milena/tests/morpho/meyer_wst_long.cc +++ b/milena/tests/morpho/meyer_wst_long.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 Olena. // @@ -67,5 +68,6 @@ int main() image2d<L> ws = morpho::meyer_wst(clo, c4(), nbasins); // Save the image in color. - io::ppm::save(labeling::colorize(value::rgb8(), ws, nbasins), "out.ppm"); + io::ppm::save(labeling::colorize(value::rgb8(), ws, nbasins), + "meyer_wst_long-out.ppm"); } diff --git a/milena/tests/morpho/opening/Makefile.am b/milena/tests/morpho/opening/Makefile.am index ef3b690..b714cb4 100644 --- a/milena/tests/morpho/opening/Makefile.am +++ b/milena/tests/morpho/opening/Makefile.am @@ -13,32 +13,31 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk SUBDIRS = \ approx -check_PROGRAMS = \ - area_on_vertices \ - leveling \ - algebraic \ - height \ - area \ - volume \ - structural \ - sum - +check_PROGRAMS = \ + area_on_vertices \ + leveling \ + algebraic \ + height \ + area \ + volume \ + structural \ + sum TESTS = $(check_PROGRAMS) - -# FIXME: each test should clean its output, temporary output should -# not be cleaned up by make. -CLEANFILES = \ - approx/out.pbm \ - approx/ref.pbm \ - out.pgm +MOSTLYCLEANFILES = \ + algebraic-out.pgm \ + algebraic-ref.pgm \ + area-out.pgm \ + height-out.pgm \ + leveling-out.pgm \ + leveling-ref.pgm \ + structural-out.pgm \ + sum-out.pgm \ + volume-out.pgm diff --git a/milena/tests/morpho/opening/algebraic.cc b/milena/tests/morpho/opening/algebraic.cc index b463fd2..1cabec1 100644 --- a/milena/tests/morpho/opening/algebraic.cc +++ b/milena/tests/morpho/opening/algebraic.cc @@ -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. // @@ -52,11 +52,11 @@ int main() // { // accu::math::count<point2d> a; // io::pgm::save(morpho::opening::algebraic(lena, c4(), a, 10), -// "ref.pgm"); +// "algebraic-ref.pgm"); // } { morpho::attribute::card<I> a; io::pgm::save(morpho::opening::algebraic(lena, c4(), a, 10), - "out.pgm"); + "algebraic-out.pgm"); } } diff --git a/milena/tests/morpho/opening/approx/Makefile.am b/milena/tests/morpho/opening/approx/Makefile.am index 5d31c71..4bd5c35 100644 --- a/milena/tests/morpho/opening/approx/Makefile.am +++ b/milena/tests/morpho/opening/approx/Makefile.am @@ -13,14 +13,14 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ structural - TESTS = $(check_PROGRAMS) + +MOSTLYCLEANFILES = \ + structural-out.pbm \ + structural-ref.pbm diff --git a/milena/tests/morpho/opening/approx/structural.cc b/milena/tests/morpho/opening/approx/structural.cc index 24d6832..d464f33 100644 --- a/milena/tests/morpho/opening/approx/structural.cc +++ b/milena/tests/morpho/opening/approx/structural.cc @@ -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. // @@ -45,12 +45,12 @@ int main() { ref = morpho::opening::structural(lena, dsk); - io::pbm::save(ref, "ref.pbm"); + io::pbm::save(ref, "structural-ref.pbm"); } { out = morpho::opening::approx::structural(lena, dsk); - io::pbm::save(out, "out.pbm"); + io::pbm::save(out, "structural-out.pbm"); } } diff --git a/milena/tests/morpho/opening/area.cc b/milena/tests/morpho/opening/area.cc index 301d214..53e0f52 100644 --- a/milena/tests/morpho/opening/area.cc +++ b/milena/tests/morpho/opening/area.cc @@ -1,4 +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. // @@ -45,5 +46,5 @@ int main() image2d<int_u8> out(lena.domain()); out = morpho::opening::area(lena, c4(), 510); - io::pgm::save(out, "out.pgm"); + io::pgm::save(out, "area-out.pgm"); } diff --git a/milena/tests/morpho/opening/height.cc b/milena/tests/morpho/opening/height.cc index 8de2f79..41a49a6 100644 --- a/milena/tests/morpho/opening/height.cc +++ b/milena/tests/morpho/opening/height.cc @@ -1,4 +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. // @@ -45,5 +46,5 @@ int main() image2d<int_u8> out(lena.domain()); out = morpho::opening::height(lena, c4(), 20); - io::pgm::save(out, "out.pgm"); + io::pgm::save(out, "height-out.pgm"); } diff --git a/milena/tests/morpho/opening/leveling.cc b/milena/tests/morpho/opening/leveling.cc index 1454b48..e9a574d 100644 --- a/milena/tests/morpho/opening/leveling.cc +++ b/milena/tests/morpho/opening/leveling.cc @@ -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. // @@ -50,11 +50,11 @@ int main() // { // accu::shape::volume<I> a; // io::pgm::save(morpho::opening::leveling(lena, c4(), a, 10), -// "ref.pgm"); +// "leveling-ref.pgm"); // } { morpho::attribute::volume<I> a; io::pgm::save(morpho::opening::leveling(lena, c4(), a, 10), - "out.pgm"); + "leveling-out.pgm"); } } diff --git a/milena/tests/morpho/opening/structural.cc b/milena/tests/morpho/opening/structural.cc index a34c2a4..4dfa6e8 100644 --- a/milena/tests/morpho/opening/structural.cc +++ b/milena/tests/morpho/opening/structural.cc @@ -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. // @@ -49,5 +49,5 @@ int main() out = morpho::opening::structural(lena, convert::to<window2d>(w)); - io::pgm::save(out, "out.pgm"); + io::pgm::save(out, "structural-out.pgm"); } diff --git a/milena/tests/morpho/opening/sum.cc b/milena/tests/morpho/opening/sum.cc index acaf810..c5b1720 100644 --- a/milena/tests/morpho/opening/sum.cc +++ b/milena/tests/morpho/opening/sum.cc @@ -1,4 +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. // @@ -47,5 +48,5 @@ int main() typedef morpho::attribute::sum<I> A; io::pgm::load(lena, MLN_IMG_DIR "/tiny.pgm"); io::pgm::save(morpho::opening::leveling(lena, c4(), A(), 10000), - "out.pgm"); + "sum-out.pgm"); } diff --git a/milena/tests/morpho/opening/volume.cc b/milena/tests/morpho/opening/volume.cc index 2e9d7c7..4a66c7f 100644 --- a/milena/tests/morpho/opening/volume.cc +++ b/milena/tests/morpho/opening/volume.cc @@ -1,4 +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. // @@ -45,5 +46,5 @@ int main() image2d<int_u8> out(lena.domain()); out = morpho::opening::volume(lena, c4(), 10000); - io::pgm::save(out, "out.pgm"); + io::pgm::save(out, "volume-out.pgm"); } diff --git a/milena/tests/morpho/thinning.cc b/milena/tests/morpho/thinning.cc index 913eea6..5be689c 100644 --- a/milena/tests/morpho/thinning.cc +++ b/milena/tests/morpho/thinning.cc @@ -1,4 +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. // @@ -61,11 +62,11 @@ int main() { image2d<bool> pic; io::pbm::load(pic, MLN_IMG_DIR "/picasso.pbm"); - io::pbm::save(morpho::thinning(pic, win_fg, win_bg), "out.pbm"); + io::pbm::save(morpho::thinning(pic, win_fg, win_bg), "thinning-out.pbm"); } // FIXME: Dead code? // { // image2d<int_u8> pic = io::pgm::load(MLN_IMG_DIR "/picasso.pgm"); -// io::pgm::save( morpho::thinning(pic, win_fg, win_bg), "out.pgm" ); +// io::pgm::save( morpho::thinning(pic, win_fg, win_bg), "thinning-out.pgm" ); // } } diff --git a/milena/tests/morpho/watershed/Makefile.am b/milena/tests/morpho/watershed/Makefile.am index f3d102e..7f90c1c 100644 --- a/milena/tests/morpho/watershed/Makefile.am +++ b/milena/tests/morpho/watershed/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/milena/tests/tests.mk @@ -24,13 +21,9 @@ check_PROGRAMS = \ superpose \ topological - TESTS = $(check_PROGRAMS) - -# FIXME: each test should clean its output, temporary output should -# not be cleaned up by make. -CLEANFILES = \ - topo_wst.pgm \ - tmp_ref.pgm \ - tmp_out.pgm +MOSTLYCLEANFILES = \ + flooding-tmp_out.pgm \ + flooding-tmp_ref.pgm \ + topological-out.pgm diff --git a/milena/tests/morpho/watershed/flooding.cc b/milena/tests/morpho/watershed/flooding.cc index 79818ed..71b7928 100644 --- a/milena/tests/morpho/watershed/flooding.cc +++ b/milena/tests/morpho/watershed/flooding.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 Olena. // @@ -68,17 +69,19 @@ int main() { util::timer t; t.start(); - image2d<L> output = morpho::watershed::impl::generic::flooding(input, c4(), n_basins); + image2d<L> output = + morpho::watershed::impl::generic::flooding(input, c4(), n_basins); std::cout << "gen: " << t << std::endl; io::pgm::save(data::transform(output, f_16_to_8()), - "tmp_ref.pgm"); + "flooding-tmp_ref.pgm"); } { util::timer t; t.start(); - image2d<L> output = morpho::watershed::impl::flooding_fastest(input, c4(), n_basins); + image2d<L> output = + morpho::watershed::impl::flooding_fastest(input, c4(), n_basins); std::cout << "fast: " << t << std::endl; io::pgm::save(data::transform(output, f_16_to_8()), - "tmp_out.pgm"); + "flooding-tmp_out.pgm"); } } diff --git a/milena/tests/morpho/watershed/topological.cc b/milena/tests/morpho/watershed/topological.cc index 728b6c8..20c7508 100644 --- a/milena/tests/morpho/watershed/topological.cc +++ b/milena/tests/morpho/watershed/topological.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 Olena. // @@ -51,5 +52,5 @@ int main() io::pgm::load(ima, MLN_IMG_DIR "/small.pgm"); morpho::watershed::topo_wst< ima_t, neighb2d> n(ima, c4()); n.go(); - io::pgm::save(morpho::watershed::topological(n), "topo_wst.pgm"); + io::pgm::save(morpho::watershed::topological(n), "topological-out.pgm"); } -- 1.5.6.5