Changeset 1007 for trunk/yat/classifier

Timestamp:

Jan 29, 2008, 10:53:23 AM (16 years ago)

Author:

Markus Ringnér

Message:

Restructuringpredict in NCC. refs #259

File:

• trunk/yat/classifier/NCC.h (modified) (2 diffs)

trunk/yat/classifier/NCC.h

@@ -220 +220 @@
 
   template <typename Distance>
-  void NCC<Distance>::predict(const DataLookup2D& input,                    
+  void NCC<Distance>::predict(const DataLookup2D& test,                     
                               utility::matrix& prediction) const
   {   
-    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()) {
+    utility::yat_assert<std::runtime_error>(data_.rows()==test.rows());
+    utility::yat_assert<std::runtime_error>(test.rows()==centroids_->rows());
+    
+    prediction.clone(utility::matrix(centroids_->columns(), test.columns()));       
+
+    // unweighted test data
+    if (const MatrixLookup* test_unweighted =
+        dynamic_cast<const MatrixLookup*>(&test)) {
       MatrixLookup unweighted_centroids(*centroids_);
-      for(size_t j=0; j<input.columns();j++) {        
+      for(size_t j=0; j<test.columns();j++) {       
         DataLookup1D in(*test_unweighted,j,false);
         for(size_t k=0; k<centroids_->columns();k++) {
@@ -241 +243 @@
       }
     }
-    // if either training or test is weighted: weighted
-    // calculations are used
-    else { 
-      const MatrixLookupWeighted* test_weighted =
-        dynamic_cast<const MatrixLookupWeighted*>(&input);      
-      if(test_weighted) {
-        MatrixLookupWeighted weighted_centroids(*centroids_);
-        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);
-            utility::yat_assert<std::runtime_error>(in.size()==centroid.size());
-            prediction(k,j)=statistics::
-              vector_distance(in.begin(),in.end(),centroid.begin(),
-                              typename statistics::vector_distance_traits<Distance>::distance());
-          }
-        }
-      }
-      else if(data_.weighted() && test_unweighted) {
-        std::string str =  "Error in NCC<Distance>::predict:";
-        str += " predicting unweighted data when NCC";
-        str += " is trained on weighted data is not yet supported";
-        throw std::runtime_error(str);        
-      }
-      else {
-        std::string str = 
-          "Error in NCC<Distance>::predict: DataLookup2D of unexpected class.";
-        throw std::runtime_error(str);
-      }
+    // weighted test data
+    else if (const MatrixLookupWeighted* test_weighted =
+            dynamic_cast<const MatrixLookupWeighted*>(&test)) { 
+      MatrixLookupWeighted weighted_centroids(*centroids_);
+      for(size_t j=0; j<test.columns();j++) {       
+        DataLookupWeighted1D in(*test_weighted,j,false);
+        for(size_t k=0; k<centroids_->columns();k++) {
+          DataLookupWeighted1D centroid(weighted_centroids,k,false);
+          utility::yat_assert<std::runtime_error>(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 = 
+        "Error in NCC<Distance>::predict: DataLookup2D of unexpected class.";
+      throw std::runtime_error(str);
     }
   }