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

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2007-08-16 21:36:17 -0400 (Thu, 16 Aug 2007)
New Revision: 1952

Modified:
   branches/uml/source/main/cTaskLib.cc
   branches/uml/source/main/cUMLModel.cc
Log:
Reward rebalancing & fix to witness trace run. (Removed -a)



Modified: branches/uml/source/main/cTaskLib.cc
===================================================================
--- branches/uml/source/main/cTaskLib.cc	2007-08-16 20:38:20 UTC (rev 1951)
+++ branches/uml/source/main/cTaskLib.cc	2007-08-17 01:36:17 UTC (rev 1952)
@@ -3114,7 +3114,9 @@
 	if(system(cmd.c_str())!=0) return 0.0;
 	
 	if(system("/usr/bin/gcc -DMEMLIM=512 pan.c -o pan &> /dev/null")!=0) return 0.0;
-	if(system("./pan -e -n -a -w19  -m100000 -c1 &> ./pan.out")!=0) return 0.0;
+// Eliminated -a option on 8/16/ it was causing weird errors.
+//	if(system("./pan -e -n -a -w19  -m100000 -c1 &> ./pan.out")!=0) return 0.0;
+	if(system("./pan -e -n -w19  -m100000 -c1 &> ./pan.out")!=0) return 0.0;
 //	num_witness = (system("cat pan.out | perl -e 'while(<STDIN>) { if(/errors:\\s(\\d+)/) {exit($1);}}'"));
 
 	return !(system("cat pan.out | perl -e 'while(<STDIN>) { if(/errors:\\s(\\d+)/) {exit($1);}}'"));
@@ -3271,12 +3273,12 @@
 	nt = mod->numTrans();
 	
 	if (mt > 0) {
-		bonus = 1 + mt - nt;
+		bonus = mt - nt;
 		bonus /= mt;
 	}	
 	
 	// cap the amount of bonus.
-	if (bonus > 5) bonus = 5;
+	//if (bonus > 5) bonus = 5;
 	
 	return bonus;
 

Modified: branches/uml/source/main/cUMLModel.cc
===================================================================
--- branches/uml/source/main/cUMLModel.cc	2007-08-16 20:38:20 UTC (rev 1951)
+++ branches/uml/source/main/cUMLModel.cc	2007-08-17 01:36:17 UTC (rev 1952)
@@ -290,7 +290,7 @@
 		s = scenarios[i];
 		temp_bonus = getStateDiagram(s.stateDiagramID)->findPath(s.path, s.shouldLoop, s.startState);
 //		std::cout << "TEMP BONUS: " << temp_bonus << std::endl;
-		total_bonus += temp_bonus;
+//		total_bonus += temp_bonus;
 				
 		complete_bonus = s.path.size() + s.shouldLoop; 
 		if (s.startState >= 0) complete_bonus++;
@@ -304,6 +304,7 @@
 //			scenario_completion[i] = 0;
 ////			std::cout << "scenario incomplete " << std::endl;
 //
+		total_bonus += (temp_bonus / complete_bonus);
 //		}
 	scenario_completion[i] = temp_bonus / complete_bonus;
 	}