[Avida-SVN] r2938 - in branches/movement: 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:12:31 PST 2008
Author: brysonda
Date: 2008-11-12 00:12:31 -0500 (Wed, 12 Nov 2008)
New Revision: 2938
Added:
branches/movement/tests/energy_deme_level_res/expected/data/deme_0000000_spatial_energy.m
branches/movement/tests/energy_deme_level_res/expected/data/deme_0000001_spatial_energy.m
branches/movement/tests/energy_deme_level_res/expected/data/deme_spatial_resource_deme_ResB.m
branches/movement/tests/energy_deme_level_res/expected/data/deme_spatial_sleep.m
Removed:
branches/movement/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m
branches/movement/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m
branches/movement/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m
branches/movement/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m
Modified:
branches/movement/source/main/cResourceCount.cc
branches/movement/source/main/cSpatialCountElem.h
branches/movement/source/main/cSpatialResCount.cc
branches/movement/source/main/cSpatialResCount.h
Log:
Merge spatial resource initial value fix into the movement branch. Fix energy_deme_level_res consistency test output filenames.
Modified: branches/movement/source/main/cResourceCount.cc
===================================================================
--- branches/movement/source/main/cResourceCount.cc 2008-11-12 05:00:35 UTC (rev 2937)
+++ branches/movement/source/main/cResourceCount.cc 2008-11-12 05:12:31 UTC (rev 2938)
@@ -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;
Modified: branches/movement/source/main/cSpatialCountElem.h
===================================================================
--- branches/movement/source/main/cSpatialCountElem.h 2008-11-12 05:00:35 UTC (rev 2937)
+++ branches/movement/source/main/cSpatialCountElem.h 2008-11-12 05:12:31 UTC (rev 2938)
@@ -55,7 +55,7 @@
void SetInitial(double init) { initial = init; }
double GetInitial() { return initial; }
- inline void ResetResourceCount() { amount = initial; }
+ inline void ResetResourceCount(double res_initial) { amount = res_initial + initial; }
};
Modified: branches/movement/source/main/cSpatialResCount.cc
===================================================================
--- branches/movement/source/main/cSpatialResCount.cc 2008-11-12 05:00:35 UTC (rev 2937)
+++ branches/movement/source/main/cSpatialResCount.cc 2008-11-12 05:12:31 UTC (rev 2938)
@@ -32,14 +32,12 @@
/* 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;
ydiffuse = inydiffuse;
xgravity = inxgravity;
@@ -58,9 +56,10 @@
/* 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;
ydiffuse = 1.0;
xgravity = 0.0;
@@ -72,23 +71,20 @@
for (i = 0; i < GetSize(); i++) {
cSpatialCountElem tmpelem;
grid[i] = tmpelem;
- }
- SetPointers();
+ }
+ 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);
world_x = inworld_x;
world_y = inworld_y;
@@ -97,12 +93,12 @@
for (i = 0; i < GetSize(); i++) {
cSpatialCountElem tmpelem;
grid[i] = tmpelem;
- }
- SetPointers();
+ }
+ 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. */
@@ -434,5 +430,5 @@
void cSpatialResCount::ResetResourceCounts()
{
- for (int i = 0; i < grid.GetSize(); i++) grid[i].ResetResourceCount();
+ for (int i = 0; i < grid.GetSize(); i++) grid[i].ResetResourceCount(m_initial);
}
Modified: branches/movement/source/main/cSpatialResCount.h
===================================================================
--- branches/movement/source/main/cSpatialResCount.h 2008-11-12 05:00:35 UTC (rev 2937)
+++ branches/movement/source/main/cSpatialResCount.h 2008-11-12 05:12:31 UTC (rev 2938)
@@ -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;
@@ -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; }
Deleted: branches/movement/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m
===================================================================
--- branches/movement/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m 2008-11-12 05:00:35 UTC (rev 2937)
+++ branches/movement/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m 2008-11-12 05:12:31 UTC (rev 2938)
@@ -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/movement/tests/energy_deme_level_res/expected/data/deme_0000000_spatial_energy.m (from rev 2936, branches/movement/tests/energy_deme_level_res/expected/data/deme_0000000_spacial_energy.m)
===================================================================
--- branches/movement/tests/energy_deme_level_res/expected/data/deme_0000000_spatial_energy.m (rev 0)
+++ branches/movement/tests/energy_deme_level_res/expected/data/deme_0000000_spatial_energy.m 2008-11-12 05:12:31 UTC (rev 2938)
@@ -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/movement/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m
===================================================================
--- branches/movement/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m 2008-11-12 05:00:35 UTC (rev 2937)
+++ branches/movement/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m 2008-11-12 05:12:31 UTC (rev 2938)
@@ -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/movement/tests/energy_deme_level_res/expected/data/deme_0000001_spatial_energy.m (from rev 2936, branches/movement/tests/energy_deme_level_res/expected/data/deme_0000001_spacial_energy.m)
===================================================================
--- branches/movement/tests/energy_deme_level_res/expected/data/deme_0000001_spatial_energy.m (rev 0)
+++ branches/movement/tests/energy_deme_level_res/expected/data/deme_0000001_spatial_energy.m 2008-11-12 05:12:31 UTC (rev 2938)
@@ -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/movement/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m
===================================================================
--- branches/movement/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m 2008-11-12 05:00:35 UTC (rev 2937)
+++ branches/movement/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m 2008-11-12 05:12:31 UTC (rev 2938)
@@ -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: branches/movement/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m
===================================================================
--- branches/movement/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m 2008-11-12 05:00:35 UTC (rev 2937)
+++ branches/movement/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m 2008-11-12 05:12:31 UTC (rev 2938)
@@ -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/movement/tests/energy_deme_level_res/expected/data/deme_spatial_resource_deme_ResB.m (from rev 2936, branches/movement/tests/energy_deme_level_res/expected/data/deme_spacial_resource_deme_ResB.m)
===================================================================
--- branches/movement/tests/energy_deme_level_res/expected/data/deme_spatial_resource_deme_ResB.m (rev 0)
+++ branches/movement/tests/energy_deme_level_res/expected/data/deme_spatial_resource_deme_ResB.m 2008-11-12 05:12:31 UTC (rev 2938)
@@ -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: branches/movement/tests/energy_deme_level_res/expected/data/deme_spatial_sleep.m (from rev 2936, branches/movement/tests/energy_deme_level_res/expected/data/deme_spacial_sleep.m)
===================================================================
--- branches/movement/tests/energy_deme_level_res/expected/data/deme_spatial_sleep.m (rev 0)
+++ branches/movement/tests/energy_deme_level_res/expected/data/deme_spatial_sleep.m 2008-11-12 05:12:31 UTC (rev 2938)
@@ -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