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

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2008-05-01 22:37:12 -0400 (Thu, 01 May 2008)
New Revision: 2573

Modified:
   branches/uml/source/main/cUMLModel.cc
Log:
Bug fixes for scenario task reward tracking. 


Modified: branches/uml/source/main/cUMLModel.cc
===================================================================
--- branches/uml/source/main/cUMLModel.cc	2008-05-01 23:35:15 UTC (rev 2572)
+++ branches/uml/source/main/cUMLModel.cc	2008-05-02 02:37:12 UTC (rev 2573)
@@ -517,6 +517,7 @@
 	double current_alt_set_percent_complete = 0.0;
 	double current_alt_set_max_bonus = 0;
 	int max_alt_set_id = 0;
+	int num_sets = 1;
 //	double accrued_ = 0.0;
 
 	for (unsigned int i=0; i< scenarios.size(); i++) { 
@@ -542,6 +543,7 @@
 			current_alt_set_max_bonus = temp_bonus;
 			current_alt_set = s.alt_set_name;
 			current_alt_set_percent_complete = scenario_completion[i];
+			num_sets++;
 		} else { 
 			if(current_alt_set_percent_complete < scenario_completion[i]) {
 				current_alt_set_percent_complete = scenario_completion[i];
@@ -551,9 +553,13 @@
 		}
 	}
 	
+	// finish out by storing the values of the last set: 
+	percent_scenario_complete += current_alt_set_percent_complete;
+	total_bonus += current_alt_set_max_bonus;
+	scenarios[max_alt_set_id].utilityMap["Used"] = 1;
 
 	
-	percent_scenario_complete = percent_scenario_complete/scenarios.size();
+	percent_scenario_complete = percent_scenario_complete/num_sets;
 		
 	return total_bonus;
 }