Changeset 1087 for trunk/yat/classifier

Timestamp:

Feb 14, 2008, 7:05:37 AM (16 years ago)

Author:

Peter

Message:

fixes #312 and added passing of data in EB constructors

Location:

trunk/yat/classifier

Files:

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

trunk/yat/classifier/EnsembleBuilder.h

@@ -52 +52 @@
     /// Constructor.
     ///
-    EnsembleBuilder(const Classifier&, const Sampler&);
+    EnsembleBuilder(const Classifier&, const Data&, const Sampler&);
 
     ///
     /// Constructor.
     ///
-    EnsembleBuilder(const Classifier&, const Sampler&, 
+    EnsembleBuilder(const Classifier&, const Data&, const Sampler&, 
                     FeatureSelector&);
 
@@ -116 +116 @@
 
   template <class C, class D> 
-  EnsembleBuilder<C,D>::EnsembleBuilder(const C& sc, 
+  EnsembleBuilder<C,D>::EnsembleBuilder(const C& sc, const D& data,
                                         const Sampler& sampler) 
-    : mother_(sc),subset_(new SubsetGenerator<D>(sampler,sc.data()))
-  {
-  }
-
-
-  template <class C, class D> 
-  EnsembleBuilder<C, D>::EnsembleBuilder(const C& sc, const Sampler& sampler,
+    : mother_(sc),subset_(new SubsetGenerator<D>(sampler,data))
+  {
+  }
+
+
+  template <class C, class D> 
+  EnsembleBuilder<C, D>::EnsembleBuilder(const C& sc, const D& data, 
+                                         const Sampler& sampler,
                                          FeatureSelector& fs) 
     : mother_(sc),
-      subset_(new SubsetGenerator<D>(sampler,sc.data(),fs))
+      subset_(new SubsetGenerator<D>(sampler,data,fs))
   {
   }

trunk/yat/classifier/SVM.cc

@@ -47 +47 @@
 
   SVM::SVM(const KernelLookup& kernel, const Target& target)
-    : SupervisedClassifier(target),
-      alpha_(target.size(),0),
+    : alpha_(target.size(),0),
       bias_(0),
       C_inverse_(0),
@@ -57 +56 @@
       owner_(false),
       sample_(target.size()),
+      target_(target),
       trained_(false),
       tolerance_(0.00000001)
@@ -114 +114 @@
   }
 
-  SupervisedClassifier* SVM::make_classifier(const DataLookup2D& data,
-                                             const Target& target) const
+  SVM* SVM::make_classifier(const DataLookup2D& data,
+                            const Target& target) const
   {
     SVM* sc=0;

trunk/yat/classifier/SVM.h

@@ -28 +28 @@
 
 #include "KernelLookup.h"
-#include "SupervisedClassifier.h"
 #include "SVindex.h"
+#include "Target.h"
 #include "yat/utility/vector.h"
 
@@ -52 +52 @@
   /// taken care of outside (in the kernel).
   ///   
-  class SVM : public SupervisedClassifier
+  class SVM
   {
   
@@ -75 +75 @@
     /// If DataLookup2D is not a KernelLookup a bad_cast exception is thrown.
     ///
-    SupervisedClassifier* 
-    make_classifier(const DataLookup2D&, const Target&) const;
+    SVM* make_classifier(const DataLookup2D&, const Target&) const;
 
     ///
@@ -246 +245 @@
     bool owner_;
     SVindex sample_;
+    Target target_;
     bool trained_;
     double tolerance_;