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

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2007-08-02 08:20:12 -0400 (Thu, 02 Aug 2007)
New Revision: 1882

Modified:
   branches/uml/source/main/cTaskLib.cc
Log:
modify the minimum trans task

Modified: branches/uml/source/main/cTaskLib.cc
===================================================================
--- branches/uml/source/main/cTaskLib.cc	2007-08-02 01:09:39 UTC (rev 1881)
+++ branches/uml/source/main/cTaskLib.cc	2007-08-02 12:20:12 UTC (rev 1882)
@@ -3494,9 +3494,13 @@
 	int mt, nt;
 		
 		
-	if ((organism->getUMLModel()->getBonusInfo("spinw1") == 0)	 &&
+/*	if ((organism->getUMLModel()->getBonusInfo("spinw1") == 0)	 &&
 		(organism->getUMLModel()->getBonusInfo("spinw2") == 0)) { 
 			return bonus;
+	} */
+	if ((organism->getUMLModel()->getBonusInfo("scenario5") == 0) || 
+		(organism->getUMLModel()->getBonusInfo("scenario6") == 0)) { 
+			return bonus;
 	}
 	
 	// Ok. Subtract the number of edges from the maximum number of edges seen so far.