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

Changed all "float" to "double"

Browse source 
But more than that, this is a test of CVS for me
Marc
This commit is contained in:
marc 2000-02-16 04:40:20 +00:00
commit cbc26ed5b2
1 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

42
eo/src/eoLottery.h
View file

@ -30,36 +30,33 @@
#include <functional> // #include <functional> //
#include <numeric> // accumulate #include <numeric> // accumulate
#include <eo> // eoPop eoSelect MINFLOAT #include "eoPopOps.h"
#include "eoRNG.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
/** eoLottery: a selection method. Puts into the output a group of individuals /// eoLottery: a selection method.
selected using lottery; individuals with higher probability will have more /// requires EOT::Fitness to be float castable
chances of being selected.
Requires EOT::Fitness to be float castable
*/
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
template<class EOT> class eoLottery: public eoBinPopOp<EOT> template<class EOT> class eoLottery: public eoBinPopOp<EOT>
{ {
public: public:
/// (Default) Constructor. /// (Default) Constructor.
eoLottery(const float& _rate = 1.0): rate(_rate) {} eoLottery(const double & _rate = 1.0): rate(_rate) {}
/** actually selects individuals from pop and pushes them back them into breeders /** actually selects individuals from pop and put them into breeders
* until breeders has the right size: rate*pop.size() * until breeders has the right size: rate*pop.size()
* BUT what happens if breeders is already too big? * BUT what happens if breeders is already too big?
* Too big for what? */
*/
void operator()( eoPop<EOT>& pop, eoPop<EOT>& breeders) void operator()( eoPop<EOT>& pop, eoPop<EOT>& breeders)
{ {
// scores of chromosomes // scores of chromosomes
vector<float> score(pop.size()); vector<double> score(pop.size());
// calculates total scores for chromosomes // calculates total scores for chromosomes
float total = 0; double total = 0;
for (unsigned i = 0; i < pop.size(); i++) { for (unsigned i = 0; i < pop.size(); i++) {
score[i] = static_cast<float>(pop[i].fitness()); score[i] = static_cast<double>(pop[i].fitness());
total += score[i]; total += score[i];
} }
@ -77,9 +74,22 @@ template<class EOT> class eoLottery: public eoBinPopOp<EOT>
breeders.push_back(pop[indloc]); breeders.push_back(pop[indloc]);
} }
} }
/// accessor to private rate
double Rate() {return rate;}
/** @name Methods from eoObject */
//@{
/** readFrom and printOn inherited from eoMerge */
/** Inherited from eoObject. Returns the class name.
@see eoObject
*/
virtual string className() const {return "eoLottery";};
//@}
private: private:
float rate; // selection rate double rate; // selection rate
}; };
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------