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

add option to exit after make_help + fix exit code

Browse source 
- Defaults to previous behaviour, which was to exit.
- Fix the returned exit code: was 1, but should be 0, as asking for help
is not an error.
This commit is contained in:
Johann Dreo 2020-03-10 09:12:39 +01:00
commit 67aaf8b025
5 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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) // end of parameter input (+ .status + help)
// that one is not templatized, but is here for completeness // that one is not templatized, but is here for completeness
void make_help(eoParser & _parser); void make_help(eoParser & _parser, bool exit_after = true);
/** @} */ /** @} */
/** @} */ /** @} */

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) // end of parameter input (+ .status + help)
// that one is not templatized // that one is not templatized
// Because of that, the source is in src/utils dir // Because of that, the source is in src/utils dir
void make_help(eoParser & _parser); void make_help(eoParser & _parser, bool exit_after = true);
/** @} */ /** @} */
#endif #endif

2
eo/src/ga/make_ga.h
View file

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

2
eo/src/utils/checkpointing
View file

@ -47,7 +47,7 @@
#include "eoGenCounter.h" #include "eoGenCounter.h"
// and make_help - any better suggestion to include it? // and make_help - any better suggestion to include it?
void make_help(eoParser & _parser); void make_help(eoParser & _parser, bool exit_after = true);
#endif // !_CHECKPOINTING_ #endif // !_CHECKPOINTING_

6
eo/src/utils/make_help.cpp
View file

@ -44,7 +44,7 @@ using namespace std;
* It is declared in all make_xxx.h files in representation-dependent dirs * It is declared in all make_xxx.h files in representation-dependent dirs
* but it is NOT representation-dependent itself - that's why it's in utils * but it is NOT representation-dependent itself - that's why it's in utils
*/ */
void make_help(eoParser & _parser) void make_help(eoParser & _parser, bool exit_after)
{ {
// name of the "status" file where all actual parameter values will be saved // name of the "status" file where all actual parameter values will be saved
string str_status = _parser.ProgramName() + ".status"; // default value string str_status = _parser.ProgramName() + ".status"; // default value
@ -65,7 +65,9 @@ void make_help(eoParser & _parser)
_parser.printHelp(cout); _parser.printHelp(cout);
cout << "You can use an edited copy of file " << statusParam.value() cout << "You can use an edited copy of file " << statusParam.value()
<< " as parameter file" << endl; << " as parameter file" << endl;
exit(1); if(exit_after) {
exit(0);
}
} }
} }