Commit f4a58aac authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

Fix tests.

	* mln/canvas/morpho/attribute_filter.hh: add a missing inline.

	* mln/registration/icp.hh: fix compilation issues.

	* tests/registration/registration.cc: enlarge the closest_point image
	bbox.

	* tests/transform/bench_closest_point_geodesic.cc: Update call to
	distance_and_closest_point_geodesic.

	* tests/transform/distance_and_closest_point_geodesic.cc: fix
	reference resut.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3478 4aad255d-cdde-0310-9447-f3009e2ae8c0
parent 213b67f7
2009-03-05 Guillaume Lazzara <lazzara@lrde.epita.fr>
Fix tests.
* mln/canvas/morpho/attribute_filter.hh: add a missing inline.
* mln/registration/icp.hh: fix compilation issues.
* tests/registration/registration.cc: enlarge the closest_point image
bbox.
* tests/transform/bench_closest_point_geodesic.cc: Update call to
distance_and_closest_point_geodesic.
* tests/transform/distance_and_closest_point_geodesic.cc: fix
reference resut.
2009-03-04 Etienne FOLIO <folio@lrde.epita.fr>
 
New fast front propagation.
......@@ -446,6 +446,7 @@ namespace mln
// Facade.
template <typename I, typename N, typename A>
inline
mln_concrete(I)
attribute_filter(const Image<I>& input,
const Neighborhood<N>& nbh,
......
......@@ -197,8 +197,8 @@ namespace mln
mln_piter(I) pi(cp_ima_.domain());
for_all(pi)
{
debug(pi) = debug(cp_ima_(pi));
debug2(pi) = debug2(cp_ima_(pi));
debug(pi) = debug(X[cp_ima_(pi)]);
debug2(pi) = debug2(X[cp_ima_(pi)]);
}
io::pbm::save(slice(debug2,0), "debug2-b.ppm");
......
......@@ -56,8 +56,7 @@ int main()
arr_t arr2 = convert::to<arr_t>(img2);
box3d bbox = img2.bbox();
bbox.enlarge(1, 10);
bbox.enlarge(2, 10);
bbox.enlarge(10);
registration::registration1(bbox, arr1, arr2);
//FIXME: Auto test result
}
......@@ -35,9 +35,9 @@
#include <mln/core/alias/neighb3d.hh>
#include <mln/data/fill.hh>
#include <mln/opt/at.hh>
#include <mln/transform/closest_point_geodesic.hh>
#include <mln/transform/distance_and_closest_point_geodesic.hh>
#include <mln/value/int_u8.hh>
#include <mln/util/couple.hh>
int main()
{
......@@ -56,9 +56,8 @@ int main()
std::rand() % nrows,
std::rand() % ncols) = true;
trace::quiet = false;
image3d<point3d> output = transform::closest_point_geodesic(input,
c6(),
mln_max(unsigned));
util::couple<image3d<unsigned>, image3d<point3d> > output =
transform::distance_and_closest_point_geodesic(input,
c6(),
mln_max(unsigned));
}
......@@ -51,15 +51,16 @@ unsigned dmap_ref[] = { 4, 4, 4, 3, 2, 3, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4 };
unsigned cp_idx_ref[] = { 0 , 0 , 82 , 82 , 82 , 82, 82, 0 , 0 ,
0 , 82 , 82 , 82 , 82 , 82, 82, 82, 0 ,
110, 82 , 82 , 82 , 82 , 82, 82, 82, 82,
110, 110, 110, 82 , 82 , 82, 82, 82, 0 ,
110, 110, 110, 110, 82 , 82, 82, 0 , 0 ,
110, 110, 110, 110, 82 , 82, 0 , 0 , 0 ,
110, 110, 110, 110, 110, 0 , 0 , 0 , 0 ,
0 , 110, 110, 110, 0 , 0 , 0 , 0 , 0 ,
0 , 0 , 110, 0 , 0 , 0 , 0 , 0 , 0 };
unsigned cp_idx_ref[] = { 2, 2, 0, 0, 0, 0, 0, 2, 2,
2, 0, 0, 0, 0, 0, 0, 0, 2,
1, 0, 0, 0, 0, 0, 0, 0, 0,
1, 1, 1, 0, 0, 0, 0, 0, 2,
1, 1, 1, 1, 0, 0, 0, 2, 2,
1, 1, 1, 1, 0, 0, 2, 2, 2,
1, 1, 1, 1, 1, 2, 2, 2, 2,
2, 1, 1, 1, 2, 2, 2, 2, 2,
2, 2, 1, 2, 2, 2, 2, 2, 2 };
int main()
{
......
Supports Markdown
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