Added a field for saving the fitness of the solution (useful for monitoring)
This commit is contained in:
parent
b5f15a4a3d
commit
6548a0e223
1 changed files with 108 additions and 91 deletions
|
|
@ -47,99 +47,116 @@
|
||||||
template<class Neighbor>
|
template<class Neighbor>
|
||||||
class moLocalSearch: public eoMonOp<typename Neighbor::EOT> {
|
class moLocalSearch: public eoMonOp<typename Neighbor::EOT> {
|
||||||
public:
|
public:
|
||||||
typedef moNeighborhood<Neighbor> Neighborhood;
|
typedef moNeighborhood<Neighbor> Neighborhood;
|
||||||
typedef moNeighborhoodExplorer<Neighbor> NeighborhoodExplorer;
|
typedef moNeighborhoodExplorer<Neighbor> NeighborhoodExplorer;
|
||||||
typedef typename Neighbor::EOT EOT;
|
typedef typename Neighbor::EOT EOT;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructor of a moLocalSearch
|
||||||
|
* @param _searchExpl a neighborhood explorer
|
||||||
|
* @param _cont an external continuator (can be a checkpoint!)
|
||||||
|
* @param _fullEval a full evaluation function
|
||||||
|
*/
|
||||||
|
moLocalSearch(NeighborhoodExplorer& _searchExpl, moContinuator<Neighbor> & _cont, eoEvalFunc<EOT>& _fullEval)
|
||||||
|
: searchExplorer(_searchExpl), cont(&_cont), fullEval(_fullEval), currentSolutionFitness(0)
|
||||||
|
{ }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run the local search on a solution
|
||||||
|
* @param _solution the related solution
|
||||||
|
*/
|
||||||
|
virtual bool operator()(EOT & _solution) {
|
||||||
|
|
||||||
/**
|
if (_solution.invalid())
|
||||||
* Constructor of a moLocalSearch
|
fullEval(_solution);
|
||||||
* @param _searchExpl a neighborhood explorer
|
|
||||||
* @param _cont an external continuator (can be a checkpoint!)
|
// initialization of the parameter of the search (for example fill empty the tabu list)
|
||||||
* @param _fullEval a full evaluation function
|
searchExplorer.initParam(_solution);
|
||||||
*/
|
|
||||||
moLocalSearch(NeighborhoodExplorer& _searchExpl,
|
// initialization of the external continuator (for example the time, or the number of generations)
|
||||||
moContinuator<Neighbor> & _cont, eoEvalFunc<EOT>& _fullEval) :
|
cont->init(_solution);
|
||||||
searchExplorer(_searchExpl), cont(&_cont), fullEval(_fullEval) {
|
|
||||||
}
|
bool b;
|
||||||
;
|
|
||||||
|
do
|
||||||
|
{
|
||||||
|
currentSolutionFitness = _solution.fitness();
|
||||||
|
|
||||||
|
// explore the neighborhood of the solution
|
||||||
|
searchExplorer(_solution);
|
||||||
|
// if a solution in the neighborhood can be accepted
|
||||||
|
if (searchExplorer.accept(_solution)) {
|
||||||
|
searchExplorer.move(_solution);
|
||||||
|
searchExplorer.moveApplied(true);
|
||||||
|
} else
|
||||||
|
searchExplorer.moveApplied(false);
|
||||||
|
|
||||||
/**
|
// update the parameter of the search (for ex. Temperature of the SA)
|
||||||
* Run the local search on a solution
|
searchExplorer.updateParam(_solution);
|
||||||
* @param _solution the related solution
|
|
||||||
*/
|
|
||||||
virtual bool operator()(EOT & _solution) {
|
|
||||||
|
|
||||||
if (_solution.invalid())
|
b = (*cont)(_solution);
|
||||||
fullEval(_solution);
|
}
|
||||||
|
while (b && searchExplorer.isContinue(_solution));
|
||||||
|
|
||||||
// initialization of the parameter of the search (for example fill empty the tabu list)
|
searchExplorer.terminate(_solution);
|
||||||
searchExplorer.initParam(_solution);
|
|
||||||
|
|
||||||
// initialization of the external continuator (for example the time, or the number of generations)
|
cont->lastCall(_solution);
|
||||||
cont->init(_solution);
|
|
||||||
|
|
||||||
bool b;
|
return true;
|
||||||
do {
|
}
|
||||||
// explore the neighborhood of the solution
|
|
||||||
searchExplorer(_solution);
|
|
||||||
// if a solution in the neighborhood can be accepted
|
|
||||||
if (searchExplorer.accept(_solution)) {
|
|
||||||
searchExplorer.move(_solution);
|
|
||||||
searchExplorer.moveApplied(true);
|
|
||||||
} else
|
|
||||||
searchExplorer.moveApplied(false);
|
|
||||||
|
|
||||||
// update the parameter of the search (for ex. Temperature of the SA)
|
/**
|
||||||
searchExplorer.updateParam(_solution);
|
* Set an external continuator
|
||||||
|
* @param _cont the external continuator
|
||||||
|
*/
|
||||||
|
void setContinuator(moContinuator<Neighbor> & _cont) {
|
||||||
|
cont = &_cont;
|
||||||
|
}
|
||||||
|
|
||||||
b = (*cont)(_solution);
|
/**
|
||||||
} while (b && searchExplorer.isContinue(_solution));
|
* external continuator object
|
||||||
|
*
|
||||||
|
* @overload
|
||||||
|
* @return the external continuator
|
||||||
|
*/
|
||||||
|
moContinuator<Neighbor>* getContinuator() const {
|
||||||
|
return cont;
|
||||||
|
}
|
||||||
|
|
||||||
searchExplorer.terminate(_solution);
|
/**
|
||||||
|
* to get the neighborhood explorer
|
||||||
|
*
|
||||||
|
* @overload
|
||||||
|
* @return the neighborhood explorer
|
||||||
|
*/
|
||||||
|
moNeighborhoodExplorer<Neighbor> & getNeighborhoodExplorer() const {
|
||||||
|
return searchExplorer;
|
||||||
|
}
|
||||||
|
|
||||||
cont->lastCall(_solution);
|
/**
|
||||||
|
* Useful for monitoring with anb eoGetterUpdater
|
||||||
return true;
|
* @return the fitness of the last computed solution
|
||||||
}
|
*/
|
||||||
;
|
double getCurrentSolutionFitness() const {
|
||||||
|
return currentSolutionFitness;
|
||||||
/**
|
}
|
||||||
* Set an external continuator
|
|
||||||
* @param _cont the external continuator
|
|
||||||
*/
|
|
||||||
void setContinuator(moContinuator<Neighbor> & _cont) {
|
|
||||||
cont = &_cont;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* external continuator object
|
|
||||||
*
|
|
||||||
* @overload
|
|
||||||
* @return the external continuator
|
|
||||||
*/
|
|
||||||
moContinuator<Neighbor>* getContinuator() const {
|
|
||||||
return cont;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* to get the neighborhood explorer
|
|
||||||
*
|
|
||||||
* @overload
|
|
||||||
* @return the neighborhood explorer
|
|
||||||
*/
|
|
||||||
moNeighborhoodExplorer<Neighbor> & getNeighborhoodExplorer() const {
|
|
||||||
return searchExplorer;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
// make the exploration of the neighborhood according to a local search heuristic
|
|
||||||
moNeighborhoodExplorer<Neighbor>& searchExplorer;
|
// make the exploration of the neighborhood according to a local search heuristic
|
||||||
|
moNeighborhoodExplorer<Neighbor>& searchExplorer;
|
||||||
|
|
||||||
// external continuator
|
// external continuator
|
||||||
moContinuator<Neighbor> * cont;
|
moContinuator<Neighbor> * cont;
|
||||||
|
|
||||||
//full evaluation function
|
//full evaluation function
|
||||||
eoEvalFunc<EOT>& fullEval;
|
eoEvalFunc<EOT>& fullEval;
|
||||||
|
|
||||||
|
private:
|
||||||
|
|
||||||
|
// fitness of the last computed solution
|
||||||
|
double currentSolutionFitness;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue