Changeset 1175 for trunk/yat/classifier

Timestamp:

Feb 27, 2008, 5:27:13 PM (16 years ago)

Author:

Peter

Message:

fixed bug in SVM. SVM does not own the Kernel and should therefore never delete it. Cpy and assignment can simply copy the pointer without problem. Yet if the Kernel is deallocated outside, behavior of SVM is undefined.

Location:

trunk/yat/classifier

Files:

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

trunk/yat/classifier/SVM.cc

@@ -60 +60 @@
 
   SVM::SVM(const SVM& other)
-    : bias_(other.bias_), C_inverse_(other.C_inverse_), kernel_(NULL),
+    : bias_(other.bias_), C_inverse_(other.C_inverse_), kernel_(kernel_),
       margin_(0), max_epochs_(other.max_epochs_), tolerance_(other.tolerance_),
       trained_(other.trained_)
   {
-    if (other.kernel_)
-      kernel_ = new KernelLookup(*other.kernel_);
   }
 
@@ -71 +69 @@
   SVM::~SVM()
   {
-    if (kernel_)
-      delete kernel_;
   }
 
@@ -118 +114 @@
   SVM* SVM::make_classifier(void) const
   {
-    return new SVM(*this);
+    SVM* svm = new SVM(*this);
+    svm->trained_ = false;
+    return svm;
   }
 
@@ -181 +179 @@
   void SVM::train(const KernelLookup& kernel, const Target& targ) 
   {
-    if (kernel_)
-      delete kernel_;
     kernel_ = new KernelLookup(kernel);
     target_ = targ;

trunk/yat/classifier/SVM.h

@@ -230 +230 @@
     double bias_;
     double C_inverse_;
+    // not owned by SVM
     const KernelLookup* kernel_; 
     double margin_;