From cb34e81feeef94a4615e82617bb85ccad10f087a Mon Sep 17 00:00:00 2001 From: liefooga Date: Mon, 26 Feb 2007 16:21:06 +0000 Subject: [PATCH] Generational replacement update git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@199 331e1502-861f-0410-8da2-ba01fb791d7f --- .../src/moeoGenerationalReplacement.h | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/branches/paradiseo-moeo-1.0/src/moeoGenerationalReplacement.h b/branches/paradiseo-moeo-1.0/src/moeoGenerationalReplacement.h index 99e7b9024..b85d12000 100644 --- a/branches/paradiseo-moeo-1.0/src/moeoGenerationalReplacement.h +++ b/branches/paradiseo-moeo-1.0/src/moeoGenerationalReplacement.h @@ -13,13 +13,27 @@ #ifndef MOEOGENERATIONALREPLACEMENT_H_ #define MOEOGENERATIONALREPLACEMENT_H_ -#include -#include +#include +#include /** * Generational replacement: only the new individuals are preserved. */ template < class MOEOT > -class moeoGenerationalReplacement : public moeoReplacement < MOEOT >, public eoGenerationalReplacement < MOEOT > {}; +class moeoGenerationalReplacement : public moeoReplacement < MOEOT >, public eoGenerationalReplacement < MOEOT > +{ +public: + + /** + * Swaps _parents and _offspring + * @param _parents the parents population + * @param _offspring the offspring population + */ + void operator()(eoPop < MOEOT > & _parents, eoPop < MOEOT > & _offspring) + { + eoGenerationalReplacement < MOEOT >::operator ()(_parents, _offspring); + } + +}; #endif /*MOEOGENERATIONALREPLACEMENT_H_*/