[Avida-cvs] [avida-svn] r994 - in branches/coopcomm: . source/main source/tools support/config

[dknoester at myxo.css.msu.edu]

Author: dknoester
Date: 2006-09-26 11:14:20 -0400 (Tue, 26 Sep 2006)
New Revision: 994

Modified:
   branches/coopcomm/CMakeLists.txt
   branches/coopcomm/source/main/cAvidaConfig.h
   branches/coopcomm/source/tools/SConscript
   branches/coopcomm/support/config/avida.cfg
Log:
Merged trunk changes r972:993 into coopcomm branch.

Modified: branches/coopcomm/CMakeLists.txt
===================================================================
--- branches/coopcomm/CMakeLists.txt	2006-09-26 14:54:37 UTC (rev 993)
+++ branches/coopcomm/CMakeLists.txt	2006-09-26 15:14:20 UTC (rev 994)
@@ -157,7 +157,7 @@
 # By default, build the console interface to Avida.
 OPTION(AVD_GUI_NCURSES
   "Enable building Avida console interface."
-  OFF
+  ON
 )
 # Make sure requisites are present for build of console interface.  Give
 # user feedback if they're missing.
@@ -187,7 +187,7 @@
 	# are run via 'make test' under unix.
 	OPTION(AVD_CONSISTENCY_TEST_PRIMITIVE
 		"Enable primitive consistency test suites."
-		ON
+		OFF
 	)
 	IF(AVD_CONSISTENCY_TEST_PRIMITIVE)
 		IF(EXISTS ${PROJECT_SOURCE_DIR}/consistencytests)

Modified: branches/coopcomm/source/main/cAvidaConfig.h
===================================================================
--- branches/coopcomm/source/main/cAvidaConfig.h	2006-09-26 14:54:37 UTC (rev 993)
+++ branches/coopcomm/source/main/cAvidaConfig.h	2006-09-26 15:14:20 UTC (rev 994)
@@ -238,8 +238,8 @@
   CONFIG_ADD_VAR(MAX_LABEL_EXE_SIZE, int, 1, "Max nops marked as executed when labels are used");
   CONFIG_ADD_VAR(BASE_SIZE_MERIT, int, 100, "Base merit when size is *not* used");
   CONFIG_ADD_VAR(DEFAULT_BONUS, double, 1.0, "The bonus an organism gets before any tasks");
-  CONFIG_ADD_VAR(MERIT_GIVEN, double, 0.0, "Fraction of merit donated with 'donate' command");
-  CONFIG_ADD_VAR(MERIT_RECEIVED, double, 0.0, "Multiplier of merit given with 'donate' command");
+  CONFIG_ADD_VAR(MERIT_GIVEN, double, 0.0, "Amount of merit donated with 'donoate' command.");
+  CONFIG_ADD_VAR(MERIT_RECEIVED, double, 0.0, "Amount of merit received with 'donate' command");
   CONFIG_ADD_VAR(MAX_DONATE_KIN_DIST, int, -1, "Limit on distance of relation for donate; -1=no max");
   CONFIG_ADD_VAR(MAX_DONATE_EDIT_DIST, int, -1, "Limit on edit distance for donate; -1=no max");
   CONFIG_ADD_VAR(MAX_DONATES, int, 1000000, "Limit on number of donates organisms are allowed.");

Modified: branches/coopcomm/source/tools/SConscript
===================================================================
--- branches/coopcomm/source/tools/SConscript	2006-09-26 14:54:37 UTC (rev 993)
+++ branches/coopcomm/source/tools/SConscript	2006-09-26 15:14:20 UTC (rev 994)
@@ -120,7 +120,7 @@
   'cTools.cc',
   'cWeightedIndex.cc',
   'cCycleCheck.cc',
-  'nTemplateTests.cc',
+  #'nTemplateTests.cc',
 ]
 
 environment.Library('tools', srcs) 

Modified: branches/coopcomm/support/config/avida.cfg
===================================================================
--- branches/coopcomm/support/config/avida.cfg	2006-09-26 14:54:37 UTC (rev 993)
+++ branches/coopcomm/support/config/avida.cfg	2006-09-26 15:14:20 UTC (rev 994)
@@ -141,8 +141,8 @@
 MAX_LABEL_EXE_SIZE 1     # Max nops marked as executed when labels are used
 BASE_SIZE_MERIT 100      # Base merit when size is *not* used
 DEFAULT_BONUS 1.0        # The bonus an organism gets before any tasks
-MERIT_GIVEN 0.0          # Fraction of merit donated with 'donate' command
-MERIT_RECEIVED 0.0       # Multiplier of merit given with 'donate' command
+MERIT_GIVEN 0.0          # Amount of merit donated with 'donate' command
+MERIT_RECEIVED 0.0       # Amount of merit given with 'donate' command
 MAX_DONATE_KIN_DIST -1   # Limit on distance of relation for donate; -1=no max
 MAX_DONATE_EDIT_DIST -1  # Limit on edit distance for donate; -1=no max
 MAX_DONATES 1000000      # Limit on number of donates organisms are allowed.