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

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2007-08-13 12:48:17 -0400 (Mon, 13 Aug 2007)
New Revision: 1929

Modified:
   branches/uml/source/main/cStats.cc
   branches/uml/source/main/cTaskLib.cc
Log:
Fixed a bug regarding when the witness trace process passed. Changed stats to print when hydra, witness, and spin tasks pass.



Modified: branches/uml/source/main/cStats.cc
===================================================================
--- branches/uml/source/main/cStats.cc	2007-08-13 15:00:13 UTC (rev 1928)
+++ branches/uml/source/main/cStats.cc	2007-08-13 16:48:17 UTC (rev 1929)
@@ -1023,6 +1023,7 @@
 	df.Write( av_number_of_actions.Average(), "av num actions");
 	df.Write( av_number_of_state_diagrams.Average(), "av num state diagrams");
 	df.Write( av_number_of_trans_lab.Average(), "av num of trans lab");
+	*/
 	df.Write( m_hydraAttempt.Sum(), "total number of hydra attempts" );
 	df.Write( m_hydraPassed.Sum(), "total number of hydra passes" );
 	df.Write( m_W1Attempt.Sum(), "total number of spin W1 attempts" );
@@ -1034,7 +1035,7 @@
 	df.Write( m_N2Attempt.Sum(), "total number of spin N2 attempts" );
 	df.Write( m_N2Passed.Sum(), "total number of spin N2 passes" );
 	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_scenario7.Sum(), "total number of scenario 7 all transitions");

Modified: branches/uml/source/main/cTaskLib.cc
===================================================================
--- branches/uml/source/main/cTaskLib.cc	2007-08-13 15:00:13 UTC (rev 1928)
+++ branches/uml/source/main/cTaskLib.cc	2007-08-13 16:48:17 UTC (rev 1929)
@@ -3122,7 +3122,7 @@
 	cOrganism* organism = ctx.getOrganism();
 	double bonus = 0.0;
 		
-	if (organism->getUMLModel()->getBonusInfo("spinw1") == 0)	
+	if (organism->getUMLModel()->getBonusInfo("spinw1") <= 1)	
 	{ 
 		organism->getUMLModel()->setBonusInfo("spinn1", bonus);	
 		return bonus;
@@ -3180,7 +3180,7 @@
 	cOrganism* organism = ctx.getOrganism();
 	double bonus = 0.0;
 	
-	if (organism->getUMLModel()->getBonusInfo("spinw2") == 0)	
+	if (organism->getUMLModel()->getBonusInfo("spinw2") <= 1)	
 	{ 
 		organism->getUMLModel()->setBonusInfo("spinn2", bonus);	
 		return bonus;