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

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2007-08-06 12:10:20 -0400 (Mon, 06 Aug 2007)
New Revision: 1894

Modified:
   branches/uml/source/main/cStats.cc
   branches/uml/source/main/cTaskLib.cc
Log:


Modified: branches/uml/source/main/cStats.cc
===================================================================
--- branches/uml/source/main/cStats.cc	2007-08-06 14:28:12 UTC (rev 1893)
+++ branches/uml/source/main/cStats.cc	2007-08-06 16:10:20 UTC (rev 1894)
@@ -1026,6 +1026,7 @@
 	df.Write( m_N1andN2Passed.Sum(), "total number of spin N1 & N2 passes");
 */	
 	df.Write( m_scenario5.Sum(), "total number of scenario 5 all transitions");
+	df.Write( m_scenario6.Sum(), "total number of scenario 6 all transitions");
 	df.Write( m_scenario5loop.Sum(), "total number of scenario 5 all transitions - might loop");	
 	df.Write( m_scenario6loop.Sum(), "total number of scenario 6 all transitions - might loop");
 

Modified: branches/uml/source/main/cTaskLib.cc
===================================================================
--- branches/uml/source/main/cTaskLib.cc	2007-08-06 14:28:12 UTC (rev 1893)
+++ branches/uml/source/main/cTaskLib.cc	2007-08-06 16:10:20 UTC (rev 1894)
@@ -3159,7 +3159,9 @@
 	// Track in stats.
 	if (bonus == 9) { 
 		m_world->GetStats().scenario5Complete();
-	}
+	}else if (bonus >= 18) { 
+		m_world->GetStats().scenario5Loop();
+	} 
 	
 	// Set bonus info for current model
 	org->getUMLModel()->setBonusInfo("scenario5", bonus);		
@@ -3201,6 +3203,8 @@
 	// Track in stats.
 	if (bonus == 4) { 
 		m_world->GetStats().scenario6Complete();
+	} else if (bonus >= 8) { 
+		m_world->GetStats().scenario6Loop();
 	} 
 	
 	// Set bonus info for current model