diff --git a/branches/cmakemodif/paradiseo-moeo/tutorial/examples/flowshop/make_eval_FlowShop.h b/branches/cmakemodif/paradiseo-moeo/tutorial/examples/flowshop/make_eval_FlowShop.h index 680615af7..6836b2d6b 100644 --- a/branches/cmakemodif/paradiseo-moeo/tutorial/examples/flowshop/make_eval_FlowShop.h +++ b/branches/cmakemodif/paradiseo-moeo/tutorial/examples/flowshop/make_eval_FlowShop.h @@ -54,14 +54,7 @@ eoEvalFuncCounter & do_make_eval(eoParser& _parser, eoState& _state) { // benchmark file name - std::string benchmarkFileName = _parser.getORcreateParam(std::string(), "BenchmarkFile", "Benchmark file name (benchmarks are available at www.lifl.fr/~liefooga/benchmarks)", 'B',"Representation", true).value(); - if (benchmarkFileName == "") - { - std::string stmp = "*** Missing name of the benchmark file\n"; - stmp += " Type '-B=the_benchmark_file_name' or '--BenchmarkFile=the_benchmark_file_name'\n"; - stmp += " Benchmarks files are available at www.lifl.fr/~liefooga/benchmarks"; - throw std::runtime_error(stmp.c_str()); - } + std::string benchmarkFileName = _parser.getORcreateParam(std::string("../examples/flowshop/benchs/020_20_01.txt"), "BenchmarkFile", "Benchmark file name", 'B',"Representation", false).value(); // reading of the parameters contained in the benchmark file FlowShopBenchmarkParser fParser(benchmarkFileName); unsigned int M = fParser.getM(); diff --git a/branches/cmakemodif/paradiseo-moeo/tutorial/examples/flowshop/make_genotype_FlowShop.h b/branches/cmakemodif/paradiseo-moeo/tutorial/examples/flowshop/make_genotype_FlowShop.h index 5487a0f17..d1af7d8e4 100644 --- a/branches/cmakemodif/paradiseo-moeo/tutorial/examples/flowshop/make_genotype_FlowShop.h +++ b/branches/cmakemodif/paradiseo-moeo/tutorial/examples/flowshop/make_genotype_FlowShop.h @@ -52,14 +52,7 @@ eoInit & do_make_genotype(eoParser& _parser, eoState& _state) { // benchmark file name - std::string benchmarkFileName = _parser.getORcreateParam(std::string(), "BenchmarkFile", "Benchmark file name (benchmarks are available at www.lifl.fr/~liefooga/benchmarks/)", 'B',"Representation", true).value(); - if (benchmarkFileName == "") - { - std::string stmp = "*** Missing name of the benchmark file\n"; - stmp += " Type '-B=the_benchmark_file_name' or '--BenchmarkFile=the_benchmark_file_name'\n"; - stmp += " Benchmarks files are available at www.lifl.fr/~liefooga/benchmarks"; - throw std::runtime_error(stmp.c_str()); - } + std::string benchmarkFileName = _parser.getORcreateParam(std::string("../examples/flowshop/benchs/020_20_01.txt"), "BenchmarkFile", "Benchmark file name", 'B',"Representation", false).value(); // reading of number of jobs to schedule contained in the benchmark file FlowShopBenchmarkParser fParser(benchmarkFileName); unsigned int N = fParser.getN();