[Avida-SVN] r2343 - in development: source/cpu tests/energy_deme_level_res/expected/data
dknoester at myxo.css.msu.edu
dknoester at myxo.css.msu.edu
Tue Feb 19 06:39:09 PST 2008
Author: dknoester
Date: 2008-02-19 09:39:09 -0500 (Tue, 19 Feb 2008)
New Revision: 2343
Modified:
development/source/cpu/cHardwareBase.cc
development/source/cpu/cHardwareCPU.cc
development/source/cpu/cHardwareGX.cc
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_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:
Added support for deme resources to sense instructions, updated relevant consistency test.
Modified: development/source/cpu/cHardwareBase.cc
===================================================================
--- development/source/cpu/cHardwareBase.cc 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/source/cpu/cHardwareBase.cc 2008-02-19 14:39:09 UTC (rev 2343)
@@ -919,9 +919,10 @@
if (m_world->GetConfig().ENERGY_ENABLED.Get() > 0) {
// TODO: Get rid of magic number. check avaliable energy first
double energy_req = inst_energy_cost[cur_inst.GetOp()] * (organism->GetPhenotype().GetMerit().GetDouble() / 100.0); //compensate by factor of 100
+ int cellID = organism->GetCellID();
+
+ if((cellID != -1) && (energy_req > 0.0)) { // guard against running in the test cpu.
- if (energy_req > 0.0) {
- int cellID = organism->GetCellID();
if (organism->GetPhenotype().GetStoredEnergy() >= energy_req) {
inst_energy_cost[cur_inst.GetOp()] = 0;
// subtract energy used from current org energy.
Modified: development/source/cpu/cHardwareCPU.cc
===================================================================
--- development/source/cpu/cHardwareCPU.cc 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/source/cpu/cHardwareCPU.cc 2008-02-19 14:39:09 UTC (rev 2343)
@@ -3009,7 +3009,8 @@
{
// Returns the amount of a resource or resources
// specified by modifying NOPs into register BX
- const tArray<double> & res_count = organism->GetOrgInterface().GetResources();
+ const tArray<double> res_count = organism->GetOrgInterface().GetResources() +
+ organism->GetOrgInterface().GetDemeResources(organism->GetOrgInterface().GetDemeID());
// Arbitrarily set to BX since the conditional instructions use this directly.
int reg_to_set = REG_BX;
Modified: development/source/cpu/cHardwareGX.cc
===================================================================
--- development/source/cpu/cHardwareGX.cc 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/source/cpu/cHardwareGX.cc 2008-02-19 14:39:09 UTC (rev 2343)
@@ -2414,7 +2414,8 @@
{
// Returns the log2 amount of a resource or resources
// specified by modifying NOPs into register BX
- const tArray<double> & res_count = organism->GetOrgInterface().GetResources();
+ const tArray<double> res_count = organism->GetOrgInterface().GetResources() +
+ organism->GetOrgInterface().GetDemeResources(organism->GetOrgInterface().GetDemeID());
// Arbitrarily set to BX since the conditionals use this directly.
int reg_to_set = REG_BX;
Modified: development/tests/energy_deme_level_res/expected/data/average.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/average.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/average.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -1,5 +1,5 @@
# Avida Average Data
-# Thu Feb 7 16:22:57 2008
+# Tue Feb 19 09:51:21 2008
# 1: Update
# 2: Merit
# 3: Gestation Time
@@ -22,9 +22,9 @@
20 1.61755 143.067 0.253012 0 42.2 40.6 36.4667 3 0.266667 0.2 0.333333 3.93333 -1.73114 0 0
30 1.32964 144.387 0.260206 0 42.0645 41.2903 37.7097 2.58333 0.258065 0.193548 0.419355 5.51613 -1.19629 0 0
40 1.1854 145.881 0.262352 0 41.9831 41.5932 38.3051 3.10526 0.322034 0.20339 0.474576 7.28814 -1.70709 0 0
-50 1.11967 147.271 0.263515 0 41.9167 41.9583 38.6875 2.46154 0.270833 0.177083 0.729167 9.45833 -1.59387 0 0
-60 1.08546 145.52 0.263124 0 41.99 41.78 38.36 2.04082 0.17 0.06 0.88 11.4 -2.29421 0 0
-70 3.41177 146 0.267123 0 42 42 39 2.33333 0.428571 0.142857 0.285714 1.85714 -0.444212 -1 0
-80 1.88892 146.211 0.26602 0 42.0526 42 38.8947 2.375 0.210526 0.157895 0.578947 3.36842 -0.759562 -1 0
-90 1.34781 147.035 0.259879 0 42.0175 41.6491 38.2281 2.59091 0.0701754 0.0350877 0.842105 5.03509 -1.45346 -1 0
-100 1.09888 147.218 0.259571 0 42.0484 41.7097 38.2419 2.6383 0.0725806 0.0725806 1.12097 7.04839 -1.7522 -1 0
+50 1.11982 147.323 0.263491 0 41.9479 41.9688 38.6979 2.4 0.270833 0.177083 0.760417 9.42708 -1.76902 0 0
+60 1.0781 146.87 0.263816 0 41.93 41.96 38.73 2.08333 0.13 0.08 0.88 11.33 -2.11273 0 0
+70 5.3181 104 0.192308 0 43.25 32 20 1.33333 0 0 0.5 1 1.33068 -1 0
+80 5.3181 104 0.192308 0 43.25 32 20 1.33333 0 0 0.5 1 1.33068 -1 0
+90 5.3181 104 0.192308 0 43.25 32 20 1.33333 0 0 0.5 1 1.33068 -1 0
+100 5.3181 104 0.192308 0 43.25 32 20 1.33333 0 0 0.5 1 1.33068 -1 0
Modified: development/tests/energy_deme_level_res/expected/data/count.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/count.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/count.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -1,5 +1,5 @@
# Avida count data
-# Thu Feb 7 16:22:57 2008
+# Tue Feb 19 09:51:21 2008
# 1: update
# 2: number of insts executed this update
# 3: number of organisms
@@ -22,9 +22,9 @@
20 330 15 5 1 0 0 0 4 0 3 11 8 15 0 0
30 810 31 12 1 0 0 0 8 4 6 20 16 31 0 0
40 1470 59 19 3 0 0 0 19 9 12 42 34 59 0 0
-50 2640 96 39 4 0 0 0 26 18 17 59 50 96 0 0
-60 3000 100 49 6 0 0 0 17 17 6 58 56 100 0 0
-70 120 7 3 1 0 0 0 3 0 1 5 3 7 0 0
-80 450 19 8 2 0 0 0 4 0 3 12 10 19 0 0
-90 1650 57 22 4 0 0 0 4 2 2 36 31 57 0 0
-100 3540 124 47 8 0 0 0 9 3 9 83 66 124 0 0
+50 2640 96 40 4 0 0 0 26 18 17 58 52 96 0 0
+60 3000 100 48 7 0 0 0 13 13 8 66 61 100 0 0
+70 120 4 3 1 0 0 0 0 0 0 2 2 4 0 0
+80 120 4 3 1 0 0 0 0 0 0 2 2 4 0 0
+90 120 4 3 1 0 0 0 0 0 0 2 2 4 0 0
+100 120 4 3 1 0 0 0 0 0 0 2 2 4 0 0
Modified: 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 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m 2008-02-19 14:39:09 UTC (rev 2343)
@@ -69,25 +69,25 @@
11534.2 11592.6 11593.7 11593.7 11451.9 11593.7 11629.4 11633.4 11566.9 11534.2
11534.2 11641.5 10648.6 11649.7 11653.2 11478.4 11642.2 11642.7 11605.6 11534.2
11645 10648.6 11443.9 11647.7 10215.6 11641 11641.5 11640.4 11566.9 11605.6
-9970.65 9360.24 0 11637.2 10209.5 11647.3 0 10702.5 11605.4 11593.7
+9970.65 9360.24 0 11637.2 10175.8 11647.3 0 10702.5 11605.4 11593.7
9360.24 10214.5 11566.9 0 0 11159.7 11119.5 11639.2 10702.5 11566.9
11566.9 10228 11566.9 11533 11644.1 11493.8 11696.8 11637.2 11715.6 10692.6
-10702.5 12476.9 11534.2 11637.1 11638.2 11566.9 11645.4 11696.8 11642.7 10692.6
-11534.2 11174.8 11178.2 11633.6 11649.7 11534.2 11534.2 11533 11647.3 11534.2
-11642.7 11635.7 11642.9 11653.2 11566.9 11566.9 11527.3 11648.5 11593.7 11064.4
+10702.5 12476.9 11534.2 11637.1 11638.2 11566.9 11645.4 11696.8 11648.5 10692.6
+11534.2 11174.8 11534.2 11633.6 11653.2 11534.2 11534.2 11534.2 11648.5 11534.2
+11642.7 11178.2 11642.9 11514.6 11566.9 11566.9 11527.3 11563.6 11593.7 11064.4
];
deme_0000000_energy_0000060 = [ ...
-11453.8 11460.8 11339.9 11559.1 11559.1 11079.8 11520.7 11520.7 11460.8 11460.8
-11460.8 11520.7 10613.9 11520.7 11134.4 11520.7 10517.7 11600.3 11493.4 11493.4
-11307.1 10613.9 11519.6 9537.33 11559.1 11126.7 11553.8 11460.8 11531.8 11493.4
-9931.41 9931.41 11089.8 11557.9 11592.1 9537.33 11559.1 10594.6 11559.1 11460.8
-9970.65 11484.1 11460.8 11459.1 9537.33 11595.6 11559.1 11609 10621.4 11559.1
-11324.6 10623 11460.8 11580.5 11609.6 10823.3 11232.3 11230.1 10596.1 10596.1
-11460.8 11559.1 11614.8 10428.2 10457.8 11611.5 11464.3 10522.7 11281.7 10607.1
-11559.1 11520.7 11603.2 11614.8 11556.9 11613.8 11559.1 10522.7 11559.1 10607.1
-11559.1 9955.84 10863.2 11460.8 11597.4 11600.4 11554 11146.8 11559.1 11559.1
-11585.8 11422.6 11460.8 11559.1 11559.1 11554 11598.1 10518.4 11519.6 11493.4
+11460.8 11482.4 11482.4 11482.4 11559.1 10216.8 10772 11520.7 11452.5 11460.8
+11482.4 11559.1 11609 11559.1 11073.9 11559.1 10218.8 11559.1 11448.2 11268.6
+9931.41 11291.9 10848.6 11559.1 11370.1 11126.7 11559 11559.1 11493.4 9537.45
+11247.6 9931.41 10848.6 11556.9 11559.1 11078.5 11079.6 11458.5 11531.8 9537.45
+9970.65 9360.24 11493.4 11556.9 11556.9 10456.2 11520.7 10732.7 11559.1 11559.1
+11460.8 9891.74 11460.8 11460.8 10560.8 10557.6 11559.1 11559.1 10596.1 11060.7
+11493.4 9943.94 11603.2 10457.8 11518.6 11146.2 10522.7 10522.7 10596.1 10642.5
+10474.7 11961.7 11559.1 11559.1 11610.2 11460.8 11460.8 10850.2 11519.6 10642.5
+10797.5 10484.1 11613.7 11460.8 11613.7 11460.8 11559.1 11413.1 11520.7 11559.1
+10669.1 10810.4 11613.7 11143.6 10529.4 10772 11487.4 11559.1 11452.5 11559.1
];
deme_0000000_energy_0000070 = [ ...
@@ -96,11 +96,11 @@
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
-30964.5 0 0 0 0 0 0 0 0 30964.5
-30949 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 30933.5
+52122.7 0 0 0 0 0 0 0 0 0
+0 52346 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
];
deme_0000000_energy_0000080 = [ ...
@@ -108,37 +108,37 @@
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
-15835.3 20373 0 0 0 0 0 0 19660.8 0
-15843.3 15843.3 0 0 0 0 0 0 0 19670.8
-20373 15846.4 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 29731.7
0 0 0 0 0 0 0 0 0 0
+50373 0 0 0 0 0 0 0 0 0
+0 50984.5 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
];
deme_0000000_energy_0000090 = [ ...
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
-12493 13435.3 13397.3 0 0 0 0 0 12239.2 0
-12455 13435.3 13435.3 0 0 0 0 12280 12239.2 12280
-13397.3 12534.3 13397.3 0 0 0 0 0 12288.2 12247.3
-13397.3 12534.3 12538.1 0 0 0 0 0 12247.3 13381
-15299.6 12534.3 12472.9 0 0 0 0 12246.1 0 28028.2
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
+48527.7 0 0 0 0 0 0 0 0 0
+0 49814.4 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
];
deme_0000000_energy_0000100 = [ ...
0 0 0 0 0 0 0 0 0 0
-0 0 11902.7 0 0 0 0 0 9962.1 0
-11406.1 11406.1 11869 11869 11431.5 10658.2 0 0 10636.7 9962.1
-10672.1 11942.5 11869 11431.5 11869 0 10672.1 10672.1 10350.2 10350.2
-10171.5 11902.7 11902.7 11902.7 0 0 0 10672.1 10608.7 10672.1
-10171.5 10283.4 11799.2 11796.8 0 0 10672.1 10993.9 10672.1 10608.7
-11869 11803.9 11802.7 11869 11800.4 0 10643 10644.1 10608.7 10672.1
-14671.9 11869 11800.4 0 0 0 0 9950.84 9917.72 11869
-0 11869 0 11867.2 0 0 9969.91 9950.84 0 0
0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+47049.2 0 0 0 0 0 0 0 0 0
+0 49027.1 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
];
Modified: 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 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m 2008-02-19 14:39:09 UTC (rev 2343)
@@ -94,51 +94,51 @@
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
-0 0 30961.4 0 0 0 0 0 0 0
-0 30964.5 0 0 0 0 0 0 0 0
-52213.3 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
+52367.3 0 0 0 0 0 0 0 0 0
+52122.7 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
];
deme_0000001_energy_0000080 = [ ...
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
-0 20373 0 0 0 0 0 0 0 0
-0 0 20430.9 0 0 0 0 0 0 0
-0 20373 20370.9 0 0 0 0 0 0 0
-20373 14799.1 0 0 0 0 0 0 0 0
-14781.4 14799.1 0 0 0 0 0 0 0 20379.2
-14788.8 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
+51090.9 0 0 0 0 0 0 0 0 0
+50676.2 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
];
deme_0000001_energy_0000090 = [ ...
0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 13442.1
-13397.3 13397.3 13435.3 13435.3 0 0 0 0 0 0
-13439.4 13397.3 13480.2 13435.3 0 0 0 0 0 13394.5
-13397.3 13397.3 13432.8 13432.8 0 0 0 0 0 13397.3
-13397.3 12244.6 12520.5 13432.8 0 0 0 0 13421.4 15350.3
-12209.9 12244.6 12244.6 12530.6 0 0 0 13455.4 13483.8 13483.8
-12209.9 12244.6 12244.6 0 0 0 0 0 0 12209.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 0 0 0 0 0 0
+49878.2 0 0 0 0 0 0 0 0 0
+49080.7 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
];
deme_0000001_energy_0000100 = [ ...
-11144.2 11752 10754.4 11800.4 11869 0 0 0 0 0
-11878.6 10754.4 11801.6 11869 11902.7 0 0 0 0 12952.7
-11869 11902.7 11902.7 11902.7 12165.7 0 0 0 11719.2 11865.4
-13005.7 11942.5 11942.5 11942.5 11902.7 11902.7 0 0 11869 11209.5
-11064.1 11108.2 11900.9 11866.6 11900.4 11900.4 0 11801.6 11790.9 11958
-11104.9 11061.9 11866.6 11900.9 11936.5 0 11794.5 11793.3 13012.9 11985.7
-10576.4 10606.5 10641.9 10469 9721.79 11896.8 0 13040.1 11945.9 11945.9
-10606.5 11876.6 10641.9 10607.5 9721.79 0 11984.4 11985.7 10606.5 10641.9
-10606.5 10606.5 9545.64 10605.4 0 0 0 10606.5 0 10606.5
-10606.5 11752 0 9545.64 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+48527.4 0 0 0 0 0 0 0 0 0
+47421.5 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
];
Modified: development/tests/energy_deme_level_res/expected/data/deme_donor.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_donor.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/deme_donor.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -1,5 +1,5 @@
# Num orgs doing doing a donate for each deme in population
-# Thu Feb 7 16:22:57 2008
+# Tue Feb 19 09:51:21 2008
# 1: update
# 2: Deme 0
# 3: Deme 1
Modified: development/tests/energy_deme_level_res/expected/data/deme_fitness.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_fitness.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/deme_fitness.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -1,5 +1,5 @@
# Average fitnesses for each deme in the population
-# Thu Feb 7 16:22:57 2008
+# Tue Feb 19 09:51:21 2008
# 1: update
# 2: Deme 0
# 3: Deme 1
@@ -9,9 +9,9 @@
20 0.253012 0
30 0.260206 0
40 0.262352 0
-50 0.263515 0
-60 0.263124 0
-70 0.267123 0.267123
-80 0.265601 0.266396
-90 0.264705 0.256108
-100 0.26368 0.256504
+50 0.263491 0
+60 0.263816 0
+70 0.192308 0.192308
+80 0.192308 0.192308
+90 0.192308 0.192308
+100 0.192308 0.192308
Modified: development/tests/energy_deme_level_res/expected/data/deme_gest_time.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_gest_time.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/deme_gest_time.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -1,5 +1,5 @@
# Average gestation time for each deme in population
-# Thu Feb 7 16:22:57 2008
+# Tue Feb 19 09:51:21 2008
# 1: update
# 2: Deme 0
# 3: Deme 1
@@ -9,9 +9,9 @@
20 143.067 0
30 144.387 0
40 145.881 0
-50 147.271 0
-60 145.52 0
-70 146 146
-80 146 146.4
-90 147.04 147.031
-100 147.415 147.07
+50 147.323 0
+60 146.87 0
+70 104 104
+80 104 104
+90 104 104
+100 104 104
Modified: development/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -1,5 +1,5 @@
# Number of times each instruction is exectued in deme 0
-# Thu Feb 7 16:22:57 2008
+# Tue Feb 19 09:51:21 2008
# 1: update
# 2: Inst 0
# 3: Inst 1
@@ -40,9 +40,9 @@
20 42 0 0 0 0 0 0 0 0 0 0 0 0 0 0 30 210 15 15 588 30 588 0 0 588 0 0 0 0 0 0 0 0
30 42 0 2 0 0 0 0 0 0 0 0 0 0 0 0 62 432 31 31 1258 62 1258 0 0 1258 0 0 0 0 0 0 0 0
40 42 0 5 0 0 0 0 0 43 0 0 0 0 0 0 120 819 59 59 2433 118 2433 0 0 2436 0 0 0 0 0 0 0 0
-50 0 0 14 1 6 0 0 0 0 2 2 0 0 0 0 196 1319 96 96 4006 192 4008 0 0 4012 0 1 0 0 0 0 0 2
-60 43 0 12 7 6 0 0 0 0 2 0 0 0 1 0 203 1375 100 100 4135 200 4135 0 0 4141 2 2 0 3 0 1 0 0
-70 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 168 8 168 0 0 168 0 0 0 0 0 0 0 0
-80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 16 126 9 9 378 18 378 0 0 378 0 0 2 0 0 0 0 0
-90 0 0 4 0 0 0 0 0 0 0 0 2 0 0 0 46 350 25 25 1056 50 1056 0 0 1056 0 0 4 0 0 0 0 0
-100 0 0 13 2 1 2 0 0 2 4 0 5 0 0 0 95 737 53 53 2240 106 2240 0 0 2240 2 2 11 0 0 0 0 0
+50 0 0 14 2 6 0 0 0 0 2 2 0 0 0 0 197 1319 96 96 4007 192 4009 0 0 4013 0 1 0 0 0 0 0 2
+60 0 0 20 3 2 2 0 0 2 6 1 0 0 2 0 203 1365 100 100 4173 200 4172 0 0 4174 0 2 0 4 1 4 1 0
+70 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
+80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
+90 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
+100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
Modified: development/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -1,5 +1,5 @@
# Number of times each instruction is exectued in deme 1
-# Thu Feb 7 16:22:57 2008
+# Tue Feb 19 09:51:21 2008
# 1: update
# 2: Inst 0
# 3: Inst 1
@@ -42,7 +42,7 @@
40 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
60 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-70 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 42 3 3 126 6 126 0 0 126 0 0 0 0 0 0 0 0
-80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 20 140 10 10 420 20 420 0 0 420 0 0 0 0 0 0 0 0
-90 18 0 0 0 0 0 0 5 0 0 0 0 0 0 8 86 448 32 32 1298 64 1298 0 0 1298 0 0 0 0 0 4 0 0
-100 62 0 6 0 0 0 4 9 2 0 0 2 0 0 17 162 980 71 71 2889 142 2889 0 0 2889 5 0 2 0 0 8 0 0
+70 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
+80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
+90 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
+100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
Modified: development/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -1,5 +1,5 @@
# Average life fitnesses for each deme in the population
-# Thu Feb 7 16:22:57 2008
+# Tue Feb 19 09:51:21 2008
# 1: update
# 2: Deme 0
# 3: Deme 1
@@ -9,9 +9,9 @@
20 0.253012 0
30 0.260206 0
40 0.262352 0
-50 0.263515 0
-60 0.263124 0
-70 0.267123 0.267123
-80 0.265601 0.266396
-90 0.264705 0.256108
-100 0.26368 0.256504
+50 0.263491 0
+60 0.263816 0
+70 0.192308 0.192308
+80 0.192308 0.192308
+90 0.192308 0.192308
+100 0.192308 0.192308
Modified: development/tests/energy_deme_level_res/expected/data/deme_merit.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_merit.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/deme_merit.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -1,5 +1,5 @@
# Average merits for each deme in population
-# Thu Feb 7 16:22:57 2008
+# Tue Feb 19 09:51:21 2008
# 1: update
# 2: Deme 0
# 3: Deme 1
@@ -9,9 +9,9 @@
20 1.61755 0
30 1.32964 0
40 1.1854 0
-50 1.11967 0
-60 1.08546 0
-70 3.09738 3.83097
-80 1.95161 1.83251
-90 1.37068 1.32994
-100 1.09028 1.10529
+50 1.11982 0
+60 1.0781 0
+70 5.3181 5.3181
+80 5.3181 5.3181
+90 5.3181 5.3181
+100 5.3181 5.3181
Modified: development/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -1,5 +1,5 @@
# Average mutation rates for organisms in each deme
-# Thu Feb 7 16:22:57 2008
+# Tue Feb 19 09:51:21 2008
# 1: update
# 2: Deme 0
# 3: Deme 1
Modified: development/tests/energy_deme_level_res/expected/data/deme_receiver.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_receiver.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/deme_receiver.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -1,5 +1,5 @@
# Num orgs doing receiving a donate for each deme in population
-# Thu Feb 7 16:22:57 2008
+# Tue Feb 19 09:51:21 2008
# 1: update
# 2: Deme 0
# 3: Deme 1
Modified: development/tests/energy_deme_level_res/expected/data/deme_resources.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_resources.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/deme_resources.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -1,5 +1,5 @@
# Avida deme resource data
-# Thu Feb 7 16:22:57 2008
+# Tue Feb 19 09:51:21 2008
# 1: update
# 2: Deme 0 Resource deme_ResA
# 3: Deme 0 Resource deme_ResB
@@ -13,7 +13,7 @@
40 138 40901.5 1 41901.3
50 295 50900.5 1 51900.5
60 514.5 60900.2 1 60900.2
-70 4 10934.9 4 10934.9
-80 15.5 20912.2 14.5 20912.2
-90 46.5 30904.2 52.5 30904.2
-100 117 40901.5 148 40901.5
+70 3 10934.9 3 10934.9
+80 3 20912.2 3 20912.2
+90 3 30904.2 3 30904.2
+100 3 40901.5 3 40901.5
Modified: development/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m 2008-02-19 14:39:09 UTC (rev 2343)
@@ -156,16 +156,16 @@
];
deme_0000000_sleep_0000060 = [ ...
+0 0 0 0 0 1 0 0 0 0
+0 0 1 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
+0 1 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 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 = [ ...
@@ -251,12 +251,12 @@
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
+1 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
];
deme_0000000_sleep_0000100 = [ ...
@@ -266,10 +266,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 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
];
deme_0000001_sleep_0000100 = [ ...
Modified: development/tests/energy_deme_level_res/expected/data/deme_task.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_task.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/deme_task.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -1,5 +1,5 @@
# Num orgs doing each task for each deme in population
-# Thu Feb 7 16:22:57 2008
+# Tue Feb 19 09:51:21 2008
# 1: update
# 2: Deme 0, Task 0
# 3: Deme 0, Task 1
@@ -13,7 +13,7 @@
40 59 59 0 0
50 96 92 0 0
60 100 97 0 0
-70 4 4 3 3
-80 9 9 10 10
-90 25 25 32 32
-100 53 53 71 66
+70 2 2 2 2
+80 2 2 2 2
+90 2 2 2 2
+100 2 2 2 2
Modified: development/tests/energy_deme_level_res/expected/data/dominant.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/dominant.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/dominant.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -1,5 +1,5 @@
# Avida Dominant Data
-# Thu Feb 7 16:22:57 2008
+# Tue Feb 19 09:51:21 2008
# 1: Update
# 2: Average Merit of the Dominant Genotype
# 3: Average Gestation Time of the Dominant Genotype
@@ -22,9 +22,9 @@
20 2.25175 146 0.267123 0.00684932 42 42 39 11 4 3 0 0 0.267123 1 042-aaaaa
30 1.65767 146 0.267123 0.00684932 42 42 39 20 7 6 0 0 0.267123 1 042-aaaaa
40 1.41085 146 0.267123 0.00684932 42 42 39 36 15 9 0 0 0.267123 1 042-aaaaa
-50 1.29779 146 0.267123 0.00684932 42 42 39 41 14 9 0 0 0.267123 1 042-aaaaa
-60 1.25336 146 0.267123 0.00684932 42 42 39 37 9 2 0 0 0.267123 1 042-aaaaa
-70 3.97769 146 0.267123 0.00684932 42 42 39 5 3 1 0 0 0.267123 105 042-aaaad
-80 2.80711 146 0.267123 0.00684932 42 42 39 9 2 1 0 0 0.267123 105 042-aaaad
-90 1.92678 146 0.267123 0.00684932 42 42 39 22 3 2 0 0 0.267123 105 042-aaaad
-100 1.51404 146 0.267123 0.00684932 42 42 39 41 6 6 0 0 0.267123 105 042-aaaad
+50 1.29779 146 0.267123 0.00684932 42 42 39 39 14 9 0 0 0.267123 1 042-aaaaa
+60 1.25377 146 0.267123 0.00684932 42 42 39 38 6 5 0 0 0.272109 1 042-aaaaa
+70 5.3181 104 0.192308 0.00961538 43 43 20 2 0 0 0 0 0.192308 105 043-aaaac
+80 5.3181 104 0.192308 0.00961538 43 43 20 2 0 0 0 0 0.192308 105 043-aaaac
+90 5.3181 104 0.192308 0.00961538 43 43 20 2 0 0 0 0 0.192308 105 043-aaaac
+100 5.3181 104 0.192308 0.00961538 43 43 20 2 0 0 0 0 0.192308 105 043-aaaac
Modified: development/tests/energy_deme_level_res/expected/data/instruction.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/instruction.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/instruction.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -1,5 +1,5 @@
# Avida instruction execution data
-# Thu Feb 7 16:22:57 2008
+# Tue Feb 19 09:51:21 2008
# 1: Update
# 2: nop-A
# 3: nop-B
@@ -40,9 +40,9 @@
20 42 0 0 0 0 0 0 0 0 0 0 0 0 0 0 30 210 15 15 588 30 588 0 0 588 0 0 0 0 0 0 0 0
30 42 0 2 0 0 0 0 0 0 0 0 0 0 0 0 62 432 31 31 1258 62 1258 0 0 1258 0 0 0 0 0 0 0 0
40 42 0 5 0 0 0 0 0 43 0 0 0 0 0 0 120 819 59 59 2433 118 2433 0 0 2436 0 0 0 0 0 0 0 0
-50 0 0 14 1 6 0 0 0 0 2 2 0 0 0 0 196 1319 96 96 4006 192 4008 0 0 4012 0 1 0 0 0 0 0 2
-60 43 0 12 7 6 0 0 0 0 2 0 0 0 1 0 203 1375 100 100 4135 200 4135 0 0 4141 2 2 0 3 0 1 0 0
-70 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 14 98 7 7 294 14 294 0 0 294 0 0 0 0 0 0 0 0
-80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 36 266 19 19 798 38 798 0 0 798 0 0 2 0 0 0 0 0
-90 18 0 4 0 0 0 0 5 0 0 0 2 0 0 8 132 798 57 57 2354 114 2354 0 0 2354 0 0 4 0 0 4 0 0
-100 62 0 19 2 1 2 4 9 4 4 0 7 0 0 17 257 1717 124 124 5129 248 5129 0 0 5129 7 2 13 0 0 8 0 0
+50 0 0 14 2 6 0 0 0 0 2 2 0 0 0 0 197 1319 96 96 4007 192 4009 0 0 4013 0 1 0 0 0 0 0 2
+60 0 0 20 3 2 2 0 0 2 6 1 0 0 2 0 203 1365 100 100 4173 200 4172 0 0 4174 0 2 0 4 1 4 1 0
+70 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 84 8 84 0 0 88 0 0 0 0 0 0 0 0
+80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 84 8 84 0 0 88 0 0 0 0 0 0 0 0
+90 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 84 8 84 0 0 88 0 0 0 0 0 0 0 0
+100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 84 8 84 0 0 88 0 0 0 0 0 0 0 0
Modified: development/tests/energy_deme_level_res/expected/data/instruction_histogram.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/instruction_histogram.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/instruction_histogram.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -38,9 +38,9 @@
20 1106 14 232 0 0 0 0 0 0 0 0 0 1 0 0 28 225 22 14 15 36 37 0 0 14 0 1 0 0 0 0 0 0
30 2271 34 537 0 0 2 0 0 2 0 0 1 1 0 0 70 525 45 35 36 79 82 0 0 37 0 1 0 0 0 0 0 0
40 3957 71 1078 0 0 1 0 0 1 0 0 1 1 0 1 150 1068 83 71 73 153 156 0 0 76 0 2 0 0 0 0 1 1
-50 6556 114 1786 3 8 2 1 0 0 5 2 1 0 0 0 249 1763 144 114 112 252 256 4 0 120 1 3 0 8 1 1 2 2
-60 6856 118 1879 11 8 3 1 3 1 7 0 3 0 1 2 248 1785 227 117 112 321 277 2 3 119 6 4 1 7 8 1 0 0
-70 571 8 110 0 0 0 0 0 0 0 0 0 0 0 1 16 112 8 8 8 16 15 0 0 8 0 0 1 0 0 0 0 0
-80 1272 31 388 0 0 0 0 2 0 0 0 1 0 0 4 59 405 30 28 28 57 57 1 0 29 0 0 2 1 0 2 0 0
-90 3390 85 1259 3 2 1 4 9 2 2 0 5 0 0 14 177 1300 118 71 71 180 174 0 0 73 3 1 9 0 0 3 0 0
-100 7820 165 2542 6 3 4 12 18 7 5 2 12 1 3 30 348 2594 230 141 143 365 361 1 1 147 13 4 19 1 0 10 1 0
+50 6478 115 1816 5 8 2 1 0 0 5 3 1 0 1 0 254 1794 146 115 113 257 259 4 0 122 1 3 0 8 1 1 2 2
+60 6611 120 1946 8 2 3 0 1 4 13 2 2 1 2 2 256 1878 189 121 121 299 284 1 1 124 2 3 0 10 3 7 2 1
+70 91 2 46 0 0 0 0 0 0 0 0 0 0 1 0 4 43 4 2 2 6 6 0 0 4 0 0 0 0 0 0 2 0
+80 91 2 46 0 0 0 0 0 0 0 0 0 0 1 0 4 43 4 2 2 6 6 0 0 4 0 0 0 0 0 0 2 0
+90 91 2 46 0 0 0 0 0 0 0 0 0 0 1 0 4 43 4 2 2 6 6 0 0 4 0 0 0 0 0 0 2 0
+100 180 2 45 0 0 0 0 0 0 0 0 0 0 1 1 4 43 4 2 2 6 5 0 0 3 0 0 1 0 0 0 2 0
Modified: development/tests/energy_deme_level_res/expected/data/resource.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/resource.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/resource.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -1,5 +1,5 @@
# Avida resource data
-# Thu Feb 7 16:22:57 2008
+# Tue Feb 19 09:51:21 2008
# First column gives the current update, all further columns give the quantity
# of the particular resource at that update.
# 1: Update
@@ -10,9 +10,9 @@
20 262
30 662
40 1417
-50 3127
-60 5367
-70 5439
-80 5668
-90 6457
-100 8457
+50 3122
+60 5301
+70 5345
+80 5345
+90 5345
+100 5348
Modified: development/tests/energy_deme_level_res/expected/data/sleep.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/sleep.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/sleep.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -10,8 +10,8 @@
30 0 0
40 0 0
50 4 0
-60 0 0
+60 3 0
70 0 0
80 0 0
-90 0 0
-100 0 0
+90 0 1
+100 1 0
Modified: development/tests/energy_deme_level_res/expected/data/stats.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/stats.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/stats.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -1,5 +1,5 @@
# Generic Statistics Data
-# Thu Feb 7 16:22:57 2008
+# Tue Feb 19 09:51:21 2008
# 1: update
# 2: average inferiority (energy)
# 3: ave probability of any mutations in genome
@@ -18,9 +18,9 @@
20 0.0542725 0.336759 0.33579 0.410617 0.409157 1 0.949594 0 0 0 0
30 0.0262377 0.336103 0.33579 0.409628 0.409157 2 1.50126 0 0 0 0
40 0.0180228 0.335708 0.33579 0.409034 0.409157 5 1.75576 0 0 0 0
-50 0.0136005 0.335386 0.33579 0.408549 0.409157 6 2.66629 0 0 0 0
-60 0.0150835 0.335742 0.33579 0.409084 0.409157 6 3.03163 0 0 0 0
-70 0 0.33579 0.33579 0.409157 0.409157 2 0.796312 0 -1 0 0
-80 0.00413976 0.336045 0.33579 0.409541 0.409157 1 1.6118 0 -1 0 0
-90 0.0274955 0.335875 0.33579 0.409285 0.409157 2 2.36784 0 -1 0 0
-100 0.0286804 0.336025 0.33579 0.40951 0.409157 0 2.97456 0 0 0 0
+50 0.0136904 0.335538 0.33579 0.408777 0.409157 7 2.74953 0 0 0 0
+60 0.0124589 0.335451 0.33579 0.408646 0.409157 0 2.97946 0 0 0 0
+70 0 0.341823 0.340621 0.418281 0.416457 0 1.03972 0 -1 0 0
+80 0 0.341823 0.340621 0.418281 0.416457 0 1.03972 0 -1 0 0
+90 0 0.341823 0.340621 0.418281 0.416457 0 1.03972 0 -1 0 0
+100 0 0.341823 0.340621 0.418281 0.416457 0 1.03972 0 -1 0 0
Modified: development/tests/energy_deme_level_res/expected/data/tasks.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/tasks.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/tasks.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -1,5 +1,5 @@
# Avida tasks data
-# Thu Feb 7 16:22:57 2008
+# Tue Feb 19 09:51:21 2008
# 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
@@ -13,7 +13,7 @@
40 59 59
50 96 92
60 100 97
-70 7 7
-80 19 19
-90 57 57
-100 124 119
+70 4 4
+80 4 4
+90 4 4
+100 4 4
Modified: development/tests/energy_deme_level_res/expected/data/tasks_exe.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/tasks_exe.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/tasks_exe.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -1,5 +1,5 @@
# Avida tasks execution data
-# Thu Feb 7 16:22:57 2008
+# Tue Feb 19 09:51:21 2008
# First column gives the current update, all further columns give the number
# of times the particular task has been executed this update.
# 1: Update
@@ -11,8 +11,8 @@
30 308 62
40 585 116
50 939 183
-60 976 187
-70 70 14
-80 190 32
-90 566 98
-100 1210 198
+60 965 186
+70 40 8
+80 40 8
+90 40 8
+100 40 8
Modified: development/tests/energy_deme_level_res/expected/data/time.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/time.dat 2008-02-18 23:51:26 UTC (rev 2342)
+++ development/tests/energy_deme_level_res/expected/data/time.dat 2008-02-19 14:39:09 UTC (rev 2343)
@@ -1,5 +1,5 @@
# Avida time data
-# Thu Feb 7 16:22:57 2008
+# Tue Feb 19 09:51:21 2008
# 1: update
# 2: avida time
# 3: average generation
@@ -10,9 +10,9 @@
20 5.80003 3.93333 330
30 12.4747 5.51613 810
40 20.3006 7.28814 1470
-50 28.8839 9.45833 2640
-60 37.9373 11.4 3000
-70 40.2023 1.85714 120
-80 44.0728 3.36842 450
-90 50.6183 5.03509 1650
-100 58.8345 7.04839 3540
+50 28.8839 9.42708 2640
+60 38.0382 11.33 3000
+70 40.3939 1 120
+80 42.2743 1 120
+90 44.1547 1 120
+100 46.0351 1 120
More information about the Avida-cvs
mailing list