Changeset 1158

Timestamp:

Feb 26, 2008, 2:49:38 PM (16 years ago)

Author:

Markus Ringnér

Message:

Fixed #322

Location:

trunk

Files:

• test/ncc_test.cc (modified) (1 diff)
• yat/classifier/IGP.h (modified) (4 diffs)
• yat/classifier/KNN.h (modified) (2 diffs)
• yat/classifier/NCC.h (modified) (2 diffs)

trunk/test/ncc_test.cc

@@ -22 +22 @@
 */
 
-#include "yat/classifier/IGP.h"
 #include "yat/classifier/Kernel_MEV.h"
 #include "yat/classifier/KernelLookup.h"

trunk/yat/classifier/IGP.h

@@ -51 +51 @@
   
   public:
+    ///
+    /// Constructor taking the training data and the target vector and
+    /// as input. 
+    ///
+    IGP(const MatrixLookup&, const Target&);
+
+
     ///
     /// Constructor taking the training data, the target vector and
     /// the distance measure as input. 
     ///
-    IGP(const MatrixLookup&, const Target&);
+    IGP(const MatrixLookup&, const Target&, const Distance&);
 
     ///
@@ -69 +76 @@
 
   private:
+    void calculate();
+
     utility::Vector igp_;
     Distance distance_;
@@ -83 +92 @@
     : matrix_(data), target_(target)
   {   
+    calculate();
+  }
+
+  template <typename Distance>
+  IGP<Distance>::IGP(const MatrixLookup& data, const Target& target, const Distance& dist) 
+    : matrix_(data), target_(target), distance_(dist)
+  {   
+    calculate();
+  }
+
+  
+  template <typename Distance>
+  IGP<Distance>::~IGP()   
+  {
+  }
+
+  template <typename Distance>
+  void IGP<Distance>::calculate() 
+  {
     utility::yat_assert<std::runtime_error>(target_.size()==matrix_.columns());
     
@@ -108 +136 @@
     }
   }
-  
-  template <typename Distance>
-  IGP<Distance>::~IGP()   
-  {
-  }
 
   

trunk/yat/classifier/KNN.h

@@ -63 +63 @@
 
     ///
+    /// @brief Constructor 
+    ///
+    KNN(const Distance&);
+
+
+    ///
     /// @brief Destructor
     ///
@@ -141 +147 @@
   KNN<Distance, NeighborWeighting>::KNN() 
     : SupervisedClassifier(),data_(0),target_(0),k_(3)
+  {
+  }
+
+  template <typename Distance, typename NeighborWeighting>
+  KNN<Distance, NeighborWeighting>::KNN(const Distance& dist) 
+    : SupervisedClassifier(),data_(0),target_(0),k_(3), distance_(dist)
   {
   }

trunk/yat/classifier/NCC.h

@@ -69 +69 @@
     NCC(void);
     
+    ///
+    /// @brief Constructor
+    ///
+    NCC(const Distance&);
+
 
     ///
@@ -123 +128 @@
   NCC<Distance>::NCC() 
     : SupervisedClassifier(), centroids_(0), centroids_nan_(false)
+  {
+  }
+
+  template <typename Distance>
+  NCC<Distance>::NCC(const Distance& dist) 
+    : SupervisedClassifier(), centroids_(0), centroids_nan_(false), distance_(dist)
   {
   }