[Avida-SVN] r2193 - branches/dkdev/source/main

[dknoester at myxo.css.msu.edu]

Author: dknoester
Date: 2007-11-12 09:20:22 -0500 (Mon, 12 Nov 2007)
New Revision: 2193

Modified:
   branches/dkdev/source/main/cStats.cc
Log:
Bugfix: stat tracking on non-zero deme merits.

Modified: branches/dkdev/source/main/cStats.cc
===================================================================
--- branches/dkdev/source/main/cStats.cc	2007-11-11 14:01:36 UTC (rev 2192)
+++ branches/dkdev/source/main/cStats.cc	2007-11-12 14:20:22 UTC (rev 2193)
@@ -1008,8 +1008,8 @@
     _deme_merit.Add(deme.GetGermline().GetMerit().GetDouble());
     // Calculate the non-zero deme merit:
     unsigned int nz = std::count_if(deme.GetTrials().begin(), deme.GetTrials().end(), std::bind2nd(std::not_equal_to<double>(), 0.0));
-    if(nz != 0) {
-      _deme_merit_nonzero.Add(deme.GetGermline().GetMerit().GetDouble()/(double)nz);
+    if(nz > 0) {
+      _deme_merit_nonzero.Add(std::accumulate(deme.GetTrials().begin(), deme.GetTrials().end(), 0.0) / nz);
     }
     if(deme.GetGermline().GetMerit().GetDouble() > _deme_max_germline_merit) {
       _deme_max_germline_merit = deme.GetGermline().GetMerit().GetDouble();