[Avida-SVN] r2140 - in development: source/main support/config
barrick at myxo.css.msu.edu
barrick at myxo.css.msu.edu
Sun Oct 14 18:14:00 PDT 2007
Author: barrick
Date: 2007-10-14 21:14:00 -0400 (Sun, 14 Oct 2007)
New Revision: 2140
Modified:
development/source/main/cAvidaConfig.h
development/source/main/cPhenotype.cc
development/support/config/avida.cfg
Log:
Minor change to how MERIT_DEFAULT_BONUS works -- shouldn't be noticed by anyone using it.
Modified: development/source/main/cAvidaConfig.h
===================================================================
--- development/source/main/cAvidaConfig.h 2007-10-12 20:44:11 UTC (rev 2139)
+++ development/source/main/cAvidaConfig.h 2007-10-15 01:14:00 UTC (rev 2140)
@@ -378,7 +378,7 @@
CONFIG_ADD_VAR(BASE_MERIT_METHOD, int, 4, "0 = Constant (merit 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\n6 = Merit prop. to num times MERIT_BONUS_INST is in genome.");
CONFIG_ADD_VAR(BASE_CONST_MERIT, int, 100, "Base merit when BASE_MERIT_METHOD set to 0");
CONFIG_ADD_VAR(DEFAULT_BONUS, double, 1.0, "Initial bonus before any tasks");
- CONFIG_ADD_VAR(MERIT_DEFAULT_BONUS, int, 0, "Scale the merit of an offspring by the default bonus\nrather than the accumulated bonus of the parent?");
+ CONFIG_ADD_VAR(MERIT_DEFAULT_BONUS, int, 0, "Scale the merit of an offspring by this default bonus\nrather than the accumulated bonus of the parent? 0 = off");
CONFIG_ADD_VAR(MERIT_BONUS_INST, int, 0, "in BASE_MERIT_METHOD 6, this sets which instruction counts\n(-1 = none, 0 = First in INST_SET.)");
CONFIG_ADD_VAR(MERIT_BONUS_EFFECT, int, 0, "in BASE_MERIT_METHOD 6, this sets how much merit is earned\nper instruction (-1 = penalty, 0 = no effect.)");
CONFIG_ADD_VAR(FITNESS_METHOD, int, 0, "0 = default, >1 = experimental");
Modified: development/source/main/cPhenotype.cc
===================================================================
--- development/source/main/cPhenotype.cc 2007-10-12 20:44:11 UTC (rev 2139)
+++ development/source/main/cPhenotype.cc 2007-10-15 01:14:00 UTC (rev 2140)
@@ -537,7 +537,7 @@
// and it will also be propagated to the child
const int merit_default_bonus = m_world->GetConfig().MERIT_DEFAULT_BONUS.Get();
if (merit_default_bonus) {
- cur_bonus = m_world->GetConfig().DEFAULT_BONUS.Get();
+ cur_bonus = merit_default_bonus;
}
merit = cur_merit_base * cur_bonus;
@@ -682,7 +682,7 @@
int cur_merit_base = CalcSizeMerit();
const int merit_default_bonus = m_world->GetConfig().MERIT_DEFAULT_BONUS.Get();
if (merit_default_bonus) {
- cur_bonus = m_world->GetConfig().DEFAULT_BONUS.Get();
+ cur_bonus = merit_default_bonus;
}
merit = cur_merit_base * cur_bonus;
@@ -1442,7 +1442,7 @@
// and it will also be propagated to the child
int merit_default_bonus = m_world->GetConfig().MERIT_DEFAULT_BONUS.Get();
if (merit_default_bonus) {
- cur_bonus = m_world->GetConfig().DEFAULT_BONUS.Get();
+ cur_bonus = merit_default_bonus;
}
merit = cur_merit_base * cur_bonus;
@@ -1565,7 +1565,7 @@
// and it will also be propagated to the child
const int merit_default_bonus = m_world->GetConfig().MERIT_DEFAULT_BONUS.Get();
if (merit_default_bonus) {
- cur_bonus = m_world->GetConfig().DEFAULT_BONUS.Get();
+ cur_bonus = merit_default_bonus;
}
merit = cur_merit_base * cur_bonus;
Modified: development/support/config/avida.cfg
===================================================================
--- development/support/config/avida.cfg 2007-10-12 20:44:11 UTC (rev 2139)
+++ development/support/config/avida.cfg 2007-10-15 01:14:00 UTC (rev 2140)
@@ -185,8 +185,8 @@
# 6 = Merit prop. to num times MERIT_BONUS_INST is in genome.
BASE_CONST_MERIT 100 # Base merit when BASE_MERIT_METHOD set to 0
DEFAULT_BONUS 1.0 # Initial bonus before any tasks
-MERIT_DEFAULT_BONUS 0 # Scale the merit of an offspring by the default bonus
- # rather than the accumulated bonus of the parent?
+MERIT_DEFAULT_BONUS 0 # Scale the merit of an offspring by this default bonus
+ # rather than the accumulated bonus of the parent? 0 = off
MERIT_BONUS_INST 0 # in BASE_MERIT_METHOD 6, this sets which instruction counts
# (-1 = none, 0 = First in INST_SET.)
MERIT_BONUS_EFFECT 0 # in BASE_MERIT_METHOD 6, this sets how much merit is earned
@@ -325,17 +325,20 @@
PROMOTER_INST_MAX 0 # Maximum number of instructions to execute before terminating. 0 = off
PROMOTER_PROCESSIVITY 1.0 # Chance of not terminating after each cpu cycle.
PROMOTER_PROCESSIVITY_INST 1.0 # Chance of not terminating after each instruction.
+PROMOTER_TO_REGISTER 0 # Place a promoter's base bit code in register BX when starting execution from it?
TERMINATION_RESETS 0 # Does termination reset the thread's state?
NO_ACTIVE_PROMOTER_EFFECT 0 # What happens when there are no active promoters?
# 0 = Start execution at the beginning of the genome.
# 1 = Kill the organism.
# 2 = Stop the organism from executing any further instructions.
-PROMOTER_EXE_LENGTH 4 # Length of promoter windows used to determine execution.
-PROMOTER_EXE_THRESHOLD 3 # Minimum number of bits that must be set in a promoter window to allow execution.
-INST_CODE_LENGTH 4 # Instruction binary code length (number of bits)
+PROMOTER_CODE_SIZE 24 # Size of a promoter code in bits. (Maximum value is 32)
+PROMOTER_EXE_LENGTH 3 # Length of promoter windows used to determine execution.
+PROMOTER_EXE_THRESHOLD 2 # Minimum number of bits that must be set in a promoter window to allow execution.
+INST_CODE_LENGTH 3 # Instruction binary code length (number of bits)
INST_CODE_DEFAULT_TYPE 0 # Default value of instruction binary code value.
# 0 = All zeros
# 1 = Based off the instruction number
+CONSTITUTIVE_REGULATION 0 # Sense a new regulation value before each CPU cycle?
### COLORS_GROUP ###
# Output colors for when data files are printed in HTML mode.
More information about the Avida-cvs
mailing list