[Avida-SVN] r2240 - branches/energy/source/main

[beckma24 at myxo.css.msu.edu]

Author: beckma24
Date: 2007-12-27 09:52:54 -0500 (Thu, 27 Dec 2007)
New Revision: 2240

Modified:
   branches/energy/source/main/cDeme.cc
   branches/energy/source/main/cOrgMessagePredicate.h
   branches/energy/source/main/cTaskLib.cc
Log:
Sending to center (nest) can not longer be satisfied by zero event, which denotes the center or nest

Modified: branches/energy/source/main/cDeme.cc
===================================================================
--- branches/energy/source/main/cDeme.cc	2007-12-26 22:40:58 UTC (rev 2239)
+++ branches/energy/source/main/cDeme.cc	2007-12-27 14:52:54 UTC (rev 2240)
@@ -109,7 +109,7 @@
       int eventCell = event.GetNextEventCellID();
       while(eventCell != -1) {
         if(event.GetEventID() == m_world->GetPopulation().GetCell(GetCellID(eventCell)).GetCellData()) { // eventID == CellData
-          //set cell data to 0
+          //set cell data to -1
           m_world->GetPopulation().GetCell(GetCellID(eventCell)).SetCellData(-1);
         }
         eventCell = event.GetNextEventCellID();

Modified: branches/energy/source/main/cOrgMessagePredicate.h
===================================================================
--- branches/energy/source/main/cOrgMessagePredicate.h	2007-12-26 22:40:58 UTC (rev 2239)
+++ branches/energy/source/main/cOrgMessagePredicate.h	2007-12-27 14:52:54 UTC (rev 2240)
@@ -169,9 +169,11 @@
       return false;
     }
     
-    if(m_event->IsActive() && 
-       ((unsigned int)m_event->GetEventID() == msg.GetData() ||
-        (unsigned int)m_event->GetEventID() == msg.GetLabel())) {
+    unsigned int eventID = m_event->GetEventID();
+    
+    if(m_event->IsActive() && eventID != 0 &&
+       (eventID == msg.GetData() ||
+        eventID == msg.GetLabel())) {
       m_cell_ids.insert(msg.GetSender()->GetCellID());
 
       if(m_base_station == msg.GetReceiver()->GetCellID()) {

Modified: branches/energy/source/main/cTaskLib.cc
===================================================================
--- branches/energy/source/main/cTaskLib.cc	2007-12-26 22:40:58 UTC (rev 2239)
+++ branches/energy/source/main/cTaskLib.cc	2007-12-27 14:52:54 UTC (rev 2240)
@@ -2767,8 +2767,10 @@
   cDeme& deme = m_world->GetPopulation().GetDeme(ctx.GetOrgInterface()->GetDemeID());
     
   for(int i = 0; i < deme.GetNumEvents(); i++) {
-    if((unsigned int)deme.GetEvent(i).GetEventID() == last_sent_msg.GetLabel() || (unsigned int)deme.GetEvent(i).GetEventID() == last_sent_msg.GetData()) {
-      return 1.0;
+    if((unsigned int)deme.GetEvent(i).GetEventID() != 0) {
+      if((unsigned int)deme.GetEvent(i).GetEventID() == last_sent_msg.GetLabel() || (unsigned int)deme.GetEvent(i).GetEventID() == last_sent_msg.GetData()) {
+        return 1.0;
+      }
     }
   }
   return 0.0;