From 9b7556d81e93488dcab31808a4b621bcca35702c Mon Sep 17 00:00:00 2001 From: evomarc Date: Thu, 8 Nov 2001 06:14:59 +0000 Subject: [PATCH] I have changed all calls to use an eoParser rather than an eoParameterLoader This is required if you want to use the method getParamWithLongName that allows one to get a value of a parameter read somewhere else. After changing 3 calls due to that, I decided to change ALL calls within the make_xxx functions --- eo/src/do/make_algo_scalar.h | 2 +- eo/src/do/make_checkpoint.h | 2 +- eo/src/do/make_checkpoint_FDC.h | 2 +- eo/src/do/make_continue.h | 2 +- eo/src/es/eoEsMutationInit.h | 4 +-- eo/src/es/make_algo_scalar_es.cpp | 12 ++++---- eo/src/es/make_algo_scalar_real.cpp | 4 +-- eo/src/es/make_checkpoint_es.cpp | 12 ++++---- eo/src/es/make_checkpoint_real.cpp | 4 +-- eo/src/es/make_es.h | 48 ++++++++++++++--------------- eo/src/es/make_genotype_es.cpp | 12 ++++---- eo/src/es/make_genotype_real.cpp | 4 +-- eo/src/es/make_op_es.cpp | 12 ++++---- eo/src/es/make_op_es.h | 2 +- eo/src/es/make_op_real.cpp | 4 +-- eo/src/es/make_op_real.h | 2 +- eo/src/es/make_real.h | 16 +++++----- eo/src/ga/make_algo_scalar_ga.cpp | 4 +-- eo/src/ga/make_checkpoint_ga.cpp | 4 +-- eo/src/ga/make_ga.h | 16 +++++----- eo/src/ga/make_genotype_ga.cpp | 4 +-- eo/src/ga/make_genotype_ga.h | 18 +++++++++-- eo/src/ga/make_op.h | 2 +- eo/src/ga/make_op_ga.cpp | 4 +-- 24 files changed, 104 insertions(+), 92 deletions(-) diff --git a/eo/src/do/make_algo_scalar.h b/eo/src/do/make_algo_scalar.h index 3830bdde..fed479b7 100644 --- a/eo/src/do/make_algo_scalar.h +++ b/eo/src/do/make_algo_scalar.h @@ -70,7 +70,7 @@ */ template -eoAlgo & do_make_algo_scalar(eoParameterLoader& _parser, eoState& _state, eoEvalFunc& _eval, eoContinue& _continue, eoGenOp& _op) +eoAlgo & do_make_algo_scalar(eoParser& _parser, eoState& _state, eoEvalFunc& _eval, eoContinue& _continue, eoGenOp& _op) { // the selection eoValueParam& selectionParam = _parser.createParam(eoParamParamType("DetTour(2)"), "selection", "Selection: Roulette, DetTour(T), StochTour(t) or Sequential(ordered/unordered)", 'S', "Evolution Engine"); diff --git a/eo/src/do/make_checkpoint.h b/eo/src/do/make_checkpoint.h index 28299706..b0852c0b 100644 --- a/eo/src/do/make_checkpoint.h +++ b/eo/src/do/make_checkpoint.h @@ -40,7 +40,7 @@ bool testDirRes(std::string _dirName, bool _erase); template -eoCheckPoint& do_make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter& _eval, eoContinue& _continue) +eoCheckPoint& do_make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter& _eval, eoContinue& _continue) { // first, create a checkpoint from the eoContinue eoCheckPoint *checkpoint = new eoCheckPoint(_continue); diff --git a/eo/src/do/make_checkpoint_FDC.h b/eo/src/do/make_checkpoint_FDC.h index d9a60746..fc8792f2 100644 --- a/eo/src/do/make_checkpoint_FDC.h +++ b/eo/src/do/make_checkpoint_FDC.h @@ -40,7 +40,7 @@ bool testDirRes(std::string _dirName, bool _erase); template -eoCheckPoint& do_make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter& _eval, eoContinue& _continue) +eoCheckPoint& do_make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter& _eval, eoContinue& _continue) { // first, create a checkpoint from the eoContinue eoCheckPoint *checkpoint = new eoCheckPoint(_continue); diff --git a/eo/src/do/make_continue.h b/eo/src/do/make_continue.h index 8bb8d743..3531c619 100644 --- a/eo/src/do/make_continue.h +++ b/eo/src/do/make_continue.h @@ -60,7 +60,7 @@ eoCombinedContinue * make_combinedContinue(eoCombinedContinue *_comb } template -eoContinue & do_make_continue(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter & _eval) +eoContinue & do_make_continue(eoParser& _parser, eoState& _state, eoEvalFuncCounter & _eval) { //////////// Stopping criterion /////////////////// // the combined continue - to be filled diff --git a/eo/src/es/eoEsMutationInit.h b/eo/src/es/eoEsMutationInit.h index 86f58c1e..79472138 100644 --- a/eo/src/es/eoEsMutationInit.h +++ b/eo/src/es/eoEsMutationInit.h @@ -47,7 +47,7 @@ class eoEsMutationInit { public : - eoEsMutationInit(eoParameterLoader& _parser, + eoEsMutationInit(eoParser& _parser, std::string _section="ES mutation parameters" ) : parser(_parser), repSection(_section), TauLclParam(0), TauGlbParam(0), TauBetaParam(0) {} @@ -101,7 +101,7 @@ class eoEsMutationInit private : - eoParameterLoader& parser; + eoParser& parser; std::string repSection; eoValueParam* TauLclParam; eoValueParam* TauGlbParam; diff --git a/eo/src/es/make_algo_scalar_es.cpp b/eo/src/es/make_algo_scalar_es.cpp index b952770e..5decab96 100644 --- a/eo/src/es/make_algo_scalar_es.cpp +++ b/eo/src/es/make_algo_scalar_es.cpp @@ -46,34 +46,34 @@ // Algo /////// -eoAlgo >& make_algo_scalar(eoParameterLoader& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _continue, eoGenOp >& _op) +eoAlgo >& make_algo_scalar(eoParser& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _continue, eoGenOp >& _op) { return do_make_algo_scalar(_parser, _state, _eval, _continue, _op); } -eoAlgo >& make_algo_scalar(eoParameterLoader& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _continue, eoGenOp >& _op) +eoAlgo >& make_algo_scalar(eoParser& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _continue, eoGenOp >& _op) { return do_make_algo_scalar(_parser, _state, _eval, _continue, _op); } ////////////// -eoAlgo >& make_algo_scalar(eoParameterLoader& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _continue, eoGenOp >& _op) +eoAlgo >& make_algo_scalar(eoParser& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _continue, eoGenOp >& _op) { return do_make_algo_scalar(_parser, _state, _eval, _continue, _op); } -eoAlgo >& make_algo_scalar(eoParameterLoader& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _continue, eoGenOp >& _op) +eoAlgo >& make_algo_scalar(eoParser& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _continue, eoGenOp >& _op) { return do_make_algo_scalar(_parser, _state, _eval, _continue, _op); } /////////////// -eoAlgo >& make_algo_scalar(eoParameterLoader& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _continue, eoGenOp >& _op) +eoAlgo >& make_algo_scalar(eoParser& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _continue, eoGenOp >& _op) { return do_make_algo_scalar(_parser, _state, _eval, _continue, _op); } -eoAlgo >& make_algo_scalar(eoParameterLoader& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _continue, eoGenOp >& _op) +eoAlgo >& make_algo_scalar(eoParser& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _continue, eoGenOp >& _op) { return do_make_algo_scalar(_parser, _state, _eval, _continue, _op); } diff --git a/eo/src/es/make_algo_scalar_real.cpp b/eo/src/es/make_algo_scalar_real.cpp index 7c48b7fd..a6731c17 100644 --- a/eo/src/es/make_algo_scalar_real.cpp +++ b/eo/src/es/make_algo_scalar_real.cpp @@ -44,12 +44,12 @@ // Algo /////// -eoAlgo >& make_algo_scalar(eoParameterLoader& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _continue, eoGenOp >& _op) +eoAlgo >& make_algo_scalar(eoParser& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _continue, eoGenOp >& _op) { return do_make_algo_scalar(_parser, _state, _eval, _continue, _op); } -eoAlgo >& make_algo_scalar(eoParameterLoader& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _continue, eoGenOp >& _op) +eoAlgo >& make_algo_scalar(eoParser& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _continue, eoGenOp >& _op) { return do_make_algo_scalar(_parser, _state, _eval, _continue, _op); } diff --git a/eo/src/es/make_checkpoint_es.cpp b/eo/src/es/make_checkpoint_es.cpp index 489524d6..a9dfac38 100644 --- a/eo/src/es/make_checkpoint_es.cpp +++ b/eo/src/es/make_checkpoint_es.cpp @@ -46,31 +46,31 @@ // checkpoint ///////////// -eoCheckPoint >& make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue) +eoCheckPoint >& make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue) { return do_make_checkpoint(_parser, _state, _eval, _continue); } -eoCheckPoint >& make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue) +eoCheckPoint >& make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue) { return do_make_checkpoint(_parser, _state, _eval, _continue); } ///////////// -eoCheckPoint >& make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue) +eoCheckPoint >& make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue) { return do_make_checkpoint(_parser, _state, _eval, _continue); } -eoCheckPoint >& make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue) +eoCheckPoint >& make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue) { return do_make_checkpoint(_parser, _state, _eval, _continue); } ///////////// -eoCheckPoint >& make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue) +eoCheckPoint >& make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue) { return do_make_checkpoint(_parser, _state, _eval, _continue); } -eoCheckPoint >& make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue) +eoCheckPoint >& make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue) { return do_make_checkpoint(_parser, _state, _eval, _continue); } diff --git a/eo/src/es/make_checkpoint_real.cpp b/eo/src/es/make_checkpoint_real.cpp index d278caf8..15cb8a06 100644 --- a/eo/src/es/make_checkpoint_real.cpp +++ b/eo/src/es/make_checkpoint_real.cpp @@ -44,11 +44,11 @@ // checkpoint ///////////// -eoCheckPoint >& make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue) +eoCheckPoint >& make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue) { return do_make_checkpoint(_parser, _state, _eval, _continue); } -eoCheckPoint >& make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue) +eoCheckPoint >& make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue) { return do_make_checkpoint(_parser, _state, _eval, _continue); } diff --git a/eo/src/es/make_es.h b/eo/src/es/make_es.h index d4c45394..c2c7b379 100644 --- a/eo/src/es/make_es.h +++ b/eo/src/es/make_es.h @@ -64,24 +64,24 @@ //Representation dependent - rewrite everything anew for each representation ////////////////////////// // the genotypes -eoRealInitBounded > & make_genotype(eoParameterLoader& _parser, eoState& _state, eoEsSimple _eo); -eoRealInitBounded > & make_genotype(eoParameterLoader& _parser, eoState& _state, eoEsSimple _eo); +eoRealInitBounded > & make_genotype(eoParser& _parser, eoState& _state, eoEsSimple _eo); +eoRealInitBounded > & make_genotype(eoParser& _parser, eoState& _state, eoEsSimple _eo); -eoRealInitBounded > & make_genotype(eoParameterLoader& _parser, eoState& _state, eoEsStdev _eo); -eoRealInitBounded > & make_genotype(eoParameterLoader& _parser, eoState& _state, eoEsStdev _eo); +eoRealInitBounded > & make_genotype(eoParser& _parser, eoState& _state, eoEsStdev _eo); +eoRealInitBounded > & make_genotype(eoParser& _parser, eoState& _state, eoEsStdev _eo); -eoRealInitBounded > & make_genotype(eoParameterLoader& _parser, eoState& _state, eoEsFull _eo); -eoRealInitBounded > & make_genotype(eoParameterLoader& _parser, eoState& _state, eoEsFull _eo); +eoRealInitBounded > & make_genotype(eoParser& _parser, eoState& _state, eoEsFull _eo); +eoRealInitBounded > & make_genotype(eoParser& _parser, eoState& _state, eoEsFull _eo); // the operators -eoGenOp >& make_op(eoParameterLoader& _parser, eoState& _state, eoRealInitBounded >& _init); -eoGenOp >& make_op(eoParameterLoader& _parser, eoState& _state, eoRealInitBounded >& _init); -eoGenOp >& make_op(eoParameterLoader& _parser, eoState& _state, eoRealInitBounded >& _init); -eoGenOp >& make_op(eoParameterLoader& _parser, eoState& _state, eoRealInitBounded >& _init); -eoGenOp >& make_op(eoParameterLoader& _parser, eoState& _state, eoRealInitBounded >& _init); -eoGenOp >& make_op(eoParameterLoader& _parser, eoState& _state, eoRealInitBounded >& _init); +eoGenOp >& make_op(eoParser& _parser, eoState& _state, eoRealInitBounded >& _init); +eoGenOp >& make_op(eoParser& _parser, eoState& _state, eoRealInitBounded >& _init); +eoGenOp >& make_op(eoParser& _parser, eoState& _state, eoRealInitBounded >& _init); +eoGenOp >& make_op(eoParser& _parser, eoState& _state, eoRealInitBounded >& _init); +eoGenOp >& make_op(eoParser& _parser, eoState& _state, eoRealInitBounded >& _init); +eoGenOp >& make_op(eoParser& _parser, eoState& _state, eoRealInitBounded >& _init); //Representation INdependent //////////////////////////// @@ -108,25 +108,25 @@ eoContinue >& make_continue(eoParser& _parser, eoState& _state, eoContinue >& make_continue(eoParser& _parser, eoState& _state, eoEvalFuncCounter > & _eval); // the checkpoint -eoCheckPoint >& make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue); -eoCheckPoint >& make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue); +eoCheckPoint >& make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue); +eoCheckPoint >& make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue); -eoCheckPoint >& make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue); -eoCheckPoint >& make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue); +eoCheckPoint >& make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue); +eoCheckPoint >& make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue); -eoCheckPoint >& make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue); -eoCheckPoint >& make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue); +eoCheckPoint >& make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue); +eoCheckPoint >& make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue); // the algo -eoAlgo >& make_algo_scalar(eoParameterLoader& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _ccontinue, eoGenOp >& _op); -eoAlgo >& make_algo_scalar(eoParameterLoader& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _ccontinue, eoGenOp >& _op); +eoAlgo >& make_algo_scalar(eoParser& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _ccontinue, eoGenOp >& _op); +eoAlgo >& make_algo_scalar(eoParser& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _ccontinue, eoGenOp >& _op); -eoAlgo >& make_algo_scalar(eoParameterLoader& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _ccontinue, eoGenOp >& _op); -eoAlgo >& make_algo_scalar(eoParameterLoader& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _ccontinue, eoGenOp >& _op); +eoAlgo >& make_algo_scalar(eoParser& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _ccontinue, eoGenOp >& _op); +eoAlgo >& make_algo_scalar(eoParser& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _ccontinue, eoGenOp >& _op); -eoAlgo >& make_algo_scalar(eoParameterLoader& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _ccontinue, eoGenOp >& _op); -eoAlgo >& make_algo_scalar(eoParameterLoader& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _ccontinue, eoGenOp >& _op); +eoAlgo >& make_algo_scalar(eoParser& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _ccontinue, eoGenOp >& _op); +eoAlgo >& make_algo_scalar(eoParser& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _ccontinue, eoGenOp >& _op); // run void run_ea(eoAlgo >& _ga, eoPop >& _pop); diff --git a/eo/src/es/make_genotype_es.cpp b/eo/src/es/make_genotype_es.cpp index 354a1ce9..e3b0bd28 100644 --- a/eo/src/es/make_genotype_es.cpp +++ b/eo/src/es/make_genotype_es.cpp @@ -52,29 +52,29 @@ /// The following function merely call the templatized do_* functions -eoEsChromInit > & make_genotype(eoParameterLoader& _parser, eoState& _state, eoEsSimple _eo) +eoEsChromInit > & make_genotype(eoParser& _parser, eoState& _state, eoEsSimple _eo) { return do_make_genotype(_parser, _state, _eo); } -eoEsChromInit > & make_genotype(eoParameterLoader& _parser, eoState& _state, eoEsSimple _eo) +eoEsChromInit > & make_genotype(eoParser& _parser, eoState& _state, eoEsSimple _eo) { return do_make_genotype(_parser, _state, _eo); } -eoEsChromInit > & make_genotype(eoParameterLoader& _parser, eoState& _state, eoEsStdev _eo) +eoEsChromInit > & make_genotype(eoParser& _parser, eoState& _state, eoEsStdev _eo) { return do_make_genotype(_parser, _state, _eo); } -eoEsChromInit > & make_genotype(eoParameterLoader& _parser, eoState& _state, eoEsStdev _eo) +eoEsChromInit > & make_genotype(eoParser& _parser, eoState& _state, eoEsStdev _eo) { return do_make_genotype(_parser, _state, _eo); } -eoEsChromInit > & make_genotype(eoParameterLoader& _parser, eoState& _state, eoEsFull _eo) +eoEsChromInit > & make_genotype(eoParser& _parser, eoState& _state, eoEsFull _eo) { return do_make_genotype(_parser, _state, _eo); } -eoEsChromInit > & make_genotype(eoParameterLoader& _parser, eoState& _state, eoEsFull _eo) +eoEsChromInit > & make_genotype(eoParser& _parser, eoState& _state, eoEsFull _eo) { return do_make_genotype(_parser, _state, _eo); } diff --git a/eo/src/es/make_genotype_real.cpp b/eo/src/es/make_genotype_real.cpp index b5ea0374..c5d58b07 100644 --- a/eo/src/es/make_genotype_real.cpp +++ b/eo/src/es/make_genotype_real.cpp @@ -52,11 +52,11 @@ /// The following function merely call the templatized do_* functions -eoEsChromInit > & make_genotype(eoParameterLoader& _parser, eoState& _state, eoReal _eo) +eoEsChromInit > & make_genotype(eoParser& _parser, eoState& _state, eoReal _eo) { return do_make_genotype(_parser, _state, _eo); } -eoEsChromInit > & make_genotype(eoParameterLoader& _parser, eoState& _state, eoReal _eo) +eoEsChromInit > & make_genotype(eoParser& _parser, eoState& _state, eoReal _eo) { return do_make_genotype(_parser, _state, _eo); } diff --git a/eo/src/es/make_op_es.cpp b/eo/src/es/make_op_es.cpp index 4d4fd948..604d6e7e 100644 --- a/eo/src/es/make_op_es.cpp +++ b/eo/src/es/make_op_es.cpp @@ -43,32 +43,32 @@ // operators //////////// -eoGenOp >& make_op(eoParameterLoader& _parser, eoState& _state, eoRealInitBounded >& _init) +eoGenOp >& make_op(eoParser& _parser, eoState& _state, eoRealInitBounded >& _init) { return do_make_op(_parser, _state, _init); } -eoGenOp >& make_op(eoParameterLoader& _parser, eoState& _state, eoRealInitBounded >& _init) +eoGenOp >& make_op(eoParser& _parser, eoState& _state, eoRealInitBounded >& _init) { return do_make_op(_parser, _state, _init); } -eoGenOp >& make_op(eoParameterLoader& _parser, eoState& _state, eoRealInitBounded >& _init) +eoGenOp >& make_op(eoParser& _parser, eoState& _state, eoRealInitBounded >& _init) { return do_make_op(_parser, _state, _init); } -eoGenOp >& make_op(eoParameterLoader& _parser, eoState& _state, eoRealInitBounded >& _init) +eoGenOp >& make_op(eoParser& _parser, eoState& _state, eoRealInitBounded >& _init) { return do_make_op(_parser, _state, _init); } -eoGenOp >& make_op(eoParameterLoader& _parser, eoState& _state, eoRealInitBounded >& _init) +eoGenOp >& make_op(eoParser& _parser, eoState& _state, eoRealInitBounded >& _init) { return do_make_op(_parser, _state, _init); } -eoGenOp >& make_op(eoParameterLoader& _parser, eoState& _state, eoRealInitBounded >& _init) +eoGenOp >& make_op(eoParser& _parser, eoState& _state, eoRealInitBounded >& _init) { return do_make_op(_parser, _state, _init); } diff --git a/eo/src/es/make_op_es.h b/eo/src/es/make_op_es.h index 40d72ddd..0a5bc8d0 100644 --- a/eo/src/es/make_op_es.h +++ b/eo/src/es/make_op_es.h @@ -68,7 +68,7 @@ */ template -eoGenOp & do_make_op(eoParameterLoader& _parser, eoState& _state, eoRealInitBounded& _init) +eoGenOp & do_make_op(eoParser& _parser, eoState& _state, eoRealInitBounded& _init) { // get vector size unsigned vecSize = _init.size(); diff --git a/eo/src/es/make_op_real.cpp b/eo/src/es/make_op_real.cpp index b392193d..195a4445 100644 --- a/eo/src/es/make_op_real.cpp +++ b/eo/src/es/make_op_real.cpp @@ -43,12 +43,12 @@ // oeprators //////////// -eoGenOp >& make_op(eoParameterLoader& _parser, eoState& _state, eoRealInitBounded >& _init) +eoGenOp >& make_op(eoParser& _parser, eoState& _state, eoRealInitBounded >& _init) { return do_make_op(_parser, _state, _init); } -eoGenOp >& make_op(eoParameterLoader& _parser, eoState& _state, eoRealInitBounded >& _init) +eoGenOp >& make_op(eoParser& _parser, eoState& _state, eoRealInitBounded >& _init) { return do_make_op(_parser, _state, _init); } diff --git a/eo/src/es/make_op_real.h b/eo/src/es/make_op_real.h index c8835717..6e3e377a 100644 --- a/eo/src/es/make_op_real.h +++ b/eo/src/es/make_op_real.h @@ -65,7 +65,7 @@ */ template -eoGenOp & do_make_op(eoParameterLoader& _parser, eoState& _state, eoRealInitBounded& _init) +eoGenOp & do_make_op(eoParser& _parser, eoState& _state, eoRealInitBounded& _init) { // get vector size unsigned vecSize = _init.size(); diff --git a/eo/src/es/make_real.h b/eo/src/es/make_real.h index f858e8a5..5c776ff4 100644 --- a/eo/src/es/make_real.h +++ b/eo/src/es/make_real.h @@ -60,12 +60,12 @@ ////////////////////////// // the genotypes -eoRealInitBounded > & make_genotype(eoParameterLoader& _parser, eoState& _state, eoReal _eo); -eoRealInitBounded > & make_genotype(eoParameterLoader& _parser, eoState& _state, eoReal _eo); +eoRealInitBounded > & make_genotype(eoParser& _parser, eoState& _state, eoReal _eo); +eoRealInitBounded > & make_genotype(eoParser& _parser, eoState& _state, eoReal _eo); // the operators -eoGenOp >& make_op(eoParameterLoader& _parser, eoState& _state, eoRealInitBounded >& _init); -eoGenOp >& make_op(eoParameterLoader& _parser, eoState& _state, eoRealInitBounded >& _init); +eoGenOp >& make_op(eoParser& _parser, eoState& _state, eoRealInitBounded >& _init); +eoGenOp >& make_op(eoParser& _parser, eoState& _state, eoRealInitBounded >& _init); //Representation INdependent //////////////////////////// @@ -80,14 +80,14 @@ eoContinue >& make_continue(eoParser& _parser, eoState& _state, e eoContinue >& make_continue(eoParser& _parser, eoState& _state, eoEvalFuncCounter > & _eval); // the checkpoint -eoCheckPoint >& make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue); -eoCheckPoint >& make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue); +eoCheckPoint >& make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue); +eoCheckPoint >& make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue); // the algo -eoAlgo >& make_algo_scalar(eoParameterLoader& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _ccontinue, eoGenOp >& _op); +eoAlgo >& make_algo_scalar(eoParser& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _ccontinue, eoGenOp >& _op); -eoAlgo >& make_algo_scalar(eoParameterLoader& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _ccontinue, eoGenOp >& _op); +eoAlgo >& make_algo_scalar(eoParser& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _ccontinue, eoGenOp >& _op); // run void run_ea(eoAlgo >& _ga, eoPop >& _pop); diff --git a/eo/src/ga/make_algo_scalar_ga.cpp b/eo/src/ga/make_algo_scalar_ga.cpp index a7ae453b..cb5bcca3 100644 --- a/eo/src/ga/make_algo_scalar_ga.cpp +++ b/eo/src/ga/make_algo_scalar_ga.cpp @@ -47,12 +47,12 @@ // Algo /////// -eoAlgo >& make_algo_scalar(eoParameterLoader& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _continue, eoGenOp >& _op) +eoAlgo >& make_algo_scalar(eoParser& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _continue, eoGenOp >& _op) { return do_make_algo_scalar(_parser, _state, _eval, _continue, _op); } -eoAlgo >& make_algo_scalar(eoParameterLoader& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _continue, eoGenOp >& _op) +eoAlgo >& make_algo_scalar(eoParser& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _continue, eoGenOp >& _op) { return do_make_algo_scalar(_parser, _state, _eval, _continue, _op); } diff --git a/eo/src/ga/make_checkpoint_ga.cpp b/eo/src/ga/make_checkpoint_ga.cpp index e8e41572..6aaac47a 100644 --- a/eo/src/ga/make_checkpoint_ga.cpp +++ b/eo/src/ga/make_checkpoint_ga.cpp @@ -47,11 +47,11 @@ // checkpoint ///////////// -eoCheckPoint >& make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue) +eoCheckPoint >& make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue) { return do_make_checkpoint(_parser, _state, _eval, _continue); } -eoCheckPoint >& make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue) +eoCheckPoint >& make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue) { return do_make_checkpoint(_parser, _state, _eval, _continue); } diff --git a/eo/src/ga/make_ga.h b/eo/src/ga/make_ga.h index ea7561f7..8cf53c0f 100644 --- a/eo/src/ga/make_ga.h +++ b/eo/src/ga/make_ga.h @@ -52,12 +52,12 @@ ////////////////////////// // the genotypes -eoInit > & make_genotype(eoParameterLoader& _parser, eoState& _state, eoBit _eo); - eoInit > & make_genotype(eoParameterLoader& _parser, eoState& _state, eoBit _eo); +eoInit > & make_genotype(eoParser& _parser, eoState& _state, eoBit _eo); + eoInit > & make_genotype(eoParser& _parser, eoState& _state, eoBit _eo); // the operators -eoGenOp >& make_op(eoParameterLoader& _parser, eoState& _state, eoInit >& _init); -eoGenOp >& make_op(eoParameterLoader& _parser, eoState& _state, eoInit >& _init); +eoGenOp >& make_op(eoParser& _parser, eoState& _state, eoInit >& _init); +eoGenOp >& make_op(eoParser& _parser, eoState& _state, eoInit >& _init); //Representation INdependent //////////////////////////// @@ -72,14 +72,14 @@ eoContinue >& make_continue(eoParser& _parser, eoState& _state, eo eoContinue >& make_continue(eoParser& _parser, eoState& _state, eoEvalFuncCounter > & _eval); // the checkpoint -eoCheckPoint >& make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue); -eoCheckPoint >& make_checkpoint(eoParameterLoader& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue); +eoCheckPoint >& make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue); +eoCheckPoint >& make_checkpoint(eoParser& _parser, eoState& _state, eoEvalFuncCounter >& _eval, eoContinue >& _continue); // the algo -eoAlgo >& make_algo_scalar(eoParameterLoader& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _ccontinue, eoGenOp >& _op); +eoAlgo >& make_algo_scalar(eoParser& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _ccontinue, eoGenOp >& _op); -eoAlgo >& make_algo_scalar(eoParameterLoader& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _ccontinue, eoGenOp >& _op); +eoAlgo >& make_algo_scalar(eoParser& _parser, eoState& _state, eoEvalFunc >& _eval, eoContinue >& _ccontinue, eoGenOp >& _op); // run void run_ea(eoAlgo >& _ga, eoPop >& _pop); diff --git a/eo/src/ga/make_genotype_ga.cpp b/eo/src/ga/make_genotype_ga.cpp index 6903e426..52bd31a8 100644 --- a/eo/src/ga/make_genotype_ga.cpp +++ b/eo/src/ga/make_genotype_ga.cpp @@ -40,11 +40,11 @@ /// The following function merely call the templatized do_* functions above -eoInit > & make_genotype(eoParameterLoader& _parser, eoState& _state, eoBit _eo) +eoInit > & make_genotype(eoParser& _parser, eoState& _state, eoBit _eo) { return do_make_genotype(_parser, _state, _eo); } -eoInit > & make_genotype(eoParameterLoader& _parser, eoState& _state, eoBit _eo) +eoInit > & make_genotype(eoParser& _parser, eoState& _state, eoBit _eo) { return do_make_genotype(_parser, _state, _eo); } diff --git a/eo/src/ga/make_genotype_ga.h b/eo/src/ga/make_genotype_ga.h index 93ea00c5..16cef294 100644 --- a/eo/src/ga/make_genotype_ga.h +++ b/eo/src/ga/make_genotype_ga.h @@ -58,16 +58,28 @@ */ template -eoInit & do_make_genotype(eoParameterLoader& _parser, eoState& _state, EOT) +eoInit & do_make_genotype(eoParser& _parser, eoState& _state, EOT) { // for bitstring, only thing needed is the size - eoValueParam& chromSize = _parser.createParam(unsigned(10), "ChromSize", "The length of the bitstrings", 'n',"Genotype Initialization"); + unsigned theSize; + // but it might have been already read in the definition fo the performance + eoParam* ptParam = _parser.getParamWithLongName(string("ChromSize")); + + if (!ptParam) // not already defined: read it here + { + theSize = _parser.createParam(unsigned(10), "ChromSize", "The length of the bitstrings", 'n',"Problem").value(); + } + else // it was read before, get its value + { + eoValueParam* ptChromSize = dynamic_cast*>(ptParam); + theSize = ptChromSize->value(); + } // Then we can built a bitstring random initializer // based on boolean_generator class (see utils/rnd_generator.h) eoBooleanGenerator * gen = new eoBooleanGenerator; _state.storeFunctor(gen); - eoInitFixedLength* init = new eoInitFixedLength(chromSize.value(), *gen); + eoInitFixedLength* init = new eoInitFixedLength(theSize, *gen); // store in state _state.storeFunctor(init); return *init; diff --git a/eo/src/ga/make_op.h b/eo/src/ga/make_op.h index 40ae2492..bf8d27d0 100644 --- a/eo/src/ga/make_op.h +++ b/eo/src/ga/make_op.h @@ -66,7 +66,7 @@ */ template -eoGenOp & do_make_op(eoParameterLoader& _parser, eoState& _state, eoInit& _init) +eoGenOp & do_make_op(eoParser& _parser, eoState& _state, eoInit& _init) { // this is a temporary version, while Maarten codes the full tree-structured // general operator input diff --git a/eo/src/ga/make_op_ga.cpp b/eo/src/ga/make_op_ga.cpp index 7ee1eb1b..9186f54e 100644 --- a/eo/src/ga/make_op_ga.cpp +++ b/eo/src/ga/make_op_ga.cpp @@ -45,12 +45,12 @@ // oeprators //////////// -eoGenOp >& make_op(eoParameterLoader& _parser, eoState& _state, eoInit >& _init) +eoGenOp >& make_op(eoParser& _parser, eoState& _state, eoInit >& _init) { return do_make_op(_parser, _state, _init); } -eoGenOp >& make_op(eoParameterLoader& _parser, eoState& _state, eoInit >& _init) +eoGenOp >& make_op(eoParser& _parser, eoState& _state, eoInit >& _init) { return do_make_op(_parser, _state, _init); }