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

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2007-08-25 13:09:06 -0400 (Sat, 25 Aug 2007)
New Revision: 2008

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


Modified: branches/uml/source/main/cTaskLib.cc
===================================================================
--- branches/uml/source/main/cTaskLib.cc	2007-08-24 20:43:34 UTC (rev 2007)
+++ branches/uml/source/main/cTaskLib.cc	2007-08-25 17:09:06 UTC (rev 2008)
@@ -3283,9 +3283,9 @@
 		(organism->getUMLModel()->getBonusInfo("scenario6") != 4)) { 
 			return bonus;
 	}*/
-	if	(organism->getUMLModel()->getBonusInfo("hydra") == 0){ 
+/*	if	(organism->getUMLModel()->getBonusInfo("hydra") == 0){ 
 		return bonus;
-	}
+	}*/
 
 	
 	// Ok. Subtract the number of edges from the maximum number of edges seen so far. 

Modified: branches/uml/source/main/cUMLStateDiagram.cc
===================================================================
--- branches/uml/source/main/cUMLStateDiagram.cc	2007-08-24 20:43:34 UTC (rev 2007)
+++ branches/uml/source/main/cUMLStateDiagram.cc	2007-08-25 17:09:06 UTC (rev 2008)
@@ -57,6 +57,7 @@
 				// We've found a state that has out-edges where the trigger+guard
 				// combination is duplicated at least once.
 				++numNonD;
+				break;
 			}
 			
 		}