Changeset 1204

Timestamp:

Mar 5, 2008, 3:26:08 PM (16 years ago)

Author:

Peter

Message:

Return by value from FeatureSelector?. Copying a Lookup is cheap, so no reason to return by reference and keep a collection of garbage

Location:

trunk/yat/classifier

Files:

• FeatureSelector.cc (modified) (2 diffs)
• FeatureSelector.h (modified) (2 diffs)

trunk/yat/classifier/FeatureSelector.cc

@@ -41 +41 @@
   FeatureSelector::~FeatureSelector()
   {
-    for (std::list<const MatrixLookup*>::iterator i=garbage_.begin(); 
-         i!=garbage_.end(); ++i)
-      delete *i;
-    for (std::list<const MatrixLookupWeighted*>::iterator i=
-           garbage_weighted_.begin(); i!=garbage_weighted_.end(); ++i)
-      delete *i;
   }
 
@@ -56 +50 @@
 
 
-  const MatrixLookup& FeatureSelector::get(const MatrixLookup& matrix)
+  const MatrixLookup FeatureSelector::get(const MatrixLookup& matrix)
   {
-    garbage_.push_back(new MatrixLookup(matrix,utility::Index(features_),true));
-    return *garbage_.back();
+    return MatrixLookup(matrix, features_,true);
   }
 
 
-  const MatrixLookupWeighted& 
+  const MatrixLookupWeighted 
   FeatureSelector::get(const MatrixLookupWeighted& matrix)
   {
-    garbage_weighted_.push_back(new MatrixLookupWeighted(matrix,
-                                                         utility::Index(features_),
-                                                         true));
-    return *garbage_weighted_.back();
+    return MatrixLookupWeighted(matrix, features_, true);
   }
 

trunk/yat/classifier/FeatureSelector.h

@@ -57 +57 @@
     /// @return MatrixLookup containing only selected features. 
     ///
-    const MatrixLookup& get(const MatrixLookup& data);
+    const MatrixLookup get(const MatrixLookup& data);
 
     ///
     /// @return MatrixLookupWeighted containing only selected features. 
     ///
-    const MatrixLookupWeighted& get(const MatrixLookupWeighted& data);
+    const MatrixLookupWeighted get(const MatrixLookupWeighted& data);
 
     ///
@@ -97 +97 @@
 
   private:
-    std::list<const MatrixLookup*> garbage_;
-    std::list<const MatrixLookupWeighted*> garbage_weighted_;
 
   };