[Avida-cvs] [avida-svn] r551 - development/source/main

[brysonda@myxo.css.msu.edu]

Author: brysonda
Date: 2006-03-31 12:55:15 -0500 (Fri, 31 Mar 2006)
New Revision: 551

Modified:
   development/source/main/cOrganism.cc
   development/source/main/cPopulationInterface.cc
Log:
Fix a couple of bugs in Net functions.

Modified: development/source/main/cOrganism.cc
===================================================================
--- development/source/main/cOrganism.cc	2006-03-31 16:32:24 UTC (rev 550)
+++ development/source/main/cOrganism.cc	2006-03-31 17:55:15 UTC (rev 551)
@@ -272,8 +272,9 @@
 {
   assert(m_net);
 
+  if (m_net->last_seq = -1) return false;
+
   bool found = false;
-
   for (int i = m_net->last_seq; i < m_net->seq.GetSize(); i++) {
     cOrgSeqMessage& msg = m_net->seq[i];
     if (msg.GetValue() == value && !msg.GetReceived()) {
@@ -282,7 +283,6 @@
       break;
     }
   }
-
   if (!found) return false;
 
   int completed = 0;

Modified: development/source/main/cPopulationInterface.cc
===================================================================
--- development/source/main/cPopulationInterface.cc	2006-03-31 16:32:24 UTC (rev 550)
+++ development/source/main/cPopulationInterface.cc	2006-03-31 17:55:15 UTC (rev 551)
@@ -131,8 +131,8 @@
     cell.ConnectionList().CircNext();
     
     cOrganism* cur_neighbor = cell.ConnectionList().GetFirst()->GetOrganism();
-    cOrgSinkMessage* msg;
-    if (cur_neighbor != NULL || (msg = cur_neighbor->NetPop()) != NULL ) return msg;
+    cOrgSinkMessage* msg = NULL;
+    if (cur_neighbor != NULL && (msg = cur_neighbor->NetPop()) != NULL ) return msg;
   }
   
   return NULL;