Changeset 42 for trunk/src/SVM.cc

Timestamp:

Feb 26, 2004, 4:06:20 PM (19 years ago)

Author:

Jari Häkkinen

Message:

Made a major revision of matrix and vector classes. Everything compiles
but the binaries have not been tested.

File:

• trunk/src/SVM.cc (modified) (8 diffs)

trunk/src/SVM.cc

@@ -13 +13 @@
 #include "random_singleton.h"
 
-using namespace thep_cpp_tools;
-using namespace std;
+namespace theplu {
+namespace cpptools {  
 
-SVM::SVM(const thep_gsl_api::matrix& kernel, 
-   const thep_gsl_api::vector& target) : trained_(false), 
-                 kernel_(kernel),
-                 target_(target),
-                 alpha_(target.size(),true,true),
-                 bias_(0)
-  
+SVM::SVM(const gslapi::matrix& kernel, const gslapi::vector& target)
+  : trained_(false), 
+    kernel_(kernel),
+    target_(target),
+    alpha_(target.size()),
+    bias_(0)
 {
 }
 
-void SVM::train() //Should be done so one can choose to not train on all the samples
+void SVM::train(void) //Should be done so one can choose to not train on all the samples
 {
-  thep_gsl_api::vector E = thep_gsl_api::vector(-target_);
+  using namespace std;
+  gslapi::vector E = gslapi::vector(-target_);
   
   double upper_bound = pow(10., 32); 
@@ -36 +36 @@
   double u;
   double v;
-  thep_gsl_api::vector dalpha;  
+  gslapi::vector dalpha;  
   
   // Stop criteria  
@@ -47 +47 @@
        
      // Choosing a pair of variables to modify (Should be done more clever)
-     u_long index1 = rnd->get_uniform_int(kernel_.cols());
-     u_long index2 = rnd->get_uniform_int(kernel_.cols()-1);
+     u_long index1 = rnd->get_uniform_int(kernel_.columns());
+     u_long index2 = rnd->get_uniform_int(kernel_.columns()-1);
      if (index2 >= index1) 
       index2++;
@@ -80 +80 @@
        }
 
-     double k = kernel_.get(index1, index1) + kernel_.get(index2, index2) - 
-       2*kernel_.get(index1, index2);
+     double k = ( kernel_(index1, index1) + kernel_(index2, index2) - 
+                  2*kernel_(index1, index2) );
      alpha_new = alpha_[index2] + target_[index2]*
        (E[index1]-E[index2])/k;
@@ -93 +93 @@
      stop_condition = stop( target_, kernel_, alpha_);
      if (count>10000000){
-      cerr << "SVM): " << "more than 10,000,000 epochs reached" << endl;
+       cerr << "SVM): " << "more than 10,000,000 epochs reached" << endl;
        exit(1);
      }
@@ -101 +101 @@
   double min_output_positive = 10000;
   double max_output_negative = -10000;
-  thep_gsl_api::vector output_unbiased = kernel_ * alpha_.mul_elements(target_);
+  gslapi::vector output_unbiased = kernel_ * alpha_.mul_elements(target_);
   for (u_int i=0; i<target_.size(); i++){
    if (target_[i]==1){
@@ -120 +120 @@
 }
 
-bool SVM::stop( const thep_gsl_api::vector& target_,
-    const thep_gsl_api::matrix& kernel_,
-    const thep_gsl_api::vector& alpha_)
+bool SVM::stop( const gslapi::vector& target_,
+    const gslapi::matrix& kernel_,
+    const gslapi::vector& alpha_)
 {
   double min_output_positive = 10000;
   double max_output_negative = -10000;
   double epsilon = 0.000001; // used twice, should perhaps be two different values
-  thep_gsl_api::vector output_unbiased = kernel_ * alpha_.mul_elements(target_);
+  gslapi::vector output_unbiased = kernel_ * alpha_.mul_elements(target_);
   for (u_int i=0; i<target_.size(); i++){
    if (target_[i]==1){
@@ -154 +154 @@
 }
 
-
+}} // of namespace cpptools and namespace theplu
 
 #endif