From 6d61aa2811d54016722c90af245eff27ccdc6217 Mon Sep 17 00:00:00 2001 From: mac Date: Sun, 9 Apr 2000 10:05:55 +0000 Subject: [PATCH] Updated eoBreeder to use the even newer general operator interface --- eo/src/eoBreeder.h | 6 +++--- eo/src/eoOpSelector.h | 2 +- eo/src/eoRandomIndiSelector.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eo/src/eoBreeder.h b/eo/src/eoBreeder.h index eedc14e9..f7d08351 100644 --- a/eo/src/eoBreeder.h +++ b/eo/src/eoBreeder.h @@ -35,8 +35,8 @@ #include // eoTransform #include // eoOpSelector -#include "eoRandomIndiSelector.h" -#include "eoBackInserter.h" +#include +#include using namespace std; @@ -93,7 +93,7 @@ template class eoBreeder: public eoMonPopOp eoRandomIndiSelector selector; eoBackInserter inserter; - (*Gop)(selector.init(pop, orgsize, i), inserter.bind(pop)); + (*Gop)(selector.bind(pop, orgsize, i), inserter.bind(pop)); break; } } diff --git a/eo/src/eoOpSelector.h b/eo/src/eoOpSelector.h index 8088c8a3..82be4732 100644 --- a/eo/src/eoOpSelector.h +++ b/eo/src/eoOpSelector.h @@ -64,7 +64,7 @@ public: modified or whatever @param _id a previously assigned ID @throw runtime_exception if the ID does not exist*/ - virtual const eoOp& getOp( ID _id ) = 0; + virtual eoOp& getOp( ID _id ) = 0; /** Remove an operator from the operator set @param _id a previously assigned ID diff --git a/eo/src/eoRandomIndiSelector.h b/eo/src/eoRandomIndiSelector.h index 8d9a0ccd..990c6c4a 100644 --- a/eo/src/eoRandomIndiSelector.h +++ b/eo/src/eoRandomIndiSelector.h @@ -26,7 +26,7 @@ #ifndef eoRandomIndiSelector_h #define eoRandomIndiSelector_h -#include "eoIndiSelector.h" +#include /** \ingroup selectors