Changeset 1098 for trunk/yat/classifier

Timestamp:

Feb 18, 2008, 4:13:53 AM (15 years ago)

Author:

Jari Häkkinen

Message:

Fixes #299. Memory leak in matrix was found and removed.

Location:

trunk/yat/classifier

Files:

• KNN.h (modified) (1 diff)
• Kernel_SEV.cc (modified) (2 diffs)
• NCC.h (modified) (1 diff)
• SVM.cc (modified) (1 diff)

trunk/yat/classifier/KNN.h

@@ -251 +251 @@
     // for each test sample (column in distances) find the closest
     // training samples
-    prediction.clone(utility::matrix(target_.nof_classes(),test.columns(),0.0));
+    prediction.resize(target_.nof_classes(),test.columns(),0.0);
     for(size_t sample=0;sample<distances->columns();sample++) {
       std::vector<size_t> k_index;

trunk/yat/classifier/Kernel_SEV.cc

@@ -47 +47 @@
     : Kernel(data,kf, own)
   {
-    kernel_matrix_.clone(utility::matrix(data_->columns(),data_->columns()));
+    kernel_matrix_.resize(data_->columns(),data_->columns());
     for (size_t i=0; i<kernel_matrix_.rows(); i++) 
       for (size_t j=i; j<kernel_matrix_.columns(); j++)
@@ -66 +66 @@
   void Kernel_SEV::build_kernel(void)
   {
-    kernel_matrix_.clone(utility::matrix(data_->columns(),data_->columns()));
+    kernel_matrix_.resize(data_->columns(),data_->columns());
     for (size_t i=0; i<kernel_matrix_.rows(); i++) 
       for (size_t j=i; j<kernel_matrix_.columns(); j++)

trunk/yat/classifier/NCC.h

@@ -232 +232 @@
        "NCC::predict test data with incorrect number of rows");
     
-    prediction.clone(utility::matrix(centroids_->columns(), test.columns()));       
+    prediction.resize(centroids_->columns(), test.columns());
 
     // unweighted test data

trunk/yat/classifier/SVM.cc

@@ -158 +158 @@
       const KernelLookup& input_kernel =dynamic_cast<const KernelLookup&>(input);
       assert(input.rows()==alpha_.size());
-      prediction.clone(utility::matrix(2,input.columns(),0));
+      prediction.resize(2,input.columns(),0);
       for (size_t i = 0; i<input.columns(); i++){
         for (size_t j = 0; j<input.rows(); j++){