diff --git a/images/18116.jpg b/images/18116.jpg new file mode 100644 index 0000000000000000000000000000000000000000..1da2f668e16be3f6a3f9654aa2e088e372f9858c Binary files /dev/null and b/images/18116.jpg differ diff --git a/rapport/presentation.tex b/rapport/presentation.tex index cb9c9eeb8daf2b216cd5c4bb2c8a5faabc1bb778..6704de3a21c5ed9daaab81f0422ecdd7df5152ae 100644 --- a/rapport/presentation.tex +++ b/rapport/presentation.tex @@ -126,8 +126,12 @@ le tour en les remplaçant par $(v_1, v_2')$ et $(v_1',v_2)$ a une valeur inférieure, on effectue cette opération. \end{block} - - DESSIN + + \begin{exampleblock}{Exemple} + \begin{center} + \includegraphics[height=2cm]{../images/18116.jpg} + \end{center} + \end{exampleblock} \begin{alertblock}{Temps} @@ -211,37 +215,24 @@ \begin{frame} \frametitle{Comparaison des méthodes} \begin{exampleblock}{Exemple~: berlin52 (52 points, valeur optimale à 7542)} - - \begin{multicols}{2} - - \raggedcolumns - \begin{center} - \includegraphics[width=4cm]{../images/00_APPROX_berlin52_approx2.png} - - 2-approximation (10114) - - \ds - + \begin{figure} + \centering + \subfloat[2-approximation (10114)]{ + \includegraphics[width=2.5cm]{../images/00_APPROX_berlin52_approx2.png} + } + \subfloat[2-approx + 2-OPT (7755)]{ + \includegraphics[width=2.5cm]{../images/00_APPROX_berlin52_approx2_2opt.png} + } - \includegraphics[width=4cm]{../images/00_APPROX_berlin52_glouton.png} + + \subfloat[glouton (9951)]{ + \includegraphics[width=2.5cm]{../images/00_APPROX_berlin52_glouton.png} + } + \subfloat[glouton + 2-OPT (7657)]{ + \includegraphics[width=2.5cm]{../images/00_APPROX_berlin52_glouton_2opt.png} + } + \end{figure} - glouton (9951) - - \end{center} - - \columnbreak - \begin{center} -\includegraphics[width=4cm]{../images/00_APPROX_berlin52_approx2_2opt.png} - -2-approx + 2-OPT (7755) - -\ds - - \includegraphics[width=4cm]{../images/00_APPROX_berlin52_glouton_2opt.png} - - glouton + 2-OPT(7657) - \end{center} - \end{multicols} \end{exampleblock} \end{frame}