From bdb4b14192697b919385c46e4af493fc69178bf9 Mon Sep 17 00:00:00 2001 From: jhumeau Date: Thu, 8 Jan 2009 14:58:55 +0000 Subject: [PATCH] git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1318 331e1502-861f-0410-8da2-ba01fb791d7f --- .../tutorial/examples/flowshop/make_eval_FlowShop.h | 9 +-------- .../tutorial/examples/flowshop/make_genotype_FlowShop.h | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) 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();