Changeset 1031 for trunk/test

Timestamp:

Feb 4, 2008, 4:44:44 PM (15 years ago)

Author:

Markus Ringnér

Message:

Fixes #272

Location:

trunk/test

Files:

• knn_test.cc (modified) (2 diffs)
• ncc_test.cc (modified) (4 diffs)
• vector_distance_test.cc (modified) (6 diffs)

trunk/test/knn_test.cc

@@ -24 +24 @@
 #include "yat/classifier/KNN.h"
 #include "yat/classifier/MatrixLookupWeighted.h"
-#include "yat/statistics/euclidean_vector_distance.h"
-#include "yat/statistics/pearson_vector_distance.h"
+#include "yat/statistics/euclidean_distance.h"
+#include "yat/statistics/pearson_distance.h"
 #include "yat/utility/matrix.h"
 
@@ -66 +66 @@
 
   classifier::MatrixLookupWeighted dataviewweighted(data,weights);
-  classifier::KNN<statistics::pearson_vector_distance_tag> knn(dataviewweighted,targets);
+  classifier::KNN<statistics::pearson_distance_tag> knn(dataviewweighted,targets);
   *error << "training KNN" << std::endl;
   knn.train();

trunk/test/ncc_test.cc

@@ -31 +31 @@
 #include "yat/classifier/Target.h"
 #include "yat/utility/matrix.h"
-#include "yat/statistics/euclidean_vector_distance.h"
-#include "yat/statistics/pearson_vector_distance.h"
+#include "yat/statistics/euclidean_distance.h"
+#include "yat/statistics/pearson_distance.h"
 #include "yat/utility/utility.h"
 
@@ -78 +78 @@
   vec[3]="bjds";
   classifier::Target target(vec);
-  classifier::NCC<statistics::pearson_vector_distance_tag> ncctmp(ml,target);
+  classifier::NCC<statistics::pearson_distance_tag> ncctmp(ml,target);
   *error << "training...\n";
   ncctmp.train();
@@ -100 +100 @@
   classifier::Target target1(vec1);
 
-  classifier::NCC<statistics::euclidean_vector_distance_tag> ncc1(ml1,target1);
+  classifier::NCC<statistics::euclidean_distance_tag> ncc1(ml1,target1);
   ncc1.train();
   utility::matrix prediction1;
@@ -150 +150 @@
       
   classifier::MatrixLookupWeighted dataviewweighted(data,weights);
-  classifier::NCC<statistics::pearson_vector_distance_tag> ncc(dataviewweighted,targets);
+  classifier::NCC<statistics::pearson_distance_tag> ncc(dataviewweighted,targets);
   *error << "training...\n";
   ncc.train();

trunk/test/vector_distance_test.cc

@@ -24 +24 @@
 #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/statistics/euclidean_distance.h"
+#include "yat/statistics/pearson_distance.h"
 #include "yat/utility/matrix.h"
 #include "yat/utility/vector.h"
@@ -47 +47 @@
     error = new std::ofstream("/dev/null");
     if (argc>1)
-      std::cout << "vector_distance_test -v : for printing extra information\n";
+      std::cout << "distance_test -v : for printing extra information\n";
   }
-  *error << "testing vector_distance" << std::endl;
+  *error << "testing distance" << std::endl;
   bool ok = true;
   
@@ -59 +59 @@
   double tolerance=1e-4;
   
-  double dist=statistics::vector_distance(a.begin(),a.end(),b.begin(),
-                                          statistics::euclidean_vector_distance_tag());
+  double dist=statistics::distance(a.begin(),a.end(),b.begin(),
+                                          statistics::euclidean_distance_tag());
   if(fabs(dist-2.23607)>tolerance) {
-    *error << "Error in unweighted Euclidean vector_distance " << std::endl;
+    *error << "Error in unweighted Euclidean distance " << std::endl;
     ok=false;
   }
   
-  dist=statistics::vector_distance(a.begin(),a.end(),b.begin(),
-                                   statistics::pearson_vector_distance_tag());  
+  dist=statistics::distance(a.begin(),a.end(),b.begin(),
+                                   statistics::pearson_distance_tag()); 
   if(fabs(dist-1.5)>tolerance) {
-    *error << "Error in unweighted Pearson vector_distance " << std::endl;
+    *error << "Error in unweighted Pearson distance " << std::endl;
     ok=false;
   }
@@ -85 +85 @@
   classifier::DataLookupWeighted1D bw(mw,1,true);
   
-  dist=statistics::vector_distance(aw.begin(),aw.end(),bw.begin(),
-                                   statistics::euclidean_vector_distance_tag());
+  dist=statistics::distance(aw.begin(),aw.end(),bw.begin(),
+                                   statistics::euclidean_distance_tag());
   
   if(fabs(dist-sqrt(6))>tolerance) {
-    *error << "Error in weighted Euclidean vector_distance " << std::endl;
+    *error << "Error in weighted Euclidean distance " << std::endl;
     ok=false;
   }
   
-  dist=statistics::vector_distance(aw.begin(),aw.end(),bw.begin(),
-                                   statistics::pearson_vector_distance_tag());
+  dist=statistics::distance(aw.begin(),aw.end(),bw.begin(),
+                                   statistics::pearson_distance_tag());
   
   if(fabs(dist-2)>tolerance) {
-    *error << "Error in weighted Pearson vector_distance " << std::endl;
+    *error << "Error in weighted Pearson distance " << std::endl;
     ok=false;
   }
@@ -108 +108 @@
   sb[2] = 1;
   
-  dist=statistics::vector_distance(sa.begin(),sa.end(),sb.begin(),
-                                   statistics::euclidean_vector_distance_tag());  
+  dist=statistics::distance(sa.begin(),sa.end(),sb.begin(),
+                                   statistics::euclidean_distance_tag()); 
   if(fabs(dist-2.23607)>tolerance) {
-    *error << "Error in vector_distance for std::vector " << std::endl;
+    *error << "Error in distance for std::vector " << std::endl;
     ok=false;
   }
@@ -118 +118 @@
   std::list<double> la;
   std::copy(sa.begin(),sa.end(),std::back_inserter<std::list<double> >(la));
-  dist=statistics::vector_distance(la.begin(),la.end(),sb.begin(),
-                                   statistics::euclidean_vector_distance_tag());  
+  dist=statistics::distance(la.begin(),la.end(),sb.begin(),
+                                   statistics::euclidean_distance_tag()); 
   if(fabs(dist-2.23607)>tolerance) {
-    *error << "Error in vector_distance for std::list " << std::endl;
+    *error << "Error in distance for std::list " << std::endl;
     ok=false;
   }
   
   if(!ok) {
-    *error << "vector_distance_test failed" << std::endl;
+    *error << "distance_test failed" << std::endl;
   }
   if (error!=&std::cerr)