[Avida-SVN] r1557 - in branches/uml: . source/main

[dknoester at myxo.css.msu.edu]

Author: dknoester
Date: 2007-05-15 15:39:23 -0400 (Tue, 15 May 2007)
New Revision: 1557

Modified:
   branches/uml/CMakeLists.txt
   branches/uml/source/main/cPopulation.cc
Log:
stats printing

Modified: branches/uml/CMakeLists.txt
===================================================================
--- branches/uml/CMakeLists.txt	2007-05-15 18:52:10 UTC (rev 1556)
+++ branches/uml/CMakeLists.txt	2007-05-15 19:39:23 UTC (rev 1557)
@@ -172,6 +172,8 @@
   ${MAIN_DIR}/cAvidaConfig.cc
   ${MAIN_DIR}/cBirthChamber.cc
   ${MAIN_DIR}/cDeme.cc
+  ${MAIN_DIR}/cUMLModel.cc
+  ${MAIN_DIR}/cUMLStateDiagram.cc
   ${MAIN_DIR}/cEnvironment.cc
   ${MAIN_DIR}/cEventList.cc
   ${MAIN_DIR}/cFitnessMatrix.cc

Modified: branches/uml/source/main/cPopulation.cc
===================================================================
--- branches/uml/source/main/cPopulation.cc	2007-05-15 18:52:10 UTC (rev 1556)
+++ branches/uml/source/main/cPopulation.cc	2007-05-15 19:39:23 UTC (rev 1557)
@@ -1159,33 +1159,24 @@
 void cPopulation::PrintDemeUMLStats()
 {
   cStats& stats = m_world->GetStats();
-  
-  cDataFile & df_uml = m_world->GetDataFile("deme_uml.dat");
- 
+  cDataFile& df_uml = m_world->GetDataFile("deme_uml.dat");
   df_uml.WriteComment("UML info for each deme in the population");
+  // Going to bypass cDataFile for the rest of this.
+  std::ostream& out = df_uml.GetOFStream();
  
-  df_uml.Write(stats.GetUpdate(), "update");
+  out << "Update: " << stats.GetUpdate() << endl;
 
   const int num_demes = deme_array.GetSize();
   for (int deme_id = 0; deme_id < num_demes; deme_id++) {
-    cString comment;
-		df_uml.Write(deme_id, "Deme ID");
-		df_uml.Endl();
-
+    out << "Deme: " << deme_id << endl;
 		
-		// Print all the self_bonus info
-		std::map <std::string, double> uml_bonus = deme_array[deme_id].getUMLModel()->getBonus();
-		std::map<std::string, double>::const_iterator iter;
-		for (iter=uml_bonus.begin(); iter != uml_bonus.end(); ++iter) {
-//			cout << iter->second << " " << iter->first << endl;
-			df_uml.Write(iter->second, (iter->first).c_str());
-			df_uml.Endl();
-
-		}
-
+    // Print all the self_bonus info
+    const std::map<std::string, double>& uml_bonus = deme_array[deme_id].getUMLModel()->getBonus();
+    std::map<std::string, double>::const_iterator iter;
+    for(iter=uml_bonus.begin(); iter != uml_bonus.end(); ++iter) {
+      out << iter->first << ": " << iter->second << endl;
+    }
   }
-    
-  
 }
 
 // Print out statistics about individual demes