diff -r ca5884c2e3bd -r 8da9e0c16194 slides/slides03.tex --- a/slides/slides03.tex Thu Nov 24 01:44:38 2016 +0000 +++ b/slides/slides03.tex Thu Nov 24 09:42:49 2016 +0000 @@ -209,44 +209,61 @@ \end{frame} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{frame}[c] -\frametitle{Types} - -\begin{itemize} -\item Base types\smallskip - - \begin{tabular}{@{}l@{}} - \textcolor{codegreen}{\texttt{Int}}, - \textcolor{codegreen}{\texttt{Long}}, - \textcolor{codegreen}{\texttt{BigInt}}, - \textcolor{codegreen}{\texttt{Float}}, - \textcolor{codegreen}{\texttt{Double}}\\ - \textcolor{codegreen}{\texttt{String}}, - \textcolor{codegreen}{\texttt{Char}}\\ - \textcolor{codegreen}{\texttt{Boolean}} - \end{tabular} + \frametitle{CW3: Regexes (1 Part)} + +\begin{center} + Graphs: $(a^*)^* b$ and strings $\underbrace{\;a\ldots a\;}_{n}$\bigskip + +\begin{tabular}[t]{@{\hspace{-8mm}}c@{\hspace{-4mm}}c@{}} +\raisebox{6mm}{\begin{tikzpicture} +\begin{axis}[ + xlabel={$n$}, + x label style={at={(1.05,0.0)}}, + ylabel={time in secs}, + enlargelimits=false, + xtick={0,5,...,30}, + xmax=33, + ymax=35, + ytick={0,5,...,30}, + scaled ticks=false, + axis lines=left, + width=5.5cm, + height=5cm, + legend entries={Python, Java}, + legend pos=north west, + legend cell align=left] +\addplot[blue,mark=*, mark options={fill=white}] table {re-python2.data}; +\addplot[cyan,mark=*, mark options={fill=white}] table {re-java.data}; +\end{axis} +\end{tikzpicture}} + & +\begin{tikzpicture} + \begin{axis}[ + xlabel={$n$}, + x label style={at={(1.05,0.0)}}, + ylabel={time in secs}, + enlargelimits=false, + ymax=35, + ytick={0,5,...,30}, + axis lines=left, + %%scaled ticks=false, + width=5.5cm, + height=5cm] +%%\addplot[green,mark=square*,mark options={fill=white}] table {re2a.data}; +\addplot[red,mark=square*,mark options={fill=white}] table {re3a.data}; +\end{axis} +\end{tikzpicture} +\end{tabular} +\end{center} -\item Compound types \smallskip - - \begin{tabular}{@{}ll@{}} - \textcolor{codegreen}{\texttt{List[Int]}} & lists of Int's \\ - \textcolor{codegreen}{\texttt{Set[Double]}} & sets of Double's \\ - \textcolor{codegreen}{\texttt{(Int, String)}} & Int-String pair\\ - \textcolor{codegreen}{\texttt{List[(BigInt, String)]}} & - lists of BigInt-String\\ - & pairs\\ - \textcolor{codegreen}{\texttt{List[List[Int]]}} & list of lists of Int's\\ - \end{tabular} - -\end{itemize} - +\hfill\small\url{https://vimeo.com/112065252} \end{frame} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\begin{frame}[t] +\begin{frame}[c] \frametitle{Where to go on from here?} \begin{itemize} @@ -255,7 +272,7 @@ \item Elm (\url{http://elm-lang.org})\ldots web applications with style\medskip -\item Haskell, Ocaml, Standard ML, Scheme +\item Haskell, Ocaml, Standard ML, Scheme, \ldots \end{itemize} \end{frame}