[Avida-SVN] r3185 - in branches/interrupt/tests/energy_deme_level_res: . expected expected/data
beckma24 at myxo.css.msu.edu
beckma24 at myxo.css.msu.edu
Mon Mar 9 07:03:23 PDT 2009
Author: beckma24
Date: 2009-03-09 10:03:23 -0400 (Mon, 09 Mar 2009)
New Revision: 3185
Added:
branches/interrupt/tests/energy_deme_level_res/expected/
branches/interrupt/tests/energy_deme_level_res/expected/data/
branches/interrupt/tests/energy_deme_level_res/expected/data/average.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/count.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/deme_0000000_spatial_energy.m
branches/interrupt/tests/energy_deme_level_res/expected/data/deme_0000001_spatial_energy.m
branches/interrupt/tests/energy_deme_level_res/expected/data/deme_donor.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/deme_fitness.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/deme_genetic_distance.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/deme_gest_time.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/deme_merit.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/deme_receiver.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/deme_resources.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/deme_spatial_resource_deme_ResB.m
branches/interrupt/tests/energy_deme_level_res/expected/data/deme_spatial_sleep.m
branches/interrupt/tests/energy_deme_level_res/expected/data/deme_task.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/dominant.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/instruction.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/instruction_histogram.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/resource.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/sleep.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/stats.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/tasks.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/tasks_exe.dat
branches/interrupt/tests/energy_deme_level_res/expected/data/time.dat
Log:
readding energy_deme_level_res expected results
Added: branches/interrupt/tests/energy_deme_level_res/expected/data/average.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/average.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/average.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,30 @@
+# Avida Average Data
+# Mon Mar 9 10:06:15 2009
+# 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.1619 0 0
+20 1.61755 143.067 0.253012 0 42.2 40.6 36.4667 3 0.266667 0.2 0.333333 3.93333 -1.73114 0 0
+30 1.32964 144.387 0.260206 0 42.0645 41.2903 37.7097 2.58333 0.258065 0.193548 0.419355 5.51613 -1.19629 0 0
+40 1.1854 145.881 0.262352 0 41.9831 41.5932 38.3051 3.10526 0.322034 0.20339 0.474576 7.28814 -1.70709 0 0
+50 1.11982 147.323 0.263491 0 41.9479 41.9688 38.6979 2.4 0.270833 0.177083 0.760417 9.42708 -1.76902 0 0
+60 1.0781 146.87 0.263816 0 41.93 41.96 38.73 2.08333 0.13 0.08 0.88 11.33 -2.11273 0 0
+70 5.3181 104 0.192308 0 43.25 32 20 1.33333 0 0 0.5 1 1.33068 -1 0
+80 5.3181 104 0.192308 0 43.25 32 20 1.33333 0 0 0.5 1 1.33068 -1 0
+90 5.3181 104 0.192308 0 43.25 32 20 1.33333 0 0 0.5 1 1.33068 -1 0
+100 5.3181 104 0.192308 0 43.25 32 20 1.33333 0 0 0.5 1 1.33068 -1 0
Added: branches/interrupt/tests/energy_deme_level_res/expected/data/count.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/count.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/count.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,30 @@
+# Avida count data
+# Mon Mar 9 10:06:15 2009
+# 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 15 5 1 0 0 0 4 0 3 11 8 15 0 0
+30 810 31 12 1 0 0 0 8 4 6 20 16 31 0 0
+40 1470 59 19 3 0 0 0 19 9 12 42 34 59 0 0
+50 2640 96 40 4 0 0 0 26 18 17 58 52 96 0 0
+60 3000 100 48 7 0 0 0 13 13 8 66 61 100 0 0
+70 120 4 3 1 0 0 0 0 0 0 2 2 4 0 0
+80 120 4 3 1 0 0 0 0 0 0 2 2 4 0 0
+90 120 4 3 1 0 0 0 0 0 0 2 2 4 0 0
+100 120 4 3 1 0 0 0 0 0 0 2 2 4 0 0
Added: branches/interrupt/tests/energy_deme_level_res/expected/data/deme_0000000_spatial_energy.m
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/deme_0000000_spatial_energy.m (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/deme_0000000_spatial_energy.m 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,144 @@
+deme_0000000_energy_0000000 = [ ...
+99490 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 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 = [ ...
+30815.8 30918 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 30815.8
+0 0 0 0 0 0 0 0 0 30815.8
+];
+
+deme_0000000_energy_0000020 = [ ...
+15770.3 15770.3 15804.5 0 0 0 0 15798.9 15770.3 0
+20344 0 0 15820.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
+15833.8 0 0 0 0 0 0 0 15770.3 15822.7
+15770.3 15832.2 0 0 0 0 0 15770.3 15832.2 15770.3
+];
+
+deme_0000000_energy_0000030 = [ ...
+13397.3 12474.1 15309.3 0 0 0 0 15275.8 12515.5 12533
+19496.5 12474.1 12474.1 15341.1 0 0 0 12472.9 0 0
+0 12474.1 12474.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
+12004.7 0 0 0 0 0 0 0 12474.1 0
+12043.3 13351 12519.2 0 0 0 0 0 12474.1 12526.8
+12525.5 12515.5 0 0 0 0 0 13345.6 12474.1 12521.8
+12534.3 13397.3 12474.1 0 0 0 0 13397.3 12521.8 13397.3
+];
+
+deme_0000000_energy_0000040 = [ ...
+11806.3 11869 14795 11752 11752 0 11752 14752.7 11869 11869
+18609.6 11793.3 11869 14744.2 11752 0 11861.8 11798.2 11869 11902.7
+11752 11869 11799.2 0 0 0 11799.3 0 11942.5 11752
+11798 11802.7 11814.8 11803.9 0 0 0 0 0 0
+9970.65 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 10996 9970.65
+11902.7 0 0 0 0 0 0 11793.3 12108 10957.5
+11187.8 12947.3 11869 0 0 0 11789.8 11808.7 11752 11806.3
+11812.2 11808.7 11869 11808.1 0 11869 11902.7 11869 11802.7 11812.2
+11808.7 11808.7 11808.1 11752 0 0 12145.6 11752 11808.7 11869
+];
+
+deme_0000000_energy_0000050 = [ ...
+11566.9 11593.7 11630.1 11593.7 11593.7 11642.7 11588.6 11593.7 11525.7 11566.9
+11534.2 11592.6 11593.7 11593.7 11451.9 11593.7 11629.4 11633.4 11566.9 11534.2
+11534.2 11641.5 10648.6 11649.7 11653.2 11478.4 11642.2 11642.7 11605.6 11534.2
+11645 10648.6 11443.9 11647.7 10215.6 11641 11641.5 11640.4 11566.9 11605.6
+9970.65 9360.24 0 11637.2 10175.8 11647.3 0 10702.5 11605.4 11593.7
+9360.24 10214.5 11566.9 0 0 11159.7 11119.5 11639.2 10702.5 11566.9
+11566.9 10228 11566.9 11533 11644.1 11493.8 11696.8 11637.2 11715.6 10692.6
+10702.5 12476.9 11534.2 11637.1 11638.2 11566.9 11645.4 11696.8 11648.5 10692.6
+11534.2 11174.8 11534.2 11633.6 11653.2 11534.2 11534.2 11534.2 11648.5 11534.2
+11642.7 11178.2 11642.9 11514.6 11566.9 11566.9 11527.3 11563.6 11593.7 11064.4
+];
+
+deme_0000000_energy_0000060 = [ ...
+11460.8 11482.4 11482.4 11482.4 11559.1 10216.8 10772 11520.7 11452.5 11460.8
+11482.4 11559.1 11609 11559.1 11073.9 11559.1 10218.8 11559.1 11448.2 11268.6
+9931.41 11291.9 10848.6 11559.1 11370.1 11126.7 11559 11559.1 11493.4 9537.45
+11247.6 9931.41 10848.6 11556.9 11559.1 11078.5 11079.6 11458.5 11531.8 9537.45
+9970.65 9360.24 11493.4 11556.9 11556.9 10456.2 11520.7 10732.7 11559.1 11559.1
+11460.8 9891.74 11460.8 11460.8 10560.8 10557.6 11559.1 11559.1 10596.1 11060.7
+11493.4 9943.94 11603.2 10457.8 11518.6 11146.2 10522.7 10522.7 10596.1 10642.5
+10474.7 11961.7 11559.1 11559.1 11610.2 11460.8 11460.8 10850.2 11519.6 10642.5
+10797.5 10484.1 11613.7 11460.8 11613.7 11460.8 11559.1 11413.1 11520.7 11559.1
+10669.1 10810.4 11613.7 11143.6 10529.4 10772 11487.4 11559.1 11452.5 11559.1
+];
+
+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
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+52122.7 0 0 0 0 0 0 0 0 0
+0 52346 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 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
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+50373 0 0 0 0 0 0 0 0 0
+0 50984.5 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 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 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+48527.7 0 0 0 0 0 0 0 0 0
+0 49814.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
+];
+
+deme_0000000_energy_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
+47049.2 0 0 0 0 0 0 0 0 0
+0 49027.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
+];
+
Added: branches/interrupt/tests/energy_deme_level_res/expected/data/deme_0000001_spatial_energy.m
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/deme_0000001_spatial_energy.m (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/deme_0000001_spatial_energy.m 2009-03-09 14:03:23 UTC (rev 3185)
@@ -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
+52367.3 0 0 0 0 0 0 0 0 0
+52122.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
+0 0 0 0 0 0 0 0 0 0
+51090.9 0 0 0 0 0 0 0 0 0
+50676.2 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 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 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+49878.2 0 0 0 0 0 0 0 0 0
+49080.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_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
+48527.4 0 0 0 0 0 0 0 0 0
+47421.5 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 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/interrupt/tests/energy_deme_level_res/expected/data/deme_donor.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/deme_donor.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/deme_donor.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,17 @@
+# Num orgs doing doing a donate for each deme in population
+# Mon Mar 9 10:06:15 2009
+# 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/interrupt/tests/energy_deme_level_res/expected/data/deme_fitness.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/deme_fitness.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/deme_fitness.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,17 @@
+# Average fitnesses for each deme in the population
+# Mon Mar 9 10:06:15 2009
+# 1: update
+# 2: Deme 0
+# 3: Deme 1
+
+0 0.000000 0.000000
+10 0.267123 0
+20 0.253012 0
+30 0.260206 0
+40 0.262352 0
+50 0.263491 0
+60 0.263816 0
+70 0.192308 0.192308
+80 0.192308 0.192308
+90 0.192308 0.192308
+100 0.192308 0.192308
Added: branches/interrupt/tests/energy_deme_level_res/expected/data/deme_genetic_distance.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/deme_genetic_distance.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/deme_genetic_distance.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,15 @@
+# 1: Update
+# 2: Average genetic Hamming distance between all orgnaisms in deme averaged over all demes
+# 3: Average genetic Levenshtein distance between all orgnaisms in deme averaged over all demes
+
+0 0.000000 0.000000
+10 0 0
+20 2.59583 2.0375
+30 4.14012 1.31855
+40 4.91299 0.963559
+50 5.98862 0.829897
+60 6.82267 0.996337
+70 12.1667 10.6667
+80 12.1667 10.6667
+90 12.1667 10.6667
+100 12.1667 10.6667
Added: branches/interrupt/tests/energy_deme_level_res/expected/data/deme_gest_time.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/deme_gest_time.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/deme_gest_time.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,17 @@
+# Average gestation time for each deme in population
+# Mon Mar 9 10:06:15 2009
+# 1: update
+# 2: Deme 0
+# 3: Deme 1
+
+0 146.000000 0.000000
+10 146 0
+20 143.067 0
+30 144.387 0
+40 145.881 0
+50 147.323 0
+60 146.87 0
+70 104 104
+80 104 104
+90 104 104
+100 104 104
Added: branches/interrupt/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,48 @@
+# Number of times each instruction is exectued in deme 0
+# Mon Mar 9 10:06:15 2009
+# 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 42 0 0 0 0 0 0 0 0 0 0 0 0 0 0 30 210 15 15 588 30 588 0 0 588 0 0 0 0 0 0 0 0
+30 42 0 2 0 0 0 0 0 0 0 0 0 0 0 0 62 432 31 31 1258 62 1258 0 0 1258 0 0 0 0 0 0 0 0
+40 42 0 5 0 0 0 0 0 43 0 0 0 0 0 0 120 819 59 59 2433 118 2433 0 0 2436 0 0 0 0 0 0 0 0
+50 0 0 14 2 6 0 0 0 0 2 2 0 0 0 0 197 1319 96 96 4007 192 4009 0 0 4013 0 1 0 0 0 0 0 2
+60 0 0 20 3 2 2 0 0 2 6 1 0 0 2 0 203 1365 100 100 4173 200 4172 0 0 4174 0 2 0 4 1 4 1 0
+70 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
+80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
+90 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
+100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
Added: branches/interrupt/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,48 @@
+# Number of times each instruction is exectued in deme 1
+# Mon Mar 9 10:06:15 2009
+# 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 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
+80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
+90 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
+100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
Added: branches/interrupt/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,17 @@
+# Average life fitnesses for each deme in the population
+# Mon Mar 9 10:06:15 2009
+# 1: update
+# 2: Deme 0
+# 3: Deme 1
+
+0 0.000000 0.000000
+10 0.267123 0
+20 0.253012 0
+30 0.260206 0
+40 0.262352 0
+50 0.263491 0
+60 0.263816 0
+70 0.192308 0.192308
+80 0.192308 0.192308
+90 0.192308 0.192308
+100 0.192308 0.192308
Added: branches/interrupt/tests/energy_deme_level_res/expected/data/deme_merit.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/deme_merit.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/deme_merit.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,17 @@
+# Average merits for each deme in population
+# Mon Mar 9 10:06:15 2009
+# 1: update
+# 2: Deme 0
+# 3: Deme 1
+
+0 10.000000 0.000000
+10 3.09738 0
+20 1.61755 0
+30 1.32964 0
+40 1.1854 0
+50 1.11982 0
+60 1.0781 0
+70 5.3181 5.3181
+80 5.3181 5.3181
+90 5.3181 5.3181
+100 5.3181 5.3181
Added: branches/interrupt/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,18 @@
+# Average mutation rates for organisms in each deme
+# Mon Mar 9 10:06:15 2009
+# 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/interrupt/tests/energy_deme_level_res/expected/data/deme_receiver.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/deme_receiver.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/deme_receiver.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,17 @@
+# Num orgs doing receiving a donate for each deme in population
+# Mon Mar 9 10:06:15 2009
+# 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/interrupt/tests/energy_deme_level_res/expected/data/deme_resources.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/deme_resources.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/deme_resources.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,19 @@
+# Avida deme resource data
+# Mon Mar 9 10:06:15 2009
+# 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 65.5 30904.2 1 30904.2
+40 138 40901.5 1 41901.3
+50 295 50900.5 1 51900.5
+60 514.5 60900.2 1 60900.2
+70 3 10934.9 3 10934.9
+80 3 20912.2 3 20912.2
+90 3 30904.2 3 30904.2
+100 3 40901.5 3 40901.5
Added: branches/interrupt/tests/energy_deme_level_res/expected/data/deme_spatial_resource_deme_ResB.m
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/deme_spatial_resource_deme_ResB.m (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/deme_spatial_resource_deme_ResB.m 2009-03-09 14:03:23 UTC (rev 3185)
@@ -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/interrupt/tests/energy_deme_level_res/expected/data/deme_spatial_sleep.m
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/deme_spatial_sleep.m (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/deme_spatial_sleep.m 2009-03-09 14:03:23 UTC (rev 3185)
@@ -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 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 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 1 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 1 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
+];
+
+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 0 0 0 1 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 1 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
+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
+];
+
+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 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_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 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 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/interrupt/tests/energy_deme_level_res/expected/data/deme_task.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/deme_task.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/deme_task.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,19 @@
+# Num orgs doing each task for each deme in population
+# Mon Mar 9 10:06:15 2009
+# 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 15 15 0 0
+30 31 31 0 0
+40 59 59 0 0
+50 96 92 0 0
+60 100 97 0 0
+70 2 2 2 2
+80 2 2 2 2
+90 2 2 2 2
+100 2 2 2 2
Added: branches/interrupt/tests/energy_deme_level_res/expected/data/dominant.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/dominant.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/dominant.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,30 @@
+# Avida Dominant Data
+# Mon Mar 9 10:06:15 2009
+# 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.25175 146 0.267123 0.00684932 42 42 39 11 4 3 0 0 0.267123 1 042-aaaaa
+30 1.65767 146 0.267123 0.00684932 42 42 39 20 7 6 0 0 0.267123 1 042-aaaaa
+40 1.41085 146 0.267123 0.00684932 42 42 39 36 15 9 0 0 0.267123 1 042-aaaaa
+50 1.29779 146 0.267123 0.00684932 42 42 39 39 14 9 0 0 0.267123 1 042-aaaaa
+60 1.25377 146 0.267123 0.00684932 42 42 39 38 6 5 0 0 0.272109 1 042-aaaaa
+70 5.3181 104 0.192308 0.00961538 43 43 20 2 0 0 0 0 0.192308 105 043-aaaac
+80 5.3181 104 0.192308 0.00961538 43 43 20 2 0 0 0 0 0.192308 105 043-aaaac
+90 5.3181 104 0.192308 0.00961538 43 43 20 2 0 0 0 0 0.192308 105 043-aaaac
+100 5.3181 104 0.192308 0.00961538 43 43 20 2 0 0 0 0 0.192308 105 043-aaaac
Added: branches/interrupt/tests/energy_deme_level_res/expected/data/instruction.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/instruction.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/instruction.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,48 @@
+# Avida instruction execution data
+# Mon Mar 9 10:06:15 2009
+# 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 42 0 0 0 0 0 0 0 0 0 0 0 0 0 0 30 210 15 15 588 30 588 0 0 588 0 0 0 0 0 0 0 0
+30 42 0 2 0 0 0 0 0 0 0 0 0 0 0 0 62 432 31 31 1258 62 1258 0 0 1258 0 0 0 0 0 0 0 0
+40 42 0 5 0 0 0 0 0 43 0 0 0 0 0 0 120 819 59 59 2433 118 2433 0 0 2436 0 0 0 0 0 0 0 0
+50 0 0 14 2 6 0 0 0 0 2 2 0 0 0 0 197 1319 96 96 4007 192 4009 0 0 4013 0 1 0 0 0 0 0 2
+60 0 0 20 3 2 2 0 0 2 6 1 0 0 2 0 203 1365 100 100 4173 200 4172 0 0 4174 0 2 0 4 1 4 1 0
+70 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 84 8 84 0 0 88 0 0 0 0 0 0 0 0
+80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 84 8 84 0 0 88 0 0 0 0 0 0 0 0
+90 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 84 8 84 0 0 88 0 0 0 0 0 0 0 0
+100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 84 8 84 0 0 88 0 0 0 0 0 0 0 0
Added: branches/interrupt/tests/energy_deme_level_res/expected/data/instruction_histogram.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/instruction_histogram.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/instruction_histogram.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -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 77 1 18 0 0 0 0 0 0 0 0 0 0 0 0 2 17 2 1 1 3 3 0 0 1 0 0 0 0 0 0 0 0
+10 318 4 68 0 0 0 0 0 0 0 0 0 0 0 0 8 65 7 4 4 11 11 0 0 4 0 0 0 0 0 0 0 0
+20 1106 14 232 0 0 0 0 0 0 0 0 0 1 0 0 28 225 22 14 15 36 37 0 0 14 0 1 0 0 0 0 0 0
+30 2271 34 537 0 0 2 0 0 2 0 0 1 1 0 0 70 525 45 35 36 79 82 0 0 37 0 1 0 0 0 0 0 0
+40 3957 71 1078 0 0 1 0 0 1 0 0 1 1 0 1 150 1068 83 71 73 153 156 0 0 76 0 2 0 0 0 0 1 1
+50 6478 115 1816 5 8 2 1 0 0 5 3 1 0 1 0 254 1794 146 115 113 257 259 4 0 122 1 3 0 8 1 1 2 2
+60 6611 120 1946 8 2 3 0 1 4 13 2 2 1 2 2 256 1878 189 121 121 299 284 1 1 124 2 3 0 10 3 7 2 1
+70 91 2 46 0 0 0 0 0 0 0 0 0 0 1 0 4 43 4 2 2 6 6 0 0 4 0 0 0 0 0 0 2 0
+80 91 2 46 0 0 0 0 0 0 0 0 0 0 1 0 4 43 4 2 2 6 6 0 0 4 0 0 0 0 0 0 2 0
+90 91 2 46 0 0 0 0 0 0 0 0 0 0 1 0 4 43 4 2 2 6 6 0 0 4 0 0 0 0 0 0 2 0
+100 180 2 45 0 0 0 0 0 0 0 0 0 0 1 1 4 43 4 2 2 6 5 0 0 3 0 0 1 0 0 0 2 0
Added: branches/interrupt/tests/energy_deme_level_res/expected/data/resource.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/resource.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/resource.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,18 @@
+# Avida resource data
+# Mon Mar 9 10:06:15 2009
+# 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 262
+30 662
+40 1417
+50 3122
+60 5301
+70 5345
+80 5345
+90 5345
+100 5348
Added: branches/interrupt/tests/energy_deme_level_res/expected/data/sleep.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/sleep.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/sleep.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -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 0 0
+50 4 0
+60 3 0
+70 0 0
+80 0 0
+90 0 1
+100 1 0
Added: branches/interrupt/tests/energy_deme_level_res/expected/data/stats.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/stats.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/stats.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,26 @@
+# Generic Statistics Data
+# Mon Mar 9 10:06:15 2009
+# 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.0542725 0.336759 0.33579 0.410617 0.409157 1 0.949594 0 0 0 0
+30 0.0262377 0.336103 0.33579 0.409628 0.409157 2 1.50126 0 0 0 0
+40 0.0180228 0.335708 0.33579 0.409034 0.409157 5 1.75576 0 0 0 0
+50 0.0136904 0.335538 0.33579 0.408777 0.409157 7 2.74953 0 0 0 0
+60 0.0124589 0.335451 0.33579 0.408646 0.409157 0 2.97946 0 0 0 0
+70 0 0.341823 0.340621 0.418281 0.416457 0 1.03972 0 -1 0 0
+80 0 0.341823 0.340621 0.418281 0.416457 0 1.03972 0 -1 0 0
+90 0 0.341823 0.340621 0.418281 0.416457 0 1.03972 0 -1 0 0
+100 0 0.341823 0.340621 0.418281 0.416457 0 1.03972 0 -1 0 0
Added: branches/interrupt/tests/energy_deme_level_res/expected/data/tasks.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/tasks.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/tasks.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,19 @@
+# Avida tasks data
+# Mon Mar 9 10:06:15 2009
+# 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 15 15
+30 31 31
+40 59 59
+50 96 92
+60 100 97
+70 4 4
+80 4 4
+90 4 4
+100 4 4
Added: branches/interrupt/tests/energy_deme_level_res/expected/data/tasks_exe.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/tasks_exe.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/tasks_exe.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,18 @@
+# Avida tasks execution data
+# Mon Mar 9 10:06:15 2009
+# 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 150 30
+30 308 62
+40 585 116
+50 939 183
+60 965 186
+70 40 8
+80 40 8
+90 40 8
+100 40 8
Added: branches/interrupt/tests/energy_deme_level_res/expected/data/time.dat
===================================================================
--- branches/interrupt/tests/energy_deme_level_res/expected/data/time.dat (rev 0)
+++ branches/interrupt/tests/energy_deme_level_res/expected/data/time.dat 2009-03-09 14:03:23 UTC (rev 3185)
@@ -0,0 +1,18 @@
+# Avida time data
+# Mon Mar 9 10:06:15 2009
+# 1: update
+# 2: avida time
+# 3: average generation
+# 4: num_executed?
+
+0 0.000000 0.000000 30
+10 1.60476 2 90
+20 5.80003 3.93333 330
+30 12.4747 5.51613 810
+40 20.3006 7.28814 1470
+50 28.8839 9.42708 2640
+60 38.0382 11.33 3000
+70 40.3939 1 120
+80 42.2743 1 120
+90 44.1547 1 120
+100 46.0351 1 120
More information about the Avida-cvs
mailing list