fix some errors in tests

- 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

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;
}

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

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);
/** @} */
/** @} */

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

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;

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[]){

View file

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

View file

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

View file

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

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[])

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