Changeset 525

Timestamp:

Feb 24, 2006, 5:29:22 PM (16 years ago)

Author:

Markus Ringnér

Message:

Added structure to Supervised classifier and NCC to support ranking inputs with a statistics::Score and using only top-scoring inputs in classification.

Location:

trunk/lib/classifier

Files:

• NCC.cc (modified) (5 diffs)
• NCC.h (modified) (3 diffs)
• SupervisedClassifier.cc (modified) (1 diff)
• SupervisedClassifier.h (modified) (4 diffs)

trunk/lib/classifier/NCC.cc

@@ -5 +5 @@
 #include <c++_tools/classifier/DataLookup1D.h>
 #include <c++_tools/classifier/DataLookup2D.h>
+#include <c++_tools/classifier/InputRanker.h>
 #include <c++_tools/classifier/Target.h>
 #include <c++_tools/gslapi/vector.h>
@@ -24 +25 @@
   }
 
+  NCC::NCC(const DataLookup2D& data, const Target& target, 
+           const statistics::Distance& distance, 
+           statistics::Score& score, size_t nof_inputs) 
+    : SupervisedClassifier(target, &score, nof_inputs), 
+      distance_(distance), matrix_(data)
+  {
+  }
+
+  NCC::~NCC()   
+  {
+    if(ranker_)
+      delete ranker_;
+  }
+
+
   SupervisedClassifier* 
   NCC::make_classifier(const DataLookup2D& data, 
                        const Target& target) const 
   {     
-    NCC* sc= new NCC(data,target,this->distance_);
-    return sc;
+    NCC* ncc= new NCC(data,target,this->distance_);
+    ncc->score_=this->score_;
+    ncc->nof_inputs_=this->nof_inputs_;
+    return ncc;
   }
 
@@ -35 +53 @@
   bool NCC::train()
   {
+    if(ranker_)
+      delete ranker_;
+    if(score_)
+      ranker_=new InputRanker(matrix_, target_, *score_);
+    // Markus : ranker_ should be taken into account if used!!!
+
     // Calculate the centroids for each class
     centroids_=gslapi::matrix(matrix_.rows(),target_.nof_classes());
@@ -54 +78 @@
                     gslapi::vector& prediction) const
   {
+    // Markus : ranker_ should be taken into account if used!!!
+
     prediction=gslapi::vector(centroids_.columns());    
     gslapi::vector w(input.size(),0);
@@ -68 +94 @@
                     gslapi::matrix& prediction) const
   {
+    // Markus : ranker_ should be taken into account if used!!!
+    
     prediction=gslapi::matrix(centroids_.columns(), input.columns());   
     for(size_t j=0; j<input.columns();j++) {     

trunk/lib/classifier/NCC.h

@@ -7 +7 @@
 
 #include <c++_tools/classifier/SupervisedClassifier.h>
-//#include <c++_tools/statistics/Distance.h>
 
 #include <map>
@@ -15 +14 @@
   namespace statistics {
     class Distance;
+    class Score;
   }
 
@@ -36 +36 @@
     ///
     NCC(const DataLookup2D&, const Target&, const statistics::Distance&);
+
+    NCC(const DataLookup2D&, const Target&, const statistics::Distance&, 
+        statistics::Score&, const size_t);
+
+    virtual ~NCC();
 
     const gslapi::matrix& centroids(void) const {return centroids_;}

trunk/lib/classifier/SupervisedClassifier.cc

@@ -6 +6 @@
 namespace classifier {
 
-  SupervisedClassifier::SupervisedClassifier(const Target& target)
-    : target_(target), trained_(false)
+  SupervisedClassifier::SupervisedClassifier(const Target& target,
+                                             statistics::Score* score,
+                                             const size_t nof_inputs)
+    : target_(target), score_(score), ranker_(0), nof_inputs_(nof_inputs),
+      trained_(false)
   {
   }

trunk/lib/classifier/SupervisedClassifier.h

@@ -4 +4 @@
 #define _theplu_classifier_supervisedclassifier_ 
 
+#include <cctype>
 
 namespace theplu {
@@ -12 +13 @@
   }
 
+  namespace statistics {
+    class Score;
+  }
+
+
 namespace classifier {  
 
   class DataLookup2D;
-  class Target;
+  class InputRanker;  class Target;
 
 
@@ -29 +35 @@
     /// Constructor. Taking a vector of target values.
     ///
-    SupervisedClassifier(const Target&);
+    SupervisedClassifier(const Target&, statistics::Score* =0, 
+                         const size_t=0);
     
     ///
@@ -62 +69 @@
     
     const Target& target_;
+    statistics::Score* score_;
+    classifier::InputRanker* ranker_;
+    size_t nof_inputs_;
     bool trained_;