Changeset 330 for trunk/lib/svm/SVM.cc

Timestamp:

Jun 1, 2005, 11:30:47 PM (17 years ago)

Author:

Peter

Message:

added an abstract base class for Kernel from which Kernel_SEV Kernel_MEV are inherited. Also added a separate class for viewing into subKernels

File:

• trunk/lib/svm/SVM.cc (modified) (4 diffs)

trunk/lib/svm/SVM.cc

@@ -4 +4 @@
 #include <c++_tools/svm/SVM.h>
 
-#include <c++_tools/svm/Kernel_MEV.h>
+#include <c++_tools/svm/Kernel.h>
 #include <c++_tools/gslapi/matrix.h>
 #include <c++_tools/gslapi/vector.h>
@@ -137 +137 @@
   }
 
-  SVM::SVM(const Kernel_MEV& kernel, 
-           const gslapi::vector& target)
+  SVM::SVM(const Kernel& kernel, const gslapi::vector& target)
            
   : alpha_(target.size(),0),
     bias_(0),
     C_inverse_(0),
-    kernel_(kernel),
+    kernel_(&kernel),
     max_epochs_(10000000),
     output_(target.size(),0),
@@ -160 +159 @@
   {
     // initializing variables for optimization
-    assert(target_.size()==kernel_.size());
+    assert(target_.size()==kernel_->size());
     assert(target_.size()==alpha_.size());
 
@@ -358 +357 @@
       output_(i)=0;
       for (size_t j=0; j<output_.size(); j++) 
-        output_(i)+=alpha_(j)*target_(j)*kernel_(i,j);
+        output_(i)+=alpha_(j)*target_(j)*(*kernel_)(i,j);
     }