Changeset 702 for trunk/yat/regression/LinearWeighted.cc

Timestamp:

Oct 26, 2006, 4:04:35 PM (16 years ago)

Author:

Peter

Message:

Refs #81 moved mse_ to inherited classes and made mse() pure virtual because mse is calculated different for different classes and therefore this design is more logic. Fixed docs and other things...

File:

• trunk/yat/regression/LinearWeighted.cc (modified) (1 diff)

trunk/yat/regression/LinearWeighted.cc

@@ -39 +39 @@
     // product wx*wy, so we can send in w and a dummie to get what we
     // want.
-    utility::vector dummie(w.size(),1);
-    statistics::AveragerPairWeighted ap;
-    ap.add_values(x,y,w,dummie);
-
-    double m_x = ap.x_averager().mean();
-    double m_y = ap.y_averager().mean();
-    
-    double sxy = ap.sum_xy_centered();
-
-    double sxx = ap.x_averager().sum_xx_centered();
-    double syy = ap.y_averager().sum_xx_centered();
+    ap_.reset();
+    ap_.add_values(x,y,utility::vector(x.size(),1),w);
 
     // estimating the noise level. see attached document for motivation
     // of the expression.
-    s2_= (syy-sxy*sxy/sxx)/(w.sum()-2*(w*w)/w.sum()) ;
+    s2_= (syy()-sxy()*sxy()/sxx())/(w.sum()-2*(w*w)/w.sum()) ;
     
-    alpha_ = m_y;
-    beta_ = sxy/sxx;
-    alpha_var_ = ap.y_averager().standard_error() * 
-      ap.y_averager().standard_error();
-    beta_var_ = s2_/sxx;  
-    m_x_=m_x;
+    alpha_ = m_y();
+    beta_ = sxy()/sxx();
+    alpha_var_ = ap_.y_averager().standard_error() * 
+      ap_.y_averager().standard_error();
+    beta_var_ = s2_/sxx();  
+    m_x_=m_x();
   }