[Avida-SVN] r2000 - in branches/energy/tests: . energy_deme_level_res energy_deme_level_res/config energy_deme_level_res/expected energy_deme_level_res/expected/data
beckma24 at myxo.css.msu.edu
beckma24 at myxo.css.msu.edu
Thu Aug 23 19:23:23 PDT 2007
Author: beckma24
Date: 2007-08-23 22:23:23 -0400 (Thu, 23 Aug 2007)
New Revision: 2000
Added:
branches/energy/tests/energy_deme_level_res/
branches/energy/tests/energy_deme_level_res/config/
branches/energy/tests/energy_deme_level_res/config/avida.cfg
branches/energy/tests/energy_deme_level_res/config/echo40.org
branches/energy/tests/energy_deme_level_res/config/environment-5tasks.cfg
branches/energy/tests/energy_deme_level_res/config/events-ConstResource.cfg
branches/energy/tests/energy_deme_level_res/config/instset-TEST.cfg
branches/energy/tests/energy_deme_level_res/expected/
branches/energy/tests/energy_deme_level_res/expected/data/
branches/energy/tests/energy_deme_level_res/expected/data/average.dat
branches/energy/tests/energy_deme_level_res/expected/data/count.dat
branches/energy/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m
branches/energy/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m
branches/energy/tests/energy_deme_level_res/expected/data/deme_donor.dat
branches/energy/tests/energy_deme_level_res/expected/data/deme_fitness.dat
branches/energy/tests/energy_deme_level_res/expected/data/deme_gest_time.dat
branches/energy/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat
branches/energy/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat
branches/energy/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat
branches/energy/tests/energy_deme_level_res/expected/data/deme_merit.dat
branches/energy/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat
branches/energy/tests/energy_deme_level_res/expected/data/deme_receiver.dat
branches/energy/tests/energy_deme_level_res/expected/data/deme_resources.dat
branches/energy/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m
branches/energy/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m
branches/energy/tests/energy_deme_level_res/expected/data/deme_task.dat
branches/energy/tests/energy_deme_level_res/expected/data/dominant.dat
branches/energy/tests/energy_deme_level_res/expected/data/instruction.dat
branches/energy/tests/energy_deme_level_res/expected/data/instruction_histogram.dat
branches/energy/tests/energy_deme_level_res/expected/data/resource.dat
branches/energy/tests/energy_deme_level_res/expected/data/sleep.dat
branches/energy/tests/energy_deme_level_res/expected/data/stats.dat
branches/energy/tests/energy_deme_level_res/expected/data/tasks.dat
branches/energy/tests/energy_deme_level_res/expected/data/tasks_exe.dat
branches/energy/tests/energy_deme_level_res/expected/data/time.dat
branches/energy/tests/energy_deme_level_res/test_list
Log:
Refreshing energy_deme_level_res test
Added: branches/energy/tests/energy_deme_level_res/config/avida.cfg
===================================================================
--- branches/energy/tests/energy_deme_level_res/config/avida.cfg (rev 0)
+++ branches/energy/tests/energy_deme_level_res/config/avida.cfg 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,233 @@
+#############################################################################
+# 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 4 # Control output verbosity
+
+### ARCH_GROUP ###
+# Architecture Variables
+WORLD_X 10 # Width of the Avida world
+WORLD_Y 20 # Height of the Avida world
+WORLD_GEOMETRY 2 # 1 = Bounded Grid
+ # 2 = Torus
+NUM_DEMES 2 # Number of independed groups in the population; 0=off
+RANDOM_SEED 7 # 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 instset-TEST.cfg # File containing instruction set
+EVENT_FILE events-ConstResource.cfg # File containing list of events during run
+ANALYZE_FILE analyze.cfg # File used for analysis mode
+ENVIRONMENT_FILE environment-5tasks.cfg # File that describes the environment
+START_CREATURE echo40.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)
+ # 9= Largest energy used in entire population
+ # 10= Largest energy used in neighborhood
+PREFER_EMPTY 1 # Give empty cells preference in offsping placement?
+DEATH_METHOD 0 # 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)
+META_COPY_MUT 0.0 # Prob. of copy mutation rate changing (per gen)
+META_STD_DEV 0.0 # Standard deviation of meta mutation size.
+MUT_RATE_SOURCE 1 # 1 = Mutation rates determined by environment.
+ # 2 = Mutation rates inherited from parent.
+
+### 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
+
+### ENERGY_GROUP ###
+# Energy Settings
+ENERGY_ENABLED 1 # Enable Energy Model. 0/1 (off/on)
+ENERGY_GIVEN_ON_INJECT 100000 # Energy given to organism upon injection.
+ENERGY_GIVEN_AT_BIRTH 0.0 # Energy given to offspring upon birth.
+FRAC_PARENT_ENERGY_GIVEN_AT_BIRTH 0.5 # Fraction of energy given to offspring.
+FRAC_ENERGY_DECAY_AT_BIRTH 0.05 # Fraction of energy lost due to decay during reproduction.
+NUM_INST_EXC_BEFORE_0_ENERGY 1000000 # Number of instructions executed before energy is exhausted.
+ENERGY_CAP -1 # Maximun amount of energy that can be stored in an organism. -1 means the cap is set to Max Int
+ENERGY_VERBOSE 0 # Print energy and merit values. 0/1 (off/on)
Added: branches/energy/tests/energy_deme_level_res/config/echo40.org
===================================================================
--- branches/energy/tests/energy_deme_level_res/config/echo40.org (rev 0)
+++ branches/energy/tests/energy_deme_level_res/config/echo40.org 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,42 @@
+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 # 1
+nop-C #
+IO # 2
+nop-C #
+IO # 3
+nop-C #
+IO # 4
+nop-C #
+IO # 5
+nop-C #
+IO # 6
+nop-C #
+IO # 7
+nop-C #
+IO # 8
+nop-C #
+IO
+IO # echo 9
+nop-C #
+nand
+IO # nand 1
+IO
+nop-C # echo 10
+nand
+IO # nand 2
+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: branches/energy/tests/energy_deme_level_res/config/environment-5tasks.cfg
===================================================================
--- branches/energy/tests/energy_deme_level_res/config/environment-5tasks.cfg (rev 0)
+++ branches/energy/tests/energy_deme_level_res/config/environment-5tasks.cfg 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,33 @@
+##############################################################################
+#
+# This is the setup file for the task/resource system. From here, you can
+# setup the available resources (including their inflow and outflow rates) as
+# well as the reactions that the organisms can trigger by performing tasks.
+#
+# This file is currently setup to reward 9 tasks, all of which use the
+# "infinite" resource, which is undepletable.
+#
+# For information on how to use this file, see: doc/environment.html
+# For other sample environments, see: source/support/config/
+#
+##############################################################################
+
+RESOURCE global:initial=1.0:deme=false
+RESOURCE deme_ResA:initial=1.0:deme=true
+RESOURCE deme_ResB:geometry=grid:initial=1000:inflow=1000:outflow=0.1\
+ :deme=true:\
+ inflowx1=0:inflowx2=9:inflowy1=1:inflowy2=1:\
+ outflowx1=0:outflowx2=9:outflowy1=5:outflowy2=5:\
+ xdiffuse=0:ydiffuse=0:xgravity=0:ygravity=0
+
+
+REACTION ECHO echo process:resource=global:value=1000.0:type=energy:frac=1.0:product=global:conversion=2.0 requisite:max_count=10
+
+REACTION NAND nand process:resource=deme_ResA:value=1500.0:type=energy:frac=1.0:product=deme_ResA:conversion=1.5 requisite:max_count=10
+
+
+#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: branches/energy/tests/energy_deme_level_res/config/events-ConstResource.cfg
===================================================================
--- branches/energy/tests/energy_deme_level_res/config/events-ConstResource.cfg (rev 0)
+++ branches/energy/tests/energy_deme_level_res/config/events-ConstResource.cfg 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,38 @@
+##############################################################################
+#
+# 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] [action/event] [arguments...]
+#
+# This file is currently setup to record key information every 100 updates.
+#
+# For information on how to use this file, see: doc/events.html
+# For other sample event configurations, see: support/config/
+#
+##############################################################################
+
+
+# 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 10:10:end PrintTasksExeData # Num. times tasks have been executed.
+
+# Setup the exit time and full population data collection.
+
+u 0:10:end PrintInstructionAbundanceHistogram
+u 0:10:end PrintInstructionData
+u 10:10:end PrintSleepData
+
+u 0:10:end PrintDemeStats
+
+u 20:20:end ReplicateDemes
+
+u 100 exit
\ No newline at end of file
Added: branches/energy/tests/energy_deme_level_res/config/instset-TEST.cfg
===================================================================
--- branches/energy/tests/energy_deme_level_res/config/instset-TEST.cfg (rev 0)
+++ branches/energy/tests/energy_deme_level_res/config/instset-TEST.cfg 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,64 @@
+nop-A 1 1 0 100 # a
+nop-B 1 1 0 100 # b
+nop-C 1 1 0 100 # c
+if-n-equ 1 1 0 100 # d
+if-less 1 1 0 100 # e
+pop 1 1 0 100 # f
+push 1 1 0 100 # g
+swap-stk 1 1 0 100 # h
+swap 1 1 0 100 # i
+shift-r 1 1 0 100 # j
+shift-l 1 1 0 100 # k
+inc 1 1 0 100 # l
+dec 1 1 0 100 # m
+add 1 1 0 100 # n
+sub 1 1 0 100 # o
+nand 1 1 0 100 # p
+IO 1 1 0 100 # q Puts current contents of register and gets new.
+h-alloc 1 1 0 100 # r Allocate as much memory as organism can use.
+h-divide 1 1 0 100 # s Cuts off everything between the read and write heads
+h-copy 1 1 0 100 # t Combine h-read and h-write
+h-search 1 1 0 100 # u Search for matching template, set flow head & return info
+ # # if no template, move flow-head here, set size&offset=0.
+mov-head 1 1 0 100 # v Move ?IP? head to flow control.
+jmp-head 1 1 0 100 # w Move ?IP? head by fixed amount in CX. Set old pos in CX.
+get-head 1 1 0 100 # x Get position of specified head in CX.
+if-label 1 1 0 100 # y
+set-flow 1 1 0 100 # z Move flow-head to address in ?CX?
+
+sense-m100 1 1 0 100
+
+if-equ-0 1 1 0 100
+
+time 1 1 0 100
+
+sleep1 1 10 0 1
+sleep2 1 20 0 1
+sleep3 1 40 0 1
+sleep4 1 80 0 1
+
+
+#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: branches/energy/tests/energy_deme_level_res/expected/data/average.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/average.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/average.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,30 @@
+# Avida Average Data
+# Thu Aug 23 22:49:52 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 10.000000 146.000000 0.000000 0.000000 42.000000 42.000000 39.000000 1.000000 1.000000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000
+10 3.09738 146 0.267123 0 42 42 39 4 0.25 0.25 0 2 -1.57458 0 0
+20 1.6472 146.143 0.266864 0 42 42 39 3.5 0.214286 0.214286 0.285714 3.85714 -1.17999 0 0
+30 1.2888 147.725 0.264072 0 41.9 41.925 38.9 3.07692 0.3 0.225 0.5 5.6 -1.32207 0 0
+40 1.17957 149.26 0.258396 0 41.961 41.6494 38.4416 3.08 0.194805 0.12987 0.701299 7.37662 -1.11564 0 0
+50 1.08876 146.82 0.261371 0 41.95 41.55 38.38 2.22222 0.2 0.1 0.9 9.58 -1.27058 0 0
+60 1.03471 148.38 0.262139 0 42.01 41.78 38.81 2.22222 0.11 0.06 1.02 11.56 -0.961181 0 0
+70 3.41177 146 0.267123 0 42 42 39 3.5 0.428571 0.428571 0.142857 1.85714 0.473065 -1 0
+80 1.74953 146 0.267123 0 42.0435 42 39 3.28571 0.304348 0.26087 0.391304 3.6087 0.285334 -1 0
+90 1.26344 145.258 0.26411 0 42.1212 41.7424 38.4545 2.64 0.212121 0.166667 0.712121 5.48485 0.679852 -1 0
+100 1.06706 146.065 0.265387 0 42.036 41.8921 38.7842 2.48214 0.215827 0.151079 0.964029 7.46043 0.932542 -1 0
Added: branches/energy/tests/energy_deme_level_res/expected/data/count.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/count.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/count.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,30 @@
+# Avida count data
+# Thu Aug 23 22:49:52 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 90 4 1 1 0 0 0 1 0 1 4 2 4 0 0
+20 330 14 4 1 0 0 0 3 0 3 11 8 14 0 0
+30 930 40 13 3 0 0 0 12 3 9 28 23 40 0 0
+40 2160 77 25 5 0 0 0 15 10 10 58 45 77 0 0
+50 3000 100 45 7 0 0 0 20 20 10 66 60 100 0 0
+60 3000 100 45 10 0 0 0 11 11 6 67 59 100 0 0
+70 120 7 2 1 0 0 0 3 0 3 6 4 7 0 0
+80 480 23 7 1 0 0 0 7 0 6 17 13 23 0 0
+90 1620 66 25 3 0 0 0 14 2 11 43 34 66 0 0
+100 3750 139 56 11 0 0 0 30 16 21 90 73 139 0 0
Added: branches/energy/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,144 @@
+deme_0000000_energy_0000000 = [ ...
+99700 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+
+deme_0000000_energy_0000010 = [ ...
+30896.4 0 0 0 0 0 0 0 0 0
+0 30868.5 0 0 0 0 0 0 0 0
+0 30896.4 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+30918 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_energy_0000020 = [ ...
+15808.4 20296.5 15810 0 0 0 0 0 0 0
+15821.1 15808.4 0 0 0 0 0 0 0 0
+0 15794.1 15342.9 0 0 0 0 0 0 0
+0 15339.8 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 15836.9 0 0 0 0 0 0 15806.8 20379.2
+15833.8 15819.5 0 0 0 0 0 0 0 15819.5
+];
+
+deme_0000000_energy_0000030 = [ ...
+13398.6 19407.6 11493.6 11481 0 0 0 0 12533 13386.4
+13400 12518 13342.9 0 0 0 0 0 0 12513
+13401.3 12515.5 12729.5 12721.8 0 0 0 0 12504.2 12528
+0 11734.3 12487.9 0 0 0 0 0 12534.3 0
+0 12720.5 11735.5 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 13518.2 12509.2 0 0 0 0 0 0 12510.5
+13499.2 12514.2 12533 0 0 0 0 12514.2 12513 13432.6
+12529.3 12530.5 0 0 0 0 0 0 12497.9 13446.2
+12525.5 12511.7 11491.3 11476.4 0 0 0 0 13381 12533
+];
+
+deme_0000000_energy_0000040 = [ ...
+11786.2 18423.6 11807.5 10529.4 9996.7 0 0 11765 11788.6 11885.9
+11805.1 11885.9 12931 10701.3 10527.3 0 0 11774.4 11795.7 11790.5
+11785.8 11802.7 11070.4 11051.4 0 0 0 11860.6 11765 11802.7
+11806.3 11041.3 11074.9 11036.8 11042.4 0 0 11883.4 11873.8 11885.9
+11063.7 11059.2 10818 12031.6 11065.9 0 0 0 0 11876.2
+11782.7 11067.1 12024.3 10808.1 11760.2 0 0 0 0 11786.2
+12043.6 12031.6 12029.2 11090.4 11088.2 0 11789.8 0 11929.2 11765
+12000.3 12043.6 11794.5 11809.8 11806.3 0 11760.2 11787.4 11796.8 11931.6
+11840.1 11877.4 11775.6 10692.6 0 0 11765 11323 11795.7 11902.7
+11896.7 11805.1 10708.9 11772 10707.8 0 11315.1 11769.7 12901.1 11789.8
+];
+
+deme_0000000_energy_0000050 = [ ...
+11627.5 11621.7 11645 10285 9528.81 9765.82 11594.9 11597.2 11598.4 11628.7
+11640.4 11641.5 11631.3 10676.5 10326.4 10322.3 11589.1 11603.1 10893.6 11624
+11540 11606.6 11643.9 10743.2 10295.4 10678.6 11583.3 11626.4 11576.3 11601.9
+11605.4 10618.8 11639.2 10315.5 10673.2 10683 11610.1 11617.1 11638 11603.1
+10207.2 11636.9 10320.7 11643.9 10671.1 10685.1 10107.4 11613.6 11460.2 11628.7
+11635.7 10334.5 10330.3 10302.4 11578.6 9239.98 11645.2 10121.6 11542.4 11610.1
+11604.2 10787.9 10791.2 11591.4 9239.98 11641.7 11626.4 11601.9 10557.2 11559.9
+11679.9 11626.4 11629.9 11633.4 11624 11592.6 11596.1 11604.2 10563.6 11643
+11430.6 11600.7 11634.5 10333.1 10836.8 11576.3 11626.4 11556.5 11574 11559.9
+11612.4 11610.1 10329 11635.7 10262.1 10838.9 10862.7 11615.9 12410.3 11606.6
+];
+
+deme_0000000_energy_0000060 = [ ...
+11537.7 11605.6 11620.1 11563.9 10246.3 9765.82 11512.6 11512.6 11527.7 11604.4
+11557.9 11605.6 11565 9813.62 10182.9 10556.4 10555.3 11542.8 11526.6 11529.5
+11550.9 11510.3 11557.9 10228 10557.4 10546.8 11505.6 11240.7 11512.6 11607.9
+11457.3 11567.2 10215.6 10203.3 10608.7 10619.4 11518.4 11538.2 11588.1 11554.4
+9935.39 11561.4 10279.5 10708.2 10720 10717.9 9749.34 11552.1 11519.6 11538.2
+11386.4 11575.3 10276.4 10278.5 11480.1 10587.2 10574.4 10860.2 11130.4 11539.3
+9526.34 11577.7 9526.34 10268.2 11524.2 11582.3 11537 11557.9 10836.1 9526.34
+10818.5 9526.34 11564.9 10687.5 11589.3 11483.6 11597.8 10706.9 10862.3 11565.7
+11545.9 11571.9 11578.8 10056.9 10702.6 11489.4 10709 10172 11179.5 11532.4
+11599.7 11541.7 11534.7 11537 11569.5 10709 10638.3 10637.2 10152.5 11534.7
+];
+
+deme_0000000_energy_0000070 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+30958.3 0 0 0 0 0 0 0 0 0
+0 30967.6 0 0 0 0 0 0 0 0
+30936.6 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 30967.6
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_energy_0000080 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+15846.4 15848 0 0 0 0 0 0 0 0
+20395.7 20387.5 15843.3 0 0 0 0 0 0 0
+20391.6 15843.3 0 0 0 0 0 0 0 0
+15843.3 0 0 0 0 0 0 0 20377.1 15844.8
+0 0 0 0 0 0 0 0 0 15836.9
+15843.3 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_energy_0000090 = [ ...
+0 0 12491.7 0 0 0 0 0 0 12528
+12523 13408.1 12476.6 11980.9 0 0 0 0 0 12528
+12520.5 13405.4 11939.9 0 0 0 0 0 12056.4 13438.1
+13409.5 11750.5 13404.1 13401.3 0 0 0 0 0 12058.8
+11748.1 13416.3 13434 0 0 0 0 0 13387.8 12534.3
+12534.3 13427.2 0 0 0 0 0 0 19546.1 12535.5
+12530.5 12533 0 0 0 0 0 0 12528 12523
+13401.3 0 0 0 0 0 0 0 11586.3 11586.3
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_energy_0000100 = [ ...
+11794.5 10938.3 12087.9 10226.9 0 0 0 0 11728.3 11779.1
+10948.3 11710.6 11077.5 10210.4 10226.9 0 0 11753.1 12233.4 10952.7
+11312.8 11079.7 10204.2 10194.9 10218.7 0 0 11004.3 10995.5 11780.4
+11759 11773.2 9913.28 12925.5 11795.7 0 0 10985.6 11007.7 11309.4
+11112.6 11807.5 11887.1 11792.1 11820.8 0 11071.8 11299.2 11285.6 11419.4
+11870.2 11806.3 11809.8 11809.8 11802.7 0 0 11067.4 18462.8 11113.8
+11789.8 11803.9 11870.2 11763.8 0 0 0 0 11084 11792.1
+10207.5 11790.9 11803.9 11877.4 0 0 0 11079.6 10208.5 10496.9
+10208.5 12156.9 0 0 0 0 0 10208.5 11306.6 11769.7
+11787.4 11795.7 0 0 0 0 0 0 11766.1 11290.7
+];
+
Added: branches/energy/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,144 @@
+deme_0000001_energy_0000000 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+
+deme_0000001_energy_0000010 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_energy_0000020 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_energy_0000030 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_energy_0000040 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_energy_0000050 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_energy_0000060 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_energy_0000070 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+30958.3 0 0 0 0 0 0 0 0 52223.9
+30970.7 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_energy_0000080 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+15838.5 0 0 0 0 0 0 0 19042.9 19039
+15830.6 20399.9 0 0 0 0 0 0 19037.1 18998.6
+15840.1 0 0 0 0 0 0 0 15816.3 15819.5
+0 0 0 0 0 0 0 0 0 15840.1
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_energy_0000090 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 11071.5 0
+11109.6 11329.2 12518 0 0 0 0 0 11752.6 11074.8
+15339.2 11336 12515.5 0 0 0 10783 11728.8 11751.4 12476.6
+12477.9 12538.1 12538.1 11812.5 0 0 0 10771.1 11774 11765.7
+12501.7 12491.7 11817.3 0 0 0 12527.3 11783.6 13410.9 11758.6
+12528 13347 0 0 0 0 0 12528.6 0 13412.2
+13405.4 12531.8 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_energy_0000100 = [ ...
+0 0 0 0 0 0 0 0 10146 9989.81
+9989.81 9989.28 9821.09 11754.3 0 9933.56 10165.5 10207.6 9989.81 10140.8
+9989.28 9821.09 11779.1 11761.4 0 0 9912.48 10153.2 10208.6 9989.81
+14681.4 11792.1 11766.1 11769.7 10580.4 0 10473.7 10172.7 10169.6 10534.9
+11736.6 11731.9 11763.8 11779.1 10580.4 0 10171.7 10156.2 10198.4 10550.8
+11318.5 12098 10592.1 10834 10837.2 10226.1 12088.6 10198.4 11809.8 10176
+11739 10594.2 11811 10598.4 0 0 10223 11795.1 11173.7 11318.5
+11754.3 11808.7 11763.8 11780.3 0 0 11792.7 11780.9 11400.3 11798
+11765.5 11073.1 11075.3 0 0 11786.8 0 0 11798 11408.4
+11760.8 0 0 0 0 0 0 0 0 0
+];
+
Added: branches/energy/tests/energy_deme_level_res/expected/data/deme_donor.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/deme_donor.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/deme_donor.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,17 @@
+# Num orgs doing doing a donate for each deme in population
+# Thu Aug 23 22:49:52 2007
+# 1: update
+# 2: Deme 0
+# 3: Deme 1
+
+0 0.000000 0.000000
+10 0 0
+20 0 0
+30 0 0
+40 0 0
+50 0 0
+60 0 0
+70 0 0
+80 0 0
+90 0 0
+100 0 0
Added: branches/energy/tests/energy_deme_level_res/expected/data/deme_fitness.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/deme_fitness.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/deme_fitness.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,17 @@
+# Average fitnesses for each deme in the population
+# Thu Aug 23 22:49:52 2007
+# 1: update
+# 2: Deme 0
+# 3: Deme 1
+
+0 0.000000 0.000000
+10 0.267123 0
+20 0.266864 0
+30 0.264072 0
+40 0.258396 0
+50 0.261371 0
+60 0.262139 0
+70 0.267123 0.267123
+80 0.267123 0.267123
+90 0.26655 0.26167
+100 0.266236 0.264551
Added: branches/energy/tests/energy_deme_level_res/expected/data/deme_gest_time.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/deme_gest_time.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/deme_gest_time.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,17 @@
+# Average gestation time for each deme in population
+# Thu Aug 23 22:49:52 2007
+# 1: update
+# 2: Deme 0
+# 3: Deme 1
+
+0 146.000000 0.000000
+10 146 0
+20 146.143 0
+30 147.725 0
+40 149.26 0
+50 146.82 0
+60 148.38 0
+70 146 146
+80 146 146
+90 146.545 143.97
+100 146.435 145.7
Added: branches/energy/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,48 @@
+# Number of times each instruction is exectued in deme 0
+# Thu Aug 23 22:49:52 2007
+# 1: update
+# 2: Inst 0
+# 3: Inst 1
+# 4: Inst 2
+# 5: Inst 3
+# 6: Inst 4
+# 7: Inst 5
+# 8: Inst 6
+# 9: Inst 7
+# 10: Inst 8
+# 11: Inst 9
+# 12: Inst 10
+# 13: Inst 11
+# 14: Inst 12
+# 15: Inst 13
+# 16: Inst 14
+# 17: Inst 15
+# 18: Inst 16
+# 19: Inst 17
+# 20: Inst 18
+# 21: Inst 19
+# 22: Inst 20
+# 23: Inst 21
+# 24: Inst 22
+# 25: Inst 23
+# 26: Inst 24
+# 27: Inst 25
+# 28: Inst 26
+# 29: Inst 27
+# 30: Inst 28
+# 31: Inst 29
+# 32: Inst 30
+# 33: Inst 31
+# 34: Inst 32
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 168 8 168 0 0 168 0 0 0 0 0 0 0 0
+20 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 28 194 14 14 588 28 588 0 0 588 0 2 0 0 0 0 0 0
+30 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 80 551 40 40 1676 80 1676 0 0 1676 0 5 0 0 0 0 2 0
+40 42 0 14 0 0 0 0 0 0 0 2 1 0 0 0 152 1057 77 77 3187 156 3187 0 0 3187 0 12 0 0 2 0 7 0
+50 62 1 31 0 0 40 0 0 11 0 3 2 0 0 4 190 1368 100 100 4134 204 4134 0 0 4095 0 18 2 0 4 0 2 0
+60 23 1 21 0 0 20 4 0 0 2 8 2 0 0 2 195 1365 100 100 4180 201 4178 0 1 4159 0 17 1 1 3 4 3 0
+70 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 168 8 168 0 0 168 0 0 0 0 0 0 0 0
+80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 24 168 12 12 504 24 504 0 0 504 0 0 0 0 0 0 0 0
+90 0 0 2 4 2 0 4 0 2 0 0 0 0 0 0 66 452 33 33 1388 66 1388 0 0 1388 2 2 0 4 0 0 0 0
+100 0 0 12 9 6 1 7 0 5 0 0 0 0 0 4 136 930 69 69 2898 138 2898 0 2 2898 10 4 0 7 0 0 0 0
Added: branches/energy/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,48 @@
+# Number of times each instruction is exectued in deme 1
+# Thu Aug 23 22:49:52 2007
+# 1: update
+# 2: Inst 0
+# 3: Inst 1
+# 4: Inst 2
+# 5: Inst 3
+# 6: Inst 4
+# 7: Inst 5
+# 8: Inst 6
+# 9: Inst 7
+# 10: Inst 8
+# 11: Inst 9
+# 12: Inst 10
+# 13: Inst 11
+# 14: Inst 12
+# 15: Inst 13
+# 16: Inst 14
+# 17: Inst 15
+# 18: Inst 16
+# 19: Inst 17
+# 20: Inst 18
+# 21: Inst 19
+# 22: Inst 20
+# 23: Inst 21
+# 24: Inst 22
+# 25: Inst 23
+# 26: Inst 24
+# 27: Inst 25
+# 28: Inst 26
+# 29: Inst 27
+# 30: Inst 28
+# 31: Inst 29
+# 32: Inst 30
+# 33: Inst 31
+# 34: Inst 32
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 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 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 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 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 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 6 42 3 3 126 6 126 0 0 126 0 0 0 0 0 0 0 0
+80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 22 150 11 11 462 22 462 0 4 462 0 0 0 0 0 0 0 0
+90 3 0 0 0 0 2 3 0 0 2 0 2 0 0 0 66 445 33 33 1348 66 1348 0 12 1348 0 0 0 0 0 0 0 0
+100 6 0 0 0 0 2 6 0 1 2 0 11 0 2 2 135 941 70 70 2921 142 2921 0 24 2921 0 0 2 0 0 0 0 0
Added: branches/energy/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,17 @@
+# Average life fitnesses for each deme in the population
+# Thu Aug 23 22:49:52 2007
+# 1: update
+# 2: Deme 0
+# 3: Deme 1
+
+0 0.000000 0.000000
+10 0.267123 0
+20 0.266864 0
+30 0.264072 0
+40 0.258396 0
+50 0.261371 0
+60 0.262139 0
+70 0.267123 0.267123
+80 0.267123 0.267123
+90 0.26655 0.26167
+100 0.266236 0.264551
Added: branches/energy/tests/energy_deme_level_res/expected/data/deme_merit.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/deme_merit.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/deme_merit.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,17 @@
+# Average merits for each deme in population
+# Thu Aug 23 22:49:52 2007
+# 1: update
+# 2: Deme 0
+# 3: Deme 1
+
+0 10.000000 0.000000
+10 3.09738 0
+20 1.6472 0
+30 1.2888 0
+40 1.17957 0
+50 1.08876 0
+60 1.03471 0
+70 3.09738 3.83097
+80 1.74584 1.75357
+90 1.29808 1.22881
+100 1.13998 0.99519
Added: branches/energy/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,18 @@
+# Average mutation rates for organisms in each deme
+# Thu Aug 23 22:49:52 2007
+# 1: update
+# 2: Deme 0
+# 3: Deme 1
+# 4: Average deme mutation rate averaged across Demes.
+
+0 0.007500 0.000000 0.003750
+10 0.0075 0 0.00375
+20 0.0075 0 0.00375
+30 0.0075 0 0.00375
+40 0.0075 0 0.00375
+50 0.0075 0 0.00375
+60 0.0075 0 0.00375
+70 0.0075 0.0075 0.0075
+80 0.0075 0.0075 0.0075
+90 0.0075 0.0075 0.0075
+100 0.0075 0.0075 0.0075
Added: branches/energy/tests/energy_deme_level_res/expected/data/deme_receiver.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/deme_receiver.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/deme_receiver.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,17 @@
+# Num orgs doing receiving a donate for each deme in population
+# Thu Aug 23 22:49:52 2007
+# 1: update
+# 2: Deme 0
+# 3: Deme 1
+
+0 0.000000 0.000000
+10 0 0
+20 0 0
+30 0 0
+40 0 0
+50 0 0
+60 0 0
+70 0 0
+80 0 0
+90 0 0
+100 0 0
Added: branches/energy/tests/energy_deme_level_res/expected/data/deme_resources.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/deme_resources.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/deme_resources.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,19 @@
+# Avida deme resource data
+# Thu Aug 23 22:49:52 2007
+# 1: update
+# 2: Deme 0 Resource deme_ResA
+# 3: Deme 0 Resource deme_ResB
+# 4: Deme 1 Resource deme_ResA
+# 5: Deme 1 Resource deme_ResB
+
+0 2.000000 1000.000000 1.000000 1000.000000
+10 7.5 11931.4 1 11931.4
+20 25.5 20912.2 1 20912.2
+30 69.5 30904.2 1 30904.2
+40 180 40901.5 1 41901.3
+50 377 50900.5 1 51900.5
+60 581.5 60900.2 1 60900.2
+70 4 10934.9 4 10934.9
+80 15.5 20912.2 18 20912.2
+90 55 30904.2 60 30904.2
+100 170 40901.5 155.5 40901.5
Added: branches/energy/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,287 @@
+deme_0000000_deme_ResB_0000000 = [ ...
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
+
+deme_0000001_deme_ResB_0000000 = [ ...
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
+deme_0000000_deme_ResB_0000010 = [ ...
+10 10 10 10 10 10 10 10 10 10
+1110 1110 1110 1110 1110 1110 1110 1110 1110 1110
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+3.13811 3.13811 3.13811 3.13811 3.13811 3.13811 3.13811 3.13811 3.13811 3.13811
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
+deme_0000001_deme_ResB_0000010 = [ ...
+10 10 10 10 10 10 10 10 10 10
+1110 1110 1110 1110 1110 1110 1110 1110 1110 1110
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+3.13811 3.13811 3.13811 3.13811 3.13811 3.13811 3.13811 3.13811 3.13811 3.13811
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
+deme_0000000_deme_ResB_0000020 = [ ...
+10 10 10 10 10 10 10 10 10 10
+2010 2010 2010 2010 2010 2010 2010 2010 2010 2010
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+1.21577 1.21577 1.21577 1.21577 1.21577 1.21577 1.21577 1.21577 1.21577 1.21577
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
+deme_0000001_deme_ResB_0000020 = [ ...
+10 10 10 10 10 10 10 10 10 10
+2010 2010 2010 2010 2010 2010 2010 2010 2010 2010
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+1.21577 1.21577 1.21577 1.21577 1.21577 1.21577 1.21577 1.21577 1.21577 1.21577
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
+deme_0000000_deme_ResB_0000030 = [ ...
+10 10 10 10 10 10 10 10 10 10
+3010 3010 3010 3010 3010 3010 3010 3010 3010 3010
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+0.423912 0.423912 0.423912 0.423912 0.423912 0.423912 0.423912 0.423912 0.423912 0.423912
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
+deme_0000001_deme_ResB_0000030 = [ ...
+10 10 10 10 10 10 10 10 10 10
+3010 3010 3010 3010 3010 3010 3010 3010 3010 3010
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+0.423912 0.423912 0.423912 0.423912 0.423912 0.423912 0.423912 0.423912 0.423912 0.423912
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
+deme_0000000_deme_ResB_0000040 = [ ...
+10 10 10 10 10 10 10 10 10 10
+4010 4010 4010 4010 4010 4010 4010 4010 4010 4010
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+0.147809 0.147809 0.147809 0.147809 0.147809 0.147809 0.147809 0.147809 0.147809 0.147809
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
+deme_0000001_deme_ResB_0000040 = [ ...
+10 10 10 10 10 10 10 10 10 10
+4110 4110 4110 4110 4110 4110 4110 4110 4110 4110
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+0.133028 0.133028 0.133028 0.133028 0.133028 0.133028 0.133028 0.133028 0.133028 0.133028
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
+deme_0000000_deme_ResB_0000050 = [ ...
+10 10 10 10 10 10 10 10 10 10
+5010 5010 5010 5010 5010 5010 5010 5010 5010 5010
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+0.0515378 0.0515378 0.0515378 0.0515378 0.0515378 0.0515378 0.0515378 0.0515378 0.0515378 0.0515378
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
+deme_0000001_deme_ResB_0000050 = [ ...
+10 10 10 10 10 10 10 10 10 10
+5110 5110 5110 5110 5110 5110 5110 5110 5110 5110
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+0.046384 0.046384 0.046384 0.046384 0.046384 0.046384 0.046384 0.046384 0.046384 0.046384
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
+deme_0000000_deme_ResB_0000060 = [ ...
+10 10 10 10 10 10 10 10 10 10
+6010 6010 6010 6010 6010 6010 6010 6010 6010 6010
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+0.0179701 0.0179701 0.0179701 0.0179701 0.0179701 0.0179701 0.0179701 0.0179701 0.0179701 0.0179701
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
+deme_0000001_deme_ResB_0000060 = [ ...
+10 10 10 10 10 10 10 10 10 10
+6010 6010 6010 6010 6010 6010 6010 6010 6010 6010
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+0.0179701 0.0179701 0.0179701 0.0179701 0.0179701 0.0179701 0.0179701 0.0179701 0.0179701 0.0179701
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
+deme_0000000_deme_ResB_0000070 = [ ...
+10 10 10 10 10 10 10 10 10 10
+1010 1010 1010 1010 1010 1010 1010 1010 1010 1010
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+3.48678 3.48678 3.48678 3.48678 3.48678 3.48678 3.48678 3.48678 3.48678 3.48678
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
+deme_0000001_deme_ResB_0000070 = [ ...
+10 10 10 10 10 10 10 10 10 10
+1010 1010 1010 1010 1010 1010 1010 1010 1010 1010
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+3.48678 3.48678 3.48678 3.48678 3.48678 3.48678 3.48678 3.48678 3.48678 3.48678
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
+deme_0000000_deme_ResB_0000080 = [ ...
+10 10 10 10 10 10 10 10 10 10
+2010 2010 2010 2010 2010 2010 2010 2010 2010 2010
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+1.21577 1.21577 1.21577 1.21577 1.21577 1.21577 1.21577 1.21577 1.21577 1.21577
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
+deme_0000001_deme_ResB_0000080 = [ ...
+10 10 10 10 10 10 10 10 10 10
+2010 2010 2010 2010 2010 2010 2010 2010 2010 2010
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+1.21577 1.21577 1.21577 1.21577 1.21577 1.21577 1.21577 1.21577 1.21577 1.21577
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
+deme_0000000_deme_ResB_0000090 = [ ...
+10 10 10 10 10 10 10 10 10 10
+3010 3010 3010 3010 3010 3010 3010 3010 3010 3010
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+0.423912 0.423912 0.423912 0.423912 0.423912 0.423912 0.423912 0.423912 0.423912 0.423912
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
+deme_0000001_deme_ResB_0000090 = [ ...
+10 10 10 10 10 10 10 10 10 10
+3010 3010 3010 3010 3010 3010 3010 3010 3010 3010
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+0.423912 0.423912 0.423912 0.423912 0.423912 0.423912 0.423912 0.423912 0.423912 0.423912
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
+deme_0000000_deme_ResB_0000100 = [ ...
+10 10 10 10 10 10 10 10 10 10
+4010 4010 4010 4010 4010 4010 4010 4010 4010 4010
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+0.147809 0.147809 0.147809 0.147809 0.147809 0.147809 0.147809 0.147809 0.147809 0.147809
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
+deme_0000001_deme_ResB_0000100 = [ ...
+10 10 10 10 10 10 10 10 10 10
+4010 4010 4010 4010 4010 4010 4010 4010 4010 4010
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+0.147809 0.147809 0.147809 0.147809 0.147809 0.147809 0.147809 0.147809 0.147809 0.147809
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+10 10 10 10 10 10 10 10 10 10
+];
+
Added: branches/energy/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,287 @@
+deme_0000000_sleep_0000000 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+
+deme_0000001_sleep_0000000 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_sleep_0000010 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_sleep_0000010 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_sleep_0000020 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_sleep_0000020 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_sleep_0000030 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_sleep_0000030 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_sleep_0000040 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 1 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 1 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_sleep_0000040 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_sleep_0000050 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 1
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_sleep_0000050 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_sleep_0000060 = [ ...
+0 0 1 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_sleep_0000060 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_sleep_0000070 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_sleep_0000070 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_sleep_0000080 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_sleep_0000080 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_sleep_0000090 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_sleep_0000090 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_sleep_0000100 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 1 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_sleep_0000100 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 1 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
Added: branches/energy/tests/energy_deme_level_res/expected/data/deme_task.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/deme_task.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/deme_task.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,19 @@
+# Num orgs doing each task for each deme in population
+# Thu Aug 23 22:49:52 2007
+# 1: update
+# 2: Deme 0, Task 0
+# 3: Deme 0, Task 1
+# 4: Deme 1, Task 0
+# 5: Deme 1, Task 1
+
+0 0 0 0 0
+10 4 4 0 0
+20 14 14 0 0
+30 40 40 0 0
+40 77 76 0 0
+50 100 99 0 0
+60 100 96 0 0
+70 4 4 3 3
+80 12 12 11 11
+90 33 33 33 33
+100 69 69 70 70
Added: branches/energy/tests/energy_deme_level_res/expected/data/dominant.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/dominant.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/dominant.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,30 @@
+# Avida Dominant Data
+# Thu Aug 23 22:49:52 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 42 0.000000 0.000000 1 0 0 0 0 0.000000 1 042-aaaaa
+10 3.83097 146 0.267123 0.00684932 42 42 39 4 1 1 0 0 0.267123 1 042-aaaaa
+20 2.3073 146 0.267123 0.00684932 42 42 39 10 3 3 0 0 0.267123 1 042-aaaaa
+30 1.66644 146 0.267123 0.00684932 42 42 39 22 9 8 0 0 0.267606 1 042-aaaaa
+40 1.4198 146 0.267123 0.00684932 42 42 39 30 9 6 0 0 0.267606 1 042-aaaaa
+50 1.29896 146 0.267123 0.00684932 42 42 39 40 13 7 0 0 0.267606 1 042-aaaaa
+60 1.25594 146 0.267123 0.00684932 42 42 39 33 3 2 0 0 0.27027 1 042-aaaaa
+70 3.97769 146 0.267123 0.00684932 42 42 39 6 3 3 0 0 0.267123 117 042-aaaai
+80 2.41044 146 0.267123 0.00684932 42 42 39 16 7 6 0 0 0.267123 117 042-aaaai
+90 1.7188 146 0.267123 0.00684932 42 42 39 31 9 8 0 0 0.267123 117 042-aaaai
+100 1.43893 146 0.267123 0.00684932 42 42 39 38 11 7 0 0 0.267606 117 042-aaaai
Added: branches/energy/tests/energy_deme_level_res/expected/data/instruction.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/instruction.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/instruction.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,48 @@
+# Avida instruction execution data
+# Thu Aug 23 22:49:52 2007
+# 1: Update
+# 2: nop-A
+# 3: nop-B
+# 4: nop-C
+# 5: if-n-equ
+# 6: if-less
+# 7: pop
+# 8: push
+# 9: swap-stk
+# 10: swap
+# 11: shift-r
+# 12: shift-l
+# 13: inc
+# 14: dec
+# 15: add
+# 16: sub
+# 17: nand
+# 18: IO
+# 19: h-alloc
+# 20: h-divide
+# 21: h-copy
+# 22: h-search
+# 23: mov-head
+# 24: jmp-head
+# 25: get-head
+# 26: if-label
+# 27: set-flow
+# 28: sense-m100
+# 29: if-equ-0
+# 30: time
+# 31: sleep1
+# 32: sleep2
+# 33: sleep3
+# 34: sleep4
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 168 8 168 0 0 168 0 0 0 0 0 0 0 0
+20 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 28 194 14 14 588 28 588 0 0 588 0 2 0 0 0 0 0 0
+30 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 80 551 40 40 1676 80 1676 0 0 1676 0 5 0 0 0 0 2 0
+40 42 0 14 0 0 0 0 0 0 0 2 1 0 0 0 152 1057 77 77 3187 156 3187 0 0 3187 0 12 0 0 2 0 7 0
+50 62 1 31 0 0 40 0 0 11 0 3 2 0 0 4 190 1368 100 100 4134 204 4134 0 0 4095 0 18 2 0 4 0 2 0
+60 23 1 21 0 0 20 4 0 0 2 8 2 0 0 2 195 1365 100 100 4180 201 4178 0 1 4159 0 17 1 1 3 4 3 0
+70 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 98 7 7 294 14 294 0 0 294 0 0 0 0 0 0 0 0
+80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 46 318 23 23 966 46 966 0 4 966 0 0 0 0 0 0 0 0
+90 3 0 2 4 2 2 7 0 2 2 0 2 0 0 0 132 897 66 66 2736 132 2736 0 12 2736 2 2 0 4 0 0 0 0
+100 6 0 12 9 6 3 13 0 6 2 0 11 0 2 6 271 1871 139 139 5819 280 5819 0 26 5819 10 4 2 7 0 0 0 0
Added: branches/energy/tests/energy_deme_level_res/expected/data/instruction_histogram.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/instruction_histogram.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/instruction_histogram.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,46 @@
+# 1: Update
+# 2: nop-A
+# 3: nop-B
+# 4: nop-C
+# 5: if-n-equ
+# 6: if-less
+# 7: pop
+# 8: push
+# 9: swap-stk
+# 10: swap
+# 11: shift-r
+# 12: shift-l
+# 13: inc
+# 14: dec
+# 15: add
+# 16: sub
+# 17: nand
+# 18: IO
+# 19: h-alloc
+# 20: h-divide
+# 21: h-copy
+# 22: h-search
+# 23: mov-head
+# 24: jmp-head
+# 25: get-head
+# 26: if-label
+# 27: set-flow
+# 28: sense-m100
+# 29: if-equ-0
+# 30: time
+# 31: sleep1
+# 32: sleep2
+# 33: sleep3
+# 34: sleep4
+
+0 84 1 15 0 0 0 0 0 0 0 0 0 0 0 0 2 14 2 1 1 3 2 0 0 1 0 0 0 0 0 0 0 0
+10 340 4 57 0 0 0 0 0 0 0 0 0 0 0 0 8 56 7 4 4 11 9 0 0 4 0 0 0 0 0 0 0 0
+20 1159 13 201 0 0 0 0 0 0 0 0 0 0 0 0 28 193 42 14 33 35 29 0 0 14 0 2 0 0 0 0 1 0
+30 2923 42 650 0 1 0 0 0 0 0 0 1 0 0 0 90 640 119 43 108 96 90 0 0 46 0 8 3 0 0 0 2 0
+40 5306 80 1461 0 3 0 0 0 0 2 2 3 0 1 2 189 1379 198 87 112 220 191 1 0 92 0 26 2 1 5 0 10 0
+50 7330 102 1719 0 1 1 2 0 2 1 4 4 0 1 5 217 1635 173 107 110 274 255 4 2 110 0 28 4 2 7 3 5 0
+60 6819 102 1816 0 0 3 5 1 1 5 12 5 0 0 5 217 1731 197 101 111 299 258 0 2 109 2 22 3 2 5 8 5 1
+70 571 7 112 0 0 0 0 0 0 0 0 0 0 0 0 16 110 8 8 8 16 16 0 2 8 0 0 0 0 0 0 0 0
+80 1679 24 441 2 0 0 4 0 0 2 0 0 0 0 0 64 434 33 24 31 65 57 0 8 29 0 0 2 2 0 0 0 0
+90 4544 68 1239 5 4 3 16 0 4 2 0 5 0 1 2 173 1199 119 72 73 200 168 1 23 79 3 2 5 8 0 0 0 0
+100 9583 150 2420 13 9 4 21 5 7 3 3 12 0 2 21 318 2300 245 148 154 403 354 2 43 167 13 4 7 14 1 3 1 1
Added: branches/energy/tests/energy_deme_level_res/expected/data/resource.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/resource.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/resource.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,18 @@
+# Avida resource data
+# Thu Aug 23 22:49:52 2007
+# First column gives the current update, all further columns give the quantity
+# of the particular resource at that update.
+# 1: Update
+# 2: global
+
+0 11.000000
+10 71
+20 260
+30 723
+40 1935
+50 4087
+60 6168
+70 6236
+80 6496
+90 7335
+100 9547
Added: branches/energy/tests/energy_deme_level_res/expected/data/sleep.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/sleep.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/sleep.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,17 @@
+# Number of organisms sleeping
+
+# total number of organisms sleeping
+# 1: update
+# 2: DemeID 0
+# 3: DemeID 1
+
+10 0 0
+20 0 0
+30 0 0
+40 2 0
+50 1 0
+60 1 0
+70 0 0
+80 0 0
+90 0 0
+100 1 1
Added: branches/energy/tests/energy_deme_level_res/expected/data/stats.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/stats.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/stats.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,26 @@
+# Generic Statistics Data
+# Thu Aug 23 22:49:52 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.335790 0.335790 0.409157 0.409157 1 0.000000 0.000000 0 0 0
+10 0 0.33579 0.33579 0.409157 0.409157 0 0 0 0 0 0
+20 0.00097229 0.33579 0.33579 0.409157 0.409157 0 0.895333 0 0 0 0
+30 0.0114882 0.335305 0.33579 0.408427 0.409157 3 1.73312 0 0 0 0
+40 0.0332154 0.335601 0.33579 0.408873 0.409157 2 2.36158 0 0 0 0
+50 0.0217704 0.335548 0.33579 0.408792 0.409157 4 2.85053 0 0 0 0
+60 0.0188356 0.335839 0.33579 0.40923 0.409157 4 3.00576 0 0 0 0
+70 0 0.33579 0.33579 0.409157 0.409157 0 0.410116 0 0 0 0
+80 0 0.336001 0.33579 0.409475 0.409157 1 1.14646 0 0 0 0
+90 0.0113463 0.336378 0.33579 0.410042 0.409157 3 2.28781 0 0 0 0
+100 0.00652006 0.335965 0.33579 0.40942 0.409157 -1 3.2868 0 0 0 0
Added: branches/energy/tests/energy_deme_level_res/expected/data/tasks.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/tasks.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/tasks.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,19 @@
+# Avida tasks data
+# Thu Aug 23 22:49:52 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: Echo
+# 3: Nand
+
+0 0 0
+10 4 4
+20 14 14
+30 40 40
+40 77 76
+50 100 99
+60 100 96
+70 7 7
+80 23 23
+90 66 66
+100 139 139
Added: branches/energy/tests/energy_deme_level_res/expected/data/tasks_exe.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/tasks_exe.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/tasks_exe.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,18 @@
+# Avida tasks execution data
+# Thu Aug 23 22:49:52 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: Echo
+# 3: Nand
+
+10 40 8
+20 138 28
+30 395 76
+40 756 144
+50 976 178
+60 966 181
+70 70 14
+80 222 46
+90 619 126
+100 1278 261
Added: branches/energy/tests/energy_deme_level_res/expected/data/time.dat
===================================================================
--- branches/energy/tests/energy_deme_level_res/expected/data/time.dat (rev 0)
+++ branches/energy/tests/energy_deme_level_res/expected/data/time.dat 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,18 @@
+# Avida time data
+# Thu Aug 23 22:49:52 2007
+# 1: update
+# 2: avida time
+# 3: average generation
+# 4: num_executed?
+
+0 0.000000 0.000000 30
+10 1.60476 2 90
+20 5.80282 3.85714 330
+30 12.5502 5.6 930
+40 20.6979 7.37662 2160
+50 29.6142 9.58 3000
+60 38.9211 11.56 3000
+70 41.2313 1.85714 120
+80 45.2305 3.6087 480
+90 52.0982 5.48485 1620
+100 60.9504 7.46043 3750
Added: branches/energy/tests/energy_deme_level_res/test_list
===================================================================
--- branches/energy/tests/energy_deme_level_res/test_list (rev 0)
+++ branches/energy/tests/energy_deme_level_res/test_list 2007-08-24 02:23:23 UTC (rev 2000)
@@ -0,0 +1,37 @@
+;--- Begin Test Configuration File (test_list) ---
+[main]
+; Command line arguments to pass to the application
+args =
+
+app = %(default_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 = Ben Beckmann ; Who created the test
+email = beckma24 at 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.
+;
+; builddir
+; cpus
+; default_app
+; 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