Changeset 1009 for trunk/yat/classifier

Timestamp:

Feb 1, 2008, 5:15:44 AM (16 years ago)

Author:

Peter

Message:

merging branch peter-dev into trunk delta 1008:994

Location:

trunk/yat/classifier

Files:

• IGP.h (modified) (1 diff)
• KNN.h (modified) (1 diff)
• NBC.cc (modified) (1 diff)
• SVM.cc (modified) (1 diff)
• utility.cc (modified) (2 diffs)

trunk/yat/classifier/IGP.h

@@ -86 +86 @@
     
     // Calculate IGP for each class
-    igp_.clone(utility::vector(target_.nof_classes()));
+    igp_ = utility::vector(target_.nof_classes());
     
     for(u_int i=0; i<target_.size(); i++) {

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_,utility::vector(*distances,sample,false));
+      utility::sort_smallest_index(k_index,k_,distances->column_vec(sample));
       for(size_t j=0;j<k_index.size();j++) {
         prediction(target_(k_index[j]),sample)++;

trunk/yat/classifier/NBC.cc

@@ -205 +205 @@
 
     // normalize each row (label) to sum up to unity (probability)
-    for (size_t i=0; i<prediction.rows(); ++i)
-      utility::vector(prediction,i) *= 
-        1.0/utility::sum(utility::vector(prediction,i));
-
+    for (size_t i=0; i<prediction.rows(); ++i){
+      prediction.row_vec(i) *= 
+        1.0/sum(
+                prediction.row_vec(i)
+                );
+    }
   }
 

trunk/yat/classifier/SVM.cc

@@ -198 +198 @@
   {
     trained_=false;
-    alpha_.clone(utility::vector(target_.size(), 0));
+    alpha_ = utility::vector(target_.size(), 0);
   }
 

trunk/yat/classifier/utility.cc

@@ -35 +35 @@
   void convert(const DataLookup1D& lookup, utility::vector& vector) 
   {
-    vector.clone(utility::vector(lookup.size()));
+    vector = utility::vector(lookup.size());
     for(u_int i=0; i<lookup.size(); i++)
       vector(i)=lookup(i);
@@ -44 +44 @@
   {
     
-    value.clone(utility::vector(lookup.size()));
-    weight.clone(utility::vector(lookup.size()));
+    value = utility::vector(lookup.size());
+    weight = utility::vector(lookup.size());
     for(u_int i=0; i<lookup.size(); i++){
       value(i)=lookup.data(i);