moCoolSched ==> moCoolingSchedule, moEasyCoolSched ==> moExponentialCoolingSchedule, add moLinearCoolingSchedule
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@272 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
parent
92da4948bb
commit
f43584ebc2
205 changed files with 1395 additions and 1439 deletions
|
|
@ -10,7 +10,8 @@
|
|||
*/
|
||||
|
||||
#include <moSA.h>
|
||||
#include <moEasyCoolSched.h>
|
||||
#include <moExponentialCoolingSchedule.h>
|
||||
#include <moLinearCoolingSchedule.h>
|
||||
#include <moGenSolContinue.h>
|
||||
|
||||
#include <graph.h>
|
||||
|
|
@ -51,7 +52,8 @@ int main (int __argc, char * __argv []) {
|
|||
|
||||
TwoOpt move ;
|
||||
|
||||
moEasyCoolSched cool_sched (0.1, 0.98) ; // Cooling Schedule
|
||||
moExponentialCoolingSchedule cool_sched (0.1, 0.98) ; // Exponential Cooling Schedule
|
||||
//moLinearCoolingSchedule cool_sched (0.1, 0.5) ; // Linear Cooling Schedule
|
||||
|
||||
moGenSolContinue <Route> cont (1000) ; /* Temperature Descreasing
|
||||
will occur each 1000
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue