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

Modify the moPopXoverRndNeighborhood to limit the number of neighbors

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1910 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
verel 2010-08-24 16:40:40 +00:00
commit 5770cc8be6
1 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
trunk/paradiseo-mo/src/problems/bitString/moPopXoverRndNeighborhood.h
View file

@ -60,8 +60,9 @@ public:
/** /**
* Constructor * Constructor
* @param _crossover the crossover operator * @param _crossover the crossover operator
* @param _maxNeighbor maximum neighbors to explore in the neighborhood
*/ */
moPopXoverRndNeighborhood(eoQuadOp<SUBEOT> & _crossover): moRndNeighborhood<Neighbor>(), crossover(_crossover) {} moPopXoverRndNeighborhood(eoQuadOp<SUBEOT> & _crossover, unsigned int _maxNeighbor = 0): moRndNeighborhood<Neighbor>(), crossover(_crossover), maxNeighbor(_maxNeighbor) {}
/** /**
* Test if it exist a neighbor * Test if it exist a neighbor
@ -79,6 +80,18 @@ public:
* @param _neighbor the first neighbor * @param _neighbor the first neighbor
*/ */
virtual void init(EOT & _solution, Neighbor & _neighbor) { virtual void init(EOT & _solution, Neighbor & _neighbor) {
next(_solution, _neighbor);
nbNeighbor = 0;
}
/**
* Give the next neighbor
* apply a ones the crossover operato between random solutions
* @param _solution the solution to explore (population of solutions)
* @param _neighbor the next neighbor which is "random"
*/
virtual void next(EOT & _solution, Neighbor & _neighbor) {
unsigned int popSize = _solution.size(); unsigned int popSize = _solution.size();
// random solutions in the population // random solutions in the population
@ -98,16 +111,9 @@ public:
// apply the crossover // apply the crossover
crossover(_neighbor.solution1(), _neighbor.solution2()); crossover(_neighbor.solution1(), _neighbor.solution2());
}
/** // increase the number of neighbor explored
* Give the next neighbor nbNeighbor++;
* apply a ones the crossover operato between random solutions
* @param _solution the solution to explore (population of solutions)
* @param _neighbor the next neighbor which is "random"
*/
virtual void next(EOT & _solution, Neighbor & _neighbor) {
init(_solution, _neighbor);
} }
/** /**
@ -116,6 +122,9 @@ public:
* @return true if there is again a neighbor to explore: population size larger or equals than 2 * @return true if there is again a neighbor to explore: population size larger or equals than 2
*/ */
virtual bool cont(EOT & _solution) { virtual bool cont(EOT & _solution) {
if (maxNeighbor != 0)
return (_solution.size() > 1) && (nbNeighbor < maxNeighbor);
else
return _solution.size() > 1; return _solution.size() > 1;
} }
@ -129,6 +138,8 @@ public:
private: private:
eoQuadOp<SUBEOT> & crossover; eoQuadOp<SUBEOT> & crossover;
unsigned int maxNeighbor;
unsigned int nbNeighbor;
}; };
#endif #endif