Update the explorer and the algo of TS to get the best so far solution
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1949 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
verel
parent
1e730f2646
commit
da555f2095
2 changed files with 128 additions and 118 deletions
|
|
@ -1,30 +1,30 @@
|
|||
/*
|
||||
<moTS.h>
|
||||
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
|
||||
<moTS.h>
|
||||
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
|
||||
|
||||
Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau
|
||||
Sébastien Verel, Arnaud Liefooghe, Jérémie Humeau
|
||||
|
||||
This software is governed by the CeCILL license under French law and
|
||||
abiding by the rules of distribution of free software. You can ue,
|
||||
modify and/ or redistribute the software under the terms of the CeCILL
|
||||
license as circulated by CEA, CNRS and INRIA at the following URL
|
||||
"http://www.cecill.info".
|
||||
This software is governed by the CeCILL license under French law and
|
||||
abiding by the rules of distribution of free software. You can ue,
|
||||
modify and/ or redistribute the software under the terms of the CeCILL
|
||||
license as circulated by CEA, CNRS and INRIA at the following URL
|
||||
"http://www.cecill.info".
|
||||
|
||||
In this respect, the user's attention is drawn to the risks associated
|
||||
with loading, using, modifying and/or developing or reproducing the
|
||||
software by the user in light of its specific status of free software,
|
||||
that may mean that it is complicated to manipulate, and that also
|
||||
therefore means that it is reserved for developers and experienced
|
||||
professionals having in-depth computer knowledge. Users are therefore
|
||||
encouraged to load and test the software's suitability as regards their
|
||||
requirements in conditions enabling the security of their systems and/or
|
||||
data to be ensured and, more generally, to use and operate it in the
|
||||
same conditions as regards security.
|
||||
The fact that you are presently reading this means that you have had
|
||||
knowledge of the CeCILL license and that you accept its terms.
|
||||
In this respect, the user's attention is drawn to the risks associated
|
||||
with loading, using, modifying and/or developing or reproducing the
|
||||
software by the user in light of its specific status of free software,
|
||||
that may mean that it is complicated to manipulate, and that also
|
||||
therefore means that it is reserved for developers and experienced
|
||||
professionals having in-depth computer knowledge. Users are therefore
|
||||
encouraged to load and test the software's suitability as regards their
|
||||
requirements in conditions enabling the security of their systems and/or
|
||||
data to be ensured and, more generally, to use and operate it in the
|
||||
same conditions as regards security.
|
||||
The fact that you are presently reading this means that you have had
|
||||
knowledge of the CeCILL license and that you accept its terms.
|
||||
|
||||
ParadisEO WebSite : http://paradiseo.gforge.inria.fr
|
||||
Contact: paradiseo-help@lists.gforge.inria.fr
|
||||
ParadisEO WebSite : http://paradiseo.gforge.inria.fr
|
||||
Contact: paradiseo-help@lists.gforge.inria.fr
|
||||
*/
|
||||
|
||||
#ifndef _moTS_h
|
||||
|
|
@ -51,107 +51,110 @@ class moTS: public moLocalSearch<Neighbor>
|
|||
{
|
||||
public:
|
||||
|
||||
typedef typename Neighbor::EOT EOT;
|
||||
typedef moNeighborhood<Neighbor> Neighborhood ;
|
||||
typedef typename Neighbor::EOT EOT;
|
||||
typedef moNeighborhood<Neighbor> Neighborhood ;
|
||||
|
||||
/**
|
||||
* Basic constructor for a tabu search
|
||||
* @param _neighborhood the neighborhood
|
||||
* @param _fullEval the full evaluation function
|
||||
* @param _eval neighbor's evaluation function
|
||||
* @param _time the time limit for stopping criteria
|
||||
* @param _tabuListSize the size of the tabu list
|
||||
*/
|
||||
moTS(Neighborhood& _neighborhood,
|
||||
eoEvalFunc<EOT>& _fullEval,
|
||||
moEval<Neighbor>& _eval,
|
||||
unsigned int _time,
|
||||
unsigned int _tabuListSize
|
||||
):
|
||||
moLocalSearch<Neighbor>(explorer, timeCont, _fullEval),
|
||||
timeCont(_time),
|
||||
tabuList(_tabuListSize,0),
|
||||
explorer(_neighborhood, _eval, defaultNeighborComp, defaultSolNeighborComp, tabuList, dummyIntensification, dummyDiversification, defaultAspiration)
|
||||
{}
|
||||
/**
|
||||
* Basic constructor for a tabu search
|
||||
* @param _neighborhood the neighborhood
|
||||
* @param _fullEval the full evaluation function
|
||||
* @param _eval neighbor's evaluation function
|
||||
* @param _time the time limit for stopping criteria
|
||||
* @param _tabuListSize the size of the tabu list
|
||||
*/
|
||||
moTS(Neighborhood& _neighborhood,
|
||||
eoEvalFunc<EOT>& _fullEval,
|
||||
moEval<Neighbor>& _eval,
|
||||
unsigned int _time,
|
||||
unsigned int _tabuListSize
|
||||
):
|
||||
moLocalSearch<Neighbor>(explorer, timeCont, _fullEval),
|
||||
timeCont(_time),
|
||||
tabuList(_tabuListSize,0),
|
||||
explorer(_neighborhood, _eval, defaultNeighborComp, defaultSolNeighborComp, tabuList, dummyIntensification, dummyDiversification, defaultAspiration)
|
||||
{}
|
||||
|
||||
/**
|
||||
* Simple constructor for a tabu search
|
||||
* @param _neighborhood the neighborhood
|
||||
* @param _fullEval the full evaluation function
|
||||
* @param _eval neighbor's evaluation function
|
||||
* @param _time the time limit for stopping criteria
|
||||
* @param _tabuList the tabu list
|
||||
*/
|
||||
moTS(Neighborhood& _neighborhood,
|
||||
eoEvalFunc<EOT>& _fullEval,
|
||||
moEval<Neighbor>& _eval,
|
||||
unsigned int _time,
|
||||
moTabuList<Neighbor>& _tabuList):
|
||||
moLocalSearch<Neighbor>(explorer, timeCont, _fullEval),
|
||||
timeCont(_time),
|
||||
tabuList(0,0),
|
||||
explorer(_neighborhood, _eval, defaultNeighborComp, defaultSolNeighborComp, _tabuList, dummyIntensification, dummyDiversification, defaultAspiration)
|
||||
{}
|
||||
/**
|
||||
* Simple constructor for a tabu search
|
||||
* @param _neighborhood the neighborhood
|
||||
* @param _fullEval the full evaluation function
|
||||
* @param _eval neighbor's evaluation function
|
||||
* @param _time the time limit for stopping criteria
|
||||
* @param _tabuList the tabu list
|
||||
*/
|
||||
moTS(Neighborhood& _neighborhood,
|
||||
eoEvalFunc<EOT>& _fullEval,
|
||||
moEval<Neighbor>& _eval,
|
||||
unsigned int _time,
|
||||
moTabuList<Neighbor>& _tabuList):
|
||||
moLocalSearch<Neighbor>(explorer, timeCont, _fullEval),
|
||||
timeCont(_time),
|
||||
tabuList(0,0),
|
||||
explorer(_neighborhood, _eval, defaultNeighborComp, defaultSolNeighborComp, _tabuList, dummyIntensification, dummyDiversification, defaultAspiration)
|
||||
{}
|
||||
|
||||
/**
|
||||
* General constructor for a tabu search
|
||||
* @param _neighborhood the neighborhood
|
||||
* @param _fullEval the full evaluation function
|
||||
* @param _eval neighbor's evaluation function
|
||||
* @param _cont an external continuator
|
||||
* @param _tabuList the tabu list
|
||||
* @param _aspiration the aspiration Criteria
|
||||
*/
|
||||
moTS(Neighborhood& _neighborhood,
|
||||
eoEvalFunc<EOT>& _fullEval,
|
||||
moEval<Neighbor>& _eval,
|
||||
moContinuator<Neighbor>& _cont,
|
||||
moTabuList<Neighbor>& _tabuList,
|
||||
moAspiration<Neighbor>& _aspiration):
|
||||
moLocalSearch<Neighbor>(explorer, _cont, _fullEval),
|
||||
timeCont(0),
|
||||
tabuList(0,0),
|
||||
explorer(_neighborhood, _eval, defaultNeighborComp, defaultSolNeighborComp, _tabuList, dummyIntensification, dummyDiversification, _aspiration)
|
||||
{}
|
||||
|
||||
/**
|
||||
* General constructor for a tabu search
|
||||
* @param _neighborhood the neighborhood
|
||||
* @param _fullEval the full evaluation function
|
||||
* @param _eval neighbor's evaluation function
|
||||
* @param _neighborComp a comparator between 2 neighbors
|
||||
* @param _solNeighborComp a solution vs neighbor comparator
|
||||
* @param _cont an external continuator
|
||||
* @param _tabuList the tabu list
|
||||
* @param _intensification the intensification strategy
|
||||
* @param _diversification the diversification strategy
|
||||
* @param _aspiration the aspiration Criteria
|
||||
*/
|
||||
moTS(Neighborhood& _neighborhood,
|
||||
eoEvalFunc<EOT>& _fullEval,
|
||||
moEval<Neighbor>& _eval,
|
||||
moNeighborComparator<Neighbor>& _neighborComp,
|
||||
moSolNeighborComparator<Neighbor>& _solNeighborComp,
|
||||
moContinuator<Neighbor>& _cont,
|
||||
moTabuList<Neighbor>& _tabuList,
|
||||
moIntensification<Neighbor>& _intensification,
|
||||
moDiversification<Neighbor>& _diversification,
|
||||
moAspiration<Neighbor>& _aspiration):
|
||||
moLocalSearch<Neighbor>(explorer, _cont, _fullEval),
|
||||
timeCont(0),
|
||||
tabuList(0,0),
|
||||
explorer(_neighborhood, _eval, _neighborComp, _solNeighborComp, _tabuList, _intensification, _diversification, _aspiration)
|
||||
{}
|
||||
/**
|
||||
* General constructor for a tabu search
|
||||
* @param _neighborhood the neighborhood
|
||||
* @param _fullEval the full evaluation function
|
||||
* @param _eval neighbor's evaluation function
|
||||
* @param _cont an external continuator
|
||||
* @param _tabuList the tabu list
|
||||
* @param _aspiration the aspiration Criteria
|
||||
*/
|
||||
moTS(Neighborhood& _neighborhood,
|
||||
eoEvalFunc<EOT>& _fullEval,
|
||||
moEval<Neighbor>& _eval,
|
||||
moContinuator<Neighbor>& _cont,
|
||||
moTabuList<Neighbor>& _tabuList,
|
||||
moAspiration<Neighbor>& _aspiration):
|
||||
moLocalSearch<Neighbor>(explorer, _cont, _fullEval),
|
||||
timeCont(0),
|
||||
tabuList(0,0),
|
||||
explorer(_neighborhood, _eval, defaultNeighborComp, defaultSolNeighborComp, _tabuList, dummyIntensification, dummyDiversification, _aspiration)
|
||||
{}
|
||||
|
||||
/**
|
||||
* General constructor for a tabu search
|
||||
* @param _neighborhood the neighborhood
|
||||
* @param _fullEval the full evaluation function
|
||||
* @param _eval neighbor's evaluation function
|
||||
* @param _neighborComp a comparator between 2 neighbors
|
||||
* @param _solNeighborComp a solution vs neighbor comparator
|
||||
* @param _cont an external continuator
|
||||
* @param _tabuList the tabu list
|
||||
* @param _intensification the intensification strategy
|
||||
* @param _diversification the diversification strategy
|
||||
* @param _aspiration the aspiration Criteria
|
||||
*/
|
||||
moTS(Neighborhood& _neighborhood,
|
||||
eoEvalFunc<EOT>& _fullEval,
|
||||
moEval<Neighbor>& _eval,
|
||||
moNeighborComparator<Neighbor>& _neighborComp,
|
||||
moSolNeighborComparator<Neighbor>& _solNeighborComp,
|
||||
moContinuator<Neighbor>& _cont,
|
||||
moTabuList<Neighbor>& _tabuList,
|
||||
moIntensification<Neighbor>& _intensification,
|
||||
moDiversification<Neighbor>& _diversification,
|
||||
moAspiration<Neighbor>& _aspiration):
|
||||
moLocalSearch<Neighbor>(explorer, _cont, _fullEval),
|
||||
timeCont(0),
|
||||
tabuList(0,0),
|
||||
explorer(_neighborhood, _eval, _neighborComp, _solNeighborComp, _tabuList, _intensification, _diversification, _aspiration)
|
||||
{}
|
||||
|
||||
moTSexplorer<Neighbor>& getExplorer() {
|
||||
return explorer;
|
||||
}
|
||||
|
||||
private:
|
||||
moTimeContinuator<Neighbor> timeCont;
|
||||
moNeighborComparator<Neighbor> defaultNeighborComp;
|
||||
moSolNeighborComparator<Neighbor> defaultSolNeighborComp;
|
||||
moNeighborVectorTabuList<Neighbor> tabuList;
|
||||
moDummyIntensification<Neighbor> dummyIntensification;
|
||||
moDummyDiversification<Neighbor> dummyDiversification;
|
||||
moBestImprAspiration<Neighbor> defaultAspiration;
|
||||
moTSexplorer<Neighbor> explorer;
|
||||
moTimeContinuator<Neighbor> timeCont;
|
||||
moNeighborComparator<Neighbor> defaultNeighborComp;
|
||||
moSolNeighborComparator<Neighbor> defaultSolNeighborComp;
|
||||
moNeighborVectorTabuList<Neighbor> tabuList;
|
||||
moDummyIntensification<Neighbor> dummyIntensification;
|
||||
moDummyDiversification<Neighbor> dummyDiversification;
|
||||
moBestImprAspiration<Neighbor> defaultAspiration;
|
||||
moTSexplorer<Neighbor> explorer;
|
||||
};
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -223,6 +223,13 @@ public:
|
|||
};
|
||||
|
||||
|
||||
/**
|
||||
* Give the current best found so far
|
||||
* @return the best solution so far
|
||||
*/
|
||||
const EOT& getBest() {
|
||||
return bestSoFar;
|
||||
};
|
||||
|
||||
protected:
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue