Changeset 729 for trunk/yat/regression/Linear.cc

Timestamp:

Jan 5, 2007, 5:00:15 PM (16 years ago)

Author:

Peter

Message:

Fixes #159. Also removed some inlines in OneDimensionalWeighted? by adding source file. Refs #81

File:

• trunk/yat/regression/Linear.cc (modified) (4 diffs)

trunk/yat/regression/Linear.cc

@@ -31 +31 @@
 
   Linear::Linear(void)
-    : OneDimensional(), alpha_(0), alpha_var_(0), beta_(0), beta_var_(0),
-      chisq_(0)
+    : OneDimensional(), alpha_(0), alpha_var_(0), beta_(0), beta_var_(0)
   {
   }
@@ -60 +59 @@
   }
 
-  double Linear::chisq(void) const 
-  { 
-    return chisq_; 
-  }
-
   void Linear::fit(const utility::vector& x, const utility::vector& y) 
   {
@@ -77 +71 @@
     chisq_ = (ap_.y_averager().sum_xx_centered() - ap_.sum_xy_centered()*
               ap_.sum_xy_centered()/ap_.x_averager().sum_xx_centered() );
-    r2_= 1-chisq_/ap_.x_averager().sum_xx_centered();
     alpha_var_ = s2() / x.size();
     beta_var_ = s2() / ap_.x_averager().sum_xx_centered();
@@ -85 +78 @@
   { 
     return alpha_ + beta_ * (x - ap_.x_averager().mean()); 
-  }
-
-  double Linear::r2(void) const
-  {
-    return r2_;
   }