Changeset 42 for trunk/src/Kernel.cc

Timestamp:

Feb 26, 2004, 4:06:20 PM (18 years ago)

Author:

Jari Häkkinen

Message:

Made a major revision of matrix and vector classes. Everything compiles
but the binaries have not been tested.

File:

• trunk/src/Kernel.cc (modified) (3 diffs)

trunk/src/Kernel.cc

@@ -1 +1 @@
 // $Id$
-
-// System
-#include <math.h>
-
 
 // Thep C++ Tools
@@ -11 +7 @@
 #include "vector.h"
 
-using namespace thep_cpp_tools;
+namespace theplu {
+namespace cpptools {  
 
-Kernel::Kernel(const thep_gsl_api::matrix& data, const KernelFunction& kf)
+Kernel::Kernel(const gslapi::matrix& data, const KernelFunction& kf)
+  : k_(data.columns(),data.columns())
 {
-  k_=thep_gsl_api::matrix(data.cols(),data.cols(),0);
-  for(u_int i=0;i<data.cols();i++)
-    for(u_int j=0;j<i+1;j++) {  
-     double tmp = kf(data.col_vector(i),data.col_vector(j));
-     k_.set(i,j,tmp);
-    }
+  for(u_int i=0;i<data.columns();i++)
+    for(u_int j=0;j<i+1;j++)
+      k_(i,j)=kf(data.TEMP_col_return(i),data.TEMP_col_return(j));
   
   // Copy lower triangle to upper triangle of Kernel matrix
-  for(u_int i=0;i<data.cols()-1;i++)
-    for(u_int j=i+1;j<data.cols();j++) 
-      k_.set(i,j,k_.get(j,i));
+  for(u_int i=0;i<data.columns()-1;i++)
+    for(u_int j=i+1;j<data.columns();j++) 
+      k_(i,j)=k_(j,i);
 }
 
@@ -32 +27 @@
 }  
 
-
-
+}} // of namespace cpptools and namespace theplu