[Avida-cvs] avida/current/source/main CVS commit

[Claus Wilke]

Update of /cvsroot/avida/avida/current/source/main
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13438/source/main

Modified Files:
	config.cc config.hh phenotype.cc population.hh 
	resource_count.hh 
Log Message:
This patch contains two changes: 

1. Added two new events "inject_scaled_resource" and
   "outflow_scaled_resource" that allow inflow and outflow of
   resources scaled with average merit of the population.

2. Added support for more customization of the merit system. First, I
   fixed usage of the config option BASE_SIZE_MERIT (it was previously
   ignored). The default BASE_SIZE_MERIT is 100, in agreement with the
   value that was previously hardcoded. Second, I added a config
   option DEFAULT_BONUS, with default value 1. The default bonus is
   the value to which bonuses are multiplied or added. It was
   previously hardcoded to 1, but with additive bonuses, a default
   bonus of 0 can make sense.