Changeset 1483

Timestamp:

Sep 9, 2008, 6:03:15 PM (13 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

Files:

• test/Makefile.am (modified) (2 diffs)
• test/distance_test.cc (modified) (2 diffs)
• test/matrix_weighted_test.cc (added)
• test/ncc_test.cc (modified) (2 diffs)
• yat/classifier/MatrixLookupWeighted.cc (modified) (2 diffs)
• yat/classifier/MatrixLookupWeighted.h (modified) (2 diffs)
• yat/classifier/NCC.h (modified) (2 diffs)
• yat/utility/MatrixWeighted.cc (modified) (2 diffs)

trunk/test/Makefile.am

@@ -40 +40 @@
   iterator_test kernel_lookup_test kernel_test \
   knn_test large_file_test matrix_lookup_test matrix_test \
-  nbc_test \
+  matrix_weighted_test nbc_test \
   ncc_test nni_test normalization_test pca_test \
   range_test regression_test rnd_test roc_test \
@@ -81 +81 @@
 large_file_test_SOURCES = large_file_test.cc
 matrix_test_SOURCES = matrix_test.cc
+matrix_weighted_test_SOURCES = matrix_weighted_test.cc
 matrix_lookup_test_SOURCES = matrix_lookup_test.cc
 nbc_test_SOURCES = nbc_test.cc

trunk/test/distance_test.cc

@@ -29 +29 @@
 #include "yat/statistics/PearsonDistance.h"
 #include "yat/utility/Matrix.h"
+#include "yat/utility/MatrixWeighted.h"
 #include "yat/utility/Vector.h"
 
@@ -227 +228 @@
 {
   utility::Matrix x=data();
-  classifier::MatrixLookupWeighted ml(x);
-  double dist1 = dist(ml.begin_row(0), ml.end_row(0), ml.begin_row(1));
+  utility::MatrixWeighted mw(x);
+  double dist1 = dist(mw.begin_row(0), mw.end_row(0), mw.begin_row(1));
   double dist2 = dist(x.begin_row(0), x.end_row(0), x.begin_row(1));
   check_equality(dist1, dist2, suite, "unity weights", N);

trunk/test/ncc_test.cc

@@ -46 +46 @@
 using namespace theplu::yat;
 
+void predict_nan_data_unweighted_data(test::Suite& suite);
+
 int main(int argc,char* argv[])
 {  
   test::Suite suite(argc, argv);
   suite.err() << "testing ncc" << std::endl;
+
+  predict_nan_data_unweighted_data(suite);
 
   /////////////////////////////////////////////
@@ -253 +257 @@
   return suite.return_value();
 }
+
+void predict_nan_data_unweighted_data(test::Suite& suite)
+{
+  //////////////////////////////////////////////////////////////////////////
+  // A test of predictions using weighted training resulting in NaN's
+  // in centroids and unweighted test data
+  //////////////////////////////////////////////////////////////////////////
+  suite.err() << "test of predictions using nan centroids and unweighted test data\n";
+  utility::Matrix data1(3,4);
+  for(size_t i=0;i<3;i++) {
+    data1(i,0)=3-i;
+    data1(i,1)=5-i;
+    data1(i,2)=i+1;
+    data1(i,3)=i+3;
+  }
+  std::vector<std::string> vec1(4, "pos");
+  vec1[0]="neg";
+  vec1[1]="neg";
+
+  classifier::MatrixLookup ml1(data1);
+  classifier::Target target1(vec1);
+  utility::Matrix prediction1;
+  utility::Matrix result1(2,4);
+
+  utility::Matrix weights2(3,4,1.0);
+  weights2(1,0)=weights2(1,1)=0.0;
+
+  classifier::MatrixLookupWeighted mlw2(data1,weights2);
+  classifier::NCC<statistics::EuclideanDistance> ncc2;
+  ncc2.train(mlw2,target1);
+  ncc2.predict(ml1,prediction1);  
+  result1(0,0)=result1(0,1)=result1(1,2)=result1(1,3)=sqrt(3.0);
+  result1(1,0)=result1(1,1)=sqrt(11.0);
+  result1(0,2)=result1(0,3)=sqrt(15.0);
+  if(!std::isnan(ncc2.centroids()(1,0))) 
+    suite.add(false);
+  if (!suite.equal_range(prediction1.begin(), prediction1.end(),
+                         result1.begin())) {
+    suite.add(false);
+    suite.err() << "Difference to expected prediction too large\n";
+  }
+}

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++)

trunk/yat/utility/MatrixWeighted.cc

@@ -123 +123 @@
     assert(data.columns()==weight.columns());
     columns_ = data.columns();
-    resize(data.columns(), data.rows());
+    resize(data.rows(), data.columns());
+    assert(rows()==data.rows());
+    assert(columns()==data.columns());
     std::copy(data.begin(), data.end(), data_iterator(vec_.begin()));
     std::copy(weight.begin(), weight.end(), weight_iterator(vec_.begin()));
@@ -169 +171 @@
     columns_ = columns;
     vec_.resize(rows*columns);
+    assert(this->rows()==rows);
+    assert(this->columns()==columns);
   }