Updated notebooks for new library organisation

[cipher-tools.git] / 2016 / 2016-challenge3.ipynb

diff --git a/2016/2016-challenge3.ipynb b/2016/2016-challenge3.ipynb
index 51e27a8e94584b2e647b12ec82c18ff3d613b0e3..6ef30cef57d569dc59e43bae772210aa4f55c8f9 100644 (file)
--- a/2016/2016-challenge3.ipynb
+++ b/2016/2016-challenge3.ipynb
@@ -3,9 +3,7 @@
   {
    "cell_type": "code",
    "execution_count": 1,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
     "import os,sys,inspect\n",
@@ -16,7 +14,9 @@
     "import matplotlib.pyplot as plt\n",
     "%matplotlib inline\n",
     "\n",
-    "from cipherbreak import *\n",
+    "from cipher.keyword_cipher import *\n",
+    "from support.utilities import *\n",
+    "from support.text_prettify import *\n",
     "\n",
     "c3a = open('3a.ciphertext').read()\n",
     "c3b = open('3b.ciphertext').read()"
@@ -24,10 +24,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
-   "metadata": {
-    "collapsed": false
-   },
+   "execution_count": 2,
+   "metadata": {},
    "outputs": [
     {
      "data": {
@@ -35,7 +33,7 @@
        "(('weston', <KeywordWrapAlphabet.from_largest: 3>), -1706.5657011593255)"
       ]
      },
-     "execution_count": 10,
+     "execution_count": 2,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -47,10 +45,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
-   "metadata": {
-    "collapsed": false
-   },
+   "execution_count": 3,
+   "metadata": {},
    "outputs": [
     {
      "name": "stdout",
@@ -75,10 +71,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
-   "metadata": {
-    "collapsed": false
-   },
+   "execution_count": 4,
+   "metadata": {},
    "outputs": [
     {
      "data": {
@@ -86,7 +80,7 @@
        "(('neural', <KeywordWrapAlphabet.from_largest: 3>), -1476.8535205989874)"
       ]
      },
-     "execution_count": 13,
+     "execution_count": 4,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -98,10 +92,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
-   "metadata": {
-    "collapsed": false
-   },
+   "execution_count": 5,
+   "metadata": {},
    "outputs": [
     {
      "name": "stdout",
@@ -141,7 +133,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.5.2"
+   "version": "3.6.3"
   }
  },
  "nbformat": 4,