[Avida-SVN] r2313 - in development/tests: energy_asex_1000u/config energy_deme_level_res/config

[beckma24 at myxo.css.msu.edu]

Author: beckma24
Date: 2008-02-08 11:52:23 -0500 (Fri, 08 Feb 2008)
New Revision: 2313

Modified:
   development/tests/energy_asex_1000u/config/avida.cfg
   development/tests/energy_deme_level_res/config/avida.cfg
Log:
Fixed energy tests

Modified: development/tests/energy_asex_1000u/config/avida.cfg
===================================================================
--- development/tests/energy_asex_1000u/config/avida.cfg	2008-02-08 16:32:52 UTC (rev 2312)
+++ development/tests/energy_asex_1000u/config/avida.cfg	2008-02-08 16:52:23 UTC (rev 2313)
@@ -226,8 +226,8 @@
 ENERGY_ENABLED 1                       # Enable Energy Model. 0/1 (off/on)
 ENERGY_GIVEN_ON_INJECT 100000               # Energy given to organism upon injection.
 ENERGY_GIVEN_AT_BIRTH 0.0                # Energy given to offspring upon birth.
-FRAC_PARENT_ENERGY_GIVEN_AT_BIRTH 0.5  # Fraction of energy given to offspring.
-FRAC_ENERGY_DECAY_AT_BIRTH 0.05         # Fraction of energy lost due to decay during reproduction.
+FRAC_PARENT_ENERGY_GIVEN_TO_ORG_AT_BIRTH 0.5  # Fraction of energy given to offspring.
+FRAC_ENERGY_DECAY_AT_ORG_BIRTH 0.05         # Fraction of energy lost due to decay during reproduction.
 NUM_INST_EXC_BEFORE_0_ENERGY 1000000         # Number of instructions executed before energy is exhausted.
 ENERGY_CAP -1                          # Maximun amount of energy that can be stored in an organism.  -1 means the cap is set to Max Int
 ENERGY_VERBOSE 0                       # Print energy and merit values. 0/1 (off/on)

Modified: development/tests/energy_deme_level_res/config/avida.cfg
===================================================================
--- development/tests/energy_deme_level_res/config/avida.cfg	2008-02-08 16:32:52 UTC (rev 2312)
+++ development/tests/energy_deme_level_res/config/avida.cfg	2008-02-08 16:52:23 UTC (rev 2313)
@@ -249,8 +249,9 @@
 ENERGY_ENABLED 1                       # Enable Energy Model. 0/1 (off/on)
 ENERGY_GIVEN_ON_INJECT 100000               # Energy given to organism upon injection.
 ENERGY_GIVEN_AT_BIRTH 0.0                # Energy given to offspring upon birth.
-FRAC_PARENT_ENERGY_GIVEN_AT_BIRTH 0.5  # Fraction of energy given to offspring.
-FRAC_ENERGY_DECAY_AT_BIRTH 0.05         # Fraction of energy lost due to decay during reproduction.
+FRAC_PARENT_ENERGY_GIVEN_TO_ORG_AT_BIRTH 0.5  # Fraction of energy given to offspring.
+FRAC_ENERGY_DECAY_AT_ORG_BIRTH 0.05         # Fraction of energy lost due to decay during reproduction.
+FRAC_ENERGY_DECAY_AT_DEME_BIRTH 1.0
 NUM_INST_EXC_BEFORE_0_ENERGY 1000000         # Number of instructions executed before energy is exhausted.
 ENERGY_CAP -1                          # Maximun amount of energy that can be stored in an organism.  -1 means the cap is set to Max Int
 ENERGY_VERBOSE 0                       # Print energy and merit values. 0/1 (off/on)