[Avida-SVN] r2516 - branches/jobScheduling/source/main

[beckma24 at myxo.css.msu.edu]

Author: beckma24
Date: 2008-04-03 10:42:35 -0400 (Thu, 03 Apr 2008)
New Revision: 2516

Modified:
   branches/jobScheduling/source/main/cDeme.cc
Log:


Modified: branches/jobScheduling/source/main/cDeme.cc
===================================================================
--- branches/jobScheduling/source/main/cDeme.cc	2008-04-03 05:07:03 UTC (rev 2515)
+++ branches/jobScheduling/source/main/cDeme.cc	2008-04-03 14:42:35 UTC (rev 2516)
@@ -302,6 +302,8 @@
 }
 
 void cDeme::KillCellEvent(const int eventID) {
+  if(eventID <= 0)
+    return;
   for(int i = 0; i < cell_events.GetSize(); i++) {
     cDemeCellEvent& event = cell_events[i];
     if(event.IsActive() && event.GetEventID() == eventID) {
@@ -311,8 +313,8 @@
         if(event.GetEventID() == m_world->GetPopulation().GetCell(GetCellID(eventCell)).GetCellData()) { // eventID == CellData
           //set cell data to 0
           m_world->GetPopulation().GetCell(GetCellID(eventCell)).SetCellData(0);
-          eventCell = event.GetNextEventCellID();
         }
+        eventCell = event.GetNextEventCellID();
       }
       event.DeactivateEvent();  //event over
       eventsKilled++;