nojhan/eodev
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

I had left a flaw in teh Ctor (did not accept rates >1)

Browse source
This commit is contained in:
evomarc 2002-07-06 05:23:18 +00:00
commit a7a1ed2326
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
eo/src/utils/eoHowMany.h
View file

@ -38,11 +38,11 @@
* allows one to modify the population size without touching anything else. * allows one to modify the population size without touching anything else.
* *
* There are 4 possible way to compute the return value from the argument: * There are 4 possible way to compute the return value from the argument:
* - an absolute POSITIVE integer --> return rate (regardless of popsize) * - an absolute POSITIVE integer --> return it (regardless of popsize)
* - a POSITIVE rate -> return rate*popSize * - a POSITIVE rate --> return rate*popSize
* - an absolute NEGATIVE integer --> return popsize-rate * - an absolute NEGATIVE integer --> return popsize-rate (if positive)
* - a NEGATIVE rate -> return (1-rate)*popSize * - a NEGATIVE rate in [-1,0] --> store and use 1-|rate| (positive)
* Note that a negative rate should be unnecessary because a rate is * Note that a negative rate should be have been necessary because a rate is
* relative, but it is there for consistency reasons - and because it * relative, but it is there for consistency reasons - and because it
* is needed in <a href="classeo_g3_replacement_h-source.html">eoG3Replacement</a> * is needed in <a href="classeo_g3_replacement_h-source.html">eoG3Replacement</a>
* *
@ -77,9 +77,11 @@ public:
if (_interpret_as_rate) if (_interpret_as_rate)
{ {
if (_rate<0) if (_rate<0)
rate = 1.0-rate; {
if (rate > 1.0) rate = 1.0+_rate;
throw std::logic_error("rate>1 in eoHowMany!"); if (rate < 0) // was < -1
throw std::logic_error("rate<-1 in eoHowMany!");
}
} }
else else
{ {