Changeset 964 for trunk/yat/classifier

Timestamp:

Oct 10, 2007, 11:14:17 PM (16 years ago)

Author:

Peter

Message:

adding function to set maximal training epochs in SVM, and fixed so C and max_epochs is copied in make_classifier (rather than set to default).

Location:

trunk/yat/classifier

Files:

• SVM.cc (modified) (4 diffs)
• SVM.h (modified) (1 diff)

trunk/yat/classifier/SVM.cc

@@ -37 +37 @@
 #include <cmath>
 #include <limits>
+#include <stdexcept>
 #include <utility>
 #include <vector>
@@ -122 +123 @@
       sc = new SVM(kernel,target);
       //Copy those variables possible to modify from outside
-      // Peter, in particular C
+      sc->set_C(this->C());
+      sc->max_epochs(max_epochs());
     }
     catch (std::bad_cast& e) {
@@ -137 +139 @@
     return max_epochs_;
   }
+
+
+  void SVM::max_epochs(long int n)
+  {
+    max_epochs_=n;
+  }
+
 
   const theplu::yat::utility::vector& SVM::output(void) const
@@ -275 +284 @@
       epochs++;  
       if (epochs>max_epochs_){
-        std::cerr << "WARNING: SVM: maximal number of epochs reached.\n";
-        calculate_bias();
-        calculate_margin();
-        return false;
+        throw std::runtime_error("SVM: maximal number of epochs reached.");
       }
     }

trunk/yat/classifier/SVM.h

@@ -105 +105 @@
     ///
     long int max_epochs(void) const;
+    
+    /*
+      \brief set maximal number of epochs in training
+    */
+    void max_epochs(long int);
     
     /**