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

Use the variable selectedNeighbor moSimpleHC, moFirstImprHC, moRandomBestHC

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2558 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
verel 2011-12-10 10:59:35 +00:00
commit 159de4ca13
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
trunk/paradiseo-mo/src/explorer/moRandomBestHCexplorer.h
View file

@ -56,6 +56,7 @@ public:
using moNeighborhoodExplorer<Neighbor>::neighborhood; using moNeighborhoodExplorer<Neighbor>::neighborhood;
using moNeighborhoodExplorer<Neighbor>::eval; using moNeighborhoodExplorer<Neighbor>::eval;
using moNeighborhoodExplorer<Neighbor>::currentNeighbor; using moNeighborhoodExplorer<Neighbor>::currentNeighbor;
using moNeighborhoodExplorer<Neighbor>::selectedNeighbor;
/** /**
* Constructor * Constructor
@ -137,6 +138,12 @@ public:
else if (neighborComparator.equals(currentNeighbor, bestVector[0])) //if the current is equals to previous best solutions then update vector of the best solution else if (neighborComparator.equals(currentNeighbor, bestVector[0])) //if the current is equals to previous best solutions then update vector of the best solution
bestVector.push_back(currentNeighbor); bestVector.push_back(currentNeighbor);
} }
// choose randomly one of the best solutions
unsigned int i = rng.random(bestVector.size());
// the selected Neighbor
selectedNeighbor = bestVector[i];
} }
else { else {
//if _solution hasn't neighbor, //if _solution hasn't neighbor,
@ -157,6 +164,7 @@ public:
* move the solution with the best neighbor * move the solution with the best neighbor
* @param _solution the solution to move * @param _solution the solution to move
*/ */
/*
virtual void move(EOT & _solution) { virtual void move(EOT & _solution) {
// choose randomly one of the best solutions // choose randomly one of the best solutions
unsigned int i = rng.random(bestVector.size()); unsigned int i = rng.random(bestVector.size());
@ -167,6 +175,7 @@ public:
//update its fitness //update its fitness
_solution.fitness(bestVector[i].fitness()); _solution.fitness(bestVector[i].fitness());
}; };
*/
/** /**
* accept test if an amelirated neighbor was found * accept test if an amelirated neighbor was found
@ -175,7 +184,7 @@ public:
*/ */
virtual bool accept(EOT & _solution) { virtual bool accept(EOT & _solution) {
if (neighborhood.hasNeighbor(_solution)) if (neighborhood.hasNeighbor(_solution))
isAccept = solNeighborComparator(_solution, bestVector[0]) ; isAccept = solNeighborComparator(_solution, selectedNeighbor) ;
return isAccept; return isAccept;
}; };