Changeset 874 for trunk/yat/classifier

Timestamp:

Sep 18, 2007, 2:53:21 PM (16 years ago)

Author:

Markus Ringnér

Message:

Fixes ticket:237

Location:

trunk/yat/classifier

Files:

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

trunk/yat/classifier/NCC.cc

@@ -110 +110 @@
 
 
-  void NCC::predict(const DataLookup1D& input, const utility::vector& weights,
+  void NCC::predict(const utility::vector& input, const utility::vector& weights,
                     utility::vector& prediction) const
   {
     prediction.clone(utility::vector(centroids_.columns()));
-
-    utility::vector value(input.size(),0);
-    for(size_t i=0; i<input.size(); i++)
-      value(i)=input(i);
     
     // take care of nan's in centroids
@@ -127 +123 @@
           wc(i)=1.0;
       }
-      prediction(j)=distance_(value,centroid,weights,wc);   
+      prediction(j)=distance_(input,centroid,weights,wc);   
     }
   }
@@ -141 +137 @@
     if (data) {
       for(size_t j=0; j<input.columns();j++) {     
-        DataLookup1D in(input,j,false);
+        utility::vector in(input.rows(),0);
+        for(size_t i=0; i<in.size();i++) 
+          in(i)=data->data(i,j);
         utility::vector weights(in.size(),0);
         for(size_t i=0; i<in.size();i++) 
@@ -159 +157 @@
     }
     for(size_t j=0; j<input.columns();j++) {     
-      DataLookup1D in(input,j,false);
+      utility::vector in(input.rows(),0);
+      for(size_t i=0; i<in.size();i++) 
+        in(i)=(*data)(i,j);
       utility::vector weights(in.size(),1.0);
       utility::vector out;

trunk/yat/classifier/NCC.h

@@ -110 +110 @@
     /// Calculate the distance to each centroid for a test sample
     ///
-    void predict(const DataLookup1D&, const utility::vector&,
+    void predict(const utility::vector&, const utility::vector&,
                  utility::vector&) const;