[Avida-SVN] r1480 - in development/tests: . default_classic_500u default_classic_500u/config default_classic_500u/expected default_classic_500u/expected/data default_classic_500u/expected/data/archive midrun_classsic_30u
brysonda at myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Tue Apr 17 14:43:38 PDT 2007
Author: brysonda
Date: 2007-04-17 17:43:37 -0400 (Tue, 17 Apr 2007)
New Revision: 1480
Added:
development/tests/default_classic_500u/
development/tests/default_classic_500u/config/
development/tests/default_classic_500u/config/avida.cfg
development/tests/default_classic_500u/config/default-classic.org
development/tests/default_classic_500u/config/environment.cfg
development/tests/default_classic_500u/config/events.cfg
development/tests/default_classic_500u/config/instset-classic.cfg
development/tests/default_classic_500u/expected/
development/tests/default_classic_500u/expected/data/
development/tests/default_classic_500u/expected/data/archive/
development/tests/default_classic_500u/expected/data/archive/099-aaadi.org
development/tests/default_classic_500u/expected/data/archive/100-aaaaa.org
development/tests/default_classic_500u/expected/data/archive/100-aaadg.org
development/tests/default_classic_500u/expected/data/archive/100-aaags.org
development/tests/default_classic_500u/expected/data/archive/101-aaacb.org
development/tests/default_classic_500u/expected/data/average.dat
development/tests/default_classic_500u/expected/data/count.dat
development/tests/default_classic_500u/expected/data/dominant.dat
development/tests/default_classic_500u/expected/data/resource.dat
development/tests/default_classic_500u/expected/data/stats.dat
development/tests/default_classic_500u/expected/data/tasks.dat
development/tests/default_classic_500u/expected/data/tasks_exe.dat
development/tests/default_classic_500u/expected/data/tasks_quality.dat
development/tests/default_classic_500u/expected/data/time.dat
development/tests/default_classic_500u/test_list
Modified:
development/tests/midrun_classsic_30u/test_list
Log:
Add long (500u) classic test. Mark midrun test as a perf test.
Added: development/tests/default_classic_500u/config/avida.cfg
===================================================================
--- development/tests/default_classic_500u/config/avida.cfg (rev 0)
+++ development/tests/default_classic_500u/config/avida.cfg 2007-04-17 21:43:37 UTC (rev 1480)
@@ -0,0 +1,216 @@
+#############################################################################
+# This file includes all the basic run-time defines for Avida.
+# For more information, see doc/config.html
+#############################################################################
+
+VERSION_ID 2.7.0 # Do not change this value.
+
+### GENERAL_GROUP ###
+# General Settings
+ANALYZE_MODE 0 # 0 = Disabled
+ # 1 = Enabled
+ # 2 = Interactive
+VIEW_MODE 1 # Initial viewer screen
+CLONE_FILE - # Clone file to load
+VERBOSITY 1 # Control output verbosity
+
+### ARCH_GROUP ###
+# Architecture Variables
+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
+RANDOM_SEED 101 # Random number seed (0 for based on time)
+HARDWARE_TYPE 0 # 0 = Original CPUs
+ # 1 = New SMT CPUs
+ # 2 = Transitional SMT
+
+### CONFIG_FILE_GROUP ###
+# Configuration Files
+DATA_DIR data # Directory in which config files are found
+INST_SET - # 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
+
+### REPRODUCTION_GROUP ###
+# Birth and Death
+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)
+ # 2 = Die when inst executed = length*AGE_LIMIT (+dev)
+AGE_LIMIT 20 # Modifies DEATH_METHOD
+AGE_DEVIATION 0 # Creates a distribution around AGE_LIMIT
+ALLOC_METHOD 0 # (Orignal CPU Only)
+ # 0 = Allocated space is set to default instruction.
+ # 1 = Set to section of dead genome (Necrophilia)
+ # 2 = Allocated space is set to random instruction.
+DIVIDE_METHOD 1 # 0 = Divide leaves state of mother untouched.
+ # 1 = Divide resets state of mother
+ # (after the divide, we have 2 children)
+ # 2 = Divide resets state of current thread only
+ # (does not touch possible parasite threads)
+GENERATION_INC_METHOD 1 # 0 = Only the generation of the child is
+ # increased on divide.
+ # 1 = Both the generation of the mother and child are
+ # increased on divide (good with DIVIDE_METHOD 1).
+
+### RECOMBINATION_GROUP ###
+# Sexual Recombination and Modularity
+RECOMBINATION_PROB 1.0 # probability of recombination in div-sex
+MAX_BIRTH_WAIT_TIME -1 # Updates incipiant orgs can wait for crossover
+MODULE_NUM 0 # number of modules in the genome
+CONT_REC_REGS 1 # are (modular) recombination regions continuous
+CORESPOND_REC_REGS 1 # are (modular) recombination regions swapped randomly
+ # or with corresponding positions?
+TWO_FOLD_COST_SEX 0 # 1 = only one recombined offspring is born.
+ # 2 = both offspring are born
+SAME_LENGTH_SEX 0 # 0 = recombine with any genome
+ # 1 = only recombine w/ same length
+
+### DIVIDE_GROUP ###
+# Divide Restrictions
+CHILD_SIZE_RANGE 2.0 # Maximal differential between child and parent sizes.
+MIN_COPIED_LINES 0.5 # Code fraction which must be copied before divide.
+MIN_EXE_LINES 0.5 # Code fraction which must be executed before divide.
+REQUIRE_ALLOCATE 1 # (Original CPU Only) Require allocate before divide?
+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.
+REQUIRED_BONUS 0 # The bonus that an organism must accumulate to divide.
+
+### MUTATION_GROUP ###
+# Mutations
+POINT_MUT_PROB 0.0 # Mutation rate (per-location per update)
+COPY_MUT_PROB 0.0075 # Mutation rate (per copy)
+INS_MUT_PROB 0.0 # Insertion rate (per site, applied on divide)
+DEL_MUT_PROB 0.0 # Deletion rate (per site, applied on divide)
+DIV_MUT_PROB 0.0 # Mutation rate (per site, applied on divide)
+DIVIDE_MUT_PROB 0.0 # Mutation rate (per divide)
+DIVIDE_INS_PROB 0.05 # Insertion rate (per divide)
+DIVIDE_DEL_PROB 0.05 # Deletion rate (per divide)
+PARENT_MUT_PROB 0.0 # Per-site, in parent, on divide
+SPECIAL_MUT_LINE -1 # If this is >= 0, ONLY this line is mutated
+INJECT_INS_PROB 0.0 # Insertion rate (per site, applied on inject)
+INJECT_DEL_PROB 0.0 # Deletion rate (per site, applied on inject)
+INJECT_MUT_PROB 0.0 # Mutation rate (per site, applied on inject)
+
+### REVERSION_GROUP ###
+# Mutation Reversion
+# These slow down avida a lot, and should be set to 0.0 normally.
+REVERT_FATAL 0.0 # Should any mutations be reverted on birth?
+REVERT_DETRIMENTAL 0.0 # 0.0 to 1.0; Probability of reversion.
+REVERT_NEUTRAL 0.0 #
+REVERT_BENEFICIAL 0.0 #
+STERILIZE_FATAL 0.0 # Should any mutations clear (kill) the organism?
+STERILIZE_DETRIMENTAL 0.0 #
+STERILIZE_NEUTRAL 0.0 #
+STERILIZE_BENEFICIAL 0.0 #
+FAIL_IMPLICIT 0 # Should copies that failed *not* due to mutations
+ # be eliminated?
+NEUTRAL_MAX 0.0 # The percent benifical change from parent fitness to be considered neutral.
+NEUTRAL_MIN 0.0 # The percent deleterious change from parent fitness to be considered neutral.
+
+### TIME_GROUP ###
+# Time Slicing
+AVE_TIME_SLICE 30 # Ave number of insts per org per update
+SLICING_METHOD 1 # 0 = CONSTANT: all organisms get default...
+ # 1 = PROBABILISTIC: Run _prob_ proportional to merit.
+ # 2 = INTEGRATED: Perfectly integrated deterministic.
+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
+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.
+
+### GENEOLOGY_GROUP ###
+# Geneology
+TRACK_MAIN_LINEAGE 1 # Keep all ancestors of the active population?
+ # 0=no, 1=yes, 2=yes,w/sexual population
+THRESHOLD 3 # Number of organisms in a genotype needed for it
+ # to be considered viable.
+GENOTYPE_PRINT 0 # 0/1 (off/on) Print out all threshold genotypes?
+GENOTYPE_PRINT_DOM 0 # Print out a genotype if it stays dominant for
+ # this many updates. (0 = off)
+SPECIES_THRESHOLD 2 # max failure count for organisms to be same species
+SPECIES_RECORDING 0 # 1 = full, 2 = limited search (parent only)
+SPECIES_PRINT 0 # 0/1 (off/on) Print out all species?
+TEST_CPU_TIME_MOD 20 # Time allocated in test CPUs (multiple of length)
+
+### LOG_GROUP ###
+# Log Files
+LOG_CREATURES 0 # 0/1 (off/on) toggle to print file.
+LOG_GENOTYPES 0 # 0 = off, 1 = print ALL, 2 = print threshold ONLY.
+LOG_THRESHOLD 0 # 0/1 (off/on) toggle to print file.
+LOG_SPECIES 0 # 0/1 (off/on) toggle to print file.
+
+### LINEAGE_GROUP ###
+# Lineage
+# NOTE: This should probably be called "Clade"
+# This one can slow down avida a lot. It is used to get an idea of how
+# often an advantageous mutation arises, and where it goes afterwards.
+# Lineage creation options are. Works only when LOG_LINEAGES is set to 1.
+# 0 = manual creation (on inject, use successive integers as lineage labels).
+# 1 = when a child's (potential) fitness is higher than that of its parent.
+# 2 = when a child's (potential) fitness is higher than max in population.
+# 3 = when a child's (potential) fitness is higher than max in dom. lineage
+# *and* the child is in the dominant lineage, or (2)
+# 4 = when a child's (potential) fitness is higher than max in dom. lineage
+# (and that of its own lineage)
+# 5 = same as child's (potential) fitness is higher than that of the
+# currently dominant organism, and also than that of any organism
+# currently in the same lineage.
+# 6 = when a child's (potential) fitness is higher than any organism
+# currently in the same lineage.
+# 7 = when a child's (potential) fitness is higher than that of any
+# organism in its line of descent
+LOG_LINEAGES 0 #
+LINEAGE_CREATION_METHOD 0 #
+
+### ORGANISM_NETWORK_GROUP ###
+# Organism Network Communication
+NET_ENABLED 0 # Enable Network Communication Support
+NET_DROP_PROB 0.0 # Message drop rate
+NET_MUT_PROB 0.0 # Message corruption probability
+NET_MUT_TYPE 0 # Type of message corruption. 0 = Random Single Bit, 1 = Always Flip Last
+NET_STYLE 0 # Communication Style. 0 = Random Next, 1 = Receiver Facing
+
+### BUY_SELL_GROUP ###
+# Buying and Selling Parameters
+SAVE_RECEIVED 0 # Enable storage of all inputs bought from other orgs
+BUY_PRICE 0 # price offered by organisms attempting to buy
+SELL_PRICE 0 # price offered by organisms attempting to sell
+
+### ANALYZE_GROUP ###
+# Analysis Settings
+MT_CONCURRENCY 1 # Number of concurrent analyze threads
+ANALYZE_OPTION_1 # String variable accessible from analysis scripts
+ANALYZE_OPTION_2 # String variable accessible from analysis scripts
Added: development/tests/default_classic_500u/config/default-classic.org
===================================================================
--- development/tests/default_classic_500u/config/default-classic.org (rev 0)
+++ development/tests/default_classic_500u/config/default-classic.org 2007-04-17 21:43:37 UTC (rev 1480)
@@ -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 #
Added: development/tests/default_classic_500u/config/environment.cfg
===================================================================
--- development/tests/default_classic_500u/config/environment.cfg (rev 0)
+++ development/tests/default_classic_500u/config/environment.cfg 2007-04-17 21:43:37 UTC (rev 1480)
@@ -0,0 +1,9 @@
+REACTION NOT not process:value=1.0:type=pow requisite:max_count=1
+REACTION NAND nand process:value=1.0:type=pow requisite:max_count=1
+REACTION AND and process:value=2.0:type=pow requisite:max_count=1
+REACTION ORN orn process:value=2.0:type=pow requisite:max_count=1
+REACTION OR or process:value=3.0:type=pow requisite:max_count=1
+REACTION ANDN andn process:value=3.0:type=pow requisite:max_count=1
+REACTION NOR nor process:value=4.0:type=pow requisite:max_count=1
+REACTION XOR xor process:value=4.0:type=pow requisite:max_count=1
+REACTION EQU equ process:value=5.0:type=pow requisite:max_count=1
Added: development/tests/default_classic_500u/config/events.cfg
===================================================================
--- development/tests/default_classic_500u/config/events.cfg (rev 0)
+++ development/tests/default_classic_500u/config/events.cfg 2007-04-17 21:43:37 UTC (rev 1480)
@@ -0,0 +1,14 @@
+# Print all of the standard data files...
+u 0:10:end PrintAverageData # Save info about they average genotypes
+u 0:10:end PrintDominantData # Save info about most abundant genotypes
+u 0:10:end PrintStatsData # Collect satistics about entire pop.
+u 0:10:end PrintCountData # Count organisms, genotypes, species, etc.
+u 0:10:end PrintTasksData # Save organisms counts for each task.
+u 0:10:end PrintTimeData # Track time conversion (generations, etc.)
+u 0:10:end PrintResourceData # Track resource abundance.
+u 0:50:end PrintDominantGenotype # Save the most abundant genotypes
+u 0:10:end PrintTasksExeData # Num. times tasks have been executed.
+u 0:10:end PrintTasksQualData # Task quality information
+
+# Setup the exit time and full population data collection.
+u 500 exit # exit
Added: development/tests/default_classic_500u/config/instset-classic.cfg
===================================================================
--- development/tests/default_classic_500u/config/instset-classic.cfg (rev 0)
+++ development/tests/default_classic_500u/config/instset-classic.cfg 2007-04-17 21:43:37 UTC (rev 1480)
@@ -0,0 +1,28 @@
+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?
+
Added: development/tests/default_classic_500u/expected/data/archive/099-aaadi.org
===================================================================
--- development/tests/default_classic_500u/expected/data/archive/099-aaadi.org (rev 0)
+++ development/tests/default_classic_500u/expected/data/archive/099-aaadi.org 2007-04-17 21:43:37 UTC (rev 1480)
@@ -0,0 +1,133 @@
+# Tue Apr 17 21:46:34 2007
+# Filename........: archive/099-aaadi.org
+# Update Output...: 450
+# Is Viable.......: 1
+# Repro Cycle Size: 0
+# Depth to Viable.: 0
+# Update Created..: 360
+# Genotype ID.....: 4861
+# Parent Gen ID...: 3808
+# Tree Depth......: 7
+# Parent Distance.: 1
+#
+# Generation: 0
+# Merit...........: 96.000000
+# Gestation Time..: 381
+# Fitness.........: 0.251969
+# Errors..........: 2
+# Genome Size.....: 99
+# Copied Size.....: 99
+# Executed Size...: 96
+# Offspring.......: SELF
+#
+# Tasks Performed:
+# not 0 (0.000000)
+# nand 0 (0.000000)
+# and 0 (0.000000)
+# orn 0 (0.000000)
+# or 0 (0.000000)
+# andn 0 (0.000000)
+# nor 0 (0.000000)
+# xor 0 (0.000000)
+# equ 0 (0.000000)
+
+
+h-alloc
+h-search
+nop-C
+nop-A
+mov-head
+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
+shift-r
+nop-C
+nop-C
+set-flow
+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-divide
+nop-C
+nop-C
+nop-C
+nop-C
+h-divide
+nop-C
+nop-C
+nop-C
+if-less
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-A
+if-less
+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
+h-copy
+if-label
+nop-C
+nop-A
+h-divide
+mov-head
+nop-A
+nop-B
Added: development/tests/default_classic_500u/expected/data/archive/100-aaaaa.org
===================================================================
--- development/tests/default_classic_500u/expected/data/archive/100-aaaaa.org (rev 0)
+++ development/tests/default_classic_500u/expected/data/archive/100-aaaaa.org 2007-04-17 21:43:37 UTC (rev 1480)
@@ -0,0 +1,134 @@
+# Tue Apr 17 21:46:14 2007
+# Filename........: archive/100-aaaaa.org
+# Update Output...: 250
+# Is Viable.......: 1
+# Repro Cycle Size: 0
+# Depth to Viable.: 0
+# Update Created..: -1
+# Genotype ID.....: 1
+# Parent Gen ID...: -1
+# Tree Depth......: 0
+# Parent Distance.: -1
+#
+# Generation: 0
+# Merit...........: 97.000000
+# Gestation Time..: 389
+# Fitness.........: 0.249357
+# Errors..........: 0
+# Genome Size.....: 100
+# Copied Size.....: 100
+# Executed Size...: 97
+# Offspring.......: SELF
+#
+# Tasks Performed:
+# not 0 (0.000000)
+# nand 0 (0.000000)
+# and 0 (0.000000)
+# orn 0 (0.000000)
+# or 0 (0.000000)
+# andn 0 (0.000000)
+# nor 0 (0.000000)
+# xor 0 (0.000000)
+# equ 0 (0.000000)
+
+
+h-alloc
+h-search
+nop-C
+nop-A
+mov-head
+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
+h-copy
+if-label
+nop-C
+nop-A
+h-divide
+mov-head
+nop-A
+nop-B
Added: development/tests/default_classic_500u/expected/data/archive/100-aaadg.org
===================================================================
--- development/tests/default_classic_500u/expected/data/archive/100-aaadg.org (rev 0)
+++ development/tests/default_classic_500u/expected/data/archive/100-aaadg.org 2007-04-17 21:43:37 UTC (rev 1480)
@@ -0,0 +1,134 @@
+# Tue Apr 17 21:46:20 2007
+# Filename........: archive/100-aaadg.org
+# Update Output...: 350
+# Is Viable.......: 1
+# Repro Cycle Size: 0
+# Depth to Viable.: 0
+# Update Created..: 254
+# Genotype ID.....: 1487
+# Parent Gen ID...: 555
+# Tree Depth......: 9
+# Parent Distance.: 3
+#
+# Generation: 0
+# Merit...........: 98.000000
+# Gestation Time..: 386
+# Fitness.........: 0.253886
+# Errors..........: 2
+# Genome Size.....: 100
+# Copied Size.....: 100
+# Executed Size...: 98
+# Offspring.......: SELF
+#
+# Tasks Performed:
+# not 0 (0.000000)
+# nand 0 (0.000000)
+# and 0 (0.000000)
+# orn 0 (0.000000)
+# or 0 (0.000000)
+# andn 0 (0.000000)
+# nor 0 (0.000000)
+# xor 0 (0.000000)
+# equ 0 (0.000000)
+
+
+h-alloc
+h-search
+set-flow
+nop-A
+mov-head
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+h-alloc
+dec
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+set-flow
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+if-n-equ
+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-A
+pop
+pop
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+h-alloc
+nop-C
+nop-A
+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
+h-copy
+if-label
+nop-C
+nop-A
+h-divide
+mov-head
+nop-A
+nop-B
Added: development/tests/default_classic_500u/expected/data/archive/100-aaags.org
===================================================================
--- development/tests/default_classic_500u/expected/data/archive/100-aaags.org (rev 0)
+++ development/tests/default_classic_500u/expected/data/archive/100-aaags.org 2007-04-17 21:43:37 UTC (rev 1480)
@@ -0,0 +1,134 @@
+# Tue Apr 17 21:46:26 2007
+# Filename........: archive/100-aaags.org
+# Update Output...: 400
+# Is Viable.......: 1
+# Repro Cycle Size: 0
+# Depth to Viable.: 0
+# Update Created..: 310
+# Genotype ID.....: 2987
+# Parent Gen ID...: 2584
+# Tree Depth......: 11
+# Parent Distance.: 1
+#
+# Generation: 0
+# Merit...........: 97.000000
+# Gestation Time..: 379
+# Fitness.........: 0.255937
+# Errors..........: 1
+# Genome Size.....: 100
+# Copied Size.....: 100
+# Executed Size...: 97
+# Offspring.......: SELF
+#
+# Tasks Performed:
+# not 0 (0.000000)
+# nand 0 (0.000000)
+# and 0 (0.000000)
+# orn 0 (0.000000)
+# or 0 (0.000000)
+# andn 0 (0.000000)
+# nor 0 (0.000000)
+# xor 0 (0.000000)
+# equ 0 (0.000000)
+
+
+h-alloc
+h-search
+nop-C
+nop-A
+mov-head
+nop-C
+nop-C
+nop-C
+swap
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+mov-head
+nop-C
+if-n-equ
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+if-n-equ
+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
+get-head
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+swap
+nop-C
+get-head
+if-less
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+add
+nop-C
+nop-C
+set-flow
+nop-C
+nop-C
+nop-C
+h-search
+shift-l
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+h-alloc
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+h-search
+h-copy
+if-label
+nop-C
+nop-A
+h-divide
+mov-head
+nop-A
+nop-B
Added: development/tests/default_classic_500u/expected/data/archive/101-aaacb.org
===================================================================
--- development/tests/default_classic_500u/expected/data/archive/101-aaacb.org (rev 0)
+++ development/tests/default_classic_500u/expected/data/archive/101-aaacb.org 2007-04-17 21:43:37 UTC (rev 1480)
@@ -0,0 +1,135 @@
+# Tue Apr 17 21:46:45 2007
+# Filename........: archive/101-aaacb.org
+# Update Output...: 500
+# Is Viable.......: 1
+# Repro Cycle Size: 0
+# Depth to Viable.: 0
+# Update Created..: 356
+# Genotype ID.....: 4671
+# Parent Gen ID...: 3176
+# Tree Depth......: 11
+# Parent Distance.: 3
+#
+# Generation: 0
+# Merit...........: 98.000000
+# Gestation Time..: 382
+# Fitness.........: 0.256545
+# Errors..........: 2
+# Genome Size.....: 101
+# Copied Size.....: 101
+# Executed Size...: 98
+# Offspring.......: SELF
+#
+# Tasks Performed:
+# not 0 (0.000000)
+# nand 0 (0.000000)
+# and 0 (0.000000)
+# orn 0 (0.000000)
+# or 0 (0.000000)
+# andn 0 (0.000000)
+# nor 0 (0.000000)
+# xor 0 (0.000000)
+# equ 0 (0.000000)
+
+
+h-alloc
+h-search
+nop-C
+nop-A
+mov-head
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+h-alloc
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+IO
+nop-C
+nop-C
+nop-C
+add
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+shift-l
+nop-C
+inc
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-B
+swap-stk
+pop
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+mov-head
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+jmp-head
+nop-C
+nop-C
+nop-C
+nop-C
+h-copy
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-A
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+nop-C
+h-divide
+nop-C
+nand
+if-less
+nop-C
+nop-C
+nop-C
+nop-C
+h-search
+h-copy
+if-label
+nop-C
+nop-A
+h-divide
+mov-head
+nop-A
+nop-B
Added: development/tests/default_classic_500u/expected/data/average.dat
===================================================================
--- development/tests/default_classic_500u/expected/data/average.dat (rev 0)
+++ development/tests/default_classic_500u/expected/data/average.dat 2007-04-17 21:43:37 UTC (rev 1480)
@@ -0,0 +1,70 @@
+# Avida Average Data
+# Tue Apr 17 21:46:13 2007
+# 1: Update
+# 2: Merit
+# 3: Gestation Time
+# 4: Fitness
+# 5: Repro Rate?
+# 6: Size
+# 7: Copied Size
+# 8: Executed Size
+# 9: Abundance
+# 10: Proportion of organisms that gave birth in this update
+# 11: Proportion of Breed True Organisms
+# 12: Genotype Depth
+# 13: Generation
+# 14: Neutral Metric
+# 15: Lineage Label
+# 16: True Replication Rate (based on births/update, time-averaged)
+
+0 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 1.000000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000
+10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+20 97 389 0.249357 0 100 100 97 0 0 0 0 1 1.75617 0 0
+30 97 389 0.249357 0 100 100 97 2 0 0 0.25 2 1.29775 0 0
+40 97 388.75 0.249518 0 100 100 97 1.6 0.125 0 0.625 3 1.26009 0 0
+50 97 388.75 0.249518 0 100 100 97 1.6 0 0 0.625 3 1.26009 0 0
+60 97 388.6 0.249615 0 99.9333 100 97 1.5 0 0 0.933333 3.93333 1.04638 0 0
+70 97 388.36 0.24977 0 99.96 100 97 1.38889 0 0 1.28 4.84 0.931187 0 0
+80 96.9474 387.737 0.250037 0 99.9474 99.9737 96.9474 1.52 0.105263 0.105263 1.5 5.92105 0.825646 0 0
+90 96.9556 387.489 0.250219 0 99.9778 99.9778 96.9556 1.60714 0.177778 0.0888889 1.68889 6.37778 0.717847 0 0
+100 95.2759 385.483 0.246665 0 99.9483 99.1034 95.2759 1.52632 0.0172414 0 1.91379 6.93103 1.18632 0 0
+110 94.125 382.7 0.245094 0 99.875 98.6875 94.125 1.53846 0 0 2.275 7.9375 1.38818 0 0
+120 94.5185 384.546 0.245507 0 99.9167 98.5093 94.5185 1.42105 0.0462963 0 2.67593 8.87037 1.77853 0 0
+130 93.7953 384.228 0.243754 0 99.9606 98.315 93.7953 1.49412 0.110236 0.0472441 2.86614 9.62205 1.82765 0 0
+140 92.5974 382.292 0.241478 0 99.9026 97.5844 92.5974 1.49515 0.0844156 0.025974 3.07792 10.1494 2.2299 0 0
+150 92.9784 381.627 0.242783 0 99.9297 98.2486 92.9784 1.45669 0.00540541 0.00540541 3.27568 10.9135 2.30072 0 0
+160 94.0136 382.778 0.244972 0 100.041 98.5747 94.0136 1.44444 0.00452489 0.00452489 3.57014 11.8597 2.38648 0 0
+170 93.9887 382.249 0.245096 0 100.581 98.5472 93.9887 1.44809 0.0415094 0.0188679 3.88679 12.8075 2.27096 0 0
+180 94.5034 383.268 0.245936 0 101.027 98.8188 94.5034 1.43269 0.0872483 0.0234899 4.0906 13.5235 2.21653 0 0
+190 93.5693 381.861 0.244123 0 101.015 98.7078 93.5693 1.3551 0.0903614 0.0361446 4.33133 14.1777 2.53638 0 0
+200 93.879 383.228 0.244182 0 101.39 98.8763 93.879 1.30986 0.016129 0.00268817 4.61559 14.879 2.53024 0 0
+210 94.6737 386.294 0.24498 0 102.089 99.683 95.1352 1.26923 0.018648 0.002331 5.01399 15.7739 2.76623 0 0
+220 95.4367 387.194 0.24649 0 101.955 100.502 95.8204 1.3649 0.0612245 0.0265306 5.39592 16.7163 2.79418 0 0
+230 96.0221 387.892 0.247628 0 101.733 100.693 96.2077 1.34988 0.0790441 0.0147059 5.62316 17.4577 2.43777 0 0
+240 95.1282 385.499 0.24646 0 101.769 100.137 95.3002 1.31486 0.06914 0.0252951 5.84823 18.1062 2.57149 0 0
+250 95.4214 386.557 0.246591 0 102.637 100.327 95.5771 1.31263 0.0198473 0.00763359 6.15725 18.8427 2.65235 0 0
+260 95.8103 390.566 0.246049 0 104.414 101.032 96.4951 1.30839 0.013947 0.0041841 6.51604 19.7476 2.74319 0 0
+270 96.4822 392.522 0.246883 0 105.602 101.482 97.3617 1.28758 0.0621827 0.0164975 6.87437 20.6104 2.72301 0 0
+280 96.3692 391.158 0.247477 0 105.125 101.419 97.1983 1.29969 0.0573477 0.0215054 7.08961 21.313 2.28006 0 0
+290 95.9548 389.6 0.246827 0 104.721 100.949 96.6042 1.2847 0.0595369 0.0264609 7.3914 22.0673 2.27658 0 0
+300 96.5178 393.675 0.246607 0 106.178 101.904 97.9013 1.29003 0.0539166 0.0264496 7.74568 22.8159 2.35565 0 0
+310 96.9269 394.82 0.247028 0 106.775 102.447 98.3491 1.30909 0.0324074 0.00833333 8.10833 23.6574 2.412 0 0
+320 96.9217 395.169 0.246942 0 107.099 102.72 98.4896 1.27494 0.0565217 0.0182609 8.41652 24.4278 2.33322 0 0
+330 96.8328 395.003 0.246642 0 107.357 102.816 98.2977 1.27708 0.0440457 0.0171289 8.68842 25.1436 2.27207 0 0
+340 97.2157 396.424 0.246619 0 107.004 102.993 98.5633 1.29773 0.0373476 0.0205793 9.0343 25.9162 2.41169 0 0
+350 97.7678 398.075 0.247128 0 107.313 103.465 99.0392 1.29401 0.0519943 0.0185185 9.42735 26.7493 2.4727 0 0
+360 97.7503 398.221 0.247063 0 107.222 103.562 99.0094 1.31621 0.0572005 0.0188425 9.6568 27.531 2.45966 0 0
+370 97.9341 396.815 0.247879 0 106.576 103.472 98.7759 1.31261 0.0454545 0.0121639 9.97375 28.2548 2.41733 0 0
+380 97.7934 396.934 0.247287 0 106.717 103.586 98.6018 1.29644 0.0447761 0.0214925 10.3325 29.0322 2.64525 0 0
+390 98.2811 398.739 0.247417 0 106.75 103.973 99.0414 1.28212 0.0419933 0.0100784 10.696 29.8191 2.96575 0 0
+400 98.3473 400.307 0.246983 0 107.53 104.39 99.241 1.26941 0.0617021 0.0212766 10.9872 30.6202 3.06784 0 0
+410 98.3208 397.487 0.247974 0 106.666 104.136 98.8557 1.2435 0.0591535 0.0198878 11.2611 31.3366 3.0582 0 0
+420 98.4207 397.949 0.247881 0 106.648 104.286 98.9069 1.2672 0.0373243 0.0164809 11.5846 32.0737 3.22234 0 0
+430 98.5579 399.792 0.247231 0 106.987 104.53 99.227 1.27554 0.0279176 0.00823799 11.9794 32.9021 3.4473 0 0
+440 98.8512 400.174 0.247774 0 107.002 104.672 99.4893 1.26876 0.0604611 0.0239234 12.2845 33.7077 3.42905 0 0
+450 98.7893 401.398 0.247317 0 107.345 104.926 99.5279 1.28587 0.0557868 0.0179017 12.4759 34.4147 3.59769 0 0
+460 98.6928 401.245 0.247085 0 107.476 105.005 99.4799 1.27434 0.0378034 0.0123359 12.7382 35.1508 3.57902 0 0
+470 98.882 400.836 0.247532 0 107.453 104.972 99.4387 1.27172 0.0337761 0.0140417 13.071 35.9503 3.83515 0 0
+480 99.1266 401.099 0.247831 0 107.585 105.162 99.6964 1.27406 0.0478417 0.0154676 13.3511 36.7558 3.82427 0 0
+490 99.2097 400.927 0.248071 0 107.75 105.241 99.6394 1.28673 0.0647059 0.0242215 13.6498 37.4969 3.76682 0 0
+500 99.128 400.87 0.247816 0 107.351 105.207 99.5542 1.28681 0.0479497 0.0162037 13.9306 38.205 3.6764 0 0
Added: development/tests/default_classic_500u/expected/data/count.dat
===================================================================
--- development/tests/default_classic_500u/expected/data/count.dat (rev 0)
+++ development/tests/default_classic_500u/expected/data/count.dat 2007-04-17 21:43:37 UTC (rev 1480)
@@ -0,0 +1,70 @@
+# Avida count data
+# Tue Apr 17 21:46:13 2007
+# 1: update
+# 2: number of insts executed this update
+# 3: number of organisms
+# 4: number of different genotypes
+# 5: number of different threshold genotypes
+# 6: number of different species
+# 7: number of different threshold species
+# 8: number of different lineages
+# 9: number of births in this update
+# 10: number of deaths in this update
+# 11: number of breed true
+# 12: number of breed true organisms?
+# 13: number of no-birth organisms
+# 14: number of single-threaded organisms
+# 15: number of multi-threaded organisms
+# 16: number of modified organisms
+
+0 30 1 1 1 0 0 0 1 0 1 1 1 1 0 0
+10 30 1 1 1 0 0 0 0 0 0 1 1 1 0 0
+20 60 2 1 1 0 0 0 0 0 0 2 1 2 0 0
+30 120 4 2 1 0 0 0 0 0 0 3 2 4 0 0
+40 210 8 5 1 0 0 0 1 0 0 4 4 8 0 0
+50 240 8 5 1 0 0 0 0 0 0 4 4 8 0 0
+60 450 15 10 1 0 0 0 0 0 0 6 8 15 0 0
+70 750 25 18 1 0 0 0 0 0 0 9 15 25 0 0
+80 1050 38 25 2 0 0 0 4 1 4 17 21 38 0 0
+90 1200 45 28 4 0 0 0 8 3 4 22 25 45 0 0
+100 1710 58 38 5 0 0 0 1 0 0 25 31 58 0 0
+110 2400 80 52 8 0 0 0 0 0 0 35 46 80 0 0
+120 3120 108 76 11 0 0 0 5 1 0 44 60 108 0 0
+130 3750 127 85 14 0 0 0 14 12 6 58 76 127 0 0
+140 4500 154 103 19 0 0 0 13 9 4 68 85 154 0 0
+150 5550 185 127 20 0 0 0 1 1 1 80 101 185 0 0
+160 6630 221 153 22 0 0 0 1 1 1 92 120 221 0 0
+170 7800 265 183 29 0 0 0 11 6 5 105 141 265 0 0
+180 8700 298 208 36 0 0 0 26 18 7 119 167 298 0 0
+190 9750 332 245 42 0 0 0 30 23 12 122 185 332 0 0
+200 11130 372 284 47 0 0 0 6 5 1 127 205 372 0 0
+210 12780 429 338 56 0 0 0 8 5 1 137 232 429 0 0
+220 14610 490 359 69 0 0 0 30 27 13 172 268 490 0 0
+230 15960 544 403 77 0 0 0 43 31 8 186 295 544 0 0
+240 17580 593 451 82 0 0 0 41 34 15 199 329 593 0 0
+250 19560 655 499 91 0 0 0 13 10 5 225 373 655 0 0
+260 21480 717 548 112 0 0 0 10 9 3 260 412 717 0 0
+270 23310 788 612 125 0 0 0 49 38 13 281 447 788 0 0
+280 24990 837 644 135 0 0 0 48 44 18 305 467 837 0 0
+290 26880 907 706 149 0 0 0 54 43 24 328 520 907 0 0
+300 29340 983 762 164 0 0 0 53 48 26 336 548 983 0 0
+310 32280 1080 825 182 0 0 0 35 31 9 366 604 1080 0 0
+320 34170 1150 902 202 0 0 0 65 54 21 386 644 1150 0 0
+330 36510 1226 960 215 0 0 0 54 45 21 408 682 1226 0 0
+340 39300 1312 1011 236 0 0 0 49 47 27 456 731 1312 0 0
+350 41820 1404 1085 267 0 0 0 73 63 26 475 789 1404 0 0
+360 44280 1486 1129 286 0 0 0 85 75 28 528 829 1486 0 0
+370 46590 1562 1190 302 0 0 0 71 62 19 539 880 1562 0 0
+380 50070 1675 1292 325 0 0 0 75 69 36 579 947 1675 0 0
+390 53370 1786 1393 344 0 0 0 75 68 18 610 1017 1786 0 0
+400 55890 1880 1481 365 0 0 0 116 99 40 631 1075 1880 0 0
+410 58590 1961 1577 388 0 0 0 116 108 39 632 1115 1961 0 0
+420 61680 2063 1628 413 0 0 0 77 70 34 680 1201 2063 0 0
+430 65310 2185 1713 443 0 0 0 61 53 18 736 1253 2185 0 0
+440 68520 2299 1812 470 0 0 0 139 124 55 792 1288 2299 0 0
+450 71580 2402 1868 494 0 0 0 134 118 43 848 1357 2402 0 0
+460 75120 2513 1972 534 0 0 0 95 86 31 879 1409 2513 0 0
+470 78840 2635 2072 560 0 0 0 89 82 37 915 1482 2635 0 0
+480 82920 2780 2182 584 0 0 0 133 117 43 970 1525 2780 0 0
+490 86250 2890 2246 622 0 0 0 187 172 70 1032 1630 2890 0 0
+500 90450 3024 2350 661 0 0 0 145 136 49 1092 1692 3024 0 0
Added: development/tests/default_classic_500u/expected/data/dominant.dat
===================================================================
--- development/tests/default_classic_500u/expected/data/dominant.dat (rev 0)
+++ development/tests/default_classic_500u/expected/data/dominant.dat 2007-04-17 21:43:37 UTC (rev 1480)
@@ -0,0 +1,70 @@
+# Avida Dominant Data
+# Tue Apr 17 21:46:13 2007
+# 1: Update
+# 2: Average Merit of the Dominant Genotype
+# 3: Average Gestation Time of the Dominant Genotype
+# 4: Average Fitness of the Dominant Genotype
+# 5: Repro Rate?
+# 6: Size of Dominant Genotype
+# 7: Copied Size of Dominant Genotype
+# 8: Executed Size of Dominant Genotype
+# 9: Abundance of Dominant Genotype
+# 10: Number of Births
+# 11: Number of Dominant Breed True?
+# 12: Dominant Gene Depth
+# 13: Dominant Breed In
+# 14: Max Fitness?
+# 15: Genotype ID of Dominant Genotype
+# 16: Name of the Dominant Genotype
+
+0 0.000000 0.000000 0.000000 0.000000 100 0.000000 0.000000 1 0 0 0 0 0.000000 1 100-aaaaa
+10 0 0 0 0 100 0 0 1 0 0 0 0 0 1 100-aaaaa
+20 0 0 0 0 100 0 0 2 0 0 0 0 0.249357 1 100-aaaaa
+30 97 389 0.249357 0.00257069 100 100 97 3 0 0 0 0 0.249357 1 100-aaaaa
+40 97 389 0.249357 0.00257069 100 100 97 4 0 0 0 0 0.25 1 100-aaaaa
+50 97 389 0.249357 0.00257069 100 100 97 4 0 0 0 0 0.25 1 100-aaaaa
+60 97 389 0.249357 0.00257069 100 100 97 5 0 0 0 0 0.250646 1 100-aaaaa
+70 97 389 0.249357 0.00257069 100 100 97 5 0 0 0 0 0.251295 1 100-aaaaa
+80 97 389 0.249357 0.00257069 100 100 97 7 0 0 0 0 0.252604 1 100-aaaaa
+90 97 389 0.249357 0.00257069 100 100 97 7 1 0 0 0 0.253264 1 100-aaaaa
+100 97 389 0.249357 0.00257069 100 100 97 8 0 0 0 0 0.253264 1 100-aaaaa
+110 97 389 0.249357 0.00257069 100 100 97 10 0 0 0 0 0.253264 1 100-aaaaa
+120 97 389 0.249357 0.00257069 100 100 97 7 0 0 0 0 0.253264 1 100-aaaaa
+130 97 389 0.249357 0.00257069 100 100 97 9 1 1 0 0 0.253968 1 100-aaaaa
+140 97 389 0.249357 0.00257069 100 100 97 7 2 0 0 0 0.253968 1 100-aaaaa
+150 97 389 0.249357 0.00257069 100 100 97 9 0 0 0 0 0.253968 1 100-aaaaa
+160 97 389 0.249357 0.00257069 100 100 97 9 0 0 0 0 0.255263 1 100-aaaaa
+170 97 389 0.249357 0.00257069 100 100 97 9 0 0 0 0 0.255263 1 100-aaaaa
+180 97 389 0.249357 0.00257069 100 100 97 10 2 1 0 0 0.255263 1 100-aaaaa
+190 87 375 0.232 0.00266667 100 100 87 10 0 0 4 0 0.255937 39 100-aaaaj
+200 97 389 0.249357 0.00257069 100 100 97 6 0 0 0 0 0.255937 1 100-aaaaa
+210 97 385 0.251948 0.0025974 100 100 97 5 0 0 4 0 0.256614 291 100-aaaba
+220 96 383 0.250653 0.00261097 99 99 96 7 0 0 4 0 0.257294 53 099-aaaab
+230 96 380 0.252632 0.00263158 99 99 96 7 0 0 6 0 0.257294 228 099-aaaai
+240 96 380 0.252632 0.00263158 99 99 96 8 2 2 6 0 0.257294 228 099-aaaai
+250 97 389 0.249357 0.00257069 100 100 97 9 0 0 0 0 0.257979 1 100-aaaaa
+260 97 389 0.249357 0.00257069 100 100 97 9 0 0 0 0 0.257979 1 100-aaaaa
+270 97 389 0.249357 0.00257069 100 100 97 12 0 0 0 0 0.259259 1 100-aaaaa
+280 97 389 0.249357 0.00257069 100 100 97 7 1 0 0 0 0.259259 1 100-aaaaa
+290 97 385 0.251948 0.0025974 100 100 97 7 0 0 4 0 0.259947 291 100-aaaba
+300 98 386 0.253886 0.00259067 100 100 98 8 0 0 9 0 0.259259 1487 100-aaadg
+310 98 386 0.253886 0.00259067 100 100 98 10 0 0 9 0 0.259259 1487 100-aaadg
+320 98 386 0.253886 0.00259067 100 100 98 8 0 0 9 0 0.260638 1487 100-aaadg
+330 98 386 0.253886 0.00259067 100 100 98 8 1 1 9 0 0.260638 1487 100-aaadg
+340 98 386 0.253886 0.00259067 100 100 98 9 2 1 9 0 0.260638 1487 100-aaadg
+350 98 386 0.253886 0.00259067 100 100 98 6 0 0 9 0 0.262032 1487 100-aaadg
+360 96 381 0.251969 0.00262467 99 99 96 7 0 0 5 0 0.260054 2182 099-aaaby
+370 94 372 0.252688 0.00268817 98 98.1111 94 7 0 0 7 0 0.260638 1654 098-aaaad
+380 94 372 0.252688 0.00268817 98 98.0833 94 7 0 0 7 0 0.261333 1654 098-aaaad
+390 96 378 0.253968 0.0026455 99 99 96 9 0 0 9 0 0.261333 2749 099-aaach
+400 97 379 0.255937 0.00263852 100 100 97 7 0 0 11 0 0.262032 2987 100-aaags
+410 87 366 0.237705 0.00273224 100 100 87 6 0 0 10 0 0.262162 4209 100-aaahk
+420 98 388 0.252577 0.00257732 101 101 98 6 0 0 13 0 0.262735 5014 101-aaacf
+430 98 388 0.252577 0.00257732 101 101 98 9 0 0 13 0 0.264151 5014 101-aaacf
+440 100 405 0.246914 0.00246914 107 106.909 100 8 1 0 11 0 0.264151 4258 107-aaaab
+450 96 381 0.251969 0.00262467 99 99 96 9 2 2 7 0 0.264151 4861 099-aaadi
+460 98 382 0.256545 0.0026178 101 101 98 9 0 0 11 0 0.264151 4671 101-aaacb
+470 98 382 0.256545 0.0026178 101 101 98 9 6 3 11 0 0.263441 4671 101-aaacb
+480 98 382 0.256545 0.0026178 101 101 98 8 0 0 11 0 0.263441 4671 101-aaacb
+490 98 382 0.256545 0.0026178 101 101 98 11 0 0 11 0 0.517333 4671 101-aaacb
+500 98 382 0.256545 0.0026178 101 101 98 12 0 0 11 0 0.517333 4671 101-aaacb
Added: development/tests/default_classic_500u/expected/data/resource.dat
===================================================================
--- development/tests/default_classic_500u/expected/data/resource.dat (rev 0)
+++ development/tests/default_classic_500u/expected/data/resource.dat 2007-04-17 21:43:37 UTC (rev 1480)
@@ -0,0 +1,57 @@
+# Avida resource data
+# Tue Apr 17 21:46:13 2007
+# First column gives the current update, all further columns give the quantity
+# of the particular resource at that update.
+# 1: Update
+
+0
+10
+20
+30
+40
+50
+60
+70
+80
+90
+100
+110
+120
+130
+140
+150
+160
+170
+180
+190
+200
+210
+220
+230
+240
+250
+260
+270
+280
+290
+300
+310
+320
+330
+340
+350
+360
+370
+380
+390
+400
+410
+420
+430
+440
+450
+460
+470
+480
+490
+500
Added: development/tests/default_classic_500u/expected/data/stats.dat
===================================================================
--- development/tests/default_classic_500u/expected/data/stats.dat (rev 0)
+++ development/tests/default_classic_500u/expected/data/stats.dat 2007-04-17 21:43:37 UTC (rev 1480)
@@ -0,0 +1,66 @@
+# Generic Statistics Data
+# Tue Apr 17 21:46:13 2007
+# 1: update
+# 2: average inferiority (energy)
+# 3: ave probability of any mutations in genome
+# 4: probability of any mutations in dom genome
+# 5: log(average fidelity)
+# 6: log(dominant fidelity)
+# 7: change in number of genotypes
+# 8: genotypic entropy
+# 9: species entropy
+# 10: depth of most reacent coalescence
+# 11: Total number of resamplings this generation
+# 12: Total number of organisms that failed to resample this generation
+
+0 0.000000 0.097500 0.562358 0.102587 0.826353 1 0.000000 0.000000 0 0 0
+10 0 0.0975 0.562358 0.102587 0.826353 0 0 0 0 0 0
+20 0 0.562358 0.562358 0.826353 0.826353 0 0 0 0 0 0
+30 0 0.562358 0.562358 0.826353 0.826353 0 0.562335 0 0 0 0
+40 -0.000644122 0.562358 0.562358 0.826353 0.826353 1 1.38629 0 0 0 0
+50 -0.000644122 0.562358 0.562358 0.826353 0.826353 0 1.38629 0 0 0 0
+60 -0.00103217 0.562146 0.562358 0.825871 0.826353 0 2.07915 0 0 0 0
+70 -0.00165239 0.562231 0.562358 0.826064 0.826353 0 2.73063 0 0 0 0
+80 -0.00272054 0.562191 0.562358 0.825972 0.826353 -1 3.00999 0 0 0 0
+90 -0.00345074 0.562287 0.562358 0.826192 0.826353 2 3.13021 0 0 0 0
+100 0.0108562 0.562194 0.562358 0.825979 0.826353 1 3.42998 0 0 0 0
+110 0.0172436 0.561962 0.562358 0.825449 0.826353 0 3.71406 0 0 0 0
+120 0.0155618 0.562094 0.562358 0.82575 0.826353 5 4.1589 0 0 0 0
+130 0.0227277 0.562233 0.562358 0.826068 0.826353 2 4.25109 0 0 0 0
+140 0.032109 0.562049 0.562358 0.825648 0.826353 5 4.44937 0 0 0 0
+150 0.0267208 0.562135 0.562358 0.825845 0.826353 -1 4.62964 0 0 0 0
+160 0.0177439 0.562487 0.562358 0.826648 0.826353 -1 4.83209 0 0 0 0
+170 0.0172373 0.564195 0.562358 0.830559 0.826353 2 5.02662 0 0 0 0
+180 0.0138164 0.565598 0.562358 0.833785 0.826353 8 5.1506 0 0 0 0
+190 -0.0509347 0.565561 0.562358 0.8337 0.826353 7 5.32126 0 0 0 0
+200 0.0209735 0.566738 0.562358 0.836412 0.826353 2 5.51909 0 0 0 0
+210 0.0280453 0.568924 0.562358 0.84147 0.826353 5 5.71551 0 0 0 0
+220 0.0167459 0.568507 0.559179 0.840504 0.819116 -1 5.74154 0 0 0 0
+230 0.0200052 0.567814 0.559179 0.838899 0.819116 17 5.85189 0 0 0 0
+240 0.024734 0.567925 0.559179 0.839157 0.819116 5 5.97173 0 0 0 0
+250 0.0111552 0.57063 0.562358 0.845436 0.826353 1 6.08868 0 0 0 0
+260 0.013356 0.576119 0.562358 0.858302 0.826353 0 6.18703 0 0 0 0
+270 0.00997113 0.579746 0.562358 0.866895 0.826353 4 6.29552 0 0 0 0
+280 0.00756862 0.578295 0.562358 0.86345 0.826353 3 6.34738 0 0 0 0
+290 0.0205346 0.577059 0.562358 0.860523 0.826353 11 6.44889 0 0 0 0
+300 0.0290896 0.581496 0.562358 0.871068 0.826353 0 6.53015 0 0 0 0
+310 0.0273818 0.5833 0.562358 0.875389 0.826353 1 6.5963 0 0 0 0
+320 0.0277338 0.584276 0.562358 0.877734 0.826353 9 6.69935 0 0 0 0
+330 0.0289484 0.585052 0.562358 0.879603 0.826353 8 6.76133 0 0 0 0
+340 0.0290389 0.583989 0.562358 0.877045 0.826353 -7 6.80589 0 0 0 0
+350 0.0269808 0.584918 0.562358 0.87928 0.826353 15 6.87603 0 0 0 0
+360 0.0196598 0.584646 0.559179 0.878624 0.819116 8 6.90941 0 0 0 0
+370 0.0192148 0.582698 0.555977 0.873945 0.811878 14 6.96112 0 0 0 0
+380 0.0216048 0.583125 0.555977 0.874969 0.811878 4 7.04279 0 0 0 0
+390 0.026135 0.583225 0.559179 0.87521 0.819116 22 7.13401 0 0 0 0
+400 0.035609 0.585572 0.562358 0.880855 0.826353 5 7.19454 0 0 0 0
+410 -0.0422945 0.582971 0.562358 0.8746 0.826353 7 7.27036 0 0 0 0
+420 0.0187701 0.582917 0.565514 0.87447 0.833591 6 7.29595 0 0 0 0
+430 0.0213961 0.583938 0.565514 0.876921 0.833591 10 7.34395 0 0 0 0
+440 -0.00348056 0.583984 0.583978 0.877033 0.877017 8 7.40223 0 0 0 0
+450 0.0186339 0.585016 0.559179 0.879515 0.819116 14 7.41883 0 0 0 0
+460 0.0375678 0.585407 0.565514 0.880459 0.833591 9 7.48036 0 0 0 0
+470 0.0357627 0.58534 0.565514 0.880297 0.833591 3 7.53554 0 0 0 0
+480 0.0345562 0.585735 0.565514 0.88125 0.833591 15 7.58794 0 0 0 0
+490 0.0335885 0.586231 0.565514 0.882446 0.833591 4 7.60969 0 0 0 0
+500 0.0346139 0.585032 0.565514 0.879554 0.833591 18 7.65405 0 0 0 0
Added: development/tests/default_classic_500u/expected/data/tasks.dat
===================================================================
--- development/tests/default_classic_500u/expected/data/tasks.dat (rev 0)
+++ development/tests/default_classic_500u/expected/data/tasks.dat 2007-04-17 21:43:37 UTC (rev 1480)
@@ -0,0 +1,66 @@
+# Avida tasks data
+# Tue Apr 17 21:46:13 2007
+# First column gives the current update, next columns give the number
+# of organisms that have the particular task as a component of their merit
+# 1: Update
+# 2: Not
+# 3: Nand
+# 4: And
+# 5: OrNot
+# 6: Or
+# 7: AndNot
+# 8: Nor
+# 9: Xor
+# 10: Equals
+
+0 0 0 0 0 0 0 0 0 0
+10 0 0 0 0 0 0 0 0 0
+20 0 0 0 0 0 0 0 0 0
+30 0 0 0 0 0 0 0 0 0
+40 0 0 0 0 0 0 0 0 0
+50 0 0 0 0 0 0 0 0 0
+60 0 0 0 0 0 0 0 0 0
+70 0 0 0 0 0 0 0 0 0
+80 0 0 0 0 0 0 0 0 0
+90 0 0 0 0 0 0 0 0 0
+100 0 0 0 0 0 0 0 0 0
+110 0 0 0 0 0 0 0 0 0
+120 0 0 0 0 0 0 0 0 0
+130 0 0 0 0 0 0 0 0 0
+140 0 0 0 0 0 0 0 0 0
+150 0 0 0 0 0 0 0 0 0
+160 0 0 0 0 0 0 0 0 0
+170 0 0 0 0 0 0 0 0 0
+180 0 0 0 0 0 0 0 0 0
+190 0 0 0 0 0 0 0 0 0
+200 0 0 0 0 0 0 0 0 0
+210 0 0 0 0 0 0 0 0 0
+220 0 0 0 0 0 0 0 0 0
+230 0 0 0 0 0 0 0 0 0
+240 0 0 0 0 0 0 0 0 0
+250 0 0 0 0 0 0 0 0 0
+260 0 0 0 0 0 0 0 0 0
+270 0 0 0 0 0 0 0 0 0
+280 0 0 0 0 0 0 0 0 0
+290 0 0 0 0 0 0 0 0 0
+300 0 0 0 0 0 0 0 0 0
+310 0 0 0 0 0 0 0 0 0
+320 0 0 0 0 0 0 0 0 0
+330 0 0 0 0 0 0 0 0 0
+340 0 0 0 0 0 0 0 0 0
+350 0 0 0 0 0 0 0 0 0
+360 0 0 0 0 0 0 0 0 0
+370 0 0 0 0 0 0 0 0 0
+380 0 0 0 0 0 0 0 0 0
+390 0 0 0 0 0 0 0 0 0
+400 0 0 0 0 0 0 0 0 0
+410 0 0 0 0 0 0 0 0 0
+420 0 0 0 0 0 0 0 0 0
+430 0 0 0 0 0 0 0 0 0
+440 0 0 0 0 0 0 0 0 0
+450 0 0 0 0 0 0 0 0 0
+460 0 0 0 0 0 0 0 0 0
+470 0 0 0 0 0 0 0 0 0
+480 0 0 0 0 0 0 0 0 0
+490 2 0 0 0 0 0 0 0 0
+500 2 0 0 0 0 0 0 0 0
Added: development/tests/default_classic_500u/expected/data/tasks_exe.dat
===================================================================
--- development/tests/default_classic_500u/expected/data/tasks_exe.dat (rev 0)
+++ development/tests/default_classic_500u/expected/data/tasks_exe.dat 2007-04-17 21:43:37 UTC (rev 1480)
@@ -0,0 +1,66 @@
+# Avida tasks execution data
+# Tue Apr 17 21:46:13 2007
+# First column gives the current update, all further columns give the number
+# of times the particular task has been executed this update.
+# 1: Update
+# 2: Not
+# 3: Nand
+# 4: And
+# 5: OrNot
+# 6: Or
+# 7: AndNot
+# 8: Nor
+# 9: Xor
+# 10: Equals
+
+0 0 0 0 0 0 0 0 0 0
+10 0 0 0 0 0 0 0 0 0
+20 0 0 0 0 0 0 0 0 0
+30 0 0 0 0 0 0 0 0 0
+40 0 0 0 0 0 0 0 0 0
+50 0 0 0 0 0 0 0 0 0
+60 0 0 0 0 0 0 0 0 0
+70 0 0 0 0 0 0 0 0 0
+80 0 0 0 0 0 0 0 0 0
+90 0 0 0 0 0 0 0 0 0
+100 0 0 0 0 0 0 0 0 0
+110 0 0 0 0 0 0 0 0 0
+120 0 0 0 0 0 0 0 0 0
+130 0 0 0 0 0 0 0 0 0
+140 0 0 0 0 0 0 0 0 0
+150 0 0 0 0 0 0 0 0 0
+160 0 0 0 0 0 0 0 0 0
+170 0 0 0 0 0 0 0 0 0
+180 0 0 0 0 0 0 0 0 0
+190 0 0 0 0 0 0 0 0 0
+200 0 0 0 0 0 0 0 0 0
+210 0 0 0 0 0 0 0 0 0
+220 0 0 0 0 0 0 0 0 0
+230 0 0 0 0 0 0 0 0 0
+240 0 0 0 0 0 0 0 0 0
+250 0 0 0 0 0 0 0 0 0
+260 0 0 0 0 0 0 0 0 0
+270 0 0 0 0 0 0 0 0 0
+280 0 0 0 0 0 0 0 0 0
+290 0 0 0 0 0 0 0 0 0
+300 0 0 0 0 0 0 0 0 0
+310 0 0 0 0 0 0 0 0 0
+320 0 0 0 0 0 0 0 0 0
+330 0 0 0 0 0 0 0 0 0
+340 0 0 0 0 0 0 0 0 0
+350 0 0 0 0 0 0 0 0 0
+360 0 0 0 0 0 0 0 0 0
+370 0 0 0 0 0 0 0 0 0
+380 0 0 0 0 0 0 0 0 0
+390 0 0 0 0 0 0 0 0 0
+400 0 0 0 0 0 0 0 0 0
+410 0 0 0 0 0 0 0 0 0
+420 0 0 0 0 0 0 0 0 0
+430 0 0 0 0 0 0 0 0 0
+440 0 0 0 0 0 0 0 0 0
+450 0 0 0 0 0 0 0 0 0
+460 0 0 0 0 0 0 0 0 0
+470 0 0 0 0 0 0 0 0 0
+480 0 0 0 0 0 0 0 0 0
+490 2 0 0 0 0 0 0 0 0
+500 2 0 0 0 0 0 0 0 0
Added: development/tests/default_classic_500u/expected/data/tasks_quality.dat
===================================================================
--- development/tests/default_classic_500u/expected/data/tasks_quality.dat (rev 0)
+++ development/tests/default_classic_500u/expected/data/tasks_quality.dat 2007-04-17 21:43:37 UTC (rev 1480)
@@ -0,0 +1,74 @@
+# Avida tasks quality data
+# Tue Apr 17 21:46:13 2007
+# First column gives the current update, rest give average and max task quality
+# 1: Update
+# 2: Not Average
+# 3: Not Max
+# 4: Nand Average
+# 5: Nand Max
+# 6: And Average
+# 7: And Max
+# 8: OrNot Average
+# 9: OrNot Max
+# 10: Or Average
+# 11: Or Max
+# 12: AndNot Average
+# 13: AndNot Max
+# 14: Nor Average
+# 15: Nor Max
+# 16: Xor Average
+# 17: Xor Max
+# 18: Equals Average
+# 19: Equals Max
+
+0 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
+10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+30 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+40 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+60 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+70 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+90 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+110 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+120 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+130 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+140 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+150 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+160 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+170 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+180 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+190 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+210 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+220 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+230 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+240 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+250 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+260 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+270 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+280 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+290 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+300 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+310 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+320 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+330 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+340 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+350 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+360 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+370 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+380 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+390 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+410 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+420 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+430 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+440 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+450 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+460 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+470 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+480 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+490 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+500 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Added: development/tests/default_classic_500u/expected/data/time.dat
===================================================================
--- development/tests/default_classic_500u/expected/data/time.dat (rev 0)
+++ development/tests/default_classic_500u/expected/data/time.dat 2007-04-17 21:43:37 UTC (rev 1480)
@@ -0,0 +1,58 @@
+# Avida time data
+# Tue Apr 17 21:46:13 2007
+# 1: update
+# 2: avida time
+# 3: average generation
+# 4: num_executed?
+
+0 0.000000 0.000000 30
+10 0 0 30
+20 0.0824742 1 60
+30 0.185567 2 120
+40 0.28866 3 210
+50 0.391753 3 240
+60 0.494845 3.93333 450
+70 0.597938 4.84 750
+80 0.701044 5.92105 1050
+90 0.804192 6.37778 1200
+100 0.907324 6.93103 1710
+110 1.01323 7.9375 2400
+120 1.11899 8.87037 3120
+130 1.22489 9.62205 3750
+140 1.33262 10.1494 4500
+150 1.44011 10.9135 5550
+160 1.54702 11.8597 6630
+170 1.65346 12.8075 7800
+180 1.75992 13.5235 8700
+190 1.86598 14.1777 9750
+200 1.97231 14.879 11130
+210 2.07823 15.7739 12780
+220 2.1838 16.7163 14610
+230 2.2886 17.4577 15960
+240 2.39281 18.1062 17580
+250 2.4974 18.8427 19560
+260 2.60194 19.7476 21480
+270 2.70618 20.6104 23310
+280 2.80987 21.313 24990
+290 2.91384 22.0673 26880
+300 3.01784 22.8159 29340
+310 3.12146 23.6574 32280
+320 3.22462 24.4278 34170
+330 3.32762 25.1436 36510
+340 3.43079 25.9162 39300
+350 3.53357 26.7493 41820
+360 3.63593 27.531 44280
+370 3.73798 28.2548 46590
+380 3.84007 29.0322 50070
+390 3.94215 29.8191 53370
+400 4.04407 30.6202 55890
+410 4.14565 31.3366 58590
+420 4.24721 32.0737 61680
+430 4.34886 32.9021 65310
+440 4.45027 33.7077 68520
+450 4.55155 34.4147 71580
+460 4.65276 35.1508 75120
+470 4.75396 35.9503 78840
+480 4.85493 36.7558 82920
+490 4.95568 37.4969 86250
+500 5.0565 38.205 90450
Added: development/tests/default_classic_500u/test_list
===================================================================
--- development/tests/default_classic_500u/test_list (rev 0)
+++ development/tests/default_classic_500u/test_list 2007-04-17 21:43:37 UTC (rev 1480)
@@ -0,0 +1,36 @@
+;--- Begin Test Configuration File (test_list) ---
+[main]
+; Command line arguments to pass to the application
+args =
+app = %(app)s ; Application path to test
+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 = yes ; Is this test a long test?
+
+[performance]
+enabled = yes ; Is this test a performance test?
+long = yes ; 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 ---
Modified: development/tests/midrun_classsic_30u/test_list
===================================================================
--- development/tests/midrun_classsic_30u/test_list 2007-04-17 19:14:42 UTC (rev 1479)
+++ development/tests/midrun_classsic_30u/test_list 2007-04-17 21:43:37 UTC (rev 1480)
@@ -15,7 +15,7 @@
long = no ; Is this test a long test?
[performance]
-enabled = no ; Is this test a performance test?
+enabled = yes ; 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
More information about the Avida-cvs
mailing list