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

fix tests after FastGA foundry changes

Browse source
This commit is contained in:
Johann Dreo 2020-10-06 15:07:04 +02:00
commit b84a13e108
2 changed files with 36 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
eo/test/t-eoAlgoFoundryFastGA.cpp
View file

@ -71,9 +71,9 @@ int main(int /*argc*/, char** /*argv*/)
} }
/***** Offspring population size *****/ /***** Offspring population size *****/
foundry.pop_sizes.add<size_t>(0); // 0 = same as parent pop foundry.offspring_sizes.add<size_t>(0); // 0 = same as parent pop
// for(size_t s = pop_size; s < 2*pop_size; s+=pop_size/10) { // for(size_t s = pop_size; s < 2*pop_size; s+=pop_size/10) {
// foundry.pop_sizes.add<size_t>(s); // foundry.offspring_sizes.add<size_t>(s);
// } // }
@ -87,7 +87,7 @@ int main(int /*argc*/, char** /*argv*/)
* foundry.mutations.size() * foundry.mutations.size()
* foundry.replacements.size() * foundry.replacements.size()
* foundry.continuators.size() * foundry.continuators.size()
* foundry.pop_sizes.size(); * foundry.offspring_sizes.size();
std::clog << n << " possible algorithms instances." << std::endl; std::clog << n << " possible algorithms instances." << std::endl;
EOT best_sol; EOT best_sol;
@ -103,7 +103,7 @@ int main(int /*argc*/, char** /*argv*/)
for(size_t i_mut = 0; i_mut < foundry.mutations.size(); ++i_mut ) { for(size_t i_mut = 0; i_mut < foundry.mutations.size(); ++i_mut ) {
for(size_t i_rep = 0; i_rep < foundry.replacements.size(); ++i_rep ) { for(size_t i_rep = 0; i_rep < foundry.replacements.size(); ++i_rep ) {
for(size_t i_cont = 0; i_cont < foundry.continuators.size(); ++i_cont ) { for(size_t i_cont = 0; i_cont < foundry.continuators.size(); ++i_cont ) {
for(size_t i_pop = 0; i_pop < foundry.pop_sizes.size(); ++i_pop ) { for(size_t i_pop = 0; i_pop < foundry.offspring_sizes.size(); ++i_pop ) {
std::clog << "\r" << i++ << "/" << n-1; std::clog.flush(); std::clog << "\r" << i++ << "/" << n-1; std::clog.flush();
eoPop<EOT> pop; eoPop<EOT> pop;

40
eo/test/t-eoFoundryFastGA.cpp
View file

@ -26,7 +26,7 @@ eoAlgoFoundryFastGA<Bits>& make_foundry(eoFunctorStore& store, eoInit<Bits>& ini
} }
for(size_t i=5; i<100; i+=10) { for(size_t i=5; i<100; i+=10) {
foundry.pop_sizes.add<size_t>(i); foundry.offspring_sizes.add<size_t>(i);
} }
/***** Crossovers ****/ /***** Crossovers ****/
@ -51,14 +51,24 @@ eoAlgoFoundryFastGA<Bits>& make_foundry(eoFunctorStore& store, eoInit<Bits>& ini
} }
/***** Selectors *****/ /***** Selectors *****/
foundry.selectors.add< eoRandomSelect<Bits> >(); for(eoOperatorFoundry<eoSelectOne<Bits>>& ops :
foundry.selectors.add< eoSequentialSelect<Bits> >(); {std::ref(foundry.crossover_selectors),
foundry.selectors.add< eoProportionalSelect<Bits> >(); std::ref(foundry.aftercross_selectors),
for(size_t i=2; i < 10; i+=1) { // Tournament size. std::ref(foundry.mutation_selectors) }) {
foundry.selectors.add< eoDetTournamentSelect<Bits> >(i);
ops.add< eoRandomSelect<Bits> >();
ops.add< eoStochTournamentSelect<Bits> >(0.5);
ops.add< eoSequentialSelect<Bits> >();
ops.add< eoProportionalSelect<Bits> >();
for(size_t i=2; i < 10; i+=4) {
ops.add< eoDetTournamentSelect<Bits> >(i);
} }
for(double i=0.51; i<0.91; i+=0.1) { // Tournament size as perc of pop. }
foundry.selectors.add< eoStochTournamentSelect<Bits> >(i);
/***** Variation rates *****/
for(double r = 0.0; r < 1.0; r+=0.1) {
foundry.crossover_rates.add<double>(r);
foundry. mutation_rates.add<double>(r);
} }
/***** Replacements ****/ /***** Replacements ****/
@ -88,7 +98,19 @@ int main(int /*argc*/, char** /*argv*/)
auto& foundry = make_foundry(store, init, onemax_eval); auto& foundry = make_foundry(store, init, onemax_eval);
size_t n = foundry.continuators.size() * foundry.crossovers.size() * foundry.mutations.size() * foundry.selectors.size() * foundry.replacements.size()* foundry.crossover_rates.size() * foundry.mutation_rates.size() * foundry.pop_sizes.size();
size_t n =
foundry.crossover_rates.size()
* foundry.crossover_selectors.size()
* foundry.crossovers.size()
* foundry.aftercross_selectors.size()
* foundry.mutation_rates.size()
* foundry.mutation_selectors.size()
* foundry.mutations.size()
* foundry.replacements.size()
* foundry.continuators.size()
* foundry.offspring_sizes.size();
std::clog << n << " possible algorithms instances." << std::endl; std::clog << n << " possible algorithms instances." << std::endl;
eoPop<Bits> pop; eoPop<Bits> pop;