[Avida-cvs] [avida-svn] r549 - in development/source: . main support targets/avida-viewer

[brysonda@myxo.css.msu.edu]

Author: brysonda
Date: 2006-03-31 11:07:28 -0500 (Fri, 31 Mar 2006)
New Revision: 549

Modified:
   development/source/defs.h
   development/source/main/cAvidaConfig.h
   development/source/support/avida.cfg
   development/source/targets/avida-viewer/cOptionsScreen.cc
Log:
Remove some unused configuration parameters.  Can always be added again if/when implemented.

Modified: development/source/defs.h
===================================================================
--- development/source/defs.h	2006-03-31 15:00:20 UTC (rev 548)
+++ development/source/defs.h	2006-03-31 16:07:28 UTC (rev 549)
@@ -144,13 +144,6 @@
 #define SEND_BUF_SIZE 3
 #define RECEIVE_BUF_SIZE 3
 
-// Task Merit Method //
-#define TASK_MERIT_NONE   0
-#define TASK_MERIT_NORMAL 1  // Bonus just equals the task bonus
-
-#define MERIT_TIME_AT_TASK     0
-#define MERIT_TIME_AT_DIVIDE   1
-
 #define FILE_TYPE_TEXT 0
 #define FILE_TYPE_HTML 1
 
@@ -190,10 +183,6 @@
 #define GENERATION_INC_OFFSPRING 0
 #define GENERATION_INC_BOTH      1
 
-#define TASK_MERIT_OFF         0
-#define TASK_MERIT_EXPONENTIAL 1
-#define TASK_MERIT_LINEAR      2
-
 #define SIZE_MERIT_OFF         0
 #define SIZE_MERIT_COPIED      1
 #define SIZE_MERIT_EXECUTED    2

Modified: development/source/main/cAvidaConfig.h
===================================================================
--- development/source/main/cAvidaConfig.h	2006-03-31 15:00:20 UTC (rev 548)
+++ development/source/main/cAvidaConfig.h	2006-03-31 16:07:28 UTC (rev 549)
@@ -228,13 +228,11 @@
   CONFIG_ADD_VAR(AVE_TIME_SLICE, int, 30, "Ave number of insts per org per update");
   CONFIG_ADD_VAR(SLICING_METHOD, int, 2, "0 = CONSTANT: all organisms get default...\n1 = PROBABILISTIC: Run _prob_ proportional to merit.\n2 = INTEGRATED: Perfectly integrated deterministic.");
   CONFIG_ADD_VAR(SIZE_MERIT_METHOD, int, 0, "0 = off (merit is independent of size)\n1 = Merit proportional to copied size\n2 = Merit prop. to executed size\n3 = Merit prop. to full size\n4 = Merit prop. to min of executed or copied size\n5 = Merit prop. to sqrt of the minimum size");
-  CONFIG_ADD_VAR(TASK_MERIT_METHOD, int, 1, "0 = No task bonuses\n1 = Bonus just equals the task bonus");
   CONFIG_ADD_VAR(MAX_CPU_THREADS, int, 1, "Number of Threads a CPU can spawn");
   CONFIG_ADD_VAR(THREAD_SLICING_METHOD, int, 0, "Formula for and organism's thread slicing -> 1 + (num_organism_threads-1) * THREAD_SLICING_METHOD.\n0 = One thread executed per time slice.\n1 = All threads executed each time slice.\n");
   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 it has completed any tasks");
-  CONFIG_ADD_VAR(MERIT_TIME, int, 0, "0 = Merit Calculated when task completed\n1 = Merit Calculated on Divide");
   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(MAX_DONATE_KIN_DIST, int, -1, "Limit on distance of relation for donate; -1=no max");

Modified: development/source/support/avida.cfg
===================================================================
--- development/source/support/avida.cfg	2006-03-31 15:00:20 UTC (rev 548)
+++ development/source/support/avida.cfg	2006-03-31 16:07:28 UTC (rev 549)
@@ -125,8 +125,6 @@
                          # 3 = Merit prop. to full size
                          # 4 = Merit prop. to min of executed or copied size
                          # 5 = Merit prop. to sqrt of the minimum size
-TASK_MERIT_METHOD 1      # 0 = No task bonuses
-                         # 1 = Bonus just equals the task bonus
 MAX_CPU_THREADS 1        # Number of Threads a CPU can spawn
 THREAD_SLICING_METHOD 0  # Formula for and organism's thread slicing -> 1 + (num_organism_threads-1) * THREAD_SLICING_METHOD.
                          # 0 = One thread executed per time slice.
@@ -134,8 +132,6 @@
 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 it has completed any tasks
-MERIT_TIME 0             # 0 = Merit Calculated when task completed
-                         # 1 = Merit Calculated on Divide
 MERIT_GIVEN 0.0          # Fraction of merit donated with 'donate' command
 MERIT_RECEIVED 0.0       # Multiplier of merit given with 'donate' command
 MAX_DONATE_KIN_DIST -1   # Limit on distance of relation for donate; -1=no max

Modified: development/source/targets/avida-viewer/cOptionsScreen.cc
===================================================================
--- development/source/targets/avida-viewer/cOptionsScreen.cc	2006-03-31 15:00:20 UTC (rev 548)
+++ development/source/targets/avida-viewer/cOptionsScreen.cc	2006-03-31 16:07:28 UTC (rev 549)
@@ -101,15 +101,6 @@
     break;
   }
 
-  switch(info.GetConfig().TASK_MERIT_METHOD.Get()) {
-    case TASK_MERIT_NONE:
-      Print(2, 55, "No Task Bonuses");
-      break;
-    case TASK_MERIT_NORMAL:
-      Print(2, 55, "Normal");
-      break;
-  }
-
   switch(info.GetConfig().SIZE_MERIT_METHOD.Get()) {
   case SIZE_MERIT_OFF:
     Print(3, 55, "Off");