diff -r a1544b804d1e -r 18bef085a7ca handouts/ho02.tex --- a/handouts/ho02.tex Fri Oct 10 16:59:22 2014 +0100 +++ b/handouts/ho02.tex Sat Oct 11 01:13:13 2014 +0100 @@ -4,7 +4,7 @@ \usepackage{../graphics} \usepackage{../data} -\pgfplotsset{compat=1.11} +\pgfplotsset{compat=1.11} \begin{document} \section*{Handout 2} @@ -19,25 +19,29 @@ \begin{center} \begin{tabular}{@{}cc@{}} -\begin{tikzpicture} \begin{axis}[ xlabel={\pcode{a}s}, ylabel={time in secs}, +\begin{tikzpicture} +\begin{axis}[xlabel={\pcode{a}s},ylabel={time in secs}, enlargelimits=false, xtick={0,5,...,30}, xmax=30, - ymax=35, ytick={0,5,...,30}, + ymax=35, + ytick={0,5,...,30}, scaled ticks=false, axis lines=left, width=5cm, height=5cm, legend entries={Python,Ruby}, legend pos=north west, - legend cell align=left ] + legend cell align=left] \addplot[blue,mark=*, mark options={fill=white}] table {re-python.data}; \addplot[brown,mark=pentagon*, mark options={fill=white}] table {re-ruby.data}; -\end{axis} \end{tikzpicture} +\end{axis} +\end{tikzpicture} & -\begin{tikzpicture} \begin{axis}[ xlabel={\pcode{a}s}, ylabel={time in secs}, +\begin{tikzpicture} + \begin{axis}[xlabel={\pcode{a}s},ylabel={time in secs}, enlargelimits=false, xtick={0,3000,...,12000}, xmax=12000, @@ -45,8 +49,11 @@ scaled ticks=false, axis lines=left, width=6.5cm, - height=5cm ] \addplot[green,mark=square*,mark options={fill=white}] table {re2b.data}; -\addplot[black,mark=square*,mark options={fill=white}] table {re3.data}; \end{axis} \end{tikzpicture} + height=5cm] +\addplot[green,mark=square*,mark options={fill=white}] table {re2b.data}; +\addplot[black,mark=square*,mark options={fill=white}] table {re3.data}; +\end{axis} +\end{tikzpicture} \end{tabular} \end{center}\medskip @@ -532,20 +539,25 @@ \begin{figure}[p] \lstinputlisting{../progs/app6.scala} \caption{The simplification function and modified -\pcode{ders}-function.\label{scala2}} +\texttt{ders}-function.\label{scala2}} \end{figure} \begin{center} -\begin{tikzpicture} \begin{axis}[ xlabel={\pcode{a}s}, ylabel={time in secs}, +\begin{tikzpicture} +\begin{axis}[xlabel={\pcode{a}s},ylabel={time in secs}, enlargelimits=false, xtick={0,2000,...,12000}, - xmax=12000, ytick={0,5,...,30}, + xmax=12000, + ytick={0,5,...,30}, scaled ticks=false, axis lines=left, width=9cm, height=4cm, - legend entries={Scala V2,Scala V3}, ] \addplot[green,mark=square*,mark options={fill=white}] table {re2b.data}; -\addplot[black,mark=square*,mark options={fill=white}] table {re3.data}; \end{axis} \end{tikzpicture} + legend entries={Scala V2,Scala V3}] +\addplot[green,mark=square*,mark options={fill=white}] table {re2b.data}; +\addplot[black,mark=square*,mark options={fill=white}] table {re3.data}; +\end{axis} +\end{tikzpicture} \end{center} \end{document}