[Avida-SVN] r1826 - branches/uml/source/main

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2007-07-19 11:03:21 -0400 (Thu, 19 Jul 2007)
New Revision: 1826

Modified:
   branches/uml/source/main/cTaskLib.cc
Log:
Hydra only runs when scenarios are all found.

Modified: branches/uml/source/main/cTaskLib.cc
===================================================================
--- branches/uml/source/main/cTaskLib.cc	2007-07-19 14:32:37 UTC (rev 1825)
+++ branches/uml/source/main/cTaskLib.cc	2007-07-19 15:03:21 UTC (rev 1826)
@@ -3142,10 +3142,11 @@
 	temp3= organism->getUMLModel()->getBonusInfo("scenario3");
 	temp4= organism->getUMLModel()->getBonusInfo("scenario4");
 	
-	if (!((organism->getUMLModel()->getBonusInfo("scenario1") == 2) ||
-		(organism->getUMLModel()->getBonusInfo("scenario2") == 2) || 
-		(organism->getUMLModel()->getBonusInfo("scenario3") == 3) || 
-		(organism->getUMLModel()->getBonusInfo("scenario4") == 3))) {
+	if ((organism->getUMLModel()->getBonusInfo("scenario1") != 2) ||
+//		(organism->getUMLModel()->getBonusInfo("scenario2") != 2) || 
+		(organism->getUMLModel()->getBonusInfo("scenario3") != 3) //|| 
+//		(organism->getUMLModel()->getBonusInfo("scenario4") != 3)
+		) {
 		
 		organism->getUMLModel()->setBonusInfo("hydra", bonus);
 		
@@ -3268,7 +3269,7 @@
 	
 //	std::cout << "I AM HERE" << std::endl;
 	std::ostringstream strstrm;
-	strstrm << "cp tmp.xmi " << m_world->GetStats().GetUpdate() << "." << organism->GetID();
+	strstrm << "cp tmp.xmi " << neverclaimFile << "." << m_world->GetStats().GetUpdate() << "." << organism->GetID();
 	strstrm << ".xml";	
 	if(system(strstrm.str().c_str())!=0) return 0.0;
 			
@@ -3351,7 +3352,7 @@
 	
 	if	((organism->getUMLModel()->getBonusInfo("scenario1") != 2) ||
 		(organism->getUMLModel()->getBonusInfo("scenario3") != 3) || 
-		(organism->getUMLModel()->getBonusInfo("scenario4") != 3) ||
+//		(organism->getUMLModel()->getBonusInfo("scenario4") != 3) ||
 		(organism->getUMLModel()->getBonusInfo("hydra") == 0))	
 	{ 
 		return bonus;