Changeset 930 for trunk/yat/classifier

Timestamp:

Oct 4, 2007, 3:30:02 PM (16 years ago)

Author:

Markus Ringnér

Message:

Fixed support for MatrixLookup? in NCC. See ticket:259

File:

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

trunk/yat/classifier/NCC.h

@@ -105 +105 @@
   private:
 
-    utility::matrix centroids_;
+    utility::matrix* centroids_;
 
     // data_ has to be of type DataLookup2D to accomodate both
@@ -123 +123 @@
   template <typename Distance>
   NCC<Distance>::NCC(const MatrixLookup& data, const Target& target) 
-    : SupervisedClassifier(target), data_(data)
+    : SupervisedClassifier(target), centroids_(0), data_(data) 
   {
   }
@@ -129 +129 @@
   template <typename Distance>
   NCC<Distance>::NCC(const MatrixLookupWeighted& data, const Target& target)
-    : SupervisedClassifier(target), data_(data)
+    : SupervisedClassifier(target), centroids_(0), data_(data) 
   {
   }
@@ -136 +136 @@
   NCC<Distance>::~NCC()   
   {
-  }
-
+    if(centroids_)
+      delete centroids_;
+  }
 
   template <typename Distance>
   const utility::matrix& NCC<Distance>::centroids(void) const
   {
-    return centroids_;
+    return *centroids_;
   }
   
@@ -158 +159 @@
     NCC* ncc=0;
     if(data.weighted()) {
-      ncc=new NCC<Distance>(dynamic_cast<const MatrixLookupWeighted&>(data),
+      ncc=new NCC<Distance>(*dynamic_cast<const MatrixLookupWeighted*>(&data),
                   target);
     }
     else {
-      ncc=new NCC<Distance>(dynamic_cast<const MatrixLookup&>(data),
+      ncc=new NCC<Distance>(*dynamic_cast<const MatrixLookup*>(&data),
                   target);
     }
+    ncc->centroids_=0;
     return ncc;
   }
@@ -172 +174 @@
   bool NCC<Distance>::train()
   {   
-    centroids_.clone(utility::matrix(data_.rows(), target_.nof_classes()));
+    if(centroids_) 
+      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 = 
@@ -180 +184 @@
     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);
+        (*centroids_)(i,target_(j)) += data_(i,j);
         if (weighted)
           nof_in_class(i,target_(j))+= weighted_data->weight(i,j);
@@ -187 +191 @@
       }
     }   
-    centroids_.div(nof_in_class);
+    centroids_->div(nof_in_class);
     trained_=true;
     return trained_;
@@ -194 +198 @@
   template <typename Distance>
   void NCC<Distance>::predict(const DataLookup2D& input,                    
-                    utility::matrix& prediction) const
+                              utility::matrix& prediction) const
   {   
-    prediction.clone(utility::matrix(centroids_.columns(), input.columns()));   
-
+    prediction.clone(utility::matrix(centroids_->columns(), input.columns()));    
+    
     // Weighted case
     const MatrixLookupWeighted* testdata =
       dynamic_cast<const MatrixLookupWeighted*>(&input);      
     if (testdata) {
-      MatrixLookupWeighted weighted_centroids(centroids_);
+      MatrixLookupWeighted weighted_centroids(*centroids_);
       for(size_t j=0; j<input.columns();j++) {        
         DataLookupWeighted1D in(*testdata,j,false);
-        for(size_t k=0; k<centroids_.columns();k++) {
+        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());
+                            typename statistics::vector_distance_traits<Distance>::distance());
         }
       }
     }
+    // Non-weighted case
     else {
-      std::string str;
-      str = "Error in NCC<Distance>::predict: DataLookup2D of unexpected class.";
-      throw std::runtime_error(str);
+      const MatrixLookup* testdata =
+        dynamic_cast<const MatrixLookup*>(&input);      
+      if (testdata) {
+        MatrixLookup unweighted_centroids(*centroids_);
+        for(size_t j=0; j<input.columns();j++) {        
+          DataLookup1D in(*testdata,j,false);
+          for(size_t k=0; k<centroids_->columns();k++) {
+            DataLookup1D centroid(unweighted_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;
+        str = "Error in NCC<Distance>::predict: DataLookup2D of unexpected class.";
+        throw std::runtime_error(str);
+      }
     }
   }