Added a field for saving the fitness of the solution (useful for monitoring)

This commit is contained in:
LPTK 2013-07-18 14:13:35 +02:00
commit 6548a0e223

View file

@ -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 * Constructor of a moLocalSearch
* @param _searchExpl a neighborhood explorer * @param _searchExpl a neighborhood explorer
* @param _cont an external continuator (can be a checkpoint!) * @param _cont an external continuator (can be a checkpoint!)
* @param _fullEval a full evaluation function * @param _fullEval a full evaluation function
*/ */
moLocalSearch(NeighborhoodExplorer& _searchExpl, moLocalSearch(NeighborhoodExplorer& _searchExpl, moContinuator<Neighbor> & _cont, eoEvalFunc<EOT>& _fullEval)
moContinuator<Neighbor> & _cont, eoEvalFunc<EOT>& _fullEval) : : searchExplorer(_searchExpl), cont(&_cont), fullEval(_fullEval), currentSolutionFitness(0)
searchExplorer(_searchExpl), cont(&_cont), fullEval(_fullEval) { { }
}
;
/** /**
* Run the local search on a solution * Run the local search on a solution
* @param _solution the related solution * @param _solution the related solution
*/ */
virtual bool operator()(EOT & _solution) { virtual bool operator()(EOT & _solution) {
if (_solution.invalid()) if (_solution.invalid())
fullEval(_solution); fullEval(_solution);
// initialization of the parameter of the search (for example fill empty the tabu list) // initialization of the parameter of the search (for example fill empty the tabu list)
searchExplorer.initParam(_solution); searchExplorer.initParam(_solution);
// initialization of the external continuator (for example the time, or the number of generations) // initialization of the external continuator (for example the time, or the number of generations)
cont->init(_solution); cont->init(_solution);
bool b; bool b;
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) do
searchExplorer.updateParam(_solution); {
currentSolutionFitness = _solution.fitness();
b = (*cont)(_solution); // explore the neighborhood of the solution
} while (b && searchExplorer.isContinue(_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);
searchExplorer.terminate(_solution); // update the parameter of the search (for ex. Temperature of the SA)
searchExplorer.updateParam(_solution);
cont->lastCall(_solution); b = (*cont)(_solution);
}
while (b && searchExplorer.isContinue(_solution));
return true; searchExplorer.terminate(_solution);
}
;
/** cont->lastCall(_solution);
* Set an external continuator
* @param _cont the external continuator
*/
void setContinuator(moContinuator<Neighbor> & _cont) {
cont = &_cont;
}
/** return true;
* external continuator object }
*
* @overload
* @return the external continuator
*/
moContinuator<Neighbor>* getContinuator() const {
return cont;
}
/** /**
* to get the neighborhood explorer * Set an external continuator
* * @param _cont the external continuator
* @overload */
* @return the neighborhood explorer void setContinuator(moContinuator<Neighbor> & _cont) {
*/ cont = &_cont;
moNeighborhoodExplorer<Neighbor> & getNeighborhoodExplorer() const { }
return searchExplorer;
} /**
* 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;
}
/**
* Useful for monitoring with anb eoGetterUpdater
* @return the fitness of the last computed solution
*/
double getCurrentSolutionFitness() const {
return currentSolutionFitness;
}
protected: protected:
// make the exploration of the neighborhood according to a local search heuristic
moNeighborhoodExplorer<Neighbor>& searchExplorer;
// external continuator // make the exploration of the neighborhood according to a local search heuristic
moContinuator<Neighbor> * cont; moNeighborhoodExplorer<Neighbor>& searchExplorer;
// external continuator
moContinuator<Neighbor> * cont;
//full evaluation function
eoEvalFunc<EOT>& fullEval;
private:
// fitness of the last computed solution
double currentSolutionFitness;
//full evaluation function
eoEvalFunc<EOT>& fullEval;
}; };
#endif #endif