Changeset 1238 for trunk/test/kernel_test.cc

Timestamp:

Mar 15, 2008, 7:03:05 PM (15 years ago)

Author:

Peter

Message:

working on #223

File:

• trunk/test/kernel_test.cc (modified) (13 diffs)

trunk/test/kernel_test.cc

@@ -23 +23 @@
   02111-1307, USA.
 */
+
+#include "Suite.h"
 
 #include "yat/utility/Matrix.h"
@@ -45 +47 @@
               const classifier::KernelFunction* kf, 
               const utility::Matrix& control, const double error_bound,
-              std::ostream* error);
+              test::Suite& suite);
 
 bool test_SEV(const classifier::MatrixLookup& data, 
               const classifier::KernelFunction* kf, 
               const utility::Matrix& control, const double error_bound,
-              std::ostream* error);
-
-
-int main(const int argc,const char* argv[])
+              test::Suite& suite);
+
+
+int main(int argc, char* argv[])
 
 {  
-  std::ostream* error;
-  if (argc>1 && argv[1]==std::string("-v"))
-    error = &std::cerr;
-  else {
-    error = new std::ofstream("/dev/null");
-    if (argc>1)
-      std::cout << "kernel_test -v : for printing extra information\n";
-  }
-  *error << "testing kernels" << std::endl;
-  bool ok = true;
+  test::Suite suite(argc, argv);
+  suite.err() << "testing kernels" << std::endl;
 
   utility::Matrix data2_core(2,3);
@@ -81 +75 @@
      kernel2(1,0) || kernel2(1,1)!=1 || kernel2(1,2) || 
      kernel2(2,0) || kernel2(2,1) || kernel2(2,2)!=1){
-    ok = false;
-    *error << "Found:\n";
+    suite.add(false);
+    suite.err() << "Found:\n";
     for (size_t i=0; i<3; i++){
       for (size_t j=0; j<3; j++)
-        *error << kernel2(i,j) << " ";
-      *error << std::endl;
+        suite.err() << kernel2(i,j) << " ";
+      suite.err() << std::endl;
     }
-    *error << "Expected:\n0 0 0\n0 1 0\n0 0 1" << std::endl;
+    suite.err() << "Expected:\n0 0 0\n0 1 0\n0 0 1" << std::endl;
   }
   classifier::KernelLookup kv2(kernel2);
   delete kf2;
 
-  // Peter, the hardcoded number below should be changed.
-  double error_bound = 1e-8; 
+  // Peter, the hardcoded number below reflects precision in files
+  // containing kernel matrices calculated in matlab.
+  double error_bound = 1e-6; 
   std::ifstream is("data/nm_data_centralized.txt");
   utility::Matrix data_core(is);
@@ -105 +100 @@
   is.close();
   classifier::KernelFunction* kf = new classifier::PolynomialKernelFunction(); 
-  ok = (ok && test_MEV(data,kf,kernel_matlab,error_bound, error)
-        & test_SEV(data,kf,kernel_matlab,error_bound, error));
+  suite.add(test_MEV(data,kf,kernel_matlab,error_bound, suite) &&
+            test_SEV(data,kf,kernel_matlab,error_bound, suite));
   delete kf;
   
@@ -113 +108 @@
   is.close();
   kf = new classifier::PolynomialKernelFunction(2); 
-  ok = (ok && test_MEV(data,kf,kernel_matlab2,error_bound, error)
-        && test_SEV(data,kf,kernel_matlab2,error_bound, error));
+  suite.add(test_MEV(data,kf,kernel_matlab2,error_bound, suite) &&
+            test_SEV(data,kf,kernel_matlab2,error_bound, suite));
   delete kf;
 
   // Checking that GaussianKernelFunction.
-  *error << "Checking GaussianKernelFunction.\n";
+  suite.err() << "Checking GaussianKernelFunction.\n";
   is.open("data/nm_kernel_gaussian.txt");
   utility::Matrix kernel_gaussian(is);
   is.close();
   kf = new classifier::GaussianKernelFunction(100); 
-  ok = ok && test_MEV(data,kf,kernel_gaussian,error_bound, error);
-  ok = ok && test_SEV(data,kf,kernel_gaussian,error_bound, error);
+  suite.add(test_MEV(data,kf,kernel_gaussian,error_bound, suite));
+  suite.add(test_SEV(data,kf,kernel_gaussian,error_bound, suite));
   delete kf;
 
@@ -134 +129 @@
   classifier::Kernel_SEV kernel(data,pkf);
   
-
-  if (error!=&std::cerr)
-    delete error;
-
-  if (ok=true)  
-    return 0;
-  return -1;
+  return suite.return_value();
 }
 
@@ -146 +135 @@
               const classifier::KernelFunction* kf, 
               const utility::Matrix& control, const double error_bound,
-              std::ostream* error)
+              test::Suite& suite)
 {
-  *error << "testing Kernel_MEV" << std::endl;
+  suite.err() << "testing Kernel_MEV" << std::endl;
   classifier::Kernel_MEV kernel(data,*kf);
   for(u_int i=0;i<control.rows();i++)
     for(u_int j=0;j<control.columns();j++)
-      if (std::abs(kernel(i,j)-control(i,j))>error_bound)
+      if (std::abs(kernel(i,j)-control(i,j))>error_bound){
+        suite.err() << "ERROR: comparing kernel(" << i << "," << j << "): "
+                    << kernel(i,j)
+                    << "\n and control(" << i << "," << j << "): "
+                    << control(i,j) << "\n"
+                    << "difference: " << kernel(i,j)-control(i,j) << "\n"
+                    << "expected less than " << error_bound << "\n";
         return false;
-
+      }
   // checking view
   std::vector<size_t> index_vec(3);
@@ -164 +159 @@
   classifier::KernelLookup kv(kv_raw,index,index);
   if (kv.rows()!=index.size()){
-    *error << "Error: KernelLookup(kernel, index)\n" << std::endl
-           << "Size of KernelLookup is " << kv.rows() << std::endl
-           << "expected " << index.size() << std::endl;
+    suite.err() << "Error: KernelLookup(kernel, index)\n"
+                << "Size of KernelLookup is " << kv.rows() << "\n"
+                << "expected " << index.size() << std::endl;
     
     return false;
@@ -172 +167 @@
   classifier::KernelLookup kv2(kernel);
   if (kv2.rows()!=kernel.size()){
-    *error << "Error: KernelLookup(kernel)\n" << std::endl
+    suite.err() << "Error: KernelLookup(kernel)\n" << std::endl
            << "Size of KernelLookup is " << kv.rows() << std::endl
            << "expected " << kernel.size() << std::endl;
@@ -178 +173 @@
     return false;
   }
-
   return true;
 }
@@ -185 +179 @@
               const classifier::KernelFunction* kf, 
               const utility::Matrix& control, const double error_bound,
-              std::ostream* error)
+              test::Suite& suite)
 {
-  *error << "testing Kernel_SEV" << std::endl;
+  suite.err() << "testing Kernel_SEV" << std::endl;
   classifier::Kernel_SEV kernel(data,*kf);
   for(u_int i=0;i<control.rows();i++)
     for(u_int j=0;j<control.columns();j++)
-      if (std::abs(kernel(i,j)-control(i,j))>error_bound)
+      if (std::abs(kernel(i,j)-control(i,j))>error_bound){
+        suite.err() << "ERROR: comparing kernel(" << i << "," << j << "): "
+                    << kernel(i,j)
+                    << "\n and control(" << i << "," << j << "): "
+                    << control(i,j) << "\n"
+                    << "difference: " << kernel(i,j)-control(i,j) << "\n"
+                    << "expected less than " << error_bound << "\n";
         return false;
+      }
 
   // checking view
@@ -203 +204 @@
   classifier::KernelLookup kv(kv_raw,index, index);
   if (kv.rows()!=index.size()){
-    *error << "Error: KernelLookup(kernel, index)\n" << std::endl
+    suite.err() << "Error: KernelLookup(kernel, index)\n" << std::endl
            << "Size of KernelLookup is " << kv.rows() << std::endl
            << "expected " << index.size() << std::endl;
@@ -211 +212 @@
   classifier::KernelLookup kv2(kernel);
   if (kv2.rows()!=kernel.size()){
-    *error << "Error: KernelLookup(kernel)\n" << std::endl
+    suite.err() << "Error: KernelLookup(kernel)\n" << std::endl
            << "Size of KernelLookup is " << kv.rows() << std::endl
            << "expected " << kernel.size() << std::endl;