[Avida-SVN] r2609 - in development: Avida.xcodeproj source/main

[beckma24 at myxo.css.msu.edu]

Author: beckma24
Date: 2008-06-06 11:42:38 -0400 (Fri, 06 Jun 2008)
New Revision: 2609

Modified:
   development/Avida.xcodeproj/project.pbxproj
   development/source/main/cStats.cc
Log:
Fixed resetting of organism sleep count when demes are used

Modified: development/Avida.xcodeproj/project.pbxproj
===================================================================
--- development/Avida.xcodeproj/project.pbxproj	2008-06-06 15:34:47 UTC (rev 2608)
+++ development/Avida.xcodeproj/project.pbxproj	2008-06-06 15:42:38 UTC (rev 2609)
@@ -220,6 +220,23 @@
 		};
 /* End PBXBuildRule section */
 
+/* Begin PBXBuildStyle section */
+		B54852BC0DF98D8E00AD254E /* Development */ = {
+			isa = PBXBuildStyle;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+			};
+			name = Development;
+		};
+		B54852BD0DF98D8E00AD254E /* Deployment */ = {
+			isa = PBXBuildStyle;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+			};
+			name = Deployment;
+		};
+/* End PBXBuildStyle section */
+
 /* Begin PBXContainerItemProxy section */
 		56F555DA0C3B36FC00E2E929 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
@@ -1817,12 +1834,16 @@
 		DCC30C4D0762532C008F7A48 /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 702442D70859E0B00059BD9B /* Build configuration list for PBXProject "Avida" */;
-			compatibilityVersion = "Xcode 2.4";
+			buildSettings = {
+			};
+			buildStyles = (
+				B54852BC0DF98D8E00AD254E /* Development */,
+				B54852BD0DF98D8E00AD254E /* Deployment */,
+			);
 			hasScannedForEncodings = 0;
 			mainGroup = DCC30C490762532C008F7A48;
 			productRefGroup = DCC3164E07626CF3008F7A48 /* Products */;
 			projectDirPath = "";
-			projectRoot = "";
 			targets = (
 				7023ED520C0A590200362B9C /* full-suite */,
 				DCC3164C07626CF3008F7A48 /* avida */,

Modified: development/source/main/cStats.cc
===================================================================
--- development/source/main/cStats.cc	2008-06-06 15:34:47 UTC (rev 2608)
+++ development/source/main/cStats.cc	2008-06-06 15:42:38 UTC (rev 2609)
@@ -1231,6 +1231,10 @@
   m_deme_births.Add(source_deme.GetBirthCount());
   m_deme_merit.Add(source_deme.GetHeritableDemeMerit().GetDouble());
   m_deme_generation.Add(source_deme.GetGeneration());
+
+  // reset #orgs. sleeping in demes
+  numAsleep[source_deme.GetID()]=0;
+  numAsleep[target_deme.GetID()]=0;
 }