From 2ade1412c6fc7a9b35be0b47742327a7a8ce8151 Mon Sep 17 00:00:00 2001 From: liefooga Date: Fri, 23 Feb 2007 15:03:48 +0000 Subject: [PATCH] modif moeoSelectOneFromPopAndArch.h en moeoSelectFromPopAndArch.h git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@197 331e1502-861f-0410-8da2-ba01fb791d7f --- ...lectOneFromPopAndArch.h => moeoSelectFromPopAndArch.h} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename branches/paradiseo-moeo-1.0/src/{moeoSelectOneFromPopAndArch.h => moeoSelectFromPopAndArch.h} (85%) diff --git a/branches/paradiseo-moeo-1.0/src/moeoSelectOneFromPopAndArch.h b/branches/paradiseo-moeo-1.0/src/moeoSelectFromPopAndArch.h similarity index 85% rename from branches/paradiseo-moeo-1.0/src/moeoSelectOneFromPopAndArch.h rename to branches/paradiseo-moeo-1.0/src/moeoSelectFromPopAndArch.h index aac1b0641..954e9b85a 100644 --- a/branches/paradiseo-moeo-1.0/src/moeoSelectOneFromPopAndArch.h +++ b/branches/paradiseo-moeo-1.0/src/moeoSelectFromPopAndArch.h @@ -1,7 +1,7 @@ // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*- //----------------------------------------------------------------------------- -// moeoSelectOneFormPopAndArch.h +// moeoSelectFormPopAndArch.h // (c) OPAC Team (LIFL), Dolphin Project (INRIA), 2007 /* This library... @@ -23,7 +23,7 @@ * Elitist selection process that consists in choosing individuals in the archive as well as in the current population. */ template < class MOEOT > -class moeoSelectOneFromPopAndArch : public moeoSelectOne < MOEOT > +class moeoSelectFromPopAndArch : public moeoSelectOne < MOEOT > { public: @@ -34,7 +34,7 @@ public: * @param _arch the archive * @param _ratioFromPop the ratio of selected individuals from the population */ - moeoSelectOneFromPopAndArch (moeoSelectOne < MOEOT > & _popSelectOne, moeoSelectOne < MOEOT > _archSelectOne, moeoArchive < MOEOT > & _arch, double _ratioFromPop=0.5) + moeoSelectFromPopAndArch (moeoSelectOne < MOEOT > & _popSelectOne, moeoSelectOne < MOEOT > _archSelectOne, moeoArchive < MOEOT > & _arch, double _ratioFromPop=0.5) : popSelectOne(_popSelectOne), archSelectOne(_archSelectOne), arch(_arch), ratioFromPop(_ratioFromPop) {} @@ -44,7 +44,7 @@ public: * @param _arch the archive * @param _ratioFromPop the ratio of selected individuals from the population */ - moeoSelectOneFromPopAndArch (moeoSelectOne < MOEOT > & _popSelectOne, moeoArchive < MOEOT > & _arch, double _ratioFromPop=0.5) + moeoSelectFromPopAndArch (moeoSelectOne < MOEOT > & _popSelectOne, moeoArchive < MOEOT > & _arch, double _ratioFromPop=0.5) : popSelectOne(_popSelectOne), archSelectOne(randomSelectOne), arch(_arch), ratioFromPop(_ratioFromPop) {}