Changeset 116

Timestamp:

Jul 19, 2004, 4:40:11 PM (19 years ago)

Author:

Peter

Message:

test_crossvalidation and test_statistics added

Location:

trunk/test

Files:

• Makefile.am (modified) (2 diffs)
• test_crossvalidation.cc (added)
• test_statistics.cc (added)
• test_svm.cc (modified) (3 diffs)

trunk/test/Makefile.am

@@ -3 +3 @@
 ## $Id$
 
-check_PROGRAMS = test_kernel test_merge test_pca test_rnd test_roc \
-     test_svd test_svm test_wead
+check_PROGRAMS = test_crossvalidation test_kernel test_merge test_pca test_rnd test_roc \
+     test_statistics test_svd test_svm test_wead
+
+test_crossvalidation_SOURCES = test_crossvalidation.cc
+test_crossvalidation_LDADD = @top_srcdir@/$(CPP_TOOLS_LIB_LOCATION)/$(CPP_TOOLS_LIB) \
+    $(GSL_LIB) $(CBLAS_LIB) $(MATH_LIB)
 
 test_kernel_SOURCES = test_kernel.cc
@@ -26 +30 @@
     $(GSL_LIB) $(CBLAS_LIB) $(MATH_LIB)
 
+test_statistics_SOURCES = test_statistics.cc
+test_statistics_LDADD = @top_srcdir@/$(CPP_TOOLS_LIB_LOCATION)/$(CPP_TOOLS_LIB) \
+    $(GSL_LIB) $(CBLAS_LIB) $(MATH_LIB)
+
 test_svd_SOURCES = test_svd.cc
 test_svd_LDADD = @top_srcdir@/$(CPP_TOOLS_LIB_LOCATION)/$(CPP_TOOLS_LIB) \

trunk/test/test_svm.cc

@@ -20 +20 @@
 
 {  
-  cout << "reading data/nm_kernel.txt" << endl;
   ifstream is("data/nm_kernel.txt");
   theplu::gslapi::matrix kernel(is);
   is.close();
-
   theplu::gslapi::matrix k(kernel);
  
-  cout << "reading data/nm_target_bin.txt" << endl;
   is.open("data/nm_target_bin.txt");
   theplu::gslapi::vector target(is);
   is.close();
 
-  cout << "reading data/nm_alpha_linear_matlab.txt" << endl;
   is.open("data/nm_alpha_linear_matlab.txt");
   theplu::gslapi::vector alpha_matlab(is);
@@ -38 +34 @@
 
 
-  cout << "create svm" << endl;
   theplu::cpptools::SVM svm(kernel, target);
-  cout << "train" << endl;
   svm.train();
-  cout << "get alpha" << endl;
+
   theplu::gslapi::vector alpha = svm.get_alpha();
       
   // Comparing alpha to alpha_matlab
   theplu::gslapi::vector diff_alpha = alpha - alpha_matlab;
-  cout << diff_alpha*diff_alpha << endl;
-  
+  if (diff_alpha*diff_alpha> pow(10.0,-10)){
+    cerr << "Difference to matlab alphas too large/n";
+    return -1;
+  }
   // Comparing output to target
   theplu::gslapi::vector output = svm.get_output();
@@ -57 +53 @@
     }
   }
-  cout << "slack:" << slack << endl;
-
+  if (slack > pow(10.0,-10)){
+    cerr << "Difference to matlab alphas too large/n";
+    return -1;
+  }
   return 0;
+  
 }