Changeset 1291

Timestamp:

May 9, 2008, 9:42:31 PM (15 years ago)

Author:

Jari Häkkinen

Message:

Fixes #361

Location:

branches/0.4-stable

Files:

• test/averager_test.cc (modified) (1 diff)
• yat/statistics/AveragerPair.cc (modified) (3 diffs)
• yat/statistics/AveragerPair.h (modified) (3 diffs)

branches/0.4-stable/test/averager_test.cc

@@ -209 +209 @@
   delete ap2;
 
+  for (int i=0; i<8; i++)
+    ap.add(static_cast<double>(i),i,-1);
+  if (std::abs(ap.correlation()-1)>tol) {
+    suite.add(false);
+    suite.err() << "correlation after removal of data: " << ap.correlation()
+                << std::endl;
+    suite.err() << "error: correlation between identical vectors is unity" 
+                << std::endl;
+  }
+  ap.add(static_cast<double>(1),1,-4);
+  if (std::abs(ap.correlation()+1)>tol || ap.n()!=-2) {
+    suite.add(false);
+    suite.err() << "AveragerPair error: add with negatibe n\n";
+  }
+
+
   suite.out() << "testing AveragerPairWeighted" << std::endl;
   AveragerPairWeighted apw;

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 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
@@ -45 +44 @@
   }
 
-  void AveragerPair::add(const double x, const double y, const unsigned long n)
+  void AveragerPair::add(const double x, const double y, const long n)
   {
     x_.add(x,n); y_.add(y,n); xy_ += n*x*y;
@@ -76 +75 @@
   }
 
-  unsigned long AveragerPair::n(void) const
+  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 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
@@ -69 +68 @@
     /// Adding \a n pairs of data points with value \a x and \a y.
     ///
-    void add(const double x, const double y, const unsigned long n=1);
+    void add(const double x, const double y, const long n=1);
 
     /**
@@ -111 +110 @@
     /// @return The number of pair of data points.
     ///
-    unsigned long n(void) const;
+    long n(void) const;
 
     ///