[Avida-SVN] r2434 - development/source/main

[dknoester at myxo.css.msu.edu]

Author: dknoester
Date: 2008-03-07 11:49:22 -0500 (Fri, 07 Mar 2008)
New Revision: 2434

Modified:
   development/source/main/cStats.cc
   development/source/main/cStats.h
Log:
Added deme generation tracking to cStats.

Modified: development/source/main/cStats.cc
===================================================================
--- development/source/main/cStats.cc	2008-03-07 16:40:30 UTC (rev 2433)
+++ development/source/main/cStats.cc	2008-03-07 16:49:22 UTC (rev 2434)
@@ -1221,6 +1221,7 @@
   m_deme_gestation_time.Add(source_deme.GetAge());
   m_deme_births.Add(source_deme.GetBirthCount());
   m_deme_merit.Add(source_deme.GetHeritableDemeMerit().GetDouble());
+  m_deme_generation.Add(source_deme.GetGeneration());
 }
 
 
@@ -1247,6 +1248,7 @@
   df.Write(m_deme_gestation_time.Average(), "Mean deme gestation time [gesttime]");
   df.Write(m_deme_births.Average(), "Mean number of births within replicated demes [numbirths]");
   df.Write(m_deme_merit.Average(), "Mean heritable merit of replicated demes [merit]");
+  df.Write(m_deme_generation.Average(), "Mean generation of replicated demes [generation]");
   
   df.Endl();
   
@@ -1254,6 +1256,7 @@
   m_deme_gestation_time.Clear();
   m_deme_births.Clear();
   m_deme_merit.Clear();
+  m_deme_generation.Clear();
 }
 
 

Modified: development/source/main/cStats.h
===================================================================
--- development/source/main/cStats.h	2008-03-07 16:40:30 UTC (rev 2433)
+++ development/source/main/cStats.h	2008-03-07 16:49:22 UTC (rev 2434)
@@ -710,6 +710,7 @@
   cDoubleSum m_deme_gestation_time; //!< Gestation time for demes - mean age at deme replication.
   cDoubleSum m_deme_births; //!< Mean number of births in replicated demes.
   cDoubleSum m_deme_merit; //!< Mean merit of replicated demes.
+  cDoubleSum m_deme_generation; //!< Mean generation of replicated demes.
   cDoubleSum m_germline_generation; //!< "Generation" accumulator of replicated germlines.
 };