Checking in the name changes in selection procedures.

This impacts on many files, creating new entries in src (the old ones are moved
to obsolete dir), modifying t-eoSymreg.cpp and t-eobin.cpp in test,
as well as gprop.cc and mastermind.cc in app dir (not to mention almost all
files in tutorial:-(
This commit is contained in:
evomarc 2001-01-05 05:42:08 +00:00
commit a998ad0a41
36 changed files with 922 additions and 226 deletions

View file

@ -103,6 +103,7 @@ cout << "Initial parents (odd)\n" << orgParents << "\n And initial offsprings (e
// the replacement procedures under test
eoGenerationalReplacement<Dummy> genReplace;
eoPlusReplacement<Dummy> plusReplace;
eoEPReplacement<Dummy> epReplace(tSize);
eoCommaReplacement<Dummy> commaReplace;
eoWeakElitistReplacement<Dummy> weakElitistReplace(commaReplace);
// the SSGA replacements
@ -129,6 +130,15 @@ cout << "Parents (originally odd)\n" << parents << "\n And offsprings (orogonall
plusReplace(parents, offspring);
cout << "Parents (originally odd)\n" << parents << "\n And offsprings (originally even)\n" << offspring << endl;
// EP (proche d'un PLUS
parents = orgParents;
offspring = orgOffspring;
cout << "eoEPReplacement\n";
cout << "===============\n";
epReplace(parents, offspring);
cout << "Parents (originally odd)\n" << parents << "\n And offsprings (originally even)\n" << offspring << endl;
// Comma
parents = orgParents;
offspring = orgOffspring;

View file

@ -235,7 +235,7 @@ int main()
seqSel.addOp(mutation, 0.25);
seqSel.addOp(xover, 0.75);
eoDetTournament<EoType> selector(5);
eoDetTournamentSelect<EoType> selector(5);
eoDetTournamentInserter<EoType> inserter(eval, 5);

View file

@ -147,7 +147,7 @@ void main_function()
monitor.add(stats);
checkpoint.add(stats);
eoProportional<Chrom> select;
eoProportionalSelect<Chrom> select;
eoEvalFuncPtr<Chrom> eval(binary_value);
eoSGA<Chrom> sga(select, xover, 0.8f, bitflip, 0.1f, eval, checkpoint);