[Avida-SVN] r2670 - in branches/collect: source/actions source/cpu source/main tests/energy_deme_level_res tests/energy_deme_level_res/expected tests/energy_deme_level_res/expected/data
blwalker at myxo.css.msu.edu
blwalker at myxo.css.msu.edu
Sat Jun 21 12:45:43 PDT 2008
Author: blwalker
Date: 2008-06-21 15:45:43 -0400 (Sat, 21 Jun 2008)
New Revision: 2670
Added:
branches/collect/tests/energy_deme_level_res/expected/
branches/collect/tests/energy_deme_level_res/expected/data/
branches/collect/tests/energy_deme_level_res/expected/data/average.dat
branches/collect/tests/energy_deme_level_res/expected/data/count.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m
branches/collect/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m
branches/collect/tests/energy_deme_level_res/expected/data/deme_donor.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_fitness.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_gest_time.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_merit.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_receiver.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_resources.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m
branches/collect/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m
branches/collect/tests/energy_deme_level_res/expected/data/deme_task.dat
branches/collect/tests/energy_deme_level_res/expected/data/dominant.dat
branches/collect/tests/energy_deme_level_res/expected/data/instruction.dat
branches/collect/tests/energy_deme_level_res/expected/data/instruction_histogram.dat
branches/collect/tests/energy_deme_level_res/expected/data/resource.dat
branches/collect/tests/energy_deme_level_res/expected/data/sleep.dat
branches/collect/tests/energy_deme_level_res/expected/data/stats.dat
branches/collect/tests/energy_deme_level_res/expected/data/tasks.dat
branches/collect/tests/energy_deme_level_res/expected/data/tasks_exe.dat
branches/collect/tests/energy_deme_level_res/expected/data/time.dat
Removed:
branches/collect/tests/energy_deme_level_res/expected/data/
branches/collect/tests/energy_deme_level_res/expected/data/average.dat
branches/collect/tests/energy_deme_level_res/expected/data/count.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m
branches/collect/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m
branches/collect/tests/energy_deme_level_res/expected/data/deme_donor.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_fitness.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_gest_time.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_merit.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_receiver.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_resources.dat
branches/collect/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m
branches/collect/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m
branches/collect/tests/energy_deme_level_res/expected/data/deme_task.dat
branches/collect/tests/energy_deme_level_res/expected/data/dominant.dat
branches/collect/tests/energy_deme_level_res/expected/data/instruction.dat
branches/collect/tests/energy_deme_level_res/expected/data/instruction_histogram.dat
branches/collect/tests/energy_deme_level_res/expected/data/resource.dat
branches/collect/tests/energy_deme_level_res/expected/data/sleep.dat
branches/collect/tests/energy_deme_level_res/expected/data/stats.dat
branches/collect/tests/energy_deme_level_res/expected/data/tasks.dat
branches/collect/tests/energy_deme_level_res/expected/data/tasks_exe.dat
branches/collect/tests/energy_deme_level_res/expected/data/time.dat
Modified:
branches/collect/source/actions/PopulationActions.cc
branches/collect/source/cpu/cHardwareCPU.cc
branches/collect/source/main/cAvidaConfig.h
branches/collect/source/main/cDeme.cc
branches/collect/source/main/cDeme.h
branches/collect/source/main/cDemeCellEvent.cc
branches/collect/source/main/cPopulation.cc
branches/collect/source/main/cPopulationCell.cc
branches/collect/source/main/cResourceCount.cc
branches/collect/source/main/cResourceCount.h
Log:
Porting r2649:2668 from development to collect branch
Modified: branches/collect/source/actions/PopulationActions.cc
===================================================================
--- branches/collect/source/actions/PopulationActions.cc 2008-06-21 19:39:41 UTC (rev 2669)
+++ branches/collect/source/actions/PopulationActions.cc 2008-06-21 19:45:43 UTC (rev 2670)
@@ -620,6 +620,10 @@
if (largs.GetSize()) m_merit = largs.PopWord().AsDouble();
if (largs.GetSize()) m_lineage_label = largs.PopWord().AsInt();
if (largs.GetSize()) m_neutral_metric = largs.PopWord().AsDouble();
+
+ assert(m_num_orgs <= m_world->GetPopulation().GetSize());
+ assert(m_nest_cellid > -1);
+ assert(m_nest_cellid < m_world->GetPopulation().GetSize());
} //End cActionInjectDemesFromNest constructor
static const cString GetDescription() { return "Arguments: [int num_orgs=1] [int nest_cellid=0] [double merit=-1] [int lineage_label=0] [double neutral_metric=0]"; }
@@ -628,11 +632,11 @@
{
for(int i=0; i<m_world->GetPopulation().GetNumDemes(); ++i) {
- // The first deme will have initially had one organism injected. If this
+ // Each deme will have initially had one organism injected. If this
// is the first injection and energy is used, increment the injected
// count (the initial injection wasn't counted) and skip the first deme
// so that the energies don't get messed up.
- if( (i==0) && (m_world->GetConfig().ENERGY_ENABLED.Get() == 1) &&
+ if( (m_world->GetConfig().ENERGY_ENABLED.Get() == 1) &&
(m_world->GetPopulation().GetDeme(i).GetInjectedCount() == 0) ) {
m_world->GetPopulation().GetDeme(i).IncInjectedCount();
continue;
@@ -687,6 +691,7 @@
if (largs.GetSize()) m_merit = largs.PopWord().AsDouble();
if (largs.GetSize()) m_lineage_label = largs.PopWord().AsInt();
if (largs.GetSize()) m_neutral_metric = largs.PopWord().AsDouble();
+ assert(m_num_orgs <= m_world->GetPopulation().GetSize());
} //End cActionInjectDemesRandom constructor
static const cString GetDescription() { return "Arguments: [int num_orgs=1] [double merit=-1] [int lineage_label=0] [double neutral_metric=0]"; }
@@ -698,34 +703,35 @@
for(int i=0; i<m_world->GetPopulation().GetNumDemes(); ++i) {
- // The first deme will have initially had one organism injected. If this
+ // Each deme will have initially had one organism injected. If this
// is the first injection and energy is used, increment the injected
// count (the initial injection wasn't counted) and skip the first deme
// so that the energies don't get messed up.
- if( (i==0) && (m_world->GetConfig().ENERGY_ENABLED.Get() == 1) &&
+ if( (m_world->GetConfig().ENERGY_ENABLED.Get() == 1) &&
(m_world->GetPopulation().GetDeme(i).GetInjectedCount() == 0) ) {
m_world->GetPopulation().GetDeme(i).IncInjectedCount();
continue;
}
- target_cell = -1;
- target_cellr = -1;
- deme_size = m_world->GetPopulation().GetDeme(i).GetSize();
+ if(m_world->GetPopulation().GetDeme(i).GetInjectedCount() < m_num_orgs) {
+ target_cell = -1;
+ target_cellr = -1;
+ deme_size = m_world->GetPopulation().GetDeme(i).GetSize();
- // Find a random, unoccupied cell to use. Assumes one exists.
- do {
- target_cellr = m_world->GetRandom().GetInt(0, deme_size-1);
- target_cell = m_world->GetPopulation().GetDeme(i).GetCellID(target_cellr);
- } while (m_world->GetPopulation().GetCell(target_cell).IsOccupied());
+ // Find a random, unoccupied cell to use. Assumes one exists.
+ do {
+ target_cellr = m_world->GetRandom().GetInt(0, deme_size-1);
+ target_cell = m_world->GetPopulation().GetDeme(i).GetCellID(target_cellr);
+ } while (m_world->GetPopulation().GetCell(target_cell).IsOccupied());
- assert(target_cell > -1);
- assert(target_cell < m_world->GetPopulation().GetSize());
+ assert(target_cell > -1);
+ assert(target_cell < m_world->GetPopulation().GetSize());
- if(m_world->GetPopulation().GetDeme(i).GetInjectedCount() < m_num_orgs) {
- m_world->GetPopulation().Inject(m_world->GetPopulation().GetDeme(i).GetGermline().GetLatest(), target_cell, m_merit,
+ m_world->GetPopulation().Inject(m_world->GetPopulation().GetDeme(i).GetGermline().GetLatest(),
+ target_cell, m_merit,
m_lineage_label, m_neutral_metric);
m_world->GetPopulation().GetDeme(i).IncInjectedCount();
- }
+ } //End if there are still orgs to be inserted
} //End iterating through demes
@@ -1258,7 +1264,23 @@
virtual double Fitness(const cDeme& deme) = 0;
};
+class cAbstractCompeteDemes_AttackKillAndEnergyConserve : public cAbstractCompeteDemes {
+ public:
+ cAbstractCompeteDemes_AttackKillAndEnergyConserve(cWorld* world, const cString& args) : cAbstractCompeteDemes(world, args) { }
+
+ static const cString GetDescription() { return "No Arguments"; }
+
+ double Fitness(const cDeme& deme) {
+ double eventsKilled = static_cast<double>(deme.GetEventsKilled());
+ double totalEvents = static_cast<double>(deme.GetEventsTotal());
+ double energyRemaining = deme.CalculateTotalEnergy();
+ double initialEnergy = deme.CalculateTotalInitialEnergyResources();
+ double fitnessOfDeme = ((eventsKilled / totalEvents) + (energyRemaining / initialEnergy)) / 2.0;
+ return fitnessOfDeme;
+ }
+};
+
/* This Action will check if any demes have met the critera to be replicated
and do so. There are several bases this can be checked on:
@@ -1267,11 +1289,9 @@
'corners' - ...demes with upper left and lower right corners filled.
'deme-age' - ...demes that are a certain age
'birth-count' ...demes that have had a certain number of births.
-<<<<<<< .working
'sat-mov-pred' - ...demes whose movement predicate was previously satisfied
-=======
'events-killed' ...demes that have killed a certian number of events
->>>>>>> .merge-right.r2644
+ 'sat-msg-pred' - ...demes whose message predicate was previously satisfied
*/
class cActionReplicateDemes : public cAction
@@ -1292,6 +1312,7 @@
else if (in_trigger == "birth-count") m_rep_trigger = 4;
else if (in_trigger == "sat-mov-pred") m_rep_trigger = 5;
else if (in_trigger == "events-killed") m_rep_trigger = 6;
+ else if (in_trigger == "sat-msg-pred") m_rep_trigger = 7;
else {
cString err("Unknown replication trigger '");
err += in_trigger;
@@ -1948,6 +1969,9 @@
action_lib->Register<cActionDivideDemes>("DivideDemes");
action_lib->Register<cActionResetDemes>("ResetDemes");
action_lib->Register<cActionCopyDeme>("CopyDeme");
+
+/****AbstractCompeteDemes sub-classes****/
+ action_lib->Register<cAbstractCompeteDemes_AttackKillAndEnergyConserve>("CompeteDemes_AttackKillAndEnergyConserve");
action_lib->Register<cActionNewTrial>("NewTrial");
action_lib->Register<cActionCompeteOrganisms>("CompeteOrganisms");
Modified: branches/collect/source/cpu/cHardwareCPU.cc
===================================================================
--- branches/collect/source/cpu/cHardwareCPU.cc 2008-06-21 19:39:41 UTC (rev 2669)
+++ branches/collect/source/cpu/cHardwareCPU.cc 2008-06-21 19:45:43 UTC (rev 2670)
@@ -434,19 +434,19 @@
tInstLibEntry<tMethod>("sensef-m100", &cHardwareCPU::Inst_SenseMult100Facing),
tInstLibEntry<tMethod>("sense-pheromone", &cHardwareCPU::Inst_SensePheromone),
tInstLibEntry<tMethod>("sense-pheromone-faced", &cHardwareCPU::Inst_SensePheromoneFaced),
- tInstLibEntry<tMethod>("exploit", &cHardwareCPU::Inst_Exploit),
- tInstLibEntry<tMethod>("exploit-forward5", &cHardwareCPU::Inst_ExploitForward5),
- tInstLibEntry<tMethod>("exploit-forward3", &cHardwareCPU::Inst_ExploitForward3),
- tInstLibEntry<tMethod>("explore", &cHardwareCPU::Inst_Explore),
- tInstLibEntry<tMethod>("movetarget", &cHardwareCPU::Inst_MoveTarget),
- tInstLibEntry<tMethod>("movetarget-forward5", &cHardwareCPU::Inst_MoveTargetForward5),
- tInstLibEntry<tMethod>("movetarget-forward3", &cHardwareCPU::Inst_MoveTargetForward3),
- tInstLibEntry<tMethod>("supermove", &cHardwareCPU::Inst_SuperMove),
+ tInstLibEntry<tMethod>("exploit", &cHardwareCPU::Inst_Exploit, nInstFlag::STALL),
+ tInstLibEntry<tMethod>("exploit-forward5", &cHardwareCPU::Inst_ExploitForward5, nInstFlag::STALL),
+ tInstLibEntry<tMethod>("exploit-forward3", &cHardwareCPU::Inst_ExploitForward3, nInstFlag::STALL),
+ tInstLibEntry<tMethod>("explore", &cHardwareCPU::Inst_Explore, nInstFlag::STALL),
+ tInstLibEntry<tMethod>("movetarget", &cHardwareCPU::Inst_MoveTarget, nInstFlag::STALL),
+ tInstLibEntry<tMethod>("movetarget-forward5", &cHardwareCPU::Inst_MoveTargetForward5, nInstFlag::STALL),
+ tInstLibEntry<tMethod>("movetarget-forward3", &cHardwareCPU::Inst_MoveTargetForward3, nInstFlag::STALL),
+ tInstLibEntry<tMethod>("supermove", &cHardwareCPU::Inst_SuperMove, nInstFlag::STALL),
tInstLibEntry<tMethod>("if-target", &cHardwareCPU::Inst_IfTarget),
tInstLibEntry<tMethod>("if-not-target", &cHardwareCPU::Inst_IfNotTarget),
tInstLibEntry<tMethod>("if-pheromone", &cHardwareCPU::Inst_IfPheromone),
tInstLibEntry<tMethod>("if-not-pheromone", &cHardwareCPU::Inst_IfNotPheromone),
- tInstLibEntry<tMethod>("drop-pheromone", &cHardwareCPU::Inst_DropPheromone),
+ tInstLibEntry<tMethod>("drop-pheromone", &cHardwareCPU::Inst_DropPheromone, nInstFlag::STALL),
// Must always be the last instruction in the array
tInstLibEntry<tMethod>("NULL", &cHardwareCPU::Inst_Nop, 0, "True no-operation instruction: does nothing"),
@@ -6059,7 +6059,7 @@
cPopulationCell& mycell = pop.GetCell(cellid);
cDeme &deme = pop.GetDeme(pop.GetCell(cellid).GetDemeID());
- cResourceCount deme_resource_count = deme.GetDemeResourceCount();
+// const cResourceCount& deme_resource_count = deme.GetDemeResourceCount();
int fromcellID, destcellID;
int cell_data;
@@ -6072,8 +6072,6 @@
double pher_amount = 0; // this is used in logging
int drop_mode = -1;
-//int smc = mycell.ConnectionList().GetSize();
- //SingleProcess shows decent-looking cellids until the end. maybe this is a deme replication problem (probably)
cPopulationCell faced = mycell.GetCellFaced();
// Find if any neighbor is a target
@@ -6087,8 +6085,6 @@
mycell.ConnectionList().CircNext();
}
-// assert(faced == pop.GetCell(fromcellID).GetCellFaced());
-
// Rotate until we face the neighbor with a target.
// If there was no winner, just move forward.
for(int i = 0; i < num_rotations; i++) {
Modified: branches/collect/source/main/cAvidaConfig.h
===================================================================
--- branches/collect/source/main/cAvidaConfig.h 2008-06-21 19:39:41 UTC (rev 2669)
+++ branches/collect/source/main/cAvidaConfig.h 2008-06-21 19:45:43 UTC (rev 2670)
@@ -326,7 +326,6 @@
CONFIG_ADD_VAR(DEMES_DEFAULT_GERMLINE_PROPENSITY, double, 0.0, "Default germline propensity of organisms in deme.\nFor use with DEMES_DIVIDE_METHOD 2.");
CONFIG_ADD_VAR(DEMES_FOUNDER_GERMLINE_PROPENSITY, double, -1.0, "Default germline propensity of founder organisms in deme.\nFor use with DEMES_DIVIDE_METHOD 2.\n <0 = OFF");
CONFIG_ADD_VAR(DEMES_PREFER_EMPTY, int, 0, "Give empty demes preference as targets of deme replication?");
- CONFIG_ADD_VAR(MAX_DEME_BIRTHS, int, 500, "The maximum number of births within a deme to be\nused for birth-based replication (default=500).");
CONFIG_ADD_GROUP(REPRODUCTION_GROUP, "Birth and Death");
CONFIG_ADD_VAR(BIRTH_METHOD, int, 0, "Which organism should be replaced on birth?\n0 = Random organism in neighborhood\n1 = Oldest in neighborhood\n2 = Largest Age/Merit in neighborhood\n3 = None (use only empty cells in neighborhood)\n4 = Random from population (Mass Action)\n5 = Oldest in entire population\n6 = Random within deme\n7 = Organism faced by parent\n8 = Next grid cell (id+1)\n9 = Largest energy used in entire population\n10 = Largest energy used in neighborhood");
@@ -541,7 +540,7 @@
// @WRE: Additions for approaching various features of biological organisms
CONFIG_ADD_GROUP(BIOMIMETIC_GROUP, "Biomimetic Features Settings");
CONFIG_ADD_VAR(BIOMIMETIC_REFRACTORY_PERIOD, double, 0.0, "Number of updates affected by refractory period");
- CONFIG_ADD_VAR(BIOMIMETIC_MOVEMENT_STEP, int, 0, "Number of cells to move Avidian on move instruction");
+ CONFIG_ADD_VAR(BIOMIMETIC_MOVEMENT_STEP, int, 1, "Number of cells to move Avidian on move instruction");
CONFIG_ADD_VAR(BIOMIMETIC_MOVEMENT_LOG, int, 0, "Log detailed movement information (WARNING: large data file)");
CONFIG_ADD_VAR(BIOMIMETIC_MOVEMENT_FACTOR, double, 1.0, "Scale merit bonus due to movement (m<1.0 applies a cost)");
CONFIG_ADD_VAR(BIOMIMETIC_EVAL_ON_MOVEMENT, int, 0, "Force task evaluation on each movement step");
Modified: branches/collect/source/main/cDeme.cc
===================================================================
--- branches/collect/source/main/cDeme.cc 2008-06-21 19:39:41 UTC (rev 2669)
+++ branches/collect/source/main/cDeme.cc 2008-06-21 19:45:43 UTC (rev 2670)
@@ -151,6 +151,7 @@
if(!event.IsActive() && event.GetDelay() == _age) {
+ eventsTotal++;
event.ActivateEvent(); //start event
int eventCell = event.GetNextEventCellID();
while(eventCell != -1) {
@@ -252,6 +253,7 @@
cur_normalized_time_used = 0;
injected_count = 0;
birth_count_perslot = 0;
+ eventsTotal = 0;
eventsKilled = 0;
eventsKilledThisSlot = 0;
eventKillAttempts = 0;
@@ -272,8 +274,9 @@
(*movement_pred_list[i]).Reset();
}
- if(resetResources)
+ if(resetResources) {
deme_resource_count.ReinitializeResources(additional_resource);
+ }
}
@@ -548,7 +551,7 @@
return false;
}
-double cDeme::CalculateTotalEnergy() {
+double cDeme::CalculateTotalEnergy() const {
assert(m_world->GetConfig().ENERGY_ENABLED.Get());
double energy_sum = 0.0;
@@ -567,6 +570,17 @@
return energy_sum;
}
+double cDeme::CalculateTotalInitialEnergyResources() const {
+ assert(m_world->GetConfig().ENERGY_ENABLED.Get());
+
+ double energy_sum = 0.0;
+ for(int i = 0; i < energy_res_ids.GetSize(); i++) {
+ energy_sum += deme_resource_count.GetInitialResourceValue(i);
+ }
+ return energy_sum;
+}
+
+
// --- Founder list management --- //
void cDeme::AddFounder(cGenotype& _in_genotype, cPhenotype * _in_phenotype) {
Modified: branches/collect/source/main/cDeme.h
===================================================================
--- branches/collect/source/main/cDeme.h 2008-06-21 19:39:41 UTC (rev 2669)
+++ branches/collect/source/main/cDeme.h 2008-06-21 19:45:43 UTC (rev 2670)
@@ -71,6 +71,7 @@
double cur_normalized_time_used; // normalized by merit and number of orgs
double last_normalized_time_used;
double total_energy_testament; //! total amount of energy from suicide organisms for offspring deme
+ int eventsTotal;
unsigned int eventsKilled;
unsigned int eventsKilledThisSlot;
unsigned int eventKillAttempts;
@@ -121,7 +122,7 @@
cDeme() : _id(0), width(0), cur_birth_count(0), last_birth_count(0), cur_org_count(0), last_org_count(0), injected_count(0), birth_count_perslot(0),
_age(0), generation(0), total_org_energy(0.0),
time_used(0), gestation_time(0), cur_normalized_time_used(0.0), last_normalized_time_used(0.0), total_energy_testament(0.0),
- eventsKilled(0), eventsKilledThisSlot(0), eventKillAttempts(0), eventKillAttemptsThisSlot(0),
+ eventsTotal(0), eventsKilled(0), eventsKilledThisSlot(0), eventKillAttempts(0), eventKillAttemptsThisSlot(0),
consecutiveSuccessfulEventPeriods(0), sleeping_count(0),
avg_founder_generation(0.0), generations_per_lifetime(0.0),
deme_resource_count(0), m_germline_genotype_id(0) { ; }
@@ -172,6 +173,7 @@
bool IsFull() const { return cur_org_count == cell_ids.GetSize(); }
int GetSlotFlowRate() const;
+ int GetEventsTotal() const { return eventsTotal; }
int GetEventsKilled() const { return eventsKilled; }
int GetEventsKilledThisSlot() const { return eventsKilledThisSlot;}
int GetEventKillAttempts() const { return eventKillAttempts; }
@@ -241,7 +243,8 @@
bool KillCellEvent(const int eventID);
cDemeCellEvent* GetCellEvent(const int i) { return &cell_events[i]; };
- double CalculateTotalEnergy();
+ double CalculateTotalEnergy() const;
+ double CalculateTotalInitialEnergyResources() const;
double GetTotalEnergyTestament() { return total_energy_testament; }
void IncreaseTotalEnergyTestament(double increment) { total_energy_testament += increment; }
Modified: branches/collect/source/main/cDemeCellEvent.cc
===================================================================
--- branches/collect/source/main/cDemeCellEvent.cc 2008-06-21 19:39:41 UTC (rev 2669)
+++ branches/collect/source/main/cDemeCellEvent.cc 2008-06-21 19:45:43 UTC (rev 2670)
@@ -11,6 +11,7 @@
, m_event_width(x2-x1)
, m_event_height(y2-y1)
, m_active(false)
+ , m_dead(false)
, m_static_pos(static_pos)
, m_deme(deme)
, m_world(world)
Modified: branches/collect/source/main/cPopulation.cc
===================================================================
--- branches/collect/source/main/cPopulation.cc 2008-06-21 19:39:41 UTC (rev 2669)
+++ branches/collect/source/main/cPopulation.cc 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1116,10 +1116,10 @@
Note: New deme competition fitness functions are added in PopulationActions.cc by subclassing
cActionAbstractCompeteDemes and overriding cActionAbstractCompeteDemes::Fitness(cDeme&). (Don't forget
- to register the action and add it to the events file).
+to register the action and add it to the events file).
Another note: To mimic the behavior of the other version of CompeteDemes (which is kept around
- for backwards compatibility), change the config option DEMES_REPLICATE_SIZE to be the size of
+for backwards compatibility), change the config option DEMES_REPLICATE_SIZE to be the size of
each deme.
*/
void cPopulation::CompeteDemes(const std::vector<double>& fitness) {
@@ -1193,6 +1193,7 @@
4: 'birth-count' ...demes that have had a certain number of births.
5: 'sat-mov-pred'...demes whose movement predicate was previously satisfied
6: 'events-killed' ...demes that have killed a certian number of events
+7: 'sat-msg-pred'...demes whose movement predicate was previously satisfied
*/
@@ -1257,6 +1258,10 @@
if(source_deme.GetConsecutiveSuccessfulEventPeriods()+currentSlotSuccessful < m_world->GetConfig().DEMES_MIM_SUCCESSFUL_EVENT_PERIODS.Get()) continue;
break;
}
+ case 7: {
+ if(!(source_deme.MsgPredSatisfiedPreviously())) continue;
+ break;
+ }
default: {
cerr << "ERROR: Invalid replication trigger " << rep_trigger
<< " in cPopulation::ReplicateDemes()" << endl;
@@ -4130,7 +4135,7 @@
cell_id = 0;
}
}
-
+
InjectGenome(cell_id, genome, lineage_label);
cPhenotype& phenotype = GetCell(cell_id).GetOrganism()->GetPhenotype();
phenotype.SetNeutralMetric(neutral);
@@ -4451,7 +4456,7 @@
{
// Setup the genotype...
cGenotype* new_genotype = m_world->GetClassificationManager().GetGenotypeInjected(genome, lineage_label);
-
+
// The rest is done by InjectGenotype();
InjectGenotype( cell_id, new_genotype );
}
Modified: branches/collect/source/main/cPopulationCell.cc
===================================================================
--- branches/collect/source/main/cPopulationCell.cc 2008-06-21 19:39:41 UTC (rev 2669)
+++ branches/collect/source/main/cPopulationCell.cc 2008-06-21 19:45:43 UTC (rev 2670)
@@ -208,7 +208,8 @@
// For the moment, the cell doesn't keep track of much...
cOrganism * out_organism = m_organism;
- if(m_world->GetConfig().ENERGY_ENABLED.Get() == 1 && m_world->GetConfig().FRAC_ENERGY_TRANSFER.Get() > 0.0) {
+ if(m_world->GetConfig().ENERGY_ENABLED.Get() == 1 && m_world->GetConfig().FRAC_ENERGY_TRANSFER.Get() > 0.0
+ && m_world->GetConfig().FRAC_ENERGY_DECAY_AT_DEME_BIRTH.Get() != 1.0) { // hack
m_world->GetPopulation().GetDeme(m_deme_id).GiveBackCellEnergy(m_cell_id, m_organism->GetPhenotype().GetStoredEnergy() * m_world->GetConfig().FRAC_ENERGY_TRANSFER.Get());
}
m_organism = NULL;
Modified: branches/collect/source/main/cResourceCount.cc
===================================================================
--- branches/collect/source/main/cResourceCount.cc 2008-06-21 19:39:41 UTC (rev 2669)
+++ branches/collect/source/main/cResourceCount.cc 2008-06-21 19:45:43 UTC (rev 2670)
@@ -494,6 +494,6 @@
void cResourceCount::ReinitializeResources(double additional_resource){
for(int i = 0; i < resource_name.GetSize(); i++) {
- Set(i, resource_initial[i]+additional_resource);
+ Set(i, resource_initial[i]+additional_resource); //will cause problem if more than one resource is used.
}
}
Modified: branches/collect/source/main/cResourceCount.h
===================================================================
--- branches/collect/source/main/cResourceCount.h 2008-06-21 19:39:41 UTC (rev 2669)
+++ branches/collect/source/main/cResourceCount.h 2008-06-21 19:45:43 UTC (rev 2670)
@@ -106,6 +106,7 @@
void ResizeSpatialGrids(int in_x, int in_y);
cSpatialResCount GetSpatialResource(int id) { return spatial_resource_count[id]; }
void ReinitializeResources(double additional_resource);
+ double GetInitialResourceValue(int resourceID) const { return resource_initial[resourceID]; }
cString GetResName(int id) { return resource_name[id]; }
};
Copied: branches/collect/tests/energy_deme_level_res/expected (from rev 2668, development/tests/energy_deme_level_res/expected)
Copied: branches/collect/tests/energy_deme_level_res/expected/data (from rev 2668, development/tests/energy_deme_level_res/expected/data)
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/average.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/average.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/average.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,30 +0,0 @@
-# Avida Average Data
-# Mon Jun 16 11:44:43 2008
-# 1: Update
-# 2: Merit
-# 3: Gestation Time
-# 4: Fitness
-# 5: Repro Rate?
-# 6: Size
-# 7: Copied Size
-# 8: Executed Size
-# 9: Abundance
-# 10: Proportion of organisms that gave birth in this update
-# 11: Proportion of Breed True Organisms
-# 12: Genotype Depth
-# 13: Generation
-# 14: Neutral Metric
-# 15: Lineage Label
-# 16: True Replication Rate (based on births/update, time-averaged)
-
-0 10.000000 146.000000 0.000000 0.000000 42.000000 42.000000 39.000000 1.000000 1.000000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000
-10 3.09738 146 0.267123 0 42 42 39 4 0.25 0.25 0 2 -1.1619 0 0
-20 1.61755 143.067 0.253012 0 42.2 40.6 36.4667 3 0.266667 0.2 0.333333 3.93333 -1.73114 0 0
-30 1.32964 144.387 0.260206 0 42.0645 41.2903 37.7097 2.58333 0.258065 0.193548 0.419355 5.51613 -1.19629 0 0
-40 1.1854 145.881 0.262352 0 41.9831 41.5932 38.3051 3.10526 0.322034 0.20339 0.474576 7.28814 -1.70709 0 0
-50 1.11982 147.323 0.263491 0 41.9479 41.9688 38.6979 2.4 0.270833 0.177083 0.760417 9.42708 -1.76902 0 0
-60 1.0781 146.87 0.263816 0 41.93 41.96 38.73 2.08333 0.13 0.08 0.88 11.33 -2.11273 0 0
-70 5.3181 104 0.192308 0 43.25 32 20 1.33333 0 0 0.5 1 1.33068 -1 0
-80 5.3181 104 0.192308 0 43.25 32 20 1.33333 0 0 0.5 1 1.33068 -1 0
-90 5.3181 104 0.192308 0 43.25 32 20 1.33333 0 0 0.5 1 1.33068 -1 0
-100 5.3181 104 0.192308 0 43.25 32 20 1.33333 0 0 0.5 1 1.33068 -1 0
Copied: branches/collect/tests/energy_deme_level_res/expected/data/average.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/average.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/average.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/average.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,30 @@
+# Avida Average Data
+# Mon Jun 16 11:44:43 2008
+# 1: Update
+# 2: Merit
+# 3: Gestation Time
+# 4: Fitness
+# 5: Repro Rate?
+# 6: Size
+# 7: Copied Size
+# 8: Executed Size
+# 9: Abundance
+# 10: Proportion of organisms that gave birth in this update
+# 11: Proportion of Breed True Organisms
+# 12: Genotype Depth
+# 13: Generation
+# 14: Neutral Metric
+# 15: Lineage Label
+# 16: True Replication Rate (based on births/update, time-averaged)
+
+0 10.000000 146.000000 0.000000 0.000000 42.000000 42.000000 39.000000 1.000000 1.000000 1.000000 0.000000 0.000000 0.000000 0.000000 0.000000
+10 3.09738 146 0.267123 0 42 42 39 4 0.25 0.25 0 2 -1.1619 0 0
+20 1.61755 143.067 0.253012 0 42.2 40.6 36.4667 3 0.266667 0.2 0.333333 3.93333 -1.73114 0 0
+30 1.32964 144.387 0.260206 0 42.0645 41.2903 37.7097 2.58333 0.258065 0.193548 0.419355 5.51613 -1.19629 0 0
+40 1.1854 145.881 0.262352 0 41.9831 41.5932 38.3051 3.10526 0.322034 0.20339 0.474576 7.28814 -1.70709 0 0
+50 1.11982 147.323 0.263491 0 41.9479 41.9688 38.6979 2.4 0.270833 0.177083 0.760417 9.42708 -1.76902 0 0
+60 1.0781 146.87 0.263816 0 41.93 41.96 38.73 2.08333 0.13 0.08 0.88 11.33 -2.11273 0 0
+70 5.3181 104 0.192308 0 43.25 32 20 1.33333 0 0 0.5 1 1.33068 -1 0
+80 5.3181 104 0.192308 0 43.25 32 20 1.33333 0 0 0.5 1 1.33068 -1 0
+90 5.3181 104 0.192308 0 43.25 32 20 1.33333 0 0 0.5 1 1.33068 -1 0
+100 5.3181 104 0.192308 0 43.25 32 20 1.33333 0 0 0.5 1 1.33068 -1 0
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/count.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/count.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/count.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,30 +0,0 @@
-# Avida count data
-# Mon Jun 16 11:44:43 2008
-# 1: update
-# 2: number of insts executed this update
-# 3: number of organisms
-# 4: number of different genotypes
-# 5: number of different threshold genotypes
-# 6: number of different species
-# 7: number of different threshold species
-# 8: number of different lineages
-# 9: number of births in this update
-# 10: number of deaths in this update
-# 11: number of breed true
-# 12: number of breed true organisms?
-# 13: number of no-birth organisms
-# 14: number of single-threaded organisms
-# 15: number of multi-threaded organisms
-# 16: number of modified organisms
-
-0 30 1 1 1 0 0 0 1 0 1 1 1 1 0 0
-10 90 4 1 1 0 0 0 1 0 1 4 2 4 0 0
-20 330 15 5 1 0 0 0 4 0 3 11 8 15 0 0
-30 810 31 12 1 0 0 0 8 4 6 20 16 31 0 0
-40 1470 59 19 3 0 0 0 19 9 12 42 34 59 0 0
-50 2640 96 40 4 0 0 0 26 18 17 58 52 96 0 0
-60 3000 100 48 7 0 0 0 13 13 8 66 61 100 0 0
-70 120 4 3 1 0 0 0 0 0 0 2 2 4 0 0
-80 120 4 3 1 0 0 0 0 0 0 2 2 4 0 0
-90 120 4 3 1 0 0 0 0 0 0 2 2 4 0 0
-100 120 4 3 1 0 0 0 0 0 0 2 2 4 0 0
Copied: branches/collect/tests/energy_deme_level_res/expected/data/count.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/count.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/count.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/count.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,30 @@
+# Avida count data
+# Mon Jun 16 11:44:43 2008
+# 1: update
+# 2: number of insts executed this update
+# 3: number of organisms
+# 4: number of different genotypes
+# 5: number of different threshold genotypes
+# 6: number of different species
+# 7: number of different threshold species
+# 8: number of different lineages
+# 9: number of births in this update
+# 10: number of deaths in this update
+# 11: number of breed true
+# 12: number of breed true organisms?
+# 13: number of no-birth organisms
+# 14: number of single-threaded organisms
+# 15: number of multi-threaded organisms
+# 16: number of modified organisms
+
+0 30 1 1 1 0 0 0 1 0 1 1 1 1 0 0
+10 90 4 1 1 0 0 0 1 0 1 4 2 4 0 0
+20 330 15 5 1 0 0 0 4 0 3 11 8 15 0 0
+30 810 31 12 1 0 0 0 8 4 6 20 16 31 0 0
+40 1470 59 19 3 0 0 0 19 9 12 42 34 59 0 0
+50 2640 96 40 4 0 0 0 26 18 17 58 52 96 0 0
+60 3000 100 48 7 0 0 0 13 13 8 66 61 100 0 0
+70 120 4 3 1 0 0 0 0 0 0 2 2 4 0 0
+80 120 4 3 1 0 0 0 0 0 0 2 2 4 0 0
+90 120 4 3 1 0 0 0 0 0 0 2 2 4 0 0
+100 120 4 3 1 0 0 0 0 0 0 2 2 4 0 0
Deleted: branches/collect/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-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,144 +0,0 @@
-deme_0000000_energy_0000000 = [ ...
-99490 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-
-deme_0000000_energy_0000010 = [ ...
-30815.8 30918 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 30815.8
-0 0 0 0 0 0 0 0 0 30815.8
-];
-
-deme_0000000_energy_0000020 = [ ...
-15770.3 15770.3 15804.5 0 0 0 0 15798.9 15770.3 0
-20344 0 0 15820.4 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-15833.8 0 0 0 0 0 0 0 15770.3 15822.7
-15770.3 15832.2 0 0 0 0 0 15770.3 15832.2 15770.3
-];
-
-deme_0000000_energy_0000030 = [ ...
-13397.3 12474.1 15309.3 0 0 0 0 15275.8 12515.5 12533
-19496.5 12474.1 12474.1 15341.1 0 0 0 12472.9 0 0
-0 12474.1 12474.1 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-12004.7 0 0 0 0 0 0 0 12474.1 0
-12043.3 13351 12519.2 0 0 0 0 0 12474.1 12526.8
-12525.5 12515.5 0 0 0 0 0 13345.6 12474.1 12521.8
-12534.3 13397.3 12474.1 0 0 0 0 13397.3 12521.8 13397.3
-];
-
-deme_0000000_energy_0000040 = [ ...
-11806.3 11869 14795 11752 11752 0 11752 14752.7 11869 11869
-18609.6 11793.3 11869 14744.2 11752 0 11861.8 11798.2 11869 11902.7
-11752 11869 11799.2 0 0 0 11799.3 0 11942.5 11752
-11798 11802.7 11814.8 11803.9 0 0 0 0 0 0
-9970.65 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 10996 9970.65
-11902.7 0 0 0 0 0 0 11793.3 12108 10957.5
-11187.8 12947.3 11869 0 0 0 11789.8 11808.7 11752 11806.3
-11812.2 11808.7 11869 11808.1 0 11869 11902.7 11869 11802.7 11812.2
-11808.7 11808.7 11808.1 11752 0 0 12145.6 11752 11808.7 11869
-];
-
-deme_0000000_energy_0000050 = [ ...
-11566.9 11593.7 11630.1 11593.7 11593.7 11642.7 11588.6 11593.7 11525.7 11566.9
-11534.2 11592.6 11593.7 11593.7 11451.9 11593.7 11629.4 11633.4 11566.9 11534.2
-11534.2 11641.5 10648.6 11649.7 11653.2 11478.4 11642.2 11642.7 11605.6 11534.2
-11645 10648.6 11443.9 11647.7 10215.6 11641 11641.5 11640.4 11566.9 11605.6
-9970.65 9360.24 0 11637.2 10175.8 11647.3 0 10702.5 11605.4 11593.7
-9360.24 10214.5 11566.9 0 0 11159.7 11119.5 11639.2 10702.5 11566.9
-11566.9 10228 11566.9 11533 11644.1 11493.8 11696.8 11637.2 11715.6 10692.6
-10702.5 12476.9 11534.2 11637.1 11638.2 11566.9 11645.4 11696.8 11648.5 10692.6
-11534.2 11174.8 11534.2 11633.6 11653.2 11534.2 11534.2 11534.2 11648.5 11534.2
-11642.7 11178.2 11642.9 11514.6 11566.9 11566.9 11527.3 11563.6 11593.7 11064.4
-];
-
-deme_0000000_energy_0000060 = [ ...
-11460.8 11482.4 11482.4 11482.4 11559.1 10216.8 10772 11520.7 11452.5 11460.8
-11482.4 11559.1 11609 11559.1 11073.9 11559.1 10218.8 11559.1 11448.2 11268.6
-9931.41 11291.9 10848.6 11559.1 11370.1 11126.7 11559 11559.1 11493.4 9537.45
-11247.6 9931.41 10848.6 11556.9 11559.1 11078.5 11079.6 11458.5 11531.8 9537.45
-9970.65 9360.24 11493.4 11556.9 11556.9 10456.2 11520.7 10732.7 11559.1 11559.1
-11460.8 9891.74 11460.8 11460.8 10560.8 10557.6 11559.1 11559.1 10596.1 11060.7
-11493.4 9943.94 11603.2 10457.8 11518.6 11146.2 10522.7 10522.7 10596.1 10642.5
-10474.7 11961.7 11559.1 11559.1 11610.2 11460.8 11460.8 10850.2 11519.6 10642.5
-10797.5 10484.1 11613.7 11460.8 11613.7 11460.8 11559.1 11413.1 11520.7 11559.1
-10669.1 10810.4 11613.7 11143.6 10529.4 10772 11487.4 11559.1 11452.5 11559.1
-];
-
-deme_0000000_energy_0000070 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-52122.7 0 0 0 0 0 0 0 0 0
-0 52346 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000000_energy_0000080 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-50373 0 0 0 0 0 0 0 0 0
-0 50984.5 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000000_energy_0000090 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-48527.7 0 0 0 0 0 0 0 0 0
-0 49814.4 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000000_energy_0000100 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-47049.2 0 0 0 0 0 0 0 0 0
-0 49027.1 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
Copied: branches/collect/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m (from rev 2668, development/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,144 @@
+deme_0000000_energy_0000000 = [ ...
+99490 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+
+deme_0000000_energy_0000010 = [ ...
+30815.8 30918 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 30815.8
+0 0 0 0 0 0 0 0 0 30815.8
+];
+
+deme_0000000_energy_0000020 = [ ...
+15770.3 15770.3 15804.5 0 0 0 0 15798.9 15770.3 0
+20344 0 0 15820.4 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+15833.8 0 0 0 0 0 0 0 15770.3 15822.7
+15770.3 15832.2 0 0 0 0 0 15770.3 15832.2 15770.3
+];
+
+deme_0000000_energy_0000030 = [ ...
+13397.3 12474.1 15309.3 0 0 0 0 15275.8 12515.5 12533
+19496.5 12474.1 12474.1 15341.1 0 0 0 12472.9 0 0
+0 12474.1 12474.1 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+12004.7 0 0 0 0 0 0 0 12474.1 0
+12043.3 13351 12519.2 0 0 0 0 0 12474.1 12526.8
+12525.5 12515.5 0 0 0 0 0 13345.6 12474.1 12521.8
+12534.3 13397.3 12474.1 0 0 0 0 13397.3 12521.8 13397.3
+];
+
+deme_0000000_energy_0000040 = [ ...
+11806.3 11869 14795 11752 11752 0 11752 14752.7 11869 11869
+18609.6 11793.3 11869 14744.2 11752 0 11861.8 11798.2 11869 11902.7
+11752 11869 11799.2 0 0 0 11799.3 0 11942.5 11752
+11798 11802.7 11814.8 11803.9 0 0 0 0 0 0
+9970.65 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 10996 9970.65
+11902.7 0 0 0 0 0 0 11793.3 12108 10957.5
+11187.8 12947.3 11869 0 0 0 11789.8 11808.7 11752 11806.3
+11812.2 11808.7 11869 11808.1 0 11869 11902.7 11869 11802.7 11812.2
+11808.7 11808.7 11808.1 11752 0 0 12145.6 11752 11808.7 11869
+];
+
+deme_0000000_energy_0000050 = [ ...
+11566.9 11593.7 11630.1 11593.7 11593.7 11642.7 11588.6 11593.7 11525.7 11566.9
+11534.2 11592.6 11593.7 11593.7 11451.9 11593.7 11629.4 11633.4 11566.9 11534.2
+11534.2 11641.5 10648.6 11649.7 11653.2 11478.4 11642.2 11642.7 11605.6 11534.2
+11645 10648.6 11443.9 11647.7 10215.6 11641 11641.5 11640.4 11566.9 11605.6
+9970.65 9360.24 0 11637.2 10175.8 11647.3 0 10702.5 11605.4 11593.7
+9360.24 10214.5 11566.9 0 0 11159.7 11119.5 11639.2 10702.5 11566.9
+11566.9 10228 11566.9 11533 11644.1 11493.8 11696.8 11637.2 11715.6 10692.6
+10702.5 12476.9 11534.2 11637.1 11638.2 11566.9 11645.4 11696.8 11648.5 10692.6
+11534.2 11174.8 11534.2 11633.6 11653.2 11534.2 11534.2 11534.2 11648.5 11534.2
+11642.7 11178.2 11642.9 11514.6 11566.9 11566.9 11527.3 11563.6 11593.7 11064.4
+];
+
+deme_0000000_energy_0000060 = [ ...
+11460.8 11482.4 11482.4 11482.4 11559.1 10216.8 10772 11520.7 11452.5 11460.8
+11482.4 11559.1 11609 11559.1 11073.9 11559.1 10218.8 11559.1 11448.2 11268.6
+9931.41 11291.9 10848.6 11559.1 11370.1 11126.7 11559 11559.1 11493.4 9537.45
+11247.6 9931.41 10848.6 11556.9 11559.1 11078.5 11079.6 11458.5 11531.8 9537.45
+9970.65 9360.24 11493.4 11556.9 11556.9 10456.2 11520.7 10732.7 11559.1 11559.1
+11460.8 9891.74 11460.8 11460.8 10560.8 10557.6 11559.1 11559.1 10596.1 11060.7
+11493.4 9943.94 11603.2 10457.8 11518.6 11146.2 10522.7 10522.7 10596.1 10642.5
+10474.7 11961.7 11559.1 11559.1 11610.2 11460.8 11460.8 10850.2 11519.6 10642.5
+10797.5 10484.1 11613.7 11460.8 11613.7 11460.8 11559.1 11413.1 11520.7 11559.1
+10669.1 10810.4 11613.7 11143.6 10529.4 10772 11487.4 11559.1 11452.5 11559.1
+];
+
+deme_0000000_energy_0000070 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+52122.7 0 0 0 0 0 0 0 0 0
+0 52346 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_energy_0000080 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+50373 0 0 0 0 0 0 0 0 0
+0 50984.5 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_energy_0000090 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+48527.7 0 0 0 0 0 0 0 0 0
+0 49814.4 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_energy_0000100 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+47049.2 0 0 0 0 0 0 0 0 0
+0 49027.1 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
Deleted: branches/collect/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-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,144 +0,0 @@
-deme_0000001_energy_0000000 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-
-deme_0000001_energy_0000010 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000001_energy_0000020 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000001_energy_0000030 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000001_energy_0000040 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000001_energy_0000050 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000001_energy_0000060 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000001_energy_0000070 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-52367.3 0 0 0 0 0 0 0 0 0
-52122.7 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000001_energy_0000080 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-51090.9 0 0 0 0 0 0 0 0 0
-50676.2 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000001_energy_0000090 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-49878.2 0 0 0 0 0 0 0 0 0
-49080.7 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000001_energy_0000100 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-48527.4 0 0 0 0 0 0 0 0 0
-47421.5 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
Copied: branches/collect/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m (from rev 2668, development/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,144 @@
+deme_0000001_energy_0000000 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+
+deme_0000001_energy_0000010 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_energy_0000020 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_energy_0000030 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_energy_0000040 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_energy_0000050 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_energy_0000060 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_energy_0000070 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+52367.3 0 0 0 0 0 0 0 0 0
+52122.7 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_energy_0000080 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+51090.9 0 0 0 0 0 0 0 0 0
+50676.2 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_energy_0000090 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+49878.2 0 0 0 0 0 0 0 0 0
+49080.7 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_energy_0000100 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+48527.4 0 0 0 0 0 0 0 0 0
+47421.5 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/deme_donor.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_donor.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_donor.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,17 +0,0 @@
-# Num orgs doing doing a donate for each deme in population
-# Mon Jun 16 11:44:43 2008
-# 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
Copied: branches/collect/tests/energy_deme_level_res/expected/data/deme_donor.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/deme_donor.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/deme_donor.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_donor.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,17 @@
+# Num orgs doing doing a donate for each deme in population
+# Mon Jun 16 11:44:43 2008
+# 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
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/deme_fitness.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_fitness.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_fitness.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,17 +0,0 @@
-# Average fitnesses for each deme in the population
-# Mon Jun 16 11:44:43 2008
-# 1: update
-# 2: Deme 0
-# 3: Deme 1
-
-0 0.000000 0.000000
-10 0.267123 0
-20 0.253012 0
-30 0.260206 0
-40 0.262352 0
-50 0.263491 0
-60 0.263816 0
-70 0.192308 0.192308
-80 0.192308 0.192308
-90 0.192308 0.192308
-100 0.192308 0.192308
Copied: branches/collect/tests/energy_deme_level_res/expected/data/deme_fitness.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/deme_fitness.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/deme_fitness.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_fitness.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,17 @@
+# Average fitnesses for each deme in the population
+# Mon Jun 16 11:44:43 2008
+# 1: update
+# 2: Deme 0
+# 3: Deme 1
+
+0 0.000000 0.000000
+10 0.267123 0
+20 0.253012 0
+30 0.260206 0
+40 0.262352 0
+50 0.263491 0
+60 0.263816 0
+70 0.192308 0.192308
+80 0.192308 0.192308
+90 0.192308 0.192308
+100 0.192308 0.192308
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/deme_gest_time.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_gest_time.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_gest_time.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,17 +0,0 @@
-# Average gestation time for each deme in population
-# Mon Jun 16 11:44:43 2008
-# 1: update
-# 2: Deme 0
-# 3: Deme 1
-
-0 146.000000 0.000000
-10 146 0
-20 143.067 0
-30 144.387 0
-40 145.881 0
-50 147.323 0
-60 146.87 0
-70 104 104
-80 104 104
-90 104 104
-100 104 104
Copied: branches/collect/tests/energy_deme_level_res/expected/data/deme_gest_time.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/deme_gest_time.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/deme_gest_time.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_gest_time.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,17 @@
+# Average gestation time for each deme in population
+# Mon Jun 16 11:44:43 2008
+# 1: update
+# 2: Deme 0
+# 3: Deme 1
+
+0 146.000000 0.000000
+10 146 0
+20 143.067 0
+30 144.387 0
+40 145.881 0
+50 147.323 0
+60 146.87 0
+70 104 104
+80 104 104
+90 104 104
+100 104 104
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,48 +0,0 @@
-# Number of times each instruction is exectued in deme 0
-# Mon Jun 16 11:44:43 2008
-# 1: update
-# 2: Inst 0
-# 3: Inst 1
-# 4: Inst 2
-# 5: Inst 3
-# 6: Inst 4
-# 7: Inst 5
-# 8: Inst 6
-# 9: Inst 7
-# 10: Inst 8
-# 11: Inst 9
-# 12: Inst 10
-# 13: Inst 11
-# 14: Inst 12
-# 15: Inst 13
-# 16: Inst 14
-# 17: Inst 15
-# 18: Inst 16
-# 19: Inst 17
-# 20: Inst 18
-# 21: Inst 19
-# 22: Inst 20
-# 23: Inst 21
-# 24: Inst 22
-# 25: Inst 23
-# 26: Inst 24
-# 27: Inst 25
-# 28: Inst 26
-# 29: Inst 27
-# 30: Inst 28
-# 31: Inst 29
-# 32: Inst 30
-# 33: Inst 31
-# 34: Inst 32
-
-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 168 8 168 0 0 168 0 0 0 0 0 0 0 0
-20 42 0 0 0 0 0 0 0 0 0 0 0 0 0 0 30 210 15 15 588 30 588 0 0 588 0 0 0 0 0 0 0 0
-30 42 0 2 0 0 0 0 0 0 0 0 0 0 0 0 62 432 31 31 1258 62 1258 0 0 1258 0 0 0 0 0 0 0 0
-40 42 0 5 0 0 0 0 0 43 0 0 0 0 0 0 120 819 59 59 2433 118 2433 0 0 2436 0 0 0 0 0 0 0 0
-50 0 0 14 2 6 0 0 0 0 2 2 0 0 0 0 197 1319 96 96 4007 192 4009 0 0 4013 0 1 0 0 0 0 0 2
-60 0 0 20 3 2 2 0 0 2 6 1 0 0 2 0 203 1365 100 100 4173 200 4172 0 0 4174 0 2 0 4 1 4 1 0
-70 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
-80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
-90 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
-100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
Copied: branches/collect/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_instruction-0.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,48 @@
+# Number of times each instruction is exectued in deme 0
+# Mon Jun 16 11:44:43 2008
+# 1: update
+# 2: Inst 0
+# 3: Inst 1
+# 4: Inst 2
+# 5: Inst 3
+# 6: Inst 4
+# 7: Inst 5
+# 8: Inst 6
+# 9: Inst 7
+# 10: Inst 8
+# 11: Inst 9
+# 12: Inst 10
+# 13: Inst 11
+# 14: Inst 12
+# 15: Inst 13
+# 16: Inst 14
+# 17: Inst 15
+# 18: Inst 16
+# 19: Inst 17
+# 20: Inst 18
+# 21: Inst 19
+# 22: Inst 20
+# 23: Inst 21
+# 24: Inst 22
+# 25: Inst 23
+# 26: Inst 24
+# 27: Inst 25
+# 28: Inst 26
+# 29: Inst 27
+# 30: Inst 28
+# 31: Inst 29
+# 32: Inst 30
+# 33: Inst 31
+# 34: Inst 32
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 168 8 168 0 0 168 0 0 0 0 0 0 0 0
+20 42 0 0 0 0 0 0 0 0 0 0 0 0 0 0 30 210 15 15 588 30 588 0 0 588 0 0 0 0 0 0 0 0
+30 42 0 2 0 0 0 0 0 0 0 0 0 0 0 0 62 432 31 31 1258 62 1258 0 0 1258 0 0 0 0 0 0 0 0
+40 42 0 5 0 0 0 0 0 43 0 0 0 0 0 0 120 819 59 59 2433 118 2433 0 0 2436 0 0 0 0 0 0 0 0
+50 0 0 14 2 6 0 0 0 0 2 2 0 0 0 0 197 1319 96 96 4007 192 4009 0 0 4013 0 1 0 0 0 0 0 2
+60 0 0 20 3 2 2 0 0 2 6 1 0 0 2 0 203 1365 100 100 4173 200 4172 0 0 4174 0 2 0 4 1 4 1 0
+70 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
+80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
+90 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
+100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,48 +0,0 @@
-# Number of times each instruction is exectued in deme 1
-# Mon Jun 16 11:44:43 2008
-# 1: update
-# 2: Inst 0
-# 3: Inst 1
-# 4: Inst 2
-# 5: Inst 3
-# 6: Inst 4
-# 7: Inst 5
-# 8: Inst 6
-# 9: Inst 7
-# 10: Inst 8
-# 11: Inst 9
-# 12: Inst 10
-# 13: Inst 11
-# 14: Inst 12
-# 15: Inst 13
-# 16: Inst 14
-# 17: Inst 15
-# 18: Inst 16
-# 19: Inst 17
-# 20: Inst 18
-# 21: Inst 19
-# 22: Inst 20
-# 23: Inst 21
-# 24: Inst 22
-# 25: Inst 23
-# 26: Inst 24
-# 27: Inst 25
-# 28: Inst 26
-# 29: Inst 27
-# 30: Inst 28
-# 31: Inst 29
-# 32: Inst 30
-# 33: Inst 31
-# 34: Inst 32
-
-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-30 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-40 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-60 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-70 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
-80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
-90 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
-100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
Copied: branches/collect/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_instruction-1.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,48 @@
+# Number of times each instruction is exectued in deme 1
+# Mon Jun 16 11:44:43 2008
+# 1: update
+# 2: Inst 0
+# 3: Inst 1
+# 4: Inst 2
+# 5: Inst 3
+# 6: Inst 4
+# 7: Inst 5
+# 8: Inst 6
+# 9: Inst 7
+# 10: Inst 8
+# 11: Inst 9
+# 12: Inst 10
+# 13: Inst 11
+# 14: Inst 12
+# 15: Inst 13
+# 16: Inst 14
+# 17: Inst 15
+# 18: Inst 16
+# 19: Inst 17
+# 20: Inst 18
+# 21: Inst 19
+# 22: Inst 20
+# 23: Inst 21
+# 24: Inst 22
+# 25: Inst 23
+# 26: Inst 24
+# 27: Inst 25
+# 28: Inst 26
+# 29: Inst 27
+# 30: Inst 28
+# 31: Inst 29
+# 32: Inst 30
+# 33: Inst 31
+# 34: Inst 32
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+20 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+30 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+40 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+60 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+70 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
+80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
+90 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
+100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 28 2 2 42 4 42 0 0 44 0 0 0 0 0 0 0 0
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,17 +0,0 @@
-# Average life fitnesses for each deme in the population
-# Mon Jun 16 11:44:43 2008
-# 1: update
-# 2: Deme 0
-# 3: Deme 1
-
-0 0.000000 0.000000
-10 0.267123 0
-20 0.253012 0
-30 0.260206 0
-40 0.262352 0
-50 0.263491 0
-60 0.263816 0
-70 0.192308 0.192308
-80 0.192308 0.192308
-90 0.192308 0.192308
-100 0.192308 0.192308
Copied: branches/collect/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_lifetime_fitness.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,17 @@
+# Average life fitnesses for each deme in the population
+# Mon Jun 16 11:44:43 2008
+# 1: update
+# 2: Deme 0
+# 3: Deme 1
+
+0 0.000000 0.000000
+10 0.267123 0
+20 0.253012 0
+30 0.260206 0
+40 0.262352 0
+50 0.263491 0
+60 0.263816 0
+70 0.192308 0.192308
+80 0.192308 0.192308
+90 0.192308 0.192308
+100 0.192308 0.192308
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/deme_merit.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_merit.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_merit.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,17 +0,0 @@
-# Average merits for each deme in population
-# Mon Jun 16 11:44:43 2008
-# 1: update
-# 2: Deme 0
-# 3: Deme 1
-
-0 10.000000 0.000000
-10 3.09738 0
-20 1.61755 0
-30 1.32964 0
-40 1.1854 0
-50 1.11982 0
-60 1.0781 0
-70 5.3181 5.3181
-80 5.3181 5.3181
-90 5.3181 5.3181
-100 5.3181 5.3181
Copied: branches/collect/tests/energy_deme_level_res/expected/data/deme_merit.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/deme_merit.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/deme_merit.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_merit.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,17 @@
+# Average merits for each deme in population
+# Mon Jun 16 11:44:43 2008
+# 1: update
+# 2: Deme 0
+# 3: Deme 1
+
+0 10.000000 0.000000
+10 3.09738 0
+20 1.61755 0
+30 1.32964 0
+40 1.1854 0
+50 1.11982 0
+60 1.0781 0
+70 5.3181 5.3181
+80 5.3181 5.3181
+90 5.3181 5.3181
+100 5.3181 5.3181
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,18 +0,0 @@
-# Average mutation rates for organisms in each deme
-# Mon Jun 16 11:44:43 2008
-# 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
Copied: branches/collect/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_mut_rates.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,18 @@
+# Average mutation rates for organisms in each deme
+# Mon Jun 16 11:44:43 2008
+# 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
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/deme_receiver.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_receiver.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_receiver.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,17 +0,0 @@
-# Num orgs doing receiving a donate for each deme in population
-# Mon Jun 16 11:44:43 2008
-# 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
Copied: branches/collect/tests/energy_deme_level_res/expected/data/deme_receiver.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/deme_receiver.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/deme_receiver.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_receiver.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,17 @@
+# Num orgs doing receiving a donate for each deme in population
+# Mon Jun 16 11:44:43 2008
+# 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
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/deme_resources.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_resources.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_resources.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,19 +0,0 @@
-# Avida deme resource data
-# Mon Jun 16 11:44:43 2008
-# 1: update
-# 2: Deme 0 Resource deme_ResA
-# 3: Deme 0 Resource deme_ResB
-# 4: Deme 1 Resource deme_ResA
-# 5: Deme 1 Resource deme_ResB
-
-0 2.000000 1000.000000 1.000000 1000.000000
-10 7.5 11931.4 1 11931.4
-20 25.5 20912.2 1 20912.2
-30 65.5 30904.2 1 30904.2
-40 138 40901.5 1 41901.3
-50 295 50900.5 1 51900.5
-60 514.5 60900.2 1 60900.2
-70 3 10934.9 3 10934.9
-80 3 20912.2 3 20912.2
-90 3 30904.2 3 30904.2
-100 3 40901.5 3 40901.5
Copied: branches/collect/tests/energy_deme_level_res/expected/data/deme_resources.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/deme_resources.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/deme_resources.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_resources.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,19 @@
+# Avida deme resource data
+# Mon Jun 16 11:44:43 2008
+# 1: update
+# 2: Deme 0 Resource deme_ResA
+# 3: Deme 0 Resource deme_ResB
+# 4: Deme 1 Resource deme_ResA
+# 5: Deme 1 Resource deme_ResB
+
+0 2.000000 1000.000000 1.000000 1000.000000
+10 7.5 11931.4 1 11931.4
+20 25.5 20912.2 1 20912.2
+30 65.5 30904.2 1 30904.2
+40 138 40901.5 1 41901.3
+50 295 50900.5 1 51900.5
+60 514.5 60900.2 1 60900.2
+70 3 10934.9 3 10934.9
+80 3 20912.2 3 20912.2
+90 3 30904.2 3 30904.2
+100 3 40901.5 3 40901.5
Deleted: branches/collect/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 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,287 +0,0 @@
-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
-];
-
Copied: branches/collect/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m (from rev 2668, development/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m 2008-06-21 19:45:43 UTC (rev 2670)
@@ -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
+];
+
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,287 +0,0 @@
-deme_0000000_sleep_0000000 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-
-deme_0000001_sleep_0000000 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000000_sleep_0000010 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000001_sleep_0000010 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000000_sleep_0000020 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000001_sleep_0000020 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000000_sleep_0000030 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000001_sleep_0000030 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000000_sleep_0000040 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000001_sleep_0000040 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000000_sleep_0000050 = [ ...
-0 0 0 0 0 1 0 0 0 0
-0 0 0 0 0 0 0 1 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 1 0 0 0
-0 0 0 0 0 0 0 1 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000001_sleep_0000050 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000000_sleep_0000060 = [ ...
-0 0 0 0 0 1 0 0 0 0
-0 0 1 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 1 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000001_sleep_0000060 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000000_sleep_0000070 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000001_sleep_0000070 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000000_sleep_0000080 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000001_sleep_0000080 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000000_sleep_0000090 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000001_sleep_0000090 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-1 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000000_sleep_0000100 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 1 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
-deme_0000001_sleep_0000100 = [ ...
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-0 0 0 0 0 0 0 0 0 0
-];
-
Copied: branches/collect/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m (from rev 2668, development/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,287 @@
+deme_0000000_sleep_0000000 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+
+deme_0000001_sleep_0000000 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_sleep_0000010 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_sleep_0000010 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_sleep_0000020 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_sleep_0000020 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_sleep_0000030 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_sleep_0000030 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_sleep_0000040 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_sleep_0000040 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_sleep_0000050 = [ ...
+0 0 0 0 0 1 0 0 0 0
+0 0 0 0 0 0 0 1 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 1 0 0 0
+0 0 0 0 0 0 0 1 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_sleep_0000050 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_sleep_0000060 = [ ...
+0 0 0 0 0 1 0 0 0 0
+0 0 1 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 1 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_sleep_0000060 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_sleep_0000070 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_sleep_0000070 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_sleep_0000080 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_sleep_0000080 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_sleep_0000090 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_sleep_0000090 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+1 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000000_sleep_0000100 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 1 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
+deme_0000001_sleep_0000100 = [ ...
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0
+];
+
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/deme_task.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_task.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_task.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,19 +0,0 @@
-# Num orgs doing each task for each deme in population
-# Mon Jun 16 11:44:43 2008
-# 1: update
-# 2: Deme 0, Task 0
-# 3: Deme 0, Task 1
-# 4: Deme 1, Task 0
-# 5: Deme 1, Task 1
-
-0 0 0 0 0
-10 4 4 0 0
-20 15 15 0 0
-30 31 31 0 0
-40 59 59 0 0
-50 96 92 0 0
-60 100 97 0 0
-70 2 2 2 2
-80 2 2 2 2
-90 2 2 2 2
-100 2 2 2 2
Copied: branches/collect/tests/energy_deme_level_res/expected/data/deme_task.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/deme_task.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/deme_task.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/deme_task.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,19 @@
+# Num orgs doing each task for each deme in population
+# Mon Jun 16 11:44:43 2008
+# 1: update
+# 2: Deme 0, Task 0
+# 3: Deme 0, Task 1
+# 4: Deme 1, Task 0
+# 5: Deme 1, Task 1
+
+0 0 0 0 0
+10 4 4 0 0
+20 15 15 0 0
+30 31 31 0 0
+40 59 59 0 0
+50 96 92 0 0
+60 100 97 0 0
+70 2 2 2 2
+80 2 2 2 2
+90 2 2 2 2
+100 2 2 2 2
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/dominant.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/dominant.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/dominant.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,30 +0,0 @@
-# Avida Dominant Data
-# Mon Jun 16 11:44:43 2008
-# 1: Update
-# 2: Average Merit of the Dominant Genotype
-# 3: Average Gestation Time of the Dominant Genotype
-# 4: Average Fitness of the Dominant Genotype
-# 5: Repro Rate?
-# 6: Size of Dominant Genotype
-# 7: Copied Size of Dominant Genotype
-# 8: Executed Size of Dominant Genotype
-# 9: Abundance of Dominant Genotype
-# 10: Number of Births
-# 11: Number of Dominant Breed True?
-# 12: Dominant Gene Depth
-# 13: Dominant Breed In
-# 14: Max Fitness?
-# 15: Genotype ID of Dominant Genotype
-# 16: Name of the Dominant Genotype
-
-0 0.000000 0.000000 0.000000 0.000000 42 0.000000 0.000000 1 0 0 0 0 0.000000 1 042-aaaaa
-10 3.83097 146 0.267123 0.00684932 42 42 39 4 1 1 0 0 0.267123 1 042-aaaaa
-20 2.25175 146 0.267123 0.00684932 42 42 39 11 4 3 0 0 0.267123 1 042-aaaaa
-30 1.65767 146 0.267123 0.00684932 42 42 39 20 7 6 0 0 0.267123 1 042-aaaaa
-40 1.41085 146 0.267123 0.00684932 42 42 39 36 15 9 0 0 0.267123 1 042-aaaaa
-50 1.29779 146 0.267123 0.00684932 42 42 39 39 14 9 0 0 0.267123 1 042-aaaaa
-60 1.25377 146 0.267123 0.00684932 42 42 39 38 6 5 0 0 0.272109 1 042-aaaaa
-70 5.3181 104 0.192308 0.00961538 43 43 20 2 0 0 0 0 0.192308 105 043-aaaac
-80 5.3181 104 0.192308 0.00961538 43 43 20 2 0 0 0 0 0.192308 105 043-aaaac
-90 5.3181 104 0.192308 0.00961538 43 43 20 2 0 0 0 0 0.192308 105 043-aaaac
-100 5.3181 104 0.192308 0.00961538 43 43 20 2 0 0 0 0 0.192308 105 043-aaaac
Copied: branches/collect/tests/energy_deme_level_res/expected/data/dominant.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/dominant.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/dominant.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/dominant.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,30 @@
+# Avida Dominant Data
+# Mon Jun 16 11:44:43 2008
+# 1: Update
+# 2: Average Merit of the Dominant Genotype
+# 3: Average Gestation Time of the Dominant Genotype
+# 4: Average Fitness of the Dominant Genotype
+# 5: Repro Rate?
+# 6: Size of Dominant Genotype
+# 7: Copied Size of Dominant Genotype
+# 8: Executed Size of Dominant Genotype
+# 9: Abundance of Dominant Genotype
+# 10: Number of Births
+# 11: Number of Dominant Breed True?
+# 12: Dominant Gene Depth
+# 13: Dominant Breed In
+# 14: Max Fitness?
+# 15: Genotype ID of Dominant Genotype
+# 16: Name of the Dominant Genotype
+
+0 0.000000 0.000000 0.000000 0.000000 42 0.000000 0.000000 1 0 0 0 0 0.000000 1 042-aaaaa
+10 3.83097 146 0.267123 0.00684932 42 42 39 4 1 1 0 0 0.267123 1 042-aaaaa
+20 2.25175 146 0.267123 0.00684932 42 42 39 11 4 3 0 0 0.267123 1 042-aaaaa
+30 1.65767 146 0.267123 0.00684932 42 42 39 20 7 6 0 0 0.267123 1 042-aaaaa
+40 1.41085 146 0.267123 0.00684932 42 42 39 36 15 9 0 0 0.267123 1 042-aaaaa
+50 1.29779 146 0.267123 0.00684932 42 42 39 39 14 9 0 0 0.267123 1 042-aaaaa
+60 1.25377 146 0.267123 0.00684932 42 42 39 38 6 5 0 0 0.272109 1 042-aaaaa
+70 5.3181 104 0.192308 0.00961538 43 43 20 2 0 0 0 0 0.192308 105 043-aaaac
+80 5.3181 104 0.192308 0.00961538 43 43 20 2 0 0 0 0 0.192308 105 043-aaaac
+90 5.3181 104 0.192308 0.00961538 43 43 20 2 0 0 0 0 0.192308 105 043-aaaac
+100 5.3181 104 0.192308 0.00961538 43 43 20 2 0 0 0 0 0.192308 105 043-aaaac
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/instruction.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/instruction.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/instruction.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,48 +0,0 @@
-# Avida instruction execution data
-# Mon Jun 16 11:44:43 2008
-# 1: Update
-# 2: nop-A
-# 3: nop-B
-# 4: nop-C
-# 5: if-n-equ
-# 6: if-less
-# 7: pop
-# 8: push
-# 9: swap-stk
-# 10: swap
-# 11: shift-r
-# 12: shift-l
-# 13: inc
-# 14: dec
-# 15: add
-# 16: sub
-# 17: nand
-# 18: IO
-# 19: h-alloc
-# 20: h-divide
-# 21: h-copy
-# 22: h-search
-# 23: mov-head
-# 24: jmp-head
-# 25: get-head
-# 26: if-label
-# 27: set-flow
-# 28: sense-m100
-# 29: if-equ-0
-# 30: time
-# 31: sleep1
-# 32: sleep2
-# 33: sleep3
-# 34: sleep4
-
-0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 168 8 168 0 0 168 0 0 0 0 0 0 0 0
-20 42 0 0 0 0 0 0 0 0 0 0 0 0 0 0 30 210 15 15 588 30 588 0 0 588 0 0 0 0 0 0 0 0
-30 42 0 2 0 0 0 0 0 0 0 0 0 0 0 0 62 432 31 31 1258 62 1258 0 0 1258 0 0 0 0 0 0 0 0
-40 42 0 5 0 0 0 0 0 43 0 0 0 0 0 0 120 819 59 59 2433 118 2433 0 0 2436 0 0 0 0 0 0 0 0
-50 0 0 14 2 6 0 0 0 0 2 2 0 0 0 0 197 1319 96 96 4007 192 4009 0 0 4013 0 1 0 0 0 0 0 2
-60 0 0 20 3 2 2 0 0 2 6 1 0 0 2 0 203 1365 100 100 4173 200 4172 0 0 4174 0 2 0 4 1 4 1 0
-70 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 84 8 84 0 0 88 0 0 0 0 0 0 0 0
-80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 84 8 84 0 0 88 0 0 0 0 0 0 0 0
-90 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 84 8 84 0 0 88 0 0 0 0 0 0 0 0
-100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 84 8 84 0 0 88 0 0 0 0 0 0 0 0
Copied: branches/collect/tests/energy_deme_level_res/expected/data/instruction.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/instruction.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/instruction.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/instruction.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,48 @@
+# Avida instruction execution data
+# Mon Jun 16 11:44:43 2008
+# 1: Update
+# 2: nop-A
+# 3: nop-B
+# 4: nop-C
+# 5: if-n-equ
+# 6: if-less
+# 7: pop
+# 8: push
+# 9: swap-stk
+# 10: swap
+# 11: shift-r
+# 12: shift-l
+# 13: inc
+# 14: dec
+# 15: add
+# 16: sub
+# 17: nand
+# 18: IO
+# 19: h-alloc
+# 20: h-divide
+# 21: h-copy
+# 22: h-search
+# 23: mov-head
+# 24: jmp-head
+# 25: get-head
+# 26: if-label
+# 27: set-flow
+# 28: sense-m100
+# 29: if-equ-0
+# 30: time
+# 31: sleep1
+# 32: sleep2
+# 33: sleep3
+# 34: sleep4
+
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 168 8 168 0 0 168 0 0 0 0 0 0 0 0
+20 42 0 0 0 0 0 0 0 0 0 0 0 0 0 0 30 210 15 15 588 30 588 0 0 588 0 0 0 0 0 0 0 0
+30 42 0 2 0 0 0 0 0 0 0 0 0 0 0 0 62 432 31 31 1258 62 1258 0 0 1258 0 0 0 0 0 0 0 0
+40 42 0 5 0 0 0 0 0 43 0 0 0 0 0 0 120 819 59 59 2433 118 2433 0 0 2436 0 0 0 0 0 0 0 0
+50 0 0 14 2 6 0 0 0 0 2 2 0 0 0 0 197 1319 96 96 4007 192 4009 0 0 4013 0 1 0 0 0 0 0 2
+60 0 0 20 3 2 2 0 0 2 6 1 0 0 2 0 203 1365 100 100 4173 200 4172 0 0 4174 0 2 0 4 1 4 1 0
+70 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 84 8 84 0 0 88 0 0 0 0 0 0 0 0
+80 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 84 8 84 0 0 88 0 0 0 0 0 0 0 0
+90 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 84 8 84 0 0 88 0 0 0 0 0 0 0 0
+100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 56 4 4 84 8 84 0 0 88 0 0 0 0 0 0 0 0
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/instruction_histogram.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/instruction_histogram.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/instruction_histogram.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,46 +0,0 @@
-# 1: Update
-# 2: nop-A
-# 3: nop-B
-# 4: nop-C
-# 5: if-n-equ
-# 6: if-less
-# 7: pop
-# 8: push
-# 9: swap-stk
-# 10: swap
-# 11: shift-r
-# 12: shift-l
-# 13: inc
-# 14: dec
-# 15: add
-# 16: sub
-# 17: nand
-# 18: IO
-# 19: h-alloc
-# 20: h-divide
-# 21: h-copy
-# 22: h-search
-# 23: mov-head
-# 24: jmp-head
-# 25: get-head
-# 26: if-label
-# 27: set-flow
-# 28: sense-m100
-# 29: if-equ-0
-# 30: time
-# 31: sleep1
-# 32: sleep2
-# 33: sleep3
-# 34: sleep4
-
-0 77 1 18 0 0 0 0 0 0 0 0 0 0 0 0 2 17 2 1 1 3 3 0 0 1 0 0 0 0 0 0 0 0
-10 318 4 68 0 0 0 0 0 0 0 0 0 0 0 0 8 65 7 4 4 11 11 0 0 4 0 0 0 0 0 0 0 0
-20 1106 14 232 0 0 0 0 0 0 0 0 0 1 0 0 28 225 22 14 15 36 37 0 0 14 0 1 0 0 0 0 0 0
-30 2271 34 537 0 0 2 0 0 2 0 0 1 1 0 0 70 525 45 35 36 79 82 0 0 37 0 1 0 0 0 0 0 0
-40 3957 71 1078 0 0 1 0 0 1 0 0 1 1 0 1 150 1068 83 71 73 153 156 0 0 76 0 2 0 0 0 0 1 1
-50 6478 115 1816 5 8 2 1 0 0 5 3 1 0 1 0 254 1794 146 115 113 257 259 4 0 122 1 3 0 8 1 1 2 2
-60 6611 120 1946 8 2 3 0 1 4 13 2 2 1 2 2 256 1878 189 121 121 299 284 1 1 124 2 3 0 10 3 7 2 1
-70 91 2 46 0 0 0 0 0 0 0 0 0 0 1 0 4 43 4 2 2 6 6 0 0 4 0 0 0 0 0 0 2 0
-80 91 2 46 0 0 0 0 0 0 0 0 0 0 1 0 4 43 4 2 2 6 6 0 0 4 0 0 0 0 0 0 2 0
-90 91 2 46 0 0 0 0 0 0 0 0 0 0 1 0 4 43 4 2 2 6 6 0 0 4 0 0 0 0 0 0 2 0
-100 180 2 45 0 0 0 0 0 0 0 0 0 0 1 1 4 43 4 2 2 6 5 0 0 3 0 0 1 0 0 0 2 0
Copied: branches/collect/tests/energy_deme_level_res/expected/data/instruction_histogram.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/instruction_histogram.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/instruction_histogram.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/instruction_histogram.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,46 @@
+# 1: Update
+# 2: nop-A
+# 3: nop-B
+# 4: nop-C
+# 5: if-n-equ
+# 6: if-less
+# 7: pop
+# 8: push
+# 9: swap-stk
+# 10: swap
+# 11: shift-r
+# 12: shift-l
+# 13: inc
+# 14: dec
+# 15: add
+# 16: sub
+# 17: nand
+# 18: IO
+# 19: h-alloc
+# 20: h-divide
+# 21: h-copy
+# 22: h-search
+# 23: mov-head
+# 24: jmp-head
+# 25: get-head
+# 26: if-label
+# 27: set-flow
+# 28: sense-m100
+# 29: if-equ-0
+# 30: time
+# 31: sleep1
+# 32: sleep2
+# 33: sleep3
+# 34: sleep4
+
+0 77 1 18 0 0 0 0 0 0 0 0 0 0 0 0 2 17 2 1 1 3 3 0 0 1 0 0 0 0 0 0 0 0
+10 318 4 68 0 0 0 0 0 0 0 0 0 0 0 0 8 65 7 4 4 11 11 0 0 4 0 0 0 0 0 0 0 0
+20 1106 14 232 0 0 0 0 0 0 0 0 0 1 0 0 28 225 22 14 15 36 37 0 0 14 0 1 0 0 0 0 0 0
+30 2271 34 537 0 0 2 0 0 2 0 0 1 1 0 0 70 525 45 35 36 79 82 0 0 37 0 1 0 0 0 0 0 0
+40 3957 71 1078 0 0 1 0 0 1 0 0 1 1 0 1 150 1068 83 71 73 153 156 0 0 76 0 2 0 0 0 0 1 1
+50 6478 115 1816 5 8 2 1 0 0 5 3 1 0 1 0 254 1794 146 115 113 257 259 4 0 122 1 3 0 8 1 1 2 2
+60 6611 120 1946 8 2 3 0 1 4 13 2 2 1 2 2 256 1878 189 121 121 299 284 1 1 124 2 3 0 10 3 7 2 1
+70 91 2 46 0 0 0 0 0 0 0 0 0 0 1 0 4 43 4 2 2 6 6 0 0 4 0 0 0 0 0 0 2 0
+80 91 2 46 0 0 0 0 0 0 0 0 0 0 1 0 4 43 4 2 2 6 6 0 0 4 0 0 0 0 0 0 2 0
+90 91 2 46 0 0 0 0 0 0 0 0 0 0 1 0 4 43 4 2 2 6 6 0 0 4 0 0 0 0 0 0 2 0
+100 180 2 45 0 0 0 0 0 0 0 0 0 0 1 1 4 43 4 2 2 6 5 0 0 3 0 0 1 0 0 0 2 0
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/resource.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/resource.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/resource.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,18 +0,0 @@
-# Avida resource data
-# Mon Jun 16 11:44:43 2008
-# First column gives the current update, all further columns give the quantity
-# of the particular resource at that update.
-# 1: Update
-# 2: global
-
-0 11.000000
-10 71
-20 262
-30 662
-40 1417
-50 3122
-60 5301
-70 5345
-80 5345
-90 5345
-100 5348
Copied: branches/collect/tests/energy_deme_level_res/expected/data/resource.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/resource.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/resource.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/resource.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,18 @@
+# Avida resource data
+# Mon Jun 16 11:44:43 2008
+# First column gives the current update, all further columns give the quantity
+# of the particular resource at that update.
+# 1: Update
+# 2: global
+
+0 11.000000
+10 71
+20 262
+30 662
+40 1417
+50 3122
+60 5301
+70 5345
+80 5345
+90 5345
+100 5348
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/sleep.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/sleep.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/sleep.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,17 +0,0 @@
-# Number of organisms sleeping
-
-# total number of organisms sleeping
-# 1: update
-# 2: DemeID 0
-# 3: DemeID 1
-
-10 0 0
-20 0 0
-30 0 0
-40 0 0
-50 4 0
-60 3 0
-70 0 0
-80 0 0
-90 0 1
-100 1 0
Copied: branches/collect/tests/energy_deme_level_res/expected/data/sleep.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/sleep.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/sleep.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/sleep.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,17 @@
+# Number of organisms sleeping
+
+# total number of organisms sleeping
+# 1: update
+# 2: DemeID 0
+# 3: DemeID 1
+
+10 0 0
+20 0 0
+30 0 0
+40 0 0
+50 4 0
+60 3 0
+70 0 0
+80 0 0
+90 0 1
+100 1 0
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/stats.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/stats.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/stats.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,26 +0,0 @@
-# Generic Statistics Data
-# Mon Jun 16 11:44:43 2008
-# 1: update
-# 2: average inferiority (energy)
-# 3: ave probability of any mutations in genome
-# 4: probability of any mutations in dom genome
-# 5: log(average fidelity)
-# 6: log(dominant fidelity)
-# 7: change in number of genotypes
-# 8: genotypic entropy
-# 9: species entropy
-# 10: depth of most reacent coalescence
-# 11: Total number of resamplings this generation
-# 12: Total number of organisms that failed to resample this generation
-
-0 0.000000 0.335790 0.335790 0.409157 0.409157 1 0.000000 0.000000 0 0 0
-10 0 0.33579 0.33579 0.409157 0.409157 0 0 0 0 0 0
-20 0.0542725 0.336759 0.33579 0.410617 0.409157 1 0.949594 0 0 0 0
-30 0.0262377 0.336103 0.33579 0.409628 0.409157 2 1.50126 0 0 0 0
-40 0.0180228 0.335708 0.33579 0.409034 0.409157 5 1.75576 0 0 0 0
-50 0.0136904 0.335538 0.33579 0.408777 0.409157 7 2.74953 0 0 0 0
-60 0.0124589 0.335451 0.33579 0.408646 0.409157 0 2.97946 0 0 0 0
-70 0 0.341823 0.340621 0.418281 0.416457 0 1.03972 0 -1 0 0
-80 0 0.341823 0.340621 0.418281 0.416457 0 1.03972 0 -1 0 0
-90 0 0.341823 0.340621 0.418281 0.416457 0 1.03972 0 -1 0 0
-100 0 0.341823 0.340621 0.418281 0.416457 0 1.03972 0 -1 0 0
Copied: branches/collect/tests/energy_deme_level_res/expected/data/stats.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/stats.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/stats.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/stats.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,26 @@
+# Generic Statistics Data
+# Mon Jun 16 11:44:43 2008
+# 1: update
+# 2: average inferiority (energy)
+# 3: ave probability of any mutations in genome
+# 4: probability of any mutations in dom genome
+# 5: log(average fidelity)
+# 6: log(dominant fidelity)
+# 7: change in number of genotypes
+# 8: genotypic entropy
+# 9: species entropy
+# 10: depth of most reacent coalescence
+# 11: Total number of resamplings this generation
+# 12: Total number of organisms that failed to resample this generation
+
+0 0.000000 0.335790 0.335790 0.409157 0.409157 1 0.000000 0.000000 0 0 0
+10 0 0.33579 0.33579 0.409157 0.409157 0 0 0 0 0 0
+20 0.0542725 0.336759 0.33579 0.410617 0.409157 1 0.949594 0 0 0 0
+30 0.0262377 0.336103 0.33579 0.409628 0.409157 2 1.50126 0 0 0 0
+40 0.0180228 0.335708 0.33579 0.409034 0.409157 5 1.75576 0 0 0 0
+50 0.0136904 0.335538 0.33579 0.408777 0.409157 7 2.74953 0 0 0 0
+60 0.0124589 0.335451 0.33579 0.408646 0.409157 0 2.97946 0 0 0 0
+70 0 0.341823 0.340621 0.418281 0.416457 0 1.03972 0 -1 0 0
+80 0 0.341823 0.340621 0.418281 0.416457 0 1.03972 0 -1 0 0
+90 0 0.341823 0.340621 0.418281 0.416457 0 1.03972 0 -1 0 0
+100 0 0.341823 0.340621 0.418281 0.416457 0 1.03972 0 -1 0 0
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/tasks.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/tasks.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/tasks.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,19 +0,0 @@
-# Avida tasks data
-# Mon Jun 16 11:44:43 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
-# 2: Echo
-# 3: Nand
-
-0 0 0
-10 4 4
-20 15 15
-30 31 31
-40 59 59
-50 96 92
-60 100 97
-70 4 4
-80 4 4
-90 4 4
-100 4 4
Copied: branches/collect/tests/energy_deme_level_res/expected/data/tasks.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/tasks.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/tasks.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/tasks.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,19 @@
+# Avida tasks data
+# Mon Jun 16 11:44:43 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
+# 2: Echo
+# 3: Nand
+
+0 0 0
+10 4 4
+20 15 15
+30 31 31
+40 59 59
+50 96 92
+60 100 97
+70 4 4
+80 4 4
+90 4 4
+100 4 4
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/tasks_exe.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/tasks_exe.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/tasks_exe.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,18 +0,0 @@
-# Avida tasks execution data
-# Mon Jun 16 11:44:43 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
-# 2: Echo
-# 3: Nand
-
-10 40 8
-20 150 30
-30 308 62
-40 585 116
-50 939 183
-60 965 186
-70 40 8
-80 40 8
-90 40 8
-100 40 8
Copied: branches/collect/tests/energy_deme_level_res/expected/data/tasks_exe.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/tasks_exe.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/tasks_exe.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/tasks_exe.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,18 @@
+# Avida tasks execution data
+# Mon Jun 16 11:44:43 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
+# 2: Echo
+# 3: Nand
+
+10 40 8
+20 150 30
+30 308 62
+40 585 116
+50 939 183
+60 965 186
+70 40 8
+80 40 8
+90 40 8
+100 40 8
Deleted: branches/collect/tests/energy_deme_level_res/expected/data/time.dat
===================================================================
--- development/tests/energy_deme_level_res/expected/data/time.dat 2008-06-21 19:35:23 UTC (rev 2668)
+++ branches/collect/tests/energy_deme_level_res/expected/data/time.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -1,18 +0,0 @@
-# Avida time data
-# Mon Jun 16 11:44:43 2008
-# 1: update
-# 2: avida time
-# 3: average generation
-# 4: num_executed?
-
-0 0.000000 0.000000 30
-10 1.60476 2 90
-20 5.80003 3.93333 330
-30 12.4747 5.51613 810
-40 20.3006 7.28814 1470
-50 28.8839 9.42708 2640
-60 38.0382 11.33 3000
-70 40.3939 1 120
-80 42.2743 1 120
-90 44.1547 1 120
-100 46.0351 1 120
Copied: branches/collect/tests/energy_deme_level_res/expected/data/time.dat (from rev 2668, development/tests/energy_deme_level_res/expected/data/time.dat)
===================================================================
--- branches/collect/tests/energy_deme_level_res/expected/data/time.dat (rev 0)
+++ branches/collect/tests/energy_deme_level_res/expected/data/time.dat 2008-06-21 19:45:43 UTC (rev 2670)
@@ -0,0 +1,18 @@
+# Avida time data
+# Mon Jun 16 11:44:43 2008
+# 1: update
+# 2: avida time
+# 3: average generation
+# 4: num_executed?
+
+0 0.000000 0.000000 30
+10 1.60476 2 90
+20 5.80003 3.93333 330
+30 12.4747 5.51613 810
+40 20.3006 7.28814 1470
+50 28.8839 9.42708 2640
+60 38.0382 11.33 3000
+70 40.3939 1 120
+80 42.2743 1 120
+90 44.1547 1 120
+100 46.0351 1 120
More information about the Avida-cvs
mailing list