Changeset 1294 for branches/0.4-stable/yat/statistics

Timestamp:

May 12, 2008, 10:21:19 AM (15 years ago)

Author:

Jari Häkkinen

Message:

Reverting changes that break the interface of Averager and AveragerPair? classes.

Location:

branches/0.4-stable/yat/statistics

Files:

• Averager.cc (modified) (4 diffs)
• Averager.h (modified) (5 diffs)
• AveragerPair.cc (modified) (3 diffs)
• AveragerPair.h (modified) (3 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, 2008 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2007 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2008 Peter Johansson
 
   This file is part of the yat library, http://trac.thep.lu.se/yat
@@ -38 +39 @@
   }
 
-  Averager::Averager(double x, double xx, long n)
+  Averager::Averager(double x, double xx, unsigned long n)
     : n_(n), x_(x), xx_(xx) 
   {
@@ -48 +49 @@
   }
 
-  void Averager::add(double d, long n)
+  void Averager::add(double d, unsigned long n)
   {
     assert(!std::isnan(d));
     n_  += n;
-    assert(n>-1);
     x_  += n*d;
     xx_ += n*d*d;
@@ -67 +67 @@
   }
 
-  long Averager::n(void) const
+  unsigned long Averager::n(void) const
   {
     return n_;

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

@@ -7 +7 @@
   Copyright (C) 2004 Jari Häkkinen, Peter Johansson
   Copyright (C) 2005, 2006 Jari Häkkinen, Peter Johansson, Markus Ringnér
-  Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2007 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2008 Peter Johansson
 
   This file is part of the yat library, http://trac.thep.lu.se/yat
@@ -55 +56 @@
     /// number of samples \a n.
     ///
-    Averager(double x, double xx, long n);
+    Averager(double x, double xx, unsigned long n);
 
     ///
@@ -65 +66 @@
     /// Adding \a n (default=1) number of data point(s) with value \a d.
     ///
-    void add(double d, long n=1);
+    void add(double d, unsigned long n=1);
 
     /**
@@ -85 +86 @@
     /// @return Number of data points
     ///
-    long n(void) const;
+    unsigned long n(void) const;
 
     ///
@@ -178 +179 @@
 
   private:
-    long  n_;
+    unsigned long n_;
     double  x_, xx_;
   };

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

@@ -4 +4 @@
   Copyright (C) 2004, 2005 Jari Häkkinen, Peter Johansson
   Copyright (C) 2006 Jari Häkkinen, Peter Johansson, Markus Ringnér
-  Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2007 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2008 Peter Johansson
 
   This file is part of the yat library, http://trac.thep.lu.se/yat
@@ -44 +45 @@
   }
 
-  void AveragerPair::add(const double x, const double y, const long n)
+  void AveragerPair::add(const double x, const double y, const unsigned long n)
   {
     x_.add(x,n); y_.add(y,n); xy_ += n*x*y;
@@ -75 +76 @@
   }
 
-  long AveragerPair::n(void) const
+  unsigned long AveragerPair::n(void) const
   {
     return x_.n();

branches/0.4-stable/yat/statistics/AveragerPair.h

@@ -7 +7 @@
   Copyright (C) 2004, 2005 Jari Häkkinen, Peter Johansson
   Copyright (C) 2006 Jari Häkkinen, Peter Johansson, Markus Ringnér
-  Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2007 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2008 Peter Johansson
 
   This file is part of the yat library, http://trac.thep.lu.se/yat
@@ -68 +69 @@
     /// Adding \a n pairs of data points with value \a x and \a y.
     ///
-    void add(const double x, const double y, const long n=1);
+    void add(const double x, const double y, const unsigned long n=1);
 
     /**
@@ -110 +111 @@
     /// @return The number of pair of data points.
     ///
-    long n(void) const;
+    unsigned long n(void) const;
 
     ///