diff --git a/trunk/paradiseo-mo/src/explorer/moTSexplorer.h b/trunk/paradiseo-mo/src/explorer/moTSexplorer.h index 8abf1da61..4ea4e0e03 100644 --- a/trunk/paradiseo-mo/src/explorer/moTSexplorer.h +++ b/trunk/paradiseo-mo/src/explorer/moTSexplorer.h @@ -31,233 +31,3 @@ ParadisEO WebSite : http://paradiseo.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr */ - -#ifndef _moTSexplorer_h -#define _moTSexplorer_h - -#include -#include -#include -#include -#include -#include -#include -#include - -/** - * Explorer for a Tabu Search - */ -template< class Neighbor > -class moTSexplorer : public moNeighborhoodExplorer -{ -public: - typedef typename Neighbor::EOT EOT ; - typedef moNeighborhood Neighborhood ; - - /** - * Constructor - * @param _neighborhood the neighborhood - * @param _eval the evaluation function - * @param _neighborComparator a neighbor comparator - * @param _solNeighborComparator a comparator between a solution and a neighbor - * @param _tabuList the tabu list - * @param _intensification the intensification box - * @param _diversification the diversification box - * @param _aspiration the aspiration criteria - */ - moTSexplorer(Neighborhood& _neighborhood, - moEval& _eval, - moNeighborComparator& _neighborComparator, - moSolNeighborComparator& _solNeighborComparator, - moTabuList & _tabuList, - moIntensification & _intensification, - moDiversification & _diversification, - moAspiration & _aspiration - ) : - moNeighborhoodExplorer(_neighborhood, _eval), neighborComparator(_neighborComparator), solNeighborComparator(_solNeighborComparator), - tabuList(_tabuList), intensification(_intensification), diversification(_diversification), aspiration(_aspiration) - { - isAccept = false; - current=new Neighbor(); - best=new Neighbor(); - } - - /** - * Destructor - */ - ~moTSexplorer() { - delete current; - delete best; - } - - /** - * init tabu list, intensification box, diversification box and aspiration criteria - * @param _solution - */ - virtual void initParam(EOT& _solution) - { - tabuList.init(_solution); - intensification.init(_solution); - diversification.init(_solution); - aspiration.init(_solution); - bestSoFar=_solution; - }; - - - /** - * update params of tabu list, intensification box, diversification box and aspiration criteria - * @param _solution - */ - virtual void updateParam(EOT& _solution) - { - if ((*this).moveApplied()) { - tabuList.add(_solution, *best); - intensification.add(_solution, *best); - diversification.add(_solution, *best); - if (_solution.fitness() > bestSoFar.fitness()) - bestSoFar = _solution; - } - tabuList.update(_solution, *best); - intensification.update(_solution, *best); - diversification.update(_solution, *best); - aspiration.update(_solution, *best); - }; - - - /** - * terminate : _solution becomes the best so far - */ - virtual void terminate(EOT & _solution) { - _solution= bestSoFar; - }; - - - /** - * Explore the neighborhood of a solution - * @param _solution - */ - virtual void operator()(EOT & _solution) - { - bool found=false; - intensification(_solution); - diversification(_solution); - if (neighborhood.hasNeighbor(_solution)) - { - //init the current neighbor - neighborhood.init(_solution, *current); - //eval the current neighbor - eval(_solution, *current); - - //Find the first non-tabu element - if ( (!tabuList.check(_solution, *current)) || aspiration(_solution, *current) ) { - // set best - (*best)= (*current); - found=true; - } - while (neighborhood.cont(_solution) && !found) { - //next neighbor - neighborhood.next(_solution, (*current)); - //eval - eval(_solution, (*current)); - - if ( (!tabuList.check(_solution, *current)) || aspiration(_solution, *current) ) { - // set best - (*best)=(*current); - found=true; - } - } - //Explore the neighborhood - if (found) { - isAccept=true; - while (neighborhood.cont(_solution)) { - //next neighbor - neighborhood.next(_solution, (*current)); - //eval - eval(_solution, (*current)); - //check if the current is better than the best and is not tabu or if it is aspirat (by the aspiration criteria of course) - if ( (!tabuList.check(_solution, *current) || aspiration(_solution, (*current))) && neighborComparator((*best),(*current))) { - // set best - (*best)=(*current); - } - } - } - else { - isAccept=false; - } - } - else { - isAccept=false; - } - - }; - - - /** - * always continue - * @param _solution the solution - * @return true - */ - virtual bool isContinue(EOT & _solution) { - return true; - }; - - - /** - * move the solution with the best neighbor - * @param _solution the solution to move - */ - virtual void move(EOT & _solution) { - //move the solution - best->move(_solution); - //update its fitness - _solution.fitness(best->fitness()); - }; - - - /** - * accept test if an ameliorated neighbor was found - * @param _solution the solution - * @return true if the best neighbor ameliorate the fitness - */ - virtual bool accept(EOT & _solution) { - return isAccept; - }; - - - /** - * Give the current best found so far - * @return the best solution so far - */ - const EOT& getBest() { - return bestSoFar; - }; - -protected: - - using moNeighborhoodExplorer::neighborhood; - using moNeighborhoodExplorer::eval; - - // comparator between solution and neighbor or between neighbors - moNeighborComparator& neighborComparator; - moSolNeighborComparator& solNeighborComparator; - - // Tabu components - moTabuList & tabuList; - moIntensification & intensification; - moDiversification & diversification; - moAspiration & aspiration; - - //Current and best neighbor - Neighbor* best; - Neighbor* current; - - //Best so far Solution - EOT bestSoFar; - - // true if the move is accepted - bool isAccept ; - -}; - - -#endif