Changeset 539

Timestamp:

Mar 5, 2006, 2:33:47 PM (17 years ago)

Author:

Peter

Message:

re-introduced prediction in SVM

Location:

trunk/lib/classifier

Files:

• Kernel.h (modified) (1 diff)
• KernelLookup.h (modified) (1 diff)
• KernelWeighted_MEV.h (modified) (1 diff)
• KernelWeighted_SEV.h (modified) (1 diff)
• Kernel_MEV.h (modified) (1 diff)
• Kernel_SEV.cc (modified) (1 diff)
• SVM.cc (modified) (1 diff)
• SVM.h (modified) (1 diff)

trunk/lib/classifier/Kernel.h

@@ -67 +67 @@
 
     
-    //virtual double element(const gslapi::vector& vec, const size_t i) const=0;
+    virtual double element(const DataLookup1D& vec, const size_t i) const=0;
 
   protected:

trunk/lib/classifier/KernelLookup.h

@@ -102 +102 @@
     { return (*kernel_)(row_index_[row],column_index_[column]); }
 
-    //inline double element(const gslapi::vector& vec, const size_t i) const
-    //{ return kernel_->element(vec, row_index_[i]); }
+    inline double element(const DataLookup1D& vec, const size_t i) const
+    { return kernel_->element(vec, row_index_[i]); }
 
   private:

trunk/lib/classifier/KernelWeighted_MEV.h

@@ -52 +52 @@
     /// @return kernel element between data @a ve and training sample @a i
     /// 
-    //inline double element(const gslapi::vector& vec, const size_t i) const
-    //{ 
-    //  return (*kf_)(vec, gslapi::vector(data_,i), 
-    //                       gslapi::vector(vec.size(),1.0),
-    //                       gslapi::vector(weights_,i)); 
-    //}
+    inline double element(const DataLookup1D& vec, const size_t i) const
+    { 
+      return (*kf_)(vec, DataLookup1D(data_,i), 
+                    DataLookup1D(vec.size(),1.0),
+                    DataLookup1D(weights_,i)); 
+    }
 
   private:

trunk/lib/classifier/KernelWeighted_SEV.h

@@ -54 +54 @@
     /// @return kernel element between data @a ve and training sample @a i
     /// 
-    //inline double element(const DataLookup1D& vec, const size_t i) const
-    //{ 
-    //  return (*kf_)(vec, DataLookup1D(data_,i), 
-    //                DataLookup1D(vec.size(),1.0),
-    //                DataLookup1D(weights_,i)); 
-    //}
+    inline double element(const DataLookup1D& vec, const size_t i) const
+    { 
+      return (*kf_)(vec, DataLookup1D(data_,i), 
+                    DataLookup1D(vec.size(),1.0),
+                    DataLookup1D(weights_,i)); 
+    }
 
 

trunk/lib/classifier/Kernel_MEV.h

@@ -51 +51 @@
     /// @return kernel element between data @a ve and training sample @a i
     ///
-    //inline double element(const gslapi::vector& vec, const size_t i) const
-    //{ return kf_->operator()(vec, gslapi::vector(data_,i)); }
+    inline double element(const DataLookup1D& vec, const size_t i) const
+    { return kf_->operator()(vec, DataLookup1D(data_,i)); }
       
 

trunk/lib/classifier/Kernel_SEV.cc

@@ -23 +23 @@
           (*kf_)(DataLookup1D(data_,i,false),DataLookup1D(data_,j,false));
   }
+
+
   double Kernel_SEV::element(const DataLookup1D& vec, const size_t i) const
   { 

trunk/lib/classifier/SVM.cc

@@ -59 +59 @@
   }
 
-  double SVM::predict(const gslapi::vector& x) const
-  {
-    // predict won't work until kernel::element is working
-    assert(0);
+  double SVM::predict(const DataLookup1D& x) const
+  {
     double y=0;
-    //for (size_t i=0; i<alpha_.size(); i++)
-      //y += alpha_(i)*target_(i)*kernel_->element(x,i);
+    for (size_t i=0; i<alpha_.size(); i++)
+      y += alpha_(i)*target_(i)*kernel_->element(x,i);
 
     return y+bias_;

trunk/lib/classifier/SVM.h

@@ -170 +170 @@
     /// @return output from data @a input
     ///
-    double predict(const gslapi::vector& input) const;
+    double predict(const DataLookup1D& input) const;
 
     ///