updated
authorChristian Urban <christian dot urban at kcl dot ac dot uk>
Tue, 14 Jun 2016 12:24:25 +0100
changeset 200 10c096d59218
parent 199 193a9fdcedd6
child 201 2585e2a7a7ab
updated
Slides/data/re-python.data
Slides/data/re-ruby.data
Slides/data/re1.data
Slides/data/re2a.data
Slides/data/re2b.data
Slides/data/re3.data
Slides/langs.sty
Slides/slides01.pdf
Slides/slides01.tex
Slides/slides02.pdf
--- a/Slides/data/re-python.data	Tue Jun 14 12:17:42 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-%% LaTeX2e file `re-python.data'
-%% generated by the `filecontents' environment
-%% from source `slides01' on 2016/06/14.
-%%
-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
--- a/Slides/data/re-ruby.data	Tue Jun 14 12:17:42 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-%% LaTeX2e file `re-ruby.data'
-%% generated by the `filecontents' environment
-%% from source `slides01' on 2016/06/14.
-%%
-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
--- a/Slides/data/re1.data	Tue Jun 14 12:17:42 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-%% LaTeX2e file `re1.data'
-%% generated by the `filecontents' environment
-%% from source `slides01' on 2016/06/14.
-%%
-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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Slides/data/re2a.data	Tue Jun 14 12:24:25 2016 +0100
@@ -0,0 +1,19 @@
+%% LaTeX2e file `data/re2a.data'
+%% generated by the `filecontents' environment
+%% from source `slides01' on 2016/06/14.
+%%
+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
--- a/Slides/data/re2b.data	Tue Jun 14 12:17:42 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-%% LaTeX2e file `re2b.data'
-%% generated by the `filecontents' environment
-%% from source `slides01' on 2016/06/14.
-%%
-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
--- a/Slides/data/re3.data	Tue Jun 14 12:17:42 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-%% LaTeX2e file `re3.data'
-%% generated by the `filecontents' environment
-%% from source `slides01' on 2016/06/14.
-%%
-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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Slides/langs.sty	Tue Jun 14 12:24:25 2016 +0100
@@ -0,0 +1,69 @@
+\usepackage{listings}
+\usepackage{etoolbox}
+\setmonofont[Scale=.95]{Consolas}
+\newfontfamily{\consolas}{Consolas}
+
+\definecolor{codered}{rgb}{0.6,0,0}            % for strings
+\definecolor{codegreen}{rgb}{0.25,0.5,0.35}    % comments
+\definecolor{codepurple}{rgb}{0.5,0,0.35}      % keywords
+\definecolor{codedocblue}{rgb}{0.25,0.35,0.75} % doc
+\definecolor{codeblue}{rgb}{0.25,0.35,0.75}    % types
+
+\BeforeBeginEnvironment{lstlisting}{\par\noindent\begin{minipage}{\linewidth}}
+\AfterEndEnvironment{lstlisting}{\end{minipage}\par}
+
+\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,write,read},%
+  otherkeywords={=>,<-,<\%,<:,>:,\#},%
+  sensitive=true,%
+  %directives={Int,Char,Rexp,String,Boolean,BigInt,Unit,List,Set},%
+  %moredelim=*[directive]:,%
+  morecomment=[l]{//},%
+  morecomment=[n]{/*}{*/},
+  morestring=[s]{"""}{"""},
+  morestring=[b]",
+  morestring=[b]',
+}[keywords,comments,strings]
+
+\lstdefinelanguage{While}{
+  morekeywords={if,then,else,while,do,true,false,write,upto,read,for,skip},
+  morecomment=[l]{//},
+  morecomment=[n]{/*}{*/},
+  morestring=[b]",
+  otherkeywords={=,!=,:=,<,>,\%;*,/},
+}[keywords,comments,strings]
+
+\lstdefinestyle{mystyle}
+       {basicstyle=\ttfamily,
+	keywordstyle=\color{codepurple}\bfseries,
+	stringstyle=\color{codegreen},
+	commentstyle=\color{codegreen},
+	morecomment=[s][\color{codedocblue}]{/**}{*/},
+	numbers=left,
+	numberstyle=\tiny\color{black},
+	stepnumber=1,
+	numbersep=10pt,
+	tabsize=2,
+	showspaces=false,
+	showstringspaces=false,
+        xleftmargin=8mm,
+        emphstyle=\color{codeblue}\bfseries,
+        keepspaces
+}
+
+\lstset{language=Scala,
+        style=mystyle}
+
+
+\newcommand{\code}[1]{{\lstinline{#1}}}
+\newcommand{\pcode}[1]{\mbox{\lstset{language={},keywordstyle=\color{black}}\lstinline!#1!}}
+\newcommand{\scode}[1]{\mbox{\lstset{language={},basicstyle=\ttfamily\color{codegreen}}\lstinline!#1!}}
+\makeatother
+
+\lstset{escapeinside={(*@}{@*)}}
Binary file Slides/slides01.pdf has changed
--- a/Slides/slides01.tex	Tue Jun 14 12:17:42 2016 +0100
+++ b/Slides/slides01.tex	Tue Jun 14 12:24:25 2016 +0100
@@ -858,7 +858,7 @@
   \begin{frame}[c]
 
   \begin{center}
-  \includegraphics[scale=0.15]{pics/p1.pdf}
+  \includegraphics[scale=0.15]{pics/p1.jpg}
   \end{center}
 
   \begin{itemize}
Binary file Slides/slides02.pdf has changed