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

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2007-03-05 15:35:00 -0500 (Mon, 05 Mar 2007)
New Revision: 1390

Modified:
   branches/uml/source/main/cTaskLib.cc
Log:
modified tasks for known state diagram.


Modified: branches/uml/source/main/cTaskLib.cc
===================================================================
--- branches/uml/source/main/cTaskLib.cc	2007-03-05 20:32:36 UTC (rev 1389)
+++ branches/uml/source/main/cTaskLib.cc	2007-03-05 20:35:00 UTC (rev 1390)
@@ -1875,13 +1875,13 @@
 
 double cTaskLib::Task_Trans4(cTaskContext* ctx) const
 {
-	return ctx->organism->findTrans(4,5);
+	return ctx->organism->findTrans(0,1);
 
 }
   
 double cTaskLib::Task_Trans5(cTaskContext* ctx) const
 {
-	return ctx->organism->findTrans(5,1);
+	return ctx->organism->findTrans(4,0);
 
 }
 
@@ -1890,7 +1890,7 @@
 	double ns = (double) ctx->organism->numStates();
 	
 	if (ns <= 5 ) {
-		return ns; 
+		return (ns/5); 
 	} else{
 		return 0.0;
 	}
@@ -1902,7 +1902,7 @@
 	double nt = (double) ctx->organism->numTrans();
 	
 	if (nt <= 5 ) {
-		return nt; 
+		return (nt/5); 
 	} else{
 		return 0.0;
 	}