Changeset 736

Timestamp:

Jan 6, 2007, 6:27:31 PM (17 years ago)

Author:

Peter

Message:

Fixes #176

Location:

trunk/yat/classifier

Files:

• EnsembleBuilder.cc (modified) (2 diffs)
• EnsembleBuilder.h (modified) (2 diffs)

trunk/yat/classifier/EnsembleBuilder.cc

@@ -24 +24 @@
 #include "EnsembleBuilder.h"
 #include "DataLookup2D.h"
+#include "FeatureSelector.h"
 #include "KernelLookup.h"
 #include "Sampler.h"
@@ -38 +39 @@
                                    const Sampler& sampler) 
     : mother_(sc),subset_(new SubsetGenerator(sampler,sc.data()))
+  {
+  }
+
+  EnsembleBuilder::EnsembleBuilder(const SupervisedClassifier& sc, 
+                                   const Sampler& sampler,
+                                   FeatureSelector& fs) 
+    : mother_(sc),subset_(new SubsetGenerator(sampler,sc.data(),fs))
   {
   }

trunk/yat/classifier/EnsembleBuilder.h

@@ -33 +33 @@
 namespace classifier {  
 
+  class DataLookup2D;
+  class FeatureSelector;
   class Sampler;
+  class SupervisedClassifier;
   class SubsetGenerator;
-  class DataLookup2D;
-  class SupervisedClassifier;
 
   ///
@@ -50 +51 @@
     ///
     EnsembleBuilder(const SupervisedClassifier&, const Sampler&);
+
+    ///
+    /// Constructor.
+    ///
+    EnsembleBuilder(const SupervisedClassifier&, const Sampler&, 
+                    FeatureSelector&);
 
     ///