Changeset 453 for trunk/test/svm_test.cc

Timestamp:

Dec 15, 2005, 10:49:23 PM (17 years ago)

Author:

Peter

Message:

changed namespace svm to classifier in test

File:

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

trunk/test/svm_test.cc

@@ -3 +3 @@
 #include <c++_tools/gslapi/matrix.h>
 #include <c++_tools/gslapi/vector.h>
-#include <c++_tools/svm/SVM.h>
-#include <c++_tools/svm/Kernel.h>
-#include <c++_tools/svm/Kernel_SEV.h>
-#include <c++_tools/svm/Kernel_MEV.h>
-#include <c++_tools/svm/PolynomialKernelFunction.h>
+#include <c++_tools/classifier/SVM.h>
+#include <c++_tools/classifier/Kernel.h>
+#include <c++_tools/classifier/Kernel_SEV.h>
+#include <c++_tools/classifier/Kernel_MEV.h>
+#include <c++_tools/classifier/PolynomialKernelFunction.h>
 
 #include <cassert>
@@ -34 +34 @@
   target2(1)=1;
   target2(2)=1;
-  svm::KernelFunction* kf2 = new svm::PolynomialKernelFunction(); 
-  svm::Kernel_MEV kernel2(data2,*kf2);
+  classifier::KernelFunction* kf2 = new classifier::PolynomialKernelFunction(); 
+  classifier::Kernel_MEV kernel2(data2,*kf2);
   assert(kernel2.size()==3);
-  svm::SVM svm2(kernel2, target2);
-  svm2.train();
+  classifier::SVM classifier2(kernel2, target2);
+  classifier2.train();
 
-  if (svm2.alpha()*target2){
+  if (classifier2.alpha()*target2){
     std::cerr << "condition not fullfilled" << std::endl;
     return -1;
   }
 
-  if (svm2.alpha()(1)!=2 || svm2.alpha()(2)!=2){
+  if (classifier2.alpha()(1)!=2 || classifier2.alpha()(2)!=2){
     std::cerr << "wrong alpha" << std::endl;
-    std::cerr << "alpha: " << svm2.alpha() <<  std::endl;
+    std::cerr << "alpha: " << classifier2.alpha() <<  std::endl;
     std::cerr << "expected: 4 2 2" <<  std::endl;
 
@@ -61 +61 @@
   gslapi::matrix data=transposed_data;
 
-  svm::KernelFunction* kf = new svm::PolynomialKernelFunction(); 
-  svm::Kernel_SEV kernel(data,*kf);
+  classifier::KernelFunction* kf = new classifier::PolynomialKernelFunction(); 
+  classifier::Kernel_SEV kernel(data,*kf);
 
 
@@ -73 +73 @@
   is.close();
 
-  theplu::svm::SVM svm(kernel, target);
-  if (!svm.train()){
+  theplu::classifier::SVM classifier(kernel, target);
+  if (!classifier.train()){
     ok=false;
     if (print)
@@ -80 +80 @@
   }
 
-  theplu::gslapi::vector alpha = svm.alpha();
+  theplu::gslapi::vector alpha = classifier.alpha();
       
   // Comparing alpha to alpha_matlab
@@ -92 +92 @@
 
   // Comparing output to target
-  theplu::gslapi::vector output(svm.output());
+  theplu::gslapi::vector output(classifier.output());
   double slack = 0;
   for (unsigned int i=0; i<target.size(); i++){