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

[brysonda@myxo.css.msu.edu]

Author: brysonda
Date: 2006-04-04 20:37:21 -0400 (Tue, 04 Apr 2006)
New Revision: 570

Modified:
   development/Avida.xcodeproj/project.pbxproj
   development/source/cpu/cTestCPU.h
   development/source/main/cWorld.cc
Log:
Fix limited resource usage within the TestCPU.  Essentially the cTestResources object was being created within the Hardware Manager before the environment file was loaded in.   The easy solution right now is to move the instantiation of cHardwareManager to after the reading of the environment file.   Ideally, this dependency should be codified better, perhaps having the test resources register with the environment for updates (meaning that should external actions change resources, the Test environment would be adjusted as well).

Modified: development/Avida.xcodeproj/project.pbxproj
===================================================================
--- development/Avida.xcodeproj/project.pbxproj	2006-04-04 21:01:18 UTC (rev 569)
+++ development/Avida.xcodeproj/project.pbxproj	2006-04-05 00:37:21 UTC (rev 570)
@@ -14,6 +14,9 @@
 		7005A70709BA0FA90007E16E /* cTestCPUInterface.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 7005A70109BA0FA90007E16E /* cTestCPUInterface.h */; };
 		7005A70809BA0FA90007E16E /* cTestCPUInterface.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7005A70209BA0FA90007E16E /* cTestCPUInterface.cc */; };
 		7005A83209BA621F0007E16E /* cOrgMessage.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70B0868808F49EA800FC65FE /* cOrgMessage.cc */; };
+		700AEB7C09E3490400A073FD /* avida-smt.cfg in CopyFiles */ = {isa = PBXBuildFile; fileRef = 700AEB7B09E3490300A073FD /* avida-smt.cfg */; };
+		700AEB7D09E3490400A073FD /* avida-smt.cfg in CopyFiles */ = {isa = PBXBuildFile; fileRef = 700AEB7B09E3490300A073FD /* avida-smt.cfg */; };
+		700AEB7E09E3490400A073FD /* avida-smt.cfg in CopyFiles */ = {isa = PBXBuildFile; fileRef = 700AEB7B09E3490300A073FD /* avida-smt.cfg */; };
 		700E2996085A1F6000CF158A /* avida in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCC3164D07626CF3008F7A48 /* avida */; };
 		700E2AF8085DE50C00CF158A /* avida.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3109C0762539E008F7A48 /* avida.cc */; };
 		700E2B6F085DE50C00CF158A /* analyze.cfg in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCC3114B0762539E008F7A48 /* analyze.cfg */; };
@@ -486,6 +489,7 @@
 				7054A1B709A810CB00038658 /* cAnalyzeJobWorker.h in CopyFiles */,
 				7005A70509BA0FA90007E16E /* cTestCPUInterface.h in CopyFiles */,
 				701D51D109C645F50009B4F8 /* cAvidaContext.h in CopyFiles */,
+				700AEB7E09E3490400A073FD /* avida-smt.cfg in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -512,6 +516,7 @@
 				7054A12409A7BEFC00038658 /* cThread.h in CopyFiles */,
 				7005A70709BA0FA90007E16E /* cTestCPUInterface.h in CopyFiles */,
 				701D51CD09C645F50009B4F8 /* cAvidaContext.h in CopyFiles */,
+				700AEB7C09E3490400A073FD /* avida-smt.cfg in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -541,6 +546,7 @@
 				7054A1B509A810CB00038658 /* cAnalyzeJobWorker.h in CopyFiles */,
 				7005A70309BA0FA90007E16E /* cTestCPUInterface.h in CopyFiles */,
 				701D51CF09C645F50009B4F8 /* cAvidaContext.h in CopyFiles */,
+				700AEB7D09E3490400A073FD /* avida-smt.cfg in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -551,6 +557,7 @@
 		7005A70209BA0FA90007E16E /* cTestCPUInterface.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cTestCPUInterface.cc; sourceTree = "<group>"; };
 		7005A70909BA0FBE0007E16E /* cOrgInterface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cOrgInterface.h; sourceTree = "<group>"; };
 		700AE91B09DB65F200A073FD /* cTaskContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cTaskContext.h; sourceTree = "<group>"; };
+		700AEB7B09E3490300A073FD /* avida-smt.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "avida-smt.cfg"; sourceTree = "<group>"; };
 		700E28CF0859FFD700CF158A /* tObjectFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tObjectFactory.h; sourceTree = "<group>"; };
 		700E2B83085DE50C00CF158A /* avida-viewer */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "avida-viewer"; sourceTree = BUILT_PRODUCTS_DIR; };
 		701384330900A45B0087ED2E /* organism.smtx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = organism.smtx; sourceTree = "<group>"; };
@@ -1439,6 +1446,7 @@
 		DCC3113A0762539E008F7A48 /* Support */ = {
 			isa = PBXGroup;
 			children = (
+				700AEB7B09E3490300A073FD /* avida-smt.cfg */,
 				701384330900A45B0087ED2E /* organism.smtx */,
 				DCC3114B0762539E008F7A48 /* analyze.cfg */,
 				DCC3114C0762539E008F7A48 /* CMakeLists.txt */,

Modified: development/source/cpu/cTestCPU.h
===================================================================
--- development/source/cpu/cTestCPU.h	2006-04-04 21:01:18 UTC (rev 569)
+++ development/source/cpu/cTestCPU.h	2006-04-05 00:37:21 UTC (rev 570)
@@ -57,7 +57,6 @@
 
   bool ProcessGestation(cAvidaContext& ctx, cCPUTestInfo& test_info, int cur_depth);
   bool TestGenome_Body(cAvidaContext& ctx, cCPUTestInfo& test_info, const cGenome& genome, int cur_depth);
-  void SetupResources(void);
 
   cTestCPU(); // @not_implemented
   cTestCPU(const cTestCPU&); // @not_implemented

Modified: development/source/main/cWorld.cc
===================================================================
--- development/source/main/cWorld.cc	2006-04-04 21:01:18 UTC (rev 569)
+++ development/source/main/cWorld.cc	2006-04-05 00:37:21 UTC (rev 570)
@@ -65,7 +65,6 @@
   
   m_class_mgr = new cClassificationManager(this);
   m_env = new cEnvironment(this);
-  m_hw_mgr = new cHardwareManager(this);
   
   // Initialize the default environment...
   if (m_env->Load(m_conf->ENVIRONMENT_FILE.Get()) == false) {
@@ -73,6 +72,7 @@
     ExitAvida(-1);
   }
 
+  m_hw_mgr = new cHardwareManager(this);
   m_stats = new cStats(this);
   m_pop = new cPopulation(this);