[Avida-cvs] [Avida2-svn] r309 - trunk/source/main

[ofria@myxo.css.msu.edu]

Author: ofria
Date: 2005-09-08 16:53:21 -0400 (Thu, 08 Sep 2005)
New Revision: 309

Modified:
   trunk/source/main/config.cc
Log:
Changed a few default values in genesis (now death is on by default, age
limit of 20 * length, and track main lineage is turned on).


Modified: trunk/source/main/config.cc
===================================================================
--- trunk/source/main/config.cc	2005-09-01 02:37:03 UTC (rev 308)
+++ trunk/source/main/config.cc	2005-09-08 20:53:21 UTC (rev 309)
@@ -167,9 +167,9 @@
                    "0 = Replace random organism in neighborhood\n1 = Replace oldest organism in neighborhood\n2 = Replace largest Age/Merit in neighborhood\n3 = Place only in empty cells in neighborhood\n4 = Replace random from population (Mass Action)\n5 = Replace oldest in entire population (like Tierra)\n6 = Replace random within deme");
   repro_group->Add(prefer_empty, "1", "PREFER_EMPTY",
                    "Are empty cells given preference in offsping placement?");
-  repro_group->Add(death_method, "0", "DEATH_METHOD",
+  repro_group->Add(death_method, "1", "DEATH_METHOD",
                    "0 = Never die of old age.\n1 = Die when inst executed = AGE_LIMIT (+deviation)\n2 = Die when inst executed = length*AGE_LIMIT (+dev)");
-  repro_group->Add(age_limit, "5000", "AGE_LIMIT",
+  repro_group->Add(age_limit, "20", "AGE_LIMIT",
                    "Modifies DEATH_METHOD");
   repro_group->Add(age_deviation, "0", "AGE_DEVIATION",
                    "Creates a distribution around AGE_LIMIT");
@@ -308,7 +308,7 @@
   cConfigGroup * gen_group = new cConfigGroup("Geneology");
   group_list.PushRear(gen_group);
   
-  gen_group->Add(track_main_lineage, "0", "TRACK_MAIN_LINEAGE",
+  gen_group->Add(track_main_lineage, "1", "TRACK_MAIN_LINEAGE",
                  "Keep all ancestors of the active population?\n0=no, 1=yes, 2=yes,w/sexual population");
   gen_group->Add(threshold, "3", "THRESHOLD",
                  "Number of organisms in a genotype needed for it\n  to be considered viable.");