[Avida-cvs] [avida-svn] r420 - in development: Avida.xcodeproj source/main

[brysonda@myxo.css.msu.edu]

Author: brysonda
Date: 2005-12-09 23:11:50 -0500 (Fri, 09 Dec 2005)
New Revision: 420

Modified:
   development/Avida.xcodeproj/project.pbxproj
   development/source/main/cPopulation.cc
   development/source/main/cPopulation.h
Log:
Inline ProcessStep(int).

Modified: development/Avida.xcodeproj/project.pbxproj
===================================================================
--- development/Avida.xcodeproj/project.pbxproj	2005-12-09 18:22:25 UTC (rev 419)
+++ development/Avida.xcodeproj/project.pbxproj	2005-12-10 04:11:50 UTC (rev 420)
@@ -745,7 +745,7 @@
 		DCC315CF076253A5008F7A48 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
 		DCC315D0076253A5008F7A48 /* task_event_gen.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = task_event_gen.cc; sourceTree = "<group>"; };
 		DCC315D1076253A5008F7A48 /* task_event_gen.old.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = task_event_gen.old.cc; sourceTree = "<group>"; };
-		DCC3164D07626CF3008F7A48 /* primitive */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = primitive; sourceTree = BUILT_PRODUCTS_DIR; };
+		DCC3164D07626CF3008F7A48 /* primitive */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = primitive; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */

Modified: development/source/main/cPopulation.cc
===================================================================
--- development/source/main/cPopulation.cc	2005-12-09 18:22:25 UTC (rev 419)
+++ development/source/main/cPopulation.cc	2005-12-10 04:11:50 UTC (rev 420)
@@ -1067,12 +1067,6 @@
 }
 
 
-void cPopulation::ProcessStep(double step_size)
-{
-  ProcessStep( step_size, ScheduleOrganism() );
-}
-
-
 void cPopulation::UpdateOrganismStats()
 {
   // Loop through all the cells getting stats and doing calculations

Modified: development/source/main/cPopulation.h
===================================================================
--- development/source/main/cPopulation.h	2005-12-09 18:22:25 UTC (rev 419)
+++ development/source/main/cPopulation.h	2005-12-10 04:11:50 UTC (rev 420)
@@ -135,8 +135,8 @@
 
   // Process a single organism one instruction...
   int ScheduleOrganism();          // Determine next organism to be processed.
-  void ProcessStep(double step_size);
   void ProcessStep(double step_size, int cell_id);
+  void ProcessStep(double step_size) { ProcessStep(step_size, ScheduleOrganism()); }
 
   // Calculate the statistics from the most recent update.
   void CalcUpdateStats();
@@ -170,8 +170,7 @@
   void UpdateCellResources(const tArray<double> & res_change,
                            const int cell_id);
   void SetResource(int id, double new_level);
-  double GetResource(int id) const {
-    return resource_count.Get(id); }
+  double GetResource(int id) const { return resource_count.Get(id); }
 
   cEnvironment & GetEnvironment() { return environment; }
   int GetNumOrganisms() { return num_organisms; }