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

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2007-05-25 19:04:52 -0400 (Fri, 25 May 2007)
New Revision: 1612

Modified:
   branches/uml/source/main/cTaskLib.cc
   branches/uml/source/main/cUMLModel.cc
Log:
Fixed trans rewards...


Modified: branches/uml/source/main/cTaskLib.cc
===================================================================
--- branches/uml/source/main/cTaskLib.cc	2007-05-25 12:17:37 UTC (rev 1611)
+++ branches/uml/source/main/cTaskLib.cc	2007-05-25 23:04:52 UTC (rev 1612)
@@ -2649,7 +2649,9 @@
 {
 	double bonus = 0.0;
 //	if (ctx.organism->currTrans(1, -1, -1, -1, -1, "^TempSensor.getOpState()")) {		
-	if (ctx.organism->currTrans(1, -1, -1, -1, -1, 1)) {		
+//	if (ctx.organism->currTrans(1, -1, -1, -1, -1, 1)) {		
+	if (ctx.organism->getUMLModel()->getStateDiagram(1)->findTrans(-1, -1, -1, -1, 1))
+	{
 
 
 		ctx.task_success_complete = 1;	
@@ -2664,7 +2666,9 @@
 {
 	double bonus = 0.0;
 //	if (ctx.organism->currTrans(0, -1, -1, "setTempOpState", -1, -1)) {		
-	if (ctx.organism->currTrans(1, -1, -1, 1, -1, -1)) {		
+//	if (ctx.organism->currTrans(1, -1, -1, 1, -1, -1)) {		
+	if (ctx.organism->getUMLModel()->getStateDiagram(1)->findTrans(-1, -1, 1, -1, -1))
+	{
 
 
 			ctx.task_success_complete += 1;	
@@ -2679,7 +2683,9 @@
 {
 	double bonus = 0.0;
 //	if (ctx.organism->currTrans(0, -1, -1, "getOpState", -1, -1)) {		
-	if (ctx.organism->currTrans(0, -1, -1, 1, -1, -1)) {		
+//	if (ctx.organism->currTrans(0, -1, -1, 1, -1, -1)) {		
+	if (ctx.organism->getUMLModel()->getStateDiagram(0)->findTrans(-1, -1, 1, -1, -1))
+	{
 
 
 			bonus = 1.0;
@@ -2694,7 +2700,9 @@
 {
 	double bonus = 0.0;
 //	if (ctx.organism->currTrans(0, -1, -1, -1, -1, "op_state:=1")) {		
-	if (ctx.organism->currTrans(0, -1, -1, -1, -1, 3)) {		
+//	if (ctx.organism->currTrans(0, -1, -1, -1, -1, 3)) {		
+	if (ctx.organism->getUMLModel()->getStateDiagram(0)->findTrans(-1, -1, -1, -1, 3))
+	{
 
 			ctx.task_success_complete += 1;	
 			bonus = 1.0;
@@ -2708,7 +2716,9 @@
 {
 	double bonus = 0.0;
 //	if (ctx.organism->currTrans(0, -1, -1, -1, -1, "^SoftwareSensor.setTempOpState(op_state)")) {		
-	if (ctx.organism->currTrans(0, -1, -1, -1, -1, 1)) {		
+	//if (ctx.organism->currTrans(0, -1, -1, -1, -1, 1)) 
+	if (ctx.organism->getUMLModel()->getStateDiagram(0)->findTrans(-1, -1, -1, -1, 1))
+	{		
 
 
 			ctx.task_success_complete += 1;	

Modified: branches/uml/source/main/cUMLModel.cc
===================================================================
--- branches/uml/source/main/cUMLModel.cc	2007-05-25 12:17:37 UTC (rev 1611)
+++ branches/uml/source/main/cUMLModel.cc	2007-05-25 23:04:52 UTC (rev 1612)
@@ -436,13 +436,12 @@
 	if(system("./pan -a &> ./pan.out")!=0) return 0;
 	if(system("cat pan.out | perl -e 'while(<STDIN>) { if(/errors:\\s(\\d+)/) {exit($1);}}'")!=0) return 0;
 		
+	if(system("cat pan.out | perl -e 'while(<STDIN>) { if(/unreached/) {exit(1);}}'")!=0) return 1;
+
 	std::ostringstream strstrm;
 	strstrm << "cp tmp.xmi " << world->GetStats().GetUpdate() << "." << id;
 	strstrm << ".xml";	
 	if(system(strstrm.str().c_str())!=0) return 0.0;
-	
-	if(system("cat pan.out | perl -e 'while(<STDIN>) { if(/unreached/) {exit(1);}}'")!=0) return 1;
-
 			
 	world->GetStats().PanPassed();
 	return 3;