New style for MO

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@787 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
canape 2007-11-16 11:25:54 +00:00
commit 7161febf9c
80 changed files with 2014 additions and 2038 deletions

View file

@ -1,4 +1,4 @@
/*
/*
* <moSA.h>
* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007
* (C) OPAC Team, LIFL, 2002-2007
@ -53,122 +53,120 @@
Class that describes a Simulated Annealing algorithm.
*/
template < class M > class moSA:public moAlgo < typename M::EOType >
{
{
//! Alias for the type
typedef
//! Alias for the type
typedef
typename
M::EOType
EOT;
//! Alias for the fitness
typedef
//! Alias for the fitness
typedef
typename
EOT::Fitness
Fitness;
public:
public:
//! SA constructor
/*!
All the boxes used by a SA need to be given.
//! SA constructor
/*!
All the boxes used by a SA need to be given.
\param __move_rand a move generator (generally randomly).
\param __incr_eval a (generaly) efficient evaluation function
\param __cont a stopping criterion.
\param __init_temp the initial temperature.
\param __cool_sched a cooling schedule, describes how the temperature is modified.
\param __full_eval a full evaluation function.
*/
moSA (moRandMove < M > &__move_rand,
moMoveIncrEval < M > &__incr_eval,
moSolContinue < EOT > &__cont,
double __init_temp,
moCoolingSchedule & __cool_sched, eoEvalFunc < EOT > &__full_eval):
move_rand (__move_rand),
incr_eval (__incr_eval),
cont (__cont),
init_temp (__init_temp),
cool_sched (__cool_sched),
full_eval (__full_eval)
{
\param __move_rand a move generator (generally randomly).
\param __incr_eval a (generaly) efficient evaluation function
\param __cont a stopping criterion.
\param __init_temp the initial temperature.
\param __cool_sched a cooling schedule, describes how the temperature is modified.
\param __full_eval a full evaluation function.
*/
moSA (moRandMove < M > &__move_rand,
moMoveIncrEval < M > &__incr_eval,
moSolContinue < EOT > &__cont,
double __init_temp,
moCoolingSchedule & __cool_sched, eoEvalFunc < EOT > &__full_eval):
move_rand (__move_rand),
incr_eval (__incr_eval),
cont (__cont),
init_temp (__init_temp),
cool_sched (__cool_sched),
full_eval (__full_eval)
{}
}
//! function that launches the SA algorithm.
/*!
As a moTS or a moHC, the SA can be used for HYBRIDATION in an evolutionary algorithm.
//! function that launches the SA algorithm.
/*!
As a moTS or a moHC, the SA can be used for HYBRIDATION in an evolutionary algorithm.
\param __sol a solution to improve.
\return TRUE.
*/
bool operator ()(EOT & __sol)
{
\param __sol a solution to improve.
\return TRUE.
*/
bool operator ()(EOT & __sol)
{
if (__sol.invalid ())
{
full_eval (__sol);
}
if (__sol.invalid ())
{
full_eval (__sol);
}
double temp = init_temp;
double temp = init_temp;
M move;
M move;
EOT best_sol = __sol;
EOT best_sol = __sol;
do
{
do
{
cont.init ();
do
{
cont.init ();
do
{
move_rand (move);
move_rand (move);
Fitness delta_fit = incr_eval (move, __sol) - __sol.fitness ();
Fitness delta_fit = incr_eval (move, __sol) - __sol.fitness ();
if (delta_fit > 0 || rng.uniform () < exp (delta_fit / temp))
{
if (delta_fit > 0 || rng.uniform () < exp (delta_fit / temp))
{
__sol.fitness (incr_eval (move, __sol));
move (__sol);
__sol.fitness (incr_eval (move, __sol));
move (__sol);
/* Updating the best solution found
until now ? */
if (__sol.fitness () > best_sol.fitness ())
best_sol = __sol;
}
/* Updating the best solution found
until now ? */
if (__sol.fitness () > best_sol.fitness ())
best_sol = __sol;
}
}
while (cont (__sol));
}
while (cont (__sol));
}
while (cool_sched (temp));
}
while (cool_sched (temp));
__sol = best_sol;
__sol = best_sol;
return true;
}
return true;
}
private:
private:
//! A move generator (generally randomly)
moRandMove < M > &move_rand;
//! A move generator (generally randomly)
moRandMove < M > &move_rand;
//! A (generally) efficient evaluation function.
moMoveIncrEval < M > &incr_eval;
//! A (generally) efficient evaluation function.
moMoveIncrEval < M > &incr_eval;
//! Stopping criterion before temperature update
moSolContinue < EOT > &cont;
//! Stopping criterion before temperature update
moSolContinue < EOT > &cont;
//! Initial temperature
double init_temp;
//! Initial temperature
double init_temp;
//! The cooling schedule
moCoolingSchedule & cool_sched;
//! The cooling schedule
moCoolingSchedule & cool_sched;
//! A full evaluation function.
eoEvalFunc < EOT > &full_eval; // Full evaluator.
};
//! A full evaluation function.
eoEvalFunc < EOT > &full_eval; // Full evaluator.
};
#endif