[Avida-SVN] r2526 - branches/energy/source/cpu

[connel42 at myxo.css.msu.edu]

Author: connel42
Date: 2008-04-08 10:36:55 -0400 (Tue, 08 Apr 2008)
New Revision: 2526

Modified:
   branches/energy/source/cpu/cHardwareCPU.cc
Log:
updated movement logging to include deme id for filtering



Modified: branches/energy/source/cpu/cHardwareCPU.cc
===================================================================
--- branches/energy/source/cpu/cHardwareCPU.cc	2008-04-08 14:23:45 UTC (rev 2525)
+++ branches/energy/source/cpu/cHardwareCPU.cc	2008-04-08 14:36:55 UTC (rev 2526)
@@ -3250,7 +3250,7 @@
     // out here so that non-pheromone moves are recorded.
     if( (m_world->GetConfig().LOG_PHEROMONE.Get() == 1) &&
         (m_world->GetStats().GetUpdate() >= m_world->GetConfig().EXPLORE_LOG_START.Get()) ) {
-      cString tmpfilename = cStringUtil::Stringf("explore_movelog.dat");
+      cString tmpfilename = cStringUtil::Stringf("movetarget_movelog.dat");
       cDataFile& df = m_world->GetDataFile(tmpfilename);
 
       int rel_srcid = deme.GetRelativeCellID(fromcellID);
@@ -3266,7 +3266,7 @@
         pher_amount = 0;
       }
 
-      cString UpdateStr = cStringUtil::Stringf("%d %d %d %d %f %d",  m_world->GetStats().GetUpdate(), organism->GetID(), rel_srcid, rel_destid, pher_amount, drop_mode);
+      cString UpdateStr = cStringUtil::Stringf("%d %d %d %d %d %f %d",  m_world->GetStats().GetUpdate(), organism->GetID(), deme.GetDemeID(), rel_srcid, rel_destid, pher_amount, drop_mode);
       df.WriteRaw(UpdateStr);
     }
 
@@ -3375,7 +3375,7 @@
         pher_amount = 0;
       }
 
-      cString UpdateStr = cStringUtil::Stringf("%d %d %d %d %f %d",  m_world->GetStats().GetUpdate(), organism->GetID(), rel_srcid, rel_destid, pher_amount, drop_mode);
+      cString UpdateStr = cStringUtil::Stringf("%d %d %d %d %d %f %d",  m_world->GetStats().GetUpdate(), organism->GetID(), deme.GetDemeID(), rel_srcid, rel_destid, pher_amount, drop_mode);
       df.WriteRaw(UpdateStr);
     }
 
@@ -3507,7 +3507,7 @@
         pher_amount = 0;
       }
 
-      cString UpdateStr = cStringUtil::Stringf("%d %d %d %d %f %d",  m_world->GetStats().GetUpdate(), organism->GetID(), rel_srcid, rel_destid, pher_amount, drop_mode);
+      cString UpdateStr = cStringUtil::Stringf("%d %d %d %d %d %f %d",  m_world->GetStats().GetUpdate(), organism->GetID(), deme.GetDemeID(), rel_srcid, rel_destid, pher_amount, drop_mode);
       df.WriteRaw(UpdateStr);
     }