diff --git a/utilities/trunk/practices/paradiseo_practices_0208/lesson2/lesson2.pdf b/utilities/trunk/practices/paradiseo_practices_0208/lesson2/lesson2.pdf index 9218f1819..477a23bcc 100644 Binary files a/utilities/trunk/practices/paradiseo_practices_0208/lesson2/lesson2.pdf and b/utilities/trunk/practices/paradiseo_practices_0208/lesson2/lesson2.pdf differ diff --git a/utilities/trunk/practices/paradiseo_practices_0208/lesson2/lesson2.tex b/utilities/trunk/practices/paradiseo_practices_0208/lesson2/lesson2.tex index d83af1849..4dc98f71d 100644 --- a/utilities/trunk/practices/paradiseo_practices_0208/lesson2/lesson2.tex +++ b/utilities/trunk/practices/paradiseo_practices_0208/lesson2/lesson2.tex @@ -41,17 +41,23 @@ Lesson 2: Implement a Hill-Climbing using ParadisEO}} \smallskip \noindent - \texttt{>> Loading [../tsp/benchs/berlin52.tsp]}\\ - \texttt{[From] -29414 52 1 20 40 48 9 27 13 22 5 28 24 29 21 26 44 38 33 37 45 31 42 18 12 3 14}\\ - \texttt{36 30 6 51 32 17 11 0 34 4 10 4350 16 2 23 35 19 46 49 39 25 15 41 8 7 47}\\ - \texttt{[To] -8724 52 1 6 41 29 22 19 49 15 28 46 13 51 12 25 26 27 11 10 50 32 42 9 8 7 40 18}\\ - \texttt{44 2 16 20 30 17 21 0 31 48 35 3438 39 37 36 33 43 45 24 3 5 4 14 23 - 47} \\ + \texttt{>> Loading [../../tsp/benchs/eil101.tsp]} \\ + \texttt{[From] -3435 101 36 55 54 65 50 80 14 27 46 15 93 58 78 47 99 64 68}\\ + \texttt{49 72 81 82 76 41 16 66 30 29 83 95 71 38 35 19 5 63 26 43 96 79 52}\\ + \texttt{59 69 7 56 37 3 32 28 9 13 1 91 31 73 11 40 62 17 24 45 88 6 85 22}\\ + \texttt{18 20 44 94 12 33 60 89 74 42 97 21 100 57 77 92 98 51 2 25 75 10 86}\\ + \texttt{8 23 67 70 34 90 87 48 53 0 39 4 84 61}\\ + \texttt{[To] -708 101 36 97 91 58 95}\\ + \texttt{98 92 84 99 90 43 13 37 85 15 60 16 83 4 59 82 44 7 45 35 48 63 10}\\ + \texttt{18 46 47 81 17 51 26 27 25 39 57 52 100 88 5 93 94 12 1 56 86 96 41}\\ + \texttt{42 14 40 21 73 71 72 20 3 55 74 22 66 38 24 54 53 23 28 78 2 76 67}\\ + \texttt{79 11 75 68 0 49 32 80 77 33 50 8 34 70 64 65 19 29 69 31 89 62 9 30}\\ + \texttt{87 6 61}\\ The printed-out results show for the initial best solution and the final one~: - \\ \hspace*{1cm}-the length of the route - \\ \hspace*{1cm}-the number of cities - \\ \hspace*{1cm}-the route itself (notice that the city index starts from 0). + \\ \hspace*{0.5cm}-the length of the route + \\ \hspace*{0.5cm}-the number of cities + \\ \hspace*{0.5cm}-the route itself (notice that the city index starts from 0). \section{Tabu search} diff --git a/utilities/trunk/practices/paradiseo_practices_0208/lesson3/lesson3.pdf b/utilities/trunk/practices/paradiseo_practices_0208/lesson3/lesson3.pdf index 9df0feefe..bab6fcd9a 100644 Binary files a/utilities/trunk/practices/paradiseo_practices_0208/lesson3/lesson3.pdf and b/utilities/trunk/practices/paradiseo_practices_0208/lesson3/lesson3.pdf differ diff --git a/utilities/trunk/practices/paradiseo_practices_0208/lesson3/lesson3.tex b/utilities/trunk/practices/paradiseo_practices_0208/lesson3/lesson3.tex index 96b45b032..9c2229974 100644 --- a/utilities/trunk/practices/paradiseo_practices_0208/lesson3/lesson3.tex +++ b/utilities/trunk/practices/paradiseo_practices_0208/lesson3/lesson3.tex @@ -42,17 +42,24 @@ Lesson 4: Implement a simulated annealing using ParadisEO}} \smallskip \noindent - \texttt{>> Loading [../tsp/benchs/berlin52.tsp]}\\ - \texttt{[From] -29414 52 1 20 40 48 9 27 13 22 5 28 24 29 21 26 44 38 33 37 45 31 42 18 12 3 14}\\ - \texttt{36 30 6 51 32 17 11 0 34 4 10 4350 16 2 23 35 19 46 49 39 25 15 41 8 7 47}\\ - \texttt{[To] -8724 52 1 6 41 29 22 19 49 15 28 46 13 51 12 25 26 27 11 10 50 32 42 9 8 7 40 18}\\ - \texttt{44 2 16 20 30 17 21 0 31 48 35 3438 39 37 36 33 43 45 24 3 5 4 14 23 - 47} \\ + \texttt{>> Loading [../../tsp/benchs/eil101.tsp]}\\ + \texttt{[From] -3347 101 84 20 57 71 92 19 59 10 30 55 27 63 36 26 18 21 46}\\ + \texttt{72 96 35 39 24 29 86 60 40 34 48 67 38 13 0 5 11 16 83 49 50 6 7 87}\\ + \texttt{1 53 90 74 52 58 15 8 95 25 68 61 70 65 45 33 79 23 62 4 37 91 85 78}\\ + \texttt{89 47 69 28 32 66 80 75 94 41 100 44 73 22 9 76 64 97 31 88 51 93 43}\\ + \texttt{2 3 14 56 99 12 82 81 42 17 54 98 77}\\ + \texttt{[To] -697 101 84 90 99 36 97}\\ + \texttt{ 92 60 15 85 37 43 13 41 42 14 56 86 1 40 21 73 72 20 71 74 55 22 66}\\ + \texttt{ 38 3 24 54 53 23 28 78 80 8 50 32 2 76 67 79 11 75 49 0 68 26 100 52}\\ + \texttt{ 27 25 39 57 12 93 94 96 91 58 98 95 5 88 51 17 82 59 4 83 16 44 7 45}\\ + \texttt{ 46 35 48 63 18 47 81 6 87 61 10 62 89 31 9 30 69 29 19 65 70 64 34}\\ + \texttt{ 33 77}\\ + The printed-out results show for the initial best solution and the final one~: - \\ \hspace*{1cm}-the length of the route - \\ \hspace*{1cm}-the number of cities - \\ \hspace*{1cm}-the route itself (notice that the city index starts from 0). + \\ \hspace*{0.5cm}-the length of the route + \\ \hspace*{0.5cm}-the number of cities + \\ \hspace*{0.5cm}-the route itself (notice that the city index starts from 0). \section{Study the simulated annealing dedicated components} diff --git a/utilities/trunk/practices/paradiseo_practices_0208/lesson4/lesson4.pdf b/utilities/trunk/practices/paradiseo_practices_0208/lesson4/lesson4.pdf index aa3c1c388..090d8efe0 100644 Binary files a/utilities/trunk/practices/paradiseo_practices_0208/lesson4/lesson4.pdf and b/utilities/trunk/practices/paradiseo_practices_0208/lesson4/lesson4.pdf differ diff --git a/utilities/trunk/practices/paradiseo_practices_0208/lesson4/lesson4.tex b/utilities/trunk/practices/paradiseo_practices_0208/lesson4/lesson4.tex index c9a58d4ed..190a53dca 100644 --- a/utilities/trunk/practices/paradiseo_practices_0208/lesson4/lesson4.tex +++ b/utilities/trunk/practices/paradiseo_practices_0208/lesson4/lesson4.tex @@ -41,16 +41,23 @@ Lesson 4: Implement a tabu search using ParadisEO}} \smallskip \noindent - \texttt{>> Loading [../tsp/benchs/berlin52.tsp]}\\ - \texttt{[From] -29414 52 1 20 40 48 9 27 13 22 5 28 24 29 21 26 44 38 33 37 45 31 42 18 12 3 14}\\ - \texttt{36 30 6 51 32 17 11 0 34 4 10 4350 16 2 23 35 19 46 49 39 25 15 41 8 7 47}\\ - \texttt{[To] -8724 52 1 6 41 29 22 19 49 15 28 46 13 51 12 25 26 27 11 10 50 32 42 9 8 7 40 18}\\ - \texttt{44 2 16 20 30 17 21 0 31 48 35 3438 39 37 36 33 43 45 24 3 5 4 14 23 47}\\ + \texttt{>>> Loading [../../tsp/benchs/eil101.tsp]}\\ + \texttt{> [From] -3347 101 84 20 57 71 92 19 59 10 30 55 27 63 36 26 18 21 46}\\ + \texttt{>72 96 35 39 24 29 86 60 40 34 48 67 38 13 0 5 11 16 83 49 50 6 7 87}\\ + \texttt{>1 53 90 74 52 58 15 8 95 25 68 61 70 65 45 33 79 23 62 4 37 91 85 78}\\ + \texttt{>89 47 69 28 32 66 80 75 94 41 100 44 73 22 9 76 64 97 31 88 51 93 43}\\ + \texttt{>2 3 14 56 99 12 82 81 42 17 54 98 77}\\ + \texttt{>[To] -703 101 84 92 98 95 58}\\ + \texttt{>91 36 97 90 99 41 86 96 94 12 93 5 88 17 51 68 0 49 76 75 27 26 100}\\ + \texttt{>52 57 39 25 11 79 67 2 78 28 23 53 54 24 3 38 66 22 55 74 21 40 73}\\ + \texttt{>71 20 72 1 56 14 42 13 43 37 85 15 60 4 59 82 83 16 44 45 7 81 6 47}\\ + \texttt{>18 46 35 48 63 10 62 89 31 9 61 87 30 69 29 19 50 32 80 8 70 65 64}\\ + \texttt{>34 33 77}\\ The printed-out results show for the initial best solution and the final one~: - \\ \hspace*{1cm}-the length of the route - \\ \hspace*{1cm}-the number of cities - \\ \hspace*{1cm}-the route itself (notice that the city index starts from 0). + \\ \hspace*{0.5cm}-the length of the route + \\ \hspace*{0.5cm}-the number of cities + \\ \hspace*{0.5cm}-the route itself (notice that the city index starts from 0). \section{Study the tabu search dedicated components} diff --git a/utilities/trunk/practices/paradiseo_practices_0208/lesson5/lesson5.pdf b/utilities/trunk/practices/paradiseo_practices_0208/lesson5/lesson5.pdf index bfc63db27..9314babe9 100644 Binary files a/utilities/trunk/practices/paradiseo_practices_0208/lesson5/lesson5.pdf and b/utilities/trunk/practices/paradiseo_practices_0208/lesson5/lesson5.pdf differ diff --git a/utilities/trunk/practices/paradiseo_practices_0208/lesson5/lesson5.tex b/utilities/trunk/practices/paradiseo_practices_0208/lesson5/lesson5.tex index f4f19fbbe..568de4636 100644 --- a/utilities/trunk/practices/paradiseo_practices_0208/lesson5/lesson5.tex +++ b/utilities/trunk/practices/paradiseo_practices_0208/lesson5/lesson5.tex @@ -38,22 +38,27 @@ Lesson 5: Implement a genetic algorithm using ParadisEO}} When entering {\tt ./gen\_algo ../../tsp/benchs/berlin52.tsp}, you should end up with the following outputs: - \smallskip - \noindent - \texttt{>> Loading [../tsp/benchs/berlin52.tsp]}\\ - \texttt{[From] -26461 52 39 12 29 44 2 26 13 40 7 35 14 28 25 41 6 51 10 50 45 19 0 38 15}\\ - \texttt{33 42 21 18 32 37 9 5 20 34 43 16 30 1 23 22 4 27 36 4946 47 48 11 17 8 31 24 3}\\ - \texttt{STOP in eoGenContinue: Reached maximum number of generations [1000/1000]}\\ - \texttt{[To] -13068 52 45 24 28 22 19 21 30 17 31 36 46 25 13 12 26 27 51 10 14 37 23 4 15 49}\\ - \texttt{20 2 8 42 50 11 47 39 38 35 34 44 18 40 9 7 32 3 5 33 16 41 6 1 29 0 48 - 43} \\ + \texttt{>> Loading [../../tsp/benchs/eil101.tsp]}\\ + \texttt{[From] -3176 101 5 72 27 77 20 82 23 14 91 17 60 50 43 99 18 34 69}\\ + \texttt{76 22 38 25 88 36 40 7 55 74 42 67 53 11 62 61 92 58 93 19 70 33 32}\\ + \texttt{86 48 47 4 97 73 95 79 85 66 65 24 13 89 8 26 96 56 28 39 80 37 49}\\ + \texttt{78 12 1 98 46 31 57 10 30 90 71 75 81 16 45 29 41 100 51 21 52 59 15}\\ + \texttt{64 44 94 54 9 6 3 0 87 63 2 84 83 35 68 STOP in eoGenContinue:}\\ + \texttt{Reached maximum number of generations [1000/1000]}\\ + \texttt{[To] -1564 101 60}\\ + \texttt{17 81 59 5 94 43 42 14 40 13 15 82 45 46 35 51 26 100 74 38 24 22 21}\\ + \texttt{54 23 66 86 99 44 87 64 34 57 25 32 75 80 29 79 67 53 3 1 58 95 97}\\ + \texttt{90 85 37 83 16 92 91 36 41 96 93 52 56 12 33 77 70 30 88 39 20 72 71}\\ + \texttt{ 31 62 89 61 49 2 8 18 6 10 9 0 68 78 28 27 76 11 73 55 50 65 19 69}\\ + \texttt{48 63 47 7 4 98 84}\\ + \medskip The printed-out results show for the initial best solution and the final one~: - \\ \hspace*{1cm}-the length of the route - \\ \hspace*{1cm}-the number of cities - \\ \hspace*{1cm}-the route itself (notice that the city index starts from 0). + \\ \hspace*{0.5cm}-the length of the route + \\ \hspace*{0.5cm}-the number of cities + \\ \hspace*{0.5cm}-the route itself (notice that the city index starts from 0). \section{Study the genetic algorithm dedicated components}