nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix some errors in tests

Browse source 
- use eoEvalCounterThrowException
- use make_help
This commit is contained in:
Johann Dreo 2020-03-26 22:47:26 +01:00
commit 75ac37b02a
16 changed files with 25 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
edo/application/cmaes/main.cpp
View file

@ -28,7 +28,7 @@ Authors:
#include <eo>
//#include <mo>
#include <eoEvalFuncCounterBounder.h>
#include <eoEvalCounterThrowException.h>
#include <do/make_pop.h>
#include <do/make_run.h>
@ -67,7 +67,7 @@ int main(int ac, char** av)
eoEvalFunc< RealVec >* plainEval = new Rosenbrock< RealVec >();
state.storeFunctor(plainEval);
eoEvalFuncCounterBounder< RealVec > eval(*plainEval, max_eval);
eoEvalCounterThrowException< RealVec > eval(*plainEval, max_eval);
eoRndGenerator< double >* gen = new eoUniformGenerator< double >(-5, 5);
state.storeFunctor(gen);
@ -145,7 +145,7 @@ int main(int ac, char** av)
eo::log << eo::progress << "Best solution after random init: " << pop.best_element().fitness() << std::endl;
do_run(*algo, pop);
} catch (eoEvalFuncCounterBounderException& e) {
} catch (eoMaxEvalException& e) {
eo::log << eo::warnings << "warning: " << e.what() << std::endl;
}

6
edo/application/eda/main.cpp
View file

@ -28,7 +28,7 @@ Authors:
#include <eo>
// #include <mo>
#include <eoEvalFuncCounterBounder.h>
#include <eoEvalCounterThrowException.h>
#include <do/make_pop.h>
#include <do/make_run.h>
@ -69,7 +69,7 @@ int main(int ac, char** av)
state.storeFunctor(plainEval);
unsigned long max_eval = parser.getORcreateParam((unsigned long)0, "maxEval", "Maximum number of evaluations (0 = none)", 'E', "Stopping criterion").value(); // E
eoEvalFuncCounterBounder< EOT > eval(*plainEval, max_eval);
eoEvalCounterThrowException< EOT > eval(*plainEval, max_eval);
eoRndGenerator< double >* gen = new eoUniformGenerator< double >(-5, 5);
state.storeFunctor(gen);
@ -169,7 +169,7 @@ int main(int ac, char** av)
try {
do_run(*algo, pop);
} catch (eoEvalFuncCounterBounderException& e) {
} catch (eoMaxEvalException& e) {
eo::log << eo::warnings << "warning: " << e.what() << std::endl;
} catch (std::exception& e) {

6
eo/src/eoSIGContinue.cpp
View file

@ -36,3 +36,9 @@
// --- Global variables - but don't know what else to do - MS ---
bool existSIGContinue = false;
bool call_func = false;
void set_bool(int)
{
call_func = true;
}

5
eo/src/eoSIGContinue.h
View file

@ -42,10 +42,7 @@
extern bool existSIGContinue;
extern bool call_func;
void set_bool(int)
{
call_func = true;
}
void set_bool(int);
/**
A continuator that stops if a given signal is received during the execution

2
eo/src/es/make_es.h
View file

@ -145,7 +145,7 @@ void run_ea(eoAlgo<eoEsFull<eoMinimizingFitness> >& _ga, eoPop<eoEsFull<eoMinimi
// end of parameter input (+ .status + help)
// that one is not templatized, but is here for completeness
void make_help(eoParser & _parser, bool exit_after = true);
void make_help(eoParser & _parser, bool exit_after);
/** @} */
/** @} */

2
eo/src/es/make_real.h
View file

@ -101,7 +101,7 @@ void run_ea(eoAlgo<eoReal<eoMinimizingFitness> >& _ga, eoPop<eoReal<eoMinimizing
// end of parameter input (+ .status + help)
// that one is not templatized
// Because of that, the source is in src/utils dir
void make_help(eoParser & _parser, bool exit_after = true);
void make_help(eoParser & _parser, bool exit_after);
/** @} */
#endif

2
eo/test/t-eoEvalCmd.cpp
View file

@ -5,7 +5,7 @@
using namespace std;
int main(int /*argc*/, char* /*argv[]*/)
int main(int /*argc*/, char** /*argv[]*/)
{
typedef eoReal<eoMinimizingFitness> EOT;

2
eo/test/t-eoFitnessAssembledEA.cpp
View file

@ -95,7 +95,7 @@ public:
};
// checks for help demand, and writes the status file and make_help; in libutils
void make_help(eoParser & _parser);
// void make_help(eoParser & _parser);
// now use all of the above, + representation dependent things
int main(int argc, char* argv[]){

1
eo/test/t-eoGA.cpp
View file

@ -1,5 +1,6 @@
#include <iostream>
#include <utils/checkpointing>
#include <ga/make_ga.h>
#include <eoEvalFuncPtr.h>
#include "binary_value.h"

1
eo/test/t-eoReal.cpp
View file

@ -1,5 +1,6 @@
#include <iostream>
#include <utils/checkpointing>
#include <es/make_real.h>
#include "real_value.h"
#include <apply.h>

1
eo/tutorial/Lesson4/RealEA.cpp
View file

@ -1,5 +1,6 @@
#include <iostream>
#include <utils/checkpointing>
#include <es/make_real.h>
#include "real_value.h"
#include <apply.h>

2
eo/tutorial/Lesson5/OneMaxEA.cpp
View file

@ -116,7 +116,7 @@ void run_ea(eoAlgo<Indi>& _ga, eoPop<Indi>& _pop)
// checks for help demand, and writes the status file
// and make_help; in libutils
void make_help(eoParser & _parser);
// void make_help(eoParser & _parser);
// now use all of the above, + representation dependent things
int main(int argc, char* argv[])

2
eo/tutorial/Lesson5/OneMaxLibEA.cpp
View file

@ -89,7 +89,7 @@ void run_ea(eoAlgo<Indi>& _ga, eoPop<Indi>& _pop);
// checks for help demand, and writes the status file
// and make_help; in libutils - just a declaration, code in libeoutils.a
void make_help(eoParser & _parser);
// void make_help(eoParser & _parser);
// now use all of the above, + representation dependent things
// from here on, no difference with eoOneMax.cpp

2
moeo/tutorial/Lesson2/FlowShopEA.cpp
View file

@ -47,7 +47,7 @@
// how to initialize the population
#include <do/make_pop.h>
// checks for help demand, and writes the status file and make_help; in libutils
void make_help(eoParser & _parser);
// void make_help(eoParser & _parser);
// definition of the representation
#include <FlowShop.h>

2
moeo/tutorial/Lesson3/FlowShopEA2.cpp
View file

@ -55,7 +55,7 @@
// simple call to the algo
#include <do/make_run.h>
// checks for help demand, and writes the status file and make_help; in libutils
void make_help(eoParser & _parser);
// void make_help(eoParser & _parser);
// definition of the representation
#include <FlowShop.h>

2
moeo/tutorial/Lesson4/FlowShopDMLS.cpp
View file

@ -48,7 +48,7 @@
// how to initialize the population
#include <do/make_pop.h>
// checks for help demand, and writes the status file and make_help; in libutils
void make_help(eoParser & _parser);
// void make_help(eoParser & _parser);
// definition of the representation
#include <FlowShop.h>