[Avida-SVN] r3127 - in development/source: cpu main

[connel42 at myxo.css.msu.edu]

Author: connel42
Date: 2009-01-19 16:39:01 -0500 (Mon, 19 Jan 2009)
New Revision: 3127

Modified:
   development/source/cpu/cHardwareCPU.cc
   development/source/main/cDeme.cc
   development/source/main/cDeme.h
   development/source/main/cPhenotype.cc
Log:
* Removed some deme-level energy sharing stats that aren't used.

Modified: development/source/cpu/cHardwareCPU.cc
===================================================================
--- development/source/cpu/cHardwareCPU.cc	2009-01-19 14:42:26 UTC (rev 3126)
+++ development/source/cpu/cHardwareCPU.cc	2009-01-19 21:39:01 UTC (rev 3127)
@@ -3572,8 +3572,6 @@
   
   //place energy into receiver's incoming energy buffer
   to_org->GetPhenotype().ReceiveDonatedEnergy(energy_given);
-  to_org->GetPhenotype().IncreaseEnergyReceived(energy_given);
-  GetOrganism()->GetOrgInterface().GetDeme()->IncEnergyDonationsMade();
   
   //if we are using the push energy method, pass the new energy into the receiver's energy store and recalculate merit
   if(m_world->GetConfig().ENERGY_SHARING_METHOD.Get() == 1) {
@@ -4133,7 +4131,6 @@
   
   DoEnergyDonatePercent(energyReceiver, m_organism->GetFracEnergyDonating());
   m_organism->GetPhenotype().IncDonates();
-  m_organism->GetOrgInterface().GetDeme()->IncEnergyDonationsMade();
   m_organism->GetPhenotype().SetIsEnergyDonor();
   
   return true;
@@ -4167,7 +4164,6 @@
     {
       DoEnergyDonatePercent(neighbor, m_organism->GetFracEnergyDonating());
       m_organism->GetPhenotype().IncDonates();
-      m_organism->GetOrgInterface().GetDeme()->IncEnergyDonationsMade();
       m_organism->GetPhenotype().SetIsEnergyDonor();
     }
   }  
@@ -4230,7 +4226,6 @@
   // Could set the data field of the message to be the multiplier
   
   m_organism->BroadcastMessage(ctx, msg);
-  m_organism->GetOrgInterface().GetDeme()->IncEnergyRequestsMade();
   m_organism->GetPhenotype().SetIsEnergyRequestor();
   
   return true;
@@ -4245,7 +4240,6 @@
     return false;
   }	
   
-  m_organism->GetOrgInterface().GetDeme()->IncEnergyRequestsMade();
   m_organism->GetPhenotype().SetIsEnergyRequestor();
   m_organism->GetPhenotype().SetHasOpenEnergyRequest();
   return true;

Modified: development/source/main/cDeme.cc
===================================================================
--- development/source/main/cDeme.cc	2009-01-19 14:42:26 UTC (rev 3126)
+++ development/source/main/cDeme.cc	2009-01-19 21:39:01 UTC (rev 3127)
@@ -76,9 +76,6 @@
   last_org_reaction_count.ResizeClear(num_reactions);
   last_org_reaction_count.SetAll(0);
   
-  energy_requests_made = 0;
-  energy_donations_made = 0;
-  
   // If width is negative, set it to the full number of cells.
   width = in_width;
   if (width < 1) width = cell_ids.GetSize();

Modified: development/source/main/cDeme.h
===================================================================
--- development/source/main/cDeme.h	2009-01-19 14:42:26 UTC (rev 3126)
+++ development/source/main/cDeme.h	2009-01-19 21:39:01 UTC (rev 3127)
@@ -87,8 +87,6 @@
   unsigned int consecutiveSuccessfulEventPeriods;
   int sleeping_count; //!< Number of organisms currently sleeping
   cDoubleSum energyUsage;
-  unsigned int energy_requests_made;
-  unsigned int energy_donations_made;
   
   tArray<int> cur_task_exe_count;
   tArray<int> cur_reaction_count;
@@ -320,10 +318,6 @@
 	unsigned int GetMessageSuccessfullySent() { return MSG_SuccessfullySent; }
 	unsigned int GetMessageDropped() { return MSG_dropped; }
 	unsigned int GetMessageSendFailed() { return MSG_sendFailed; }
-  
-  // --- Energy sharing stats --- //
-  void IncEnergyRequestsMade() { energy_requests_made++; }
-  void IncEnergyDonationsMade() { energy_donations_made++; }
 
   // --- Pheromones --- //
   void AddPheromone(int absolute_cell_id, double value);

Modified: development/source/main/cPhenotype.cc
===================================================================
--- development/source/main/cPhenotype.cc	2009-01-19 14:42:26 UTC (rev 3126)
+++ development/source/main/cPhenotype.cc	2009-01-19 21:39:01 UTC (rev 3127)
@@ -1396,6 +1396,7 @@
 void cPhenotype::ReceiveDonatedEnergy(const double donation) {
   assert(donation >= 0.0);  
   energy_received_buffer += donation;
+  IncreaseEnergyReceived(donation);
   is_energy_receiver = true;
 } //End ReceiveDonatedEnergy()