Changeset 331

Timestamp:

Jun 2, 2005, 12:06:51 AM (18 years ago)

Author:

Peter

Message:

add KernelView? in makefile and small fixes

Location:

trunk/lib/svm

Files:

• KernelView.cc (modified) (2 diffs)
• KernelView.h (modified) (2 diffs)
• Makefile.am (modified) (2 diffs)

trunk/lib/svm/KernelView.cc

@@ -1 @@
-// $Id:$
+// $Id$
 
 #include <c++_tools/svm/KernelView.h>
@@ -13 +13 @@
 
 KernelView::KernelView(const Kernel& kernel, const std::vector<size_t>& index)
-  : Kernel(data,kf), kernel_(&kernel), index_(index)
+  : kernel_(&kernel), index_(index)
 {
+  // to view into the original kernel rather than a view
+  //if (kernel.is_view()){
+  //  kernel_=kernel.kernel_;
+  //  for (size_t i=0; i<index.size(); i++) 
+  //    index_[i]=kernel.index_[index[i]];
+  //}
 }
 

trunk/lib/svm/KernelView.h

@@ -23 +23 @@
     ///
     /// Contructor taking the Kernel to view into and a vector of the
-    /// indeces we view into. If Kernel is a KernelView it implemented
-    /// to view into something that is viewing into... and may
+    /// indeces we view into. The constructed Kernel matrix will have
+    /// dimensions \f$NxN\f$ where \f$N\f$ is the size of \a index. If
+    /// Kernel is a KernelView, as now it implemented to view into the
+    /// view rather directly into the original Kernel, and may
     /// therefore be slow. Use instead the original Kernel and view
     /// directly into that.
     ///
-    KernelView(const Kernel&, const std::vector<size_t>&);
+    KernelView(const Kernel& kernel, const std::vector<size_t>& index);
     
     ///
@@ -46 +48 @@
     ///
     inline double operator()(const size_t row,const size_t column) const
-    { return (*kernel_)(index[row],index[column]); }
+    { return (*kernel_)(index_[row],index_[column]); }
+
+    ///
+    /// @brief number of samples
+    ///
+    size_t size(void) const { return index_.size(); } 
     
+
   private:
     const Kernel* kernel_;

trunk/lib/svm/Makefile.am

@@ -10 +10 @@
 libsvm_la_SOURCES = \
   ConsensusInputRanker.cc CrossValidation.cc GaussianKernelFunction.cc \
-  InputRanker.cc Kernel.cc Kernel_MEV.cc Kernel_SEV.cc \
+  InputRanker.cc Kernel.cc Kernel_MEV.cc Kernel_SEV.cc KernelView.cc\
   PolynomialKernelFunction.cc  SVM.cc
 
@@ -18 +18 @@
   ConsensusInputRanker.h CrossValidation.h GaussianKernelFunction.h \
   InputRanker.h Kernel.h KernelFunction.h Kernel_MEV.h Kernel_SEV.h \
-  PolynomialKernelFunction.h SVM.h
+  KernelView.h PolynomialKernelFunction.h SVM.h