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

Minor change of the best and current in moSimpleHC

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

28
trunk/paradiseo-mo/src/explorer/moSimpleHCexplorer.h
View file

@ -62,16 +62,12 @@ public:
*/ */
moSimpleHCexplorer(Neighborhood& _neighborhood, moEval<Neighbor>& _eval, moNeighborComparator<Neighbor>& _neighborComparator, moSolNeighborComparator<Neighbor>& _solNeighborComparator) : moNeighborhoodExplorer<Neighbor>(_neighborhood, _eval), neighborComparator(_neighborComparator), solNeighborComparator(_solNeighborComparator) { moSimpleHCexplorer(Neighborhood& _neighborhood, moEval<Neighbor>& _eval, moNeighborComparator<Neighbor>& _neighborComparator, moSolNeighborComparator<Neighbor>& _solNeighborComparator) : moNeighborhoodExplorer<Neighbor>(_neighborhood, _eval), neighborComparator(_neighborComparator), solNeighborComparator(_solNeighborComparator) {
isAccept = false; isAccept = false;
current=new Neighbor();
best=new Neighbor();
} }
/** /**
* Destructor * Destructor
*/ */
~moSimpleHCexplorer() { ~moSimpleHCexplorer() {
delete current;
delete best;
} }
/** /**
@ -100,23 +96,23 @@ 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, current);
//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, current);
//initialize the best neighbor //initialize the best neighbor
(*best) = (*current); best = current;
//test all others neighbors //test all others neighbors
while (neighborhood.cont(_solution)) { while (neighborhood.cont(_solution)) {
//next neighbor //next neighbor
neighborhood.next(_solution, (*current)); neighborhood.next(_solution, current);
//eval //eval
eval(_solution, (*current)); eval(_solution, current);
//if we found a better neighbor, update the best //if we found a better neighbor, update the best
if (neighborComparator((*best), (*current))) { if (neighborComparator(best, current)) {
(*best) = (*current); best = current;
} }
} }
@ -142,10 +138,10 @@ public:
*/ */
virtual void move(EOT & _solution) { virtual void move(EOT & _solution) {
//move the solution //move the solution
(*best).move(_solution); best.move(_solution);
//update its fitness //update its fitness
_solution.fitness((*best).fitness()); _solution.fitness(best.fitness());
}; };
@ -156,7 +152,7 @@ public:
*/ */
virtual bool accept(EOT & _solution) { virtual bool accept(EOT & _solution) {
if (neighborhood.hasNeighbor(_solution)) { if (neighborhood.hasNeighbor(_solution)) {
isAccept = solNeighborComparator(_solution, (*best)) ; isAccept = solNeighborComparator(_solution, best) ;
} }
return isAccept; return isAccept;
}; };
@ -175,8 +171,8 @@ private:
moSolNeighborComparator<Neighbor>& solNeighborComparator; moSolNeighborComparator<Neighbor>& solNeighborComparator;
//Pointer on the best and the current neighbor //Pointer on the best and the current neighbor
Neighbor* best; Neighbor best;
Neighbor* current; Neighbor current;
// true if the move is accepted // true if the move is accepted
bool isAccept ; bool isAccept ;