Changeset 898 for trunk/test

Timestamp:

Sep 26, 2007, 3:44:19 PM (15 years ago)

Author:

Markus Ringnér

Message:

A first suggestion for how to adress #250. Also removed contamination of namespace std (see #251).

Location:

trunk/test

Files:

• iterator_test.cc (modified) (2 diffs)
• ncc_test.cc (modified) (3 diffs)
• vector_distance_test.cc (modified) (4 diffs)

trunk/test/iterator_test.cc

@@ -24 +24 @@
 #include "yat/classifier/DataLookup1D.h"
 
+#include "yat/classifier/DataLookupWeighted1D.h"
+#include "yat/classifier/MatrixLookupWeighted.h"
 #include "yat/utility/Iterator.h"
+#include "yat/utility/IteratorWeighted.h"
+#include "yat/utility/matrix.h"
 #include "yat/utility/vector.h"
 
@@ -63 +67 @@
   std::sort(begin, end);
 
+  // test std algorithm on IteratorWeighted
+  utility::matrix m(1,3,1);
+  m(0,1)=2.0;
+  utility::matrix w(1,3,1);
+  classifier::MatrixLookupWeighted mw(m,w);
+  classifier::DataLookupWeighted1D aw(mw,0,true);
+  size_t nof1=std::count(aw.begin(),aw.end(),1.0);
+  if(nof1!=2) {
+    *message << "std algoritm with IteratorWeighted failed" << std::endl;
+    ok=false;
+  }
+
   if (!ok)
     *message << "iterator test failed" << std::endl;

trunk/test/ncc_test.cc

@@ -28 +28 @@
 #include "yat/classifier/Target.h"
 #include "yat/utility/matrix.h"
-#include "yat/statistics/PearsonDistance.h"
+#include "yat/statistics/vector_distance_ptr.h"
+#include "yat/statistics/pearson_vector_distance.h"
 #include "yat/utility/utility.h"
 
@@ -71 +72 @@
       
   classifier::MatrixLookupWeighted dataviewweighted(data,weights);
-  statistics::PearsonDistance pearson;  
-  classifier::NCC ncc(dataviewweighted,targets,pearson);
+  statistics::vector_distance_lookup_weighted_ptr distance=
+    statistics::vector_distance<statistics::pearson_vector_distance_tag>;
+  classifier::NCC ncc(dataviewweighted,targets,distance);
   ncc.train();
 
@@ -127 +129 @@
   
 
-  // Testing IGP  
-  classifier:: MatrixLookup dataview(data);
-  *error << "testing igp" << std::endl;
-  classifier::IGP igp(dataview,targets,pearson);
-  *error << igp.score() << std::endl;
-
   if(ok)
     *error << "OK" << std::endl;

trunk/test/vector_distance_test.cc

@@ -5 +5 @@
 #include "yat/statistics/euclidean_vector_distance.h"
 #include "yat/statistics/pearson_vector_distance.h"
+#include "yat/statistics/vector_distance_ptr.h"
 #include "yat/utility/matrix.h"
 #include "yat/utility/vector.h"
@@ -14 +15 @@
 
 using namespace theplu::yat;
+
+
+// Function to test pointers to distance specialized for DataLookup1D::iterator
+double f(statistics::vector_distance_lookup_weighted_ptr distance) {
+  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);
+  
+  double dist=(*distance)(aw.begin(),aw.end(),bw.begin());
+  return dist;  
+}
 
 int main(const int argc,const char* argv[])
@@ -63 +81 @@
   
   dist=statistics::vector_distance(aw.begin(),aw.end(),bw.begin(),
-                                          statistics::euclidean_vector_distance_tag());
+                                   statistics::euclidean_vector_distance_tag());
   
   if(fabs(dist-2)>tolerance) {
@@ -79 +97 @@
 
 
-  // Test with reference to a vector_distance_tag
-  statistics::euclidean_vector_distance_tag tag;
-  statistics::vector_distance_tag& tagref=tag;
-  dist=statistics::vector_distance(aw.begin(),aw.end(),bw.begin(),tagref);
-  *error << "Dist: " << dist << std::endl;
+  // 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=
+    statistics::vector_distance<statistics::euclidean_vector_distance_tag>;
+  dist=(*test_ptr)(aw.begin(),aw.end(),bw.begin());
+  if(fabs(dist-2)>tolerance) {
+    *error << "Error when using pointer to vector_distance" << std::endl;
+    ok=false;
+  }
+
+  if(!ok) {
+    *error << "vector_distance_test failed" << std::endl;
+  }
   if (error!=&std::cerr)
     delete error;
-
   if (ok=true)  
     return 0;