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

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2008-04-29 09:11:09 -0400 (Tue, 29 Apr 2008)
New Revision: 2559

Modified:
   branches/uml/source/main/cUMLModel.cc
Log:


Modified: branches/uml/source/main/cUMLModel.cc
===================================================================
--- branches/uml/source/main/cUMLModel.cc	2008-04-28 13:24:48 UTC (rev 2558)
+++ branches/uml/source/main/cUMLModel.cc	2008-04-29 13:11:09 UTC (rev 2559)
@@ -530,7 +530,7 @@
 		// I'm simplifying until then... 
 		// The next line is commented out to increase the reward for a given scenario. 
 		// total_bonus += (temp_bonus / complete_bonus);
-		// total_bonus += temp_bonus;
+		 total_bonus += temp_bonus;
 		
 	scenario_completion[i] = temp_bonus / complete_bonus;
 //	std::cout << "scenario " << i << " bonus " << temp_bonus << " max bonus " << max_bonus; 
@@ -555,12 +555,14 @@
 
 
 	
+	// commented out to try without utility.
+	//double total_util = s.utilityMap["FaultTolerance"]*.2 + s.utilityMap["EnergyEfficiency"]*.6; 
+	//total_util += s.utilityMap["Accuracy"]*.2;
+	//total_bonus = complete_bonus * total_util;
+		
+	//return (total_bonus *5);
 	
-	double total_util = s.utilityMap["FaultTolerance"]*.2 + s.utilityMap["EnergyEfficiency"]*.6; 
-	total_util += s.utilityMap["Accuracy"]*.2;
-	total_bonus = complete_bonus * total_util;
-		
-	return (total_bonus *5);
+	return total_bonus;
 }
 
 bool cUMLModel::readyForHydra()