[libcvd-members] libcvd cvd/tensor_voting.h progs/calibrate.cxx

[Gerhard Reitmayr]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Gerhard Reitmayr <gerhard>      09/04/27 13:42:31

Modified files:
        cvd            : tensor_voting.h 
        progs          : calibrate.cxx 

Log message:
        updated CVD for Zeros change

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/tensor_voting.h?cvsroot=libcvd&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/libcvd/progs/calibrate.cxx?cvsroot=libcvd&r1=1.16&r2=1.17

Patches:
Index: cvd/tensor_voting.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/tensor_voting.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- cvd/tensor_voting.h 14 Apr 2009 12:57:54 -0000      1.7
+++ cvd/tensor_voting.h 27 Apr 2009 13:42:31 -0000      1.8
@@ -84,7 +84,7 @@
                using std::vector;
                using TensorVoting::TV_coord;
 
-               Matrix<2> zero = TooN::Zero;
+               Matrix<2> zero(TooN::Zeros);
                Image<Matrix<2> > field(image.size(), zero);
 
 
@@ -175,8 +175,7 @@
                using std::make_pair;
                using std::vector;
 
-               Matrix<2> zero;
-               TooN::Zero(zero);
+               Matrix<2> zero(TooN::Zeros);
                Image<Matrix<2> > ffield(image.size(), zero);
                Image<__m128> field(image.size());
                field.zero();

Index: progs/calibrate.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/progs/calibrate.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- progs/calibrate.cxx 23 Apr 2009 09:54:47 -0000      1.16
+++ progs/calibrate.cxx 27 Apr 2009 13:42:31 -0000      1.17
@@ -181,8 +181,8 @@
     se3 = start;
 
     for (int iter=0; iter<4; ++iter) {
-       Matrix<6> I = Zero;
-       Vector<6> b = Zero;
+       Matrix<6> I = Zeros;
+       Vector<6> b = Zeros;
        for (size_t i=0; i<p.size(); ++i) {
            Matrix<2,3> J_x;
            Matrix<2,6> J_pose;
@@ -232,7 +232,7 @@
     for (int iter=0; iter<10; ++iter) { 
        Matrix<NP> I = Identity;
        I *= lambda;
-       Vector<NP> b = Zero;
+       Vector<NP> b = Zeros;
        for (size_t i=0; i<p.size(); ++i) {
            Matrix<2,3> J_x;
            Matrix<2,6> J_pose;
@@ -413,16 +413,16 @@
     Matrix<> 
JTJ(CM::num_parameters+ms.size()*6,CM::num_parameters+ms.size()*6);
     Vector<> JTe(JTJ.num_rows());
 
-    JTJ= Zero;
-    Vector<CM::num_parameters> JTep = Zero;
+    JTJ= Zeros;
+    Vector<CM::num_parameters> JTep = Zeros;
 
     for (size_t i=0; i<ms.size(); i++)
     {
-       Matrix<6> poseBlock = Zero;
-       Matrix<CM::num_parameters> paramBlock = Zero;
-       Matrix<CM::num_parameters, 6> offDiag = Zero;
+       Matrix<6> poseBlock = Zeros;
+       Matrix<CM::num_parameters> paramBlock = Zeros;
+       Matrix<CM::num_parameters, 6> offDiag = Zeros;
       
-       Vector<6> JTei = Zero;
+       Vector<6> JTei = Zeros;
       
        for (size_t j=0; j<ms[i].im.size(); j++)
        {
@@ -463,12 +463,12 @@
 void getUncertainty(const vector<MeasurementSet>& ms, const vector<SE3<> >& 
pose, CM& cm, Matrix<CM::num_parameters>& C)
 {
     Matrix<> 
JTJ(CM::num_parameters+ms.size()*6,CM::num_parameters+ms.size()*6);
-    JTJ = Zero;
+    JTJ = Zeros;
     for (size_t i=0; i<ms.size(); i++)
     {
-       Matrix<6> poseBlock = Zero;
-       Matrix<CM::num_parameters> paramBlock = Zero;
-       Matrix<CM::num_parameters, 6> offDiag = Zero;
+       Matrix<6> poseBlock = Zeros;
+       Matrix<CM::num_parameters> paramBlock = Zeros;
+       Matrix<CM::num_parameters, 6> offDiag = Zeros;
        for (size_t j=0; j<ms[i].im.size(); j++)
         {
            Matrix<2,3> J_x;
@@ -488,7 +488,7 @@
     }
     Cholesky<> chol(JTJ);
     Vector<> v(JTJ.num_cols());
-    v = Zero;
+    v = Zeros;
   
     for (int i=0; i<CM::num_parameters; ++i) {
        v[i]=1;
@@ -721,7 +721,7 @@
 
        if(cameraParameters[0] == -1)
        {
-               cameraParameters = Zero;
+               cameraParameters = Zeros;
                cameraParameters[0] = 500;
                cameraParameters[1] = 500;
                cameraParameters[2] = videoBuffer->size().x/2;