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

fix offspring_size versus pop_size mistake

Browse source
This commit is contained in:
Johann Dreo 2020-10-02 16:01:02 +02:00
commit f24efdd770
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
eo/contrib/irace/fastga.cpp
View file

@ -151,6 +151,11 @@ int main(int argc, char* argv[])
// rng is a global // rng is a global
rng.reseed(seed); rng.reseed(seed);
auto pop_size_p = parser.getORcreateParam<size_t>(0,
"pop-size", "Population size",
'P', "Operator Choice", /*required=*/false);
const size_t pop_size = pop_size_p.value();
auto instance_p = parser.getORcreateParam<size_t>(1, auto instance_p = parser.getORcreateParam<size_t>(1,
"instance", "Instance ID", "instance", "Instance ID",
'i', "Problem", /*required=*/true); 'i', "Problem", /*required=*/true);
@ -201,10 +206,11 @@ int main(int argc, char* argv[])
'r', "Operator Choice", /*required=*/true); 'r', "Operator Choice", /*required=*/true);
const size_t replacement = replacement_p.value(); const size_t replacement = replacement_p.value();
auto pop_size_p = parser.getORcreateParam<size_t>(0, auto offspring_size_p = parser.getORcreateParam<size_t>(0,
"pop-size", "Offsprings pop size (0 = same size than the parents pop)", "offspring-size", "Offspringssize (0 = same size than the parents pop, see --pop-size)",
'P', "Operator Choice", /*required=*/true); '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 // Help + Verbose routines
make_verbose(parser); 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_selector_p, fake_foundry.mutation_selectors .size(), std::cout);
print_param_range( mutation_p, fake_foundry.mutations .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( 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"); // std::ofstream irace_param("fastga.params");
// irace_param << "# name\tswitch\ttype\tvalues" << std::endl; // 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.mutations .index()] = mutation;
encoded_algo[foundry.replacements .index()] = replacement; encoded_algo[foundry.replacements .index()] = replacement;
encoded_algo[foundry.continuators .index()] = continuator; 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; std::clog << "Encoded algorithm:" << std::endl;
foundry.select(encoded_algo); foundry.select(encoded_algo);