Changed all variables named howmany into combien (French for how many)

because of a silly problem on Solaris (howmany seems to be some macro???)
This commit is contained in:
evomarc 2001-04-11 12:01:51 +00:00
commit 64990a1ac4
3 changed files with 22 additions and 23 deletions

View file

@ -55,18 +55,18 @@ class eoInitFixedLength: public eoInit<EOT>
typedef typename EOT::AtomType AtomType;
eoInitFixedLength(unsigned _howmany, eoRndGenerator<AtomType>& _generator)
: howmany(_howmany), generator(_generator) {}
eoInitFixedLength(unsigned _combien, eoRndGenerator<AtomType>& _generator)
: combien(_combien), generator(_generator) {}
void operator()(EOT& chrom)
{
chrom.resize(howmany);
chrom.resize(combien);
std::generate(chrom.begin(), chrom.end(), generator);
chrom.invalidate();
}
private :
unsigned howmany;
unsigned combien;
/// generic wrapper for eoFunctor (s), to make them have the function-pointer style copy semantics
eoSTLF<AtomType> generator;
};
@ -87,8 +87,7 @@ class eoInitVariableLength: public eoInit<EOT>
void operator()(EOT& chrom)
{
unsigned howmany = offset + rng.random(extent);
chrom.resize(howmany);
chrom.resize(offset + rng.random(extent));
generate(chrom.begin(), chrom.end(), generator);
chrom.invalidate();
}