Changeset 101 for trunk/src/WeightedAverager.h

Timestamp:

Jun 10, 2004, 5:34:39 PM (19 years ago)

Author:

Peter

Message:

more readable code

File:

• trunk/src/WeightedAverager.h (modified) (3 diffs)

trunk/src/WeightedAverager.h

@@ -48 +48 @@
     ///w_ix_i}{\sum w_i} \f$ @return average
     ///
-    inline double mean(void) const { return w_.sum_x() ? 
-                                       wx_.sum_x()/w_.sum_x() : 0; }
+    inline double mean(void) const { return sum_w() ? 
+                                       sum_wx()/sum_w() : 0; }
   
     ///
@@ -61 +61 @@
     ///
     inline double squared_error(void) const 
-    { return (wx_.sum_xsqr()-2*mean()*wwx_+
-              mean()*mean()*w_.sum_xsqr()) / (w_.sum_x()*w_.sum_x()); }
+    { return (sum_wwxx()-2*mean()*wwx_+
+              mean()*mean()*sum_ww()) / (sum_w()*sum_w()); }
 
     ///
@@ -104 +104 @@
     /// operator to add a WeightedAverager
     ///
-    inline WeightedAverager operator+=(WeightedAverager a)
+    inline WeightedAverager operator+=(WeightedAverager& a)
     { wx_+=a.wx(); w_+=a.w(); wwx_+=a.sum_wwx(); return *this; }