Changeset 931 for trunk/yat/classifier

Timestamp:

Oct 5, 2007, 5:42:25 PM (16 years ago)

Author:

Markus Ringnér

Message:

Working on ticket:259. Removed old Distance see ticket:250

Location:

trunk/yat/classifier

Files:

• KNN.h (modified) (1 diff)
• NCC.h (modified) (6 diffs)

trunk/yat/classifier/KNN.h

@@ -168 +168 @@
   {     
     KNN* knn=0;
-    if(data.weighted()) {
-      knn=new KNN<Distance>(dynamic_cast<const MatrixLookupWeighted&>(data),
-                            target);
-    }
-    knn->k(this->k());
+    try {
+      if(data.weighted()) {
+        knn=new KNN<Distance>(dynamic_cast<const MatrixLookupWeighted&>(data),
+                              target);
+      }  
+      knn->k(this->k());
+    }
+    catch (std::bad_cast) {
+      std::string str = "Error in KNN<Distance>::make_classifier: DataLookup2D of unexpected class.";
+      throw std::runtime_error(str);
+    }
     return knn;
   }

trunk/yat/classifier/NCC.h

@@ -35 +35 @@
 #include "Target.h"
 
+#include "yat/statistics/Averager.h"
+#include "yat/statistics/AveragerWeighted.h"
 #include "yat/statistics/vector_distance.h"
 
@@ -158 +160 @@
   {     
     NCC* ncc=0;
-    if(data.weighted()) {
-      ncc=new NCC<Distance>(*dynamic_cast<const MatrixLookupWeighted*>(&data),
-                  target);
-    }
-    else {
-      ncc=new NCC<Distance>(*dynamic_cast<const MatrixLookup*>(&data),
-                  target);
-    }
-    ncc->centroids_=0;
+    try {
+      if(data.weighted()) {
+        ncc=new NCC<Distance>(dynamic_cast<const MatrixLookupWeighted&>(data),
+                              target);
+      }
+      else {
+        ncc=new NCC<Distance>(dynamic_cast<const MatrixLookup&>(data),
+                              target);
+      }
+      ncc->centroids_=0;
+    }
+    catch (std::bad_cast) {
+      std::string str = "Error in NCC<Distance>::make_classifier: DataLookup2D of unexpected class.";
+      throw std::runtime_error(str);
+    }
     return ncc;
   }
@@ -177 +185 @@
       delete centroids_;
     centroids_= new utility::matrix(data_.rows(), target_.nof_classes());
-    utility::matrix nof_in_class(data_.rows(), target_.nof_classes());
-    const MatrixLookupWeighted* weighted_data = 
-      dynamic_cast<const MatrixLookupWeighted*>(&data_);
-    bool weighted = weighted_data;
-
-    for(size_t i=0; i<data_.rows(); i++) {
-      for(size_t j=0; j<data_.columns(); j++) {
-        (*centroids_)(i,target_(j)) += data_(i,j);
-        if (weighted)
-          nof_in_class(i,target_(j))+= weighted_data->weight(i,j);
-        else
-          nof_in_class(i,target_(j))+=1.0;
-      }
-    }   
-    centroids_->div(nof_in_class);
+    // data_ is a MatrixLookup or a MatrixLookupWeighted
+    if(data_.weighted()) {
+      const MatrixLookupWeighted* weighted_data = 
+        dynamic_cast<const MatrixLookupWeighted*>(&data_);      
+      for(size_t i=0; i<data_.rows(); i++) {
+        std::vector<statistics::AveragerWeighted> class_averager;
+        class_averager.resize(target_.nof_classes());
+        for(size_t j=0; j<data_.columns(); j++) {
+          class_averager[target_(j)].add((*weighted_data)(i,j),
+                                         weighted_data->weight(i,j));
+        }
+        for(size_t c=0;c<target_.nof_classes();c++) {
+          (*centroids_)(i,c) = class_averager[c].mean();
+        }
+      }
+    }
+    else {
+      const MatrixLookup* unweighted_data = 
+        dynamic_cast<const MatrixLookup*>(&data_);      
+      for(size_t i=0; i<data_.rows(); i++) {
+        std::vector<statistics::Averager> class_averager;
+        class_averager.resize(target_.nof_classes());
+        for(size_t j=0; j<data_.columns(); j++) {
+          class_averager[target_(j)].add((*unweighted_data)(i,j));
+        }
+        for(size_t c=0;c<target_.nof_classes();c++) {
+          (*centroids_)(i,c) = class_averager[c].mean();
+        }
+      }
+    }
     trained_=true;
     return trained_;
@@ -200 +223 @@
                               utility::matrix& prediction) const
   {   
-    prediction.clone(utility::matrix(centroids_->columns(), input.columns()));    
-    
-    // Weighted case
-    const MatrixLookupWeighted* testdata =
-      dynamic_cast<const MatrixLookupWeighted*>(&input);      
-    if (testdata) {
-      MatrixLookupWeighted weighted_centroids(*centroids_);
+    prediction.clone(utility::matrix(centroids_->columns(), input.columns()));        
+    // If both training and test are unweighted: unweighted
+    // calculations are used
+    const MatrixLookup* test_unweighted =
+      dynamic_cast<const MatrixLookup*>(&input);      
+    if (test_unweighted && !data_.weighted()) {
+      MatrixLookup unweighted_centroids(*centroids_);
       for(size_t j=0; j<input.columns();j++) {        
-        DataLookupWeighted1D in(*testdata,j,false);
+        DataLookup1D in(*test_unweighted,j,false);
         for(size_t k=0; k<centroids_->columns();k++) {
-          DataLookupWeighted1D centroid(weighted_centroids,k,false);
+          DataLookup1D centroid(unweighted_centroids,k,false);            
           yat_assert(in.size()==centroid.size());
           prediction(k,j)=statistics::
@@ -218 +241 @@
       }
     }
-    // Non-weighted case
-    else {
-      const MatrixLookup* testdata =
-        dynamic_cast<const MatrixLookup*>(&input);      
-      if (testdata) {
-        MatrixLookup unweighted_centroids(*centroids_);
+    // if either training or test is weighted: weighted
+    // calculations are used
+    else { 
+      const MatrixLookupWeighted* test_weighted =
+        dynamic_cast<const MatrixLookupWeighted*>(&input);      
+      MatrixLookupWeighted weighted_centroids(*centroids_);
+      if(test_weighted) {
         for(size_t j=0; j<input.columns();j++) {        
-          DataLookup1D in(*testdata,j,false);
+          DataLookupWeighted1D in(*test_weighted,j,false);
           for(size_t k=0; k<centroids_->columns();k++) {
-            DataLookup1D centroid(unweighted_centroids,k,false);            
+            DataLookupWeighted1D centroid(weighted_centroids,k,false);
             yat_assert(in.size()==centroid.size());
             prediction(k,j)=statistics::
@@ -234 +258 @@
           }
         }
-      }     
+      }
+      else if(data_.weighted() && test_unweighted) {
+        //        MatrixLookupWeighted test2weighted(*test_unweighted);
+        // Need to convert MatrixLookup to MatrixLookupWeighted here
+        // and use it in the code below
+        for(size_t j=0; j<input.columns();j++) {        
+          DataLookupWeighted1D in(*test_weighted,j,false);
+          for(size_t k=0; k<centroids_->columns();k++) {
+            DataLookupWeighted1D centroid(weighted_centroids,k,false);
+            yat_assert(in.size()==centroid.size());
+            prediction(k,j)=statistics::
+              vector_distance(in.begin(),in.end(),centroid.begin(),
+                              typename statistics::vector_distance_traits<Distance>::distance());
+          }
+        }
+      }
       else {
         std::string str;