Changeset 1727

Timestamp:

Jan 15, 2009, 10:49:39 PM (15 years ago)

Author:

Jari Häkkinen

Message:

Fixes #464. Final tests.

Location:

trunk/test

Files:

• data/knni_matrix.data (modified) (1 diff)
• data/knni_result.data (modified) (1 diff)
• data/wenni_result.data (modified) (1 diff)
• nni_test.cc (modified) (7 diffs)

trunk/test/data/knni_matrix.data

@@ -11 +11 @@
 .2234 .77639  .38783  .28953  .62376  .5445 .32489  .22388  .238746 .23468   .1234  
 .2388 .234688 .43687  .86456  .65654  .6864 .879645 .98454  .98731  .164897  .1234
-.1968 .153987 .13684  .14685  .316135 .5286 .69435  .13634  .18351  .1984531 .1234
+.1968 .153987 .13684  .14685  .316135 .5286 .69435  .13634  .18351  .1984531 Inf
 .6865 .213687 .12368  .18564  .897654 .4945 .789654 .45547  .98466  .66136   .1234
 .9835 .963154 .964664 .132369     .983316 .3276 .376513 .34941  .387433 .31685   .1234

trunk/test/data/knni_result.data

@@ -9 +9 @@
 0.2234 0.77639 0.38783 0.28953 0.62376 0.5445 0.32489 0.22388 0.238746 0.23468 0.1234
 0.2388 0.234688 0.43687 0.86456 0.65654 0.6864 0.879645 0.98454 0.98731 0.164897 0.1234
-0.1968 0.153987 0.13684 0.14685 0.316135 0.5286 0.69435 0.13634 0.18351 0.577643004747 0.1234
+0.1968 0.153987 0.13684 0.14685 0.316135 0.5286 0.69435 0.13634 0.18351 0.577643004747 Inf
 0.6865 0.213687 0.12368 0.18564 0.897654 0.4945 0.789654 0.45547 0.98466 0.66136 0.1234
 0.9835 0.963154 0.964664 0.132369 0.983316 0.3276 0.376513 0.34941 0.387433 0.31685 0.1234

trunk/test/data/wenni_result.data

@@ -9 +9 @@
 0.2234 0.77639 0.38783 0.28953 0.62376 0.5445 0.32489 0.22388 0.238746 0.23468 0.1234
 0.2388 0.234688 0.43687 0.86456 0.65654 0.6864 0.879645 0.98454 0.98731 0.164897 0.1234
-0.1968 0.153987 0.13684 0.14685 0.316135 0.5286 0.69435 0.13634 0.18351 0.577488912729 0.1234
+0.1968 0.153987 0.13684 0.14685 0.316135 0.5286 0.69435 0.13634 0.18351 0.577488912729 Inf
 0.6865 0.213687 0.12368 0.18564 0.897654 0.4945 0.789654 0.45547 0.98466 0.66136 0.1234
 0.9835 0.963154 0.964664 0.132369 0.983316 0.3276 0.376513 0.34941 0.387433 0.31685 0.1234

trunk/test/nni_test.cc

@@ -48 +48 @@
 {
   test::Suite suite(argc, argv);
+  suite.err() << "Testing NNI algorithms" << std::endl;
 
+  suite.err() << "Reading data" << std::endl;
   unsigned int neighbours=3;
   std::string knni_data(test::filename("data/knni_matrix.data"));
@@ -64 +66 @@
 
   // test kNNI
+  suite.err() << "Testing kNNI" << std::endl;
   std::ifstream data_stream(knni_data.c_str());
   std::ifstream weight_stream(knni_weight.c_str());
@@ -79 +82 @@
   for (unsigned int i=0; i<control.rows(); i++)
     for (unsigned int j=0; j<control.columns(); j++)
-      if (!suite.equal_fix(knni.imputed_data()(i,j),control(i,j),error_bound)) {
+      if ((i==10) && (j==10)) {
+        if (!std::isnan(knni.imputed_data()(i,j)-control(i,j))) {
+          suite.err() << "kNNI FAILED, error on row " << i << " and " 
+                      << "column " << j << " expected NaN" << std::endl;
+          suite.add(false);
+        }
+      }
+      else if (!suite.equal_fix(knni.imputed_data()(i,j),control(i,j),error_bound)) {
         suite.err() << "kNNI FAILED, error on row " << i << " and " 
-                    << "column " << j << " is" << std::endl;
+                    << "column " << j << std::endl;
         suite.add(false); // calculation result out of accepted error bounds
       }
@@ -89 +99 @@
 
   // test WeNNI
+  suite.err() << "Testing WeNNI" << std::endl;
   data_stream.open(wenni_data.c_str());
   data=utility::Matrix(data_stream);
@@ -103 +114 @@
   for (unsigned int i=0; i<control.rows(); i++)
     for (unsigned int j=0; j<control.columns(); j++)
-      if (!suite.equal_fix(wenni.imputed_data()(i,j),control(i,j),error_bound)){
+      if ((i==10) && (j==10)) {
+        if (!std::isnan(knni.imputed_data()(i,j)-control(i,j))) {
+          suite.err() << "WeNNI FAILED, error on row " << i << " and " 
+                      << "column " << j << " expected NaN" << std::endl;
+          suite.add(false);
+        }
+      }
+      else if (!suite.equal_fix(wenni.imputed_data()(i,j),control(i,j),error_bound)){
         suite.err() << "WeNNI FAILED, error on row " << i << " and " 
                     << "column " << j << std::endl;
@@ -113 +131 @@
 
   // test WeNNI with binary weights
+  suite.err() << "Testing WeNNI with binary weights" << std::endl;
   data_stream.open(knni_data.c_str());
   data=utility::Matrix(data_stream);
@@ -128 +147 @@
   for (unsigned int i=0; i<control.rows(); i++)
     for (unsigned int j=0; j<control.columns(); j++)
-      if (!suite.equal_fix(wenni2.imputed_data()(i,j),control(i,j),error_bound)){
+      if ((i==10) && (j==10)) {
+        if (!std::isnan(knni.imputed_data()(i,j)-control(i,j))) {
+          suite.err() << "binary WeNNI FAILED, error on row " << i << " and " 
+                      << "column " << j << " expected NaN" << std::endl;
+          suite.add(false);
+        }
+      }
+      else if (!suite.equal_fix(wenni2.imputed_data()(i,j),control(i,j),error_bound)){
         suite.err() << "WeNNI binary weight test FAILED.\nError on row " << i
                     << " and column " << j << std::endl;