[Avida-SVN] r1847 - in trunk: . source/tools tests/default_classic_100u tests/default_transsmt_100u tests/midrun_classsic_30u

[matt at myxo.css.msu.edu]

Author: matt
Date: 2007-07-24 21:43:32 -0400 (Tue, 24 Jul 2007)
New Revision: 1847

Removed:
   trunk/tests/default_classic_100u/expected/
   trunk/tests/default_transsmt_100u/expected/
   trunk/tests/midrun_classsic_30u/expected/
Modified:
   trunk/build_avida
   trunk/source/tools/cDoubleSum.h
   trunk/source/tools/cIntSum.h
Log:
Fix cDoubleSum, cIntSum; remove expected results

Modified: trunk/build_avida
===================================================================
--- trunk/build_avida	2007-07-24 20:29:18 UTC (rev 1846)
+++ trunk/build_avida	2007-07-25 01:43:32 UTC (rev 1847)
@@ -3,6 +3,6 @@
 mkdir -p cbuild
 cd cbuild
 cmake "$@" ../
-make
+make -j2
 make install
 

Modified: trunk/source/tools/cDoubleSum.h
===================================================================
--- trunk/source/tools/cDoubleSum.h	2007-07-24 20:29:18 UTC (rev 1846)
+++ trunk/source/tools/cDoubleSum.h	2007-07-25 01:43:32 UTC (rev 1847)
@@ -39,7 +39,7 @@
   double S3()           const { return s3; }
   double S4()           const { return s4; }
 
-  double Average() const { return ( n >1 ) ? (s1/n) : 0; }
+  double Average() const { return ( n > 0 ) ? (s1/n) : 0; }
 
   double Variance() const { return ( n > 1 ) ?
       (s2 - s1*s1/n) / (n-1) : INF_ERR; }

Modified: trunk/source/tools/cIntSum.h
===================================================================
--- trunk/source/tools/cIntSum.h	2007-07-24 20:29:18 UTC (rev 1846)
+++ trunk/source/tools/cIntSum.h	2007-07-25 01:43:32 UTC (rev 1847)
@@ -40,7 +40,7 @@
   long S3()           const { return s3; }
   long S4()           const { return s4; }
 
-  double Average() const { return (n > 1) ? ((double)s1/n) : 0; }
+  double Average() const { return (n > 0) ? ((double)s1/n) : 0; }
 
   double Variance() const { return (n > 1) ? (s2 - s1*s1/(double)n) / (double)(n-1) : INF_ERR; }
   double StdDeviation() const { return sqrt(Variance()); }