[Avida-SVN] r2209 - in branches/energy: Avida.xcodeproj source/cpu source/main

[beckma24 at myxo.css.msu.edu]

Author: beckma24
Date: 2007-11-24 11:44:30 -0500 (Sat, 24 Nov 2007)
New Revision: 2209

Modified:
   branches/energy/Avida.xcodeproj/project.pbxproj
   branches/energy/source/cpu/cHardwareCPU.cc
   branches/energy/source/main/cPopulation.cc
Log:
commented out auto move logging

Modified: branches/energy/Avida.xcodeproj/project.pbxproj
===================================================================
--- branches/energy/Avida.xcodeproj/project.pbxproj	2007-11-19 03:33:12 UTC (rev 2208)
+++ branches/energy/Avida.xcodeproj/project.pbxproj	2007-11-24 16:44:30 UTC (rev 2209)
@@ -214,6 +214,23 @@
 		};
 /* End PBXBuildRule section */
 
+/* Begin PBXBuildStyle section */
+		B5C73BDA0CF4B9DE006D7121 /* Development */ = {
+			isa = PBXBuildStyle;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+			};
+			name = Development;
+		};
+		B5C73BDB0CF4B9DE006D7121 /* Deployment */ = {
+			isa = PBXBuildStyle;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+			};
+			name = Deployment;
+		};
+/* End PBXBuildStyle section */
+
 /* Begin PBXContainerItemProxy section */
 		56F555DA0C3B36FC00E2E929 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
@@ -1787,6 +1804,12 @@
 		DCC30C4D0762532C008F7A48 /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 702442D70859E0B00059BD9B /* Build configuration list for PBXProject "Avida" */;
+			buildSettings = {
+			};
+			buildStyles = (
+				B5C73BDA0CF4B9DE006D7121 /* Development */,
+				B5C73BDB0CF4B9DE006D7121 /* Deployment */,
+			);
 			hasScannedForEncodings = 0;
 			mainGroup = DCC30C490762532C008F7A48;
 			productRefGroup = DCC3164E07626CF3008F7A48 /* Products */;

Modified: branches/energy/source/cpu/cHardwareCPU.cc
===================================================================
--- branches/energy/source/cpu/cHardwareCPU.cc	2007-11-19 03:33:12 UTC (rev 2208)
+++ branches/energy/source/cpu/cHardwareCPU.cc	2007-11-24 16:44:30 UTC (rev 2209)
@@ -3842,6 +3842,7 @@
 
    return true;   
 }
+
 // More follow-the-leader; separate out sensing, @ LMG
 // The instruction reads the label following the instruction (if any), and senses the data in the cell specified by the
 // nop label:

Modified: branches/energy/source/main/cPopulation.cc
===================================================================
--- branches/energy/source/main/cPopulation.cc	2007-11-19 03:33:12 UTC (rev 2208)
+++ branches/energy/source/main/cPopulation.cc	2007-11-24 16:44:30 UTC (rev 2209)
@@ -831,7 +831,7 @@
     cell1.GetPosition(x1,y1);
     cell2.GetPosition(x,y);
     cid = org1->GetID();
-
+/*
     // Output some information
     ofstream movelog;
     movelog.open("data/movelog.txt",ios::app);
@@ -842,7 +842,7 @@
       x << " " <<
       y << " " << endl;
     movelog.close();
-
+*/
   } else {
     schedule->Adjust(cell2.GetID(), cMerit(0));
   }