[Avida-cvs] [avida-svn] r519 - in trunk/consistencytests: CMakeModules/Templates Tests/Default Tests/Researchers Tests/Researchers/dule/LocalSex Tests/Researchers/goingssh/Kazi Tests/Researchers/goingssh/Kazi/Seed_100 Tests/Researchers/goingssh/Kazi/Seed_101 Tests/Researchers/goingssh/Kazi/Seed_102 Tests/Researchers/goingssh/Kazi/Seed_103 Tests/Researchers/goingssh/Kazi/Seed_104 Tests/Researchers/goingssh/Kazi/testconfig
kaben@myxo.css.msu.edu
kaben at myxo.css.msu.edu
Mon Mar 13 23:13:02 PST 2006
Author: kaben
Date: 2006-03-14 02:13:01 -0500 (Tue, 14 Mar 2006)
New Revision: 519
Added:
trunk/consistencytests/CMakeModules/Templates/events.cfg.in
trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_100/
trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_100/detail_pop.500.expected_last_line
trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_101/
trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_101/detail_pop.500.expected_last_line
trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_102/
trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_102/detail_pop.500.expected_last_line
trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_103/
trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_103/detail_pop.500.expected_last_line
trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_104/
trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_104/detail_pop.500.expected_last_line
trunk/consistencytests/Tests/Researchers/goingssh/Kazi/testconfig/inst_set.kazi
Removed:
trunk/consistencytests/Tests/Default/config/
trunk/consistencytests/Tests/Researchers/goingssh/Kazi/testconfig/events.cfg
trunk/consistencytests/Tests/Researchers/goingssh/Kazi/testconfig/inst_set.default
trunk/consistencytests/Tests/Researchers/goingssh/Kazi/testconfig/organism.default
Modified:
trunk/consistencytests/Tests/Default/CMakeLists.txt
trunk/consistencytests/Tests/Researchers/CMakeLists.txt
trunk/consistencytests/Tests/Researchers/dule/LocalSex/CMakeLists.txt
trunk/consistencytests/Tests/Researchers/goingssh/Kazi/CMakeLists.txt
Log:
Added Sherri's consistency tests.
Some refactoring of consistency CMakeLists.txt files.
Added: trunk/consistencytests/CMakeModules/Templates/events.cfg.in
===================================================================
--- trunk/consistencytests/CMakeModules/Templates/events.cfg.in 2006-03-14 04:54:58 UTC (rev 518)
+++ trunk/consistencytests/CMakeModules/Templates/events.cfg.in 2006-03-14 07:13:01 UTC (rev 519)
@@ -0,0 +1,17 @@
+##############################################################################
+#
+# This is the setup file for the events system. From here, you can
+# configure any actions that you want to have happen during the course of
+# an experiment, including setting the times for data collection.
+#
+# basic syntax: [trigger] [start:interval:stop] [event] [arguments...]
+#
+# For information on how to use this file, see: doc/events.html
+# For other sample event configurations, see: source/support/config/
+#
+##############################################################################
+
+# Setup the exit time and full population data collection.
+u @RunLength@:@RunLength@ detail_pop # Save current state of population.
+u @RunLength@ exit # exit
+
Modified: trunk/consistencytests/Tests/Default/CMakeLists.txt
===================================================================
--- trunk/consistencytests/Tests/Default/CMakeLists.txt 2006-03-14 04:54:58 UTC (rev 518)
+++ trunk/consistencytests/Tests/Default/CMakeLists.txt 2006-03-14 07:13:01 UTC (rev 519)
@@ -8,15 +8,26 @@
# i.e., .../build/Tests/Default/.
#
+SET(TestsName "default")
+
#
# Avida configuration
-#
+
+# Number of updates per test
+SET(RunLength "500")
+# Event file generation. events.cfg.in uses the variable RunLength.
+SET(EventFileTemplate "${PROJECT_SOURCE_DIR}/CMakeModules/Templates/events.cfg.in")
+SET(EventFile "${CMAKE_CURRENT_BINARY_DIR}/events.cfg")
+CONFIGURE_FILE(${EventFileTemplate} ${EventFile} IMMEDIATE)
+
+# Where to find default configure files.
SET(ConfigDir "${AVIDA_SOURCE_DIR}/source/support")
-SET(EventFile "${CMAKE_CURRENT_SOURCE_DIR}/config/events.cfg")
+# Configure files (other than the event file, generated above).
SET(GenesisFile "${ConfigDir}/genesis")
SET(InstSetFile "${ConfigDir}/inst_set.default")
SET(EnvironmentFile "${ConfigDir}/environment.cfg")
SET(StartCreatureFile "${ConfigDir}/organism.default")
+# Command-line arguments passed to Avida.
SET(AvidaArgs "-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}")
#
@@ -28,18 +39,14 @@
# E.g., "range(100,105)" is equivalent to the Python list "[100,101,102,103,104]".
# I.e., SET(SeedSet "range(100,105)") is equivalent to SET(SeedSet "[100,101,102,103,104]").
SET(SeedSet "range(100,105)")
-# I've written ${ConfigDir}/events.cfg to stop Avida after 500 updates,
-# and to output a single detail-population file "detail_pop.500" per run,
-# i.e., ${CMAKE_CURRENT_SOURCE_DIR}/Test_100/detail_pop.500, and so on.
-SET(RunLength "500")
-
SET(OutputFileName "detail_pop.${RunLength}")
# Similar to above, except that this tells the testing scripts where to find
# expected last lines of detail_pop.${RunLength} files,
-# i.e., ${CMAKE_CURRENT_SOURCE_DIR}/Test_100/detail_pop.500.expected_last_line, and so on.
+# i.e., ${CMAKE_CURRENT_SOURCE_DIR}/Seed_100/detail_pop.500.expected_last_line, and so on.
SET(ExpectationFileName "detail_pop.${RunLength}.expected_last_line")
-# Avida will be run in, and store output files in, ${CMAKE_CURRENT_BINARY_DIR}/Test_100, and so on.
+# Avida will be run in, and store output files in,
+# ${CMAKE_CURRENT_BINARY_DIR}/Seed_100, and so on.
SET(ExpectationFilePathBase "${CMAKE_CURRENT_SOURCE_DIR}/${TestDirBaseName}_")
SET(RunSubdirPathBase "${CMAKE_CURRENT_BINARY_DIR}/${TestDirBaseName}_")
@@ -52,15 +59,21 @@
CONFIGURE_FILE(${CheckTailsScriptTemplate} ${CheckTailsScript} IMMEDIATE)
IF(AVD_CONSISTENCY_TEST_PRIMITIVE)
- ADD_TEST("Consistency-Check--Default" "${_PythonExePath}" "${CheckTailsScript}")
+ ADD_TEST("Consistency-Check--${TestsName}" "${_PythonExePath}" "${CheckTailsScript}")
ENDIF(AVD_CONSISTENCY_TEST_PRIMITIVE)
#
-# Generation of expected last lines of detail_pop.500 files.
+# Generation of expected last lines of detail_pop files.
#
-# To trigger this script, use commands like the following :
-# $ pushd ${CMAKE_CURRENT_BINARY_DIR} # i.e., cd .../build/Tests/Default/
-# $ tar cvfz Tests.tgz `find . -name detail_pop.500.expected_last_line`
+SET(GenerateTailsScriptTemplate "${PROJECT_SOURCE_DIR}/CMakeModules/Templates/generate_tails.py.in")
+SET(GenerateTailsScript "${CMAKE_CURRENT_BINARY_DIR}/generate_tails.py")
+CONFIGURE_FILE(${GenerateTailsScriptTemplate} ${GenerateTailsScript} IMMEDIATE)
+#
+# To regenerate expected last lines of detail_pop files, use commands like the
+# following :
+# $ pushd ${CMAKE_CURRENT_BINARY_DIR} # i.e., cd .../build/consistencytests/Tests/Default/
+# $ python ./generate_tails.py
+# $ tar cvfz Tests.tgz `find . -name detail_pop.*.expected_last_line`
# $ cd ${CMAKE_CURRENT_SOURCE_DIR}
# $ tar xvfz ${CMAKE_CURRENT_BINARY_DIR}/Tests.tgz
# $ popd
@@ -68,9 +81,6 @@
# I think it's safer to require that these steps be performed by hand in order
# to reduce the chance of inadvertently clobbering existing consistency-check suites.
#
-SET(GenerateTailsScriptTemplate "${PROJECT_SOURCE_DIR}/CMakeModules/Templates/generate_tails.py.in")
-SET(GenerateTailsScript "${CMAKE_CURRENT_BINARY_DIR}/generate_tails.py")
-CONFIGURE_FILE(${GenerateTailsScriptTemplate} ${GenerateTailsScript} IMMEDIATE)
# Vim modeline to tell Vim that this is a configuration script.
# vim: set ft=config:
Modified: trunk/consistencytests/Tests/Researchers/CMakeLists.txt
===================================================================
--- trunk/consistencytests/Tests/Researchers/CMakeLists.txt 2006-03-14 04:54:58 UTC (rev 518)
+++ trunk/consistencytests/Tests/Researchers/CMakeLists.txt 2006-03-14 07:13:01 UTC (rev 519)
@@ -1,5 +1,5 @@
SUBDIRS(
dule
- #goingssh
+ goingssh
)
Modified: trunk/consistencytests/Tests/Researchers/dule/LocalSex/CMakeLists.txt
===================================================================
--- trunk/consistencytests/Tests/Researchers/dule/LocalSex/CMakeLists.txt 2006-03-14 04:54:58 UTC (rev 518)
+++ trunk/consistencytests/Tests/Researchers/dule/LocalSex/CMakeLists.txt 2006-03-14 07:13:01 UTC (rev 519)
@@ -8,6 +8,8 @@
# i.e., .../build/Tests/Researchers/dule/LocalSex/.
#
+SET(TestsName "dule--GlobalSex")
+
#
# Avida configuration
#
@@ -49,7 +51,7 @@
CONFIGURE_FILE(${CheckTailsScriptTemplate} ${CheckTailsScript} IMMEDIATE)
IF(AVD_CONSISTENCY_TEST_PRIMITIVE)
- #ADD_TEST("Consistency-Check--Dule--GlobalSex" "${_PythonExePath}" "${CheckTailsScript}")
+ ADD_TEST("Consistency-Check--${TestsName}" "${_PythonExePath}" "${CheckTailsScript}")
ENDIF(AVD_CONSISTENCY_TEST_PRIMITIVE)
#
@@ -74,6 +76,8 @@
# Reconfigure for GlobalAsex
#
+SET(TestsName "dule--GlobalAsex")
+
SET(ConfigDir "${CMAKE_CURRENT_SOURCE_DIR}/config")
SET(GenesisFile "${ConfigDir}/genesis")
SET(InstSetFile "${ConfigDir}/inst_set.asex")
@@ -94,7 +98,7 @@
CONFIGURE_FILE(${CheckTailsScriptTemplate} ${CheckTailsScript} IMMEDIATE)
IF(AVD_CONSISTENCY_TEST_PRIMITIVE)
- ADD_TEST("Consistency-Check--Dule--GlobalAsex" "${_PythonExePath}" "${CheckTailsScript}")
+ ADD_TEST("Consistency-Check--${TestsName}" "${_PythonExePath}" "${CheckTailsScript}")
ENDIF(AVD_CONSISTENCY_TEST_PRIMITIVE)
SET(GenerateTailsScriptTemplate "${PROJECT_SOURCE_DIR}/CMakeModules/Templates/generate_tails.py.in")
Modified: trunk/consistencytests/Tests/Researchers/goingssh/Kazi/CMakeLists.txt
===================================================================
--- trunk/consistencytests/Tests/Researchers/goingssh/Kazi/CMakeLists.txt 2006-03-14 04:54:58 UTC (rev 518)
+++ trunk/consistencytests/Tests/Researchers/goingssh/Kazi/CMakeLists.txt 2006-03-14 07:13:01 UTC (rev 519)
@@ -1,47 +1,86 @@
-SET(ConfigDir "${CMAKE_CURRENT_SOURCE_DIR}/testconfig")
-SET(GenesisFile "${ConfigDir}/genesis")
-SET(InstSetFile "${ConfigDir}/inst_set.default")
-SET(EventFile "${ConfigDir}/events.cfg")
-SET(EnvironmentFile "${ConfigDir}/environment.cfg")
-SET(StartCreatureFile "${ConfigDir}/kazi.org")
-SET(AvidaArgs "-seed %d -set INST_SET ${InstSetFile} -set EVENT_FILE ${EventFile} -set ENVIRONMENT_FILE ${EnvironmentFile} -set START_CREATURE ${StartCreatureFile}")
-SET(SeedSet "range(100,110)")
-SET(RunSubdirPathBase "${CMAKE_CURRENT_BINARY_DIR}/Kazi_")
-SET(OutputFileName "detail_pop.100")
-SET(ExpectationFilePathBase "${CMAKE_CURRENT_SOURCE_DIR}/Kazi_")
-SET(ExpectationFileName "detail_pop.100.expected_last_line")
+# Note :
+#
+# ${CMAKE_CURRENT_SOURCE_DIR} points to the current source directory,
+# i.e., .../Tests/Default/.
+#
+# ${CMAKE_CURRENT_BINARY_DIR} points to the equivalent binary directory,
+# i.e., .../build/Tests/Default/.
+#
-SET(CheckTailsScriptTemplate "${PROJECT_SOURCE_DIR}/CMakeModules/Templates/check_tails.py.in")
-SET(CheckTailsScript "${CMAKE_CURRENT_BINARY_DIR}/kazi_check_tails.py")
-CONFIGURE_FILE(${CheckTailsScriptTemplate} ${CheckTailsScript} IMMEDIATE)
+SET(TestsName "goingssh--Kazi")
-IF(AVD_CONSISTENCY_TEST_PRIMITIVE)
- ADD_TEST("GlobalAsex" "${_PythonExePath}" "${CheckTailsScript}")
-ENDIF(AVD_CONSISTENCY_TEST_PRIMITIVE)
+#
+# Avida configuration
+#
-SET(GenerateTailsScriptTemplate "${PROJECT_SOURCE_DIR}/CMakeModules/Templates/generate_tails.py.in")
-SET(GenerateTailsScript "${CMAKE_CURRENT_BINARY_DIR}/kazi_generate_tails.py")
-CONFIGURE_FILE(${GenerateTailsScriptTemplate} ${GenerateTailsScript} IMMEDIATE)
+# Number of updates per test
+SET(RunLength "500")
+# Event file generation. events.cfg.in uses the variable RunLength.
+SET(EventFileTemplate "${PROJECT_SOURCE_DIR}/CMakeModules/Templates/events.cfg.in")
+SET(EventFile "${CMAKE_CURRENT_BINARY_DIR}/events.cfg")
+CONFIGURE_FILE(${EventFileTemplate} ${EventFile} IMMEDIATE)
+# Where to find default configure files.
+SET(ConfigDir "${CMAKE_CURRENT_SOURCE_DIR}/testconfig")
+# Configure files (other than the event file, generated above).
+SET(GenesisFile "${ConfigDir}/genesis")
+SET(InstSetFile "${ConfigDir}/inst_set.kazi")
+SET(EnvironmentFile "${ConfigDir}/environment.cfg")
+SET(StartCreatureFile "${ConfigDir}/kazi.org")
+# Command-line arguments passed to Avida.
+SET(AvidaArgs "-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}")
+#
+# Consistency checks configuration
+#
-SET(SeedSet "range(100,110)")
-SET(RunSubdirPathBase "${CMAKE_CURRENT_BINARY_DIR}/GlobalAsex_")
-SET(OutputFileName "detail_pop.100")
-SET(ExpectationFilePathBase "${CMAKE_CURRENT_SOURCE_DIR}/GlobalAsex_")
-SET(ExpectationFileName "detail_pop.100.expected_last_line")
+SET(TestDirBaseName "Seed")
+# This is Python list of Avida random seeds.
+# E.g., "range(100,105)" is equivalent to the Python list "[100,101,102,103,104]".
+# I.e., SET(SeedSet "range(100,105)") is equivalent to SET(SeedSet "[100,101,102,103,104]").
+SET(SeedSet "range(100,105)")
+SET(OutputFileName "detail_pop.${RunLength}")
+# Similar to above, except that this tells the testing scripts where to find
+# expected last lines of detail_pop.${RunLength} files,
+# i.e., ${CMAKE_CURRENT_SOURCE_DIR}/Seed_100/detail_pop.500.expected_last_line, and so on.
+SET(ExpectationFileName "detail_pop.${RunLength}.expected_last_line")
+# Avida will be run in, and store output files in,
+# ${CMAKE_CURRENT_BINARY_DIR}/Seed_100, and so on.
+SET(ExpectationFilePathBase "${CMAKE_CURRENT_SOURCE_DIR}/${TestDirBaseName}_")
+SET(RunSubdirPathBase "${CMAKE_CURRENT_BINARY_DIR}/${TestDirBaseName}_")
+#
+# This generates the Python script that performs consistency checks.
+# Several of the variables defined above make their ways into the script.
+# See CMake's documentaton of the CONFIGURE_FILE command for details.
SET(CheckTailsScriptTemplate "${PROJECT_SOURCE_DIR}/CMakeModules/Templates/check_tails.py.in")
-SET(CheckTailsScript "${CMAKE_CURRENT_BINARY_DIR}/asex_check_tails.py")
+SET(CheckTailsScript "${CMAKE_CURRENT_BINARY_DIR}/check_tails.py")
CONFIGURE_FILE(${CheckTailsScriptTemplate} ${CheckTailsScript} IMMEDIATE)
IF(AVD_CONSISTENCY_TEST_PRIMITIVE)
- ADD_TEST("GlobalAsex" "${_PythonExePath}" "${CheckTailsScript}")
+ ADD_TEST("Consistency-Check--${TestsName}" "${_PythonExePath}" "${CheckTailsScript}")
ENDIF(AVD_CONSISTENCY_TEST_PRIMITIVE)
+#
+# Generation of expected last lines of detail_pop files.
+#
SET(GenerateTailsScriptTemplate "${PROJECT_SOURCE_DIR}/CMakeModules/Templates/generate_tails.py.in")
-SET(GenerateTailsScript "${CMAKE_CURRENT_BINARY_DIR}/asex_generate_tails.py")
+SET(GenerateTailsScript "${CMAKE_CURRENT_BINARY_DIR}/generate_tails.py")
CONFIGURE_FILE(${GenerateTailsScriptTemplate} ${GenerateTailsScript} IMMEDIATE)
+#
+# To regenerate expected last lines of detail_pop files, use commands like the
+# following :
+# $ pushd ${CMAKE_CURRENT_BINARY_DIR} # i.e., cd .../build/consistencytests/Tests/Default/
+# $ python ./generate_tails.py
+# $ tar cvfz Tests.tgz `find . -name detail_pop.*.expected_last_line`
+# $ cd ${CMAKE_CURRENT_SOURCE_DIR}
+# $ tar xvfz ${CMAKE_CURRENT_BINARY_DIR}/Tests.tgz
+# $ popd
+#
+# I think it's safer to require that these steps be performed by hand in order
+# to reduce the chance of inadvertently clobbering existing consistency-check suites.
+#
-
+# Vim modeline to tell Vim that this is a configuration script.
+# vim: set ft=config:
Added: trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_100/detail_pop.500.expected_last_line
===================================================================
--- trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_100/detail_pop.500.expected_last_line 2006-03-14 04:54:58 UTC (rev 518)
+++ trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_100/detail_pop.500.expected_last_line 2006-03-14 07:13:01 UTC (rev 519)
@@ -0,0 +1 @@
+3558 3350 1 1 2 100 0 0 0 480 -1 2 rucavcBABBBulBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBButycasvab
Added: trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_101/detail_pop.500.expected_last_line
===================================================================
--- trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_101/detail_pop.500.expected_last_line 2006-03-14 04:54:58 UTC (rev 518)
+++ trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_101/detail_pop.500.expected_last_line 2006-03-14 07:13:01 UTC (rev 519)
@@ -0,0 +1 @@
+3912 3673 1 1 1 100 0 0 0 499 -1 3 rucavcBABBBBBBBBBBBBBBBBBBBBBBBBBmBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBButymazvab
Added: trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_102/detail_pop.500.expected_last_line
===================================================================
--- trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_102/detail_pop.500.expected_last_line 2006-03-14 04:54:58 UTC (rev 518)
+++ trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_102/detail_pop.500.expected_last_line 2006-03-14 07:13:01 UTC (rev 519)
@@ -0,0 +1 @@
+3857 3015 1 1 1 100 0 0 0 499 -1 3 rucavcBjBBBBBBBBBBBBBBBBBBBByBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBkBBBBBBBBBBBBBBBBBBBBBBBBBBBBBButyoasvab
Added: trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_103/detail_pop.500.expected_last_line
===================================================================
--- trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_103/detail_pop.500.expected_last_line 2006-03-14 04:54:58 UTC (rev 518)
+++ trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_103/detail_pop.500.expected_last_line 2006-03-14 07:13:01 UTC (rev 519)
@@ -0,0 +1 @@
+3587 3377 1 1 2 100 0 0 0 480 -1 4 rucavcBABBBBBBBeBBBBBBiBBBBBBlBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBmBButycasvab
Added: trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_104/detail_pop.500.expected_last_line
===================================================================
--- trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_104/detail_pop.500.expected_last_line 2006-03-14 04:54:58 UTC (rev 518)
+++ trunk/consistencytests/Tests/Researchers/goingssh/Kazi/Seed_104/detail_pop.500.expected_last_line 2006-03-14 07:13:01 UTC (rev 519)
@@ -0,0 +1 @@
+291 228 1 1 56 100 97 389 0.249357 207 -1 4 rucavcBABBBlBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBrBBxBBBsBBBBBBBBBBBBBBBBBBBButycasvab
Deleted: trunk/consistencytests/Tests/Researchers/goingssh/Kazi/testconfig/events.cfg
===================================================================
--- trunk/consistencytests/Tests/Researchers/goingssh/Kazi/testconfig/events.cfg 2006-03-14 04:54:58 UTC (rev 518)
+++ trunk/consistencytests/Tests/Researchers/goingssh/Kazi/testconfig/events.cfg 2006-03-14 07:13:01 UTC (rev 519)
@@ -1,42 +0,0 @@
-##############################################################################
-#
-# This is the setup file for the events system. From here, you can
-# configure any actions that you want to have happen during the course of
-# an experiment, including setting the times for data collection.
-#
-# basic syntax: [trigger] [start:interval:stop] [event] [arguments...]
-#
-# This file is currently setup to start off a population full of the
-# starting organism specified in genesis, and then record key information
-# every 100 updates.
-#
-# For information on how to use this file, see: doc/events.html
-# For other sample event configurations, see: source/support/config/
-#
-##############################################################################
-
-u 0 inject_all kazi.org 100
-
-# Print all of the standard data files...
-#u 0:100 print_dom # Save the most abundant genotypes
-#u 0:100:end print_average_data # Save info about they average genotypes
-#u 0:100:end print_dominant_data # Save info about most abundant genotypes
-#u 0:100:end print_stats_data # Collect satistics about entire pop.
-#u 0:100:end print_count_data # Count organisms, genotypes, species, etc.
-#u 0:100:end print_tasks_data # Save organisms counts for each task.
-#u 0:100:end print_time_data # Track time conversion (generations, etc.)
-#u 0:100:end print_resource_data # Track resource abundance.
-#
-## A few data files not printed by default
-## u 100:100:end print_error_data # Std. Error on averages.
-## u 100:100:end print_variance_data # Variance on averages.
-## u 100:100:end print_totals_data # Total counts over entire run.
-#u 100:100:end print_tasks_exe_data # Num. times tasks have been executed.
-#
-## Setup the exit time and full population data collection.
-#u 5000:5000 detail_pop # Save current state of population.
-#u 5000:5000 dump_historic_pop # Save ancestors of current population.
-#u 20000 exit # exit
-
-u 100:100 detail_pop # Save current state of population.
-u 100 exit # exit
Deleted: trunk/consistencytests/Tests/Researchers/goingssh/Kazi/testconfig/inst_set.default
===================================================================
--- trunk/consistencytests/Tests/Researchers/goingssh/Kazi/testconfig/inst_set.default 2006-03-14 04:54:58 UTC (rev 518)
+++ trunk/consistencytests/Tests/Researchers/goingssh/Kazi/testconfig/inst_set.default 2006-03-14 07:13:01 UTC (rev 519)
@@ -1,54 +0,0 @@
-nop-A 1 # a
-nop-B 1 # b
-nop-C 1 # c
-if-n-equ 1 # d
-if-less 1 # e
-pop 0 # f
-push 0 # g
-swap-stk 1 # h
-swap 1 # i
-shift-r 1 # j
-shift-l 1 # k
-inc 1 # l
-dec 1 # m
-add 1 # n
-sub 1 # o
-nand 1 # p
-IO 1 # q Puts current contents of register and gets new.
-h-alloc 1 # r Allocate as much memory as organism can use.
-h-divide 1 # s Cuts off everything between the read and write heads
-h-copy 1 # t Combine h-read and h-write
-h-search 1 # u Search for matching template, set flow head & return info
- # # if no template, move flow-head here, set size&offset=0.
-mov-head 1 # v Move ?IP? head to flow control.
-jmp-head 1 # w Move ?IP? head by fixed amount in CX. Set old pos in CX.
-get-head 1 # x Get position of specified head in CX.
-if-label 1 # y
-set-flow 1 # z Move flow-head to address in ?CX?
-kazi 1
-nop-X 0
-
-#adv-head 1
-#jump-f 1
-#jump-b 1
-#call 1
-#return 1
-#if-bit-1 1
-#get 1
-#put 1
-#h-read 1
-#h-write 1
-#set-head 1
-#search-f 1
-#search-b 1
-
-
-# Works on multiple nops: pop push inc dec IO adv-head
-
-# What if we add a new head. Search will return the location of something,
-# and put the new head there. Then set-head will move another head to that
-# point. In the case of the copy loop, it only needs to be set once and
-# this will speed up the code quite a bit!
-
-# Search with no template returns current position (abs line number) in
-# genome.
\ No newline at end of file
Copied: trunk/consistencytests/Tests/Researchers/goingssh/Kazi/testconfig/inst_set.kazi (from rev 508, trunk/consistencytests/Tests/Researchers/goingssh/Kazi/testconfig/inst_set.default)
Deleted: trunk/consistencytests/Tests/Researchers/goingssh/Kazi/testconfig/organism.default
===================================================================
--- trunk/consistencytests/Tests/Researchers/goingssh/Kazi/testconfig/organism.default 2006-03-14 04:54:58 UTC (rev 518)
+++ trunk/consistencytests/Tests/Researchers/goingssh/Kazi/testconfig/organism.default 2006-03-14 07:13:01 UTC (rev 519)
@@ -1,101 +0,0 @@
-h-alloc # Allocate space for child
-h-search # Locate the end of the organism
-nop-C #
-nop-A #
-mov-head # Place write-head at beginning of offspring.
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-nop-X #
-h-search # Mark the beginning of the copy loop
-h-copy # Do the copy
-if-label # If we're done copying....
-nop-C #
-nop-A #
-h-divide # ...divide!
-mov-head # Otherwise, loop back to the beginning of the copy loop.
-nop-A # End label.
-nop-B #
-
More information about the Avida-cvs
mailing list