[Avida-SVN] r3286 - in development: source/main tests/energy_deme_level_res tests/energy_deme_level_res/expected tests/energy_deme_level_res/expected/data
beckma24 at myxo.css.msu.edu
beckma24 at myxo.css.msu.edu
Thu Jun 4 08:41:55 PDT 2009
Author: beckma24
Date: 2009-06-04 11:41:55 -0400 (Thu, 04 Jun 2009)
New Revision: 3286
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_spatial_energy.m
development/tests/energy_deme_level_res/expected/data/deme_0000001_spatial_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_spatial_resource_deme_ResB.m
development/tests/energy_deme_level_res/expected/data/deme_spatial_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
Modified:
development/source/main/cBirthChamber.cc
development/source/main/cPopulation.cc
Log:
BUG FIX: offspring are put in scheduler with zero merit. This cause a problem with the energy model in that the scheduler is being asked to schedule zero merit organisms. Bug has been fixed in energy model using asexual organisms. Code, with comment describing how to incorperate, has been add to cPopulation::ActivateOffspring that will fix this problem in general, but it breaks consistancy, so it is commented out for now.
Modified: development/source/main/cBirthChamber.cc
===================================================================
--- development/source/main/cBirthChamber.cc 2009-06-04 15:33:40 UTC (rev 3285)
+++ development/source/main/cBirthChamber.cc 2009-06-04 15:41:55 UTC (rev 3286)
@@ -175,6 +175,11 @@
// set child energy & merit
child_array[0]->GetPhenotype().SetEnergy(child_energy);
merit_array[0] = child_array[0]->GetPhenotype().ConvertEnergyToMerit(child_array[0]->GetPhenotype().GetStoredEnergy());
+ if(merit_array[0].GetDouble() <= 0.0) { // do not allow zero merit
+ child_array.Resize(0);
+ merit_array.Resize(0);
+ return false;
+ }
} else {
merit_array[0] = parent.GetPhenotype().GetMerit();
}
Modified: development/source/main/cPopulation.cc
===================================================================
--- development/source/main/cPopulation.cc 2009-06-04 15:33:40 UTC (rev 3285)
+++ development/source/main/cPopulation.cc 2009-06-04 15:41:55 UTC (rev 3286)
@@ -346,7 +346,14 @@
// Loop through choosing the later placement of each child in the population.
bool parent_alive = true; // Will the parent live through this process?
for (int i = 0; i < child_array.GetSize(); i++) {
-/* if(merit_array[i].GetDouble() <= 0.0) {
+/*
+ THIS code will remove zero merit orgnaisms, thus never putting them into the scheduler.
+ WARNING: uncommenting this code will break consistancy, but will generalize the solution.
+ Currently, only asexual organisms that use the energy model are removed when they have zero merit.
+ If this code gets added then remove the "if(merit_array[0].GetDouble() <= 0.0)" block from cBirthChamber::DoAsexBirth,
+ does not break consistancy for test energy_deme_level_res
+
+ if(merit_array[i].GetDouble() <= 0.0) {
// no weaklings!
if(child_array.GetSize() > 1) {
child_array.Swap(i, child_array.GetSize()-1);
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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -0,0 +1,30 @@
+# Avida Average Data
+# Thu Jun 4 11:34:53 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.2278 146.105 0.262249 0 42.0526 41.6491 38.3509 3.35294 0.298246 0.192982 0.385965 7.22807 -1.72025 0 0
+50 1.1816 145.208 0.262503 0 42.0938 41.5729 38.2188 2.52632 0.125 0.03125 0.635417 9.05208 -2.17 0 0
+60 1.15216 145.97 0.261533 0 42.07 41.43 38.25 2.22222 0.24 0.18 0.82 11.16 -2.37848 0 0
+70 3.34475 147 0.265306 0 42.1429 42 39 3.5 0.285714 0.285714 0.142857 1.85714 1.7118 -1 0
+80 1.66198 147.667 0.265239 0 42.0833 42.125 39.1667 2.4 0.25 0.0833333 0.5 3.66667 2.27846 -1 0
+90 1.24357 147.889 0.264891 0 42.8095 42.1905 39.1746 2.42308 0.206349 0.142857 0.857143 5.33333 1.89711 -1 0
+100 1.10318 151.167 0.256437 0 42.9917 41.8667 38.5667 2.10526 0.1 0.0416667 1.28333 7.11667 1.77786 -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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -0,0 +1,30 @@
+# Avida count data
+# Thu Jun 4 11:34:53 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 57 17 3 0 0 0 17 9 11 42 34 57 0 0
+50 2790 96 38 5 0 0 0 12 9 3 60 55 96 0 0
+60 3000 100 45 9 0 0 0 24 24 18 67 58 100 0 0
+70 150 7 2 1 0 0 0 2 0 2 6 4 7 0 0
+80 540 24 10 2 0 0 0 6 0 2 15 13 24 0 0
+90 1590 63 26 5 0 0 0 13 3 9 38 36 63 0 0
+100 3300 120 57 9 0 0 0 12 2 5 67 65 120 0 0
Added: development/tests/energy_deme_level_res/expected/data/deme_0000000_spatial_energy.m
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_0000000_spatial_energy.m (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_0000000_spatial_energy.m 2009-06-04 15:41:55 UTC (rev 3286)
@@ -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 11798.2 0 11942.5 11752
+11798 11802.7 11814.8 11803.9 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 10996 0
+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
+11801.6 11808.7 11869 11869 0 11869 11902.7 11869 11802.7 11808.7
+11808.7 11869 11808.7 11805.7 0 0 12145.6 11752 11806.3 11869
+];
+
+deme_0000000_energy_0000050 = [ ...
+11534.2 10581.8 14125.2 11621.1 11534.2 11492.5 11593.7 14072.7 11653.2 11533
+17586.3 11156.4 11649.7 14090.3 11451.9 11534.2 11593.7 11525.7 11649.7 11534.2
+11633.4 11649.7 11163.1 11653.2 11534.2 11525.7 11525.7 11527.3 11605.6 11407
+11649.7 11593.7 11566.9 11646.5 11640.7 0 11527.3 11525.7 11605.6 11648.5
+11534.2 11593.7 11489.7 11641.9 11634.9 0 0 11605.6 10729.7 11565.8
+10702.5 11534.2 10726.5 0 11534.2 10645.3 10645.3 11593.7 10729.7 11566.9
+11566.9 10726.5 11566.9 11534.2 11566.9 11630.2 11633.7 11632.2 11566.9 10767
+10769.2 12476.9 11566.9 11566.9 11566.9 11566.9 11532.4 11566.9 11593.7 11534.2
+10936.4 11566.9 11532.2 11566.9 11534.2 11534.2 11534.2 11534.2 11593.7 11593.7
+11534.2 11566.9 11534.2 11532.2 11566.9 11534.2 11566.9 11565.8 11566.9 10937.5
+];
+
+deme_0000000_energy_0000060 = [ ...
+11466.2 10652.3 10651.3 11242 11599.7 11559.1 11493.4 13445 11460.8 10180.8
+11603.2 10812.8 11300.1 13507.7 11112.9 11460.8 11259.3 11493.4 11460.8 11059.6
+10765.2 10812.8 10802 11349 11464.9 11462.2 11452.1 11570.1 11493.4 11102.3
+11605.6 11482.4 10567.7 10569.8 11610.4 11604.6 11321.4 11553.8 11531.8 10802.3
+11481.2 11460.8 11609.2 11493.4 11556.9 11610.2 11559.1 11553.8 11608.4 11607.2
+10802.3 11603.4 10991 11493.4 11559.1 10079.3 11615.5 11559.1 11559.1 11600.9
+10623 10183 11559.1 11460.8 11493.4 11595.3 11605.7 11493.4 11557.9 10917.9
+10920.1 12006.6 10183 11486.4 10611.9 11460.8 11493.4 11493.4 11460.8 10623
+11602.3 11611.6 11458.7 11458.7 11559.1 11586.3 10802.3 11559.1 11559.1 11604.6
+11610.4 11493.4 11493.4 11611.4 11603.2 11559.1 10840.3 10802.3 11559.1 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 0 0 0 0 0 0 0 0 0
+30114.3 0 0 0 0 0 0 0 0 0
+30262.7 30114.3 0 0 0 0 0 0 0 30262.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
+];
+
+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
+14918.9 14996.9 0 0 0 0 0 0 0 14920.4
+14969.9 14993.9 14977.4 0 0 0 0 0 19512.1 0
+14993.9 14993.9 14975.9 0 0 0 0 0 14974.4 19577.6
+14993.9 0 0 0 0 0 0 0 0 14974.4
+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 12334.5
+12335.7 12333.3 0 0 0 0 0 0 11592.4 0
+12332 14530.5 12533.8 0 0 0 0 0 12491.8 11592.4
+12533.8 12533.8 11634.3 12063.8 0 0 0 11641.3 18779 11649.5
+11649.5 12653.4 10949.3 11643.6 0 0 0 0 11640.1 12533.8
+12071.5 12555.4 0 10940.5 0 0 0 0 11396 12569.4
+0 0 0 0 0 0 0 11396 0 12102.2
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_energy_0000100 = [ ...
+0 0 0 0 0 0 0 0 0 0
+11744.4 10807 0 0 0 0 0 0 11061 11316.7
+11706.8 10812.4 11764.8 0 0 0 0 10904.9 10863.4 11064.4
+11706.8 11758.9 11023.3 11022.2 0 0 0 10906 10863.4 11761.6
+11709.1 10990.9 11022.2 11025 11025 0 0 10863.4 12072.1 11022.2
+11022.2 10202.4 10990.9 10228.3 10199.3 0 0 10901.6 17787.6 10990.9
+10990.9 11477.5 10199.3 10990.9 10228.3 10229.3 0 10912.5 10978.5 11022.2
+10233.1 12129.3 10674.6 10199.3 11022.2 0 10911.4 11004.2 11059 10990.9
+10207.2 10233.1 10198.3 10674.6 0 0 0 11023.3 11022.2 10233.1
+10233.1 0 0 0 0 0 0 0 11022.2 10267.3
+];
+
Added: development/tests/energy_deme_level_res/expected/data/deme_0000001_spatial_energy.m
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_0000001_spatial_energy.m (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_0000001_spatial_energy.m 2009-06-04 15:41:55 UTC (rev 3286)
@@ -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 51714.2 0 0 0 0 0 0 0 0
+30262.7 0 0 0 0 0 0 0 0 0
+0 30271.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
+];
+
+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
+19621 0 19559.4 0 0 0 0 0 0 0
+0 19559.4 0 19559.4 0 0 0 0 0 0
+14993.9 14993.9 19577.6 0 0 0 0 0 0 19512.1
+0 14993.9 0 0 0 0 0 0 0 0
+14998.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
+];
+
+deme_0000001_energy_0000090 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+12521.9 0 12520.7 12561.4 0 0 0 0 0 12257.7
+12216.9 12521.9 12521.9 12521.9 12521.9 0 0 0 0 12216.9
+11641.3 12521.9 12521.9 12521.9 0 0 0 0 12257.7 11637.8
+11639 12071.5 11648.3 12065.8 12561.4 12561.4 0 0 11641.3 18755.1
+11634.3 12533.8 10947.4 11648.3 12051.1 0 0 0 0 11639
+11649.5 0 10952.9 0 0 0 0 0 0 11649.5
+0 12533.8 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 10292.9 0 0 0 0 0 0
+10981.7 10391.9 11017.4 11016.3 10327.3 0 0 0 10631.8 0
+11016.3 11053.1 10630.7 10361.8 11016.3 0 0 10863.4 10631.8 10667.2
+10631.8 10631.8 10361.8 11016.3 11016.3 11016.3 10686.2 10631.8 10863.4 10596.4
+10889.3 10631.8 10981.7 11016.3 11016.3 10981.7 0 10699.1 10664.8 10596.4
+10892.5 10207.2 10233.1 10213.7 10227.2 0 0 10990.9 10990.9 10909.2
+10901.6 10990.9 10207.2 10990.9 11627.4 10217.9 0 0 10990.9 10907.1
+10990.9 10885.2 10207.2 10197.9 10990.9 0 0 0 10989.8 11022.2
+0 10986.5 0 10206.2 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_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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -0,0 +1,17 @@
+# Num orgs doing doing a donate for each deme in population
+# Thu Jun 4 11:34:53 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: 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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -0,0 +1,17 @@
+# Average fitnesses for each deme in the population
+# Thu Jun 4 11:34:53 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.262249 0
+50 0.262503 0
+60 0.261533 0
+70 0.265306 0.265306
+80 0.265306 0.265144
+90 0.264776 0.26499
+100 0.25159 0.26145
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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -0,0 +1,17 @@
+# Average gestation time for each deme in population
+# Thu Jun 4 11:34:53 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 146.105 0
+50 145.208 0
+60 145.97 0
+70 147 147
+80 147 148.6
+90 147.034 148.618
+100 150.672 151.678
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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -0,0 +1,48 @@
+# Number of times each instruction is exectued in deme 0
+# Thu Jun 4 11:34:53 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 3 0 0 0 0 0 43 0 0 0 0 0 0 115 795 57 57 2353 114 2353 0 0 2356 0 0 0 0 0 0 0 0
+50 52 0 9 2 0 0 2 0 0 3 0 0 0 0 0 194 1332 96 96 3951 192 3951 0 0 3956 0 2 2 13 0 0 0 0
+60 66 0 32 3 0 0 1 0 0 3 2 2 0 0 0 201 1379 100 100 4120 200 4120 0 11 4106 1 1 3 13 0 0 1 0
+70 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 8 56 4 4 168 8 168 0 0 168 0 0 0 0 0 0 0 0
+80 0 0 0 0 0 0 0 0 0 14 0 0 0 0 0 28 196 14 14 588 28 588 0 0 588 0 0 0 0 0 0 0 0
+90 0 0 2 0 0 0 0 0 0 29 0 3 0 0 0 58 406 29 29 1216 58 1216 0 0 1216 0 0 0 2 0 0 0 0
+100 84 0 51 0 2 0 0 42 0 61 0 10 0 2 0 122 851 61 61 2472 122 2472 0 0 2430 4 0 0 0 0 0 0 3
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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -0,0 +1,48 @@
+# Number of times each instruction is exectued in deme 1
+# Thu Jun 4 11:34:53 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 3 0 0 0 0 0 6 42 3 3 126 6 126 0 0 126 0 0 0 0 0 0 0 0
+80 0 0 0 0 0 0 0 0 0 10 0 0 0 0 0 20 140 10 10 424 20 424 0 0 424 4 0 0 0 0 0 0 0
+90 0 2 3 0 0 0 0 4 0 34 0 0 0 0 0 64 469 34 34 1441 68 1441 2 0 1441 16 0 0 0 0 0 0 0
+100 2 5 10 0 0 0 4 13 0 59 0 86 0 0 0 105 803 59 59 2510 118 2510 4 1 2510 31 0 0 0 0 3 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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -0,0 +1,17 @@
+# Average life fitnesses for each deme in the population
+# Thu Jun 4 11:34:53 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.262249 0
+50 0.262503 0
+60 0.261533 0
+70 0.265306 0.265306
+80 0.265306 0.265144
+90 0.264776 0.26499
+100 0.25159 0.26145
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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -0,0 +1,17 @@
+# Average merits for each deme in population
+# Thu Jun 4 11:34:53 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.2278 0
+50 1.1816 0
+60 1.15216 0
+70 3.02717 3.76817
+80 1.5694 1.79158
+90 1.24467 1.24264
+100 1.11917 1.08665
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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -0,0 +1,18 @@
+# Average mutation rates for organisms in each deme
+# Thu Jun 4 11:34:53 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: 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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -0,0 +1,17 @@
+# Num orgs doing receiving a donate for each deme in population
+# Thu Jun 4 11:34:53 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: 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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -0,0 +1,19 @@
+# Avida deme resource data
+# Thu Jun 4 11:34:53 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 296.5 50900.5 1 51900.5
+60 512 60900.2 1 60900.2
+70 6 10934.9 4 10934.9
+80 18.5 20912.2 15.5 20912.2
+90 57.5 30904.2 53.5 30904.2
+100 139 40901.5 149 40901.5
Added: development/tests/energy_deme_level_res/expected/data/deme_spatial_resource_deme_ResB.m
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_spatial_resource_deme_ResB.m (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_spatial_resource_deme_ResB.m 2009-06-04 15:41:55 UTC (rev 3286)
@@ -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: development/tests/energy_deme_level_res/expected/data/deme_spatial_sleep.m
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_spatial_sleep.m (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_spatial_sleep.m 2009-06-04 15:41:55 UTC (rev 3286)
@@ -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 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 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
+];
+
+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 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
+];
+
+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
+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 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
+];
+
+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 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
+];
+
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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -0,0 +1,19 @@
+# Num orgs doing each task for each deme in population
+# Thu Jun 4 11:34:53 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 57 57 0 0
+50 96 96 0 0
+60 100 100 0 0
+70 4 4 3 3
+80 14 14 10 10
+90 29 29 34 34
+100 61 61 59 59
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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -0,0 +1,30 @@
+# Avida Dominant Data
+# Thu Jun 4 11:34:53 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.41391 146 0.267123 0.00684932 42 42 39 37 14 8 0 0 0.267123 1 042-aaaaa
+50 1.30456 146 0.267123 0.00684932 42 42 39 45 6 1 0 0 0.267123 1 042-aaaaa
+60 1.2547 146 0.267123 0.00684932 42 42 39 36 11 8 0 0 0.267606 1 042-aaaaa
+70 3.91637 147 0.265306 0.00680272 42 42 39 6 2 2 0 0 0.265306 99 042-aaaag
+80 2.28954 147 0.265306 0.00680272 42 42 39 13 6 2 0 0 0.265306 99 042-aaaag
+90 1.70738 147 0.265306 0.00680272 42 42 39 22 9 7 0 0 0.265306 99 042-aaaag
+100 1.45212 147 0.265306 0.00680272 42 42 39 28 6 2 0 0 0.265306 99 042-aaaag
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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -0,0 +1,48 @@
+# Avida instruction execution data
+# Thu Jun 4 11:34:53 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 3 0 0 0 0 0 43 0 0 0 0 0 0 115 795 57 57 2353 114 2353 0 0 2356 0 0 0 0 0 0 0 0
+50 52 0 9 2 0 0 2 0 0 3 0 0 0 0 0 194 1332 96 96 3951 192 3951 0 0 3956 0 2 2 13 0 0 0 0
+60 66 0 32 3 0 0 1 0 0 3 2 2 0 0 0 201 1379 100 100 4120 200 4120 0 11 4106 1 1 3 13 0 0 1 0
+70 0 0 0 0 0 0 0 0 0 7 0 0 0 0 0 14 98 7 7 294 14 294 0 0 294 0 0 0 0 0 0 0 0
+80 0 0 0 0 0 0 0 0 0 24 0 0 0 0 0 48 336 24 24 1012 48 1012 0 0 1012 4 0 0 0 0 0 0 0
+90 0 2 5 0 0 0 0 4 0 63 0 3 0 0 0 122 875 63 63 2657 126 2657 2 0 2657 16 0 0 2 0 0 0 0
+100 86 5 61 0 2 0 4 55 0 120 0 96 0 2 0 227 1654 120 120 4982 240 4982 4 1 4940 35 0 0 0 0 3 0 3
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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -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 3971 71 1076 0 0 1 0 0 1 1 0 1 1 0 1 149 1067 82 71 73 152 155 0 0 76 0 2 0 0 0 0 1 1
+50 5765 123 2070 3 0 2 5 0 0 4 2 0 2 0 1 295 2067 167 129 124 285 280 2 0 131 1 6 4 6 0 2 5 0
+60 6784 115 1925 7 0 5 1 1 5 4 4 2 2 0 3 268 1911 160 126 116 276 269 1 1 121 3 3 7 6 1 4 2 1
+70 467 8 112 0 0 0 0 0 0 8 0 0 0 0 0 16 118 10 8 8 18 18 0 0 8 2 0 0 0 0 0 0 0
+80 1592 30 392 0 0 0 0 2 0 30 0 1 0 0 1 59 421 30 29 29 60 60 1 0 30 8 0 1 1 0 1 0 0
+90 4347 87 1182 3 2 1 4 7 2 95 0 6 0 0 0 177 1266 95 82 80 177 177 5 2 82 31 1 4 4 0 2 0 2
+100 8098 159 2375 4 3 0 11 17 1 186 2 24 1 4 4 338 2531 205 145 145 355 346 5 3 151 57 1 1 1 1 5 0 4
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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -0,0 +1,18 @@
+# Avida resource data
+# Thu Jun 4 11:34:53 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 1419
+50 3005
+60 5209
+70 5281
+80 5536
+90 6291
+100 7944
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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -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 2 0
+70 0 0
+80 1 0
+90 0 0
+100 3 1
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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -0,0 +1,26 @@
+# Generic Statistics Data
+# Thu Jun 4 11:34:53 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.0184142 0.336045 0.33579 0.409541 0.409157 3 1.58348 0 0 0 0
+50 0.017446 0.336245 0.33579 0.409842 0.409157 6 2.53803 0 0 0 0
+60 0.021148 0.33613 0.33579 0.409668 0.409157 -1 2.98257 0 0 0 0
+70 0 0.336483 0.33579 0.4102 0.409157 0 0.410116 0 0 0 0
+80 0.000254745 0.336194 0.33579 0.409766 0.409157 4 1.65138 0 0 0 0
+90 0.00156406 0.339703 0.33579 0.415066 0.409157 3 2.57671 0 0 0 0
+100 0.0339996 0.340581 0.33579 0.416396 0.409157 6 3.40835 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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -0,0 +1,19 @@
+# Avida tasks data
+# Thu Jun 4 11:34:53 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 57 57
+50 96 96
+60 100 100
+70 7 7
+80 24 24
+90 63 63
+100 120 120
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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -0,0 +1,18 @@
+# Avida tasks execution data
+# Thu Jun 4 11:34:53 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 567 114
+50 943 192
+60 972 197
+70 63 14
+80 216 48
+90 563 120
+100 1066 227
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 2009-06-04 15:41:55 UTC (rev 3286)
@@ -0,0 +1,18 @@
+# Avida time data
+# Thu Jun 4 11:34:53 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.22807 1470
+50 28.6114 9.05208 2790
+60 37.1763 11.16 3000
+70 39.4354 1.85714 150
+80 43.5748 3.66667 540
+90 50.592 5.33333 1590
+100 59.2194 7.11667 3300
More information about the Avida-cvs
mailing list