[Avida-cvs] [avida-svn] r517 - in trunk/consistencytests/Tests: . Default Default/Default_100 Default/Default_101 Default/Default_102 Default/Default_103 Default/Default_104 Default/config Researchers/dule/LocalSex
kaben@myxo.css.msu.edu
kaben at myxo.css.msu.edu
Mon Mar 13 18:43:06 PST 2006
Author: kaben
Date: 2006-03-13 21:42:58 -0500 (Mon, 13 Mar 2006)
New Revision: 517
Added:
trunk/consistencytests/Tests/Default/
trunk/consistencytests/Tests/Default/CMakeLists.txt
trunk/consistencytests/Tests/Default/Default_100/
trunk/consistencytests/Tests/Default/Default_100/detail_pop.500.expected_last_line
trunk/consistencytests/Tests/Default/Default_101/
trunk/consistencytests/Tests/Default/Default_101/detail_pop.500.expected_last_line
trunk/consistencytests/Tests/Default/Default_102/
trunk/consistencytests/Tests/Default/Default_102/detail_pop.500.expected_last_line
trunk/consistencytests/Tests/Default/Default_103/
trunk/consistencytests/Tests/Default/Default_103/detail_pop.500.expected_last_line
trunk/consistencytests/Tests/Default/Default_104/
trunk/consistencytests/Tests/Default/Default_104/detail_pop.500.expected_last_line
trunk/consistencytests/Tests/Default/config/
trunk/consistencytests/Tests/Default/config/events.cfg
Modified:
trunk/consistencytests/Tests/CMakeLists.txt
trunk/consistencytests/Tests/Researchers/dule/LocalSex/CMakeLists.txt
Log:
Added consistency tests for default Avida configuration.
Modified: trunk/consistencytests/Tests/CMakeLists.txt
===================================================================
--- trunk/consistencytests/Tests/CMakeLists.txt 2006-03-13 22:23:20 UTC (rev 516)
+++ trunk/consistencytests/Tests/CMakeLists.txt 2006-03-14 02:42:58 UTC (rev 517)
@@ -1 +1,2 @@
+SUBDIRS(Default)
SUBDIRS(Researchers)
Added: trunk/consistencytests/Tests/Default/CMakeLists.txt
===================================================================
--- trunk/consistencytests/Tests/Default/CMakeLists.txt 2006-03-13 22:23:20 UTC (rev 516)
+++ trunk/consistencytests/Tests/Default/CMakeLists.txt 2006-03-14 02:42:58 UTC (rev 517)
@@ -0,0 +1,77 @@
+
+# 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/.
+#
+
+#
+# Avida configuration
+#
+SET(ConfigDir "${AVIDA_SOURCE_DIR}/source/support")
+SET(EventFile "${CMAKE_CURRENT_SOURCE_DIR}/config/events.cfg")
+SET(GenesisFile "${ConfigDir}/genesis")
+SET(InstSetFile "${ConfigDir}/inst_set.default")
+SET(EnvironmentFile "${ConfigDir}/environment.cfg")
+SET(StartCreatureFile "${ConfigDir}/organism.default")
+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(TestDirBaseName "Default")
+
+# 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)")
+# 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.
+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.
+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}/${TestDirBaseName}_check_tails.py")
+CONFIGURE_FILE(${CheckTailsScriptTemplate} ${CheckTailsScript} IMMEDIATE)
+
+IF(AVD_CONSISTENCY_TEST_PRIMITIVE)
+ ADD_TEST("Consistency-Check--Default" "${_PythonExePath}" "${CheckTailsScript}")
+ENDIF(AVD_CONSISTENCY_TEST_PRIMITIVE)
+
+#
+# Generation of expected last lines of detail_pop.500 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`
+# $ 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.
+#
+SET(GenerateTailsScriptTemplate "${PROJECT_SOURCE_DIR}/CMakeModules/Templates/generate_tails.py.in")
+SET(GenerateTailsScript "${CMAKE_CURRENT_BINARY_DIR}/${TestDirBaseName}_generate_tails.py")
+CONFIGURE_FILE(${GenerateTailsScriptTemplate} ${GenerateTailsScript} IMMEDIATE)
+
+# Vim modeline to tell Vim that this is a configuration script.
+# vim: set ft=config:
Added: trunk/consistencytests/Tests/Default/Default_100/detail_pop.500.expected_last_line
===================================================================
--- trunk/consistencytests/Tests/Default/Default_100/detail_pop.500.expected_last_line 2006-03-13 22:23:20 UTC (rev 516)
+++ trunk/consistencytests/Tests/Default/Default_100/detail_pop.500.expected_last_line 2006-03-14 02:42:58 UTC (rev 517)
@@ -0,0 +1 @@
+15836 13999 1 1 1 100 0 0 0 500 -1 13 rucavckccccccccccccvcccccncccvcdccscccccgccccccccccccccctccccccocmjufccccucccccccccccceacccutycasvab
Added: trunk/consistencytests/Tests/Default/Default_101/detail_pop.500.expected_last_line
===================================================================
--- trunk/consistencytests/Tests/Default/Default_101/detail_pop.500.expected_last_line 2006-03-13 22:23:20 UTC (rev 516)
+++ trunk/consistencytests/Tests/Default/Default_101/detail_pop.500.expected_last_line 2006-03-14 02:42:58 UTC (rev 517)
@@ -0,0 +1 @@
+16614 16032 1 1 1 104 0 0 0 500 -1 15 rucavccncccjccceccecccccccccxfccjlccccccccciccccccicczclcccccccccccpcicccdccjcccfdcccccccccmcccutycasvab
Added: trunk/consistencytests/Tests/Default/Default_102/detail_pop.500.expected_last_line
===================================================================
--- trunk/consistencytests/Tests/Default/Default_102/detail_pop.500.expected_last_line 2006-03-13 22:23:20 UTC (rev 516)
+++ trunk/consistencytests/Tests/Default/Default_102/detail_pop.500.expected_last_line 2006-03-14 02:42:58 UTC (rev 517)
@@ -0,0 +1 @@
+13664 11667 1 1 2 99 0 0 0 478 -1 11 rucavccyccaccsccccccccccccccccccccccfccccciccccoccccxccccccccricccccccccccccccccmcczctrcccutycasvab
Added: trunk/consistencytests/Tests/Default/Default_103/detail_pop.500.expected_last_line
===================================================================
--- trunk/consistencytests/Tests/Default/Default_103/detail_pop.500.expected_last_line 2006-03-13 22:23:20 UTC (rev 516)
+++ trunk/consistencytests/Tests/Default/Default_103/detail_pop.500.expected_last_line 2006-03-14 02:42:58 UTC (rev 517)
@@ -0,0 +1 @@
+13874 12656 1 1 4 101 97 383 0.253264 449 -1 11 rucavccqccccccccccccccnpcdcgcbccccccccccccccccccbccckdccccccccdcccccccccccccccckqccccccgceccutycasvab
Added: trunk/consistencytests/Tests/Default/Default_104/detail_pop.500.expected_last_line
===================================================================
--- trunk/consistencytests/Tests/Default/Default_104/detail_pop.500.expected_last_line 2006-03-13 22:23:20 UTC (rev 516)
+++ trunk/consistencytests/Tests/Default/Default_104/detail_pop.500.expected_last_line 2006-03-14 02:42:58 UTC (rev 517)
@@ -0,0 +1 @@
+16164 13989 1 1 1 101 0 0 0 500 -1 11 rucavcccctcciccccccccccccccacccpccmcccmcccccccccccccccccxccccccbcncclccccccccccucccccctmccccutycasvab
Added: trunk/consistencytests/Tests/Default/config/events.cfg
===================================================================
--- trunk/consistencytests/Tests/Default/config/events.cfg 2006-03-13 22:23:20 UTC (rev 516)
+++ trunk/consistencytests/Tests/Default/config/events.cfg 2006-03-14 02:42:58 UTC (rev 517)
@@ -0,0 +1,37 @@
+##############################################################################
+#
+# 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/
+#
+##############################################################################
+
+# 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 500:500 detail_pop # Save current state of population.
+u 500 exit # exit
+
Modified: trunk/consistencytests/Tests/Researchers/dule/LocalSex/CMakeLists.txt
===================================================================
--- trunk/consistencytests/Tests/Researchers/dule/LocalSex/CMakeLists.txt 2006-03-13 22:23:20 UTC (rev 516)
+++ trunk/consistencytests/Tests/Researchers/dule/LocalSex/CMakeLists.txt 2006-03-14 02:42:58 UTC (rev 517)
@@ -49,7 +49,7 @@
CONFIGURE_FILE(${CheckTailsScriptTemplate} ${CheckTailsScript} IMMEDIATE)
IF(AVD_CONSISTENCY_TEST_PRIMITIVE)
- #ADD_TEST("Consistency-Check--GlobalSex" "${_PythonExePath}" "${CheckTailsScript}")
+ #ADD_TEST("Consistency-Check--Dule--GlobalSex" "${_PythonExePath}" "${CheckTailsScript}")
ENDIF(AVD_CONSISTENCY_TEST_PRIMITIVE)
#
@@ -94,7 +94,7 @@
CONFIGURE_FILE(${CheckTailsScriptTemplate} ${CheckTailsScript} IMMEDIATE)
IF(AVD_CONSISTENCY_TEST_PRIMITIVE)
- ADD_TEST("Consistency-Check--GlobalAsex" "${_PythonExePath}" "${CheckTailsScript}")
+ ADD_TEST("Consistency-Check--Dule--GlobalAsex" "${_PythonExePath}" "${CheckTailsScript}")
ENDIF(AVD_CONSISTENCY_TEST_PRIMITIVE)
SET(GenerateTailsScriptTemplate "${PROJECT_SOURCE_DIR}/CMakeModules/Templates/generate_tails.py.in")
More information about the Avida-cvs
mailing list