From 9a977a9f91dc18d7924333c5dc217a290c680e51 Mon Sep 17 00:00:00 2001 From: Aliaume Lopez Date: Wed, 11 Jan 2017 17:50:25 +0100 Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rapport/presentation.tex | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/rapport/presentation.tex b/rapport/presentation.tex index 6a47e75..8ef47dc 100644 --- a/rapport/presentation.tex +++ b/rapport/presentation.tex @@ -217,20 +217,26 @@ \begin{exampleblock}{Exemple~: berlin52 (52 points, valeur optimale à 7542)} \begin{figure} \centering - \subfloat[2-approximation (10114)]{ - \includegraphics[width=3.5cm]{../images/00_APPROX_berlin52_approx2.png} - } - \subfloat[2-approx + 2-OPT (7755)]{ - \includegraphics[width=3.5cm]{../images/00_APPROX_berlin52_approx2_2opt.png} - } - - - \subfloat[glouton (9951)]{ - \includegraphics[width=3.5cm]{../images/00_APPROX_berlin52_glouton.png} - } - \subfloat[glouton + 2-OPT (7657)]{ - \includegraphics[width=3.5cm]{../images/00_APPROX_berlin52_glouton_2opt.png} - } + \begin{overlayarea}{\linewidth}{4cm} + \only<1>{ + \centering + \subfloat[2-approximation (10114)]{ + \includegraphics[width=4.5cm]{../images/00_APPROX_berlin52_approx2.png} + } + \subfloat[2-approx + 2-OPT (7755)]{ + \includegraphics[width=4.5cm]{../images/00_APPROX_berlin52_approx2_2opt.png} + } + } + \only<2>{ + \centering + \subfloat[glouton (9951)]{ + \includegraphics[width=4.5cm]{../images/00_APPROX_berlin52_glouton.png} + } + \subfloat[glouton + 2-OPT (7657)]{ + \includegraphics[width=4.5cm]{../images/00_APPROX_berlin52_glouton_2opt.png} + } + } + \end{overlayarea} \end{figure} \end{exampleblock} @@ -529,7 +535,7 @@ Implémenté dans NetworkX. \begin{exampleblock}{Sur un problème avec 225 points} \begin{figure} \centering - \begin{overlayarea}{6cm}{4cm} + \begin{overlayarea}{\linewidth}{4cm} \only<1>{\centering \includegraphics[width=7cm]{../images/0CVX_tsp225_simple_1.png} \\ Étape 1} \only<2>{\centering \includegraphics[width=7cm]{../images/0CVX_tsp225_simple_11.png} \\ Étape 11 } \only<3>{\centering \includegraphics[width=7cm]{../images/0CVX_tsp225_simple_21.png} \\ Étape 21} -- GitLab