Changeset 789 for trunk/yat/classifier

Timestamp:

Mar 10, 2007, 9:07:13 PM (17 years ago)

Author:

Jari Häkkinen

Message:

Addresses #193. vector now works as outlined here. Added some
functionality. Added a clone function that facilitates resizing of
vectors. clone is needed since assignement operator functionality is
changed.

Location:

trunk/yat/classifier

Files:

• IGP.cc (modified) (1 diff)
• NCC.cc (modified) (1 diff)
• utility.cc (modified) (2 diffs)

trunk/yat/classifier/IGP.cc

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

trunk/yat/classifier/NCC.cc

@@ -110 +110 @@
                     utility::vector& prediction) const
   {
-    prediction=utility::vector(centroids_.columns());   
+    prediction.clone(utility::vector(centroids_.columns()));
 
     utility::vector value(input.size(),0);

trunk/yat/classifier/utility.cc

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