Changeset 175

Timestamp:

Sep 29, 2004, 3:42:56 PM (19 years ago)

Author:

Jari Häkkinen

Message:

Added checks against exact vector copies in nni data, i.e. distance 0.

Location:

trunk/test

Files:

• data/knni_matrix.data (modified) (1 diff)
• data/knni_result.data (modified) (1 diff)
• data/knni_weight.data (modified) (1 diff)
• data/wenni_result.data (modified) (1 diff)
• data/wenni_weight.data (modified) (1 diff)
• test_nni.cc (modified) (2 diffs)

trunk/test/data/knni_matrix.data

@@ -3 +3 @@
 .8964 .471294 .947234 .38272  .48328  .2874 .489892 .23478  .45645  .23899   .1234
 .4372 .382144 .763342 .32924  .27823  .3827 .234764 .384734 .398795 .23498   .1234
+.8624 .286482 .83248  .72846  .28468  .2347 .23234  .98973  .29874  .32894   .1234
 .8624 .286482 .83248  .72846  .28468  .2347 .23234  .98973  .29874  .32894   .1234
 .2342 .23878  .97437  .76236  .32764  .3474 .43276  .34555  .29948  .34598   .1234

trunk/test/data/knni_result.data

@@ -4 +4 @@
 0.4372 0.382144 0.763342 0.32924 0.27823 0.3827 0.234764 0.384734 0.398795 0.23498 0.1234
 0.8624 0.286482 0.83248 0.72846 0.28468 0.2347 0.23234 0.98973 0.29874 0.32894 0.1234
+0.8624 0.286482 0.83248 0.72846 0.284680000063 0.2347 0.23234 0.98973 0.29874 0.32894 0.1234
 0.2342 0.23878 0.97437 0.76236 0.32764 0.3474 0.43276 0.34555 0.29948 0.265321643162 0.1234
 0.2347 0.56783 0.78435 0.35763 0.23468 0.7384 0.23578 0.345533 0.235948 0.32458 0.1234

trunk/test/data/knni_weight.data

@@ -4 +4 @@
 1 1 1 1 1 1 1 1 1 1 0
 1 1 1 1 1 1 1 1 1 1 0
+1 1 1 1 0 1 1 1 1 1 0
 1 1 1 1 1 1 1 1 1 0 0
 1 1 1 1 1 1 1 1 1 1 0

trunk/test/data/wenni_result.data

@@ -4 +4 @@
 0.4372 0.382144 0.763342 0.32924 0.27823 0.3827 0.234764 0.384734 0.398795 0.23498 0.1234
 0.8624 0.286482 0.83248 0.72846 0.28468 0.2347 0.23234 0.98973 0.29874 0.32894 0.1234
+0.8624 0.286482 0.83248 0.72846 0.284680000063 0.2347 0.23234 0.98973 0.29874 0.32894 0.1234
 0.2342 0.23878 0.97437 0.76236 0.32764 0.3474 0.43276 0.34555 0.29948 0.27341113502 0.1234
 0.2347 0.56783 0.78435 0.35763 0.23468 0.7384 0.23578 0.345533 0.235948 0.32458 0.1234

trunk/test/data/wenni_weight.data

@@ -4 +4 @@
 1 1 1 1 1 1 1 1 1 1 0
 1 1 1 1 1 1 1 1 1 1 0
+1 1 1 1 0 1 1 1 1 1 0
 1 1 1 1 1 1 1 1 1 0.1 0
 1 1 1 1 1 1 1 1 1 1 0

trunk/test/test_nni.cc

@@ -52 +52 @@
         exit(-1); // calculation result out of accepted error bounds
       }
+      else
+        if (!((control(i,j)==control(i,j)))) {
+          std::cerr << "test_nni: kNNI FAILED, nan (not a number) encountered in test\n";
+          exit(-1); // calucaltion error detected
+        }
   control_stream.close();
   data_stream.close();
@@ -73 +78 @@
         exit(-1); // calculation result out of accepted error bounds
       }
+      else
+        if (!((control(i,j)==control(i,j)))) {
+          std::cerr << "test_nni: WeNNI FAILED, nan (not a number) encountered in test\n";
+          exit(-1); // calucaltion error detected
+        }
 
   std::cout << "test_nni: SUCCESS, reproducing test result\n";