Changeset 1201 for trunk/yat

Timestamp:

Mar 5, 2008, 3:56:13 AM (16 years ago)

Author:

Peter

Message:

returning SmartPtr? rather than conventional pointer when object is dynamically allocated - also fixed bug in SubsetGenerator? for Kernel with feature selection

Location:

trunk/yat/classifier

Files:

• KernelLookup.cc (modified) (6 diffs)
• KernelLookup.h (modified) (2 diffs)
• SubsetGenerator.h (modified) (2 diffs)

trunk/yat/classifier/KernelLookup.cc

@@ -28 +28 @@
 
 #include <cassert>
-#ifndef NDEBUG
-#include <algorithm>
-#endif 
 
 namespace theplu {
@@ -187 +184 @@
 
 
-  const KernelLookup* 
+  utility::SmartPtr<const KernelLookup> 
   KernelLookup::selected(const utility::Index& inputs) const
   {
@@ -203 +200 @@
       kernel = kernel_->make_kernel(*ms,true);
     }
-    return new KernelLookup(*kernel, true);
-  }
-
-
-  const KernelLookup* KernelLookup::test_kernel(const MatrixLookup& data) const
-  {
-
+    return utility::SmartPtr<const KernelLookup>
+      (new KernelLookup(*kernel, true));
+  }
+
+
+  utility::SmartPtr<const KernelLookup> 
+  KernelLookup::test_kernel(const MatrixLookup& data) const
+  {
     if (!weighted()){
       assert(data.rows()==kernel_->data().rows());
@@ -242 +240 @@
         kernel_->make_kernel(*tmp, true);
 
-      return new KernelLookup(*kernel, utility::Index(row_index), 
-                              utility::Index(column_index), true);
+      return utility::SmartPtr<const KernelLookup>
+        (new KernelLookup(*kernel, utility::Index(row_index), 
+                          utility::Index(column_index), true));
     }
 
@@ -281 +280 @@
                                                          *weight_all, true);
     const Kernel* kernel = kernel_->make_kernel(*tmp, true);
-    return new KernelLookup(*kernel, row_index_, 
-                            utility::Index(column_index), true);
-  }
-
-
-
-  const KernelLookup* 
+
+
+    return utility::SmartPtr<const KernelLookup>
+      (new KernelLookup(*kernel, row_index_, 
+                        utility::Index(column_index), true));
+  }
+
+
+
+  utility::SmartPtr<const KernelLookup>
   KernelLookup::test_kernel(const MatrixLookupWeighted& data) const
   {
@@ -329 +331 @@
     const Kernel* kernel = 
       kernel_->make_kernel(MatrixLookupWeighted(*data_all, *weight_all, true));
-    return new KernelLookup(*kernel, row_index_, 
-                            utility::Index(column_index), true);
+    return utility::SmartPtr<const KernelLookup>
+      (new KernelLookup(*kernel, row_index_, 
+                        utility::Index(column_index), true));
   }
 

trunk/yat/classifier/KernelLookup.h

@@ -267 +267 @@
        corresponds to the same pair of samples as in the original
        KernelLookup.
-
-       \note Returns a dynamically allocated KernelLookup, which has
-       to be deleted by the caller to avoid memory leaks.
-    */
-    const KernelLookup* selected(const utility::Index& index) const;
+    */
+    utility::SmartPtr<const KernelLookup> 
+    selected(const utility::Index& index) const;
     
+    /**
+       This function is useful when predicting on an independent data
+       set using a kernel-based classifier. In returned KernelLookup
+       column \f$ i \f$ corresponds to column \f$ i \f$ in @a
+       data. Row \f$ i \f$ in returned KernelLookup corresponds to
+       same sample as row \f$ i \f$ in @a this. In other words, this
+       function returns a KernelLookup containing the kernel elements
+       between the passed @a data and the internal underlying data @a
+       this was built from.
+    */
+    utility::SmartPtr<const KernelLookup> 
+    test_kernel(const MatrixLookup& data) const;
+
     /**
        This function is useful when predicting on an independent data
@@ -286 +297 @@
        to be deleted by the caller to avoid memory leaks.
     */
-    const KernelLookup* test_kernel(const MatrixLookup& data) const;
-
-    /**
-       This function is useful when predicting on an independent data
-       set using a kernel-based classifier. In returned KernelLookup
-       column \f$ i \f$ corresponds to column \f$ i \f$ in @a
-       data. Row \f$ i \f$ in returned KernelLookup corresponds to
-       same sample as row \f$ i \f$ in @a this. In other words, this
-       function returns a KernelLookup containing the kernel elements
-       between the passed @a data and the internal underlying data @a
-       this was built from.
-    
-       @note Returns a dynamically allocated KernelLookup, which has
-       to be deleted by the caller to avoid memory leaks.
-    */
-    const KernelLookup* test_kernel(const MatrixLookupWeighted& data) const;
+    utility::SmartPtr<const KernelLookup> 
+    test_kernel(const MatrixLookupWeighted& data) const;
 
     /**

trunk/yat/classifier/SubsetGenerator.h

@@ -33 +33 @@
 #include "Sampler.h"
 #include "yat/utility/Index.h"
+#include "yat/utility/SmartPtr.h"
 #include "yat/utility/yat_assert.h"
 
@@ -278 +279 @@
         } 
         features_.push_back(f_selector_->features());
-        const KernelLookup* kl = kernel.selected(features_.back());
+        utility::SmartPtr<const KernelLookup> kl = 
+          kernel.selected(features_.back());
         // Dynamically allocated. Must be deleted in destructor.
-        training_data_.push_back(new KernelLookup(kernel,training_index(k),
+        training_data_.push_back(new KernelLookup(*kl,training_index(k),
                                                   training_index(k)));
-        validation_data_.push_back(new KernelLookup(kernel, training_index(k), 
+        validation_data_.push_back(new KernelLookup(*kl, training_index(k), 
                                                     validation_index(k)));
-        utility::yat_assert<std::runtime_error>(kl);
-        delete kl;
       }
       else {// no feature selection