[Avida-SVN] r2156 - in branches/collect: source/main support/config

[blwalker at myxo.css.msu.edu]

Author: blwalker
Date: 2007-10-29 11:36:03 -0400 (Mon, 29 Oct 2007)
New Revision: 2156

Modified:
   branches/collect/source/main/cAvidaConfig.h
   branches/collect/support/config/avida.cfg
Log:

Updating description of hoarding config options and adding them to the default-generated config file.

Only in this branch -- does not clutter up anybody else's config files more than they already are.  Don't kill me.


Modified: branches/collect/source/main/cAvidaConfig.h
===================================================================
--- branches/collect/source/main/cAvidaConfig.h	2007-10-29 14:07:29 UTC (rev 2155)
+++ branches/collect/source/main/cAvidaConfig.h	2007-10-29 15:36:03 UTC (rev 2156)
@@ -432,13 +432,13 @@
   CONFIG_ADD_VAR(BUY_PRICE, int, 0, "price offered by organisms attempting to buy");
   CONFIG_ADD_VAR(SELL_PRICE, int, 0, "price offered by organisms attempting to sell");
   
-  CONFIG_ADD_GROUP(HOARD_RESOURCE_GROUP, "Resource Hoarding Parameters\n These have no effect unless the organisms are using the collect instruction.  DO NOT USE with hardwares other than the \"original\".");
-  CONFIG_ADD_VAR(USE_RESOURCE_BINS, bool, 0, "Use resources stored in resource bins.  Unless the collect instruction is availible to the organisms, this will have no effect on organism behavior.  (Even when on, this only happens when there is no appropriate resource in the environment.)  Also controls output of resource bin contents, so you aren't bothered with them if you're not using them.");
-  CONFIG_ADD_VAR(ABSORB_RESOURCE_FRACTION, double, .0025, "Fraction of available environmental resource an organism absorbs with the collect command");
+  CONFIG_ADD_GROUP(HOARD_RESOURCE_GROUP, "Resource Hoarding Parameters \nDO NOT USE with hardwares other than the \"original\".");
+  CONFIG_ADD_VAR(USE_RESOURCE_BINS, bool, 0, "Use resources stored in resource bins.");
+  CONFIG_ADD_VAR(ABSORB_RESOURCE_FRACTION, double, .0025, "Fraction of available environmental resource an organism absorbs with the collect instruction.");
   CONFIG_ADD_VAR(MULTI_ABSORB_TYPE, int, 0, "What to do if collect is called on a range of resources.\n 0 = absorb a random resource in the range\n 1 = absorb the first resource in the range\n 2 = absorb the last resource in the range\n 3 = absorb ABSORB_RESOURCE_FRACTION / (# of resources in range) of each resource in the range");
   CONFIG_ADD_VAR(MAX_TOTAL_STORED, double, -1, "Maximum total amount of all resources an organism can store.\n <0 = no maximum");
-  CONFIG_ADD_VAR(USE_STORED_FRACTION, double, 1.0, "The fraction of stored resource to use when there is no environmental resource available");
-  CONFIG_ADD_VAR(RETURN_STORED_ON_DEATH, bool, 1, "Return an organism's stored resources to the world when it dies");
+  CONFIG_ADD_VAR(USE_STORED_FRACTION, double, 1.0, "The fraction of stored resource to use.");
+  CONFIG_ADD_VAR(RETURN_STORED_ON_DEATH, bool, 1, "Return an organism's stored resources to the world when it dies?");
   
   CONFIG_ADD_GROUP(ANALYZE_GROUP, "Analysis Settings");
   CONFIG_ADD_VAR(MAX_CONCURRENCY, int, -1, "Maximum number of analyze threads, -1 == use all available.");

Modified: branches/collect/support/config/avida.cfg
===================================================================
--- branches/collect/support/config/avida.cfg	2007-10-29 14:07:29 UTC (rev 2155)
+++ branches/collect/support/config/avida.cfg	2007-10-29 15:36:03 UTC (rev 2156)
@@ -292,6 +292,23 @@
 BUY_PRICE 0      # price offered by organisms attempting to buy
 SELL_PRICE 0     # price offered by organisms attempting to sell
 
+### HOARD_RESOURCE_GROUP ###
+# Resource Hoarding Parameters
+# DO NOT USE with hardwares other than the "original".
+USE_RESOURCE_BINS 0							# Use resources stored in resource bins.
+ABSORB_RESOURCE_FRACTION .0025	# Fraction of available environmental resource 
+																# an organism absorbs with the collect 
+																# instruction.
+MULTI_ABSORB_TYPE 0							# What to do if collect is called on a range of resources.
+																# 0 = absorb a random resource in the range
+																# 1 = absorb the first resource in the range
+																# 2 = absorb the last resource in the range
+																# 3 = absorb ABSORB_RESOURCE_FRACTION / (# of resources in range) of each resource in the range
+MAX_TOTAL_STORED -1							# Maximum total amount of all resources an organism can store.
+																# < 0 = no maximum
+USE_STORED_FRACTION 1.0					# The fraction of stored resource to use.
+RETURN_STORED_ON_DEATH 1				# Return an organism's stored resources to the world when it dies?
+
 ### ANALYZE_GROUP ###
 # Analysis Settings
 MAX_CONCURRENCY -1  # Maximum number of analyze threads, -1 == use all available.