[Avida-SVN] r1075 - in development: consistencytests/Tests/Default consistencytests/Tests/SMT support/config
brysonda at myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Wed Nov 8 06:33:00 PST 2006
Author: brysonda
Date: 2006-11-08 09:33:00 -0500 (Wed, 08 Nov 2006)
New Revision: 1075
Modified:
development/consistencytests/Tests/Default/CMakeLists.txt
development/consistencytests/Tests/Default/SConscript
development/consistencytests/Tests/SMT/CMakeLists.txt
development/consistencytests/Tests/SMT/SConscript
development/support/config/avida.cfg
Log:
Fix broken SMT Consistency test. Update default config file and change both tests to set the required settings. Ideally these test config should be isolated into their own files in the future, so that defaults can be changed. This, however, would not fix the problem that manifested here, where config options change name and the tests are not updated.
Modified: development/consistencytests/Tests/Default/CMakeLists.txt
===================================================================
--- development/consistencytests/Tests/Default/CMakeLists.txt 2006-11-07 19:30:06 UTC (rev 1074)
+++ development/consistencytests/Tests/Default/CMakeLists.txt 2006-11-08 14:33:00 UTC (rev 1075)
@@ -28,7 +28,7 @@
SET(EnvironmentFile "${ConfigDir}/environment.cfg")
SET(StartCreatureFile "${ConfigDir}/default-classic.org")
# Command-line arguments passed to Avida.
-SET(AvidaArgs "-c ${GenesisFile} -seed %d -set WORLD_X 40 -set WORLD_Y 40 -set INST_SET ${InstSetFile} -set EVENT_FILE ${EventFile} -set ENVIRONMENT_FILE ${EnvironmentFile} -set START_CREATURE ${StartCreatureFile} -set DATA_DIR .")
+SET(AvidaArgs "-c ${GenesisFile} -seed %d -set WORLD_X 40 -set WORLD_Y 40 -set INST_SET ${InstSetFile} -set EVENT_FILE ${EventFile} -set ENVIRONMENT_FILE ${EnvironmentFile} -set START_CREATURE ${StartCreatureFile} -set DATA_DIR . -set BIRTH_METHOD 4 -set SLICING_METHOD 2")
#
# Consistency checks configuration
Modified: development/consistencytests/Tests/Default/SConscript
===================================================================
--- development/consistencytests/Tests/Default/SConscript 2006-11-07 19:30:06 UTC (rev 1074)
+++ development/consistencytests/Tests/Default/SConscript 2006-11-08 14:33:00 UTC (rev 1075)
@@ -14,7 +14,7 @@
EnvironmentFile = e.File('environment.cfg', ConfigDir)
StartCreatureFile = e.File('default-classic.org', ConfigDir)
-AvidaArgs = "-c %(GenesisFile)s -set WORLD_X 40 -set WORLD_Y 40 -set INST_SET %(InstSetFile)s -set ENVIRONMENT_FILE %(EnvironmentFile)s -set START_CREATURE %(StartCreatureFile)s -seed %(Seed)s -set EVENT_FILE %(EventsFile)s -set DATA_DIR %(DataDir)s" % {
+AvidaArgs = "-c %(GenesisFile)s -set WORLD_X 40 -set WORLD_Y 40 -set INST_SET %(InstSetFile)s -set ENVIRONMENT_FILE %(EnvironmentFile)s -set START_CREATURE %(StartCreatureFile)s -seed %(Seed)s -set EVENT_FILE %(EventsFile)s -set DATA_DIR %(DataDir)s -set BIRTH_METHOD 4 -set SLICING_METHOD 2" % {
'GenesisFile':GenesisFile.path,
'InstSetFile':InstSetFile.path,
'EnvironmentFile':EnvironmentFile.path,
Modified: development/consistencytests/Tests/SMT/CMakeLists.txt
===================================================================
--- development/consistencytests/Tests/SMT/CMakeLists.txt 2006-11-07 19:30:06 UTC (rev 1074)
+++ development/consistencytests/Tests/SMT/CMakeLists.txt 2006-11-08 14:33:00 UTC (rev 1075)
@@ -28,7 +28,7 @@
SET(EnvironmentFile "${ConfigDir}/environment.cfg")
SET(StartCreatureFile "${ConfigDir}/default-transsmt.org")
# Command-line arguments passed to Avida.
-SET(AvidaArgs "-c ${GenesisFile} -seed %d -set HARDWARE_TYPE 2 -set SIZE_MERIT_METHOD 0 -set WORLD_X 40 -set WORLD_Y 40 -set INST_SET ${InstSetFile} -set EVENT_FILE ${EventFile} -set ENVIRONMENT_FILE ${EnvironmentFile} -set START_CREATURE ${StartCreatureFile} -set DATA_DIR .")
+SET(AvidaArgs "-c ${GenesisFile} -seed %d -set HARDWARE_TYPE 2 -set BASE_MERIT_METHOD 0 -set WORLD_X 40 -set WORLD_Y 40 -set INST_SET ${InstSetFile} -set EVENT_FILE ${EventFile} -set ENVIRONMENT_FILE ${EnvironmentFile} -set START_CREATURE ${StartCreatureFile} -set DATA_DIR . -set BIRTH_METHOD 4 -set SLICING_METHOD 2")
#
# Consistency checks configuration
Modified: development/consistencytests/Tests/SMT/SConscript
===================================================================
--- development/consistencytests/Tests/SMT/SConscript 2006-11-07 19:30:06 UTC (rev 1074)
+++ development/consistencytests/Tests/SMT/SConscript 2006-11-08 14:33:00 UTC (rev 1075)
@@ -14,7 +14,7 @@
EnvironmentFile = e.File('environment.cfg', ConfigDir)
StartCreatureFile = e.File('default-transsmt.org', ConfigDir)
-AvidaArgs = "-c %(GenesisFile)s -set HARDWARE_TYPE 2 -set SIZE_MERIT_METHOD 0 -set WORLD_X 40 -set WORLD_Y 40 -set INST_SET %(InstSetFile)s -set ENVIRONMENT_FILE %(EnvironmentFile)s -set START_CREATURE %(StartCreatureFile)s -seed %(Seed)s -set EVENT_FILE %(EventsFile)s -set DATA_DIR %(DataDir)s" % {
+AvidaArgs = "-c %(GenesisFile)s -set HARDWARE_TYPE 2 -set BASE_MERIT_METHOD 0 -set WORLD_X 40 -set WORLD_Y 40 -set INST_SET %(InstSetFile)s -set ENVIRONMENT_FILE %(EnvironmentFile)s -set START_CREATURE %(StartCreatureFile)s -seed %(Seed)s -set EVENT_FILE %(EventsFile)s -set DATA_DIR %(DataDir)s -set BIRTH_METHOD 4 -set SLICING_METHOD 2" % {
'GenesisFile':GenesisFile.path,
'InstSetFile':InstSetFile.path,
'EnvironmentFile':EnvironmentFile.path,
Modified: development/support/config/avida.cfg
===================================================================
--- development/support/config/avida.cfg 2006-11-07 19:30:06 UTC (rev 1074)
+++ development/support/config/avida.cfg 2006-11-08 14:33:00 UTC (rev 1075)
@@ -10,14 +10,14 @@
ANALYZE_MODE 0 # 0 = Disabled
# 1 = Enabled
# 2 = Interactive
-VIEW_MODE 0 # Initial viewer screen
+VIEW_MODE 1 # Initial viewer screen
CLONE_FILE - # Clone file to load
VERBOSITY 1 # Control output verbosity
### ARCH_GROUP ###
# Architecture Variables
-WORLD_X 100 # Width of the Avida world
-WORLD_Y 100 # Height of the Avida world
+WORLD_X 60 # Width of the Avida world
+WORLD_Y 60 # Height of the Avida world
WORLD_GEOMETRY 2 # 1 = Bounded Grid
# 2 = Torus
NUM_DEMES 0 # Number of independed groups in the population; 0=off
@@ -37,13 +37,16 @@
### REPRODUCTION_GROUP ###
# Birth and Death
-BIRTH_METHOD 4 # 0 = Replace random organism in neighborhood
- # 1 = Replace oldest organism in neighborhood
- # 2 = Replace largest Age/Merit in neighborhood
- # 3 = Place only in empty cells in neighborhood
- # 4 = Replace random from population (Mass Action)
- # 5 = Replace oldest in entire population (like Tierra)
- # 6 = Replace random within deme
+BIRTH_METHOD 0 # Which organism should be replaced on birth?
+ # 0 = Random organism in neighborhood
+ # 1 = Oldest in neighborhood
+ # 2 = Largest Age/Merit in neighborhood
+ # 3 = None (use only empty cells in neighborhood)
+ # 4 = Random from population (Mass Action)
+ # 5 = Oldest in entire population
+ # 6 = Random within deme
+ # 7 = Organism faced by parent
+ # 8 = Next grid cell (id+1)
PREFER_EMPTY 1 # Give empty cells preference in offsping placement?
DEATH_METHOD 2 # 0 = Never die of old age.
# 1 = Die when inst executed = AGE_LIMIT (+deviation)
@@ -86,7 +89,7 @@
REQUIRED_TASK -1 # Task ID required for successful divide.
IMMUNITY_TASK -1 # Task providing immunity from the required task.
REQUIRED_REACTION -1 # Reaction ID required for successful divide.
-DIE_PROB 0.0 # probability of death when 'die' instruction is executed
+REQUIRED_BONUS 0 # The bonus that an organism must accumulate to divide.
### MUTATION_GROUP ###
# Mutations
@@ -123,25 +126,27 @@
### TIME_GROUP ###
# Time Slicing
AVE_TIME_SLICE 30 # Ave number of insts per org per update
-SLICING_METHOD 2 # 0 = CONSTANT: all organisms get default...
+SLICING_METHOD 1 # 0 = CONSTANT: all organisms get default...
# 1 = PROBABILISTIC: Run _prob_ proportional to merit.
# 2 = INTEGRATED: Perfectly integrated deterministic.
-SIZE_MERIT_METHOD 4 # 0 = off (merit is independent of size)
+BASE_MERIT_METHOD 4 # 0 = Constant (merit independent of size)
# 1 = Merit proportional to copied size
# 2 = Merit prop. to executed size
# 3 = Merit prop. to full size
# 4 = Merit prop. to min of executed or copied size
# 5 = Merit prop. to sqrt of the minimum size
+BASE_CONST_MERIT 100 # Base merit when BASE_MERIT_METHOD set to 0
+DEFAULT_BONUS 1.0 # Initial bonus before any tasks
+MERIT_DEFAULT_BONUS 0 # Scale the merit of an offspring by the default bonus
+ # rather than the accumulated bonus of the parent?
MAX_CPU_THREADS 1 # Number of Threads a CPU can spawn
THREAD_SLICING_METHOD 0 # Formula for and organism's thread slicing
# (num_threads-1) * THREAD_SLICING_METHOD + 1
# 0 = One thread executed per time slice.
# 1 = All threads executed each time slice.
MAX_LABEL_EXE_SIZE 1 # Max nops marked as executed when labels are used
-BASE_SIZE_MERIT 100 # Base merit when size is *not* used
-DEFAULT_BONUS 1.0 # The bonus an organism gets before any tasks
-MERIT_GIVEN 0.0 # Fraction of merit donated with 'donate' command
-MERIT_RECEIVED 0.0 # Multiplier of merit given with 'donate' command
+DONATE_SIZE 5.0 # Amount of merit donated with 'donate' command
+DONATE_MULT 10.0 # Multiple of merit given that the target receives.
MAX_DONATE_KIN_DIST -1 # Limit on distance of relation for donate; -1=no max
MAX_DONATE_EDIT_DIST -1 # Limit on edit distance for donate; -1=no max
MAX_DONATES 1000000 # Limit on number of donates organisms are allowed.
More information about the Avida-cvs
mailing list