[Avida-SVN] r1920 - in branches/energy/source: cpu main

[beckma24 at myxo.css.msu.edu]

Author: beckma24
Date: 2007-08-09 15:05:07 -0400 (Thu, 09 Aug 2007)
New Revision: 1920

Modified:
   branches/energy/source/cpu/cHardwareCPU.cc
   branches/energy/source/main/cOrganism.cc
   branches/energy/source/main/cPhenotype.cc
Log:
Tied executionRatio in to merit calculations

Modified: branches/energy/source/cpu/cHardwareCPU.cc
===================================================================
--- branches/energy/source/cpu/cHardwareCPU.cc	2007-08-09 18:28:33 UTC (rev 1919)
+++ branches/energy/source/cpu/cHardwareCPU.cc	2007-08-09 19:05:07 UTC (rev 1920)
@@ -4121,7 +4121,7 @@
   if(m_world->GetConfig().APPLY_ENERGY_METHOD.Get() == 2) {
     organism->GetPhenotype().RefreshEnergy();
     organism->GetPhenotype().ApplyToEnergyStore();
-    double newMerit = cMerit::EnergyToMerit(organism->GetPhenotype().GetStoredEnergy(), m_world);
+    double newMerit = cMerit::EnergyToMerit(organism->GetPhenotype().GetStoredEnergy(), m_world) * organism->GetPhenotype().GetExecutionRatio();
     pop.UpdateMerit(organism->GetCellID(), newMerit);
   }
   return true;

Modified: branches/energy/source/main/cOrganism.cc
===================================================================
--- branches/energy/source/main/cOrganism.cc	2007-08-09 18:28:33 UTC (rev 1919)
+++ branches/energy/source/main/cOrganism.cc	2007-08-09 19:05:07 UTC (rev 1920)
@@ -243,7 +243,7 @@
   if(m_world->GetConfig().ENERGY_ENABLED.Get() && m_world->GetConfig().APPLY_ENERGY_METHOD.Get() == 1 && task_completed) {
     m_phenotype.RefreshEnergy();
     m_phenotype.ApplyToEnergyStore();
-    double newMerit = cMerit::EnergyToMerit(GetPhenotype().GetStoredEnergy(), m_world);
+    double newMerit = cMerit::EnergyToMerit(GetPhenotype().GetStoredEnergy(), m_world) * GetPhenotype().GetExecutionRatio();
     if(newMerit != -1) {
       m_interface->UpdateMerit(newMerit);
     }

Modified: branches/energy/source/main/cPhenotype.cc
===================================================================
--- branches/energy/source/main/cPhenotype.cc	2007-08-09 18:28:33 UTC (rev 1919)
+++ branches/energy/source/main/cPhenotype.cc	2007-08-09 19:05:07 UTC (rev 1920)
@@ -1423,7 +1423,7 @@
   ReduceEnergy(child_energy - 2*energy_given_at_birth); // 2*energy_given_at_birth: 1 in child_energy & 1 for parent
     
   //TODO: add energy_given_at_birth to Stored_energy
-  cMerit parentMerit = cMerit(cMerit::EnergyToMerit(GetStoredEnergy(), m_world));
+  cMerit parentMerit = cMerit(cMerit::EnergyToMerit(GetStoredEnergy(), m_world) * GetExecutionRatio());
   SetMerit(parentMerit);
   
 /*  if(m_world->GetConfig().ENERGY_VERBOSE.Get()) {