[Avida-SVN] r3427 - in development/tests: . reaction_ordering reaction_ordering/config reaction_ordering/expected reaction_ordering/expected/data
brysonda at myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Fri Sep 25 08:44:46 PDT 2009
Author: brysonda
Date: 2009-09-25 11:44:46 -0400 (Fri, 25 Sep 2009)
New Revision: 3427
Added:
development/tests/midrun_classic_30u/
development/tests/reaction_ordering/
development/tests/reaction_ordering/config/
development/tests/reaction_ordering/config/avida.cfg
development/tests/reaction_ordering/config/default-classic.org
development/tests/reaction_ordering/config/environment.cfg
development/tests/reaction_ordering/config/events.cfg
development/tests/reaction_ordering/config/instset-classic.cfg
development/tests/reaction_ordering/expected/
development/tests/reaction_ordering/expected/data/
development/tests/reaction_ordering/expected/data/reactions.dat
development/tests/reaction_ordering/test_list
Removed:
development/tests/midrun_classsic_30u/
Log:
Add simple consistency test to verify proper reaction counts for multiple reactions. Also renamed midrun_classic_30u to spell classic properly. Gah, don't know why I waited so long to fix that.
Copied: development/tests/midrun_classic_30u (from rev 3424, development/tests/midrun_classsic_30u)
Added: development/tests/reaction_ordering/config/avida.cfg
===================================================================
--- development/tests/reaction_ordering/config/avida.cfg (rev 0)
+++ development/tests/reaction_ordering/config/avida.cfg 2009-09-25 15:44:46 UTC (rev 3427)
@@ -0,0 +1,14 @@
+VERSION_ID 2.9.0 # Do not change this value.
+
+WORLD_X 10 # Width of the Avida world
+WORLD_Y 10 # Height of the Avida world
+WORLD_GEOMETRY 2 # 1 = Bounded Grid
+RANDOM_SEED 100 # Random number seed (0 for based on time)
+HARDWARE_TYPE 0 # 0 = Original CPUs
+DATA_DIR data # Directory in which config files are found
+INST_SET - # File containing instruction set
+INST_SET_FORMAT 0 # Instruction set file format.
+EVENT_FILE events.cfg # File containing list of events during run
+ANALYZE_FILE analyze.cfg # File used for analysis mode
+ENVIRONMENT_FILE environment.cfg # File that describes the environment
+START_CREATURE default-classic.org # Organism to seed the soup
Added: development/tests/reaction_ordering/config/default-classic.org
===================================================================
--- development/tests/reaction_ordering/config/default-classic.org (rev 0)
+++ development/tests/reaction_ordering/config/default-classic.org 2009-09-25 15:44:46 UTC (rev 3427)
@@ -0,0 +1,24 @@
+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 #
+IO
+nop-C
+IO
+nop-C #
+IO
+nop-B
+nand
+IO
+nop-B
+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 #
Added: development/tests/reaction_ordering/config/environment.cfg
===================================================================
--- development/tests/reaction_ordering/config/environment.cfg (rev 0)
+++ development/tests/reaction_ordering/config/environment.cfg 2009-09-25 15:44:46 UTC (rev 3427)
@@ -0,0 +1,4 @@
+
+REACTION ECHO_pre echo process:value=1.0:type=pow requisite:max_count=1
+REACTION ECHO echo process:value=1.0:type=pow requisite:max_count=1
+REACTION NAND nand process:value=1.0:type=pow requisite:max_count=1
Added: development/tests/reaction_ordering/config/events.cfg
===================================================================
--- development/tests/reaction_ordering/config/events.cfg (rev 0)
+++ development/tests/reaction_ordering/config/events.cfg 2009-09-25 15:44:46 UTC (rev 3427)
@@ -0,0 +1,2 @@
+u 0:1:end PrintReactionData
+u 10 Exit
Added: development/tests/reaction_ordering/config/instset-classic.cfg
===================================================================
--- development/tests/reaction_ordering/config/instset-classic.cfg (rev 0)
+++ development/tests/reaction_ordering/config/instset-classic.cfg 2009-09-25 15:44:46 UTC (rev 3427)
@@ -0,0 +1,52 @@
+nop-A 1 # a
+nop-B 1 # b
+nop-C 1 # c
+if-n-equ 1 # d
+if-less 1 # e
+pop 1 # f
+push 1 # 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?
+
+#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
Added: development/tests/reaction_ordering/expected/data/reactions.dat
===================================================================
--- development/tests/reaction_ordering/expected/data/reactions.dat (rev 0)
+++ development/tests/reaction_ordering/expected/data/reactions.dat 2009-09-25 15:44:46 UTC (rev 3427)
@@ -0,0 +1,20 @@
+# Avida reaction data
+# Fri Sep 25 11:47:04 2009
+# First column gives the current update, all further columns give the number
+# of currently living organisms each reaction has affected.
+# 1: Update
+# 2: ECHO_pre
+# 3: ECHO
+# 4: NAND
+
+0 0 0 0
+1 0 0 0
+2 2 2 2
+3 2 2 2
+4 2 2 2
+5 3 3 3
+6 4 4 4
+7 4 4 4
+8 6 6 6
+9 8 8 6
+10 10 10 8
Added: development/tests/reaction_ordering/test_list
===================================================================
--- development/tests/reaction_ordering/test_list (rev 0)
+++ development/tests/reaction_ordering/test_list 2009-09-25 15:44:46 UTC (rev 3427)
@@ -0,0 +1,36 @@
+;--- Begin Test Configuration File (test_list) ---
+[main]
+; Command line arguments to pass to the application
+args =
+app = %(default_app)s
+nonzeroexit = disallow ; Exit code handling (disallow, allow, or require)
+ ; disallow - treat non-zero exit codes as failures
+ ; allow - all exit codes are acceptable
+ ; require - treat zero exit codes as failures, useful
+ ; for creating tests for app error checking
+createdby = David Bryson ; Who created the test
+email = brysonda at egr.msu.edu ; Email address for the test's creator
+
+[consistency]
+enabled = yes ; Is this test a consistency test?
+long = no ; Is this test a long test?
+
+[performance]
+enabled = no ; Is this test a performance test?
+long = no ; Is this test a long test?
+
+; The following variables can be used in constructing setting values by calling
+; them with %(variable_name)s. For example see 'app' above.
+;
+; app
+; builddir
+; cpus
+; mode
+; perf_repeat
+; perf_user_margin
+; perf_wall_margin
+; svn
+; svnmetadir
+; svnversion
+; testdir
+;--- End Test Configuration File ---
More information about the Avida-cvs
mailing list