moILS has been added, berlin52.tsp too, moComparator, moFitComparator, ...
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@606 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jboisson
parent
98f2988555
commit
b1520dda65
366 changed files with 12063 additions and 1766 deletions
|
|
@ -15,13 +15,16 @@
|
|||
#include "moAlgo.h"
|
||||
#include "moAspirCrit.h"
|
||||
#include "moBestImprSelect.h"
|
||||
#include "moComparator.h"
|
||||
#include "moCoolingSchedule.h"
|
||||
#include "moExponentialCoolingSchedule.h"
|
||||
#include "moFirstImprSelect.h"
|
||||
#include "moFitComparator.h"
|
||||
#include "moGenSolContinue.h"
|
||||
#include "moHC.h"
|
||||
#include "moHCMoveLoopExpl.h"
|
||||
#include "moImprBestFitAspirCrit.h"
|
||||
#include "moILS.h"
|
||||
#include "moItRandNextMove.h"
|
||||
#include "moLinearCoolingSchedule.h"
|
||||
#include "moLSCheckPoint.h"
|
||||
|
|
|
|||
25
trunk/paradiseo-mo/src/moComparator.h
Normal file
25
trunk/paradiseo-mo/src/moComparator.h
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
|
||||
|
||||
// "moComparator.h"
|
||||
|
||||
// (c) OPAC Team, LIFL, 2003-2007
|
||||
|
||||
/* TEXT LICENCE
|
||||
|
||||
Contact: paradiseo-help@lists.gforge.inria.fr
|
||||
*/
|
||||
|
||||
#ifndef __moComparator_h
|
||||
#define __moComparator_h
|
||||
|
||||
|
||||
//! Template for classes which need to compare two EOT and indicate if the first is "better" than the second.
|
||||
/*!
|
||||
The objects that extend this template describe how an EOT is "better" than an other.
|
||||
*/
|
||||
template<class EOT>
|
||||
class moComparator: public eoBF<const EOT&, const EOT&, bool>
|
||||
{
|
||||
};
|
||||
|
||||
#endif
|
||||
29
trunk/paradiseo-mo/src/moFitComparator.h
Normal file
29
trunk/paradiseo-mo/src/moFitComparator.h
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
|
||||
|
||||
// "moFitComparator.h"
|
||||
|
||||
// (c) OPAC Team, LIFL, 2003-2007
|
||||
|
||||
/* TEXT LICENCE
|
||||
|
||||
Contact: paradiseo-help@lists.gforge.inria.fr
|
||||
*/
|
||||
|
||||
#ifndef __moFitComparator_h
|
||||
#define __moFitComparator_h
|
||||
|
||||
//! Comparison according to the fitness.
|
||||
/*!
|
||||
An EOT is better than an other if its fitness is better.
|
||||
*/
|
||||
template<class EOT>
|
||||
class moFitComparator: public moComparator<EOT>
|
||||
{
|
||||
public:
|
||||
bool operator()(const EOT& _solution1, const EOT& _solution2)
|
||||
{
|
||||
return _solution1.fitness()>_solution2.fitness();
|
||||
}
|
||||
};
|
||||
|
||||
#endif
|
||||
185
trunk/paradiseo-mo/src/moILS.h
Normal file
185
trunk/paradiseo-mo/src/moILS.h
Normal file
|
|
@ -0,0 +1,185 @@
|
|||
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
|
||||
|
||||
// "moILS.h"
|
||||
|
||||
// (c) OPAC Team, LIFL, 2003-2007
|
||||
|
||||
/* LICENCE TEXT
|
||||
|
||||
Contact: paradiseo-help@lists.gforge.inria.fr
|
||||
*/
|
||||
|
||||
#ifndef __moILS_h
|
||||
#define __moILS_h
|
||||
|
||||
#include <eoEvalFunc.h>
|
||||
|
||||
#include "moHC.h"
|
||||
#include "moTS.h"
|
||||
#include "moSA.h"
|
||||
|
||||
//! Iterated Local Search (ILS)
|
||||
/*!
|
||||
Class which describes the algorithm for a iterated local search.
|
||||
*/
|
||||
template < class M > class moILS:public moAlgo < typename M::EOType >
|
||||
{
|
||||
|
||||
//! Alias for the type.
|
||||
typedef typename M::EOType EOT;
|
||||
|
||||
//! Alias for the fitness.
|
||||
typedef typename EOT::Fitness Fitness;
|
||||
|
||||
public:
|
||||
|
||||
//! Generic constructor
|
||||
/*!
|
||||
Generic constructor using a moAlgo
|
||||
|
||||
\param __algo The solution based heuristic to use.
|
||||
\param __continue The stopping criterion.
|
||||
\param __acceptance_criterion The acceptance criterion.
|
||||
\param __perturbation The pertubation generator.
|
||||
\param __full_eval The evaluation function.
|
||||
*/
|
||||
moILS (moAlgo<EOT> &__algo, moSolContinue <EOT> &__continue, moComparator<EOT> &__acceptance_criterion, eoMonOp<EOT> &__perturbation,
|
||||
eoEvalFunc<EOT> &__full_eval):
|
||||
algo(__algo), cont(__continue), acceptance_criterion(__acceptance_criterion), perturbation(__perturbation), full_eval(__full_eval)
|
||||
{}
|
||||
|
||||
//! Constructor for using a moHC for the moAlgo
|
||||
/*!
|
||||
\param __move_init The move initialisation (for the moHC).
|
||||
\param __next_move The move generator (for the moHC).
|
||||
\param __incr_eval The partial evaluation function (for the moHC).
|
||||
\param __move_select The move selection strategy (for the moHC).
|
||||
\param __continue The stopping criterion.
|
||||
\param __acceptance_criterion The acceptance criterion.
|
||||
\param __perturbation The pertubation generator.
|
||||
\param __full_eval The evaluation function.
|
||||
*/
|
||||
moILS (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval,
|
||||
moMoveSelect < M > &__move_select, moSolContinue <EOT> &__continue, moComparator<EOT> &__acceptance_criterion,
|
||||
eoMonOp<EOT> &__perturbation, eoEvalFunc<EOT> &__full_eval):
|
||||
algo(*new moHC<M>(__move_init, __next_move, __incr_eval, __move_select, __full_eval)), cont(__continue),
|
||||
acceptance_criterion(__acceptance_criterion), perturbation(__perturbation), full_eval(__full_eval)
|
||||
{}
|
||||
|
||||
//! Constructor for using a moTS for the moAlgo
|
||||
/*!
|
||||
\param __move_init The move initialisation (for the moTS).
|
||||
\param __next_move The move generator (for the moTS).
|
||||
\param __incr_eval The partial evaluation function (for the moTS).
|
||||
\param __tabu_list The tabu list (for the moTS !!!!).
|
||||
\param __aspir_crit The aspiration criterion (for the moTS).
|
||||
\param __moTS_continue The stopping criterion (for the moTS).
|
||||
\param __continue The stopping criterion.
|
||||
\param __acceptance_criterion The acceptance criterion.
|
||||
\param __perturbation The pertubation generator.
|
||||
\param __full_eval The evaluation function.
|
||||
*/
|
||||
moILS (moMoveInit <M> &__move_init, moNextMove <M> &__next_move, moMoveIncrEval <M> &__incr_eval,
|
||||
moTabuList <M> &__tabu_list, moAspirCrit <M> &__aspir_crit, moSolContinue <EOT> &__moTS_continue,
|
||||
moSolContinue <EOT> &__continue, moComparator<EOT> &__acceptance_criterion, eoMonOp<EOT> &__perturbation,
|
||||
eoEvalFunc<EOT> &__full_eval):
|
||||
algo(*new moTS<M>(__move_init, __next_move, __incr_eval, __tabu_list, __aspir_crit, __moTS_continue, __full_eval)),
|
||||
cont(__continue), acceptance_criterion(__acceptance_criterion), perturbation(__perturbation), full_eval(__full_eval)
|
||||
{}
|
||||
|
||||
//! Constructor for using a moTS for the moAlgo
|
||||
/*!
|
||||
\param __move_rand The random move generator (for the moSA).
|
||||
\param __incr_eval The partial evaluation function (for the moSA).
|
||||
\param __moSA_continue The stopping criterion (for the moSA).
|
||||
\param __init_temp The initial temperature (for the moSA).
|
||||
\param __cool_sched The cooling scheduler (for the moSA).
|
||||
\param __continue The stopping criterion.
|
||||
\param __acceptance_criterion The acceptance criterion.
|
||||
\param __perturbation The pertubation generator.
|
||||
\param __full_eval The evaluation function.
|
||||
*/
|
||||
moILS (moRandMove<M> &__move_rand, moMoveIncrEval <M> &__incr_eval, moSolContinue <EOT> &__moSA_continue, double __init_temp,
|
||||
moCoolingSchedule & __cool_sched, moSolContinue <EOT> &__continue, moComparator<EOT> &__acceptance_criterion,
|
||||
eoMonOp<EOT> &__perturbation, eoEvalFunc<EOT> &__full_eval):
|
||||
algo(*new moSA<M>(__move_rand, __incr_eval, __moSA_continue, __init_temp, __cool_sched, __full_eval)),
|
||||
cont(__continue), acceptance_criterion(__acceptance_criterion), perturbation(__perturbation), full_eval(__full_eval)
|
||||
{}
|
||||
|
||||
|
||||
|
||||
//! Function which launches the ILS
|
||||
/*!
|
||||
The ILS has to improve a current solution.
|
||||
As the moSA, the moTS and the moHC, it can be used for HYBRIDATION in an evolutionnary algorithm.
|
||||
|
||||
\param __sol a current solution to improve.
|
||||
\return TRUE.
|
||||
*/
|
||||
bool operator()(EOT & __sol)
|
||||
{
|
||||
EOT __sol_saved=__sol;
|
||||
|
||||
cont.init ();
|
||||
|
||||
//some code has been duplicated in order to avoid one perturbation and one evaluation without adding a test in the loop.
|
||||
|
||||
//std::cout << "Before intensification: " << __sol.fitness() << std::endl;
|
||||
algo(__sol);
|
||||
//std::cout << "After intensification: " << __sol.fitness() << std::endl;
|
||||
|
||||
if(acceptance_criterion(__sol, __sol_saved))
|
||||
{
|
||||
std::cout << "Accepted: " << __sol.fitness() << std::endl;
|
||||
__sol_saved=__sol;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
//std::cout << "Refused" << std::endl;
|
||||
__sol=__sol_saved;
|
||||
}
|
||||
|
||||
while (cont (__sol))
|
||||
{
|
||||
perturbation(__sol);
|
||||
full_eval(__sol);
|
||||
|
||||
//std::cout << "Before intensification: " << __sol.fitness() << std::endl;
|
||||
algo(__sol);
|
||||
//std::cout << "After intensification: " << __sol.fitness() << std::endl;
|
||||
|
||||
if(acceptance_criterion(__sol, __sol_saved))
|
||||
{
|
||||
std::cout << "Accepted: " << __sol.fitness() << std::endl;
|
||||
__sol_saved=__sol;
|
||||
}
|
||||
else
|
||||
{
|
||||
//std::cout << "Refused" << std::endl;
|
||||
__sol=__sol_saved;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
//! The solution based heuristic.
|
||||
moAlgo<EOT> &algo;
|
||||
|
||||
//! The stopping criterion.
|
||||
moSolContinue<EOT> &cont;
|
||||
|
||||
//! The acceptance criterion.
|
||||
moComparator<EOT> &acceptance_criterion;
|
||||
|
||||
//! The perturbation generator
|
||||
eoMonOp<EOT> &perturbation;
|
||||
|
||||
//! The full evaluation function
|
||||
eoEvalFunc<EOT> &full_eval;
|
||||
};
|
||||
|
||||
#endif
|
||||
Loading…
Add table
Add a link
Reference in a new issue