[Avida-cvs] [Avida2-svn] r226 - trunk/source/main

[dule@myxo.css.msu.edu]

Author: dule
Date: 2005-07-05 20:33:47 -0400 (Tue, 05 Jul 2005)
New Revision: 226

Modified:
   trunk/source/main/config.cc
   trunk/source/main/organism.cc
Log:
tweaking some stuff relating to required/immunity task

Modified: trunk/source/main/config.cc
===================================================================
--- trunk/source/main/config.cc	2005-07-05 22:19:48 UTC (rev 225)
+++ trunk/source/main/config.cc	2005-07-06 00:33:47 UTC (rev 226)
@@ -208,7 +208,7 @@
 		 "Is a an allocate required before a divide? (0/1)");
   div_group->Add(required_task, "-1", "REQUIRED_TASK",
 		 "Task ID required for successful divide.");
-  div_group->Add(immunity_task, "-1", "REQUIRED_TASK",
+  div_group->Add(immunity_task, "-1", "IMMUNITY_TASK",
 		 "Task providing immunity from the required task.");
   div_group->Add(required_reaction, "-1", "REQUIRED_REACTION",
 		 "Reaction ID required for successful divide.");

Modified: trunk/source/main/organism.cc
===================================================================
--- trunk/source/main/organism.cc	2005-07-05 22:19:48 UTC (rev 225)
+++ trunk/source/main/organism.cc	2005-07-06 00:33:47 UTC (rev 226)
@@ -244,6 +244,8 @@
   // Make sure required task (if any) has been performed...
   const int required_task = cConfig::GetRequiredTask();
   const int immunity_task = cConfig::GetImmunityTask();
+//cout << "req=" << required_task << "," <<phenotype.GetCurTaskCount()[required_task]<< " "; 
+//cout << "im=" << immunity_task << "," <<phenotype.GetCurTaskCount()[immunity_task]<< endl; 
   if (required_task != -1 &&
       phenotype.GetCurTaskCount()[required_task] == 0) { 
     if (immunity_task==-1 ||