https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox
Index: ChangeLog
from Thierry Geraud <thierry.geraud(a)lrde.epita.fr>
Fix fastest distance computation.
* folio/distance_front.cc (main): Remove echo.
Test equality between generic and fastest results.
* folio/distance_front_new.hh
(distance_front_fastest): Fix erroneous line moves.
distance_front.cc | 6 ++++--
distance_front_new.hh | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
Index: folio/distance_front.cc
--- folio/distance_front.cc (revision 3479)
+++ folio/distance_front.cc (working copy)
@@ -38,6 +38,7 @@
#include <mln/data/fill.hh>
#include <mln/debug/println.hh>
#include <mln/opt/at.hh>
+#include <mln/level/compare.hh>
# include <mln/transform/internal/distance_functor.hh>
# include "distance_front_new.hh"
@@ -74,13 +75,14 @@
w_win,
dmax,
f);
- debug::println("ref", ref);
+ // debug::println("ref", ref);
output = canvas::impl::distance_front_fastest(input,
nbh,
w_win,
dmax,
f);
- debug::println("output", output);
+ // debug::println("output", output);
+ mln_invariant(output == ref);
}
Index: folio/distance_front_new.hh
--- folio/distance_front_new.hh (revision 3479)
+++ folio/distance_front_new.hh (working copy)
@@ -316,10 +316,10 @@
}
}
}
+ }
bucket_size -= bucket_d.size();
bucket_d.clear();
}
- }
} // end of Propagation.
trace::exiting("canvas::impl::distance_front_fastest");