[Avida-SVN] r2952 - branches/movement/source/actions

[grabow38 at myxo.css.msu.edu]

Author: grabow38
Date: 2008-11-19 12:21:07 -0500 (Wed, 19 Nov 2008)
New Revision: 2952

Modified:
   branches/movement/source/actions/PopulationActions.cc
Log:
Revising fitness function in cAbstractCompeteDemes_FollowPath.  Again.

Modified: branches/movement/source/actions/PopulationActions.cc
===================================================================
--- branches/movement/source/actions/PopulationActions.cc	2008-11-18 01:24:44 UTC (rev 2951)
+++ branches/movement/source/actions/PopulationActions.cc	2008-11-19 17:21:07 UTC (rev 2952)
@@ -1791,7 +1791,7 @@
 	  if ( consumed_good > consumed_poison )
 	    fitnessOfDeme = pow( (consumed_good - consumed_poison), 2.0 );
     else if ( consumed_good > 0 )
-      fitnessOfDeme = consumed_good;
+      fitnessOfDeme = 1.0;
 	  
     return fitnessOfDeme;
   }