From 80293879f3f41f05e12ddd043dc051f93b9afae7 Mon Sep 17 00:00:00 2001 From: Trey Hunner Date: Mon, 15 Sep 2014 12:30:59 -0700 Subject: [PATCH 1/6] Clear all output (there was some buggy output) --- part-2.ipynb | 724 ++++++--------------------------------------------- 1 file changed, 76 insertions(+), 648 deletions(-) diff --git a/part-2.ipynb b/part-2.ipynb index 0bd02fb..516f14c 100644 --- a/part-2.ipynb +++ b/part-2.ipynb @@ -1,7 +1,7 @@ { "metadata": { "name": "", - "signature": "sha256:7640407737f0f1e8519c9b988e071dc2978364eabd3531de7ede1919a57b3780" + "signature": "sha256:53e2b0898480ce45c94722204b163633311d0a135695ba04bda955a94a66fff9" }, "nbformat": 3, "nbformat_minor": 0, @@ -39,8 +39,7 @@ "slide_type": "slide" } }, - "outputs": [], - "prompt_number": 8 + "outputs": [] }, { "cell_type": "markdown", @@ -57,17 +56,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 2, - "text": [ - "[100, 500, 'things']" - ] - } - ], - "prompt_number": 2 + "outputs": [] }, { "cell_type": "markdown", @@ -84,17 +73,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 3, - "text": [ - "list" - ] - } - ], - "prompt_number": 3 + "outputs": [] }, { "cell_type": "markdown", @@ -111,17 +90,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 4, - "text": [ - "3" - ] - } - ], - "prompt_number": 4 + "outputs": [] }, { "cell_type": "markdown", @@ -138,17 +107,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 5, - "text": [ - "True" - ] - } - ], - "prompt_number": 5 + "outputs": [] }, { "cell_type": "code", @@ -158,17 +117,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 10, - "text": [ - "True" - ] - } - ], - "prompt_number": 10 + "outputs": [] }, { "cell_type": "code", @@ -178,17 +127,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 9, - "text": [ - "False" - ] - } - ], - "prompt_number": 9 + "outputs": [] }, { "cell_type": "code", @@ -198,8 +137,7 @@ ], "language": "python", "metadata": {}, - "outputs": [], - "prompt_number": 12 + "outputs": [] }, { "cell_type": "heading", @@ -224,17 +162,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 13, - "text": [ - "100" - ] - } - ], - "prompt_number": 13 + "outputs": [] }, { "cell_type": "markdown", @@ -251,17 +179,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 22, - "text": [ - "500" - ] - } - ], - "prompt_number": 22 + "outputs": [] }, { "cell_type": "code", @@ -271,17 +189,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 23, - "text": [ - "'things'" - ] - } - ], - "prompt_number": 23 + "outputs": [] }, { "cell_type": "markdown", @@ -298,19 +206,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "ename": "IndexError", - "evalue": "list index out of range", - "output_type": "pyerr", - "traceback": [ - "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m\n\u001b[0;31mIndexError\u001b[0m Traceback (most recent call last)", - "\u001b[0;32m\u001b[0m in \u001b[0;36m\u001b[0;34m()\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0mthings\u001b[0m\u001b[0;34m[\u001b[0m\u001b[0;36m3\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m", - "\u001b[0;31mIndexError\u001b[0m: list index out of range" - ] - } - ], - "prompt_number": 16 + "outputs": [] }, { "cell_type": "markdown", @@ -334,8 +230,7 @@ ], "language": "python", "metadata": {}, - "outputs": [], - "prompt_number": 24 + "outputs": [] }, { "cell_type": "code", @@ -345,17 +240,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 25, - "text": [ - "5" - ] - } - ], - "prompt_number": 25 + "outputs": [] }, { "cell_type": "code", @@ -365,17 +250,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 26, - "text": [ - "'d'" - ] - } - ], - "prompt_number": 26 + "outputs": [] }, { "cell_type": "heading", @@ -418,8 +293,7 @@ ], "language": "python", "metadata": {}, - "outputs": [], - "prompt_number": 27 + "outputs": [] }, { "cell_type": "markdown", @@ -436,17 +310,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 28, - "text": [ - "0" - ] - } - ], - "prompt_number": 28 + "outputs": [] }, { "cell_type": "markdown", @@ -465,8 +329,7 @@ ], "language": "python", "metadata": {}, - "outputs": [], - "prompt_number": 29 + "outputs": [] }, { "cell_type": "code", @@ -476,17 +339,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 30, - "text": [ - "['laptop']" - ] - } - ], - "prompt_number": 30 + "outputs": [] }, { "cell_type": "code", @@ -496,8 +349,7 @@ ], "language": "python", "metadata": {}, - "outputs": [], - "prompt_number": 32 + "outputs": [] }, { "cell_type": "code", @@ -507,17 +359,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 33, - "text": [ - "['laptop', 'wedding ring', 'wedding ring']" - ] - } - ], - "prompt_number": 33 + "outputs": [] }, { "cell_type": "markdown", @@ -534,8 +376,7 @@ ], "language": "python", "metadata": {}, - "outputs": [], - "prompt_number": 35 + "outputs": [] }, { "cell_type": "code", @@ -545,17 +386,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 36, - "text": [ - "['Macobook Pro', 'wedding ring', 'wedding ring']" - ] - } - ], - "prompt_number": 36 + "outputs": [] }, { "cell_type": "markdown", @@ -572,8 +403,7 @@ ], "language": "python", "metadata": {}, - "outputs": [], - "prompt_number": 37 + "outputs": [] }, { "cell_type": "markdown", @@ -590,17 +420,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 38, - "text": [ - "True" - ] - } - ], - "prompt_number": 38 + "outputs": [] }, { "cell_type": "markdown", @@ -624,17 +444,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 39, - "text": [ - "3" - ] - } - ], - "prompt_number": 39 + "outputs": [] }, { "cell_type": "markdown", @@ -651,17 +461,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 40, - "text": [ - "2" - ] - } - ], - "prompt_number": 40 + "outputs": [] }, { "cell_type": "code", @@ -671,17 +471,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 41, - "text": [ - "'tungsten wedding ring'" - ] - } - ], - "prompt_number": 41 + "outputs": [] }, { "cell_type": "markdown", @@ -700,17 +490,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 42, - "text": [ - "'tungsten wedding ring'" - ] - } - ], - "prompt_number": 42 + "outputs": [] }, { "cell_type": "markdown", @@ -734,8 +514,7 @@ ], "language": "python", "metadata": {}, - "outputs": [], - "prompt_number": 43 + "outputs": [] }, { "cell_type": "code", @@ -745,17 +524,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 44, - "text": [ - "'D'" - ] - } - ], - "prompt_number": 44 + "outputs": [] }, { "cell_type": "code", @@ -765,17 +534,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 45, - "text": [ - "'y'" - ] - } - ], - "prompt_number": 45 + "outputs": [] }, { "cell_type": "markdown", @@ -793,8 +552,7 @@ ], "language": "python", "metadata": {}, - "outputs": [], - "prompt_number": 53 + "outputs": [] }, { "cell_type": "markdown", @@ -811,17 +569,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 47, - "text": [ - "'apples'" - ] - } - ], - "prompt_number": 47 + "outputs": [] }, { "cell_type": "markdown", @@ -838,17 +586,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 48, - "text": [ - "'oranges'" - ] - } - ], - "prompt_number": 48 + "outputs": [] }, { "cell_type": "markdown", @@ -865,8 +603,7 @@ ], "language": "python", "metadata": {}, - "outputs": [], - "prompt_number": 49 + "outputs": [] }, { "cell_type": "markdown", @@ -883,8 +620,7 @@ ], "language": "python", "metadata": {}, - "outputs": [], - "prompt_number": 50 + "outputs": [] }, { "cell_type": "markdown", @@ -901,17 +637,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 51, - "text": [ - "4" - ] - } - ], - "prompt_number": 51 + "outputs": [] }, { "cell_type": "markdown", @@ -928,17 +654,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 52, - "text": [ - "False" - ] - } - ], - "prompt_number": 52 + "outputs": [] }, { "cell_type": "markdown", @@ -957,8 +673,7 @@ ], "language": "python", "metadata": {}, - "outputs": [], - "prompt_number": 54 + "outputs": [] }, { "cell_type": "heading", @@ -976,17 +691,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 55, - "text": [ - "['apples', 'bananas']" - ] - } - ], - "prompt_number": 55 + "outputs": [] }, { "cell_type": "markdown", @@ -1003,17 +708,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 56, - "text": [ - "['apples', 'bananas']" - ] - } - ], - "prompt_number": 56 + "outputs": [] }, { "cell_type": "markdown", @@ -1030,17 +725,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 57, - "text": [ - "['oranges']" - ] - } - ], - "prompt_number": 57 + "outputs": [] }, { "cell_type": "markdown", @@ -1057,17 +742,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 58, - "text": [ - "['apples', 'bananas', 'oranges']" - ] - } - ], - "prompt_number": 58 + "outputs": [] }, { "cell_type": "code", @@ -1077,8 +752,7 @@ ], "language": "python", "metadata": {}, - "outputs": [], - "prompt_number": 59 + "outputs": [] }, { "cell_type": "markdown", @@ -1095,17 +769,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 60, - "text": [ - "['apples', 'bananas', 'oranges']" - ] - } - ], - "prompt_number": 60 + "outputs": [] }, { "cell_type": "markdown", @@ -1122,17 +786,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 61, - "text": [ - "['apples', 'bananas', 'oranges']" - ] - } - ], - "prompt_number": 61 + "outputs": [] }, { "cell_type": "code", @@ -1142,8 +796,7 @@ ], "language": "python", "metadata": {}, - "outputs": [], - "prompt_number": 62 + "outputs": [] }, { "cell_type": "heading", @@ -1212,19 +865,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "output_type": "stream", - "stream": "stdout", - "text": [ - "Danny\n", - "Audrey\n", - "Risa\n", - "Alain\n" - ] - } - ], - "prompt_number": 63 + "outputs": [] }, { "cell_type": "markdown", @@ -1242,19 +883,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "output_type": "stream", - "stream": "stdout", - "text": [ - "Danny\n", - "Audrey\n", - "Risa\n", - "Alain\n" - ] - } - ], - "prompt_number": 64 + "outputs": [] }, { "cell_type": "markdown", @@ -1272,19 +901,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "output_type": "stream", - "stream": "stdout", - "text": [ - "Hello Danny\n", - "Hello Audrey\n", - "Hello Risa\n", - "Hello Alain\n" - ] - } - ], - "prompt_number": 85 + "outputs": [] }, { "cell_type": "markdown", @@ -1315,8 +932,7 @@ ], "language": "python", "metadata": {}, - "outputs": [], - "prompt_number": 66 + "outputs": [] }, { "cell_type": "code", @@ -1326,17 +942,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 67, - "text": [ - "'A'" - ] - } - ], - "prompt_number": 67 + "outputs": [] }, { "cell_type": "markdown", @@ -1353,17 +959,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 68, - "text": [ - "True" - ] - } - ], - "prompt_number": 68 + "outputs": [] }, { "cell_type": "markdown", @@ -1380,17 +976,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 69, - "text": [ - "True" - ] - } - ], - "prompt_number": 69 + "outputs": [] }, { "cell_type": "markdown", @@ -1407,17 +993,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 70, - "text": [ - "True" - ] - } - ], - "prompt_number": 70 + "outputs": [] }, { "cell_type": "markdown", @@ -1436,17 +1012,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "output_type": "stream", - "stream": "stdout", - "text": [ - "Audrey starts with a vowel\n", - "Alain starts with a vowel\n" - ] - } - ], - "prompt_number": 71 + "outputs": [] }, { "cell_type": "markdown", @@ -1472,8 +1038,7 @@ ], "language": "python", "metadata": {}, - "outputs": [], - "prompt_number": 72 + "outputs": [] }, { "cell_type": "code", @@ -1485,8 +1050,7 @@ ], "language": "python", "metadata": {}, - "outputs": [], - "prompt_number": 73 + "outputs": [] }, { "cell_type": "markdown", @@ -1503,17 +1067,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 74, - "text": [ - "['Audrey', 'Alain']" - ] - } - ], - "prompt_number": 74 + "outputs": [] }, { "cell_type": "markdown", @@ -1530,8 +1084,7 @@ ], "language": "python", "metadata": {}, - "outputs": [], - "prompt_number": 75 + "outputs": [] }, { "cell_type": "markdown", @@ -1548,8 +1101,7 @@ ], "language": "python", "metadata": {}, - "outputs": [], - "prompt_number": 76 + "outputs": [] }, { "cell_type": "code", @@ -1560,8 +1112,7 @@ ], "language": "python", "metadata": {}, - "outputs": [], - "prompt_number": 77 + "outputs": [] }, { "cell_type": "code", @@ -1571,17 +1122,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 78, - "text": [ - "26.33" - ] - } - ], - "prompt_number": 78 + "outputs": [] }, { "cell_type": "markdown", @@ -1632,18 +1173,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "output_type": "stream", - "stream": "stdout", - "text": [ - "Hello\n", - "My name is Danny\n", - "I live in California\n" - ] - } - ], - "prompt_number": 80 + "outputs": [] }, { "cell_type": "markdown", @@ -1668,17 +1198,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 88, - "text": [ - "[['Danny', 'Inland Empire'], ['Audrey', 'Corona'], ['Alain', 'San Diego']]" - ] - } - ], - "prompt_number": 88 + "outputs": [] }, { "cell_type": "markdown", @@ -1696,18 +1216,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "output_type": "stream", - "stream": "stdout", - "text": [ - "['Danny', 'Inland Empire']\n", - "['Audrey', 'Corona']\n", - "['Alain', 'San Diego']\n" - ] - } - ], - "prompt_number": 89 + "outputs": [] }, { "cell_type": "markdown", @@ -1727,24 +1236,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "output_type": "stream", - "stream": "stdout", - "text": [ - "Hello\n", - "My name is Danny\n", - "I live in Inland Empire\n", - "Hello\n", - "My name is Audrey\n", - "I live in Corona\n", - "Hello\n", - "My name is Alain\n", - "I live in San Diego\n" - ] - } - ], - "prompt_number": 91 + "outputs": [] }, { "cell_type": "heading", @@ -1765,24 +1257,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "output_type": "stream", - "stream": "stdout", - "text": [ - "Hello\n", - "My name is Danny\n", - "I live in Inland Empire\n", - "Hello\n", - "My name is Audrey\n", - "I live in Corona\n", - "Hello\n", - "My name is Alain\n", - "I live in San Diego\n" - ] - } - ], - "prompt_number": 92 + "outputs": [] }, { "cell_type": "markdown", @@ -1800,17 +1275,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "metadata": {}, - "output_type": "pyout", - "prompt_number": 94, - "text": [ - "['Danny', 'Inland Empire']" - ] - } - ], - "prompt_number": 94 + "outputs": [] }, { "cell_type": "heading", @@ -1842,8 +1307,7 @@ ], "language": "python", "metadata": {}, - "outputs": [], - "prompt_number": 98 + "outputs": [] }, { "cell_type": "markdown", @@ -1861,16 +1325,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "output_type": "stream", - "stream": "stdout", - "text": [ - "['Four', 'score', 'and', 'seven', 'years', 'ago', 'our', 'fathers', 'brought', 'forth', 'on', 'this', 'continent', 'a', 'new', 'nation,', 'conceived', 'in', 'liberty,', 'and', 'dedicated', 'to', 'the', 'proposition', 'that', 'all', 'men', 'are', 'created', 'equal.']\n" - ] - } - ], - "prompt_number": 99 + "outputs": [] }, { "cell_type": "markdown", @@ -1887,16 +1342,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "output_type": "stream", - "stream": "stdout", - "text": [ - "30\n" - ] - } - ], - "prompt_number": 100 + "outputs": [] }, { "cell_type": "markdown", @@ -1915,16 +1361,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "output_type": "stream", - "stream": "stdout", - "text": [ - "{'fathers', 'proposition', 'forth', 'equal.', 'conceived', 'men', 'nation,', 'ago', 'created', 'in', 'a', 'that', 'dedicated', 'are', 'our', 'brought', 'the', 'seven', 'and', 'score', 'all', 'this', 'Four', 'new', 'continent', 'on', 'liberty,', 'to', 'years'}\n" - ] - } - ], - "prompt_number": 102 + "outputs": [] }, { "cell_type": "markdown", @@ -1941,16 +1378,7 @@ ], "language": "python", "metadata": {}, - "outputs": [ - { - "output_type": "stream", - "stream": "stdout", - "text": [ - "29\n" - ] - } - ], - "prompt_number": 103 + "outputs": [] }, { "cell_type": "markdown", From b449b4a809a558fee085920c8982e3d128759d84 Mon Sep 17 00:00:00 2001 From: Trey Hunner Date: Mon, 15 Sep 2014 12:31:43 -0700 Subject: [PATCH 2/6] Fix typo (correct spelling of Rise's name) --- part-2.ipynb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/part-2.ipynb b/part-2.ipynb index 516f14c..1997874 100644 --- a/part-2.ipynb +++ b/part-2.ipynb @@ -1,7 +1,7 @@ { "metadata": { "name": "", - "signature": "sha256:53e2b0898480ce45c94722204b163633311d0a135695ba04bda955a94a66fff9" + "signature": "sha256:3f6a7dc2e9e8f093bc1ef0089ac9675c14124d7e84487738693a6ce9f160f94a" }, "nbformat": 3, "nbformat_minor": 0, @@ -792,7 +792,7 @@ "cell_type": "code", "collapsed": false, "input": [ - "names = [\"Danny\", \"Audrey\", \"Risa\", \"Alain\"]" + "names = [\"Danny\", \"Audrey\", \"Rise\", \"Alain\"]" ], "language": "python", "metadata": {}, @@ -842,7 +842,7 @@ "collapsed": false, "input": [ "print(\"Hello\")\n", - "print(\"My name is Risa\")\n", + "print(\"My name is Rise\")\n", "print(\"I live in San Diego\")" ], "language": "python", From 78193f7e37d75a274e5e4cab2133f3c5f9c6800e Mon Sep 17 00:00:00 2001 From: Trey Hunner Date: Mon, 15 Sep 2014 12:38:02 -0700 Subject: [PATCH 3/6] Note to wait for students and prompt for questions --- part-2.ipynb | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/part-2.ipynb b/part-2.ipynb index 1997874..c739fbb 100644 --- a/part-2.ipynb +++ b/part-2.ipynb @@ -907,6 +907,9 @@ "cell_type": "markdown", "metadata": {}, "source": [ + "Questions?\n", + "\n", + "\n", "What if we only want to print out the names that start with a vowel?" ] }, @@ -1018,7 +1021,9 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "The amount of work we had to do here is independent of the length of the list. This list could have had a billion elements in it and this code would still work." + "The amount of work we had to do here is independent of the length of the list. This list could have had a billion elements in it and this code would still work.\n", + "\n", + "(Wait for students)" ] }, { @@ -1069,6 +1074,15 @@ "metadata": {}, "outputs": [] }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "(Wait for students)\n", + "\n", + "Questions?" + ] + }, { "cell_type": "markdown", "metadata": {}, From 940d525822ee733c430221c29b55178d04e259e6 Mon Sep 17 00:00:00 2001 From: Trey Hunner Date: Mon, 15 Sep 2014 12:38:47 -0700 Subject: [PATCH 4/6] Note that students don't need to type a long part --- part-2.ipynb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/part-2.ipynb b/part-2.ipynb index c739fbb..f223ef9 100644 --- a/part-2.ipynb +++ b/part-2.ipynb @@ -951,7 +951,9 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "We want to check whether it equals A, E, I, O, or U. There are a lot of different ways to write this" + "We want to check whether it equals A, E, I, O, or U. There are a lot of different ways to write this.\n", + "\n", + "You don't need to type all three of these examples out. This first one especially is pretty long." ] }, { @@ -1002,7 +1004,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Now let's setup our for loop" + "Now let's setup our for loop. This part is fun, so let's all type it together." ] }, { From 53a39ec55fedcc8f7f9039f53cb16d126e058180 Mon Sep 17 00:00:00 2001 From: Trey Hunner Date: Mon, 15 Sep 2014 12:58:38 -0700 Subject: [PATCH 5/6] Fix bug in markdown list in pop quiz section --- part-2.ipynb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/part-2.ipynb b/part-2.ipynb index f223ef9..921c676 100644 --- a/part-2.ipynb +++ b/part-2.ipynb @@ -1415,13 +1415,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "1. Using the help() method, add the following phrase to the Gettysburg Address **wordset**: \"Abraham Lincoln" - ] - }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ + "1. Using the help() method, add the following phrase to the Gettysburg Address **wordset**: \"Abraham Lincoln\"\n", "2. sort the list of names in reverse order." ] } From e58faa9dfe2626cc962c23c6a2b3d0450c3c6794 Mon Sep 17 00:00:00 2001 From: Trey Hunner Date: Mon, 15 Sep 2014 13:01:30 -0700 Subject: [PATCH 6/6] Note the name of variable unpacking --- part-2.ipynb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/part-2.ipynb b/part-2.ipynb index 921c676..1ca86e0 100644 --- a/part-2.ipynb +++ b/part-2.ipynb @@ -1293,6 +1293,13 @@ "metadata": {}, "outputs": [] }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ + "This is called \"unpacking\". It works with any variable assignment." + ] + }, { "cell_type": "heading", "level": 1,