X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=hangman-setter.ipynb;h=aa2487e5575276df6220ca80dcabaed693e1fce6;hb=07484b53aa43b00983f682a41e81e72d2c8e723c;hp=75bf88c312d32b69650e5da8a085090ad75e234a;hpb=779f73cd801e470854afbbca2a4d2d729879a1f7;p=cas-master-teacher-training.git

diff --git a/hangman-setter.ipynb b/hangman-setter.ipynb
index 75bf88c..aa2487e 100644
--- a/hangman-setter.ipynb
+++ b/hangman-setter.ipynb
@@ -1,7 +1,7 @@
 {
  "metadata": {
   "name": "",
-  "signature": "sha256:a121884b619c7fb25f8da469639386d4238f812c2ed89dc610bede92be57ea00"
+  "signature": "sha256:65af1805536aa8ac4200804af5d4b4d0e55c2eb86d74b2cf3f31a632b3aeccf8"
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -117,13 +117,13 @@
       {
        "metadata": {},
        "output_type": "pyout",
-       "prompt_number": 14,
+       "prompt_number": 7,
        "text": [
-        "'rebounds'"
+        "'goitre'"
        ]
       }
      ],
-     "prompt_number": 14
+     "prompt_number": 7
     },
     {
      "cell_type": "code",
@@ -161,7 +161,7 @@
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Enter letter: sdfsdfs\n"
+        "Enter letter: r\n"
        ]
       },
       {
@@ -169,7 +169,7 @@
        "output_type": "pyout",
        "prompt_number": 9,
        "text": [
-        "'s'"
+        "'r'"
        ]
       }
      ],
@@ -179,7 +179,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "def find_all(string, letter):\n",
+      "def find_all_explicit(string, letter):\n",
       "    locations = []\n",
       "    starting=0\n",
       "    location = string.find(letter)\n",
@@ -192,13 +192,25 @@
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": 11
+     "prompt_number": 25
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
+      "def find_all(string, letter):\n",
+      "    return [p for p, l in enumerate(string) if l == letter]"
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": [],
+     "prompt_number": 26
     },
     {
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "find_all('happy', 'q')"
+      "find_all('happy', 'p')"
      ],
      "language": "python",
      "metadata": {},
@@ -206,13 +218,13 @@
       {
        "metadata": {},
        "output_type": "pyout",
-       "prompt_number": 12,
+       "prompt_number": 27,
        "text": [
-        "[]"
+        "[2, 3]"
        ]
       }
      ],
-     "prompt_number": 12
+     "prompt_number": 27
     },
     {
      "cell_type": "code",
@@ -230,13 +242,13 @@
       {
        "metadata": {},
        "output_type": "pyout",
-       "prompt_number": 15,
+       "prompt_number": 12,
        "text": [
-        "['_', 'e', '_', '_', '_', '_']"
+        "['_', '_', '_', '_', '_', 'e']"
        ]
       }
      ],
-     "prompt_number": 15
+     "prompt_number": 12
     },
     {
      "cell_type": "code",
@@ -251,7 +263,7 @@
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": 18
+     "prompt_number": 13
     },
     {
      "cell_type": "code",
@@ -267,7 +279,7 @@
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": 19
+     "prompt_number": 14
     },
     {
      "cell_type": "code",
@@ -287,7 +299,7 @@
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": 27
+     "prompt_number": 15
     },
     {
      "cell_type": "code",
@@ -311,7 +323,7 @@
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": 25
+     "prompt_number": 16
     },
     {
      "cell_type": "code",
@@ -326,7 +338,7 @@
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Word: _ _ _ _ _ _ _ _ _ _ _ _ _ _  : Lives = 10 , wrong guesses: \n"
+        "Word: _ _ _ _  : Lives = 10 , wrong guesses: \n"
        ]
       },
       {
@@ -341,7 +353,7 @@
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Word: _ e _ _ _ _ _ _ _ _ _ _ _ _  : Lives = 10 , wrong guesses: \n"
+        "Word: _ _ _ e  : Lives = 10 , wrong guesses: \n"
        ]
       },
       {
@@ -349,14 +361,14 @@
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Enter letter: a\n"
+        "Enter letter: s\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Word: _ e _ _ a _ _ _ _ _ _ _ _ _  : Lives = 10 , wrong guesses: \n"
+        "Word: _ _ _ e  : Lives = 9 , wrong guesses: s\n"
        ]
       },
       {
@@ -364,14 +376,14 @@
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Enter letter: i\n"
+        "Enter letter: a\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Word: _ e _ _ a _ _ _ _ _ i _ i _  : Lives = 10 , wrong guesses: \n"
+        "Word: _ _ _ e  : Lives = 8 , wrong guesses: a s\n"
        ]
       },
       {
@@ -386,7 +398,7 @@
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Word: _ e _ _ a _ _ _ o _ i _ i _  : Lives = 10 , wrong guesses: \n"
+        "Word: _ _ _ e  : Lives = 7 , wrong guesses: a o s\n"
        ]
       },
       {
@@ -394,14 +406,14 @@
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Enter letter: t\n"
+        "Enter letter: i\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Word: _ e _ _ a _ _ _ o _ i t i _  : Lives = 10 , wrong guesses: \n"
+        "Word: _ i _ e  : Lives = 7 , wrong guesses: a o s\n"
        ]
       },
       {
@@ -409,14 +421,14 @@
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Enter letter: r\n"
+        "Enter letter: t\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Word: _ e r _ a _ _ r o _ i t i _  : Lives = 10 , wrong guesses: \n"
+        "Word: _ i _ e  : Lives = 6 , wrong guesses: a o s t\n"
        ]
       },
       {
@@ -431,7 +443,7 @@
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Word: _ e r _ a _ _ r o _ i t i _  : Lives = 9 , wrong guesses: n\n"
+        "Word: _ i _ e  : Lives = 5 , wrong guesses: a n o s t\n"
        ]
       },
       {
@@ -439,29 +451,14 @@
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Enter letter: s\n"
-       ]
-      },
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "Word: _ e r _ a _ _ r o _ i t i _  : Lives = 8 , wrong guesses: n s\n"
-       ]
-      },
-      {
-       "name": "stdout",
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "Enter letter: h\n"
+        "Enter letter: m\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Word: h e r _ a _ h r o _ i t i _  : Lives = 8 , wrong guesses: n s\n"
+        "Word: _ i _ e  : Lives = 4 , wrong guesses: a m n o s t\n"
        ]
       },
       {
@@ -469,14 +466,14 @@
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Enter letter: c\n"
+        "Enter letter: l\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Word: h e r _ a _ h r o _ i t i c  : Lives = 8 , wrong guesses: n s\n"
+        "Word: _ i _ e  : Lives = 3 , wrong guesses: a l m n o s t\n"
        ]
       },
       {
@@ -491,7 +488,7 @@
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Word: h e r _ a _ h r o _ i t i c  : Lives = 8 , wrong guesses: n s\n"
+        "Word: _ i _ e  : Lives = 2 , wrong guesses: a c l m n o s t\n"
        ]
       },
       {
@@ -499,14 +496,14 @@
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Enter letter: m\n"
+        "Enter letter: d\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Word: h e r m a _ h r o _ i t i c  : Lives = 8 , wrong guesses: n s\n"
+        "Word: _ i d e  : Lives = 2 , wrong guesses: a c l m n o s t\n"
        ]
       },
       {
@@ -514,14 +511,14 @@
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Enter letter: p\n"
+        "Enter letter: h\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Word: h e r m a p h r o _ i t i c  : Lives = 8 , wrong guesses: n s\n"
+        "Word: _ i d e  : Lives = 1 , wrong guesses: a c h l m n o s t\n"
        ]
       },
       {
@@ -529,18 +526,18 @@
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "Enter letter: d\n"
+        "Enter letter: b\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "You won! The word was hermaphroditic\n"
+        "You lost. The word was ride\n"
        ]
       }
      ],
-     "prompt_number": 30
+     "prompt_number": 20
     },
     {
      "cell_type": "code",
@@ -548,7 +545,8 @@
      "input": [],
      "language": "python",
      "metadata": {},
-     "outputs": []
+     "outputs": [],
+     "prompt_number": 17
     }
    ],
    "metadata": {}