diff --git a/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp b/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp index 8f1b8ab46..f9151b246 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp @@ -21,10 +21,9 @@ #include #include - - -int main (int __argc, char * __argv []) { - +int +main (int __argc, char * __argv []) +{ if (__argc != 2) { std :: cerr << "Usage : ./hill_climbing [instance]" << std :: endl ; diff --git a/trunk/paradiseo-mo/tutorial/Lesson1/lesson_1.pdf b/trunk/paradiseo-mo/tutorial/Lesson1/lesson_1.pdf new file mode 100644 index 000000000..4af0e8e56 Binary files /dev/null and b/trunk/paradiseo-mo/tutorial/Lesson1/lesson_1.pdf differ diff --git a/trunk/paradiseo-mo/tutorial/Lesson2/lesson_2.pdf b/trunk/paradiseo-mo/tutorial/Lesson2/lesson_2.pdf new file mode 100644 index 000000000..0418ba621 Binary files /dev/null and b/trunk/paradiseo-mo/tutorial/Lesson2/lesson_2.pdf differ diff --git a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp index 59a5d9712..13913bdb7 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp @@ -22,21 +22,22 @@ #include #include -int main (int __argc, char * __argv []) { - - if (__argc != 2) { - - std :: cerr << "Usage : ./tabu_search [instance]" << std :: endl ; - return 1 ; - } - +int +main (int __argc, char * __argv []) +{ + if (__argc != 2) + { + std :: cerr << "Usage : ./tabu_search [instance]" << std :: endl ; + return 1 ; + } + Graph :: load (__argv [1]) ; // Instance - + Route route ; // Solution RouteInit init ; // Sol. Random Init. init (route) ; - + RouteEval full_eval ; // Full. Eval. full_eval (route) ; @@ -61,9 +62,9 @@ int main (int __argc, char * __argv []) { moTS tabu_search (two_opt_init, two_opt_next, two_opt_incr_eval, tabu_list, aspir_crit, cont, full_eval) ; tabu_search (route) ; - + std :: cout << "[To] " << route << std :: endl ; - + return 0 ; } diff --git a/trunk/paradiseo-mo/tutorial/Lesson3/lesson_3.pdf b/trunk/paradiseo-mo/tutorial/Lesson3/lesson_3.pdf new file mode 100644 index 000000000..779132996 Binary files /dev/null and b/trunk/paradiseo-mo/tutorial/Lesson3/lesson_3.pdf differ diff --git a/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp b/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp index d0707dd88..b768b075b 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp @@ -20,14 +20,15 @@ #include #include -int main (int __argc, char * __argv []) { - - if (__argc != 2) { - - std :: cerr << "Usage : ./simulated_annealing [instance]" << std :: endl ; - return 1 ; - } - +int +main (int __argc, char * __argv []) +{ + if (__argc != 2) + { + std :: cerr << "Usage : ./simulated_annealing [instance]" << std :: endl ; + return 1 ; + } + Graph :: load (__argv [1]) ; // Instance Route route ; // Solution