Changeset 1669 for trunk

Timestamp:

Dec 22, 2008, 4:00:06 AM (15 years ago)

Author:

Peter

Message:

refs #470: nni_test

File:

• trunk/test/nni_test.cc (modified) (3 diffs)

trunk/test/nni_test.cc

@@ -72 +72 @@
   std::ifstream control_stream(knni_result.c_str());
   utility::Matrix control(control_stream);
-  control-=knni.imputed_data();
-  // error_bound is arbitrarily selected
-  double error_bound = std::numeric_limits<double>::epsilon()*1e4;
+  double error_bound = 1e-11;
   for (unsigned int i=0; i<control.rows(); i++)
     for (unsigned int j=0; j<control.columns(); j++)
-      if (std::abs(control(i,j))>error_bound) {
+      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::abs(control(i,j))
-                    << ". Expected less than " << error_bound << std::endl;
+                    << "column " << j << " is" << std::endl;
         suite.add(false); // calculation result out of accepted error bounds
       }
-      else
-        if (!((control(i,j)==control(i,j)))) {
-          suite.err() << "kNNI FAILED, nan (not a number) " 
-                      << "encountered in test on row " << i
-                      << " and column " << j << std::endl;
-          suite.add(false); // calucaltion error detected
-        }
   control_stream.close();
   data_stream.close();
@@ -103 +93 @@
   control_stream.open(wenni_result.c_str());
   control=utility::Matrix(control_stream);
-  control-=wenni.imputed_data();
   for (unsigned int i=0; i<control.rows(); i++)
     for (unsigned int j=0; j<control.columns(); j++)
-      if (std::abs(control(i,j))>error_bound) {
+      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 << " is " << std::abs(control(i,j))
-                    << ". Expected less than " << error_bound << std::endl;
+                    << "column " << j << std::endl;
         suite.add(false); // calculation result out of accepted error bounds
       }
-      else
-        if (!((control(i,j)==control(i,j)))) {
-          suite.err() << "WeNNI FAILED, nan (not a number) " 
-                      << "encountered in test on row " << i
-                      << " and column " << j << std::endl;
-          suite.add(false); // calucaltion error detected
-        }
   control_stream.close();
   data_stream.close();
@@ -132 +113 @@
   control_stream.open(knni_result.c_str());
   control=utility::Matrix(control_stream);
-  control-=wenni2.imputed_data();
   for (unsigned int i=0; i<control.rows(); i++)
     for (unsigned int j=0; j<control.columns(); j++)
-      if (std::abs(control(i,j))>error_bound) {
+      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 << " is " << std::abs(control(i,j))
-                    << ". Expected less than " << error_bound << std::endl;
+                    << " and column " << j << std::endl;
         suite.add(false); // calculation result out of accepted error bounds
       }
-      else
-        if (!((control(i,j)==control(i,j)))) {
-          suite.err() << "WeNNI binary wieght test FAILED.\n"
-                      << "nan (not a number) encountered in test on row " << i
-                      << " and column " << j << std::endl;
-          suite.add(false); // calucaltion error detected
-        }
   control_stream.close();
   data_stream.close();