Changeset 1295 for trunk/yat/statistics
- Timestamp:
- May 12, 2008, 10:35:10 AM (15 years ago)
- Location:
- trunk/yat/statistics
- Files:
-
- 4 edited
-
Averager.cc (modified) (4 diffs)
-
Averager.h (modified) (5 diffs)
-
AveragerPair.cc (modified) (3 diffs)
-
AveragerPair.h (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/yat/statistics/Averager.cc
r1275 r1295 4 4 Copyright (C) 2004, 2005 Jari Häkkinen, Peter Johansson 5 5 Copyright (C) 2006 Jari Häkkinen, Markus Ringnér 6 Copyright (C) 2007 Jari Häkkinen, Peter Johansson 7 Copyright (C) 2008 Peter Johansson 6 Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson 8 7 9 8 This file is part of the yat library, http://trac.thep.lu.se/yat … … 39 38 } 40 39 41 Averager::Averager(double x, double xx, unsignedlong n)40 Averager::Averager(double x, double xx, long n) 42 41 : n_(n), x_(x), xx_(xx) 43 42 { … … 49 48 } 50 49 51 void Averager::add(double d, unsignedlong n)50 void Averager::add(double d, long n) 52 51 { 53 52 assert(!std::isnan(d)); 54 53 n_ += n; 54 assert(n>-1); 55 55 x_ += n*d; 56 56 xx_ += n*d*d; … … 67 67 } 68 68 69 unsignedlong Averager::n(void) const69 long Averager::n(void) const 70 70 { 71 71 return n_; -
trunk/yat/statistics/Averager.h
r1275 r1295 7 7 Copyright (C) 2004 Jari Häkkinen, Peter Johansson 8 8 Copyright (C) 2005, 2006 Jari Häkkinen, Peter Johansson, Markus Ringnér 9 Copyright (C) 2007 Jari Häkkinen, Peter Johansson 10 Copyright (C) 2008 Peter Johansson 9 Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson 11 10 12 11 This file is part of the yat library, http://trac.thep.lu.se/yat … … 56 55 /// number of samples \a n. 57 56 /// 58 Averager(double x, double xx, unsignedlong n);57 Averager(double x, double xx, long n); 59 58 60 59 /// … … 66 65 /// Adding \a n (default=1) number of data point(s) with value \a d. 67 66 /// 68 void add(double d, unsignedlong n=1);67 void add(double d, long n=1); 69 68 70 69 /** … … 86 85 /// @return Number of data points 87 86 /// 88 unsignedlong n(void) const;87 long n(void) const; 89 88 90 89 /// … … 179 178 180 179 private: 181 unsignedlong n_;180 long n_; 182 181 double x_, xx_; 183 182 }; -
trunk/yat/statistics/AveragerPair.cc
r1275 r1295 4 4 Copyright (C) 2004, 2005 Jari Häkkinen, Peter Johansson 5 5 Copyright (C) 2006 Jari Häkkinen, Peter Johansson, Markus Ringnér 6 Copyright (C) 2007 Jari Häkkinen, Peter Johansson 7 Copyright (C) 2008 Peter Johansson 6 Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson 8 7 9 8 This file is part of the yat library, http://trac.thep.lu.se/yat … … 45 44 } 46 45 47 void AveragerPair::add(const double x, const double y, const unsignedlong n)46 void AveragerPair::add(const double x, const double y, const long n) 48 47 { 49 48 x_.add(x,n); y_.add(y,n); xy_ += n*x*y; … … 76 75 } 77 76 78 unsignedlong AveragerPair::n(void) const77 long AveragerPair::n(void) const 79 78 { 80 79 return x_.n(); -
trunk/yat/statistics/AveragerPair.h
r1275 r1295 7 7 Copyright (C) 2004, 2005 Jari Häkkinen, Peter Johansson 8 8 Copyright (C) 2006 Jari Häkkinen, Peter Johansson, Markus Ringnér 9 Copyright (C) 2007 Jari Häkkinen, Peter Johansson 10 Copyright (C) 2008 Peter Johansson 9 Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson 11 10 12 11 This file is part of the yat library, http://trac.thep.lu.se/yat … … 69 68 /// Adding \a n pairs of data points with value \a x and \a y. 70 69 /// 71 void add(const double x, const double y, const unsignedlong n=1);70 void add(const double x, const double y, const long n=1); 72 71 73 72 /** … … 111 110 /// @return The number of pair of data points. 112 111 /// 113 unsignedlong n(void) const;112 long n(void) const; 114 113 115 114 ///
Note: See TracChangeset
for help on using the changeset viewer.
