Changeset 848 for trunk/test

Timestamp:

Apr 28, 2007, 5:20:40 PM (16 years ago)

Author:

Jari Häkkinen

Message:

Merged log:/branches/0.3.1#838:846 to trunk.

Location:

trunk/test

Files:

• averager_test.cc (modified) (2 diffs)
• regression_test.cc (modified) (4 diffs)

trunk/test/averager_test.cc

@@ -30 +30 @@
 #include "yat/utility/vector.h"
 
+#include <cmath>
 #include <fstream>
 #include <limits>
@@ -229 +230 @@
 bool equal(const Averager& a, const Averager& b)
 {
-//  std::cout << (a.n()==b.n()) << std::endl;
+//  std::cout << (a.n()==b.n()) << std::endl;
 //  std::cout << (a.mean()==b.mean()) << std::endl;
-//  std::cout << (a.variance()==b.variance()) << std::endl;
-  return (a.n()==b.n() && a.mean()==b.mean() && a.variance()==b.variance());
+//  std::cout << (fabs(a.variance()-b.variance()<1e-15)) << std::endl;
+  return (a.n()==b.n() && a.mean()==b.mean() &&
+          fabs(a.variance()-b.variance()<1e-15));
 }
 

trunk/test/regression_test.cc

@@ -267 +267 @@
   r.fit(x,y);
   rw.fit(x,y,w);
-  if (r.predict(2000) != rw.predict(2000)){
+  if (fabs(r.predict(2000) - rw.predict(2000))>1e-15) {
     ok = false;
     *error << "Error: predict not equal\n" 
@@ -382 +382 @@
 
   wr.fit(x2,y2,w2);
-  if (wr.predict(2000) != predict){
+  if (fabs(wr.predict(2000) - predict)>1e-15) {
     ok = false;
     *error << "Error: predict not equal.\n";
   }
-  if (wr.prediction_error2(2000) != prediction_error2){
+  if (fabs(wr.prediction_error2(2000) - prediction_error2)>1e-13) {
     ok = false;
     *error << "Error: prediction_error2 not equal.\n";
   }
-  if (wr.r2() != r2){
+  if (fabs(wr.r2() - r2)>1e-15) {
     ok = false;
     *error << "Error: r2 not equal.\n";
@@ -396 +396 @@
     *error << "   r2: " << wr.r2() << "\n";
   }
-  if (wr.s2() != s2){
+  if (fabs(wr.s2() - s2)>1e-15) {
     ok = false;
     *error << "Error: s2 not equal.\n";
   }
-  if (wr.standard_error2(2000) != standard_error2){
+  if (fabs(wr.standard_error2(2000) - standard_error2)>1e-15) {
     ok = false;
     *error << "Error: standard_error2 not equal.\n";
@@ -437 +437 @@
   }
 
-  if (md.standard_error2(z) != mdw.standard_error2(z)){
+  if (fabs(md.standard_error2(z)-mdw.standard_error2(z))>10e-6){
     ok = false;
     *error << "Error: standard_error2 not equal\n"