diff --git a/rapport/chapter5-applications/baldock.tex b/rapport/chapter5-applications/baldock.tex index 2bba34f..0e1f3e7 100644 --- a/rapport/chapter5-applications/baldock.tex +++ b/rapport/chapter5-applications/baldock.tex @@ -8,27 +8,34 @@ networks in four major english cities. \cite{baldockDailyTemporalStructure2011} -% \begin{figure}[ht] -% \centering -% \begin{subfigure}[htb]{0.47\textwidth} -% % \input{../tikz/applications/baldock/graph-Baldock2019_Bristol.tex} -% \caption{Bristol} -% \end{subfigure} -% \hfill -% \begin{subfigure}[htb]{0.47\textwidth} -% % \input{../tikz/applications/baldock/graph-Baldock2019_Edinburgh.tex} -% \caption{Edinburgh} -% \end{subfigure} -% \newline -% \begin{subfigure}[htb]{0.47\textwidth} -% \input{../tikz/applications/baldock/graph-Baldock2019_Leeds.tex} -% \caption{Leeds} -% \end{subfigure} -% \hfill -% \begin{subfigure}[htb]{0.47\textwidth} -% \input{../tikz/applications/baldock/graph-Baldock2019_Reading.tex} -% \caption{Reading} -% \end{subfigure} -% \caption{English networks from~\cite{baldockSystemsApproachReveals2019a}} -% \label{fig:baldock-english-networks} -% \end{figure} \ No newline at end of file +\begin{figure}[ht] + \centering + \begin{subfigure}[htb]{0.47\textwidth} + \input{../tikz/applications/baldock/graph-Baldock2019_Bristol.tex} + \caption{Bristol} + \end{subfigure} + \hfill + \begin{subfigure}[htb]{0.47\textwidth} + \input{../tikz/applications/baldock/graph-Baldock2019_Edinburgh.tex} + \caption{Edinburgh} + \end{subfigure} + \newline + \begin{subfigure}[htb]{0.47\textwidth} + \input{../tikz/applications/baldock/graph-Baldock2019_Leeds.tex} + \caption{Leeds} + \end{subfigure} + \hfill + \begin{subfigure}[htb]{0.47\textwidth} + \input{../tikz/applications/baldock/graph-Baldock2019_Reading.tex} + \caption{Reading} + \end{subfigure} + \caption{English networks from~\cite{baldockSystemsApproachReveals2019a}} + \label{fig:baldock-english-networks} +\end{figure} + +\begin{figure}[ht] + \centering + \input{../tikz/applications/baldock/graph-Baldock2011_TB+Baldock2011_JN.tex} + \caption{South African network from~\cite{baldockDailyTemporalStructure2011}} + \label{fig:baldock-south-african-networks} +\end{figure} \ No newline at end of file diff --git a/rapport/rapport.pdf b/rapport/rapport.pdf index 6f4f6c1..0b392a4 100644 Binary files a/rapport/rapport.pdf and b/rapport/rapport.pdf differ diff --git a/rapport/rapport.tex b/rapport/rapport.tex index 886e2e6..586e507 100644 --- a/rapport/rapport.tex +++ b/rapport/rapport.tex @@ -39,6 +39,7 @@ \usepackage{pdflscape} \usepackage{float} % pour le placement des figure + \usepackage{caption} % Figures \usepackage{subcaption} % And Subfigures @@ -86,7 +87,6 @@ arrows,shapes,positioning,shadows,trees,calc,backgrounds, automata,positioning} - \tikzset{ basic/.style = {draw, text width=3cm, font=\sffamily, rectangle}, root/.style = {basic, rounded corners=2pt, thin, align=center, @@ -173,7 +173,6 @@ automata,positioning} %%%%%%%%%%%%%% En-tĂȘte de chapitre %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \makeatletter \def\thickhrulefill{\leavevmode \leaders \hrule height 1ex \hfill \kern \z@} \def\@makechapterhead#1{% @@ -221,32 +220,31 @@ automata,positioning} % Pour activer les onglets \ActivateBG \begin{selectlanguage}{french} - % \maketitle - \pagenumbering{roman} - \tableofcontents - \include{remerciements} - % \include{chapter1-presentation_UMR} + % \maketitle + \pagenumbering{roman} + \tableofcontents + \include{remerciements} + % \include{chapter1-presentation_UMR} \end{selectlanguage} \begin{selectlanguage}{english} - \pagenumbering{arabic} - \include{chapter2-context} - \include{chapter3-structure-detection} - \include{chapter4-simulation-studies} + \pagenumbering{arabic} + \include{chapter2-context} + \include{chapter3-structure-detection} + \include{chapter4-simulation-studies} - % \chapter{Applications} - % \include{Rcodes/real_data/application_dore} - % \include{Rcodes/real_data/CoOPLBM_completion_analyze} - \include{chapter5-applications} + % \chapter{Applications} + % \include{Rcodes/real_data/application_dore} + % \include{Rcodes/real_data/CoOPLBM_completion_analyze} + \include{chapter5-applications} + \include{conclusions} - \include{conclusions} - - \addtocounter{maincontentend}{1} - \addtocounter{customchapter}{1} - \printbibliography - \input{appendices.tex} - % \listoffigures - % \listoftables + \addtocounter{maincontentend}{1} + \addtocounter{customchapter}{1} + \printbibliography + \input{appendices.tex} + % \listoffigures + % \listoftables \end{selectlanguage} \end{document}