Changeset 1290 for branches/0.4-stable/yat/statistics/Averager.cc

Timestamp:

May 9, 2008, 1:44:25 PM (15 years ago)

Author:

Jari Häkkinen

Message:

Addresses #361. Averager accepts negative n for removal of data from the Averager.

File:

• branches/0.4-stable/yat/statistics/Averager.cc (modified) (4 diffs)

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

@@ -4 +4 @@
   Copyright (C) 2004, 2005 Jari Häkkinen, Peter Johansson
   Copyright (C) 2006 Jari Häkkinen, Markus Ringnér
-  Copyright (C) 2007 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2008 Peter Johansson
+  Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
 
   This file is part of the yat library, http://trac.thep.lu.se/yat
@@ -39 +38 @@
   }
 
-  Averager::Averager(double x, double xx, unsigned long n)
+  Averager::Averager(double x, double xx, long n)
     : n_(n), x_(x), xx_(xx) 
   {
@@ -49 +48 @@
   }
 
-  void Averager::add(double d, unsigned long n)
+  void Averager::add(double d, long n)
   {
     assert(!std::isnan(d));
     n_  += n;
+    assert(n>-1);
     x_  += n*d;
     xx_ += n*d*d;
@@ -67 +67 @@
   }
 
-  unsigned long Averager::n(void) const
+  long Averager::n(void) const
   {
     return n_;