[Avida-SVN] r2086 - branches/energy/source/main

beckma24 at myxo.css.msu.edu beckma24 at myxo.css.msu.edu
Thu Sep 13 05:58:09 PDT 2007


Author: beckma24
Date: 2007-09-13 08:58:09 -0400 (Thu, 13 Sep 2007)
New Revision: 2086

Modified:
   branches/energy/source/main/cPopulation.cc
Log:
Fixing logic error

Modified: branches/energy/source/main/cPopulation.cc
===================================================================
--- branches/energy/source/main/cPopulation.cc	2007-09-12 18:12:51 UTC (rev 2085)
+++ branches/energy/source/main/cPopulation.cc	2007-09-13 12:58:09 UTC (rev 2086)
@@ -1094,8 +1094,8 @@
         break;
       }
       case 3: {
-        // Replicate old demes.
-        if(source_deme.GetAge() < m_world->GetConfig().MAX_DEME_AGE.Get() && source_deme.GetBirthCount() > 0) continue;
+        // Replicate old demes if injected organism is not sterile
+        if(source_deme.GetAge() < m_world->GetConfig().MAX_DEME_AGE.Get() || source_deme.GetBirthCount() < 1) continue;
         break;
       }
       case 4: {




More information about the Avida-cvs mailing list