[Avida-SVN] r3538 - in branches/topology-manager/source: drivers main

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2009-11-20 13:32:28 -0500 (Fri, 20 Nov 2009)
New Revision: 3538

Modified:
   branches/topology-manager/source/drivers/cDefaultRunDriver.cc
   branches/topology-manager/source/main/cPopulation.cc
   branches/topology-manager/source/main/cPopulation.h
   branches/topology-manager/source/main/cTopologyManager.cc
   branches/topology-manager/source/main/cTopologyManager.h
   branches/topology-manager/source/main/cWorld.cc
Log:
Fix a few compile errors in topology manager.

Modified: branches/topology-manager/source/drivers/cDefaultRunDriver.cc
===================================================================
--- branches/topology-manager/source/drivers/cDefaultRunDriver.cc	2009-11-20 18:30:05 UTC (rev 3537)
+++ branches/topology-manager/source/drivers/cDefaultRunDriver.cc	2009-11-20 18:32:28 UTC (rev 3538)
@@ -71,7 +71,7 @@
   cTopologyManager& topology_manager = m_world->GetTopologyManager();
   cStats& stats = m_world->GetStats();
 
-  const int ave_time_slice = m_world->GetConfig().AVE_TIME_SLICE.Get(cDefaultRunDriver);
+  const int ave_time_slice = m_world->GetConfig().AVE_TIME_SLICE.Get();
   const double point_mut_prob = m_world->GetConfig().POINT_MUT_PROB.Get();
 
   void (cPopulation::*ActiveProcessStep)(cAvidaContext& ctx, double step_size, int cell_id) = &cPopulation::ProcessStep;

Modified: branches/topology-manager/source/main/cPopulation.cc
===================================================================
--- branches/topology-manager/source/main/cPopulation.cc	2009-11-20 18:30:05 UTC (rev 3537)
+++ branches/topology-manager/source/main/cPopulation.cc	2009-11-20 18:32:28 UTC (rev 3538)
@@ -3298,3 +3298,6 @@
 	return num_orgs;
 
 }
+
+int cPopulation::GetNumDemes() const { return topology_manager->GetNumDemes(); }
+cDeme& cPopulation::GetDeme(int i) { return topology_manager->GetDeme(i); }

Modified: branches/topology-manager/source/main/cPopulation.h
===================================================================
--- branches/topology-manager/source/main/cPopulation.h	2009-11-20 18:30:05 UTC (rev 3537)
+++ branches/topology-manager/source/main/cPopulation.h	2009-11-20 18:32:28 UTC (rev 3538)
@@ -221,8 +221,8 @@
   int GetSize() const { return cell_array.GetSize(); }
   int GetWorldX() const { return world_x; }
   int GetWorldY() const { return world_y; }
-  int GetNumDemes() const { return topology_manager->GetNumDemes(); }
-  cDeme& GetDeme(int i) { return topology_manager->GetDeme(i); }
+  int GetNumDemes() const;
+  cDeme& GetDeme(int i);
 
 
 

Modified: branches/topology-manager/source/main/cTopologyManager.cc
===================================================================
--- branches/topology-manager/source/main/cTopologyManager.cc	2009-11-20 18:30:05 UTC (rev 3537)
+++ branches/topology-manager/source/main/cTopologyManager.cc	2009-11-20 18:32:28 UTC (rev 3538)
@@ -47,9 +47,7 @@
 #include <climits>
 
 
-cTopologyManager::cTopologyManager(cWorld* world)
-: m_world(world)
-, environment(world->GetEnvironment()), schedule(NULL)
+cTopologyManager::cTopologyManager(cWorld* world) : m_world(world), environment(world->GetEnvironment()), schedule(NULL)
 {
 
   // Avida specific information.
@@ -2714,3 +2712,6 @@
   const cDeme& deme = deme_array[deme_id];
   schedule->Adjust(cell.GetID(), deme.HasDemeMerit() ? (merit * deme.GetDemeMerit()) : merit, cell.GetDemeID());
 }
+
+bool cTopologyManager::GetSyncEvents() { return m_pop->GetSyncEvents(); }
+void cTopologyManager::SetSyncEvents(bool _in) { m_pop->SetSyncEvents(_in); }

Modified: branches/topology-manager/source/main/cTopologyManager.h
===================================================================
--- branches/topology-manager/source/main/cTopologyManager.h	2009-11-20 18:30:05 UTC (rev 3537)
+++ branches/topology-manager/source/main/cTopologyManager.h	2009-11-20 18:32:28 UTC (rev 3538)
@@ -59,10 +59,11 @@
 #endif
 
 class cChangeList;
+class cDeme;
+class cEnvironment;
 class cSchedule;
-class cEnvironment;
-class cDeme;
 
+
 class cTopologyManager : public cTopoElement
 {
 private:
@@ -71,15 +72,17 @@
   cPopulation* m_pop;
   tArray<cPopulationCell>& cell_array;  // Local cells composing the population
   tArray<int> empty_cell_id_array;     // Used for PREFER_EMPTY birth methods
-  cEnvironment & environment;          // Physics & Chemistry description
+  cEnvironment& environment;          // Physics & Chemistry description
   int world_x;                         // Structured population width.
   int world_y;                         // Structured population height.
   int world_z; 						   // Population depth.
 
-
+  
+  cTopologyManager(); // @not_implemented
+  
+  
 public:
   cWorld* m_world;
-  cTopologyManager(); // not implemented
   cTopologyManager(cWorld* world); //, cPopulation* pop);
   ~cTopologyManager();
 
@@ -203,8 +206,8 @@
 
   bool OK();
 
-  bool GetSyncEvents() { return m_pop->GetSyncEvents(); }
-  void SetSyncEvents(bool _in) { m_pop->SetSyncEvents(_in); }
+  bool GetSyncEvents();
+  void SetSyncEvents(bool _in);
 
 
   int ScheduleOrganism();          // Determine next organism to be processed.

Modified: branches/topology-manager/source/main/cWorld.cc
===================================================================
--- branches/topology-manager/source/main/cWorld.cc	2009-11-20 18:30:05 UTC (rev 3537)
+++ branches/topology-manager/source/main/cWorld.cc	2009-11-20 18:32:28 UTC (rev 3538)
@@ -37,7 +37,7 @@
 #include "cTestCPU.h"
 #include "cTools.h"
 #include "cTopology.h"
-//#include "cTopologyManager.h"
+#include "cTopologyManager.h"
 #include "cFallbackWorldDriver.h"
 
 #include <cassert>