Add the notion of currentNeighbor in the moNeighborhoodExploration
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2538 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
parent
8ca458536e
commit
05c14f31a6
2 changed files with 13 additions and 1 deletions
|
|
@ -118,11 +118,23 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
// default class for the empty constructor
|
||||||
moDummyNeighborhood<Neighbor> dummyNeighborhood;
|
moDummyNeighborhood<Neighbor> dummyNeighborhood;
|
||||||
|
|
||||||
|
// default class for the empty constructor
|
||||||
moDummyEval<Neighbor> dummyEval;
|
moDummyEval<Neighbor> dummyEval;
|
||||||
|
|
||||||
|
// the neighborhood which is explored
|
||||||
Neighborhood & neighborhood;
|
Neighborhood & neighborhood;
|
||||||
|
|
||||||
|
// evaluation of a neighbor
|
||||||
moEval<Neighbor>& eval;
|
moEval<Neighbor>& eval;
|
||||||
|
|
||||||
|
// flag : true a the neighbor is accepted and the movement is made
|
||||||
bool isMoved;
|
bool isMoved;
|
||||||
|
|
||||||
|
// the current neighbor of the exploration : common features of algorithm
|
||||||
|
Neighbor currentNeighbor
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -170,7 +170,7 @@ private:
|
||||||
moNeighborComparator<Neighbor>& neighborComparator;
|
moNeighborComparator<Neighbor>& neighborComparator;
|
||||||
moSolNeighborComparator<Neighbor>& solNeighborComparator;
|
moSolNeighborComparator<Neighbor>& solNeighborComparator;
|
||||||
|
|
||||||
//Pointer on the best and the current neighbor
|
// the best and the current neighbor
|
||||||
Neighbor best;
|
Neighbor best;
|
||||||
Neighbor current;
|
Neighbor current;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue