[Avida-SVN] r1048 - trunk/source/main

[jclune at myxo.css.msu.edu]

Author: jclune
Date: 2006-10-16 21:11:24 -0400 (Mon, 16 Oct 2006)
New Revision: 1048

Modified:
   trunk/source/main/cPopulation.cc
Log:
corrected comments for compete demes

Modified: trunk/source/main/cPopulation.cc
===================================================================
--- trunk/source/main/cPopulation.cc	2006-10-16 02:55:45 UTC (rev 1047)
+++ trunk/source/main/cPopulation.cc	2006-10-17 01:11:24 UTC (rev 1048)
@@ -611,8 +611,18 @@
 
 // CompeteDemes  probabilistically copies demes into the next generation
 // based on their fitness. How deme fitness is estimated is specified by 
-// competition_type input argument as by the birth count (1), average
-// fitness (2), or equal for all demes (3). For ease of use, each organism 
+// competition_type input argument as:
+/*
+ 0: deme fitness = 1 (control, random deme selection)
+ 1: deme fitness = number of births since last competition (default) 
+ 2: deme fitness = average organism fitness at the current update (uses parent's fitness, so
+                     does not work with donations)
+ 3: deme fitness = average mutation rate at the current update
+ 4: deme fitness = strong rank selection on (parents) fitness (2^-deme fitness rank)
+ 5: deme fitness = average organism life (current, not parents) fitness (works with donations)
+ 6: deme fitness = strong rank selection on life (current, not parents) fitness
+*/
+//  For ease of use, each organism 
 // is setup as if it we just injected into the population.
 
 void cPopulation::CompeteDemes(int competition_type)