[Avida-SVN] r3422 - development/source/tools

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2009-09-23 14:33:59 -0400 (Wed, 23 Sep 2009)
New Revision: 3422

Modified:
   development/source/tools/cDoubleSum.cc
   development/source/tools/cDoubleSum.h
Log:
Some reorganization of cDoubleSum, for clarity.

Modified: development/source/tools/cDoubleSum.cc
===================================================================
--- development/source/tools/cDoubleSum.cc	2009-09-23 16:17:05 UTC (rev 3421)
+++ development/source/tools/cDoubleSum.cc	2009-09-23 18:33:59 UTC (rev 3422)
@@ -27,3 +27,21 @@
 
 
 const double cDoubleSum::INF_ERR = 0;
+
+double cDoubleSum::Skewness() const
+{
+  return (n > 2.0) ? (n * s3 - (3.0 * s2) * s1 + ((2.0 * s1) * s1) * s1 / n) / ((n - 1.0) * (n - 2.0)) : INF_ERR;
+}
+//n*n*(s3/n - 3*s2/n*s1/n + 2*s1/n*s1/n*s1/n)/((n-1)*(n-2)) : INF_ERR; }
+
+
+double cDoubleSum::Kurtosis() const {
+  return (n > 3.0) ? 
+  (n + 1.0) * (n * s4 - (4.0 * s3) * s1 + (((6.0 * s2) * s1) * s1) / n - (((((3.0 * s1) * s1) * s1) / n) * s1) / n) /
+//(n + 1.0) * (n * s4 - (4.0 * s3) * s1 + (((6.0 * s2) * s1) * s1) / n - ((((3.0 * s1) * s1) * s1) / (n * s1)) / n) /
+  ((n - 1.0) * (n - 2.0) * (n - 3.0))
+//((n - 1.0) * (n - 2.0) * (n - 3.0))
+  : INF_ERR;
+}
+//n*n*(n+1)*(s4/n - 4*s3/n*s1/n + 6*s2/n*s1/n*s1/n -
+//3*s1/n*s1/n*s1/n*s1/n)/((n-1)*(n-2)*(n-3)) :

Modified: development/source/tools/cDoubleSum.h
===================================================================
--- development/source/tools/cDoubleSum.h	2009-09-23 16:17:05 UTC (rev 3421)
+++ development/source/tools/cDoubleSum.h	2009-09-23 18:33:59 UTC (rev 3422)
@@ -67,17 +67,9 @@
 //      the real Standard Error
 //       sqrt(s2 / (n * (n-1))) : INF_ERR; }
 
-  double Skewness() const { return ( n > 2 ) ?
-       (n*s3 - 3*s2*s1 + 2*s1*s1*s1/n) / ((n-1)*(n-2)) : INF_ERR; }
-     //n*n*(s3/n - 3*s2/n*s1/n + 2*s1/n*s1/n*s1/n)/((n-1)*(n-2)) : INF_ERR; }
-
-  double Kurtosis() const { return ( n > 3 ) ?
-     //n*n*(n+1)*(s4/n - 4*s3/n*s1/n + 6*s2/n*s1/n*s1/n -
-     //3*s1/n*s1/n*s1/n*s1/n)/((n-1)*(n-2)*(n-3)) :
-       (n+1)*(n*s4 - 4*s3*s1 + 6*s2*s1*s1/n - 3*s1*s1*s1/n*s1/n) /
-       ((n-1)*(n-2)*(n-3)) :
-       INF_ERR; }
-
+  double Skewness() const;
+  double Kurtosis() const;
+  
   // Notation Shortcuts
   double Ave() const { return Average(); }
   double Var() const { return Variance(); }