Changeset 542

Timestamp:

Mar 5, 2006, 4:46:47 PM (17 years ago)

Author:

Peter

Message:

added predict function in SVM supporting weight

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.cc (modified) (1 diff)
• Kernel_MEV.h (modified) (1 diff)
• Kernel_SEV.cc (modified) (1 diff)
• Kernel_SEV.h (modified) (1 diff)
• SVM.cc (modified) (1 diff)
• SVM.h (modified) (1 diff)

trunk/lib/classifier/Kernel.h

@@ -68 +68 @@
     
     virtual double element(const DataLookup1D& vec, const size_t i) const=0;
+    virtual double element(const DataLookup1D& vec, const DataLookup1D& w,
+                           const size_t i) const=0;
 
   protected:

trunk/lib/classifier/KernelLookup.h

@@ -105 +105 @@
     { return kernel_->element(vec, row_index_[i]); }
 
+    inline double element(const DataLookup1D& vec, const DataLookup1D& w, 
+                          const size_t i) const
+    { return kernel_->element(vec, w, row_index_[i]); }
+
   private:
     ///

trunk/lib/classifier/KernelWeighted_MEV.h

@@ -59 +59 @@
     }
 
+    inline double element(const DataLookup1D& vec, const DataLookup1D& w, 
+                          const size_t i) const
+    { 
+      return (*kf_)(vec, DataLookup1D(data_,i),w,DataLookup1D(weights_,i)); 
+    }
+
   private:
     ///

trunk/lib/classifier/KernelWeighted_SEV.h

@@ -61 +61 @@
     }
 
+    inline double element(const DataLookup1D& vec, const DataLookup1D& w, 
+                          const size_t i) const
+    { 
+      return (*kf_)(vec, DataLookup1D(data_,i),w,DataLookup1D(weights_,i)); 
+    }
 
   private:

trunk/lib/classifier/Kernel_MEV.cc

@@ -14 +14 @@
   }
 
-
 }} // of namespace classifier and namespace theplu

trunk/lib/classifier/Kernel_MEV.h

@@ -54 +54 @@
     { return kf_->operator()(vec, DataLookup1D(data_,i)); }
       
+    inline double element(const DataLookup1D& vec, const DataLookup1D& w, 
+                          const size_t i) const
+    {return (*kf_)(vec, DataLookup1D(data_,i), w, DataLookup1D(w.size(),1.0));}
 
   private:

trunk/lib/classifier/Kernel_SEV.cc

@@ -30 +30 @@
   }
 
+  double Kernel_SEV::element(const DataLookup1D& vec, const DataLookup1D& w,
+                             const size_t i) const
+  { 
+    return (*kf_)(vec, DataLookup1D(data_,i), w, DataLookup1D(w.size(),1.0));
+  }
+
 
 }} // of namespace classifier and namespace theplu

trunk/lib/classifier/Kernel_SEV.h

@@ -62 +62 @@
     /// 
     double element(const DataLookup1D& vec, const size_t i) const;
+    double element(const DataLookup1D& vec, const DataLookup1D& w, 
+                   const size_t i) const;
 
 

trunk/lib/classifier/SVM.cc

@@ -64 +64 @@
     for (size_t i=0; i<alpha_.size(); i++)
       y += alpha_(i)*target_(i)*kernel_->element(x,i);
+
+    return y+bias_;
+  }
+
+  double SVM::predict(const DataLookup1D& x, const DataLookup1D& w) const
+  {
+    double y=0;
+    for (size_t i=0; i<alpha_.size(); i++)
+      y += alpha_(i)*target_(i)*kernel_->element(x,w,i);
 
     return y+bias_;

trunk/lib/classifier/SVM.h

@@ -171 +171 @@
     ///
     double predict(const DataLookup1D& input) const;
+
+    ///
+    /// @return output from data @a input with corresponding @a weight
+    ///
+    double predict(const DataLookup1D& input, const DataLookup1D& weight) const;
 
     ///