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

small code modifications and pdf of the lessons added

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@546 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
jboisson 2007-07-05 12:43:05 +00:00
commit d6fdf10ca5
6 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

7
trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp
View file

@ -21,10 +21,9 @@
#include <two_opt_next.h> #include <two_opt_next.h>
#include <two_opt_incr_eval.h> #include <two_opt_incr_eval.h>
int
main (int __argc, char * __argv [])
int main (int __argc, char * __argv []) { {
if (__argc != 2) { if (__argc != 2) {
std :: cerr << "Usage : ./hill_climbing [instance]" << std :: endl ; std :: cerr << "Usage : ./hill_climbing [instance]" << std :: endl ;

BIN
trunk/paradiseo-mo/tutorial/Lesson1/lesson_1.pdf Normal file
View file

Binary file not shown.

BIN
trunk/paradiseo-mo/tutorial/Lesson2/lesson_2.pdf Normal file
View file

Binary file not shown.

25
trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp
View file

@ -22,21 +22,22 @@
#include <two_opt_incr_eval.h> #include <two_opt_incr_eval.h>
#include <two_opt_tabu_list.h> #include <two_opt_tabu_list.h>
int main (int __argc, char * __argv []) { int
main (int __argc, char * __argv [])
if (__argc != 2) { {
if (__argc != 2)
std :: cerr << "Usage : ./tabu_search [instance]" << std :: endl ; {
return 1 ; std :: cerr << "Usage : ./tabu_search [instance]" << std :: endl ;
} return 1 ;
}
Graph :: load (__argv [1]) ; // Instance Graph :: load (__argv [1]) ; // Instance
Route route ; // Solution Route route ; // Solution
RouteInit init ; // Sol. Random Init. RouteInit init ; // Sol. Random Init.
init (route) ; init (route) ;
RouteEval full_eval ; // Full. Eval. RouteEval full_eval ; // Full. Eval.
full_eval (route) ; full_eval (route) ;
@ -61,9 +62,9 @@ int main (int __argc, char * __argv []) {
moTS <TwoOpt> tabu_search (two_opt_init, two_opt_next, two_opt_incr_eval, tabu_list, aspir_crit, cont, full_eval) ; moTS <TwoOpt> tabu_search (two_opt_init, two_opt_next, two_opt_incr_eval, tabu_list, aspir_crit, cont, full_eval) ;
tabu_search (route) ; tabu_search (route) ;
std :: cout << "[To] " << route << std :: endl ; std :: cout << "[To] " << route << std :: endl ;
return 0 ; return 0 ;
} }

BIN
trunk/paradiseo-mo/tutorial/Lesson3/lesson_3.pdf Normal file
View file

Binary file not shown.

17
trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp
View file

@ -20,14 +20,15 @@
#include <two_opt_rand.h> #include <two_opt_rand.h>
#include <two_opt_incr_eval.h> #include <two_opt_incr_eval.h>
int main (int __argc, char * __argv []) { int
main (int __argc, char * __argv [])
if (__argc != 2) { {
if (__argc != 2)
std :: cerr << "Usage : ./simulated_annealing [instance]" << std :: endl ; {
return 1 ; std :: cerr << "Usage : ./simulated_annealing [instance]" << std :: endl ;
} return 1 ;
}
Graph :: load (__argv [1]) ; // Instance Graph :: load (__argv [1]) ; // Instance
Route route ; // Solution Route route ; // Solution