Changeset 900 for trunk/test/vector_distance_test.cc

Timestamp:

Sep 27, 2007, 9:10:33 AM (16 years ago)

Author:

Markus Ringnér

Message:

Refs #251. Fixed so the unweighted distances are at the forward-iterator level. To test this I added a distance calculation between a list and a vector in vector_distance_test (also fixed its indentation)

File:

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

trunk/test/vector_distance_test.cc

@@ -12 +12 @@
 #include <fstream>
 #include <iostream>
+#include <list>
+#include <string>
+#include <vector>
 
 
@@ -46 +49 @@
   *error << "testing vector_distance" << std::endl;
   bool ok = true;
-
+  
   utility::vector a(3,1);
   a(1) = 2;
   utility::vector b(3,0);
   b(2) = 1;
-
+  
   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;
+    *error << "Error in unweighted Euclidean vector_distance " << std::endl;
     ok=false;
   }
-
+  
   dist=statistics::vector_distance(a.begin(),a.end(),b.begin(),
-                                          statistics::pearson_vector_distance_tag()); 
+                                   statistics::pearson_vector_distance_tag());  
   if(fabs(dist-1.5)>tolerance) {
-    *error << "Error in unweighted Pearson vector_distance: " << std::endl;
+    *error << "Error in unweighted Pearson vector_distance " << std::endl;
     ok=false;
   }
-
+  
   
   // Testing weighted versions
@@ -84 +87 @@
   
   if(fabs(dist-2)>tolerance) {
-    *error << "Error in weighted Euclidean vector_distance: " << std::endl;
+    *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());
+                                   statistics::pearson_vector_distance_tag());
   
   if(fabs(dist-2)>tolerance) {
-    *error << "Error in weighted Pearson vector_distance: " << std::endl;
+    *error << "Error in weighted Pearson vector_distance " << std::endl;
     ok=false;
   }
-
-
-  // Test with std::vectors
-  std::vector<double> sa(3,1);
-  sa[1] = 2;
-  std::vector<double> sb(3,0);
-  sb[2] = 1;
-
-  dist=statistics::vector_distance(sa.begin(),sa.end(),sb.begin(),
-                                   statistics::euclidean_vector_distance_tag());  if(fabs(dist-2.23607)>tolerance) {
-    *error << "Error in vector_distance for std::vector: " << std::endl;
-    ok=false;
-  }
-
-
+  
+  
   // Test with pointer to a vector_distance
   statistics::vector_distance_lookup_weighted_ptr test_ptr=
@@ -118 +108 @@
     ok=false;
   }
-
+  
+  // Test with std::vectors
+  std::vector<double> sa(3,1);
+  sa[1] = 2;
+  std::vector<double> sb(3,0);
+  sb[2] = 1;
+  
+  dist=statistics::vector_distance(sa.begin(),sa.end(),sb.begin(),
+                                   statistics::euclidean_vector_distance_tag());  
+  if(fabs(dist-2.23607)>tolerance) {
+    *error << "Error in vector_distance for std::vector " << std::endl;
+    ok=false;
+  }
+  
+  // Test for a std::list and a std::vector
+  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());  
+  if(fabs(dist-2.23607)>tolerance) {
+    *error << "Error in vector_distance for std::list " << std::endl;
+    ok=false;
+  }
+  
   if(!ok) {
     *error << "vector_distance_test failed" << std::endl;