From f24efdd770b3ba89df4eb8e00bb3391a40055107 Mon Sep 17 00:00:00 2001 From: Johann Dreo Date: Fri, 2 Oct 2020 16:01:02 +0200 Subject: [PATCH] fix offspring_size versus pop_size mistake --- eo/contrib/irace/fastga.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/eo/contrib/irace/fastga.cpp b/eo/contrib/irace/fastga.cpp index 3cc7d7a0f..c50f650f1 100644 --- a/eo/contrib/irace/fastga.cpp +++ b/eo/contrib/irace/fastga.cpp @@ -151,6 +151,11 @@ int main(int argc, char* argv[]) // rng is a global rng.reseed(seed); + auto pop_size_p = parser.getORcreateParam(0, + "pop-size", "Population size", + 'P', "Operator Choice", /*required=*/false); + const size_t pop_size = pop_size_p.value(); + auto instance_p = parser.getORcreateParam(1, "instance", "Instance ID", 'i', "Problem", /*required=*/true); @@ -201,10 +206,11 @@ int main(int argc, char* argv[]) 'r', "Operator Choice", /*required=*/true); const size_t replacement = replacement_p.value(); - auto pop_size_p = parser.getORcreateParam(0, - "pop-size", "Offsprings pop size (0 = same size than the parents pop)", + auto offspring_size_p = parser.getORcreateParam(0, + "offspring-size", "Offspringssize (0 = same size than the parents pop, see --pop-size)", 'P', "Operator Choice", /*required=*/true); - const size_t pop_size = pop_size_p.value(); + const size_t offspring_size = offspring_size_p.value(); + // Help + Verbose routines make_verbose(parser); @@ -246,7 +252,7 @@ int main(int argc, char* argv[]) print_param_range( mutation_selector_p, fake_foundry.mutation_selectors .size(), std::cout); print_param_range( mutation_p, fake_foundry.mutations .size(), std::cout); print_param_range( replacement_p, fake_foundry.replacements .size(), std::cout); - print_param_range( pop_size_p, fake_foundry.pop_sizes .size(), std::cout); + print_param_range( offspring_size_p, fake_foundry.pop_sizes .size(), std::cout); // std::ofstream irace_param("fastga.params"); // irace_param << "# name\tswitch\ttype\tvalues" << std::endl; @@ -317,7 +323,7 @@ int main(int argc, char* argv[]) encoded_algo[foundry.mutations .index()] = mutation; encoded_algo[foundry.replacements .index()] = replacement; encoded_algo[foundry.continuators .index()] = continuator; - encoded_algo[foundry.pop_sizes .index()] = pop_size; + encoded_algo[foundry.pop_sizes .index()] = offspring_size; std::clog << "Encoded algorithm:" << std::endl; foundry.select(encoded_algo);