Changeset 1483 for trunk/yat/classifier

Timestamp:

Sep 9, 2008, 6:03:15 PM (15 years ago)

Author:

Peter

Message:

refs #396 - removing a constructor in MatrixLookupWeighted? - needed to re-organize tests in ncc_test to track down an error

Location:

trunk/yat/classifier

Files:

• MatrixLookupWeighted.cc (modified) (2 diffs)
• MatrixLookupWeighted.h (modified) (2 diffs)
• NCC.h (modified) (2 diffs)

trunk/yat/classifier/MatrixLookupWeighted.cc

@@ -88 +88 @@
 
 
+  /*
   MatrixLookupWeighted::MatrixLookupWeighted(const utility::Matrix& data)
     : data_(MatrixP(&data, false))
@@ -98 +99 @@
     assert(validate());
   }
+  */
 
 

trunk/yat/classifier/MatrixLookupWeighted.h

@@ -107 +107 @@
        \brief Create a lookup into entire \a matrix.
      */
-    MatrixLookupWeighted(const utility::MatrixWeighted& matrix);
+    explicit MatrixLookupWeighted(const utility::MatrixWeighted& matrix);
 
     ///
@@ -133 +133 @@
     /// result of further use is undefined.
     ///
-    MatrixLookupWeighted(const utility::Matrix& matrix);
+    //MatrixLookupWeighted(const utility::Matrix& matrix);
 
 

trunk/yat/classifier/NCC.h

@@ -34 +34 @@
 #include "yat/statistics/AveragerWeighted.h"
 #include "yat/utility/Matrix.h"
+#include "yat/utility/MatrixWeighted.h"
 #include "yat/utility/Vector.h"
 #include "yat/utility/stl_utility.h"
@@ -294 +295 @@
                                           utility::Matrix& prediction) const
   {
-    MatrixLookupWeighted weighted_centroids(centroids_);
+    utility::MatrixWeighted weighted_centroids(centroids_);
     for(size_t j=0; j<test.columns();j++) 
       for(size_t k=0; k<centroids_.columns();k++)