[Avida-SVN] r2071 - in development/tests/energy_deme_level_res: . expected expected/data
beckma24 at myxo.css.msu.edu
beckma24 at myxo.css.msu.edu
Fri Sep 7 12:36:10 PDT 2007
Author: beckma24
Date: 2007-09-07 15:36:10 -0400 (Fri, 07 Sep 2007)
New Revision: 2071
Added:
development/tests/energy_deme_level_res/expected/
development/tests/energy_deme_level_res/expected/data/
development/tests/energy_deme_level_res/expected/data/average.dat
development/tests/energy_deme_level_res/expected/data/count.dat
development/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m
development/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m
development/tests/energy_deme_level_res/expected/data/deme_donor.dat
development/tests/energy_deme_level_res/expected/data/deme_fitness.dat
development/tests/energy_deme_level_res/expected/data/deme_gest_time.dat
development/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat
development/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat
development/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat
development/tests/energy_deme_level_res/expected/data/deme_merit.dat
development/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat
development/tests/energy_deme_level_res/expected/data/deme_receiver.dat
development/tests/energy_deme_level_res/expected/data/deme_resources.dat
development/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m
development/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m
development/tests/energy_deme_level_res/expected/data/deme_task.dat
development/tests/energy_deme_level_res/expected/data/dominant.dat
development/tests/energy_deme_level_res/expected/data/instruction.dat
development/tests/energy_deme_level_res/expected/data/instruction_histogram.dat
development/tests/energy_deme_level_res/expected/data/resource.dat
development/tests/energy_deme_level_res/expected/data/sleep.dat
development/tests/energy_deme_level_res/expected/data/stats.dat
development/tests/energy_deme_level_res/expected/data/tasks.dat
development/tests/energy_deme_level_res/expected/data/tasks_exe.dat
development/tests/energy_deme_level_res/expected/data/time.dat
Log:
Regenerated energy_deme_level_res tests
Added: development/tests/energy_deme_level_res/expected/data/average.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/average.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/average.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -0,0 +1,30 @@
+# Avida Average Data
+# Fri Sep 7 16:09:20 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 41.75 42 39 2 0.25 0.25 0.25 2 -3.21718 0 0
+20 1.81026 146 0.267123 0 42 42 39 2.75 0.272727 0.272727 0.272727 3.63636 -2.57527 0 0
+30 1.44961 144.087 0.25792 0 42 41.087 37.3478 3.28571 0.173913 0.130435 0.304348 5.04348 -2.95184 0 0
+40 1.21065 145.521 0.264239 0 42.0625 41.5625 38.5 4.36364 0.0625 0.0625 0.270833 7 -3.61784 0 0
+50 1.14769 146.649 0.261818 0 42.1596 41.6277 38.4149 2.41026 0.0744681 0.0319149 0.648936 9.06383 -2.59815 0 0
+60 1.10636 145.67 0.261279 0 42.02 41.65 38.16 2.94118 0.16 0.11 0.65 11.22 -2.0348 0 0
+70 3.76973 144.333 0.265592 0 41.1667 41.1667 38.3333 1.5 0.333333 0.166667 0.666667 1.66667 -1.24153 -1 0
+80 2.23904 143.769 0.26538 0 41.1538 41.1538 38.1538 2.6 0 0 0.615385 2.84615 -1.55024 -1 0
+90 1.35539 144.705 0.263789 0 41.2045 41.1591 38.1591 2.75 0 0 0.886364 4.88636 -0.868435 -1 0
+100 1.01945 144.394 0.259282 0 41.2477 40.789 37.4954 2.27083 0.0550459 0.0275229 1.13761 6.88073 -0.773531 -1 0
Added: development/tests/energy_deme_level_res/expected/data/count.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/count.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/count.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -0,0 +1,30 @@
+# Avida count data
+# Fri Sep 7 16:09:20 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 2 1 0 0 0 1 0 1 3 2 4 0 0
+20 240 11 4 1 0 0 0 3 0 3 8 7 11 0 0
+30 570 23 7 1 0 0 0 4 0 3 17 12 23 0 0
+40 1350 48 11 1 0 0 0 3 0 3 39 26 48 0 0
+50 2730 94 39 6 0 0 0 7 4 3 62 51 94 0 0
+60 3000 100 34 6 0 0 0 16 16 11 71 60 100 0 0
+70 120 6 4 1 0 0 0 2 0 1 3 3 6 0 0
+80 390 13 5 2 0 0 0 0 0 0 9 7 13 0 0
+90 1320 44 16 4 0 0 0 0 0 0 29 25 44 0 0
+100 3120 109 48 6 0 0 0 6 1 3 67 62 109 0 0
Added: development/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m 2007-09-07 19:36:10 UTC (rev 2071)
@@ -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 30896.4
+0 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 30868.5
+];
+
+deme_0000000_energy_0000020 = [ ...
+15824.2 0 0 0 0 0 0 0 15800.5 29803
+0 15832.2 0 0 0 0 0 0 0 15814.7
+0 15836.9 20360.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 0 0 0 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 0 20329.6
+0 15829 0 0 0 0 0 0 0 15840.1
+];
+
+deme_0000000_energy_0000030 = [ ...
+13435.3 0 0 0 0 0 0 0 12534.3 28031.3
+13434 13425.8 13417.7 0 0 0 0 0 12528 13425.8
+13506 13408.1 19614.3 0 0 0 0 12521.8 13470.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
+12538.1 11356.8 0 0 0 0 0 0 0 12534.3
+13406.8 11361.4 0 0 0 0 0 0 0 19577.1
+13455.7 13432.6 0 0 0 0 0 12536.8 0 13451.6
+];
+
+deme_0000000_energy_0000040 = [ ...
+11900.3 11912.3 11887.1 11900.3 0 0 11806.3 11887.1 11883.4 11941.3
+11944.9 11901.5 11894.3 0 0 0 11792.1 11803.9 11895.5 11946.1
+11914.8 11885.9 18655.1 11901.5 0 0 11878.6 11800.4 11977.4 10271.7
+11918.4 11902.7 0 11929.2 0 0 0 12250.9 11969 10284.1
+11900.3 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+11800.4 0 0 0 0 0 0 0 11911.1 11796.8
+11885.9 11045.4 0 0 0 0 0 0 11956.9 11906.3
+11925.6 11909.9 0 0 0 0 0 11935.8 11914.8 11966.5
+11941.3 11926.8 11176.5 0 0 0 0 11878.6 11951.5 11906.3
+];
+
+deme_0000000_energy_0000050 = [ ...
+11569.3 11558.7 11538.9 11538 11550.9 11604.2 11604.2 10942.3 11581 11609.3
+10878.1 10927.6 11558.7 11634.5 11642.7 11506.1 11603.1 11631 11584.5 11610.2
+10910 11563.4 17462.3 11570.4 11604.4 11596.1 11537.7 11639.2 11654.7 11591.5
+11583.3 11591.5 10388 11583.3 11451.9 10224.1 11629.9 11876 11648.9 9372.31
+11565.8 11576.3 11476.7 10398.5 11591.5 11628.7 10224.1 11611.4 10424.2 11507.4
+10444.7 10436.4 0 0 11597.4 0 11614.9 11576.3 10444.1 11485
+11535.3 11578.6 11591.5 0 11625.7 0 11563.7 11603.2 11554.1 11636.9
+11574.2 10734 11539.1 10400.8 0 11640.9 11576.5 10656 11561.1 11631
+11145.2 11629 11546.1 10419.7 11608.9 11574.8 11581.2 11596.4 11599.9 11601.1
+11152 11590.3 10429.2 11570.5 11540.4 11620.5 11572.5 11579.8 11616.3 11561.1
+];
+
+deme_0000000_energy_0000060 = [ ...
+11478.3 11477.1 11589.3 11600.9 11606.9 11611.4 11576.5 11588.1 11212.3 11507.3
+11355.3 11488.7 11618.3 11466.6 11609 11611.4 11564.9 11466.6 11573 11517.8
+11482.9 11616 11518.9 11488.7 11512 11574.2 11598.6 11022.3 11042.4 11513.1
+11605.7 11605.7 11472.4 11524.8 11540.5 11488.7 11578.8 11457.3 11420.1 11593.9
+11583.5 11488.4 11489.9 11493.4 11475.9 11552.7 9962.24 11505 9881.86 11134.2
+11587 11574.2 11497.7 11141.6 11475.9 9966.94 11534.1 11614.8 11614.8 11477.1
+11550.9 11461.5 11466.6 11140.5 10240.5 11483.1 11472.4 11499.3 11480.6 10744.9
+11515.6 11498 11591 10214.7 10229.2 11265.3 11472.6 11462 11513.3 10750.3
+10724.3 11580.6 11598 10229.2 11399.2 11483.3 11463.6 11492.8 9244.99 11516.8
+11425.9 11594.5 11602.1 11473.6 11601.1 11585.8 11458.7 9244.99 11466.6 11460.8
+];
+
+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 30275.5 0 0 0 0 0 0 0 0
+30281.5 0 0 0 0 0 0 0 0 0
+30268.5 0 0 0 0 0 0 0 0 0
+0 30259.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
+];
+
+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 19669.8 0 0 0 0 0 0 0 0
+19607.9 19634 0 0 0 0 0 0 0 0
+19677.1 19685.1 0 0 0 0 0 0 0 19605.9
+0 19613.5 19609.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
+];
+
+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
+12591.7 0 0 11688.7 0 0 0 0 0 12581.5
+12582.8 12604.4 11672.2 0 0 0 0 0 12591.2 12595
+12570.8 12639 12181.8 12163.4 12611 0 0 0 11971 12625
+12644.1 12635.2 12601.9 12617.4 0 0 0 0 11961.4 11957.7
+14614.9 12579.2 12616.1 12609.8 0 0 0 11966.2 0 12669.6
+0 12589.4 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 10172.6 0 0 9559.01 0 0 0 0 0
+11041.8 10167.5 9559.01 9559.01 9559.01 0 0 0 11020.6 11012.8
+10368.6 10366.5 9559.01 9559.01 0 0 0 11066.2 11071.8 11015
+11057.4 10317.4 10316.4 11383 9303.64 0 0 10645.8 12154.6 11041.7
+11072.9 12304.5 11021.6 9303.64 11054.7 9326.02 0 11058.1 10299.3 11024.9
+11080.4 11058.1 12194.5 11098.2 11116.1 11070.3 10300.3 10284.8 11054.7 10293.1
+14008.9 11032.4 11049.1 11387.4 11050.3 0 10296.2 10304.4 10047.9 11069.2
+11040.2 11051.4 11068.1 11041.3 0 11061.4 0 10305.5 10048.9 11107
+11372.5 0 11055.8 0 11068.1 0 0 0 11121.5 11032.4
+];
+
Added: development/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m 2007-09-07 19:36:10 UTC (rev 2071)
@@ -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
+0 51811.7 0 0 0 0 0 0 0 0
+51785.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
+];
+
+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
+0 48902.1 0 0 0 0 0 0 0 19665.6
+19667.6 19663.6 19653.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 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 12592.4 0
+12621.7 43959.9 12621.7 0 0 0 0 0 12595 12621.7
+12630.6 12587.3 12565.7 0 0 0 0 0 12644.6 12616.6
+12615.3 12578.4 12586.1 0 0 0 0 0 0 12621.7
+0 0 12573.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
+];
+
+deme_0000001_energy_0000100 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 10919.2 0
+11044.2 0 0 0 0 0 0 11033.9 10924.7 11000.4
+11078.5 11064.3 0 11109.7 10351.3 0 0 0 11046.1 11365.2
+11040.9 11038.3 11093 10363.8 0 0 0 11126.5 11039.4 11069.6
+11088.5 11019.4 11046.1 11065.1 11081.9 0 0 11409.5 11124.3 11052.8
+11072.9 11090.8 11021.6 11022.7 0 0 0 0 11089.7 11086.3
+11011.6 11085.2 11040.6 11049.5 11062.9 0 0 10603.7 11116.5 11065.1
+11050.6 11019.4 11070.7 0 0 0 0 11119.8 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
Added: development/tests/energy_deme_level_res/expected/data/deme_donor.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_donor.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_donor.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -0,0 +1,17 @@
+# Num orgs doing doing a donate for each deme in population
+# Fri Sep 7 16:09:20 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: development/tests/energy_deme_level_res/expected/data/deme_fitness.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_fitness.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_fitness.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -0,0 +1,17 @@
+# Average fitnesses for each deme in the population
+# Fri Sep 7 16:09:20 2007
+# 1: update
+# 2: Deme 0
+# 3: Deme 1
+
+0 0.000000 0.000000
+10 0.267123 0
+20 0.267123 0
+30 0.25792 0
+40 0.264239 0
+50 0.261818 0
+60 0.261279 0
+70 0.26552 0.265734
+80 0.265158 0.265734
+90 0.262677 0.265734
+100 0.255996 0.264135
Added: development/tests/energy_deme_level_res/expected/data/deme_gest_time.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_gest_time.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_gest_time.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -0,0 +1,17 @@
+# Average gestation time for each deme in population
+# Fri Sep 7 16:09:20 2007
+# 1: update
+# 2: Deme 0
+# 3: Deme 1
+
+0 146.000000 0.000000
+10 146 0
+20 146 0
+30 144.087 0
+40 145.521 0
+50 146.649 0
+60 145.67 0
+70 145 143
+80 144.25 143
+90 145.679 143
+100 144.492 144.25
Added: development/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -0,0 +1,48 @@
+# Number of times each instruction is exectued in deme 0
+# Fri Sep 7 16:09:20 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 0 0 0 0 0 0 0 0 0 0 0 0 0 22 154 11 11 462 22 462 0 0 462 0 0 0 0 0 0 0 0
+30 42 0 0 0 42 2 0 0 0 0 0 0 0 0 0 46 320 23 23 924 46 924 0 0 882 0 0 0 0 0 0 0 0
+40 21 0 2 0 21 1 0 0 0 0 0 0 0 0 0 93 666 48 48 1995 96 1995 0 0 1975 0 0 4 0 0 0 0 0
+50 63 0 5 0 23 1 0 0 0 0 0 4 0 3 44 181 1308 94 94 3894 190 3893 0 88 3835 0 0 2 0 0 0 0 0
+60 82 0 52 1 1 2 0 0 0 0 0 0 0 5 42 195 1387 100 100 4123 200 4123 2 3 4046 0 0 0 0 2 0 0 0
+70 0 2 4 0 0 0 0 0 0 0 0 0 0 0 0 8 52 4 4 166 8 166 0 0 166 0 0 0 0 0 0 0 0
+80 0 4 8 0 0 0 0 0 0 0 0 0 0 0 0 16 104 8 8 330 16 330 0 0 330 0 0 0 0 0 0 0 0
+90 0 14 32 0 0 0 0 0 2 0 0 0 0 0 0 58 356 28 28 1155 56 1155 0 0 1155 0 0 0 0 4 0 0 0
+100 42 32 75 0 0 0 2 0 6 46 0 0 0 0 0 131 820 65 65 2599 130 2599 0 0 2557 0 0 0 3 10 2 0 0
Added: development/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -0,0 +1,48 @@
+# Number of times each instruction is exectued in deme 1
+# Fri Sep 7 16:09:20 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 2 0 0 0 0 0 0 0 0 0 0 0 0 4 26 2 2 82 4 82 0 0 82 0 0 0 0 0 0 0 0
+80 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 10 65 5 5 205 10 205 0 0 205 0 0 0 0 0 0 0 0
+90 0 0 16 0 0 0 0 0 0 0 0 0 0 0 0 32 208 16 16 656 32 656 0 0 656 0 0 0 0 0 0 0 0
+100 0 0 46 0 0 0 0 2 0 0 0 1 0 0 0 88 570 44 44 1807 88 1807 0 0 1807 3 0 0 0 0 2 0 0
Added: development/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -0,0 +1,17 @@
+# Average life fitnesses for each deme in the population
+# Fri Sep 7 16:09:20 2007
+# 1: update
+# 2: Deme 0
+# 3: Deme 1
+
+0 0.000000 0.000000
+10 0.267123 0
+20 0.267123 0
+30 0.25792 0
+40 0.264239 0
+50 0.261818 0
+60 0.261279 0
+70 0.26552 0.265734
+80 0.265158 0.265734
+90 0.262677 0.265734
+100 0.255996 0.264135
Added: development/tests/energy_deme_level_res/expected/data/deme_merit.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_merit.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_merit.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -0,0 +1,17 @@
+# Average merits for each deme in population
+# Fri Sep 7 16:09:20 2007
+# 1: update
+# 2: Deme 0
+# 3: Deme 1
+
+0 10.000000 0.000000
+10 3.09738 0
+20 1.81026 0
+30 1.44961 0
+40 1.21065 0
+50 1.14769 0
+60 1.10636 0
+70 3.02856 5.25207
+80 1.98782 2.641
+90 1.2605 1.52144
+100 0.956297 1.11275
Added: development/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -0,0 +1,18 @@
+# Average mutation rates for organisms in each deme
+# Fri Sep 7 16:09:20 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: development/tests/energy_deme_level_res/expected/data/deme_receiver.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_receiver.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_receiver.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -0,0 +1,17 @@
+# Num orgs doing receiving a donate for each deme in population
+# Fri Sep 7 16:09:20 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: development/tests/energy_deme_level_res/expected/data/deme_resources.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_resources.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_resources.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -0,0 +1,19 @@
+# Avida deme resource data
+# Fri Sep 7 16:09:20 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 17.5 20912.2 1 20912.2
+30 42 30904.2 1 30904.2
+40 109 40901.5 1 40901.5
+50 265.5 50900.5 1 50900.5
+60 464.5 60900.2 1 60900.2
+70 4 10934.9 4 10934.9
+80 16 20912.2 10 20912.2
+90 58.5 30904.2 33 30904.2
+100 139.5 40901.5 106 40901.5
Added: development/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m 2007-09-07 19:36:10 UTC (rev 2071)
@@ -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
+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_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
+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_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: development/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m 2007-09-07 19:36:10 UTC (rev 2071)
@@ -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 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 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_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 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 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 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
+];
+
+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: development/tests/energy_deme_level_res/expected/data/deme_task.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_task.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_task.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -0,0 +1,19 @@
+# Num orgs doing each task for each deme in population
+# Fri Sep 7 16:09:20 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 11 11 0 0
+30 23 23 0 0
+40 48 48 0 0
+50 94 92 0 0
+60 100 97 0 0
+70 4 4 2 2
+80 8 8 5 5
+90 28 28 16 16
+100 65 65 44 44
Added: development/tests/energy_deme_level_res/expected/data/dominant.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/dominant.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/dominant.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -0,0 +1,30 @@
+# Avida Dominant Data
+# Fri Sep 7 16:09:20 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 3 1 1 0 0 0.267123 1 042-aaaaa
+20 2.40352 146 0.267123 0.00684932 42 42 39 8 3 3 0 0 0.267123 1 042-aaaaa
+30 1.84153 146 0.267123 0.00684932 42 42 39 17 3 3 0 0 0.267123 1 042-aaaaa
+40 1.46002 146 0.267123 0.00684932 42 42 39 36 3 3 0 0 0.267123 1 042-aaaaa
+50 1.3038 146 0.267123 0.00684932 42 42 39 42 4 2 0 0 0.272727 1 042-aaaaa
+60 1.24913 146 0.267123 0.00684932 42 42 39 45 11 7 0 0 0.267123 1 042-aaaaa
+70 4.51107 143 0.265734 0.00699301 41 41 38 2 1 0 0 0 0.265734 85 041-aaaaa
+80 3.21814 143 0.265734 0.00699301 41 41 38 5 0 0 0 0 0.265734 85 041-aaaaa
+90 1.94358 143 0.265734 0.00699301 41 41 38 15 0 0 0 0 0.265734 85 041-aaaaa
+100 1.43684 143 0.265734 0.00699301 41 41 38 31 1 0 0 0 0.265734 85 041-aaaaa
Added: development/tests/energy_deme_level_res/expected/data/instruction.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/instruction.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/instruction.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -0,0 +1,48 @@
+# Avida instruction execution data
+# Fri Sep 7 16:09:20 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 0 0 0 0 0 0 0 0 0 0 0 0 0 22 154 11 11 462 22 462 0 0 462 0 0 0 0 0 0 0 0
+30 42 0 0 0 42 2 0 0 0 0 0 0 0 0 0 46 320 23 23 924 46 924 0 0 882 0 0 0 0 0 0 0 0
+40 21 0 2 0 21 1 0 0 0 0 0 0 0 0 0 93 666 48 48 1995 96 1995 0 0 1975 0 0 4 0 0 0 0 0
+50 63 0 5 0 23 1 0 0 0 0 0 4 0 3 44 181 1308 94 94 3894 190 3893 0 88 3835 0 0 2 0 0 0 0 0
+60 82 0 52 1 1 2 0 0 0 0 0 0 0 5 42 195 1387 100 100 4123 200 4123 2 3 4046 0 0 0 0 2 0 0 0
+70 0 2 6 0 0 0 0 0 0 0 0 0 0 0 0 12 78 6 6 248 12 248 0 0 248 0 0 0 0 0 0 0 0
+80 0 4 13 0 0 0 0 0 0 0 0 0 0 0 0 26 169 13 13 535 26 535 0 0 535 0 0 0 0 0 0 0 0
+90 0 14 48 0 0 0 0 0 2 0 0 0 0 0 0 90 564 44 44 1811 88 1811 0 0 1811 0 0 0 0 4 0 0 0
+100 42 32 121 0 0 0 2 2 6 46 0 1 0 0 0 219 1390 109 109 4406 218 4406 0 0 4364 3 0 0 3 10 4 0 0
Added: development/tests/energy_deme_level_res/expected/data/instruction_histogram.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/instruction_histogram.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/instruction_histogram.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -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 3 56 0 0 0 0 0 0 0 0 0 0 0 0 8 56 7 4 4 11 8 0 0 4 0 0 0 0 0 0 0 0
+20 966 10 147 0 0 0 0 0 0 0 0 0 0 0 0 18 126 29 11 14 32 20 0 0 12 0 1 0 0 0 0 0 0
+30 1449 22 449 0 1 2 0 0 0 0 0 0 0 0 0 58 428 50 24 30 68 55 0 0 26 0 1 3 0 0 0 1 0
+40 3026 48 1107 0 1 2 1 0 0 2 0 3 0 2 0 136 1089 97 51 61 146 135 0 1 57 0 0 8 0 0 0 0 0
+50 6163 94 1923 0 3 3 2 0 0 1 1 7 0 6 5 232 1876 202 100 107 296 254 0 6 105 0 2 3 4 2 2 7 0
+60 6379 100 1954 3 1 3 2 1 1 2 0 0 1 7 2 253 1933 176 109 116 286 256 2 7 118 0 0 1 1 5 2 2 1
+70 474 8 84 0 0 0 0 0 0 0 0 0 0 0 0 12 78 23 7 6 29 13 0 0 7 0 0 0 0 0 0 0 0
+80 732 21 322 0 0 0 0 0 1 0 0 0 0 0 0 42 297 41 15 17 57 39 0 0 18 0 0 1 0 2 0 0 0
+90 2863 69 942 1 0 0 0 1 4 2 0 0 0 0 1 110 831 104 43 48 151 123 0 0 47 2 0 2 8 4 1 0 0
+100 6680 154 2108 5 3 1 6 3 8 10 1 4 0 1 2 246 1880 202 111 116 310 281 4 2 116 7 1 6 11 11 5 0 1
Added: development/tests/energy_deme_level_res/expected/data/resource.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/resource.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/resource.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -0,0 +1,18 @@
+# Avida resource data
+# Fri Sep 7 16:09:20 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 193
+30 383
+40 1107
+50 2811
+60 4908
+70 4964
+80 5123
+90 5700
+100 7091
Added: development/tests/energy_deme_level_res/expected/data/sleep.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/sleep.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/sleep.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -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 0 0
+60 0 0
+70 0 0
+80 0 0
+90 0 0
+100 1 0
Added: development/tests/energy_deme_level_res/expected/data/stats.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/stats.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/stats.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -0,0 +1,26 @@
+# Generic Statistics Data
+# Fri Sep 7 16:09:20 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.334577 0.33579 0.407332 0.409157 0 0.562335 0 0 0 0
+20 0 0.33579 0.33579 0.409157 0.409157 0 0.885574 0 0 0 0
+30 0.0350592 0.33579 0.33579 0.409157 0.409157 1 1.04138 0 0 0 0
+40 0.0108545 0.336093 0.33579 0.409613 0.409157 0 1.1258 0 0 0 0
+50 0.0200609 0.336563 0.33579 0.410322 0.409157 4 2.61504 0 0 0 0
+60 0.0221213 0.335887 0.33579 0.409303 0.409157 -3 2.49965 0 0 0 0
+70 0.000537201 0.331738 0.330924 0.403075 0.401858 1 1.32966 0 0 0 0
+80 0.00133527 0.331675 0.330924 0.402981 0.401858 0 1.41274 0 0 0 0
+90 0.00734858 0.331922 0.330924 0.403351 0.401858 0 2.17912 0 0 0 0
+100 0.0245821 0.332133 0.330924 0.403666 0.401858 3 3.04144 0 0 0 0
Added: development/tests/energy_deme_level_res/expected/data/tasks.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/tasks.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/tasks.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -0,0 +1,19 @@
+# Avida tasks data
+# Fri Sep 7 16:09:20 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 11 11
+30 23 23
+40 48 48
+50 94 92
+60 100 97
+70 6 6
+80 13 13
+90 44 44
+100 109 109
Added: development/tests/energy_deme_level_res/expected/data/tasks_exe.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/tasks_exe.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/tasks_exe.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -0,0 +1,18 @@
+# Avida tasks execution data
+# Fri Sep 7 16:09:20 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 110 22
+30 228 44
+40 475 92
+50 924 172
+60 986 188
+70 54 12
+80 117 26
+90 386 88
+100 953 209
Added: development/tests/energy_deme_level_res/expected/data/time.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/time.dat (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/time.dat 2007-09-07 19:36:10 UTC (rev 2071)
@@ -0,0 +1,18 @@
+# Avida time data
+# Fri Sep 7 16:09:20 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.59914 3.63636 240
+30 11.5839 5.04348 570
+40 19.2077 7 1350
+50 27.907 9.06383 2730
+60 36.7739 11.22 3000
+70 38.9856 1.66667 120
+80 42.5677 2.84615 390
+90 48.8138 4.88636 1320
+100 57.1728 6.88073 3120
More information about the Avida-cvs
mailing list