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

[beckma24 at myxo.css.msu.edu]

Author: beckma24
Date: 2007-03-28 16:55:05 -0400 (Wed, 28 Mar 2007)
New Revision: 1437

Modified:
   branches/energy/source/cpu/cHardwareCPU.cc
   branches/energy/source/main/cOrganism.cc
   branches/energy/source/main/cPhenotype.cc
Log:
Fixed interface usage problem that causes analyze mode to crash.

Modified: branches/energy/source/cpu/cHardwareCPU.cc
===================================================================
--- branches/energy/source/cpu/cHardwareCPU.cc	2007-03-28 14:24:14 UTC (rev 1436)
+++ branches/energy/source/cpu/cHardwareCPU.cc	2007-03-28 20:55:05 UTC (rev 1437)
@@ -531,8 +531,10 @@
   double energy_req = inst_energy_cost[cur_inst.GetOp()] * (organism->GetPhenotype().GetMerit().GetDouble() / 100.0); //compensate by factor of 100
   
   if(energy_req > 0.0) {
+//  cerr<<"here";
   
     if(organism->GetPhenotype().GetStoredEnergy() >= energy_req) {
+//  cerr<<" here2";
     
       inst_energy_cost[cur_inst.GetOp()] = 0;
       //subtract energy used from current org energy.
@@ -548,7 +550,6 @@
     }
   }
   
-  
   // If first time cost hasn't been paid off...
   if ( inst_ft_cost[cur_inst.GetOp()] > 0 ) {
     inst_ft_cost[cur_inst.GetOp()]--;       // dec cost

Modified: branches/energy/source/main/cOrganism.cc
===================================================================
--- branches/energy/source/main/cOrganism.cc	2007-03-28 14:24:14 UTC (rev 1436)
+++ branches/energy/source/main/cOrganism.cc	2007-03-28 20:55:05 UTC (rev 1437)
@@ -213,7 +213,8 @@
     double newMerit = m_phenotype.RefreshEnergy();
     if(newMerit != -1) {
 //      std::cerr<<GetCellID()<<" "<<newMerit<<std::endl;
-      m_world->GetPopulation().UpdateMerit(GetCellID(), newMerit);
+      m_interface->UpdateMerit(newMerit);
+//      m_world->GetPopulation().UpdateMerit(GetCellID(), newMerit);
     }
   }
 

Modified: branches/energy/source/main/cPhenotype.cc
===================================================================
--- branches/energy/source/main/cPhenotype.cc	2007-03-28 14:24:14 UTC (rev 1436)
+++ branches/energy/source/main/cPhenotype.cc	2007-03-28 20:55:05 UTC (rev 1437)
@@ -199,7 +199,7 @@
 {
   // Setup reasonable initial values injected organism...
   merit           = _length;
-  energy_store    = 0.0;  //TODO
+  energy_store    = m_world->GetConfig().ENERGY_GIVEN_ON_INJECT.Get();
   genome_length   = _length;
   copied_size     = _length;
   executed_size   = _length;