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

moHC.h and iterated_local_search.cpp are updated

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@607 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jboisson 2007-09-20 14:08:55 +00:00
commit f37356d18a
3 changed files with 8 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/paradiseo-mo/src/moHC.h
View file

@ -12,7 +12,6 @@
#ifndef __moHC_h #ifndef __moHC_h
#define __moHC_h #define __moHC_h
#include <eoOp.h>
#include <eoEvalFunc.h> #include <eoEvalFunc.h>
#include "moAlgo.h" #include "moAlgo.h"

13
trunk/paradiseo-mo/src/moILS.h
View file

@ -123,20 +123,17 @@ public:
cont.init (); cont.init ();
//some code has been duplicated in order to avoid one perturbation and one evaluation without adding a test in the loop. //some code has been duplicated in order to avoid one perturbation and one evaluation without adding a test in the loop.
// better than a do {} while; with a test in the loop.
//std::cout << "Before intensification: " << __sol.fitness() << std::endl;
algo(__sol); algo(__sol);
//std::cout << "After intensification: " << __sol.fitness() << std::endl;
if(acceptance_criterion(__sol, __sol_saved)) if(acceptance_criterion(__sol, __sol_saved))
{ {
std::cout << "Accepted: " << __sol.fitness() << std::endl;
__sol_saved=__sol; __sol_saved=__sol;
} }
else else
{ {
//std::cout << "Refused" << std::endl;
__sol=__sol_saved; __sol=__sol_saved;
} }
@ -145,18 +142,14 @@ public:
perturbation(__sol); perturbation(__sol);
full_eval(__sol); full_eval(__sol);
//std::cout << "Before intensification: " << __sol.fitness() << std::endl;
algo(__sol); algo(__sol);
//std::cout << "After intensification: " << __sol.fitness() << std::endl;
if(acceptance_criterion(__sol, __sol_saved)) if(acceptance_criterion(__sol, __sol_saved))
{ {
std::cout << "Accepted: " << __sol.fitness() << std::endl;
__sol_saved=__sol; __sol_saved=__sol;
} }
else else
{ {
//std::cout << "Refused" << std::endl;
__sol=__sol_saved; __sol=__sol_saved;
} }
} }

36
trunk/paradiseo-mo/tutorial/Lesson4/iterated_local_search.cpp
View file

@ -20,8 +20,6 @@
#include <two_opt_init.h> #include <two_opt_init.h>
#include <two_opt_next.h> #include <two_opt_next.h>
#include <two_opt_incr_eval.h> #include <two_opt_incr_eval.h>
#include <two_opt_tabu_list.h>
#include <two_opt_rand.h>
#include <city_swap.h> #include <city_swap.h>
@ -46,46 +44,22 @@ main (int __argc, char * __argv [])
std :: cout << "[From] " << route << std :: endl ; std :: cout << "[From] " << route << std :: endl ;
/* Tools for an efficient (? :-))
local search ! */
TwoOptInit two_opt_init ; // Init. TwoOptInit two_opt_init ; // Init.
TwoOptNext two_opt_next ; // Explorer. TwoOptNext two_opt_next ; // Explorer.
TwoOptIncrEval two_opt_incr_eval ; // Eff. eval. TwoOptIncrEval two_opt_incr_eval ; // Eff. eval.
moBestImprSelect <TwoOpt> two_opt_select ; moBestImprSelect <TwoOpt> two_opt_select ; //Move selection
//moHC<TwoOpt> hill_climbing (two_opt_init, two_opt_next, two_opt_incr_eval, two_opt_select, full_eval) ; moGenSolContinue <Route> cont (1000) ; //Stopping criterion
moGenSolContinue <Route> cont (1000) ;
moFitComparator<Route> comparator; moFitComparator<Route> comparator; // Route comparator
CitySwap perturbation; CitySwap perturbation; // Route perturbation
//moILS<TwoOpt> iterated_local_search (hill_climbing, cont, comparator, perturbation, full_eval) ; moILS<TwoOpt> iterated_local_search (two_opt_init, two_opt_next, two_opt_incr_eval, two_opt_select,
//moILS<TwoOpt> iterated_local_search (two_opt_init, two_opt_next, two_opt_incr_eval,
// two_opt_select, cont, comparator, perturbation, full_eval) ;
moGenSolContinue <Route> ts_cont (100) ;
TwoOptTabuList tabu_list ; // Tabu List
moNoAspirCrit <TwoOpt> aspir_crit ; // Aspiration Criterion
//moILS<TwoOpt> iterated_local_search (two_opt_init, two_opt_next, two_opt_incr_eval, tabu_list, aspir_crit, ts_cont,
// cont, comparator, perturbation, full_eval) ;
TwoOptRand two_opt_rand ; // Route Random. Gen.
moExponentialCoolingSchedule cool_sched (0.1, 0.98) ; // Exponential Cooling Schedule
moGenSolContinue <Route> sa_cont (100) ;
moILS<TwoOpt> iterated_local_search (two_opt_rand, two_opt_incr_eval, sa_cont, 100, cool_sched,
cont, comparator, perturbation, full_eval) ; cont, comparator, perturbation, full_eval) ;
iterated_local_search(route) ; iterated_local_search(route) ;
std :: cout << "[To] " << route << std :: endl ; std :: cout << "[To] " << route << std :: endl ;