Changeset 353

Timestamp:

Jun 9, 2005, 1:28:35 AM (18 years ago)

Author:

Peter

Message:

removed function returning the whole matrix. It is not needed anymore and should not be there for simplistic reasons.

Location:

trunk/lib/svm

Files:

• GaussianKernelFunction.cc (modified) (1 diff)
• GaussianKernelFunction.h (modified) (1 diff)
• KernelFunction.h (modified) (1 diff)
• PolynomialKernelFunction.cc (modified) (1 diff)
• PolynomialKernelFunction.h (modified) (1 diff)

trunk/lib/svm/GaussianKernelFunction.cc

@@ -34 +34 @@
 
 
-const theplu::gslapi::matrix& 
-GaussianKernelFunction::operator()(theplu::gslapi::matrix& k,
-                                   const theplu::gslapi::matrix& data) const
-{
-  theplu::gslapi::matrix data_transposed(data);
-  data_transposed.transpose();
-  k = data_transposed*data;
-  // Working with the linear linear kernel in order to avoid copying
-  // row vectors from data matrix (many times) and calculate the
-  // kernel element in a more transparent way.
-  for (size_t i=0; i<k.rows()-1; i++)
-    for (size_t j=i+1; j<k.columns(); j++)
-      k(i,j)=k(j,i)=exp(-(k(i,i)+k(j,j)-2*k(i,j))/(2*sigma_));
-  for (size_t i=0; i<k.rows(); i++)
-    k(i,i)=1;
-  return k;
-}
 
 }} // of namespace svn and namespace theplu

trunk/lib/svm/GaussianKernelFunction.h

@@ -50 +50 @@
                       const gslapi::vector& w2) const;
           
-    ///
-    /// @return kernel matrix
-    ///
-    const gslapi::matrix& operator()(theplu::gslapi::matrix& kernel,
-                                     const theplu::gslapi::matrix& data) const;
-  
   private:
     double sigma_;

trunk/lib/svm/KernelFunction.h

@@ -44 +44 @@
                               const gslapi::vector&) const = 0; 
     
-    ///
-    /// @return kernel matrix
-    ///
-    virtual const theplu::gslapi::matrix& operator()
-      (theplu::gslapi::matrix& k, const gslapi::matrix& data) const = 0;
-  
   }; // class KernelFunction
 

trunk/lib/svm/PolynomialKernelFunction.cc

@@ -36 +36 @@
 }
 
-const theplu::gslapi::matrix& 
-PolynomialKernelFunction::operator()(theplu::gslapi::matrix& kernel,
-                                     const theplu::gslapi::matrix& data) const
-{
-  gslapi::matrix data_transposed(data.transpose());
-  kernel = data_transposed*data;
-  if (order_>1)
-    for (size_t i=0; i<kernel.rows(); i++)
-      for (size_t j=i; j<kernel.rows(); j++)
-        kernel(i,j)=kernel(j,i)=pow(1+kernel(i,j),order_);
-  return kernel;
-}
 }} // of namespace cpptools and namespace theplu

trunk/lib/svm/PolynomialKernelFunction.h

@@ -55 +55 @@
                       const gslapi::vector&, const gslapi::vector&) const;
     
-    ///
-    /// @return kernel matrix
-    ///
-    const gslapi::matrix& operator()(theplu::gslapi::matrix& kernel,
-                                     const theplu::gslapi::matrix& data) const;
-
   private:
     int order_;