[Avida-cvs] [avida-svn] r529 - in development: Avida.xcodeproj source/targets/avida-viewer

brysonda@myxo.css.msu.edu brysonda at myxo.css.msu.edu
Sat Mar 25 10:05:04 PST 2006


Author: brysonda
Date: 2006-03-25 13:04:58 -0500 (Sat, 25 Mar 2006)
New Revision: 529

Modified:
   development/Avida.xcodeproj/project.pbxproj
   development/source/targets/avida-viewer/cTextViewerDriver.cc
Log:
Fix cTextViewerDriver to create necessary cAvidaContext.

Modified: development/Avida.xcodeproj/project.pbxproj
===================================================================
--- development/Avida.xcodeproj/project.pbxproj	2006-03-25 03:00:15 UTC (rev 528)
+++ development/Avida.xcodeproj/project.pbxproj	2006-03-25 18:04:58 UTC (rev 529)
@@ -453,7 +453,7 @@
 			isa = PBXContainerItemProxy;
 			containerPortal = DCC30C4D0762532C008F7A48 /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 70AA941809D486AE006A24C8 /* tcmalloc */;
+			remoteGlobalIDString = 70AA941809D486AE006A24C8;
 			remoteInfo = tcmalloc;
 		};
 /* End PBXContainerItemProxy section */

Modified: development/source/targets/avida-viewer/cTextViewerDriver.cc
===================================================================
--- development/source/targets/avida-viewer/cTextViewerDriver.cc	2006-03-25 03:00:15 UTC (rev 528)
+++ development/source/targets/avida-viewer/cTextViewerDriver.cc	2006-03-25 18:04:58 UTC (rev 529)
@@ -54,6 +54,8 @@
   const int ave_time_slice = m_world->GetConfig().AVE_TIME_SLICE.Get();
   const double point_mut_prob = m_world->GetConfig().POINT_MUT_PROB.Get();
   
+  cAvidaContext ctx(m_world->GetRandom());
+  
   while (!m_done) {
     if (cChangeList* change_list = population.GetChangeList()) {
       change_list->Reset();
@@ -100,11 +102,11 @@
             first_update = false;
           }
         }
-        population.ProcessStep(step_size, next_id);
+        population.ProcessStep(ctx, step_size, next_id);
       }
     }
     else {
-      for (int i = 0; i < UD_size; i++) population.ProcessStep(step_size);
+      for (int i = 0; i < UD_size; i++) population.ProcessStep(ctx, step_size);
     }
     
     
@@ -130,7 +132,7 @@
     if (point_mut_prob > 0 ) {
       for (int i = 0; i < population.GetSize(); i++) {
         if (population.GetCell(i).IsOccupied()) {
-          population.GetCell(i).GetOrganism()->GetHardware().PointMutate(point_mut_prob);
+          population.GetCell(i).GetOrganism()->GetHardware().PointMutate(ctx, point_mut_prob);
         }
       }
     }




More information about the Avida-cvs mailing list