URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-02-05 Fabien Freling <freling@lrde.epita.fr> Enable the fastest version of labeling. * fabien/labeling.hh: Fastest version enabled. * fabien/regional_maxima.cc: Launch 10 times the test. --- labeling.hh | 2 +- regional_maxima.cc | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) Index: trunk/milena/sandbox/fabien/regional_maxima.cc =================================================================== --- trunk/milena/sandbox/fabien/regional_maxima.cc (revision 3292) +++ trunk/milena/sandbox/fabien/regional_maxima.cc (revision 3293) @@ -46,9 +46,12 @@ using namespace mln; using value::int_u8; - image2d<int_u8> lena = io::pgm::load<int_u8>(MLN_IMG_DIR "/tiny.pgm"); + image2d<int_u8> lena = io::pgm::load<int_u8>(MLN_IMG_DIR "/lena.pgm"); unsigned n; - debug::println(labeling::regional_maxima(lena, c4(), n)); + for (int i = 0; i < 10; ++i) + { + labeling::regional_maxima(lena, c4(), n); + } mln_assertion(n == 25); } Index: trunk/milena/sandbox/fabien/labeling.hh =================================================================== --- trunk/milena/sandbox/fabien/labeling.hh (revision 3292) +++ trunk/milena/sandbox/fabien/labeling.hh (revision 3293) @@ -530,7 +530,7 @@ && mln_is_simple_neighborhood(N)::value }; - return labeling_sorted_dispatch(metal::false_(), + return labeling_sorted_dispatch(metal::bool_<test>(), input, nbh, nlabels, functor, increasing); }