Changeset 527 for trunk/lib/classifier/Kernel_SEV.cc

Timestamp:

Mar 1, 2006, 12:23:53 PM (16 years ago)

Author:

Peter

Message:

Modified Kernel to be built from MatrixLookup? rather than
gslapi::matrix. Also changed interface to create DataLookup1D from
DataLookup2D - is now coherent with gslapi.

File:

• trunk/lib/classifier/Kernel_SEV.cc (modified) (2 diffs)

trunk/lib/classifier/Kernel_SEV.cc

@@ -3 +3 @@
 #include <c++_tools/classifier/Kernel_SEV.h>
 
+#include <c++_tools/classifier/DataLookup1D.h>
 #include <c++_tools/classifier/Kernel.h>
 #include <c++_tools/classifier/KernelFunction.h>
+#include <c++_tools/classifier/MatrixLookup.h>
 #include <c++_tools/gslapi/matrix.h>
 #include <c++_tools/gslapi/vector.h>
@@ -12 +14 @@
 
 
-  Kernel_SEV::Kernel_SEV(const gslapi::matrix& data, const KernelFunction& kf)
+  Kernel_SEV::Kernel_SEV(const MatrixLookup& data, const KernelFunction& kf)
     : Kernel(data,kf)
   {
     kernel_matrix_ = gslapi::matrix(data.columns(),data.columns());
     for (size_t i=0; i<kernel_matrix_.rows(); i++) 
-      for (size_t j=i; j<kernel_matrix_.columns(); j++) 
+      for (size_t j=i; j<kernel_matrix_.columns(); j++)
         kernel_matrix_(i,j) = kernel_matrix_(j,i) =
-          (*kf_)(gslapi::vector(data_,i,false),gslapi::vector(data_,j,false));
+          (*kf_)(DataLookup1D(data_,i,false),DataLookup1D(data_,j,false));
   }
-
-  double Kernel_SEV::element(const gslapi::vector& vec, const size_t i) const
+  double Kernel_SEV::element(const DataLookup1D& vec, const size_t i) const
   { 
-    return kf_->operator()(vec, gslapi::vector(data_,i)); 
+    return kf_->operator()(vec, DataLookup1D(data_,i)); 
   }