Changeset 453 for trunk/test/kernel_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/kernel_test.cc (modified) (7 diffs)

trunk/test/kernel_test.cc

@@ -6 +6 @@
 #include <c++_tools/gslapi/matrix.h>
 #include <c++_tools/gslapi/vector.h>
-#include <c++_tools/svm/KernelFunction.h>
-#include <c++_tools/svm/PolynomialKernelFunction.h>
-#include <c++_tools/svm/GaussianKernelFunction.h>
-#include <c++_tools/svm/KernelView.h>
-#include <c++_tools/svm/Kernel_MEV.h>
-#include <c++_tools/svm/Kernel_SEV.h>
+#include <c++_tools/classifier/KernelFunction.h>
+#include <c++_tools/classifier/PolynomialKernelFunction.h>
+#include <c++_tools/classifier/GaussianKernelFunction.h>
+#include <c++_tools/classifier/KernelView.h>
+#include <c++_tools/classifier/Kernel_MEV.h>
+#include <c++_tools/classifier/Kernel_SEV.h>
 
 #include <cmath>
@@ -21 +21 @@
 using namespace theplu;
 
-bool test_MEV(const gslapi::matrix& data, const svm::KernelFunction* kf, 
+bool test_MEV(const gslapi::matrix& data, const classifier::KernelFunction* kf, 
               const gslapi::matrix& control, const double error_bound)
 {
-  svm::Kernel_MEV kernel(data,*kf);
+  classifier::Kernel_MEV kernel(data,*kf);
   for(u_int i=0;i<control.rows();i++)
     for(u_int j=0;j<control.columns();j++)
@@ -35 +35 @@
   index[1]=2;
   index[2]=3;
-  svm::KernelView(kernel,index);
+  classifier::KernelView(kernel,index);
 
   return true;
 }
 
-bool test_SEV(const gslapi::matrix& data, const svm::KernelFunction* kf, 
+bool test_SEV(const gslapi::matrix& data, const classifier::KernelFunction* kf, 
               const gslapi::matrix& control, const double error_bound)
 {
-  svm::Kernel_SEV kernel(data,*kf);
+  classifier::Kernel_SEV kernel(data,*kf);
   for(u_int i=0;i<control.rows();i++)
     for(u_int j=0;j<control.columns();j++)
@@ -54 +54 @@
   index[1]=2;
   index[2]=3;
-  svm::KernelView(kernel,index);
+  classifier::KernelView(kernel,index);
   return true;
 }
@@ -84 +84 @@
   gslapi::matrix kernel_matlab(is);
   is.close();
-  svm::KernelFunction* kf = new svm::PolynomialKernelFunction(); 
+  classifier::KernelFunction* kf = new classifier::PolynomialKernelFunction(); 
   ok = (ok && test_MEV(data,kf,kernel_matlab,error_bound)
         & test_SEV(data,kf,kernel_matlab,error_bound));
@@ -92 +92 @@
   gslapi::matrix kernel_matlab2(is);
   is.close();
-  kf = new svm::PolynomialKernelFunction(2); 
+  kf = new classifier::PolynomialKernelFunction(2); 
   ok = (ok && test_MEV(data,kf,kernel_matlab2,error_bound)
         & test_SEV(data,kf,kernel_matlab2,error_bound));
@@ -99 +99 @@
   // Checking that a GaussianKernelFunction object can be built at
   // compile time.
-  kf = new svm::GaussianKernelFunction(); 
+  kf = new classifier::GaussianKernelFunction(); 
   delete kf;