Changeset 73

Timestamp:

May 3, 2004, 12:13:24 PM (19 years ago)

Author:

Peter

Message:

changes to match svm class

File:

• trunk/test/test_svm.cc (modified) (2 diffs)

trunk/test/test_svm.cc

@@ -6 +6 @@
 #include "vector.h"
 #include "SVM.h"
+#include "Kernel.h"
+#include "PolynomialKernelFunction.h"
 
 // Standard includes
@@ -18 +20 @@
 
 {  
-  cout << "reading data/nm_kernel.txt" << endl;    
-  //ifstream is("k.txt");
-  ifstream is("data/nm_kernel.txt");
-  theplu::gslapi::matrix kernel(is);
-  is.close();
+  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);
+  theplu::gslapi::matrix k(kernel);
  
-  cout << "reading data/nm_target_bin.txt" << endl;    
-  is.open("data/nm_target_bin.txt");
+  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);
+  is.close();
+
+
+  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;
   
-  theplu::gslapi::vector target(is);
-  is.close();
+  // Comparing output to target
+  theplu::gslapi::vector output = svm.get_output();
+  double slack = 0;
+  for (unsigned int i=0; i<target.size(); i++){
+    if (output[i]*target[i] < 1){
+      slack += 1 - output[i]*target[i];
+    }
+  }
+  cout << "slack:" << slack << endl;
 
-  cout << "data/nm_alpha_linear_matlab.txt" << endl;    
-  is.open("data/nm_alpha_linear_matlab.txt");
-  theplu::gslapi::vector alpha_matlab(is);
-  is.close();
-
-  //training the SVM
-  cout << "Training the SVM" << endl;    
-  theplu::cpptools::SVM svm(kernel, target);
-  cout << "Training the SVM" << endl;    
-  svm.train();
-  
-  //getting alpha
-  cout << "getting alpha" << endl;    
-  theplu::gslapi::vector alpha;
-  alpha =  svm.get_alpha();
-      
-  // Comparing alpha to alpha_matlab
-  theplu::gslapi::vector diff_alpha = alpha - alpha_matlab;
-  cout << "Checking difference" << endl;    
-  cout << diff_alpha*diff_alpha << endl;
-  
-  // Comparing output to target
-  theplu::gslapi::vector output = svm.get_output();
-  double slack = 0;
-  for (unsigned int i=0; i<target.size(); i++){
-   if (output[i]*target[i] < 1){
-    slack += 1 - output[i]*target[i];
-   }
-  }
-  cout << "slack:" << slack << endl;
-
-  //training the SVM
-  cout << "Training the SVM" << endl;    
-  svm.train(1);
-  
-  
   return 0;
 }