nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

moCoolSched ==> moCoolingSchedule, moEasyCoolSched ==> moExponentialCoolingSchedule, add moLinearCoolingSchedule

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@272 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jboisson 2007-04-18 08:26:27 +00:00
commit f43584ebc2
205 changed files with 1395 additions and 1439 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/paradiseo-mo/src/moSA.h
View file

@ -20,7 +20,7 @@
#include "moAlgo.h"
#include "moRandMove.h"
#include "moMoveIncrEval.h"
#include "moCoolSched.h"
#include "moCoolingSchedule.h"
#include "moSolContinue.h"
#include <math.h>
@ -61,7 +61,7 @@ public:
moMoveIncrEval < M > &__incr_eval,
moSolContinue < EOT > &__cont,
double __init_temp,
moCoolSched & __cool_sched, eoEvalFunc < EOT > &__full_eval):
moCoolingSchedule & __cool_sched, eoEvalFunc < EOT > &__full_eval):
move_rand (__move_rand),
incr_eval (__incr_eval),
cont (__cont),
@ -144,7 +144,7 @@ private:
init_temp;
//! The cooling schedule
moCoolSched & cool_sched;
moCoolingSchedule & cool_sched;
//! A full evaluation function.
eoEvalFunc < EOT > &full_eval; // Full evaluator.