# HG changeset patch # User Christian Urban # Date 1385891921 0 # Node ID 828303e8e4afbc2383c9ef6cb78d9e525e409a7d # Parent 5be68de225e9531126cf9f6cf3aba6d051edfeae updated slides diff -r 5be68de225e9 -r 828303e8e4af progs/fib.while --- a/progs/fib.while Sat Nov 30 00:06:02 2013 +0000 +++ b/progs/fib.while Sun Dec 01 09:58:41 2013 +0000 @@ -1,9 +1,8 @@ /* Fibonacci Program - input: n -*/ + input: n */ + write "Fib"; -read n; -//n := 19; +read n; // n := 19; minus1 := 0; minus2 := 1; while n > 0 do { diff -r 5be68de225e9 -r 828303e8e4af slides/compiled.data --- a/slides/compiled.data Sat Nov 30 00:06:02 2013 +0000 +++ b/slides/compiled.data Sun Dec 01 09:58:41 2013 +0000 @@ -1,6 +1,6 @@ %% LaTeX2e file `compiled.data' %% generated by the `filecontents' environment -%% from source `slides08' on 2013/11/19. +%% from source `slides01' on 2013/12/01. %% %1 0.234146 %5000 0.227539 diff -r 5be68de225e9 -r 828303e8e4af slides/compiled2.data --- a/slides/compiled2.data Sat Nov 30 00:06:02 2013 +0000 +++ b/slides/compiled2.data Sun Dec 01 09:58:41 2013 +0000 @@ -1,6 +1,6 @@ %% LaTeX2e file `compiled2.data' %% generated by the `filecontents' environment -%% from source `slides05' on 2013/10/22. +%% from source `slides01' on 2013/12/01. %% 200 0.222058 400 0.215204 diff -r 5be68de225e9 -r 828303e8e4af slides/interpreted.data --- a/slides/interpreted.data Sat Nov 30 00:06:02 2013 +0000 +++ b/slides/interpreted.data Sun Dec 01 09:58:41 2013 +0000 @@ -1,6 +1,6 @@ %% LaTeX2e file `interpreted.data' %% generated by the `filecontents' environment -%% from source `slides07' on 2013/11/13. +%% from source `slides01' on 2013/12/01. %% %1 0.00503 200 1.005863 diff -r 5be68de225e9 -r 828303e8e4af slides/interpreted2.data --- a/slides/interpreted2.data Sat Nov 30 00:06:02 2013 +0000 +++ b/slides/interpreted2.data Sun Dec 01 09:58:41 2013 +0000 @@ -1,6 +1,6 @@ %% LaTeX2e file `interpreted2.data' %% generated by the `filecontents' environment -%% from source `slides05' on 2013/10/22. +%% from source `slides01' on 2013/12/01. %% %1 0.00503 200 1.005863 diff -r 5be68de225e9 -r 828303e8e4af slides/slides01.pdf Binary file slides/slides01.pdf has changed diff -r 5be68de225e9 -r 828303e8e4af slides/slides01.tex --- a/slides/slides01.tex Sat Nov 30 00:06:02 2013 +0000 +++ b/slides/slides01.tex Sun Dec 01 09:58:41 2013 +0000 @@ -1,15 +1,13 @@ \documentclass[dvipsnames,14pt,t,xelatex]{beamer} \usepackage{beamerthemeplaincu} - \usepackage{fontenc,xltxtra,xunicode} +\usepackage{fontenc,xltxtra,xunicode} \defaultfontfeatures{Mapping=tex-text} -\usepackage{mathpartir} \usepackage[absolute,overlay]{textpos} \usepackage{ifthen} \usepackage{tikz} \usepackage{pgf} \usepackage{calc} \usepackage{ulem} -%%\usepackage{courier} \usepackage{listings} \renewcommand{\uline}[1]{#1} \usetikzlibrary{arrows} @@ -21,84 +19,14 @@ \usetikzlibrary{plotmarks} \usepackage{graphicx} \usepackage{pgfplots} - -\definecolor{javared}{rgb}{0.6,0,0} % for strings -\definecolor{javagreen}{rgb}{0.25,0.5,0.35} % comments -\definecolor{javapurple}{rgb}{0.5,0,0.35} % keywords -\definecolor{javadocblue}{rgb}{0.25,0.35,0.75} % javadoc +\usepackage{../langs} +\usepackage{../data} \makeatletter \lst@CCPutMacro\lst@ProcessOther {"2D}{\lst@ttfamily{-{}}{-{}}} \@empty\z@\@empty \makeatother -\lstset{language=Java, - basicstyle=\ttfamily, - keywordstyle=\color{javapurple}\bfseries, - stringstyle=\color{javagreen}, - commentstyle=\color{javagreen}, - morecomment=[s][\color{javadocblue}]{/**}{*/}, - numbers=left, - numberstyle=\tiny\color{black}, - stepnumber=1, - numbersep=10pt, - tabsize=2, - showspaces=false, - showstringspaces=false} - -\lstdefinelanguage{scala}{ - morekeywords={abstract,case,catch,class,def,% - do,else,extends,false,final,finally,% - for,if,implicit,import,match,mixin,% - new,null,object,override,package,% - private,protected,requires,return,sealed,% - super,this,throw,trait,true,try,% - type,val,var,while,with,yield}, - otherkeywords={=>,<-,<\%,<:,>:,\#,@}, - sensitive=true, - morecomment=[l]{//}, - morecomment=[n]{/*}{*/}, - morestring=[b]", - morestring=[b]', - morestring=[b]""" -} - -\lstset{language=Scala, - basicstyle=\ttfamily, - keywordstyle=\color{javapurple}\bfseries, - stringstyle=\color{javagreen}, - commentstyle=\color{javagreen}, - morecomment=[s][\color{javadocblue}]{/**}{*/}, - numbers=left, - numberstyle=\tiny\color{black}, - stepnumber=1, - numbersep=10pt, - tabsize=2, - showspaces=false, - showstringspaces=false} - - -\begin{filecontents}{interpreted2.data} -%1 0.00503 -200 1.005863 -400 7.8296765 -600 27.2321885 -800 65.249271 -1000 135.4493445 -1200 232.134097 -1400 382.527227 -\end{filecontents} - -\begin{filecontents}{compiled2.data} -200 0.222058 -400 0.215204 -600 0.202031 -800 0.21986 -1000 0.205934 -1200 0.1981615 -1400 0.207116 -\end{filecontents} - % beamer stuff \renewcommand{\slidecaption}{AFL 01, King's College London, 25.~September 2013} diff -r 5be68de225e9 -r 828303e8e4af slides/slides02.pdf Binary file slides/slides02.pdf has changed diff -r 5be68de225e9 -r 828303e8e4af slides/slides02.tex --- a/slides/slides02.tex Sat Nov 30 00:06:02 2013 +0000 +++ b/slides/slides02.tex Sun Dec 01 09:58:41 2013 +0000 @@ -1,8 +1,5 @@ \documentclass[dvipsnames,14pt,t]{beamer} \usepackage{beamerthemeplaincu} -%%\usepackage[T1]{fontenc} -\usepackage[latin1]{inputenc} -\usepackage{mathpartir} \usepackage[absolute,overlay]{textpos} \usepackage{ifthen} \usepackage{tikz} @@ -20,215 +17,19 @@ \usetikzlibrary{plotmarks} \usetikzlibrary{calc} \usepackage{graphicx} - -\definecolor{javared}{rgb}{0.6,0,0} % for strings -\definecolor{javagreen}{rgb}{0.25,0.5,0.35} % comments -\definecolor{javapurple}{rgb}{0.5,0,0.35} % keywords -\definecolor{javadocblue}{rgb}{0.25,0.35,0.75} % javadoc +\usepackage{../langs} +\usepackage{../data} \makeatletter \lst@CCPutMacro\lst@ProcessOther {"2D}{\lst@ttfamily{-{}}{-{}}} \@empty\z@\@empty \makeatother -\lstset{language=Java, - basicstyle=\consolas, - keywordstyle=\color{javapurple}\bfseries, - stringstyle=\color{javagreen}, - commentstyle=\color{javagreen}, - morecomment=[s][\color{javadocblue}]{/**}{*/}, - numbers=left, - numberstyle=\tiny\color{black}, - stepnumber=1, - numbersep=10pt, - tabsize=2, - showspaces=false, - showstringspaces=false} - -\lstdefinelanguage{scala}{ - morekeywords={abstract,case,catch,class,def,% - do,else,extends,false,final,finally,% - for,if,implicit,import,match,mixin,% - new,null,object,override,package,% - private,protected,requires,return,sealed,% - super,this,throw,trait,true,try,% - type,val,var,while,with,yield}, - otherkeywords={=>,<-,<\%,<:,>:,\#,@,->}, - sensitive=true, - morecomment=[l]{//}, - morecomment=[n]{/*}{*/}, - morestring=[b]", - morestring=[b]', - morestring=[b]""" -} - -\lstset{language=Scala, - basicstyle=\consolas, - keywordstyle=\color{javapurple}\bfseries, - stringstyle=\color{javagreen}, - commentstyle=\color{javagreen}, - morecomment=[s][\color{javadocblue}]{/**}{*/}, - numbers=left, - numberstyle=\tiny\color{black}, - stepnumber=1, - numbersep=10pt, - tabsize=2, - showspaces=false, - showstringspaces=false} - % beamer stuff \renewcommand{\slidecaption}{AFL 02, King's College London, 2.~October 2013} \newcommand{\bl}[1]{\textcolor{blue}{#1}} \newcommand{\dn}{\stackrel{\mbox{\scriptsize def}}{=}}% for definitions -% The data files, written on the first run. -\begin{filecontents}{re-python.data} -1 0.029 -5 0.029 -10 0.029 -15 0.032 -16 0.042 -17 0.042 -18 0.055 -19 0.084 -20 0.136 -21 0.248 -22 0.464 -23 0.899 -24 1.773 -25 3.505 -26 6.993 -27 14.503 -28 29.307 -#29 58.886 -\end{filecontents} - -\begin{filecontents}{re-ruby.data} -1 0.00006 -2 0.00003 -3 0.00001 -4 0.00001 -5 0.00001 -6 0.00002 -7 0.00002 -8 0.00004 -9 0.00007 -10 0.00013 -11 0.00026 -12 0.00055 -13 0.00106 -14 0.00196 -15 0.00378 -16 0.00764 -17 0.01606 -18 0.03094 -19 0.06508 -20 0.12420 -21 0.25393 -22 0.51449 -23 1.02174 -24 2.05998 -25 4.22514 -26 8.42479 -27 16.88678 -28 34.79653 -\end{filecontents} - -\begin{filecontents}{re1.data} -1 0.00179 -2 0.00011 -3 0.00014 -4 0.00026 -5 0.00050 -6 0.00095 -7 0.00190 -8 0.00287 -9 0.00779 -10 0.01399 -11 0.01894 -12 0.03666 -13 0.07994 -14 0.08944 -15 0.02377 -16 0.07392 -17 0.22798 -18 0.65310 -19 2.11360 -20 6.31606 -21 21.46013 -\end{filecontents} - -\begin{filecontents}{re2a.data} -1 0.00227 -5 0.00027 -10 0.00075 -15 0.00178 -20 0.00102 -25 0.00028 -30 0.00040 -35 0.00052 -40 0.00075 -45 0.00125 -50 0.00112 -55 0.00099 -60 0.00113 -65 0.00137 -70 0.00170 -\end{filecontents} - -\begin{filecontents}{re2b.data} -1 0.00020 -51 0.00080 -101 0.00678 -151 0.01792 -201 0.04815 -251 0.09648 -301 0.23195 -351 0.52646 -401 0.96277 -451 1.57726 -501 2.00166 -551 2.98341 -601 4.81181 -651 6.57054 -701 9.73973 -751 14.25762 -801 14.80760 -851 19.60958 -901 25.43550 -951 31.96038 -\end{filecontents} - -\begin{filecontents}{re3.data} -1 0.001605 -501 0.131066 -1001 0.057885 -1501 0.136875 -2001 0.176238 -2501 0.254363 -3001 0.37262 -3501 0.500946 -4001 0.638384 -4501 0.816605 -5001 1.00491 -5501 1.232505 -6001 1.525672 -6501 1.757502 -7001 2.092784 -7501 2.429224 -8001 2.803037 -8501 3.463045 -9001 3.609 -9501 4.081504 -10001 4.54569 -10501 6.17789 -11001 6.77242 -11501 7.95864 -\end{filecontents} - - - - \begin{document} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff -r 5be68de225e9 -r 828303e8e4af slides/slides03.pdf Binary file slides/slides03.pdf has changed diff -r 5be68de225e9 -r 828303e8e4af slides/slides03.tex --- a/slides/slides03.tex Sat Nov 30 00:06:02 2013 +0000 +++ b/slides/slides03.tex Sun Dec 01 09:58:41 2013 +0000 @@ -1,8 +1,5 @@ \documentclass[dvipsnames,14pt,t]{beamer} \usepackage{beamerthemeplaincu} -%%\usepackage[T1]{fontenc} -\usepackage[latin1]{inputenc} -\usepackage{mathpartir} \usepackage[absolute,overlay]{textpos} \usepackage{ifthen} \usepackage{tikz} @@ -21,62 +18,14 @@ \usetikzlibrary{fit} \usetikzlibrary{backgrounds} \usepackage{graphicx} +\usepackage{../langs} +\usepackage{../data} -\definecolor{javared}{rgb}{0.6,0,0} % for strings -\definecolor{javagreen}{rgb}{0.25,0.5,0.35} % comments -\definecolor{javapurple}{rgb}{0.5,0,0.35} % keywords -\definecolor{javadocblue}{rgb}{0.25,0.35,0.75} % javadoc \makeatletter \lst@CCPutMacro\lst@ProcessOther {"2D}{\lst@ttfamily{-{}}{-{}}} \@empty\z@\@empty \makeatother -\lstset{language=Java, - basicstyle=\consolas, - keywordstyle=\color{javapurple}\bfseries, - stringstyle=\color{javagreen}, - commentstyle=\color{javagreen}, - morecomment=[s][\color{javadocblue}]{/**}{*/}, - numbers=left, - numberstyle=\tiny\color{black}, - stepnumber=1, - numbersep=10pt, - tabsize=2, - showspaces=false, - showstringspaces=false} - -\lstdefinelanguage{scala}{ - morekeywords={abstract,case,catch,class,def,% - do,else,extends,false,final,finally,% - for,if,implicit,import,match,mixin,% - new,null,object,override,package,% - private,protected,requires,return,sealed,% - super,this,throw,trait,true,try,% - type,val,var,while,with,yield}, - otherkeywords={=>,<-,<\%,<:,>:,\#,@,->}, - sensitive=true, - morecomment=[l]{//}, - morecomment=[n]{/*}{*/}, - morestring=[b]", - morestring=[b]', - morestring=[b]""" -} - -\lstset{language=Scala, - basicstyle=\consolas, - keywordstyle=\color{javapurple}\bfseries, - stringstyle=\color{javagreen}, - commentstyle=\color{javagreen}, - morecomment=[s][\color{javadocblue}]{/**}{*/}, - numbers=left, - numberstyle=\tiny\color{black}, - stepnumber=1, - numbersep=10pt, - tabsize=2, - showspaces=false, - showstringspaces=false} - - % beamer stuff \renewcommand{\slidecaption}{AFL 03, King's College London, 9.~October 2013} \newcommand{\bl}[1]{\textcolor{blue}{#1}} @@ -440,10 +389,11 @@ \begin{center} \begin{tikzpicture}[>=stealth',very thick,auto, every state/.style={minimum size=0pt,inner sep=2pt,draw=blue!50,very thick,fill=blue!20},] -\node[state,initial] (q_0) {$q_0$}; \node[state] (q_1) [right=of q_0] {$q_1$}; +\node[state,initial] (q_0) {$q_0$}; +\node[state] (q_1) [right=of q_0] {$q_1$}; \node[state] (q_2) [below right=of q_0] {$q_2$}; \node[state] (q_3) [right=of q_2] {$q_3$}; -\node[state, accepting] (q_4) [right=of q_1] {$q_4$}; +\node[state, accepting] (q_4) [right=of q_1] {$q_4$}; \path[->] (q_0) edge node [above] {\alert{$a$}} (q_1); \path[->] (q_1) edge node [above] {\alert{$a$}} (q_4); \path[->] (q_4) edge [loop right] node {\alert{$a, b$}} (); @@ -473,10 +423,11 @@ \begin{center} \begin{tikzpicture}[>=stealth',very thick,auto, every state/.style={minimum size=0pt,inner sep=2pt,draw=blue!50,very thick,fill=blue!20},] -\node[state,initial] (q_0) {$q_0$}; \node[state] (q_1) [right=of q_0] {$q_1$}; +\node[state,initial] (q_0) {$q_0$}; +\node[state] (q_1) [right=of q_0] {$q_1$}; \node[state] (q_2) [below right=of q_0] {$q_2$}; \node[state] (q_3) [right=of q_2] {$q_3$}; -\node[state, accepting] (q_4) [right=of q_1] {$q_4$}; +\node[state, accepting] (q_4) [right=of q_1] {$q_4$}; \path[->] (q_0) edge node [above] {\alert{$a$}} (q_1); \path[->] (q_1) edge node [above] {\alert{$a$}} (q_4); \path[->] (q_4) edge [loop right] node {\alert{$a, b$}} (); @@ -569,10 +520,14 @@ \begin{tabular}[t]{c@{\hspace{9mm}}c} \begin{tikzpicture}[scale=0.7,>=stealth',very thick, every state/.style={minimum size=0pt,draw=blue!50,very thick,fill=blue!20},] -\node[state,initial] (q_0) {$q_0$}; \node[state] (q_1) [above=of q_0] {$q_1$}; \node[state, accepting] (q_2) [below=of q_0] {$q_2$}; -\path[->] (q_0) edge node [left] {\alert{$\epsilon$}} (q_1); \path[->] (q_0) edge node [left] {\alert{$\epsilon$}} (q_2); -\path[->] (q_0) edge [loop right] node {\alert{$a$}} (); \path[->] (q_1) edge [loop above] node {\alert{$a$}} (); -\path[->] (q_2) edge [loop below] node {\alert{$b$}} (); +\node[state,initial] (q_0) {$q_0$}; +\node[state] (q_1) [above=of q_0] {$q_1$}; +\node[state, accepting] (q_2) [below=of q_0] {$q_2$}; +\path[->] (q_0) edge node [left] {\alert{$\epsilon$}} (q_1); +\path[->] (q_0) edge node [left] {\alert{$\epsilon$}} (q_2); +\path[->] (q_0) edge [loop right] node {\alert{$a$}} (); +\path[->] (q_1) edge [loop above] node {\alert{$a$}} (); +\path[->] (q_2) edge [loop below] node {\alert{$b$}} (); \end{tikzpicture} & \raisebox{20mm}{ @@ -602,15 +557,15 @@ \begin{tabular}[t]{l@{\hspace{10mm}}l} \raisebox{1mm}{\bl{$\varnothing$}} & \begin{tikzpicture}[scale=0.7,>=stealth',very thick, every state/.style={minimum size=3pt,draw=blue!50,very thick,fill=blue!20},] -\node[state, initial] (q_0) {$\mbox{}$}; +\node[state, initial] (q_0) {$\mbox{}$}; \end{tikzpicture}\\\\ \raisebox{1mm}{\bl{$\epsilon$}} & \begin{tikzpicture}[scale=0.7,>=stealth',very thick, every state/.style={minimum size=3pt,draw=blue!50,very thick,fill=blue!20},] -\node[state, initial, accepting] (q_0) {$\mbox{}$}; +\node[state, initial, accepting] (q_0) {$\mbox{}$}; \end{tikzpicture}\\\\ \raisebox{2mm}{\bl{$c$}} & \begin{tikzpicture}[scale=0.7,>=stealth',very thick, every state/.style={minimum size=3pt,draw=blue!50,very thick,fill=blue!20},] -\node[state, initial] (q_0) {$\mbox{}$}; +\node[state, initial] (q_0) {$\mbox{}$}; \node[state, accepting] (q_1) [right=of q_0] {$\mbox{}$}; \path[->] (q_0) edge node [below] {\alert{$c$}} (q_1); \end{tikzpicture}\\\\ @@ -768,10 +723,14 @@ \begin{center} \begin{tikzpicture}[scale=0.7,>=stealth',very thick, every state/.style={minimum size=0pt,draw=blue!50,very thick,fill=blue!20},] -\node[state,initial] (q_0) {$q_0$}; \node[state] (q_1) [above=of q_0] {$q_1$}; \node[state, accepting] (q_2) [below=of q_0] {$q_2$}; -\path[->] (q_0) edge node [left] {\alert{$\epsilon$}} (q_1); \path[->] (q_0) edge node [left] {\alert{$\epsilon$}} (q_2); -\path[->] (q_0) edge [loop right] node {\alert{$a$}} (); \path[->] (q_1) edge [loop above] node {\alert{$a$}} (); -\path[->] (q_2) edge [loop below] node {\alert{$b$}} (); +\node[state,initial] (q_0) {$q_0$}; +\node[state] (q_1) [above=of q_0] {$q_1$}; +\node[state, accepting] (q_2) [below=of q_0] {$q_2$}; +\path[->] (q_0) edge node [left] {\alert{$\epsilon$}} (q_1); +\path[->] (q_0) edge node [left] {\alert{$\epsilon$}} (q_2); +\path[->] (q_0) edge [loop right] node {\alert{$a$}} (); +\path[->] (q_1) edge [loop above] node {\alert{$a$}} (); +\path[->] (q_2) edge [loop below] node {\alert{$b$}} (); \end{tikzpicture} \end{center} \end{textblock} @@ -822,10 +781,11 @@ \begin{center} \begin{tikzpicture}[>=stealth',very thick,auto, every state/.style={minimum size=0pt,inner sep=2pt,draw=blue!50,very thick,fill=blue!20},] -\node[state,initial] (q_0) {$q_0$}; \node[state] (q_1) [right=of q_0] {$q_1$}; +\node[state,initial] (q_0) {$q_0$}; +\node[state] (q_1) [right=of q_0] {$q_1$}; \node[state] (q_2) [below right=of q_0] {$q_2$}; \node[state] (q_3) [right=of q_2] {$q_3$}; -\node[state, accepting] (q_4) [right=of q_1] {$q_4$}; +\node[state, accepting] (q_4) [right=of q_1] {$q_4$}; \path[->] (q_0) edge node [above] {\alert{$a$}} (q_1); \path[->] (q_1) edge node [above] {\alert{$a$}} (q_4); \path[->] (q_4) edge [loop right] node {\alert{$a, b$}} (); @@ -843,8 +803,9 @@ \begin{center} \begin{tikzpicture}[>=stealth',very thick,auto, every state/.style={minimum size=0pt,inner sep=2pt,draw=blue!50,very thick,fill=blue!20},] -\node[state,initial] (q_02) {$q_{0, 2}$}; \node[state] (q_13) [right=of q_02] {$q_{1, 3}$}; -\node[state, accepting] (q_4) [right=of q_13] {$q_{4\phantom{,0}}$}; +\node[state,initial] (q_02) {$q_{0, 2}$}; +\node[state] (q_13) [right=of q_02] {$q_{1, 3}$}; +\node[state, accepting] (q_4) [right=of q_13] {$q_{4\phantom{,0}}$}; \path[->] (q_02) edge [bend left] node [above] {\alert{$a$}} (q_13); \path[->] (q_13) edge [bend left] node [below] {\alert{$b$}} (q_02); \path[->] (q_02) edge [loop below] node {\alert{$b$}} (); diff -r 5be68de225e9 -r 828303e8e4af slides/slides04.pdf Binary file slides/slides04.pdf has changed diff -r 5be68de225e9 -r 828303e8e4af slides/slides04.tex --- a/slides/slides04.tex Sat Nov 30 00:06:02 2013 +0000 +++ b/slides/slides04.tex Sun Dec 01 09:58:41 2013 +0000 @@ -1,8 +1,5 @@ \documentclass[dvipsnames,14pt,t]{beamer} \usepackage{beamerthemeplaincu} -%%%\usepackage[T1]{fontenc} -\usepackage[latin1]{inputenc} -\usepackage{mathpartir} \usepackage[absolute,overlay]{textpos} \usepackage{ifthen} \usepackage{tikz} @@ -22,168 +19,19 @@ \usetikzlibrary{plotmarks} \usetikzlibrary{backgrounds} \usepackage{graphicx} - -\definecolor{javared}{rgb}{0.6,0,0} % for strings -\definecolor{javagreen}{rgb}{0.25,0.5,0.35} % comments -\definecolor{javapurple}{rgb}{0.5,0,0.35} % keywords -\definecolor{javadocblue}{rgb}{0.25,0.35,0.75} % javadoc +\usepackage{../langs} +\usepackage{../data} \makeatletter \lst@CCPutMacro\lst@ProcessOther {"2D}{\lst@ttfamily{-{}}{-{}}} \@empty\z@\@empty \makeatother -\lstset{language=Java, - basicstyle=\consolas, - keywordstyle=\color{javapurple}\bfseries, - stringstyle=\color{javagreen}, - commentstyle=\color{javagreen}, - morecomment=[s][\color{javadocblue}]{/**}{*/}, - numbers=left, - numberstyle=\tiny\color{black}, - stepnumber=1, - numbersep=10pt, - tabsize=2, - showspaces=false, - showstringspaces=false} -\lstdefinelanguage{scala}{ - morekeywords={abstract,case,catch,class,def,% - do,else,extends,false,final,finally,% - for,if,implicit,import,match,mixin,% - new,null,object,override,package,% - private,protected,requires,return,sealed,% - super,this,throw,trait,true,try,% - type,val,var,while,with,yield}, - otherkeywords={=>,<-,<\%,<:,>:,\#,@,->}, - sensitive=true, - morecomment=[l]{//}, - morecomment=[n]{/*}{*/}, - morestring=[b]", - morestring=[b]', - morestring=[b]""" -} - -\lstset{language=Scala, - basicstyle=\consolas, - keywordstyle=\color{javapurple}\bfseries, - stringstyle=\color{javagreen}, - commentstyle=\color{javagreen}, - morecomment=[s][\color{javadocblue}]{/**}{*/}, - numbers=left, - numberstyle=\tiny\color{black}, - stepnumber=1, - numbersep=10pt, - tabsize=2, - showspaces=false, - showstringspaces=false} - -% beamer stuff \renewcommand{\slidecaption}{AFL 04, King's College London, 16.~October 2013} \newcommand{\bl}[1]{\textcolor{blue}{#1}} \newcommand{\dn}{\stackrel{\mbox{\scriptsize def}}{=}}% for definitions -% The data files, written on the first run. -\begin{filecontents}{re-python.data} -1 0.029 -5 0.029 -10 0.029 -15 0.032 -16 0.042 -17 0.042 -18 0.055 -19 0.084 -20 0.136 -21 0.248 -22 0.464 -23 0.899 -24 1.773 -25 3.505 -26 6.993 -27 14.503 -28 29.307 -#29 58.886 -\end{filecontents} - -\begin{filecontents}{re-ruby.data} -1 0.00006 -2 0.00003 -3 0.00001 -4 0.00001 -5 0.00001 -6 0.00002 -7 0.00002 -8 0.00004 -9 0.00007 -10 0.00013 -11 0.00026 -12 0.00055 -13 0.00106 -14 0.00196 -15 0.00378 -16 0.00764 -17 0.01606 -18 0.03094 -19 0.06508 -20 0.12420 -21 0.25393 -22 0.51449 -23 1.02174 -24 2.05998 -25 4.22514 -26 8.42479 -27 16.88678 -28 34.79653 -\end{filecontents} - -\begin{filecontents}{nfa.data} -0 0.00099 -5 0.01304 -10 0.05350 -15 0.10152 -20 0.10876 -25 0.06984 -30 0.09693 -35 0.04805 -40 0.07512 -45 0.07624 -50 0.10451 -55 0.13285 -60 0.15748 -65 0.19982 -70 0.24075 -75 0.28963 -80 0.35734 -85 0.43735 -90 0.49692 -95 0.59551 -100 0.72236 -\end{filecontents} - -\begin{filecontents}{nfasearch.data} -0 0.00009 -1 0.00147 -2 0.00030 -3 0.00062 -4 0.00132 -5 0.00177 -6 0.00487 -7 0.00947 -8 0.01757 -9 0.02050 -10 0.02091 -11 0.04002 -12 0.08662 -13 0.17269 -14 0.37255 -15 0.81935 -16 1.76254 -17 3.89442 -18 8.42263 -19 17.89661 -20 38.21481 -\end{filecontents} - \begin{document} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff -r 5be68de225e9 -r 828303e8e4af slides/slides05.pdf Binary file slides/slides05.pdf has changed diff -r 5be68de225e9 -r 828303e8e4af slides/slides05.tex --- a/slides/slides05.tex Sat Nov 30 00:06:02 2013 +0000 +++ b/slides/slides05.tex Sun Dec 01 09:58:41 2013 +0000 @@ -1,8 +1,5 @@ \documentclass[dvipsnames,14pt,t]{beamer} \usepackage{beamerthemeplaincu} -%\usepackage[T1]{fontenc} -%\usepackage[latin1]{inputenc} -\usepackage{mathpartir} \usepackage[absolute,overlay]{textpos} \usepackage{ifthen} \usepackage{tikz} @@ -21,82 +18,9 @@ \usepackage{graphicx} \usepackage{pgfplots} \usepackage{fontspec} -\setmonofont{Consolas} - -\definecolor{javared}{rgb}{0.6,0,0} % for strings -\definecolor{javagreen}{rgb}{0.25,0.5,0.35} % comments -\definecolor{javapurple}{rgb}{0.5,0,0.35} % keywords -\definecolor{javadocblue}{rgb}{0.25,0.35,0.75} % javadoc - -\makeatletter -\lst@CCPutMacro\lst@ProcessOther {"2D}{\lst@ttfamily{-{}}{-{}}} -\@empty\z@\@empty -\makeatother - - -\lstdefinelanguage{scala}{ - morekeywords={abstract,case,catch,class,def,% - do,else,extends,false,final,finally,% - for,if,implicit,import,match,mixin,% - new,null,object,override,package,% - private,protected,requires,return,sealed,% - super,this,throw,trait,true,try,% - type,val,var,while,with,yield}, - otherkeywords={=>,<-,<\%,<:,>:,\#,@}, - sensitive=true, - morecomment=[l]{//}, - morecomment=[n]{/*}{*/}, - morestring=[b]", - morestring=[b]', - morestring=[b]""" -} +\usepackage{../langs} +\usepackage{../data} -\lstdefinelanguage{while}{ - morekeywords={while, if, then. else, read, write}, - otherkeywords={=>,<-,<\%,<:,>:,\#,@}, - sensitive=true, - morecomment=[l]{//}, - morecomment=[n]{/*}{*/}, - morestring=[b]", - morestring=[b]', - morestring=[b]""" -} - - -\lstset{language=Scala, - basicstyle=\ttfamily, - keywordstyle=\color{javapurple}\bfseries, - stringstyle=\color{javagreen}, - commentstyle=\color{javagreen}, - morecomment=[s][\color{javadocblue}]{/**}{*/}, - numbers=left, - numberstyle=\tiny\color{black}, - stepnumber=1, - numbersep=10pt, - tabsize=2, - showspaces=false, - showstringspaces=false} - -\begin{filecontents}{interpreted2.data} -%1 0.00503 -200 1.005863 -400 7.8296765 -600 27.2321885 -800 65.249271 -1000 135.4493445 -1200 232.134097 -1400 382.527227 -\end{filecontents} - -\begin{filecontents}{compiled2.data} -200 0.222058 -400 0.215204 -600 0.202031 -800 0.21986 -1000 0.205934 -1200 0.1981615 -1400 0.207116 -\end{filecontents} % beamer stuff \renewcommand{\slidecaption}{AFL 05, King's College London, 23.~October 2013} diff -r 5be68de225e9 -r 828303e8e4af slides/slides06.pdf Binary file slides/slides06.pdf has changed diff -r 5be68de225e9 -r 828303e8e4af slides/slides06.tex --- a/slides/slides06.tex Sat Nov 30 00:06:02 2013 +0000 +++ b/slides/slides06.tex Sun Dec 01 09:58:41 2013 +0000 @@ -1,8 +1,5 @@ \documentclass[dvipsnames,14pt,t]{beamer} \usepackage{beamerthemeplaincu} -%\usepackage[T1]{fontenc} -%\usepackage[latin1]{inputenc} -\usepackage{mathpartir} \usepackage[absolute,overlay]{textpos} \usepackage{ifthen} \usepackage{tikz} @@ -20,12 +17,9 @@ \usetikzlibrary{calc} \usetikzlibrary{plotmarks} \usepackage{graphicx} -\setmonofont{Consolas} +\usepackage{../langs} +\usepackage{../data} -\definecolor{javared}{rgb}{0.6,0,0} % for strings -\definecolor{javagreen}{rgb}{0.25,0.5,0.35} % comments -\definecolor{javapurple}{rgb}{0.5,0,0.35} % keywords -\definecolor{javadocblue}{rgb}{0.25,0.35,0.75} % javadoc \makeatletter \lst@CCPutMacro\lst@ProcessOther {"2D}{\lst@ttfamily{-{}}{-{}}} @@ -33,101 +27,11 @@ \makeatother -\lstdefinelanguage{scala}{ - morekeywords={abstract,case,catch,class,def,% - do,else,extends,false,final,finally,% - for,if,implicit,import,match,mixin,% - new,null,object,override,package,% - private,protected,requires,return,sealed,% - super,this,throw,trait,true,try,% - type,val,var,while,with,yield}, - otherkeywords={=>,<-,<\%,<:,>:,\#,@}, - sensitive=true, - morecomment=[l]{//}, - morecomment=[n]{/*}{*/}, - morestring=[b]", - morestring=[b]', - morestring=[b]""" -} - -\lstdefinelanguage{while}{ - morekeywords={while, if, then. else, read, write}, - otherkeywords={=>,<-,<\%,<:,>:,\#,@}, - sensitive=true, - morecomment=[l]{//}, - morecomment=[n]{/*}{*/}, - morestring=[b]", - morestring=[b]', - morestring=[b]""" -} - - -\lstset{language=Scala, - basicstyle=\ttfamily, - keywordstyle=\color{javapurple}\bfseries, - stringstyle=\color{javagreen}, - commentstyle=\color{javagreen}, - morecomment=[s][\color{javadocblue}]{/**}{*/}, - numbers=left, - numberstyle=\tiny\color{black}, - stepnumber=1, - numbersep=10pt, - tabsize=2, - showspaces=false, - showstringspaces=false} - - % beamer stuff \renewcommand{\slidecaption}{AFL 06, King's College London, 30.~October 2013} \newcommand{\bl}[1]{\textcolor{blue}{#1}} \newcommand{\dn}{\stackrel{\mbox{\scriptsize def}}{=}}% for definitions - -\begin{filecontents}{s-grammar1.data} -1 0.01152 -51 0.07973 -101 0.09726 -151 0.09320 -201 0.10010 -251 0.16997 -301 0.26662 -351 0.46118 -401 0.62516 -451 0.87247 -501 1.16334 -551 1.71152 -601 2.10958 -651 2.44360 -701 2.98488 -751 3.50326 -801 4.11036 -851 4.93394 -901 5.77465 -951 7.39123 -\end{filecontents} - -\begin{filecontents}{s-grammar2.data} -1 0.01280 -2 0.00064 -3 0.00173 -4 0.00355 -5 0.00965 -6 0.02674 -7 0.06953 -8 0.11166 -9 0.18707 -10 0.09189 -11 0.12724 -12 0.24337 -13 0.59304 -14 1.53594 -15 4.01195 -16 10.73582 -17 29.51587 -#18 73.14163 -\end{filecontents} - - \begin{document} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff -r 5be68de225e9 -r 828303e8e4af slides/slides07.pdf Binary file slides/slides07.pdf has changed diff -r 5be68de225e9 -r 828303e8e4af slides/slides07.tex --- a/slides/slides07.tex Sat Nov 30 00:06:02 2013 +0000 +++ b/slides/slides07.tex Sun Dec 01 09:58:41 2013 +0000 @@ -1,8 +1,5 @@ \documentclass[dvipsnames,14pt,t]{beamer} \usepackage{beamerthemeplaincu} -%\usepackage[T1]{fontenc} -%\usepackage[latin1]{inputenc} -\usepackage{mathpartir} \usepackage[absolute,overlay]{textpos} \usepackage{ifthen} \usepackage{tikz} @@ -21,82 +18,9 @@ \usetikzlibrary{plotmarks} \usepackage{graphicx} \usepackage{pgfplots} - -\definecolor{javared}{rgb}{0.6,0,0} % for strings -\definecolor{javagreen}{rgb}{0.25,0.5,0.35} % comments -\definecolor{javapurple}{rgb}{0.5,0,0.35} % keywords -\definecolor{javadocblue}{rgb}{0.25,0.35,0.75} % javadoc - -\lstset{language=Java, - basicstyle=\ttfamily, - keywordstyle=\color{javapurple}\bfseries, - stringstyle=\color{javagreen}, - commentstyle=\color{javagreen}, - morecomment=[s][\color{javadocblue}]{/**}{*/}, - numbers=left, - numberstyle=\tiny\color{black}, - stepnumber=1, - numbersep=10pt, - tabsize=2, - showspaces=false, - showstringspaces=false} - -\lstdefinelanguage{scala}{ - morekeywords={abstract,case,catch,class,def,% - do,else,extends,false,final,finally,% - for,if,implicit,import,match,mixin,% - new,null,object,override,package,% - private,protected,requires,return,sealed,% - super,this,throw,trait,true,try,% - type,val,var,while,with,yield}, - otherkeywords={=>,<-,<\%,<:,>:,\#,@}, - sensitive=true, - morecomment=[l]{//}, - morecomment=[n]{/*}{*/}, - morestring=[b]", - morestring=[b]', - morestring=[b]""" -} +\usepackage{../langs} +\usepackage{../data} -\lstset{language=Scala, - basicstyle=\ttfamily, - keywordstyle=\color{javapurple}\bfseries, - stringstyle=\color{javagreen}, - commentstyle=\color{javagreen}, - morecomment=[s][\color{javadocblue}]{/**}{*/}, - numbers=left, - numberstyle=\tiny\color{black}, - stepnumber=1, - numbersep=10pt, - tabsize=2, - showspaces=false, - showstringspaces=false} - -\lstdefinelanguage{While}{ - morekeywords={while, if, then. else, read, write}, - otherkeywords={=>,<-,<\%,<:,>:,\#,@}, - sensitive=true, - morecomment=[l]{//}, - morecomment=[n]{/*}{*/}, - morestring=[b]", - morestring=[b]', - morestring=[b]""" -} - - -\setmonofont{Consolas} - -\begin{filecontents}{interpreted.data} -%1 0.00503 -200 1.005863 -400 7.8296765 -500 15.43106 -600 27.2321885 -800 65.249271 -1000 135.4493445 -1200 232.134097 -1400 382.527227 -\end{filecontents} % beamer stuff \renewcommand{\slidecaption}{AFL 07, King's College London, 13.~November 2013} diff -r 5be68de225e9 -r 828303e8e4af slides/slides08.pdf Binary file slides/slides08.pdf has changed diff -r 5be68de225e9 -r 828303e8e4af slides/slides08.tex --- a/slides/slides08.tex Sat Nov 30 00:06:02 2013 +0000 +++ b/slides/slides08.tex Sun Dec 01 09:58:41 2013 +0000 @@ -1,15 +1,11 @@ \documentclass[dvipsnames,14pt,t]{beamer} \usepackage{beamerthemeplaincu} -%\usepackage[T1]{fontenc} -%\usepackage[latin1]{inputenc} -\usepackage{mathpartir} \usepackage[absolute,overlay]{textpos} \usepackage{ifthen} \usepackage{tikz} \usepackage{pgf} \usepackage{calc} \usepackage{ulem} -\usepackage{courier} \usepackage{listings} \renewcommand{\uline}[1]{#1} \usetikzlibrary{arrows} @@ -21,134 +17,14 @@ \usetikzlibrary{plotmarks} \usepackage{graphicx} \usepackage{pgfplots} -\setmonofont{Consolas} - -\definecolor{javared}{rgb}{0.6,0,0} % for strings -\definecolor{javagreen}{rgb}{0.25,0.5,0.35} % comments -\definecolor{javapurple}{rgb}{0.5,0,0.35} % keywords -\definecolor{javadocblue}{rgb}{0.25,0.35,0.75} % javadoc - -\lstset{language=Java, - basicstyle=\ttfamily, - keywordstyle=\color{javapurple}\bfseries, - stringstyle=\color{javagreen}, - commentstyle=\color{javagreen}, - morecomment=[s][\color{javadocblue}]{/**}{*/}, - numbers=left, - numberstyle=\tiny\color{black}, - stepnumber=1, - numbersep=10pt, - tabsize=2, - showspaces=false, - showstringspaces=false} - -\lstdefinelanguage{scala}{ - morekeywords={abstract,case,catch,class,def,% - do,else,extends,false,final,finally,% - for,if,implicit,import,match,mixin,% - new,null,object,override,package,% - private,protected,requires,return,sealed,% - super,this,throw,trait,true,try,% - type,val,var,while,with,yield}, - otherkeywords={=>,<-,<\%,<:,>:,\#,@}, - sensitive=true, - morecomment=[l]{//}, - morecomment=[n]{/*}{*/}, - morestring=[b]", - morestring=[b]', - morestring=[b]""" -} - - -\lstset{language=Scala, - basicstyle=\ttfamily, - keywordstyle=\color{javapurple}\bfseries, - stringstyle=\color{javagreen}, - commentstyle=\color{javagreen}, - morecomment=[s][\color{javadocblue}]{/**}{*/}, - numbers=left, - numberstyle=\tiny\color{black}, - stepnumber=1, - numbersep=10pt, - tabsize=2, - showspaces=false, - showstringspaces=false} - -\lstdefinelanguage{while}{ - morekeywords={if,then,else,while,do,true,false,write}, - otherkeywords={=,!=,:=,<,>,;}, - sensitive=true, - morecomment=[n]{/*}{*/}, -} - - -\lstset{language=While, - basicstyle=\ttfamily, - keywordstyle=\color{javapurple}\bfseries, - stringstyle=\color{javagreen}, - commentstyle=\color{javagreen}, - morecomment=[s][\color{javadocblue}]{/**}{*/}, - numbers=left, - numberstyle=\tiny\color{black}, - stepnumber=1, - numbersep=10pt, - tabsize=2, - showspaces=false, - showstringspaces=false} - +\usepackage{../langs} +\usepackage{../data} % beamer stuff \renewcommand{\slidecaption}{AFL 09, King's College London, 20.~November 2013} \newcommand{\bl}[1]{\textcolor{blue}{#1}} \newcommand{\dn}{\stackrel{\mbox{\scriptsize def}}{=}}% for definitions - -% The data files, written on the first run. -\begin{filecontents}{compiled.data} -%1 0.234146 -%5000 0.227539 -%10000 0.280748 -50000 1.087897 -100000 3.713165 -250000 21.6624545 -500000 85.872613 -750000 203.6408015 -1000000 345.736574 -\end{filecontents} - -\begin{filecontents}{interpreted.data} -%1 0.00503 -200 1.005863 -400 7.8296765 -500 15.43106 -600 27.2321885 -800 65.249271 -1000 135.4493445 -1200 232.134097 -1400 382.527227 -\end{filecontents} - -\begin{filecontents}{interpreted2.data} -%1 0.00503 -200 1.005863 -400 7.8296765 -600 27.2321885 -800 65.249271 -1000 135.4493445 -1200 232.134097 -1400 382.527227 -\end{filecontents} - -\begin{filecontents}{compiled2.data} -200 0.222058 -400 0.215204 -600 0.202031 -800 0.21986 -1000 0.205934 -1200 0.1981615 -1400 0.207116 -\end{filecontents} - \begin{document} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff -r 5be68de225e9 -r 828303e8e4af slides/slides09.pdf Binary file slides/slides09.pdf has changed diff -r 5be68de225e9 -r 828303e8e4af slides/slides09.tex --- a/slides/slides09.tex Sat Nov 30 00:06:02 2013 +0000 +++ b/slides/slides09.tex Sun Dec 01 09:58:41 2013 +0000 @@ -1,8 +1,5 @@ \documentclass[dvipsnames,14pt,t]{beamer} \usepackage{beamerthemeplaincu} -%\usepackage[T1]{fontenc} -%\usepackage[latin1]{inputenc} -\usepackage{mathpartir} \usepackage[absolute,overlay]{textpos} \usepackage{ifthen} \usepackage{tikz} @@ -21,82 +18,10 @@ \usetikzlibrary{plotmarks} \usepackage{graphicx} \usepackage{pgfplots} -\setmonofont{Consolas} - -\definecolor{javared}{rgb}{0.6,0,0} % for strings -\definecolor{javagreen}{rgb}{0.25,0.5,0.35} % comments -\definecolor{javapurple}{rgb}{0.5,0,0.35} % keywords -\definecolor{javadocblue}{rgb}{0.25,0.35,0.75} % javadoc - -\lstset{language=Java, - basicstyle=\ttfamily, - keywordstyle=\color{javapurple}\bfseries, - stringstyle=\color{javagreen}, - commentstyle=\color{javagreen}, - morecomment=[s][\color{javadocblue}]{/**}{*/}, - numbers=left, - numberstyle=\tiny\color{black}, - stepnumber=1, - numbersep=10pt, - tabsize=2, - showspaces=false, - showstringspaces=false} - -\lstdefinelanguage{scala}{ - morekeywords={abstract,case,catch,class,def,% - do,else,extends,false,final,finally,% - for,if,implicit,import,match,mixin,% - new,null,object,override,package,% - private,protected,requires,return,sealed,% - super,this,throw,trait,true,try,% - type,val,var,while,with,yield}, - otherkeywords={=>,<-,<\%,<:,>:,\#,@}, - sensitive=true, - morecomment=[l]{//}, - morecomment=[n]{/*}{*/}, - morestring=[b]", - morestring=[b]', - morestring=[b]""" -} +\usepackage{../langs} +\usepackage{../data} -\lstset{language=Scala, - basicstyle=\ttfamily, - keywordstyle=\color{javapurple}\bfseries, - stringstyle=\color{javagreen}, - commentstyle=\color{javagreen}, - morecomment=[s][\color{javadocblue}]{/**}{*/}, - numbers=left, - numberstyle=\tiny\color{black}, - stepnumber=1, - numbersep=10pt, - tabsize=2, - showspaces=false, - showstringspaces=false} - -\lstdefinelanguage{while}{ - morekeywords={if,then,else,while,do,true,false,write}, - otherkeywords={=,!=,:=,<,>,;}, - sensitive=true, - morecomment=[n]{/*}{*/}, -} - - -\lstset{language=While, - basicstyle=\ttfamily, - keywordstyle=\color{javapurple}\bfseries, - stringstyle=\color{javagreen}, - commentstyle=\color{javagreen}, - morecomment=[s][\color{javadocblue}]{/**}{*/}, - numbers=left, - numberstyle=\tiny\color{black}, - stepnumber=1, - numbersep=10pt, - tabsize=2, - showspaces=false, - showstringspaces=false} - - % beamer stuff \renewcommand{\slidecaption}{AFL 09, King's College London, 27.~November 2013} \newcommand{\bl}[1]{\textcolor{blue}{#1}} @@ -115,52 +40,6 @@ \usebeamerfont*{subitem projected}} \end{pgfpicture}} -% The data files, written on the first run. -\begin{filecontents}{compiled.data} -%1 0.234146 -%5000 0.227539 -%10000 0.280748 -50000 1.087897 -100000 3.713165 -250000 21.6624545 -500000 85.872613 -750000 203.6408015 -1000000 345.736574 -\end{filecontents} - -\begin{filecontents}{interpreted.data} -%1 0.00503 -200 1.005863 -400 7.8296765 -500 15.43106 -600 27.2321885 -800 65.249271 -1000 135.4493445 -1200 232.134097 -1400 382.527227 -\end{filecontents} - -\begin{filecontents}{interpreted2.data} -%1 0.00503 -200 1.005863 -400 7.8296765 -600 27.2321885 -800 65.249271 -1000 135.4493445 -1200 232.134097 -1400 382.527227 -\end{filecontents} - -\begin{filecontents}{compiled2.data} -200 0.222058 -400 0.215204 -600 0.202031 -800 0.21986 -1000 0.205934 -1200 0.1981615 -1400 0.207116 -\end{filecontents} - \begin{document} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff -r 5be68de225e9 -r 828303e8e4af slides/slides10.pdf Binary file slides/slides10.pdf has changed diff -r 5be68de225e9 -r 828303e8e4af slides/slides10.tex --- a/slides/slides10.tex Sat Nov 30 00:06:02 2013 +0000 +++ b/slides/slides10.tex Sun Dec 01 09:58:41 2013 +0000 @@ -1,8 +1,5 @@ \documentclass[dvipsnames,14pt,t]{beamer} -\usepackage{beamerthemeplainculight} -\usepackage[T1]{fontenc} -\usepackage[latin1]{inputenc} -\usepackage{mathpartir} +\usepackage{beamerthemeplaincu} \usepackage[absolute,overlay]{textpos} \usepackage{ifthen} \usepackage{tikz} @@ -21,84 +18,13 @@ \usetikzlibrary{plotmarks} \usepackage{graphicx} \usepackage{pgfplots} - - -\definecolor{javared}{rgb}{0.6,0,0} % for strings -\definecolor{javagreen}{rgb}{0.25,0.5,0.35} % comments -\definecolor{javapurple}{rgb}{0.5,0,0.35} % keywords -\definecolor{javadocblue}{rgb}{0.25,0.35,0.75} % javadoc - -\lstset{language=Java, - basicstyle=\ttfamily, - keywordstyle=\color{javapurple}\bfseries, - stringstyle=\color{javagreen}, - commentstyle=\color{javagreen}, - morecomment=[s][\color{javadocblue}]{/**}{*/}, - numbers=left, - numberstyle=\tiny\color{black}, - stepnumber=1, - numbersep=10pt, - tabsize=2, - showspaces=false, - showstringspaces=false} +\usepackage{../langs} +\usepackage{../data} -\lstdefinelanguage{scala}{ - morekeywords={abstract,case,catch,class,def,% - do,else,extends,false,final,finally,% - for,if,implicit,import,match,mixin,% - new,null,object,override,package,% - private,protected,requires,return,sealed,% - super,this,throw,trait,true,try,% - type,val,var,while,with,yield}, - otherkeywords={=>,<-,<\%,<:,>:,\#,@}, - sensitive=true, - morecomment=[l]{//}, - morecomment=[n]{/*}{*/}, - morestring=[b]", - morestring=[b]', - morestring=[b]""" -} - - -\lstset{language=Scala, - basicstyle=\ttfamily, - keywordstyle=\color{javapurple}\bfseries, - stringstyle=\color{javagreen}, - commentstyle=\color{javagreen}, - morecomment=[s][\color{javadocblue}]{/**}{*/}, - numbers=left, - numberstyle=\tiny\color{black}, - stepnumber=1, - numbersep=10pt, - tabsize=2, - showspaces=false, - showstringspaces=false} - -\lstdefinelanguage{while}{ - morekeywords={if,then,else,while,do,true,false,write}, - otherkeywords={=,!=,:=,<,>,;}, - sensitive=true, - morecomment=[n]{/*}{*/}, -} - - -\lstset{language=While, - basicstyle=\ttfamily, - keywordstyle=\color{javapurple}\bfseries, - stringstyle=\color{javagreen}, - commentstyle=\color{javagreen}, - morecomment=[s][\color{javadocblue}]{/**}{*/}, - numbers=left, - numberstyle=\tiny\color{black}, - stepnumber=1, - numbersep=10pt, - tabsize=2, - showspaces=false, - showstringspaces=false} % beamer stuff -\renewcommand{\slidecaption}{AFL 10, King's College London, 5.~December 2012} +\renewcommand{\slidecaption}{AFL 10, King's College London, 4.~December 2013} \newcommand{\bl}[1]{\textcolor{blue}{#1}} \newcommand{\dn}{\stackrel{\mbox{\scriptsize def}}{=}}% for definitions @@ -165,7 +91,7 @@ \begin{center} \begin{tabular}{ll} Email: & christian.urban at kcl.ac.uk\\ - Of$\!$fice: & S1.27 (1st floor Strand Building)\\ + Office: & S1.27 (1st floor Strand Building)\\ Slides: & KEATS (also home work is there)\\ \end{tabular} \end{center} @@ -190,7 +116,7 @@ \frametitle{Revision: Proofs} \begin{center} -\includegraphics[scale=0.4]{river-stones.jpg} +%%\includegraphics[scale=0.4]{river-stones.jpg} \end{center} \end{frame}}