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

Add the notion of currentNeighbor in the moFirstImprHCexplorer

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

18
trunk/paradiseo-mo/src/explorer/moFirstImprHCexplorer.h
View file

@ -98,17 +98,17 @@ public:
//Test if _solution has a Neighbor //Test if _solution has a Neighbor
if (neighborhood.hasNeighbor(_solution)) { if (neighborhood.hasNeighbor(_solution)) {
//init the first neighbor //init the first neighbor
neighborhood.init(_solution, (*current)); neighborhood.init(_solution, currentNeighbor);
//eval the _solution moved with the neighbor and stock the result in the neighbor //eval the _solution moved with the neighbor and stock the result in the neighbor
eval(_solution, (*current)); eval(_solution, currentNeighbor);
//test all others neighbors //test all others neighbors
while (! solNeighborComparator(_solution, *current) && neighborhood.cont(_solution)) { while (! solNeighborComparator(_solution, currentNeighbor) && neighborhood.cont(_solution)) {
//next neighbor //next neighbor
neighborhood.next(_solution, (*current)); neighborhood.next(_solution, currentNeighbor);
//eval //eval
eval(_solution, (*current)); eval(_solution, currentNeighbor);
} }
} }
else { else {
@ -132,9 +132,9 @@ public:
*/ */
virtual void move(EOT & _solution) { virtual void move(EOT & _solution) {
//move the solution //move the solution
(*current).move(_solution); currentNeighbor.move(_solution);
//update its fitness //update its fitness
_solution.fitness((*current).fitness()); _solution.fitness(currentNeighbor.fitness());
}; };
/** /**
@ -144,7 +144,7 @@ public:
*/ */
virtual bool accept(EOT & _solution) { virtual bool accept(EOT & _solution) {
if (neighborhood.hasNeighbor(_solution)) { if (neighborhood.hasNeighbor(_solution)) {
isAccept = solNeighborComparator(_solution, (*current)) ; isAccept = solNeighborComparator(_solution, currentNeighbor) ;
} }
return isAccept; return isAccept;
}; };
@ -155,7 +155,7 @@ private:
moSolNeighborComparator<Neighbor>& solNeighborComparator; moSolNeighborComparator<Neighbor>& solNeighborComparator;
//Pointer on the best and the current neighbor //Pointer on the best and the current neighbor
Neighbor* current; // Neighbor* current;
// true if the move is accepted // true if the move is accepted
bool isAccept ; bool isAccept ;