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

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2007-01-07 15:00:16 -0500 (Sun, 07 Jan 2007)
New Revision: 1171

Modified:
   branches/uml/source/main/cOrganism.cc
   branches/uml/source/main/cTaskLib.cc
Log:


Modified: branches/uml/source/main/cOrganism.cc
===================================================================
--- branches/uml/source/main/cOrganism.cc	2007-01-07 18:16:17 UTC (rev 1170)
+++ branches/uml/source/main/cOrganism.cc	2007-01-07 20:00:16 UTC (rev 1171)
@@ -621,9 +621,7 @@
 			break;
 		case 7:
 			temp = "";
-			temp += "<UML:Transition.guard> <UML:Guard> <UML:Guard.expression> ";
-			temp += "<UML:BooleanExpression body=\"brightnessValue &gt;=0 &amp; brightnessValue&lt;=1000\" language=\"\"/>";
-			temp += " </UML:Guard.expression> </UML:Guard> </UML:Transition.guard> <UML:Transition.effect> ";
+			temp += " <UML:Transition.effect> ";
 			temp += " <UML:UninterpretedAction xmi.id=\"XDE-8E3B2DF6-D63B-4A70-9CD3-FF0DE13EEDAD\" ";
 			temp += " isAsynchronous=\"false\" name=\"\" isSpecification=\"false\"> <UML:Action.script> ";
 			temp += " <UML:ActionExpression language=\"\" body=\"correctedBrightnessValue:=brightnessValue\"/> ";
@@ -660,6 +658,17 @@
 			temp += " </UML:Action.script> </UML:UninterpretedAction> </UML:Transition.effect> ";
 			(*it).second = temp;
 			break;
+		case 11:
+			temp = "";
+			temp += "<UML:Transition.guard> <UML:Guard> <UML:Guard.expression> ";
+			temp += "<UML:BooleanExpression body=\"brightnessValue &gt;=0 &amp; brightnessValue&lt;=1000\" language=\"\"/>";
+			temp += " </UML:Guard.expression> </UML:Guard> </UML:Transition.guard> <UML:Transition.effect> ";
+			temp += " <UML:UninterpretedAction xmi.id=\"XDE-8E3B2DF6-D63B-4A70-9CD3-FF0DE13EEDAD\" ";
+			temp += " isAsynchronous=\"false\" name=\"\" isSpecification=\"false\"> <UML:Action.script> ";
+			temp += " <UML:ActionExpression language=\"\" body=\"correctedBrightnessValue:=brightnessValue\"/> ";
+			temp += " </UML:Action.script> </UML:UninterpretedAction> </UML:Transition.effect> ";
+			(*it).second = temp;
+			break;
 		default:
 			(*it).second = " ";
 	}
@@ -993,7 +1002,7 @@
 	std::string temp, temp1, temp2;
 	int tempint;
 	
-	InitTransForMSXMI();
+	InitTransForBSXMI();
 
 	xmi = "";
 	// loop through all states

Modified: branches/uml/source/main/cTaskLib.cc
===================================================================
--- branches/uml/source/main/cTaskLib.cc	2007-01-07 18:16:17 UTC (rev 1170)
+++ branches/uml/source/main/cTaskLib.cc	2007-01-07 20:00:16 UTC (rev 1171)
@@ -2234,19 +2234,17 @@
 	if(system("cat pan.out | perl -e 'while(<STDIN>) { if(/errors:\\s(\\d+)/) {exit($1);}}'")!=0) return 0.0;
 	//cmd = "cp tmp.xmi " + organism->GetGenotype()->GetID() + ".xml"; 
 	
-	if(organism->GetGenotype() != NULL) {
+//	if(organism->GetGenotype() != NULL) {
 		std::ostringstream strstrm;
-		strstrm << "cp tmp.xmi " << m_world->GetStats().GetUpdate() << "." + organism->GetID();
+		strstrm << "cp tmp.xmi " << m_world->GetStats().GetUpdate() << "." << organism->GetID();
 	// << "." + organism->GetID() << ".xml";
 		//strstrm << "." << organism->GetGenotype()->GetID();
 		strstrm << ".xml";	
 		if(system(strstrm.str().c_str())!=0) return 0.0;
-	}
-	
-
+//	}
 			
 	m_world->GetStats().PanPassed();
-	return 1.0;
+	return 3.0;
 }
 
 double cTaskLib::Task_SpinN1(cTaskContext* ctx) const {