some small changes on tutorial after fusion
This commit is contained in:
parent
1da5f37d96
commit
0f9434387e
7 changed files with 8 additions and 7 deletions
|
|
@ -125,7 +125,7 @@ void main_function(int argc, char **argv)
|
||||||
// Combine them with relative rates
|
// Combine them with relative rates
|
||||||
eoPropCombinedQuadOp<Indi> xover(xover1, onePointRate);
|
eoPropCombinedQuadOp<Indi> xover(xover1, onePointRate);
|
||||||
xover.add(xoverU, URate);
|
xover.add(xoverU, URate);
|
||||||
xover.add(xover2, twoPointsRate, true);
|
xover.add(xover2, twoPointsRate);
|
||||||
|
|
||||||
// MUTATION
|
// MUTATION
|
||||||
// standard bit-flip mutation for bitstring
|
// standard bit-flip mutation for bitstring
|
||||||
|
|
|
||||||
|
|
@ -122,7 +122,7 @@ void main_function(int argc, char **argv)
|
||||||
eoHypercubeCrossover<Indi> xoverA;
|
eoHypercubeCrossover<Indi> xoverA;
|
||||||
// Combine them with relative weights
|
// Combine them with relative weights
|
||||||
eoPropCombinedQuadOp<Indi> xover(xoverS, segmentRate);
|
eoPropCombinedQuadOp<Indi> xover(xoverS, segmentRate);
|
||||||
xover.add(xoverA, hypercubeRate, true);
|
xover.add(xoverA, hypercubeRate);
|
||||||
|
|
||||||
// MUTATION
|
// MUTATION
|
||||||
// offspring(i) uniformly chosen in [parent(i)-epsilon, parent(i)+epsilon]
|
// offspring(i) uniformly chosen in [parent(i)-epsilon, parent(i)+epsilon]
|
||||||
|
|
|
||||||
|
|
@ -131,7 +131,7 @@ void main_function(int argc, char **argv)
|
||||||
// Combine them with relative rates
|
// Combine them with relative rates
|
||||||
eoPropCombinedQuadOp<Indi> xover(xover1, onePointRate);
|
eoPropCombinedQuadOp<Indi> xover(xover1, onePointRate);
|
||||||
xover.add(xoverU, URate);
|
xover.add(xoverU, URate);
|
||||||
xover.add(xover2, twoPointsRate, true);
|
xover.add(xover2, twoPointsRate);
|
||||||
|
|
||||||
// MUTATION
|
// MUTATION
|
||||||
// standard bit-flip mutation for bitstring
|
// standard bit-flip mutation for bitstring
|
||||||
|
|
|
||||||
|
|
@ -214,7 +214,7 @@ void main_function(int argc, char **argv)
|
||||||
// Combine them with relative rates
|
// Combine them with relative rates
|
||||||
eoPropCombinedQuadOp<Indi> xover(xover1, onePointRate);
|
eoPropCombinedQuadOp<Indi> xover(xover1, onePointRate);
|
||||||
xover.add(xoverU, URate);
|
xover.add(xoverU, URate);
|
||||||
xover.add(xover2, twoPointsRate, true);
|
xover.add(xover2, twoPointsRate);
|
||||||
|
|
||||||
// MUTATION
|
// MUTATION
|
||||||
// standard bit-flip mutation for bitstring
|
// standard bit-flip mutation for bitstring
|
||||||
|
|
|
||||||
|
|
@ -191,7 +191,7 @@ void main_function(int argc, char **argv)
|
||||||
eoHypercubeCrossover<Indi> xoverA;
|
eoHypercubeCrossover<Indi> xoverA;
|
||||||
// Combine them with relative weights
|
// Combine them with relative weights
|
||||||
eoPropCombinedQuadOp<Indi> xover(xoverS, segmentRate);
|
eoPropCombinedQuadOp<Indi> xover(xoverS, segmentRate);
|
||||||
xover.add(xoverA, hypercubeRate, true);
|
xover.add(xoverA, hypercubeRate);
|
||||||
|
|
||||||
// MUTATION
|
// MUTATION
|
||||||
// offspring(i) uniformly chosen in [parent(i)-epsilon, parent(i)+epsilon]
|
// offspring(i) uniformly chosen in [parent(i)-epsilon, parent(i)+epsilon]
|
||||||
|
|
|
||||||
|
|
@ -219,7 +219,7 @@ void main_function(int argc, char **argv)
|
||||||
// Combine them with relative rates
|
// Combine them with relative rates
|
||||||
eoPropCombinedQuadOp<Indi> xover(xover1, onePointRate);
|
eoPropCombinedQuadOp<Indi> xover(xover1, onePointRate);
|
||||||
xover.add(xoverU, URate);
|
xover.add(xoverU, URate);
|
||||||
xover.add(xover2, twoPointsRate, true);
|
xover.add(xover2, twoPointsRate);
|
||||||
|
|
||||||
// MUTATION
|
// MUTATION
|
||||||
// standard bit-flip mutation for bitstring
|
// standard bit-flip mutation for bitstring
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,8 @@ using namespace std;
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// neighborhood description
|
// neighborhood description
|
||||||
#include <neighborhood/moOrderNeighborhood.h> // visit all neighbors in increasing order of bit index
|
#include <neighborhood/moRndWithReplNeighborhood.h> // visit all neighbors in random order with neighbor
|
||||||
|
#include <neighborhood/moOrderNeighborhood.h> // visit all neighbors in order with neighbor
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// the simple Hill-Climbing local search
|
// the simple Hill-Climbing local search
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue