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

[brysonda@myxo.css.msu.edu]

Author: brysonda
Date: 2006-04-01 13:39:14 -0500 (Sat, 01 Apr 2006)
New Revision: 552

Modified:
   development/source/main/cOrganism.cc
   development/source/main/cOrganism.h
Log:
Fix NetRemoteValidate so that it will actually validate results.

Modified: development/source/main/cOrganism.cc
===================================================================
--- development/source/main/cOrganism.cc	2006-03-31 17:55:15 UTC (rev 551)
+++ development/source/main/cOrganism.cc	2006-04-01 18:39:14 UTC (rev 552)
@@ -272,8 +272,6 @@
 {
   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];
@@ -286,7 +284,7 @@
   if (!found) return false;
 
   int completed = 0;
-  while (m_net->seq[m_net->last_seq].GetReceived()) {
+  while (m_net->last_seq < m_net->seq.GetSize() && m_net->seq[m_net->last_seq].GetReceived()) {
     completed++;
     m_net->last_seq++;
   }

Modified: development/source/main/cOrganism.h
===================================================================
--- development/source/main/cOrganism.h	2006-03-31 17:55:15 UTC (rev 551)
+++ development/source/main/cOrganism.h	2006-04-01 18:39:14 UTC (rev 552)
@@ -113,7 +113,7 @@
     tSmartArray<cOrgSeqMessage> seq; 
     int last_seq;
     
-    cNetSupport() : last_seq(-1) { ; }
+    cNetSupport() : last_seq(0) { ; }
     ~cNetSupport();
   };
   cNetSupport* m_net;