Changeset 742

Timestamp:

Jan 13, 2007, 10:14:05 PM (16 years ago)

Author:

Peter

Message:

added test that LinearWeighte? is equal to PolynomialWeighted?(1) fixes #166

Location:

trunk

Files:

• test/regression_test.cc (modified) (1 diff)
• yat/regression/PolynomialWeighted.cc (modified) (1 diff)
• yat/regression/PolynomialWeighted.h (modified) (1 diff)

trunk/test/regression_test.cc

@@ -131 +131 @@
            << std::endl;
     ok=false;
+  }
+
+  // Comparing LinearWeighted and PolynomialWeighted(1)
+  *error << "    comparing LinearWeighted and PolynomialWeighted(1)"
+         << std::endl;
+  linear_w.fit(x,y,w);
+  regression::PolynomialWeighted polynomial_w(1);
+  polynomial_w.fit(x,y,w);
+  if ( fabs(linear_w.beta()-polynomial_w.fit_parameters()(1))>10e-7 ){
+    *error << "error: beta and fit_parameters(1) not equal" << std::endl;
+    *error << "       beta = " << linear_w.beta() << std::endl;
+    *error << "       fit_parameters(1) = " 
+           << polynomial_w.fit_parameters()(1) << std::endl;
+    ok = false;
+  }
+  if ( fabs(polynomial_w.fit_parameters()(0)-linear_w.alpha()+
+            linear_w.beta()*1990)>0.0001){
+    *error << "error: fit_parameters(0) = " 
+           << polynomial.fit_parameters()(0)<< std::endl;
+    *error << "error: alpha-beta*m_x = " 
+           << linear.alpha()-linear.beta()*1990 << std::endl;
+    ok = false;
+  }
+  if ( fabs(polynomial_w.s2()-linear_w.s2())>0.0001){
+    *error << "error: chisq not same in linear and polynomial(1)" 
+           << std::endl;
+    ok = false;
+  }
+  if ( fabs(polynomial_w.predict(1.0)-linear_w.predict(1.0))>0.0001){
+    *error << "error: predict not same in linear and polynomial(1)" 
+           << std::endl;
+    ok = false;
+  }
+  if ( fabs(polynomial_w.standard_error2(1985)-linear_w.standard_error2(1985))
+       >0.0001){
+    *error << "error: standard_error not same in linear and polynomial(1)" 
+           << "\n  polynomial: " << polynomial.standard_error2(1985)
+           << "\n  linear: " << linear.standard_error2(1985)
+           << std::endl;
+    ok = false;
   }
 

trunk/yat/regression/PolynomialWeighted.cc

@@ -67 +67 @@
 
 
-  double PolynomialWeighted::s2(const double w=1.0) const
+  double PolynomialWeighted::s2(const double w) const
   {
     return md_.s2(w);

trunk/yat/regression/PolynomialWeighted.h

@@ -77 +77 @@
     /// @brief Mean Squared Error
     ///
-    double s2(const double) const;
+    double s2(const double w=1) const;
 
     ///