Changeset 2755

Timestamp:

Jul 4, 2012, 12:13:08 PM (9 years ago)

Author:

Peter

Message:

fixes #709

Location:

branches/0.8-stable

Files:

• test/averager.cc (modified) (3 diffs)
• yat/statistics/Averager.cc (modified) (1 diff)
• yat/statistics/AveragerWeighted.cc (modified) (1 diff)

branches/0.8-stable/test/averager.cc

@@ -55 +55 @@
            unsigned int, Suite& suite);
 
+void test_plus_assign(test::Suite& suite);
 
 int main(int argc, char* argv[])
@@ -268 +269 @@
   delete apw2;
 
+  test_plus_assign(suite);
+
   return suite.return_value();
 }
@@ -400 +403 @@
   return ok;
 }
+
+
+void test_plus_assign(test::Suite& suite)
+{
+  suite.out() << "Testing plus assign\n";
+  Averager a1;
+  a1.add(1);
+  a1.add(3);
+  Averager a2;
+  a2.add(-1);
+  a2.add(-3);
+  if (!suite.add(suite.equal(a2.mean(), (-1-3)/2)))
+    suite.err() << "mean failed\n";
+  if (!suite.add(suite.equal(a2.variance(), 1)))
+    suite.err() << "variance failed\n";
+  a2+=a1;
+  if (!suite.add(suite.equal(a2.mean(), (1+3-1-3)/4)))
+    suite.err() << "mean failed\n";
+  if (!suite.add(suite.equal(a2.variance(), (1+9+1+9)/4)))
+    suite.err() << "variance failed\n";
+
+  suite.out() << "Testing plus assign weighted\n";
+  AveragerWeighted aw1;
+  aw1.add(1);
+  aw1.add(3);
+  AveragerWeighted aw2;
+  aw2.add(-1);
+  aw2.add(-3,0.5);
+  aw2.add(-3,0.5);
+  aw2.add(42,0.0);
+  aw1 += aw2;
+  if (!suite.add(suite.equal(aw1.mean(), (1+3-1-3)/4)))
+    suite.err() << "mean failed\n";
+  if (!suite.add(suite.equal(aw1.variance(), (1+9+1+9)/4)))
+    suite.err() << "variance failed\n";
+
+  suite.out() << "Testing plus assign AveragerPair\n";
+  AveragerPair ap1;
+  ap1.add(3,3);
+  ap1.add(5,5);
+  if (!suite.add(suite.equal(ap1.sum_xy_centered(), 2)))
+    suite.err() << "sum_xy_centered failed\n";
+  AveragerPair ap2;
+  ap2.add(-3,-5);
+  ap2.add(-5,-3);
+  ap1 += ap2;
+  if (!suite.add(suite.equal(ap1.sum_xy_centered(), 9+25+15+15)))
+    suite.err() << "sum_xy_centered failed\n";
+
+  suite.out() << "Testing plus assign AveragerPairWeighted\n";
+  AveragerPairWeighted apw1;
+  apw1.add(3, 3, 1, 1);
+  apw1.add(5, 5, 1, 1);
+  if (!suite.add(suite.equal(apw1.sum_xy_centered(), 2)))
+    suite.err() << "sum_xy_centered failed\n";
+  AveragerPairWeighted apw2;
+  apw2.add(1, 3, 1, 1);
+  apw2.add(3, 1, 0.5, 1);
+  apw2.add(3, 1, 1, 0.5);
+  apw2.add(42, 99, 0, 0.5);
+  apw1 += apw2;
+  if (!suite.add(suite.equal(apw1.x_averager().mean(), 3)))
+    suite.err() << "x_averager().mean() failed\n";
+  if (!suite.add(suite.equal(apw1.y_averager().mean(), 3)))
+    suite.err() << "y_averager().mean() failed\n";
+  if (!suite.add(suite.equal(apw1.sum_xy(), 9+25+3+3)))
+    suite.err() << "sum_xy failed\n";
+  if (!suite.add(suite.equal(apw1.sum_xy_centered(), 0+4+0+0)))
+    suite.err() << "sum_xy_centered failed\n";
+}

branches/0.8-stable/yat/statistics/Averager.cc

@@ -153 +153 @@
     if (!a.n())
       return *this;
-    mean_ += (sum_x() + a.sum_x()) / (n() + a.n());
-    double delta = mean_ - a.mean();
+    const double delta = mean_ - a.mean();
+    mean_ = (sum_x() + a.sum_x()) / (n() + a.n());
     m2_ += a.m2_ + n()*a.n()*delta*delta/(n()+a.n());
     n_+=a.n_;

branches/0.8-stable/yat/statistics/AveragerWeighted.cc

@@ -163 +163 @@
     if (!a.w_)
       return *this;
-    mean_ += (sum_wx() + a.sum_wx()) / (sum_w() + a.sum_w());
     double delta = mean() - a.mean();
+    mean_ = (sum_wx() + a.sum_wx()) / (sum_w() + a.sum_w());
     m2_ += a.m2_ + sum_w()*a.sum_w()*delta*delta/(sum_w()+a.sum_w());
     w_ += a.w_;