Changeset 2563

Timestamp:

Sep 25, 2011, 9:38:22 PM (11 years ago)

Author:

Peter

Message:

refs #471. handle some n=0 cases

Location:

trunk/yat/statistics

Files:

• Averager.cc (modified) (1 diff)
• AveragerWeighted.cc (modified) (1 diff)

trunk/yat/statistics/Averager.cc

@@ -151 +151 @@
   const Averager& Averager::operator+=(const Averager& a)
   {
+    if (!a.n())
+      return *this;
     mean_ += (sum_x() + a.sum_x()) / (n() + a.n());
     double delta = mean_ - a.mean();

trunk/yat/statistics/AveragerWeighted.cc

@@ -160 +160 @@
   AveragerWeighted::operator+=(const AveragerWeighted& a)
   {
+    if (!a.w_)
+      return *this;
     mean_ += (sum_wx() + a.sum_wx()) / (sum_w() + a.sum_w());
     double delta = mean() - a.mean();