Changeset 1027 for trunk/yat/classifier

Timestamp:

Feb 2, 2008, 10:29:29 PM (16 years ago)

Author:

Peter

Message:

going back to previous design in which view and const_view are in different classes. Having them in same didnt work as expected. There is a problem converting vector::iterator to vector::const_iterator. I'll open a separate ticket for this issue.

Location:

trunk/yat/classifier

Files:

• KNN.h (modified) (1 diff)
• NBC.cc (modified) (1 diff)

trunk/yat/classifier/KNN.h

@@ -261 +261 @@
     for(size_t sample=0;sample<distances->columns();sample++) {
       std::vector<size_t> k_index;
-      utility::sort_smallest_index(k_index,k_,distances->column_vec(sample));
+      utility::sort_smallest_index(k_index,k_,
+                                   distances->column_const_vec(sample));
       for(size_t j=0;j<k_index.size();j++) {
         prediction(target_(k_index[j]),sample)++;

trunk/yat/classifier/NBC.cc

@@ -207 +207 @@
     for (size_t i=0; i<prediction.rows(); ++i){
       prediction.row_vec(i) *= 
-        1.0/sum(
-                prediction.row_vec(i)
-                );
+        1.0/sum(prediction.row_const_vec(i));
     }
   }