Changeset 890 for trunk/test/vector_distance_test.cc

Timestamp:

Sep 25, 2007, 11:35:25 AM (16 years ago)

Author:

Markus Ringnér

Message:

Refs #245 #246 #247

File:

• trunk/test/vector_distance_test.cc (modified) (3 diffs)

trunk/test/vector_distance_test.cc

@@ -1 +1 @@
 // $Id$
 
+#include "yat/classifier/DataLookupWeighted1D.h"
+#include "yat/classifier/MatrixLookupWeighted.h"
 #include "yat/statistics/euclidean_vector_distance.h"
 #include "yat/statistics/pearson_vector_distance.h"
+#include "yat/utility/matrix.h"
 #include "yat/utility/vector.h"
 
@@ -23 +26 @@
       std::cout << "vector_distance_test -v : for printing extra information\n";
   }
-  *error << "testing distance" << std::endl;
+  *error << "testing vector_distance" << std::endl;
   bool ok = true;
 
@@ -31 +34 @@
   b(2) = 1;
 
-  *error << "testing Euclidean vector_distance" << std::endl;
+  double tolerance=1e-4;
+
   double dist=statistics::vector_distance(a.begin(),a.end(),b.begin(),
                                           statistics::euclidean_vector_distance_tag());
+  if(fabs(dist-2.23607)>tolerance) {
+    *error << "Error in unweighted Euclidean vector_distance: " << std::endl;
+    ok=false;
+  }
 
-  *error << "Dist: " << dist << std::endl;
-
-
-  *error << "testing Pearson vector_distance" << std::endl;
   dist=statistics::vector_distance(a.begin(),a.end(),b.begin(),
                                           statistics::pearson_vector_distance_tag()); 
-  *error << "Dist: " << dist << std::endl;
+  if(fabs(dist-1.5)>tolerance) {
+    *error << "Error in unweighted Pearson vector_distance: " << std::endl;
+    ok=false;
+  }
 
+  
+  // Testing weighted versions
+  utility::matrix m(2,3,1);
+  m(0,1)=2;
+  m(1,0)=0;
+  m(1,1)=0;
+  utility::matrix w(2,3,1);
+  w(0,0)=0;
+  classifier::MatrixLookupWeighted mw(m,w);
+  classifier::DataLookupWeighted1D aw(mw,0,true);
+  classifier::DataLookupWeighted1D bw(mw,1,true);
+  
+  dist=statistics::vector_distance(aw.begin(),aw.end(),bw.begin(),
+                                          statistics::euclidean_vector_distance_tag());
+  
+  if(fabs(dist-2)>tolerance) {
+    *error << "Error in weighted Euclidean vector_distance: " << std::endl;
+    ok=false;
+  }
+
+  dist=statistics::vector_distance(aw.begin(),aw.end(),bw.begin(),
+                                          statistics::pearson_vector_distance_tag());
+  
+  if(fabs(dist-2)>tolerance) {
+    *error << "Error in weighted Pearson vector_distance: " << std::endl;
+    ok=false;
+  }
 
   if (error!=&std::cerr)