Changeset 1075

Timestamp:

Feb 12, 2008, 1:55:31 PM (16 years ago)

Author:

Markus Ringnér

Message:

Fixed bug in test

File:

• trunk/test/ncc_test.cc (modified) (6 diffs)

trunk/test/ncc_test.cc

@@ -86 +86 @@
   // A test of predictions using unweighted data
   /////////////////////////////////////////////
+  *error << "test of predictions using unweighted test data\n";
   utility::matrix data1(3,4);
   for(size_t i=0;i<3;i++) {
@@ -119 +120 @@
   // A test of predictions using unweighted training and weighted test data
   //////////////////////////////////////////////////////////////////////////
+  *error << "test of predictions using unweighted training and weighted test data\n";
   utility::matrix weights1(3,4,1.0);
   weights1(0,0)=weights1(1,1)=weights1(2,2)=weights1(1,3)=0.0;
@@ -137 +139 @@
   // A test of predictions using Sorlie data
   //////////////////////////////////////////////////////////////////////////
+  *error << "test with Sorlie data\n";
   std::ifstream is("data/sorlie_centroid_data.txt");
   utility::matrix data(is,'\t');
@@ -150 +153 @@
       
   classifier::MatrixLookupWeighted dataviewweighted(data,weights);
-  classifier::NCC<statistics::EuclideanDistance> ncc(dataviewweighted,targets);
+  classifier::NCC<statistics::PearsonDistance> ncc(dataviewweighted,targets);
   *error << "training...\n";
   ncc.train();
@@ -200 +203 @@
   classifier::Kernel_MEV kernel(ml,kf);
   classifier::DataLookup2D* dl_kernel = new classifier::KernelLookup(kernel); 
+  bool catch_error=false;
   try {
-    ok=0; // should catch error here
+    catch_error=false; // should catch error here
     *error << ncc.make_classifier(*dl_kernel,target) << std::endl;
   }
   catch (std::runtime_error) {    
     *error << "caught expected bad cast runtime_error" << std::endl;
-    ok=1;
+    catch_error=true;
+  }
+  if(!catch_error) {
+    ok=false;
   }
   try {
-    ok=0; // should catch error here
+    catch_error=false; // should catch error here
     ncc.predict(*dl_kernel,prediction); 
   }
   catch (std::runtime_error) {    
     *error << "caught expected bad cast runtime_error" << std::endl;
-    ok=1;
+    catch_error=true;
+  }
+  if(!catch_error) {
+    ok=false;
   }
   delete dl_kernel;
@@ -220 +230 @@
   if(ok)
     *error << "OK" << std::endl;
+  else
+    *error << "FAILED" << std::endl;
 
   if (error!=&std::cerr)