moSimple(Move/Solution)TabuList are added

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@281 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jboisson 2007-04-19 13:23:06 +00:00
commit a40fc756aa
150 changed files with 2619 additions and 199 deletions

View file

@ -16,6 +16,8 @@
#include <moFirstImprSelect.h>
#include <moBestImprSelect.h>
#include <moRandImprSelect.h>
#include <moSimpleMoveTabuList.h>
#include <moSimpleSolutionTabuList.h>
#include <graph.h>
#include <route.h>
@ -58,10 +60,12 @@ int main (int __argc, char * __argv []) {
TwoOptIncrEval two_opt_incr_eval ; // Eff. eval.
TwoOptTabuList tabu_list ; // Tabu List
//moSimpleMoveTabuList<TwoOpt> tabu_list(10);
//moSimpleSolutionTabuList<TwoOpt> tabu_list(10);
moNoAspirCrit <TwoOpt> aspir_crit ; // Aspiration Criterion
moGenSolContinue <Route> cont (50000) ; // Continuator
moGenSolContinue <Route> cont (10000) ; // Continuator
moTS <TwoOpt> tabu_search (two_opt_init, two_opt_next, two_opt_incr_eval, tabu_list, aspir_crit, cont, full_eval) ;
tabu_search (route) ;