[Avida-SVN] r1604 - in branches/uml/source: cpu main

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2007-05-25 00:06:25 -0400 (Fri, 25 May 2007)
New Revision: 1604

Modified:
   branches/uml/source/cpu/cHardwareCPU.cc
   branches/uml/source/main/cTaskLib.cc
Log:


Modified: branches/uml/source/cpu/cHardwareCPU.cc
===================================================================
--- branches/uml/source/cpu/cHardwareCPU.cc	2007-05-25 03:28:27 UTC (rev 1603)
+++ branches/uml/source/cpu/cHardwareCPU.cc	2007-05-25 04:06:25 UTC (rev 1604)
@@ -4169,7 +4169,7 @@
 {
 	if(organism->GetCellID()==-1) return false;
 	
-//	organism->modelCheck(ctx);
+	organism->modelCheck(ctx);
 
 	return organism->addTransitionTotal();
 }

Modified: branches/uml/source/main/cTaskLib.cc
===================================================================
--- branches/uml/source/main/cTaskLib.cc	2007-05-25 03:28:27 UTC (rev 1603)
+++ branches/uml/source/main/cTaskLib.cc	2007-05-25 04:06:25 UTC (rev 1604)
@@ -2898,15 +2898,10 @@
 
 double cTaskLib::Task_ModEval(cTaskContext& ctx) const { 
 	double bonus = 0.0;
-	cUMLModel* par = ctx.organism->getParentUMLModel();
+
 	cUMLModel* self = ctx.organism->getUMLModel();
-	
-	if (self->getXMI() != par->getXMI()) { 
-		bonus = self->evaluateModel(ctx.organism->GetID(), m_world);
-	} else { 
-		// get bonus of other model...
-		
-	}	
-	
+
+	bonus = self->evaluateModel(ctx.organism->GetID(), m_world);
+			
 	return bonus;
 }