[Avida-SVN] r3242 - in development/source: actions main

[beckma24 at myxo.css.msu.edu]

Author: beckma24
Date: 2009-05-18 17:02:03 -0400 (Mon, 18 May 2009)
New Revision: 3242

Modified:
   development/source/actions/PopulationActions.cc
   development/source/main/cDeme.cc
Log:
added checking of deme predicate

Modified: development/source/actions/PopulationActions.cc
===================================================================
--- development/source/actions/PopulationActions.cc	2009-05-18 20:50:21 UTC (rev 3241)
+++ development/source/actions/PopulationActions.cc	2009-05-18 21:02:03 UTC (rev 3242)
@@ -2552,7 +2552,7 @@
 public:
   cActionPred_DemeResourceThresholdPredicate(cWorld* world, const cString& args) : cAction(world, args) {
     cString largs(args);
-		assert(largs.GetSize() == 3);
+		assert(largs.CountNumWords() == 3);
     if (largs.GetSize()) resourceName = largs.PopWord();
 		if (largs.GetSize()) comparisonOperator = largs.PopWord();
 		if (largs.GetSize()) threasholdValue = largs.PopWord().AsDouble();

Modified: development/source/main/cDeme.cc
===================================================================
--- development/source/main/cDeme.cc	2009-05-18 20:50:21 UTC (rev 3241)
+++ development/source/main/cDeme.cc	2009-05-18 21:02:03 UTC (rev 3242)
@@ -123,6 +123,14 @@
 
 
 void cDeme::ProcessUpdate() {
+	// test deme predicate
+	for(int i = 0; i < deme_pred_list.Size(); i++) {
+		if(deme_pred_list[i]->GetName() == "cDemeResourceThreshold") {
+			(*deme_pred_list[i])(&deme_resource_count);
+		}
+	}
+	
+	
   energyUsage.Clear();
   
   if(IsEmpty()) {  // deme is not processed if no organisms are present