Changeset 1133

Timestamp:

Feb 23, 2008, 9:40:35 PM (16 years ago)

Author:

Peter

Message:

using SmartPtr? in KernelLookup? rather than doing the ref count myself

Location:

trunk

Files:

• test/kernel_test.cc (modified) (1 diff)
• test/svm_test.cc (modified) (1 diff)
• yat/classifier/KernelLookup.cc (modified) (6 diffs)
• yat/classifier/KernelLookup.h (modified) (3 diffs)
• yat/utility/SmartPtr.h (modified) (2 diffs)

trunk/test/kernel_test.cc

@@ -31 +31 @@
 #include "yat/classifier/Kernel_MEV.h"
 #include "yat/classifier/Kernel_SEV.h"
+#include "yat/classifier/MatrixLookup.h"
 
 #include <cassert>

trunk/test/svm_test.cc

@@ -29 +29 @@
 #include "yat/classifier/Kernel_SEV.h"
 #include "yat/classifier/Kernel_MEV.h"
+#include "yat/classifier/MatrixLookup.h"
 #include "yat/classifier/PolynomialKernelFunction.h"
 #include "yat/classifier/Target.h"

trunk/yat/classifier/KernelLookup.cc

@@ -38 +38 @@
 
   KernelLookup::KernelLookup(const Kernel& kernel, const bool own)
-    : kernel_(&kernel)
-  {
-    if (own)
-      ref_count_ = new u_int(1);
-    else
-      ref_count_ = NULL;
+    : kernel_(utility::SmartPtr<const Kernel>(&kernel, own))
+  {
     column_index_.reserve(kernel.size());
     for(size_t i=0; i<kernel.size(); i++)
@@ -55 +51 @@
                              const std::vector<size_t>& column,
                              const bool owner)
-    : column_index_(column), kernel_(&kernel), ref_count_(NULL),
+    : column_index_(column), 
+      kernel_(utility::SmartPtr<const Kernel>(&kernel, owner)),
       row_index_(row)
   {
@@ -84 +81 @@
       column_index_.push_back(other.column_index_[column[i]]);
     }
-    ref_count_=other.ref_count_;
-    if (ref_count_)
-      ++(*ref_count_);
   }
   
@@ -101 +95 @@
            *(max_element(column_index_.begin(), column_index_.end()))<
            kernel_->size());
-    ref_count_=other.ref_count_;
-    if (ref_count_)
-      ++(*ref_count_);
   }
   
@@ -138 +129 @@
            *(max_element(column_index_.begin(), column_index_.end()))<
            kernel_->size());
-    ref_count_=other.ref_count_;
-    if (ref_count_)
-      ++(*ref_count_);
   }
   
@@ -146 +134 @@
   KernelLookup::~KernelLookup(void)
   {
-    if (ref_count_)
-      if (!--(*ref_count_))
-        delete kernel_;
   }
 

trunk/yat/classifier/KernelLookup.h

@@ -28 +28 @@
 
 #include "Kernel.h"
-#include "DataLookup2D.h"
-#include "MatrixLookup.h"
 #include "yat/utility/Container2DIterator.h"
 #include "yat/utility/iterator_traits.h"
+#include "yat/utility/SmartPtr.h"
 #include "yat/utility/StrideIterator.h"
-
 
 #include <vector>
@@ -41 +39 @@
 namespace classifier {
 
+  class DataLookup2D;
   class KernelFunction;
+  class MatrixLookup;
+  class MatrixLookupWeighted;
 
   ///
@@ -337 +338 @@
 
     std::vector<size_t> column_index_;
-    const Kernel* kernel_;
-    ///
-    /// poiter telling how many owners to underlying data. NULL if
-    /// this is not an owner.
-    ///
-    u_int* ref_count_;
+    utility::SmartPtr<const Kernel> kernel_;
     std::vector<size_t> row_index_;
     

trunk/yat/utility/SmartPtr.h

@@ -26 +26 @@
 
 #include "yat_assert.h"
+
+// debug
+#include <iostream>
 
 namespace theplu {
@@ -70 +73 @@
       if (owner)
         ref_count_ = new u_int(1);
+      else
+        ref_count_ = NULL;
     }