Changeset 2803 for trunk/test/averager4.cc

Timestamp:

Jul 30, 2012, 7:18:25 AM (11 years ago)

Author:

Peter

Message:

fixed spurious test failures as well as a bug in operator+=. refs #705

File:

• trunk/test/averager4.cc (modified) (5 diffs)

trunk/test/averager4.cc

@@ -56 +56 @@
   utility::Vector vec(10);
   for (size_t i=0; i<vec.size(); ++i) {
-    vec(i) = i;
+    vec(i) = i*i;
     a.add(vec(i), 1);
   }
@@ -65 +65 @@
     sum += std::pow(vec(i)-m, 3);
   sum = sum/vec.size();
-  if (!suite.equal(a.central_moment3(), sum)) {
+  if (!suite.equal(a.central_moment3(), sum, 2)) {
     suite.add(false);
     suite.err() << "central moment3 failed: expected " << sum << "\n";
   }
-  return suite.return_value();
+  //  return suite.return_value();
 
   sum = 0;
@@ -80 +80 @@
 
   suite.out() << "comparing against GSL implementations\n";
-  double correct_factor = std::sqrt(static_cast<double>(vec.size())/
-                                    (vec.size()-1.0));
+  double correct_factor = std::sqrt((vec.size()-1.0)/vec.size());
   if (!suite.add(suite.equal(a.skewness(),
-                             std::pow(correct_factor,3)*skewness(vec),
+                             skewness(vec)/std::pow(correct_factor,3),
                              10))) {
     suite.err() << "skewness failed\n";
+    suite.err() << "Averager4: " << a.skewness() << "\n";
+    suite.err() << "GSL:       " << skewness(vec) << "\n";
+    suite.err() << "factor: " << std::pow(correct_factor,3) << "\n";
   }
 
   if (!suite.add(suite.equal(a.kurtosis(),
-                             std::pow(correct_factor,4)*kurtosis(vec),
+                             (kurtosis(vec)+3)/std::pow(correct_factor,4)-3,
                              10))) {
     suite.err() << "kurtosis failed\n";
+    suite.err() << "Averager4: " << a.kurtosis() << "\n";
+    suite.err() << "GSL:       " << kurtosis(vec) << "\n";
+    suite.err() << "factor: " << std::pow(correct_factor,4) << "\n";
+
+    double var = a.averager().variance_unbiased();
+    suite.err() << a.central_moment4()/(var*var) - 3 << "\n";
   }
 
@@ -103 +111 @@
   a2.add(6,1);
 
-  // cm3 = (4*1 + 4^3)/5 = 68/5 = 13.6
-  if (!suite.add(suite.equal(a2.central_moment3(), 13.6)))
+  // cm3 = (-4*1 + 4^3)/5 = 60/5 = 12
+  if (!suite.add(suite.equal(a2.central_moment3(), 12)))
     suite.err() << "central moment3 failed\n";
 
@@ -114 +122 @@
     suite.err() << "variance failed\n";
   if (!suite.add(suite.equal(a1.central_moment3(),
-                             (4*std::pow(2.5,3)+4+std::pow(6.0,3))/10)))
+                             (4*std::pow(-2.5,3)+4+std::pow(6.0,3))/10)))
     suite.err() << "central_moment3 failed\n";
   if (!suite.add(suite.equal(a1.central_moment4(),