Changeset 1102 for trunk/yat/classifier

Timestamp:

Feb 18, 2008, 6:00:34 AM (15 years ago)

Author:

Peter

Message:

fixes #314

Location:

trunk/yat/classifier

Files:

• SVM.cc (modified) (3 diffs)
• SVM.h (modified) (4 diffs)

trunk/yat/classifier/SVM.cc

@@ -25 +25 @@
 
 #include "SVM.h"
-#include "DataLookup2D.h"
+#include "KernelLookup.h"
 #include "Target.h"
 #include "yat/random/random.h"
@@ -89 +89 @@
 
 
+  /*
   const DataLookup2D& SVM::data(void) const
   {
     return *kernel_;
   }
+  */
 
 
@@ -127 +129 @@
   }
 
-  void SVM::predict(const DataLookup2D& input, utility::matrix& prediction) const
-  {
-    try {
-      const KernelLookup& input_kernel =dynamic_cast<const KernelLookup&>(input);
-      assert(input.rows()==alpha_.size());
-      prediction.resize(2,input.columns(),0);
-      for (size_t i = 0; i<input.columns(); i++){
-        for (size_t j = 0; j<input.rows(); j++){
-          prediction(0,i) += target(j)*alpha_(j)*input_kernel(j,i);
-          assert(target(j));
-        }
-        prediction(0,i) = margin_ * (prediction(0,i) + bias_);
-      }
-      
-      for (size_t i = 0; i<prediction.columns(); i++)
-        prediction(1,i) = -prediction(0,i);
-    }
-    catch (std::bad_cast) {
-      std::string str = 
-        "Error in SVM::predict: DataLookup2D of unexpected class.";
-      throw std::runtime_error(str);
+  void SVM::predict(const KernelLookup& input, utility::matrix& prediction) const
+  {
+    assert(input.rows()==alpha_.size());
+    prediction.resize(2,input.columns(),0);
+    for (size_t i = 0; i<input.columns(); i++){
+      for (size_t j = 0; j<input.rows(); j++){
+        prediction(0,i) += target(j)*alpha_(j)*input(j,i);
+        assert(target(j));
+      }
+      prediction(0,i) = margin_ * (prediction(0,i) + bias_);
     }
     
+    for (size_t i = 0; i<prediction.columns(); i++)
+      prediction(1,i) = -prediction(0,i);
   }
 

trunk/yat/classifier/SVM.h

@@ -27 +27 @@
 */
 
-#include "KernelLookup.h"
 #include "SVindex.h"
 #include "Target.h"
@@ -39 +38 @@
 namespace classifier {  
 
-  class DataLookup2D;
-  class Target;
+  class DataLookup1D;
+  class DataLookupWeighted1D;
+  class KernelLookup;
 
   ///
@@ -66 +66 @@
     virtual ~SVM();
 
-    const DataLookup2D& data(void) const;
+    //const DataLookup2D& data(void) const;
 
     ///
@@ -128 +128 @@
        for training.
     */
-    void predict(const DataLookup2D& input, utility::matrix& predict) const;
+    void predict(const KernelLookup& input, utility::matrix& predict) const;
 
     ///