From 9d435ee1aac6aa3451976ef3096ff7a50dca4558 Mon Sep 17 00:00:00 2001
From: Neil Smith <neil.git@njae.me.uk>
Date: Thu, 10 Jul 2014 12:56:57 +0100
Subject: [PATCH] Tidying formatting

---
 slides/affine-break.html           |  2 +-
 slides/further-work.html           | 25 ++++++++++----
 slides/index.html                  | 15 ++++----
 slides/transposition-break.html    |  2 +-
 slides/transposition-encipher.html | 55 +++++++++++++++++++-----------
 5 files changed, 65 insertions(+), 34 deletions(-)
diff --git a/slides/affine-break.html b/slides/affine-break.html
index 58b27f6..ddd8170 100644
--- a/slides/affine-break.html
+++ b/slides/affine-break.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Affine ciphers</title>
+    <title>Breaking affine ciphers</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <style type="text/css">
       /* Slideshow styles */
diff --git a/slides/further-work.html b/slides/further-work.html
index 64a9729..0101763 100644
--- a/slides/further-work.html
+++ b/slides/further-work.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Breaking keyword ciphers</title>
+    <title>Further work</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <style type="text/css">
       /* Slideshow styles */
@@ -46,23 +46,36 @@
     <textarea id="source">
 
 # Taking this further
- 
-### Countdown 
+
+
+<table>
+<tr valign="top">
+<td>
+### Countdown
+
 * Conundrum
 * Letters
    * Picking letters to maximise score
 * Numbers
    * Read the "Functional Pearl"
-
+</td>
+<td>
 ### Hangman
 * Letter probabilities based on each word occurring once in the dictionary
 * Set of candidate words filtered by length, letters guessed
-
+</td>
+</tr>
+<tr>
+<td>
 ### Text generation
 * Read some text, find the n-grams, generate more text from that.
-
+</td>
+<td>
 ### Spelling correction
 * Suggest the most likely correct word, given the probability of these errors.
+</td>
+</tr>
+</table>
 
     </textarea>
     <script src="http://gnab.github.io/remark/downloads/remark-0.6.0.min.js" type="text/javascript">
diff --git a/slides/index.html b/slides/index.html
index dad47e7..8dfb4e1 100644
--- a/slides/index.html
+++ b/slides/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Keyword ciphers</title>
+    <title>Index of cipher training</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <style type="text/css">
       /* Slideshow styles */
@@ -48,12 +48,13 @@
 # Cipher programming training
 
 * [Aims](aims.html)
-* Caesar ciphers: [Making](caesar-encipher.html) and [Breaking](caesar-break.html)
-* Affine ciphers: [Making](affine-encipher.html) and [Breaking](affine-break.html)
-* [Word segmentation](word-segmentation.html)
-* Keyword ciphers: [Making](keyword-encipher.html) and [Breaking](keyword-break.html)
-* Transposition ciphers: [Making](transposition-encipher.html) and [Breaking](transposition-break.html)
-* [Alternative plausability scoring](alternative-plaintext-scoring.html)
+* Caesar ciphers: [Making](caesar-encipher.html) and [Breaking](caesar-break.html) *(Changing representations, language models, text encodings)* 
+* Affine ciphers: [Making](affine-encipher.html) and [Breaking](affine-break.html) *(Time/space trade-offs, off-by-one issues)*
+* [Word segmentation](word-segmentation.html) *(Memoisation and complexity)* 
+* Keyword ciphers: [Making](keyword-encipher.html) and [Breaking](keyword-break.html) *(Being Pythonic and parallelism)* 
+* Transposition ciphers: [Making](transposition-encipher.html) and [Breaking](transposition-break.html) *(Equivalence classes)* 
+* Pocket enigma: [Making](pocket-enigma-encipher.html) and [Breaking](pocket-enigma-break.html) *(Object orientation)* 
+* [Alternative plaintext scoring](alternative-plaintext-scoring.html) *(Empirical computing through simulation)* 
 * [Further work](further-work.html)
 
     </textarea>
diff --git a/slides/transposition-break.html b/slides/transposition-break.html
index 5d8202a..9077c12 100644
--- a/slides/transposition-break.html
+++ b/slides/transposition-break.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Keyword ciphers</title>
+    <title>Breaking transposition ciphers</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <style type="text/css">
       /* Slideshow styles */
diff --git a/slides/transposition-encipher.html b/slides/transposition-encipher.html
index 2fea8e3..af03f75 100644
--- a/slides/transposition-encipher.html
+++ b/slides/transposition-encipher.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Keyword ciphers</title>
+    <title>Transposition ciphers</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <style type="text/css">
       /* Slideshow styles */
@@ -79,14 +79,16 @@ Even older than Caesar cipher.
 * Unwind the strip
 * "Unreadable" unless reader has pole of same diameter
 
-    attack the fort at dawn
+```
+attack the fort at dawn
 
-    a t t a c
-    k t h e f
-    o r t a t
-    d a w n
+a t t a c
+k t h e f
+o r t a t
+d a w n
 
-    akod ttra aean cft
+akod ttra aean cft
+```
 
 ---
 
@@ -102,27 +104,36 @@ Column transposition ciphers:
 * Reorder columns based on keyword
 * Read the grid (perhaps different direction)
 
+(Keyword = secret â cerst)
+```
+attack the fort at dawn
+
+s e c r t       c e r s t
+---------       ---------
+a t t a c       t t a a c
+k t h e f       h t e k f
+o r t a t       t r a o t
+d a w n         w a n d
+
+ttaac htekf traot wand
+thtw tra aean akod cft
+```
+
 Scytale is just a special case of column transposition.
 
 ---
 
 # Grids and data structures
 
-How to represent a grid?
+What operations do we need to do on a grid?
 
-What operations do we need to do on it?
+How to represent a grid?
 
 ---
 
 # Grids and data structures
 
-How to represent a grid?
-
-* List of strings
-* Each row is a string
-* Rows in order in the list
-
-What operations do we need to do on it?
+What operations do we need to do on a grid?
 
 * Fill, by rows or columns
 * Empty, by rows or columns
@@ -130,15 +141,21 @@ What operations do we need to do on it?
 * Calculate the size of the grid
 * Pad message to fit a rectangle of the required size
 
+How to represent a grid?
+
+* List of strings
+* Each row is a string
+* Rows in order in the list
+
 ---
 
 # Finding sizes
 
 Know number of columns
 
-Number of rows = ceiling(message length / columns)
+Number of rows = `\(\left \lceil \frac{\mathrm{message\ length}}{\mathrm{columns}} \right \rceil\)`
 
-Paddding is (rows * columns) - message length
+Paddding is (rows â¨ columns) - message length
 
 * What to use as default padding? 
 * Keyword parameter!
@@ -194,7 +211,7 @@ a e n o r s t
 
 The transposition `(3, 2, 6, 5, 1, 4, 0)` says that what was in position 3 moves to position 0, what was in position 2 moves to position 1, what was in position 6 moves to position 2, ...
 
-`enumerate(_iterable_)` yields an iterator that walks over the iterator, including the element indexes.
+`enumerate(_iterable_)` yields an iterator that walks over the iterable, including the element indexes.
 
 ```python
 >>> [i for i in enumerate('treason')]
-- 
2.34.1

