https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Ugo Jardonnet &lt;ugo.jardonnet(a)lrde.epita.fr&gt; Sandbox: ICP: Icp Final Translation. This patch allows icp to neglect errors due to �noise� in the image registarted. * sandbox/jardonnet/test/icp.cc: Add final translation. * sandbox/jardonnet/test/length.ppm: Add Xk points (green). registration/quat7.hh | 2 ++ test/icp.cc | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) Index: sandbox/jardonnet/test/icp.cc --- sandbox/jardonnet/test/icp.cc (revision 1892) +++ sandbox/jardonnet/test/icp.cc (working copy) @@ -68,8 +68,6 @@ const box_<point2d> box2d(400,700); image2d<value::rgb8> output(box2d, 1); - - std::vector<float> length(c.npoints()); //mean + length float mean = 0; @@ -90,9 +88,41 @@ stdev = math::sqrt(stdev); std::cout << stdev << std::endl; + //final translate translate using point only separated less than 2*stdev + //mu_Xk = center map(Ck) + algebra::vec<3,float> mu_Xk(literal::zero); + algebra::vec<3,float> mu_C(literal::zero); + float nb_point = 0; + for (size_t i = 0; i < c.npoints(); ++i) + { + if (length[i] > 2 * stdev) + { + algebra::vec<3,float> xki = map(c[i]); + algebra::vec<3,float> ci = c[i]; + mu_C += ci; + + mu_Xk += xki; + nb_point++; + } + } + mu_C /= nb_point; + mu_Xk /= nb_point; + + // qT + const algebra::vec<3,float> qT = mu_Xk - mu_C; + + //translate + for (size_t i = 0; i < c.npoints(); ++i) + { + algebra::vec<3,float> ci = c[i]; + ci -= qT; + c.hook_()[i] = algebra::to_point<point3d>(ci); + } + //to 2d : projection (FIXME:if 3d) for (size_t i = 0; i < c.npoints(); i++) { + //Ck points point2d p(c[i][0], c[i][1]); if (output.has(p)) { @@ -103,6 +133,10 @@ else output(p) = value::rgb8(255,255,255); } + //Xk points + point2d x(map(c[i])[0], map(c[i])[1]); + if (output.has(x)) + output(x) = value::rgb8(0,255,0); } io::ppm::save(output, "registred.ppm"); Index: sandbox/jardonnet/test/length.ppm Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: sandbox/jardonnet/registration/quat7.hh --- sandbox/jardonnet/registration/quat7.hh (revision 1892) +++ sandbox/jardonnet/registration/quat7.hh (working copy) @@ -138,12 +138,14 @@ } mu_Xk /= c_length; + // qR algebra::mat<P::dim,P::dim,float> Mk(literal::zero); for (size_t i = 0; i < c_length; ++i) { algebra::vec<P::dim,float> Ci = C[i]; algebra::vec<P::dim,float> Xki = map(Ck[i]); + Mk += make::mat(Ci - mu_C) * trans(make::mat(Xki - mu_Xk)); } Mk /= c_length;