From 230e1a03d1e35eda5bd0f025e1415583b4d765ea Mon Sep 17 00:00:00 2001 From: mac Date: Thu, 20 Apr 2000 11:11:58 +0000 Subject: [PATCH] removed reference to rint() (what does this function do anyway? it is not ANSI and defined nowhere in eo!) --- eo/src/eoInclusion.h | 2 +- eo/src/eoInsertion.h | 2 +- eo/src/eoMerge.h | 2 +- eo/src/eoScheme.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eo/src/eoInclusion.h b/eo/src/eoInclusion.h index c4e17a17..cc84cdaf 100644 --- a/eo/src/eoInclusion.h +++ b/eo/src/eoInclusion.h @@ -38,7 +38,7 @@ template class eoInclusion: public eoMerge */ void operator()(eoPop& breeders, eoPop& pop) { - unsigned target = min(static_cast(rint(pop.size() * rate())), + unsigned target = min(static_cast(pop.size() * rate()), pop.size() + breeders.size()); copy(breeders.begin(), breeders.end(), diff --git a/eo/src/eoInsertion.h b/eo/src/eoInsertion.h index 4f1b8a20..6f9616a8 100644 --- a/eo/src/eoInsertion.h +++ b/eo/src/eoInsertion.h @@ -59,7 +59,7 @@ template class eoInsertion: public eoMerge */ void operator()( eoPop& _breeders, eoPop& _pop) { - unsigned target = static_cast(rint(_pop.size() * rate())); + unsigned target = static_cast((_pop.size() * rate())); _pop.swap(_breeders); diff --git a/eo/src/eoMerge.h b/eo/src/eoMerge.h index 77b89d51..82cf0768 100644 --- a/eo/src/eoMerge.h +++ b/eo/src/eoMerge.h @@ -54,7 +54,7 @@ template class eoMerge: public eoBinPopOp */ void operator()( eoPop& _breeders, eoPop& _pop) { - unsigned target = static_cast(rint(_pop.size() * rate())); + unsigned target = static_cast(_pop.size() * rate()); _pop.swap(_breeders); diff --git a/eo/src/eoScheme.h b/eo/src/eoScheme.h index be074e28..5920fdb6 100644 --- a/eo/src/eoScheme.h +++ b/eo/src/eoScheme.h @@ -229,7 +229,7 @@ class eoScheme: public eoAlgo{ // everyting is read: now the consistency checks and other preliminary steps nb_offspring = (nb_offspring ? nb_offspring : - (int) rint (rate_offspring * popsize) ); + (int) (rate_offspring * popsize) ); if (!nb_offspring) nb_offspring = 1; /* al least one offspring */