diff --git a/branches/paradiseo-moeo-1.0/tutorial/Lesson1/FlowShopEA.cpp b/branches/paradiseo-moeo-1.0/tutorial/Lesson1/FlowShopEA.cpp index 87ed53d2c..7e01baabc 100644 --- a/branches/paradiseo-moeo-1.0/tutorial/Lesson1/FlowShopEA.cpp +++ b/branches/paradiseo-moeo-1.0/tutorial/Lesson1/FlowShopEA.cpp @@ -10,19 +10,15 @@ */ //----------------------------------------------------------------------------- -// Miscilaneous include and declaration -using namespace std; - -/* EO + MOEO */ // moeo general include #include // for the creation of an evaluator -#include "make_eval_FlowShop.h" +#include // for the creation of an initializer -#include "make_genotype_FlowShop.h" +#include // for the creation of the variation operators -#include "make_op_FlowShop.h" +#include // how to initialize the population #include // the stopping criterion @@ -35,21 +31,22 @@ using namespace std; #include // checks for help demand, and writes the status file and make_help; in libutils void make_help(eoParser & _parser); -/* FLOW-SHOP */ -// definition of representation -#include "FlowShop.h" +// definition of the representation +#include -int main(int argc, char* argv[]) { - try { +using namespace std; + +int main(int argc, char* argv[]) +{ + try + { + eoParser parser(argc, argv); // for user-parameter reading eoState state; // to keep all things allocated - - - /*** the representation-dependent things ***/ // The fitness evaluation @@ -60,9 +57,6 @@ int main(int argc, char* argv[]) { eoGenOp& op = do_make_op(parser, state); - - - /*** the representation-independent things ***/ // initialization of the population @@ -77,9 +71,6 @@ int main(int argc, char* argv[]) { eoAlgo& algo = do_make_ea_moeo(parser, state, eval, checkpoint, op, arch); - - - /*** Go ! ***/ // help ? @@ -88,9 +79,6 @@ int main(int argc, char* argv[]) { // first evalution apply(eval, pop); - pop.sort(); - arch.update(pop); - // printing of the initial population cout << "Initial Population\n"; pop.sortedPrintOn(cout); @@ -110,8 +98,9 @@ int main(int argc, char* argv[]) { cout << endl; - - } catch (exception& e) { + } + catch (exception& e) + { cout << e.what() << endl; } return EXIT_SUCCESS;