[Avida-SVN] r2937 - in development: source/actions source/main tests/energy_deme_level_res/expected/data
brysonda at myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Tue Nov 11 21:00:35 PST 2008
Author: brysonda
Date: 2008-11-12 00:00:35 -0500 (Wed, 12 Nov 2008)
New Revision: 2937
Added:
development/tests/energy_deme_level_res/expected/data/deme_0000000_spatial_energy.m
development/tests/energy_deme_level_res/expected/data/deme_0000001_spatial_energy.m
development/tests/energy_deme_level_res/expected/data/deme_spatial_resource_deme_ResB.m
development/tests/energy_deme_level_res/expected/data/deme_spatial_sleep.m
Removed:
development/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m
development/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m
development/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m
development/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m
Modified:
development/source/actions/PopulationActions.cc
development/source/main/cDeme.cc
development/source/main/cPopulation.cc
development/source/main/cPopulation.h
development/source/main/cResourceCount.cc
development/source/main/cResourceCount.h
development/source/main/cSpatialCountElem.cc
development/source/main/cSpatialCountElem.h
development/source/main/cSpatialResCount.cc
development/source/main/cSpatialResCount.h
Log:
Cross port deme spatial resource cell initialization fix and resource state printing performance fix from the movement branch.
Also fix cSpatialResCount to track and apply resource definition level initial amounts on reset (important for deme usage). This allows the current energy_deme_level_res consistency test to pass by simply renaming various files with correctly spelled 'spatial' names. Note that this fix may alter the outcome for longer runs. Previously, deme level spatial resources could accumulate indefinitely, since the current value was retained on reset. The resource is now reset as defined in the configuration.
Modified: development/source/actions/PopulationActions.cc
===================================================================
--- development/source/actions/PopulationActions.cc 2008-11-12 01:37:19 UTC (rev 2936)
+++ development/source/actions/PopulationActions.cc 2008-11-12 05:00:35 UTC (rev 2937)
@@ -1692,6 +1692,7 @@
}
};
+
/* 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:
Modified: development/source/main/cDeme.cc
===================================================================
--- development/source/main/cDeme.cc 2008-11-12 01:37:19 UTC (rev 2936)
+++ development/source/main/cDeme.cc 2008-11-12 05:00:35 UTC (rev 2937)
@@ -45,7 +45,7 @@
last_org_count = 0;
birth_count_perslot = 0;
m_world = world;
-
+
_current_merit = 1.0;
_next_merit = 1.0;
@@ -60,7 +60,7 @@
last_task_exe_count.SetAll(0);
last_reaction_count.ResizeClear(num_reactions);
last_reaction_count.SetAll(0);
-
+
cur_org_task_count.Resize(num_tasks);
cur_org_task_count.SetAll(0);
cur_org_task_exe_count.Resize(num_tasks);
@@ -76,7 +76,7 @@
energy_requests_made = 0;
energy_donations_made = 0;
-
+
// If width is negative, set it to the full number of cells.
width = in_width;
if (width < 1) width = cell_ids.GetSize();
@@ -89,20 +89,20 @@
{
assert(x >= 0 && x < GetWidth());
assert(y >= 0 && y < GetHeight());
-
+
const int pos = y * width + x;
return cell_ids[pos];
}
/*! Note that for this method to work, we blatantly assume that IDs are in
-monotonically increasing order!! */
+ monotonically increasing order!! */
std::pair<int, int> cDeme::GetCellPosition(int cellid) const
{
assert(cell_ids.GetSize()>0);
assert(GetWidth() > 0);
-// cellid -= cell_ids[0];
-// return std::make_pair(cellid % GetWidth(), cellid / GetWidth());
+ // cellid -= cell_ids[0];
+ // return std::make_pair(cellid % GetWidth(), cellid / GetWidth());
return std::make_pair(cellid % GetWidth(), ( cellid % cell_ids.GetSize() ) / GetWidth());
}
@@ -120,19 +120,19 @@
void cDeme::ProcessUpdate() {
energyUsage.Clear();
-
+
if(IsEmpty()) { // deme is not processed if no organisms are present
total_energy_testament = 0.0;
return;
}
-
+
for(int i = 0; i < GetSize(); i++) {
cPopulationCell& cell = GetCell(i);
if(cell.IsOccupied()) {
energyUsage.Add(cell.GetOrganism()->GetPhenotype().GetEnergyUsageRatio());
}
}
-
+
for(int i = 0; i < cell_events.Size(); i++) {
cDemeCellEvent& event = cell_events[i];
@@ -175,8 +175,8 @@
// record activation of each cell in stats
std::pair<int, int> pos = GetCellPosition(eventCell);
m_world->GetStats().IncEventCount(pos.first, pos.second);
-
-
+
+
//TODO // increase outflow of energy from these cells if not event currently present
@@ -188,9 +188,9 @@
if(event.GetEventID() == m_world->GetPopulation().GetCell(GetCellID(eventCell)).GetCellData()) { // eventID == CellData
//set cell data to 0
m_world->GetPopulation().GetCell(GetCellID(eventCell)).SetCellData(0);
-
- // TODO // remove energy outflow from these cells
-
+
+ // TODO // remove energy outflow from these cells
+
}
eventCell = event.GetNextEventCellID();
}
@@ -208,7 +208,7 @@
// update stats.flow_rate_tuples
std::map<int, flow_rate_tuple>& flowRateTuples = m_world->GetStats().FlowRateTuples();
-
+
flowRateTuples[(*iter).second].orgCount.Add(GetOrgCount());
flowRateTuples[(*iter).second].eventsKilled.Add(GetEventsKilledThisSlot());
flowRateTuples[(*iter).second].attemptsToKillEvents.Add(GetEventKillAttemptsThisSlot());
@@ -238,7 +238,7 @@
total_org_energy = deme_energy;
if(total_org_energy < 0.0)
total_org_energy = 0.0;
-
+
// split deme energy evenly between organisms in deme
for (int i=0; i<GetSize(); i++) {
int cellid = GetCellID(i);
@@ -278,17 +278,17 @@
cur_task_exe_count.SetAll(0);
cur_reaction_count.SetAll(0);
-
+
//reset remaining message predicates
- for(int i = 0; i < message_pred_list.Size(); i++) {
+ for (int i = 0; i < message_pred_list.Size(); i++) {
(*message_pred_list[i]).Reset();
}
//reset remaining message predicates
- for(int i = 0; i < movement_pred_list.Size(); i++) {
+ for (int i = 0; i < movement_pred_list.Size(); i++) {
(*movement_pred_list[i]).Reset();
}
-
- if(resetResources) {
+
+ if (resetResources) {
deme_resource_count.ReinitializeResources(additional_resource);
}
}
@@ -298,7 +298,7 @@
{
// the parent might be us, so save this value...
double old_avg_founder_generation = parent_deme.GetAvgFounderGeneration();
-
+
// update our average founder generation
cDoubleSum gen;
for (int i=0; i< m_founder_phenotypes.GetSize(); i++) {
@@ -308,7 +308,7 @@
// update our generations per lifetime based on current founders and parents generation
generations_per_lifetime = avg_founder_generation - old_avg_founder_generation;
-
+
//Save statistics according to parent before reset.
generation = parent_deme.GetGeneration() + 1;
gestation_time = parent_deme.GetTimeUsed();
@@ -316,14 +316,14 @@
last_task_exe_count = parent_deme.GetCurTaskExeCount();
last_reaction_count = parent_deme.GetCurReactionCount();
-
+
last_org_task_count = parent_deme.GetCurOrgTaskCount();
last_org_task_exe_count = parent_deme.GetCurOrgTaskExeCount();
last_org_reaction_count = parent_deme.GetCurOrgReactionCount();
last_org_count = parent_deme.GetLastOrgCount(); // Org count was updated upon KillAll()....
last_birth_count = parent_deme.GetBirthCount();
-
+
Reset(resetResources, deme_energy);
}
@@ -364,7 +364,7 @@
if(m_world->GetPopulation().GetCell(cellid).IsOccupied()) {
count += (m_world->GetPopulation().GetCell(cellid).GetOrganism()->GetPhenotype().GetLastTaskCount()[j] > 0);
}
- cur_org_task_count[j] = count;
+ cur_org_task_count[j] = count;
}
}
@@ -375,35 +375,35 @@
if(m_world->GetPopulation().GetCell(cellid).IsOccupied()) {
count += m_world->GetPopulation().GetCell(cellid).GetOrganism()->GetPhenotype().GetLastTaskCount()[j];
}
- cur_org_task_exe_count[j] = count;
+ cur_org_task_exe_count[j] = count;
}
}
-
- for(int j = 0; j < cur_org_reaction_count.GetSize(); j++) {
+
+ for(int j = 0; j < cur_org_reaction_count.GetSize(); j++) {
int count = 0;
for(int k=0; k<GetSize(); k++) {
int cellid = GetCellID(k);
if(m_world->GetPopulation().GetCell(cellid).IsOccupied()) {
count += m_world->GetPopulation().GetCell(cellid).GetOrganism()->GetPhenotype().GetLastReactionCount()[j];
}
- cur_org_reaction_count[j] = count;
+ cur_org_reaction_count[j] = count;
}
}
}
/*! Replacing this deme's germline has the effect of changing the deme's lineage.
-There's still some work to do here; the lineage labels of the Genomes in the germline
-are all messed up.
-*/
+ There's still some work to do here; the lineage labels of the Genomes in the germline
+ are all messed up.
+ */
void cDeme::ReplaceGermline(const cGermline& germline) {
_germline = germline;
}
/*! If this method is called, this is the "parent" deme. As with individuals,
-we need to rotate the heritable merit to the current merit.
-*/
+ we need to rotate the heritable merit to the current merit.
+ */
void cDeme::UpdateDemeMerit() {
assert(_next_merit.GetDouble()>=1.0);
_current_merit = _next_merit;
@@ -412,7 +412,7 @@
/*! Update this deme's merit from the given source.
-*/
+ */
void cDeme::UpdateDemeMerit(cDeme& source) {
_current_merit = source.GetHeritableDemeMerit();
_next_merit = 1.0;
@@ -431,16 +431,16 @@
//addjust the resources cell list pointer here if we want CELL env. commands to be replicated in each deme
deme_resource_count.Setup(id, res->GetName(), res->GetInitial(),
- res->GetInflow(), decay,
- res->GetGeometry(), res->GetXDiffuse(),
- res->GetXGravity(), res->GetYDiffuse(),
- res->GetYGravity(), res->GetInflowX1(),
- res->GetInflowX2(), res->GetInflowY1(),
- res->GetInflowY2(), res->GetOutflowX1(),
- res->GetOutflowX2(), res->GetOutflowY1(),
- res->GetOutflowY2(), res->GetCellListPtr(),
- verbosity);
-
+ res->GetInflow(), decay,
+ res->GetGeometry(), res->GetXDiffuse(),
+ res->GetXGravity(), res->GetYDiffuse(),
+ res->GetYGravity(), res->GetInflowX1(),
+ res->GetInflowX2(), res->GetInflowY1(),
+ res->GetInflowY2(), res->GetOutflowX1(),
+ res->GetOutflowX2(), res->GetOutflowY1(),
+ res->GetOutflowY2(), res->GetCellListPtr(),
+ verbosity);
+
if(res->GetEnergyResource()) {
energy_res_ids.Push(id);
}
@@ -449,11 +449,11 @@
double cDeme::GetAndClearCellEnergy(int absolute_cell_id) {
assert(cell_ids[0] <= absolute_cell_id);
assert(absolute_cell_id <= cell_ids[cell_ids.GetSize()-1]);
-
+
double total_energy = 0.0;
int relative_cell_id = GetRelativeCellID(absolute_cell_id);
tArray<double> cell_resources = deme_resource_count.GetCellResources(relative_cell_id);
-
+
// sum all energy resources
for(int i = 0; i < energy_res_ids.GetSize(); i++) {
if(cell_resources[energy_res_ids[i]] > 0.0) {
@@ -469,10 +469,10 @@
void cDeme::GiveBackCellEnergy(int absolute_cell_id, double value) {
assert(cell_ids[0] <= absolute_cell_id);
assert(absolute_cell_id <= cell_ids[cell_ids.GetSize()-1]);
-
+
int relative_cell_id = GetRelativeCellID(absolute_cell_id);
tArray<double> cell_resources = deme_resource_count.GetCellResources(relative_cell_id);
-
+
double amount_per_resource = value / energy_res_ids.GetSize();
// put back energy resources evenly
@@ -490,10 +490,10 @@
}
/*void cDeme::SetCellEventGradient(int x1, int y1, int x2, int y2, int delay, int duration, bool static_pos, int time_to_live) {
- cDemeCellEvent demeEvent = cDemeCellEvent(x1, y1, x2, y2, delay, duration, width, GetHeight(), static_pos, time_to_live, this);
- demeEvent.DecayEventIDFromCenter();
- cell_events.Add(demeEvent);
-}*/
+ cDemeCellEvent demeEvent = cDemeCellEvent(x1, y1, x2, y2, delay, duration, width, GetHeight(), static_pos, time_to_live, this);
+ demeEvent.DecayEventIDFromCenter();
+ cell_events.Add(demeEvent);
+ }*/
int cDeme::GetNumEvents() {
return cell_events.Size();
@@ -507,24 +507,24 @@
int flow_level_increment = (m_total_events_per_slot_max - m_total_events_per_slot_min) / (m_tolal_event_flow_levels-1);
int slot_length = m_world->GetConfig().DEMES_MAX_AGE.Get() / m_total_slots;
-
+
// setup stats tuples
-
+
for(int i = 0; i < m_total_slots; i++) {
int slot_flow_level = flow_level_increment * m_world->GetRandom().GetInt(m_tolal_event_flow_levels) + m_total_events_per_slot_min; // number of event during this slot
int slot_delay = i * slot_length;
event_slot_end_points.push_back(make_pair(slot_delay+slot_length, slot_flow_level)); // last slot is never reached it is == to MAX_AGE
-
+
for(int k = 0; k < slot_flow_level; k++) {
cDemeCellEvent demeEvent = cDemeCellEvent(x1, y1, x2, y2, delay, duration, width, GetHeight(), static_position, this, m_world);
demeEvent.ConfineToTimeSlot(slot_delay, slot_delay+slot_length);
cell_events.Add(demeEvent);
}
}
-
+
// setup stats.flow_rate_tuples
std::map<int, flow_rate_tuple>& flowRateTuples = m_world->GetStats().FlowRateTuples();
-
+
for(int i = m_total_events_per_slot_min; i <= m_total_events_per_slot_max; i+=flow_level_increment) {
flowRateTuples[i].orgCount.Clear();
flowRateTuples[i].eventsKilled.Clear();
@@ -537,7 +537,7 @@
bool cDeme::KillCellEvent(const int eventID) {
eventKillAttemptsThisSlot++;
-
+
if(eventID <= 0)
return false;
for(int i = 0; i < cell_events.Size(); i++) {
@@ -550,8 +550,8 @@
//set cell data to 0
m_world->GetPopulation().GetCell(GetCellID(eventCell)).SetCellData(0);
- // TODO // remove energy outflow from these cells
-
+ // TODO // remove energy outflow from these cells
+
}
eventCell = event.GetNextEventCellID();
}
@@ -567,7 +567,7 @@
double cDeme::CalculateTotalEnergy() const {
assert(m_world->GetConfig().ENERGY_ENABLED.Get());
-
+
double energy_sum = 0.0;
for (int i=0; i<GetSize(); i++) {
int cellid = GetCellID(i);
@@ -586,7 +586,7 @@
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);
@@ -598,13 +598,13 @@
// --- Founder list management --- //
void cDeme::AddFounder(cGenotype& _in_genotype, cPhenotype * _in_phenotype) {
-
+
// save genotype id
m_founder_genotype_ids.Push( _in_genotype.GetID() );
cPhenotype phenotype;
if (_in_phenotype) phenotype = *_in_phenotype;
m_founder_phenotypes.Push( phenotype );
-
+
// defer adjusting this genotype until we are done with it
_in_genotype.IncDeferAdjust();
@@ -628,19 +628,19 @@
// same genotype, no changes
if (m_germline_genotype_id == _in_genotype.GetID()) return;
-
+
// first, save and put a hold on new germline genotype
int prev_germline_genotype_id = m_germline_genotype_id;
m_germline_genotype_id = _in_genotype.GetID();
_in_genotype.IncDeferAdjust();
-
+
// next, if we previously were saving a germline genotype, free it
cGenotype * genotype = m_world->GetClassificationManager().FindGenotype(prev_germline_genotype_id);
if (genotype) {
genotype->DecDeferAdjust();
m_world->GetClassificationManager().AdjustGenotype(*genotype);
}
-
+
}
bool cDeme::MsgPredSatisfiedPreviously() {
@@ -730,15 +730,15 @@
cerr<<"Error: An EventMoveBetweenTargets cannot be created until at least one CellEvent is added.\n";
exit(1);
}
-
+
tVector<cDemeCellEvent *> alive_events;
-
+
for(int i = 0; i < cell_events.Size(); i++) {
if(!cell_events[i].IsDead()) {
alive_events.Add(&cell_events[i]);
}
}
-
+
cOrgMovementPred_EventMovedBetweenTargets* pred = new cOrgMovementPred_EventMovedBetweenTargets(alive_events, m_world->GetPopulation(), times);
m_world->GetStats().AddMovementPredicate(pred);
movement_pred_list.Add(pred);
@@ -763,12 +763,12 @@
{
assert(cell_ids[0] <= absolute_cell_id);
assert(absolute_cell_id <= cell_ids[cell_ids.GetSize()-1]);
-
-// cPopulation& pop = m_world->GetPopulation();
-
+
+ // cPopulation& pop = m_world->GetPopulation();
+
int relative_cell_id = GetRelativeCellID(absolute_cell_id);
tArray<double> cell_resources = deme_resource_count.GetCellResources(relative_cell_id);
-
+
for (int i = 0; i < deme_resource_count.GetSize(); i++) {
if(strcmp(deme_resource_count.GetResName(i), "pheromone") == 0) {
// There should only be one "pheromone" resource, so no need to divvy value up
@@ -778,17 +778,17 @@
cell_resources[i] = 0;
}
}
-
-//It appears that ModifyCell adds the amount of resources specified in the cell_resources array, so I'm just
-//settign the element to the value I want to add instead of setting the element to the current value plus the amount to add
-// Ask Ben why he does it differently in GiveBackCellEnergy()
-
+
+ //It appears that ModifyCell adds the amount of resources specified in the cell_resources array, so I'm just
+ //settign the element to the value I want to add instead of setting the element to the current value plus the amount to add
+ // Ask Ben why he does it differently in GiveBackCellEnergy()
+
deme_resource_count.ModifyCell(cell_resources, relative_cell_id);
-
+
// CellData-based version
//const int newval = pop.GetCell(absolute_cell_id).GetCellData() + (int) round(value);
//pop.GetCell(absolute_cell_id).SetCellData(newval);
-
+
} //End AddPheromone()
int cDeme::GetSlotFlowRate() const {
@@ -799,7 +799,7 @@
}
iter++;
}
-// assert(false); // slots must be of equal size and fit perfectally in deme lifetime
+ // assert(false); // slots must be of equal size and fit perfectally in deme lifetime
return 0;
}
Modified: development/source/main/cPopulation.cc
===================================================================
--- development/source/main/cPopulation.cc 2008-11-12 01:37:19 UTC (rev 2936)
+++ development/source/main/cPopulation.cc 2008-11-12 05:00:35 UTC (rev 2937)
@@ -2803,7 +2803,7 @@
int update = m_world->GetStats().GetUpdate();
for(int i = 0; i < m_world->GetPopulation().GetNumDemes(); i++) {
- cString tmpfilename = cStringUtil::Stringf( "deme_%07i_spacial_energy.m", i); // moved here for easy movie making
+ cString tmpfilename = cStringUtil::Stringf( "deme_%07i_spatial_energy.m", i); // moved here for easy movie making
cDataFile& df = m_world->GetDataFile(tmpfilename);
cString UpdateStr = cStringUtil::Stringf( "deme_%07i_energy_%07i = [ ...", i, update );
df.WriteRaw(UpdateStr);
@@ -2827,15 +2827,15 @@
}
// Write spatial data to a file that can easily be read into Matlab
-void cPopulation::PrintDemeSpatialResData( cResourceCount res, const int i, const int deme_id) const {
+void cPopulation::PrintDemeSpatialResData(const cResourceCount& res, const int i, const int deme_id) const {
const char* tmpResName = res.GetResName(i);
- cString tmpfilename = cStringUtil::Stringf( "deme_spacial_resource_%s.m", tmpResName );
+ cString tmpfilename = cStringUtil::Stringf( "deme_spatial_resource_%s.m", tmpResName );
cDataFile& df = m_world->GetDataFile(tmpfilename);
cString UpdateStr = cStringUtil::Stringf( "deme_%07i_%s_%07i = [ ...", deme_id, static_cast<const char*>(res.GetResName(i)), m_world->GetStats().GetUpdate() );
df.WriteRaw(UpdateStr);
- cSpatialResCount sp_res = res.GetSpatialResource(i);
+ const cSpatialResCount& sp_res = res.GetSpatialResource(i);
int gridsize = sp_res.GetSize();
int xsize = m_world->GetConfig().WORLD_X.Get();
@@ -2849,7 +2849,7 @@
// Write spatial energy data to a file that can easily be read into Matlab
void cPopulation::PrintDemeSpatialSleepData() const {
int cellID = 0;
- cString tmpfilename = "deme_spacial_sleep.m";
+ cString tmpfilename = "deme_spatial_sleep.m";
cDataFile& df = m_world->GetDataFile(tmpfilename);
int update = m_world->GetStats().GetUpdate();
Modified: development/source/main/cPopulation.h
===================================================================
--- development/source/main/cPopulation.h 2008-11-12 01:37:19 UTC (rev 2936)
+++ development/source/main/cPopulation.h 2008-11-12 05:00:35 UTC (rev 2937)
@@ -238,7 +238,7 @@
void PrintDemeMutationRate();
void PrintDemeReceiver();
void PrintDemeResource();
- void PrintDemeSpatialResData(cResourceCount res, const int i, const int deme_id) const;
+ void PrintDemeSpatialResData(const cResourceCount& res, const int i, const int deme_id) const;
void PrintDemeSpatialEnergyData() const;
void PrintDemeSpatialSleepData() const;
void PrintDemeTasks();
Modified: development/source/main/cResourceCount.cc
===================================================================
--- development/source/main/cResourceCount.cc 2008-11-12 01:37:19 UTC (rev 2936)
+++ development/source/main/cResourceCount.cc 2008-11-12 05:00:35 UTC (rev 2937)
@@ -246,11 +246,10 @@
resource_initial[id] = initial;
if (in_geometry == nGeometry::GLOBAL) {
resource_count[id] = initial;
- spatial_resource_count[id].RateAll(0);
} else {
resource_count[id] = 0;
- spatial_resource_count[id].RateAll
- (initial/spatial_resource_count[id].GetSize());
+ spatial_resource_count[id].SetInitial(initial / spatial_resource_count[id].GetSize());
+ spatial_resource_count[id].RateAll(spatial_resource_count[id].GetInitial());
}
spatial_resource_count[id].StateAll();
decay_rate[id] = decay;
@@ -492,26 +491,17 @@
}
}
-void cResourceCount::ReinitializeResources(double additional_resource){
- cSpatialResCount src;
- double c_curr_amount;
- double c_initial_amount;
- double c_new_amount;
-
+void cResourceCount::ReinitializeResources(double additional_resource)
+{
for(int i = 0; i < resource_name.GetSize(); i++) {
- Set(i, resource_initial[i]+additional_resource); //will cause problem if more than one resource is used. -- why? each resource is stored separately (BDC)
+ Set(i, resource_initial[i] + additional_resource); //will cause problem if more than one resource is used. -- why? each resource is stored separately (BDC)
// Additionally, set any initial values given by the CELL command
- src = GetSpatialResource(i);
- for(int j = 0; j < src.GetSize(); j++) {
- c_initial_amount = src.Element(j).GetInitial();
- if(c_initial_amount > 0) {
- c_curr_amount = spatial_resource_count[i].GetAmount(j);
- c_new_amount = c_curr_amount + c_initial_amount + additional_resource;
- spatial_resource_count[i].SetCellAmount(j, c_new_amount);
- }
+ spatial_resource_count[i].ResetResourceCounts();
+ if (additional_resource != 0.0) {
+ spatial_resource_count[i].RateAll(additional_resource);
+ spatial_resource_count[i].StateAll();
}
} //End going through the resources
-
-} //End ReinitializeResources()
+}
Modified: development/source/main/cResourceCount.h
===================================================================
--- development/source/main/cResourceCount.h 2008-11-12 01:37:19 UTC (rev 2936)
+++ development/source/main/cResourceCount.h 2008-11-12 05:00:35 UTC (rev 2937)
@@ -105,9 +105,10 @@
double Get(int id) const;
void ResizeSpatialGrids(int in_x, int in_y);
cSpatialResCount GetSpatialResource(int id) { return spatial_resource_count[id]; }
+ const cSpatialResCount& GetSpatialResource(int id) const { 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]; }
+ const cString& GetResName(int id) const { return resource_name[id]; }
};
Modified: development/source/main/cSpatialCountElem.cc
===================================================================
--- development/source/main/cSpatialCountElem.cc 2008-11-12 01:37:19 UTC (rev 2936)
+++ development/source/main/cSpatialCountElem.cc 2008-11-12 05:00:35 UTC (rev 2937)
@@ -37,6 +37,7 @@
{
amount = initamount;
delta = 0.0;
+ initial = initamount;
elempt.Resize(MAXFLOWPTS);
xdist.Resize(MAXFLOWPTS);
ydist.Resize(MAXFLOWPTS);
@@ -49,6 +50,7 @@
{
amount = 0.0;
delta = 0.0;
+ initial = 0.0;
elempt.Resize(MAXFLOWPTS);
xdist.Resize(MAXFLOWPTS);
ydist.Resize(MAXFLOWPTS);
Modified: development/source/main/cSpatialCountElem.h
===================================================================
--- development/source/main/cSpatialCountElem.h 2008-11-12 01:37:19 UTC (rev 2936)
+++ development/source/main/cSpatialCountElem.h 2008-11-12 05:00:35 UTC (rev 2937)
@@ -54,6 +54,8 @@
int, int, double);
void SetInitial(double init) { initial = init; }
double GetInitial() { return initial; }
+
+ inline void ResetResourceCount(double res_initial) { amount = res_initial + initial; }
};
Modified: development/source/main/cSpatialResCount.cc
===================================================================
--- development/source/main/cSpatialResCount.cc 2008-11-12 01:37:19 UTC (rev 2936)
+++ development/source/main/cSpatialResCount.cc 2008-11-12 05:00:35 UTC (rev 2937)
@@ -32,12 +32,10 @@
/* Setup a single spatial resource with known flows */
-cSpatialResCount::cSpatialResCount(int inworld_x, int inworld_y,
- int ingeometry,
- double inxdiffuse, double inydiffuse, double inxgravity,
- double inygravity)
- : grid(inworld_x * inworld_y) {
-
+cSpatialResCount::cSpatialResCount(int inworld_x, int inworld_y, int ingeometry, double inxdiffuse, double inydiffuse,
+ double inxgravity, double inygravity)
+ : grid(inworld_x * inworld_y), m_initial(0.0)
+{
int i;
xdiffuse = inxdiffuse;
@@ -58,7 +56,8 @@
/* Setup a single spatial resource using default flow amounts */
cSpatialResCount::cSpatialResCount(int inworld_x, int inworld_y, int ingeometry)
- : grid(inworld_x * inworld_y) {
+ : grid(inworld_x * inworld_y), m_initial(0.0)
+{
int i;
xdiffuse = 1.0;
@@ -76,17 +75,14 @@
SetPointers();
}
-cSpatialResCount::cSpatialResCount() {
-
- xdiffuse = 1.0;
- ydiffuse = 1.0;
- xgravity = 0.0;
- ygravity = 0.0;
+cSpatialResCount::cSpatialResCount() : m_initial(0.0), xdiffuse(1.0), ydiffuse(1.0), xgravity(0.0), ygravity(0.0)
+{
geometry = nGeometry::GLOBAL;
}
-void cSpatialResCount::ResizeClear(int inworld_x, int inworld_y,
- int ingeometry) {
+
+void cSpatialResCount::ResizeClear(int inworld_x, int inworld_y, int ingeometry)
+{
int i;
grid.ResizeClear(inworld_x * inworld_y);
@@ -101,8 +97,8 @@
SetPointers();
}
-void cSpatialResCount::SetPointers() {
-
+void cSpatialResCount::SetPointers()
+{
/* Pointer 0 will point to the cell above and to the left the current cell
and will go clockwise around the cell. */
@@ -152,8 +148,10 @@
}
}
-void cSpatialResCount::CheckRanges() {
+void cSpatialResCount::CheckRanges()
+{
+
// Check that the x, y ranges of the inflow and outflow rectangles
// are valid
@@ -214,8 +212,8 @@
}
/* Set all the individual cells to their initial values */
-
-void cSpatialResCount::SetCellList(tArray<cCellResource> *in_cell_list_ptr) {
+void cSpatialResCount::SetCellList(tArray<cCellResource>* in_cell_list_ptr)
+{
cell_list_ptr = in_cell_list_ptr;
for (int i = 0; i < cell_list_ptr->GetSize(); i++) {
int cell_id = (*cell_list_ptr)[i].GetId();
@@ -430,3 +428,9 @@
Element(cell_id).SetAmount(res);
}
}
+
+
+void cSpatialResCount::ResetResourceCounts()
+{
+ for (int i = 0; i < grid.GetSize(); i++) grid[i].ResetResourceCount(m_initial);
+}
Modified: development/source/main/cSpatialResCount.h
===================================================================
--- development/source/main/cSpatialResCount.h 2008-11-12 01:37:19 UTC (rev 2936)
+++ development/source/main/cSpatialResCount.h 2008-11-12 05:00:35 UTC (rev 2937)
@@ -43,7 +43,9 @@
{
private:
tArray<cSpatialCountElem> grid;
- double xdiffuse, xgravity, ydiffuse, ygravity;
+ double m_initial;
+ double xdiffuse, ydiffuse;
+ double xgravity, ygravity;
int inflowX1, inflowX2, inflowY1, inflowY2;
int outflowX1, outflowX2, outflowY1, outflowY2;
int geometry;
@@ -62,10 +64,10 @@
void SetPointers();
void CheckRanges();
void SetCellList(tArray<cCellResource> *in_cell_list_ptr);
- int GetSize() { return grid.GetSize(); }
- int GetX() { return world_x; }
- int GetY() { return world_y; }
- int GetCellListSize() { return cell_list_ptr->GetSize(); }
+ int GetSize() const { return grid.GetSize(); }
+ int GetX() const { return world_x; }
+ int GetY() const { return world_y; }
+ int GetCellListSize() const { return cell_list_ptr->GetSize(); }
cSpatialCountElem& Element(int x) { return grid[x]; }
void Rate(int x, double ratein) const;
void Rate(int x, int y, double ratein) const;
@@ -82,6 +84,8 @@
void Sink(double percent) const;
void CellOutflow() const;
void SetCellAmount(int cell_id, double res);
+ void SetInitial(double initial) { m_initial = initial; }
+ double GetInitial() const { return m_initial; }
void SetGeometry(int in_geometry) { geometry = in_geometry; }
void SetXdiffuse(double in_xdiffuse) { xdiffuse = in_xdiffuse; }
void SetXgravity(double in_xgravity) { xgravity = in_xgravity; }
@@ -95,6 +99,8 @@
void SetOutflowX2(int in_outflowX2) { outflowX2 = in_outflowX2; }
void SetOutflowY1(int in_outflowY1) { outflowY1 = in_outflowY1; }
void SetOutflowY2(int in_outflowY2) { outflowY2 = in_outflowY2; }
+
+ void ResetResourceCounts();
};
Deleted: development/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m 2008-11-12 01:37:19 UTC (rev 2936)
+++ development/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m 2008-11-12 05:00:35 UTC (rev 2937)
@@ -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: development/tests/energy_deme_level_res/expected/data/deme_0000000_spatial_energy.m (from rev 2936, development/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m)
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_0000000_spatial_energy.m (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_0000000_spatial_energy.m 2008-11-12 05:00:35 UTC (rev 2937)
@@ -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: development/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m 2008-11-12 01:37:19 UTC (rev 2936)
+++ development/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m 2008-11-12 05:00:35 UTC (rev 2937)
@@ -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: development/tests/energy_deme_level_res/expected/data/deme_0000001_spatial_energy.m (from rev 2936, development/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m)
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_0000001_spatial_energy.m (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_0000001_spatial_energy.m 2008-11-12 05:00:35 UTC (rev 2937)
@@ -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: development/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m 2008-11-12 01:37:19 UTC (rev 2936)
+++ development/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m 2008-11-12 05:00:35 UTC (rev 2937)
@@ -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
-];
-
Deleted: development/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m 2008-11-12 01:37:19 UTC (rev 2936)
+++ development/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m 2008-11-12 05:00:35 UTC (rev 2937)
@@ -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: development/tests/energy_deme_level_res/expected/data/deme_spatial_resource_deme_ResB.m (from rev 2936, development/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m)
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_spatial_resource_deme_ResB.m (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_spatial_resource_deme_ResB.m 2008-11-12 05:00:35 UTC (rev 2937)
@@ -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
+];
+
Copied: development/tests/energy_deme_level_res/expected/data/deme_spatial_sleep.m (from rev 2936, development/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m)
===================================================================
--- development/tests/energy_deme_level_res/expected/data/deme_spatial_sleep.m (rev 0)
+++ development/tests/energy_deme_level_res/expected/data/deme_spatial_sleep.m 2008-11-12 05:00:35 UTC (rev 2937)
@@ -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
+];
+
More information about the Avida-cvs
mailing list