[Avida-SVN] r2109 - in branches/energy: source/main tests/analyze_dumplandscape/config tests/analyze_fulllandscape_1step/config tests/analyze_truncate_lineage/config tests/avida_GA_lim_res/config tests/default_transsmt_100u/config tests/midrun_classsic_30u/config tests/optimize_multivar_lim_res/config tests/sex/config tests/sex-modular/config tests/spatial_res_100u/config tests/task_sort_analyze/config
beckma24 at myxo.css.msu.edu
beckma24 at myxo.css.msu.edu
Tue Sep 25 12:47:57 PDT 2007
Author: beckma24
Date: 2007-09-25 15:47:56 -0400 (Tue, 25 Sep 2007)
New Revision: 2109
Modified:
branches/energy/source/main/cTaskLib.cc
branches/energy/tests/analyze_dumplandscape/config/avida.cfg
branches/energy/tests/analyze_fulllandscape_1step/config/avida.cfg
branches/energy/tests/analyze_truncate_lineage/config/avida.cfg
branches/energy/tests/avida_GA_lim_res/config/avida.cfg
branches/energy/tests/default_transsmt_100u/config/avida.cfg
branches/energy/tests/midrun_classsic_30u/config/avida.cfg
branches/energy/tests/optimize_multivar_lim_res/config/avida.cfg
branches/energy/tests/sex-modular/config/avida.cfg
branches/energy/tests/sex/config/avida.cfg
branches/energy/tests/spatial_res_100u/config/avida.cfg
branches/energy/tests/task_sort_analyze/config/avida.cfg
Log:
Fixed config files for tests. NUM_DEMES must be at least 1
Modified: branches/energy/source/main/cTaskLib.cc
===================================================================
--- branches/energy/source/main/cTaskLib.cc 2007-09-25 18:03:16 UTC (rev 2108)
+++ branches/energy/source/main/cTaskLib.cc 2007-09-25 19:47:56 UTC (rev 2109)
@@ -2737,13 +2737,13 @@
if (ctx.NetIsValid()) return 1.0;
return 0.0;
}
+
/*
-here
double cTaskLib::Task_SentEventID(cTaskContext& ctx) const {
cOrganism* org = ctx.GetOrganism();
message_list_type sent_msg = org->GetSentMessages();
- cDeme deme = ctx.GetOrgInterface()->GetDeme();
+ cDeme& deme = ctx.GetOrgInterface()->GetDeme();
for(int i = 0; i < deme.NumEvents(); i++) {
for(int j = 0; j < sent_msg.size(); j++) {
if(deme.GetEvent(i).GetEventID() == sent_msg[j]) {
Modified: branches/energy/tests/analyze_dumplandscape/config/avida.cfg
===================================================================
--- branches/energy/tests/analyze_dumplandscape/config/avida.cfg 2007-09-25 18:03:16 UTC (rev 2108)
+++ branches/energy/tests/analyze_dumplandscape/config/avida.cfg 2007-09-25 19:47:56 UTC (rev 2109)
@@ -20,7 +20,7 @@
WORLD_Y 60 # Height of the Avida world
WORLD_GEOMETRY 2 # 1 = Bounded Grid
# 2 = Torus
-NUM_DEMES 0 # Number of independed groups in the population; 0=off
+NUM_DEMES 1 # Number of independed groups in the population; 0=off
RANDOM_SEED 0 # Random number seed (0 for based on time)
HARDWARE_TYPE 0 # 0 = Original CPUs
# 1 = New SMT CPUs
Modified: branches/energy/tests/analyze_fulllandscape_1step/config/avida.cfg
===================================================================
--- branches/energy/tests/analyze_fulllandscape_1step/config/avida.cfg 2007-09-25 18:03:16 UTC (rev 2108)
+++ branches/energy/tests/analyze_fulllandscape_1step/config/avida.cfg 2007-09-25 19:47:56 UTC (rev 2109)
@@ -20,7 +20,7 @@
WORLD_Y 60 # Height of the Avida world
WORLD_GEOMETRY 2 # 1 = Bounded Grid
# 2 = Torus
-NUM_DEMES 0 # Number of independed groups in the population; 0=off
+NUM_DEMES 1 # Number of independed groups in the population; 0=off
RANDOM_SEED 0 # Random number seed (0 for based on time)
HARDWARE_TYPE 0 # 0 = Original CPUs
# 1 = New SMT CPUs
Modified: branches/energy/tests/analyze_truncate_lineage/config/avida.cfg
===================================================================
--- branches/energy/tests/analyze_truncate_lineage/config/avida.cfg 2007-09-25 18:03:16 UTC (rev 2108)
+++ branches/energy/tests/analyze_truncate_lineage/config/avida.cfg 2007-09-25 19:47:56 UTC (rev 2109)
@@ -20,7 +20,7 @@
WORLD_Y 60 # Height of the Avida world
WORLD_GEOMETRY 2 # 1 = Bounded Grid
# 2 = Torus
-NUM_DEMES 0 # Number of independed groups in the population; 0=off
+NUM_DEMES 1 # Number of independed groups in the population; 0=off
RANDOM_SEED 0 # Random number seed (0 for based on time)
HARDWARE_TYPE 0 # 0 = Original CPUs
# 1 = New SMT CPUs
Modified: branches/energy/tests/avida_GA_lim_res/config/avida.cfg
===================================================================
--- branches/energy/tests/avida_GA_lim_res/config/avida.cfg 2007-09-25 18:03:16 UTC (rev 2108)
+++ branches/energy/tests/avida_GA_lim_res/config/avida.cfg 2007-09-25 19:47:56 UTC (rev 2109)
@@ -20,7 +20,7 @@
WORLD_Y 15 # Height of the Avida world
WORLD_GEOMETRY 2 # 1 = Bounded Grid
# 2 = Torus
-NUM_DEMES 0 # Number of independed groups in the population; 0=off
+NUM_DEMES 1 # Number of independed groups in the population; 0=off
RANDOM_SEED 0 # Random number seed (0 for based on time)
HARDWARE_TYPE 0 # 0 = Original CPUs
# 1 = New SMT CPUs
Modified: branches/energy/tests/default_transsmt_100u/config/avida.cfg
===================================================================
--- branches/energy/tests/default_transsmt_100u/config/avida.cfg 2007-09-25 18:03:16 UTC (rev 2108)
+++ branches/energy/tests/default_transsmt_100u/config/avida.cfg 2007-09-25 19:47:56 UTC (rev 2109)
@@ -20,7 +20,7 @@
WORLD_Y 60 # Height of the Avida world
WORLD_GEOMETRY 2 # 1 = Bounded Grid
# 2 = Torus
-NUM_DEMES 0 # Number of independed groups in the population; 0=off
+NUM_DEMES 1 # Number of independed groups in the population; 0=off
RANDOM_SEED 0 # Random number seed (0 for based on time)
HARDWARE_TYPE 2 # 0 = Original CPUs
# 1 = New SMT CPUs
Modified: branches/energy/tests/midrun_classsic_30u/config/avida.cfg
===================================================================
--- branches/energy/tests/midrun_classsic_30u/config/avida.cfg 2007-09-25 18:03:16 UTC (rev 2108)
+++ branches/energy/tests/midrun_classsic_30u/config/avida.cfg 2007-09-25 19:47:56 UTC (rev 2109)
@@ -20,7 +20,7 @@
WORLD_Y 60 # Height of the Avida world
WORLD_GEOMETRY 2 # 1 = Bounded Grid
# 2 = Torus
-NUM_DEMES 0 # Number of independed groups in the population; 0=off
+NUM_DEMES 1 # Number of independed groups in the population; 0=off
RANDOM_SEED 0 # Random number seed (0 for based on time)
HARDWARE_TYPE 0 # 0 = Original CPUs
# 1 = New SMT CPUs
Modified: branches/energy/tests/optimize_multivar_lim_res/config/avida.cfg
===================================================================
--- branches/energy/tests/optimize_multivar_lim_res/config/avida.cfg 2007-09-25 18:03:16 UTC (rev 2108)
+++ branches/energy/tests/optimize_multivar_lim_res/config/avida.cfg 2007-09-25 19:47:56 UTC (rev 2109)
@@ -20,7 +20,7 @@
WORLD_Y 10 # Height of the Avida world
WORLD_GEOMETRY 2 # 1 = Bounded Grid
# 2 = Torus
-NUM_DEMES 0 # Number of independed groups in the population; 0=off
+NUM_DEMES 1 # Number of independed groups in the population; 0=off
RANDOM_SEED 2 # Random number seed (0 for based on time)
HARDWARE_TYPE 0 # 0 = Original CPUs
# 1 = New SMT CPUs
Modified: branches/energy/tests/sex/config/avida.cfg
===================================================================
--- branches/energy/tests/sex/config/avida.cfg 2007-09-25 18:03:16 UTC (rev 2108)
+++ branches/energy/tests/sex/config/avida.cfg 2007-09-25 19:47:56 UTC (rev 2109)
@@ -21,7 +21,7 @@
WORLD_Y 60 # Height of the Avida world
WORLD_GEOMETRY 2 # 1 = Bounded Grid
# 2 = Torus
-NUM_DEMES 0 # Number of independed groups in the population; 0=off
+NUM_DEMES 1 # Number of independed groups in the population; 0=off
RANDOM_SEED 7 # Random number seed (0 for based on time)
HARDWARE_TYPE 0 # 0 = Original CPUs
# 1 = New SMT CPUs
Modified: branches/energy/tests/sex-modular/config/avida.cfg
===================================================================
--- branches/energy/tests/sex-modular/config/avida.cfg 2007-09-25 18:03:16 UTC (rev 2108)
+++ branches/energy/tests/sex-modular/config/avida.cfg 2007-09-25 19:47:56 UTC (rev 2109)
@@ -21,7 +21,7 @@
WORLD_Y 60 # Height of the Avida world
WORLD_GEOMETRY 2 # 1 = Bounded Grid
# 2 = Torus
-NUM_DEMES 0 # Number of independed groups in the population; 0=off
+NUM_DEMES 1 # Number of independed groups in the population; 0=off
RANDOM_SEED 7 # Random number seed (0 for based on time)
HARDWARE_TYPE 0 # 0 = Original CPUs
# 1 = New SMT CPUs
Modified: branches/energy/tests/spatial_res_100u/config/avida.cfg
===================================================================
--- branches/energy/tests/spatial_res_100u/config/avida.cfg 2007-09-25 18:03:16 UTC (rev 2108)
+++ branches/energy/tests/spatial_res_100u/config/avida.cfg 2007-09-25 19:47:56 UTC (rev 2109)
@@ -24,7 +24,7 @@
WORLD_Y 10 # Height of the Avida world
WORLD_GEOMETRY 2 # 1 = Bounded Grid
# 2 = Torus
-NUM_DEMES 0 # Number of independed groups in the population; 0=off
+NUM_DEMES 1 # Number of independed groups in the population; 0=off
RANDOM_SEED 9 # Random number seed (0 for based on time)
HARDWARE_TYPE 0 # 0 = Original CPUs
# 1 = New SMT CPUs
Modified: branches/energy/tests/task_sort_analyze/config/avida.cfg
===================================================================
--- branches/energy/tests/task_sort_analyze/config/avida.cfg 2007-09-25 18:03:16 UTC (rev 2108)
+++ branches/energy/tests/task_sort_analyze/config/avida.cfg 2007-09-25 19:47:56 UTC (rev 2109)
@@ -20,7 +20,7 @@
WORLD_Y 60 # Height of the Avida world
WORLD_GEOMETRY 2 # 1 = Bounded Grid
# 2 = Torus
-NUM_DEMES 0 # Number of independed groups in the population; 0=off
+NUM_DEMES 1 # Number of independed groups in the population; 0=off
RANDOM_SEED 0 # Random number seed (0 for based on time)
HARDWARE_TYPE 0 # 0 = Original CPUs
# 1 = New SMT CPUs
More information about the Avida-cvs
mailing list