[Avida-SVN] r2998 - branches/interrupt/source/actions

[beckma24 at myxo.css.msu.edu]

Author: beckma24
Date: 2008-12-05 15:06:25 -0500 (Fri, 05 Dec 2008)
New Revision: 2998

Modified:
   branches/interrupt/source/actions/PopulationActions.cc
Log:
protecting against sterile demes

Modified: branches/interrupt/source/actions/PopulationActions.cc
===================================================================
--- branches/interrupt/source/actions/PopulationActions.cc	2008-12-05 06:11:20 UTC (rev 2997)
+++ branches/interrupt/source/actions/PopulationActions.cc	2008-12-05 20:06:25 UTC (rev 2998)
@@ -1288,11 +1288,13 @@
 	
 	static const cString GetDescription() { return "No Arguments"; }
   
-	double Fitness(const cDeme& deme) {    
+	double Fitness(const cDeme& deme) {
+		if(m_world->GetConfig().DEMES_PREVENT_STERILE.Get() && deme.GetBirthCount() == 0)
+			return 1.0;
 		double energyRemaining = deme.CalculateTotalEnergy();
 		double initialEnergy = m_world->GetConfig().ENERGY_GIVEN_ON_INJECT.Get();
 		double fitnessOfDeme = energyRemaining / initialEnergy;
-		return fitnessOfDeme;
+		return fitnessOfDeme + 1.0;
 	}
 };