[Avida-SVN] r1051 - development/source/main
jclune at myxo.css.msu.edu
jclune at myxo.css.msu.edu
Mon Oct 16 19:11:14 PDT 2006
Author: jclune
Date: 2006-10-16 22:11:14 -0400 (Mon, 16 Oct 2006)
New Revision: 1051
Modified:
development/source/main/cPopulation.cc
Log:
fixed comments in compete demes
Modified: development/source/main/cPopulation.cc
===================================================================
--- development/source/main/cPopulation.cc 2006-10-17 02:10:46 UTC (rev 1050)
+++ development/source/main/cPopulation.cc 2006-10-17 02:11:14 UTC (rev 1051)
@@ -625,8 +625,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)
More information about the Avida-cvs
mailing list