[Avida-SVN] r1050 - development/source/actions

[jclune at myxo.css.msu.edu]

Author: jclune
Date: 2006-10-16 22:10:46 -0400 (Mon, 16 Oct 2006)
New Revision: 1050

Modified:
   development/source/actions/PopulationActions.cc
Log:
fixed comments in compete demes

Modified: development/source/actions/PopulationActions.cc
===================================================================
--- development/source/actions/PopulationActions.cc	2006-10-17 01:22:07 UTC (rev 1049)
+++ development/source/actions/PopulationActions.cc	2006-10-17 02:10:46 UTC (rev 1050)
@@ -793,8 +793,13 @@
  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
 {