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

goingssh at myxo.css.msu.edu goingssh at myxo.css.msu.edu
Mon Nov 27 18:50:51 PST 2006


Author: goingssh
Date: 2006-11-27 21:50:41 -0500 (Mon, 27 Nov 2006)
New Revision: 1101

Added:
   development/my_avida_build_options.py
Modified:
   development/source/main/cMutationRates.h
Log:
Minor fixes to allow fresh checkouts of avida to build on windows machines

Added: development/my_avida_build_options.py
===================================================================
--- development/my_avida_build_options.py	2006-11-25 21:06:30 UTC (rev 1100)
+++ development/my_avida_build_options.py	2006-11-28 02:50:41 UTC (rev 1101)
@@ -0,0 +1,41 @@
+##############################################################################
+## Copyright (C) 1999-2005 Michigan State University                        ##
+## Based on work Copyright (C) 1993-2003 California Institute of Technology ##
+##                                                                          ##
+## Read the COPYING and README files, or contact 'avida at alife.org',         ##
+## before continuing.  SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE.     ##
+##############################################################################
+
+# For convenience you can use this file to specify build options to the
+# Avida build system.  This file must be in the top level Avida source
+# code directory for the build system to find it. Add options one per
+# line in the form
+#
+#   Foo = 'foo'
+#   Bar = 'bar'
+#
+# Build options specified at the command line override the options in
+# this file.
+#
+# For more information about build options, type
+#
+#   ./build_avida -h
+#
+# In the top level Avida source code directory.
+#
+# Note: this file is also a Python script, so you can do some processing
+# here if you like.
+
+buildType = "Release"
+
+enablePyPkg = "no"
+enableTestCode = "no"
+#enableTCMalloc = "no"
+
+boostIncludeDir = None
+boostPythonLibDir = None
+boostPythonLib = None
+GccXmlCommand = None
+
+# Vim modeline to tell Vim that this is a Python script.
+# vim: set ft=python:

Modified: development/source/main/cMutationRates.h
===================================================================
--- development/source/main/cMutationRates.h	2006-11-25 21:06:30 UTC (rev 1100)
+++ development/source/main/cMutationRates.h	2006-11-28 02:50:41 UTC (rev 1101)
@@ -84,7 +84,7 @@
   double DoMetaCopyMut(cAvidaContext& ctx) {
     if (ctx.GetRandom().P(meta.copy_mut_prob) == false) return 1.0;
     const double exp = ctx.GetRandom().GetRandNormal() * meta.standard_dev;
-    const double change = pow(2, exp);
+    const double change = pow(2.0, exp);
     copy.mut_prob *= change;
     return change;
   }




More information about the Avida-cvs mailing list