[Avida-SVN] r1046 - trunk/source/actions

[jclune at myxo.css.msu.edu]

Author: jclune
Date: 2006-10-15 20:22:11 -0400 (Sun, 15 Oct 2006)
New Revision: 1046

Modified:
   trunk/source/actions/PopulationActions.cc
Log:
updated comments for compete demes

Modified: trunk/source/actions/PopulationActions.cc
===================================================================
--- trunk/source/actions/PopulationActions.cc	2006-10-13 13:16:45 UTC (rev 1045)
+++ trunk/source/actions/PopulationActions.cc	2006-10-16 00:22:11 UTC (rev 1046)
@@ -793,8 +793,12 @@
  of each deme is determined differently depending on the competition_type: 
  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
+ 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
 */
 class cActionCompeteDemes : public cAction
 {