Changeset 635

Timestamp:

Sep 6, 2006, 3:20:24 AM (17 years ago)

Author:

Peter

Message:

closes #106 make_classifier is again taking DataLookup2D and Target making SupervisedClassifer? useful also in structure without SubsetGenerator?.

Location:

trunk/c++_tools/classifier

Files:

• EnsembleBuilder.cc (modified) (1 diff)
• NCC.cc (modified) (2 diffs)
• NCC.h (modified) (2 diffs)
• SVM.cc (modified) (2 diffs)
• SVM.h (modified) (3 diffs)
• SupervisedClassifier.h (modified) (2 diffs)

trunk/c++_tools/classifier/EnsembleBuilder.cc

@@ -31 +31 @@
     while(subset_.more()) {
       SupervisedClassifier* classifier=
-        mother_.make_classifier(subset_);
+        mother_.make_classifier(subset_.training_data(), 
+                                subset_.training_target());
       classifier->train();
       classifier_.push_back(classifier);

trunk/c++_tools/classifier/NCC.cc

@@ -7 +7 @@
 #include <c++_tools/classifier/MatrixLookup.h>
 #include <c++_tools/classifier/MatrixLookupWeighted.h>
-#include <c++_tools/classifier/SubsetGenerator.h>
 #include <c++_tools/classifier/Target.h>
 #include <c++_tools/utility/matrix.h>
@@ -40 +39 @@
 
   SupervisedClassifier* 
-  NCC::make_classifier(const SubsetGenerator& cs) const 
+  NCC::make_classifier(const DataLookup2D& data, const Target& target) const 
   {     
     NCC* ncc=0;
-    if(cs.training_data().weighted()) {
-      ncc=new NCC(dynamic_cast<const MatrixLookupWeighted&>(cs.training_data()),
-                  cs.training_target(),this->distance_);
+    if(data.weighted()) {
+      ncc=new NCC(dynamic_cast<const MatrixLookupWeighted&>(data),
+                  target,this->distance_);
     }
     else {
-      ncc=new NCC(dynamic_cast<const MatrixLookup&>(cs.training_data()),
-                  cs.training_target(),this->distance_);
+      ncc=new NCC(dynamic_cast<const MatrixLookup&>(data),
+                  target,this->distance_);
     }
     return ncc;

trunk/c++_tools/classifier/NCC.h

@@ -22 +22 @@
 namespace classifier {  
 
-  class SubsetGenerator;
   class DataLookup1D;
   class DataLookup2D;
@@ -57 +56 @@
     inline const utility::matrix& centroids(void) const {return centroids_;}
 
-    SupervisedClassifier* make_classifier(const SubsetGenerator&) const;
+    SupervisedClassifier* make_classifier(const DataLookup2D&, 
+                                          const Target&) const;
     
     ///

trunk/c++_tools/classifier/SVM.cc

@@ -4 +4 @@
 
 #include <c++_tools/classifier/DataLookup2D.h>
-#include <c++_tools/classifier/SubsetGenerator.h>
 #include <c++_tools/random/random.h>
 #include <c++_tools/statistics/Averager.h>
@@ -70 +69 @@
 
 
-  SupervisedClassifier* SVM::make_classifier(const SubsetGenerator& cs) const
-  {
-    // Peter, should check success of dynamic_cast
-    const KernelLookup& data = 
-      dynamic_cast<const KernelLookup&>(cs.training_data());
-    const Target& target=cs.training_target();
+  SupervisedClassifier* SVM::make_classifier(const DataLookup2D& data,
+                                             const Target& target) const
+  {
+    const KernelLookup& kernel = 
+      dynamic_cast<const KernelLookup&>(data);
 
     assert(data.rows()==data.columns());
     assert(data.columns()==target.size());
     SVM* sc;
-    sc = new SVM(data,target);
+    sc = new SVM(kernel,target);
 
 

trunk/c++_tools/classifier/SVM.h

@@ -4 +4 @@
 // $Id$
 
-#include <c++_tools/classifier/DataLookup2D.h>
 #include <c++_tools/classifier/KernelLookup.h>
 #include <c++_tools/classifier/SupervisedClassifier.h>
@@ -18 +17 @@
 namespace classifier {  
 
-  // forward declarations
-  class SubsetGenerator;
-
+  class DataLookup2D;
   // @internal Class keeping track of which samples are support vectors and
   // not. The first nof_sv elements in the vector are indices of the
@@ -124 +121 @@
 
     ///
-    /// @todo doc
+    /// If DataLookup2D is not a KernelLookup a bad_cast exception is thrown.
     ///
     SupervisedClassifier* 
-    make_classifier(const SubsetGenerator&) const;
+    make_classifier(const DataLookup2D&, const Target&) const;
 
     ///

trunk/c++_tools/classifier/SupervisedClassifier.h

@@ -15 +15 @@
 
   class DataLookup2D;
-  class SubsetGenerator;
   class Target;
 
@@ -46 +45 @@
     ///
     virtual SupervisedClassifier* 
-    make_classifier(const SubsetGenerator&) const =0;
+    make_classifier(const DataLookup2D&, const Target&) const =0;