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

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2007-06-25 10:25:27 -0400 (Mon, 25 Jun 2007)
New Revision: 1712

Modified:
   branches/uml/source/main/cTaskLib.cc
Log:
Added unreachable state detection.



Modified: branches/uml/source/main/cTaskLib.cc
===================================================================
--- branches/uml/source/main/cTaskLib.cc	2007-06-25 13:25:21 UTC (rev 1711)
+++ branches/uml/source/main/cTaskLib.cc	2007-06-25 14:25:27 UTC (rev 1712)
@@ -2982,7 +2982,7 @@
 	if(system("/usr/bin/gcc -DMEMLIM=512 pan.c -o pan &> /dev/null")!=0) return 0.0;
 	if(system("./pan -a &> ./pan.out")!=0) return 0.0;
 	if(system("cat pan.out | perl -e 'while(<STDIN>) { if(/errors:\\s(\\d+)/) {exit($1);}}'")!=0) return 0.0;
-//	if(system("cat pan.out | perl -e 'while(<STDIN>) { if(/unreached/) {exit(1);}}'")!=0) return 0.0;
+	if(system("cat pan.out | perl -e 'while(<STDIN>) { if(/unreached/) {exit(1);}}'")!=0) return 0.2;
 	
 	
 	std::ostringstream strstrm;
@@ -2991,7 +2991,7 @@
 	if(system(strstrm.str().c_str())!=0) return 0.0;
 			
 	m_world->GetStats().PanPassed();
-	return 3.0;
+	return 1.0;
 }
  
 double cTaskLib::SpinWitnessCoprocess(cTaskContext& ctx, const std::string& neverclaimFile) const {
@@ -3035,7 +3035,6 @@
 */	
 	
 	// check if the trigger is present
-	organism->absoluteJumpStateDiagram(1);
 	if (ctx.task_success_complete) {
 			// checkproperty
 			temp1 += SpinCoprocess(ctx, "N1");