Changeset 746 for trunk/yat

Timestamp:

Feb 11, 2007, 10:26:35 AM (16 years ago)

Author:

Peter

Message:

Fixes #146

Location:

trunk/yat/classifier

Files:

• Kernel.h (modified) (1 diff)
• KernelLookup.cc (modified) (1 diff)
• Kernel_MEV.cc (modified) (1 diff)
• Kernel_MEV.h (modified) (1 diff)
• Kernel_SEV.cc (modified) (1 diff)
• Kernel_SEV.h (modified) (1 diff)
• MatrixLookupWeighted.h (modified) (1 diff)

trunk/yat/classifier/Kernel.h

@@ -146 +146 @@
 
 
-    ///
-    /// Created Kernel is built from selected features in data. The
-    /// @a index corresponds to which rows in data to use for the
-    /// calculation of the returned Kernel.
-    /// 
-    /// @return Dynamically allocated Kernel based on selected features
-    ///
-    /// @Note Returns a dynamically allocated Kernel, which has
-    /// to be deleted by the caller to avoid memory leaks.
-    ///
-    /// @todo remove this function
-    virtual const Kernel* selected(const std::vector<size_t>& index) const=0;
-
     /**
        \brief number of samples 

trunk/yat/classifier/KernelLookup.cc

@@ -143 +143 @@
   KernelLookup::selected(const std::vector<size_t>& inputs) const
   {
-    const Kernel* kernel = kernel_->selected(inputs);
-    return new KernelLookup(*kernel, row_index_, column_index_, true);
+    const Kernel* kernel;
+    if (kernel_->weighted()){
+      const MatrixLookupWeighted* ml = 
+        dynamic_cast<const MatrixLookupWeighted*>(data());
+      assert(ml);
+      const MatrixLookupWeighted* ms = 
+        new MatrixLookupWeighted(*ml,inputs,true);
+      kernel = kernel_->make_kernel(*ms, false);
+    }
+    else {
+      const MatrixLookup* m = 
+        dynamic_cast<const MatrixLookup*>(data());
+      assert(m);
+      // matrix with selected features
+      const MatrixLookup* ms = new MatrixLookup(*m,inputs,true);
+      kernel = kernel_->make_kernel(*ms,true);
+    }
+    return new KernelLookup(*kernel, true);
   }
 

trunk/yat/classifier/Kernel_MEV.cc

@@ -76 +76 @@
 
 
-  const Kernel_MEV* Kernel_MEV::selected(const std::vector<size_t>& index) const
-  {
-    return new Kernel_MEV(*this, index);
-  }
-
-
 
 }}} // of namespace classifier, yat, and theplu

trunk/yat/classifier/Kernel_MEV.h

@@ -106 +106 @@
 
 
-    /// 
-    /// @see Kernel_MEV(const Kernel_MEV&, const std::vector<size_t>&);
-
-    ///
-    /// @note returns dynamically allocated pointer that must be
-    /// deleted by the caller to avoid memory leaks.
-    ///
-    const Kernel_MEV* selected(const std::vector<size_t>& index) const;
-
   private:
     ///

trunk/yat/classifier/Kernel_SEV.cc

@@ -94 +94 @@
 
 
-  const Kernel* Kernel_SEV::selected(const std::vector<size_t>& index) const
-  {
-    return new Kernel_SEV(*this, index);
-  }
-
-
 }}} // of namespace classifier, yat, and theplu

trunk/yat/classifier/Kernel_SEV.h

@@ -102 +102 @@
 
 
-    ///
-    /// @todo doc
-    ///
-    const Kernel* selected(const std::vector<size_t>& index) const;
-
   private:
     ///

trunk/yat/classifier/MatrixLookupWeighted.h

@@ -165 +165 @@
     /// underlying matrix to avoid multiple lookups.
     ///
-    /// If @a row_vectors is true the new MatrixLookupWeighted will be consist
+    /// If @a row_vectors is true the new MatrixLookupWeighted will consist
     /// of the row vectors defined by @a index. This means that the
     /// created MatrixLookupWeighted will fullfill:
     /// \f$ MatrixLookupWeighted(i,j)=ml(i,index[j])\f$
     ///
-    /// If @a row_vectors is false the new MatrixLookupWeighted will be consist
+    /// If @a row_vectors is false the new MatrixLookupWeighted will consist
     /// of the rolumn vectors defined by @a index. This means that the
     /// created MatrixLookupWeighted will fullfill: