[Avida-SVN] r3075 - branches/hjg-dev/source/main

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2008-12-22 22:55:20 -0500 (Mon, 22 Dec 2008)
New Revision: 3075

Modified:
   branches/hjg-dev/source/main/cOrganism.cc
   branches/hjg-dev/source/main/cStats.cc
Log:
more stats

Modified: branches/hjg-dev/source/main/cOrganism.cc
===================================================================
--- branches/hjg-dev/source/main/cOrganism.cc	2008-12-23 00:51:55 UTC (rev 3074)
+++ branches/hjg-dev/source/main/cOrganism.cc	2008-12-23 03:55:20 UTC (rev 3075)
@@ -847,6 +847,7 @@
 /* Called to subtract raw materials of a given type. */
 bool cOrganism::SubtractRawMaterials (int mat, int amount) {
 	bool isSuccessful = true;
+	int q = m_raw_materials[mat];
 	
 	if (amount <= m_raw_materials[mat]) {
 		isSuccessful = true;

Modified: branches/hjg-dev/source/main/cStats.cc
===================================================================
--- branches/hjg-dev/source/main/cStats.cc	2008-12-23 00:51:55 UTC (rev 3074)
+++ branches/hjg-dev/source/main/cStats.cc	2008-12-23 03:55:20 UTC (rev 3075)
@@ -1890,10 +1890,16 @@
 //		other_raw_mat.Add(org->GetOtherRawMaterials());
 			
 		// Update raw materials. 
-			int type_rec =0;
+			unsigned int type_rec =0;
 			for (iter2 = tag_results.begin(); iter2 != tag_results.end(); iter2++) { 
 				tag_results[iter2->first].Add(org->GetRawMaterialAmount(iter2->first));
 				if (org->GetRawMaterialAmount(iter2->first) > 0) type_rec++;
+				if (org->GetTagLabel() == iter2->first) {
+					own_raw_mat.Add(org->GetRawMaterialAmount(iter2->first));
+				} else {
+					other_raw_mat.Add(org->GetRawMaterialAmount(iter2->first));
+				}
+				
 			}		
 			if (type_rec == tag_results.size()) perfect++;
 			
@@ -1926,13 +1932,13 @@
 
 	df.Write(num_alt, "Number of altruists [altruists]");
 	df.Write(num_coop, "Number of cooperators [cooperators]");
-//	df.Write(own_raw_mat.Average(), "Avg. own raw mat [ownrawmat]");
-//	df.Write(other_raw_mat.Average(), "Avg. other raw mat [otherrawmat]");
+
 	for (iter2 = tag_results.begin(); iter2 != tag_results.end(); iter2++) { 
 		//tag_results[iter->first] += organism->GetRawMaterialAmount(iter->first);
 		df.Write(iter2->second.Average(), my_strings[iter2->first]);
 	}		
-	
+	df.Write(own_raw_mat.Average(), "Avg. own raw mat [ownrawmat]");
+	df.Write(other_raw_mat.Average(), "Avg. other raw mat [otherrawmat]");	
 	df.Write(perfect, "Number of orgs with all strings [perfect]");