Changeset 1033 for trunk/yat/classifier

Timestamp:

Feb 5, 2008, 12:12:12 PM (16 years ago)

Author:

Markus Ringnér

Message:

Working on #259

File:

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

trunk/yat/classifier/NCC.h

@@ -107 +107 @@
   private:
 
+    void predict_unweighted(const MatrixLookup&, utility::matrix&) const;
+    void predict_weighted(const MatrixLookupWeighted&, utility::matrix&) const;   
+
     utility::matrix* centroids_;
+    bool centroids_nan_;
 
     // data_ has to be of type DataLookup2D to accomodate both
     // MatrixLookup and MatrixLookupWeighted
     const DataLookup2D& data_;
-    bool centroids_nan_;
   };
 
@@ -125 +128 @@
   template <typename Distance>
   NCC<Distance>::NCC(const MatrixLookup& data, const Target& target) 
-    : SupervisedClassifier(target), centroids_(0), data_(data), centroids_nan_(false) 
+    : SupervisedClassifier(target), centroids_(0), centroids_nan_(false), data_(data) 
   {
   }
@@ -131 +134 @@
   template <typename Distance>
   NCC<Distance>::NCC(const MatrixLookupWeighted& data, const Target& target)
-    : SupervisedClassifier(target), centroids_(0), data_(data), centroids_nan_(false)  
+    : SupervisedClassifier(target), centroids_(0), centroids_nan_(false), data_(data)
   {
   }
@@ -231 +234 @@
     prediction.clone(utility::matrix(centroids_->columns(), test.columns()));       
 
-    // unweighted test data and no nan's in centroids
-    // Markus: Should test centroid_nan_ here!!!
+    // unweighted test data
     if (const MatrixLookup* test_unweighted =
         dynamic_cast<const MatrixLookup*>(&test)) {
-      MatrixLookup unweighted_centroids(*centroids_);
-      for(size_t j=0; j<test.columns();j++) {       
-        DataLookup1D in(*test_unweighted,j,false);
-        for(size_t k=0; k<centroids_->columns();k++) {
-          DataLookup1D centroid(unweighted_centroids,k,false);            
-          utility::yat_assert<std::runtime_error>(in.size()==centroid.size());
-          prediction(k,j)=statistics::
-            distance(in.begin(),in.end(),centroid.begin(),
-                            typename statistics::distance_traits<Distance>::distance());
-        }
-      }
-    }
-    // weighted test data
+      // If weighted training data resulting in NaN in centroids: weighted calculations
+      if(centroids_nan_) { 
+        //        predict_weighted(MatrixLookupWeighted(*test_unweighted),prediction);
+        std::string str = 
+        "Error in NCC<Distance>::predict: weighted training unweighted test not implemented yet";
+      throw std::runtime_error(str);
+      }
+      // If unweighted training data: unweighted calculations
+      else {
+        predict_unweighted(*test_unweighted,prediction);
+      }
+    }
+    // weighted test data: weighted calculations
     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::
-            distance(in.begin(),in.end(),centroid.begin(),
-                            typename statistics::distance_traits<Distance>::distance());
-        }
-      }
+             dynamic_cast<const MatrixLookupWeighted*>(&test)) { 
+      predict_weighted(*test_weighted,prediction);
     }
     else {
@@ -268 +260 @@
     }
   }
+  
+  template <typename Distance>
+  void NCC<Distance>::predict_unweighted(const MatrixLookup& test, 
+                                         utility::matrix& prediction) const
+  {
+    MatrixLookup unweighted_centroids(*centroids_);
+    for(size_t j=0; j<test.columns();j++) {       
+      DataLookup1D in(test,j,false);
+      for(size_t k=0; k<centroids_->columns();k++) {
+        DataLookup1D centroid(unweighted_centroids,k,false);            
+        utility::yat_assert<std::runtime_error>(in.size()==centroid.size());
+        prediction(k,j)=statistics::
+          distance(in.begin(),in.end(),centroid.begin(),
+                   typename statistics::distance_traits<Distance>::distance());
+      }
+    }
+  }
+
+  template <typename Distance>
+  void NCC<Distance>::predict_weighted(const MatrixLookupWeighted& test, 
+                                          utility::matrix& prediction) const
+  {
+    MatrixLookupWeighted weighted_centroids(*centroids_);
+    for(size_t j=0; j<test.columns();j++) {       
+      DataLookupWeighted1D in(test,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::
+          distance(in.begin(),in.end(),centroid.begin(),
+                   typename statistics::distance_traits<Distance>::distance());
+      }
+    }
+  }
+
       
 }}} // of namespace classifier, yat, and theplu