From 49b35da8f920f5f8df58192fdb4adf32bd6d301f Mon Sep 17 00:00:00 2001 From: gustavo Date: Tue, 28 Sep 1999 10:26:39 +0000 Subject: [PATCH] finish eoGeneration... still to be tested --- eo/src/eoGeneration.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/eo/src/eoGeneration.h b/eo/src/eoGeneration.h index 80aa24ff..f604d02c 100644 --- a/eo/src/eoGeneration.h +++ b/eo/src/eoGeneration.h @@ -14,24 +14,23 @@ // eoGeneration //----------------------------------------------------------------------------- -template class eoGeneration: public eoTransform +template class eoGeneration { public: /// Constructor. - eoGeneration(eoSelect& _select, + eoGeneration(eoSelect& _select, eoTranform& _transform, - eoMerge& _replace): - eoTransform() {} + eoMerge& _replace): + select(_select), transform(_transform), replace(_replace) {} - /** - * - */ + /// apply one generation of evolution to the population void operator()(eoPop& pop) { eoPop breeders; select(pop, breeders); transform(breeders); + for_each(pop.begin(), pop.end(), Chrom::Fitness); replace(breeders, pop); }