Changeset 926 for trunk/test

Timestamp:

Oct 3, 2007, 8:11:31 AM (15 years ago)

Author:

Markus Ringnér

Message:

Fixing minor mistakes so things gets installed with make install

File:

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

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"
@@ -17 +16 @@
 
 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[])
@@ -98 +80 @@
   }
   
-  
-  // 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;
-  }
-  
+    
   // Test with std::vectors
   std::vector<double> sa(3,1);