Changeset 512

Timestamp:

Feb 18, 2006, 4:06:11 PM (16 years ago)

Author:

Peter

Message:

moved common member variables to base class Kernel

Location:

trunk/lib/classifier

Files:

• Kernel.h (modified) (3 diffs)
• Kernel_MEV.h (modified) (3 diffs)
• Kernel_SEV.cc (modified) (1 diff)
• Kernel_SEV.h (modified) (1 diff)

trunk/lib/classifier/Kernel.h

@@ -35 +35 @@
     /// Default constructor
     ///
-    Kernel(void) {};
+    //Kernel(void) {};
 
     ///
@@ -47 +47 @@
     ///   sample. @note Can not handle NaNs. 
     ///
-    Kernel(const gslapi::matrix&, const KernelFunction&) {};
+    Kernel(const gslapi::matrix& data, const KernelFunction& kf) 
+      : data_(data), kf_(&kf) {};
     
     ///
@@ -66 +67 @@
     
   protected:
+    const gslapi::matrix& data_;
+    const KernelFunction* kf_;
 
   }; // class Kernel

trunk/lib/classifier/Kernel_MEV.h

@@ -29 +29 @@
     
     ///
-    ///  Default constructor (not implemented)
-    ///
-    Kernel_MEV(void);
-
-    ///
     ///   Constructor taking the data matrix and KernelFunction as
     ///   input.Each column in the data matrix corresponds to one
@@ -39 +34 @@
     ///
     inline Kernel_MEV(const gslapi::matrix& data, const KernelFunction& kf)
-      : Kernel(data,kf), data_(data), kf_(&kf) {}
+      : Kernel(data,kf) {}
 
     ///
@@ -72 +67 @@
 
   private:
-    const gslapi::matrix& data_;
-    const KernelFunction* kf_;
 
   }; // class Kernel_MEV

trunk/lib/classifier/Kernel_SEV.cc

@@ -13 +13 @@
 
 Kernel_SEV::Kernel_SEV(const gslapi::matrix& data, const KernelFunction& kf)
-  : Kernel(data,kf), data_(data), kf_(&kf)
+  : Kernel(data,kf)
 {
   kernel_matrix_ = gslapi::matrix(data.columns(),data.columns());

trunk/lib/classifier/Kernel_SEV.h

@@ -63 +63 @@
 
   private:
-    const gslapi::matrix& data_;
-    const KernelFunction* kf_;
     gslapi::matrix kernel_matrix_;