Commit 165770fe authored by Roland Levillain's avatar Roland Levillain
Browse files

Canonize Milena's tests' output file names.

	* 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.
parent 4ef67060
2010-04-26 Roland Levillain <roland@lrde.epita.fr>
Canonize Milena's tests' output file names.
* 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-05-11 Roland Levillain <roland@lrde.epita.fr>
 
Add missing const qualifiers in iterators on complexes.
# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
#
......@@ -23,9 +24,6 @@ threshold_SOURCES = threshold.cc
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
// 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");
}
}
......@@ -63,13 +63,10 @@ update_SOURCES = update.cc
# FIXME: enable it when make full-check is enabled.
#fill_full_SOURCES = fill_full.cc
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
......@@ -33,9 +33,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
// 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");
}
}
// 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");
}
}
// 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");
}
}
......@@ -33,8 +33,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
// 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");
}
# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
......@@ -23,7 +23,9 @@ dump_SOURCES = dump.cc
TESTS = $(check_PROGRAMS)
# FIXME: each test should clean its output, temporary output should
# not be cleaned up by make.
CLEANFILES = pic.dump
MOSTLYCLEANFILES = \
dump-bool.dump \
dump-float.dump \
dump-int_u8.dump \
dump-rgb8.dump \
dump-unsigned.dump
// 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);
......
# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
#
......@@ -25,10 +26,6 @@ fits_SOURCES = fits.cc
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
// 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);
}
}
# 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.
#
......@@ -28,10 +28,6 @@ save_SOURCES = save.cc
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
// 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);
}
# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
#
......@@ -19,7 +20,6 @@ include $(top_srcdir)/milena/tests/tests.mk
check_PROGRAMS = \
load_bin \
load_save_bin \
\
load_float
load_bin_SOURCES = load_bin.cc
......@@ -29,8 +29,4 @@ load_float_SOURCES = load_float.cc
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
// 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");
}
# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
#
......@@ -17,15 +18,14 @@
include $(top_srcdir)/milena/tests/tests.mk
check_PROGRAMS = \
pbm \
pbm_ascii
pbm \
pbm_ascii
pbm_SOURCES = pbm.cc
pbm_ascii_SOURCES = pbm_ascii.cc
TESTS = $(check_PROGRAMS)
# FIXME: each test should clean its output, temporary output should
# not be cleaned up by make.
CLEANFILES = out.pbm
MOSTLYCLEANFILES = \
pbm-out.pbm \
pbm_ascii-out.pbm
// 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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment