[Avida-SVN] r3493 - in development/tests/analyze_printphenotypes: . config
blwalker at myxo.css.msu.edu
blwalker at myxo.css.msu.edu
Thu Oct 15 07:53:29 PDT 2009
Author: blwalker
Date: 2009-10-15 10:53:29 -0400 (Thu, 15 Oct 2009)
New Revision: 3493
Added:
development/tests/analyze_printphenotypes/config/default-heads.org
development/tests/analyze_printphenotypes/config/instset-heads.cfg
Removed:
development/tests/analyze_printphenotypes/config/default-classic.org
development/tests/analyze_printphenotypes/config/instset-classic.cfg
development/tests/analyze_printphenotypes/expected/
Modified:
development/tests/analyze_printphenotypes/config/avida.cfg
Log:
Updating analyze_printphenotypes consistency test to use new "heads" names for old "classic" instruction set and organism files.
Also removing expected results, as there were no actual results there. New expected results will follow shortly.
Modified: development/tests/analyze_printphenotypes/config/avida.cfg
===================================================================
--- development/tests/analyze_printphenotypes/config/avida.cfg 2009-10-15 04:28:16 UTC (rev 3492)
+++ development/tests/analyze_printphenotypes/config/avida.cfg 2009-10-15 14:53:29 UTC (rev 3493)
@@ -29,11 +29,11 @@
### CONFIG_FILE_GROUP ###
# Configuration Files
DATA_DIR data # Directory in which config files are found
-INST_SET - # File containing instruction set
+INST_SET instset_heads.cfg # File containing instruction set
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
+START_CREATURE default-heads.org # Organism to seed the soup
### REPRODUCTION_GROUP ###
# Birth and Death
Deleted: development/tests/analyze_printphenotypes/config/default-classic.org
===================================================================
--- development/tests/analyze_printphenotypes/config/default-classic.org 2009-10-15 04:28:16 UTC (rev 3492)
+++ development/tests/analyze_printphenotypes/config/default-classic.org 2009-10-15 14:53:29 UTC (rev 3493)
@@ -1,53 +0,0 @@
-# --- Setup ---
-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-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-nop-C #
-
-# --- Copy Loop ---
-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/analyze_printphenotypes/config/default-heads.org
===================================================================
--- development/tests/analyze_printphenotypes/config/default-heads.org (rev 0)
+++ development/tests/analyze_printphenotypes/config/default-heads.org 2009-10-15 14:53:29 UTC (rev 3493)
@@ -0,0 +1,100 @@
+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-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+nop-C #
+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 #
Deleted: development/tests/analyze_printphenotypes/config/instset-classic.cfg
===================================================================
--- development/tests/analyze_printphenotypes/config/instset-classic.cfg 2009-10-15 04:28:16 UTC (rev 3492)
+++ development/tests/analyze_printphenotypes/config/instset-classic.cfg 2009-10-15 14:53:29 UTC (rev 3493)
@@ -1,52 +0,0 @@
-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/analyze_printphenotypes/config/instset-heads.cfg
===================================================================
--- development/tests/analyze_printphenotypes/config/instset-heads.cfg (rev 0)
+++ development/tests/analyze_printphenotypes/config/instset-heads.cfg 2009-10-15 14:53:29 UTC (rev 3493)
@@ -0,0 +1,37 @@
+# No-ops
+nop-A 1 # a
+nop-B 1 # b
+nop-C 1 # c
+
+# Flow control operations
+if-n-equ 1 # d
+if-less 1 # e
+if-label 1 # f
+mov-head 1 # g
+jmp-head 1 # h
+get-head 1 # i
+set-flow 1 # j
+
+# Single Argument Math
+shift-r 1 # k
+shift-l 1 # l
+inc 1 # m
+dec 1 # n
+push 1 # o
+pop 1 # p
+swap-stk 1 # q
+swap 1 # r
+
+# Double Argument Math
+add 1 # s
+sub 1 # t
+nand 1 # u
+
+# Biological Operations
+h-copy 1 # v
+h-alloc 1 # w
+h-divide 1 # x
+
+# I/O and Sensory
+IO 1 # y
+h-search 1 # z
More information about the Avida-cvs
mailing list