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

refactor(tests): reduce runtime for foundry tests

Browse source
This commit is contained in:
Johann Dreo 2024-09-11 11:03:38 +02:00
commit db24e611b7
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,7 @@ int main(int /*argc*/, char** /*argv*/)
/***** Crossovers ****/ /***** Crossovers ****/
foundry.crossovers.add< eo1PtBitXover<EOT> >(); foundry.crossovers.add< eo1PtBitXover<EOT> >();
foundry.crossovers.add< eoUBitXover<EOT> >(0.5); // preference over 1 // foundry.crossovers.add< eoUBitXover<EOT> >(0.5); // preference over 1
for(size_t i=1; i < 11; i+=4) { for(size_t i=1; i < 11; i+=4) {
foundry.crossovers.add< eoNPtsBitXover<EOT> >(i); // nb of points foundry.crossovers.add< eoNPtsBitXover<EOT> >(i); // nb of points
} }
@ -43,9 +43,9 @@ int main(int /*argc*/, char** /*argv*/)
std::ref(foundry.mutation_selectors) }) { std::ref(foundry.mutation_selectors) }) {
ops.add< eoRandomSelect<EOT> >(); ops.add< eoRandomSelect<EOT> >();
ops.add< eoStochTournamentSelect<EOT> >(0.5); // ops.add< eoStochTournamentSelect<EOT> >(0.5);
ops.add< eoSequentialSelect<EOT> >(); // ops.add< eoSequentialSelect<EOT> >();
ops.add< eoProportionalSelect<EOT> >(); // ops.add< eoProportionalSelect<EOT> >();
for(size_t i=2; i < 10; i+=4) { for(size_t i=2; i < 10; i+=4) {
ops.add< eoDetTournamentSelect<EOT> >(i); ops.add< eoDetTournamentSelect<EOT> >(i);
} }
@ -53,16 +53,16 @@ int main(int /*argc*/, char** /*argv*/)
/***** Replacements ****/ /***** Replacements ****/
foundry.replacements.add< eoCommaReplacement<EOT> >(); foundry.replacements.add< eoCommaReplacement<EOT> >();
foundry.replacements.add< eoPlusReplacement<EOT> >(); // foundry.replacements.add< eoPlusReplacement<EOT> >();
foundry.replacements.add< eoSSGAWorseReplacement<EOT> >(); // foundry.replacements.add< eoSSGAWorseReplacement<EOT> >();
foundry.replacements.add< eoSSGAStochTournamentReplacement<EOT> >(0.51); // foundry.replacements.add< eoSSGAStochTournamentReplacement<EOT> >(0.51);
for(size_t i=2; i < 10; i+=4) { for(size_t i=2; i < 10; i+=4) {
foundry.replacements.add< eoSSGADetTournamentReplacement<EOT> >(i); foundry.replacements.add< eoSSGADetTournamentReplacement<EOT> >(i);
} }
/***** Continuators ****/ /***** Continuators ****/
for(size_t i=10; i < 30; i+=10 ) { for(size_t i=3; i < 5; i+=1 ) {
foundry.continuators.add< eoSteadyFitContinue<EOT> >(10,i); foundry.continuators.add< eoGenContinue<EOT> >(i);
} }

2
eo/test/t-forge-FastGA.cpp
View file

@ -19,7 +19,7 @@ int main(int /*argc*/, char** /*argv*/)
eoBooleanGenerator gen(0.5); eoBooleanGenerator gen(0.5);
eoInitFixedLength<EOT> init(dim, gen); eoInitFixedLength<EOT> init(dim, gen);
eoGenContinue<EOT> common_cont(100); eoGenContinue<EOT> common_cont(5);
eoForgeVector< eoContinue<EOT> > continuators; eoForgeVector< eoContinue<EOT> > continuators;
continuators.add< eoSteadyFitContinue<EOT> >(10,10); continuators.add< eoSteadyFitContinue<EOT> >(10,10);