Changeset 388

Timestamp:

Aug 15, 2005, 11:41:58 AM (17 years ago)

Author:

Peter

Message:

added test on Regression::Linear

File:

• trunk/test/regression_test.cc (modified) (5 diffs)

trunk/test/regression_test.cc

@@ -22 +22 @@
 int main(const int argc,const char* argv[])
 {
-  bool print=((argc>1) && (argv[1]==std::string("-p")));
-  if (print)
-    std::cout << "regression: testing linear, local, naive, and polynomial fits"
-              << std::endl;
+  std::ostream* error;
+  if (argc>1 && argv[1]==std::string("-p"))
+    error = &std::cerr;
+  else 
+    error = new std::ofstream("/dev/null");
+
+  *error << "regression: testing linear, local, naive, and polynomial fits"
+         << std::endl;
 
   bool ok=true;
@@ -36 +40 @@
   // testing regression::Linear
   statistics::regression::Linear linear;
-  linear.fit(x,w,y);
+  linear.fit(x,y,w);
   double y_predicted=0;
   double y_predicted_err=0;
-  linear.predict(0,y_predicted,y_predicted_err);
-  // Jari, check missing!
+  linear.predict(1990,y_predicted,y_predicted_err);
+  if (y_predicted!=12.8){
+    *error << "regression_Linear: cannot reproduce fit." << std::endl;
+    ok=false;
+  }
 
   // testing regression::Naive
@@ -49 +56 @@
   naive.predict(0.0,y_predicted,y_predicted_err);
   if (y_predicted!=(0.1*12+0.2*11+0.3*14+0.4*13)) {
-    if (print)
-      std::cerr << "regression_Naive: cannot reproduce fit." << std::endl;
+    *error << "regression_Naive: cannot reproduce fit." << std::endl;
     ok=false;
   }
@@ -58 +64 @@
   statistics::regression::Linear rl;
   if (!Local_test(rl,kb)) {
-    if (print)
-      std::cerr << "regression_Local: Linear cannot reproduce fit." << std::endl;
+    *error << "regression_Local: Linear cannot reproduce fit." << std::endl;
     ok=false;
   }
   statistics::regression::Naive rn;
   if (!Local_test(rn,kb)) {
-    if (print)
-      std::cerr << "regression_Local: Naive cannot reproduce fit." << std::endl;
+    *error << "regression_Local: Naive cannot reproduce fit." << std::endl;
     ok=false;
   }
@@ -85 +89 @@
     if (fabs(fit[0]-1.012229646706 + fit[1]-0.012561322528 +
              fit[2]+1.159674470130)>1e-11) {  // Jari, fix number!
-      if (print)
-        std::cerr << "regression_Polynomial: cannot reproduce fit." << std::endl;
+      *error << "regression_Polynomial: cannot reproduce fit." << std::endl;
       ok=false;
     }
   }
+
+  if (error!=&std::cerr)
+    delete error;
 
   return (ok ? 0 : -1);