[Avida-SVN] r2334 - in development: Avida.xcodeproj source/actions

[dknoester at myxo.css.msu.edu]

Author: dknoester
Date: 2008-02-16 14:37:06 -0500 (Sat, 16 Feb 2008)
New Revision: 2334

Modified:
   development/Avida.xcodeproj/project.pbxproj
   development/source/actions/DriverActions.cc
Log:
Added assert to ExitAveGeneration to disable use with demes w/o germlines.

Modified: development/Avida.xcodeproj/project.pbxproj
===================================================================
--- development/Avida.xcodeproj/project.pbxproj	2008-02-16 18:47:23 UTC (rev 2333)
+++ development/Avida.xcodeproj/project.pbxproj	2008-02-16 19:37:06 UTC (rev 2334)
@@ -213,23 +213,6 @@
 		};
 /* End PBXBuildRule section */
 
-/* Begin PBXBuildStyle section */
-		B500CC0C0D64C64300E812AF /* Development */ = {
-			isa = PBXBuildStyle;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-			};
-			name = Development;
-		};
-		B500CC0D0D64C64300E812AF /* Deployment */ = {
-			isa = PBXBuildStyle;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-			};
-			name = Deployment;
-		};
-/* End PBXBuildStyle section */
-
 /* Begin PBXContainerItemProxy section */
 		56F555DA0C3B36FC00E2E929 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
@@ -1801,12 +1784,6 @@
 		DCC30C4D0762532C008F7A48 /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 702442D70859E0B00059BD9B /* Build configuration list for PBXProject "Avida" */;
-			buildSettings = {
-			};
-			buildStyles = (
-				B500CC0C0D64C64300E812AF /* Development */,
-				B500CC0D0D64C64300E812AF /* Deployment */,
-			);
 			hasScannedForEncodings = 0;
 			mainGroup = DCC30C490762532C008F7A48;
 			productRefGroup = DCC3164E07626CF3008F7A48 /* Products */;

Modified: development/source/actions/DriverActions.cc
===================================================================
--- development/source/actions/DriverActions.cc	2008-02-16 18:47:23 UTC (rev 2333)
+++ development/source/actions/DriverActions.cc	2008-02-16 19:37:06 UTC (rev 2334)
@@ -104,6 +104,8 @@
 threshold value.  Respects demes / germlines configuration.
 
 MUST appear earlier in event file than PrintGermlineData, if used.
+
+ at todo Doesn't currently work with demes w/o germlines.
 */
 class cActionExitAveGeneration : public cAction {
 public:
@@ -117,6 +119,11 @@
       // error; no default value for targeted generation.
       m_world->GetDriver().RaiseFatalException(-1, "ExitAveGeneration event requires generation.");
     }
+    
+    // Can't currently calc generation for non-germlines demes.
+    if(m_world->GetConfig().NUM_DEMES.Get() > 1) {
+      assert(m_world->GetConfig().DEMES_USE_GERMLINE.Get());
+    }
   }
 
   static const cString GetDescription() { return "Arguments: <double generation>"; }