Skip to content

Commit

Permalink
cleanup and re-run of esp talk4 notebooks
Browse files Browse the repository at this point in the history
  • Loading branch information
joefutrelle committed Jan 27, 2017
1 parent fa2b498 commit 44f6262
Show file tree
Hide file tree
Showing 12 changed files with 404 additions and 327,310 deletions.
56 changes: 39 additions & 17 deletions talk4/0 values variables and objects.ipynb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"metadata": {
"name": "",
"signature": "sha256:d151d432e5658875df204f996500eb6c78f8fe327a77f8cba396d9aa3f81b3ad"
"signature": "sha256:af2fae31c886cd35219ad364bb634eea8f23af1044670401b8934f4c770a5888"
},
"nbformat": 3,
"nbformat_minor": 0,
Expand All @@ -21,13 +21,13 @@
{
"metadata": {},
"output_type": "pyout",
"prompt_number": 5,
"prompt_number": 14,
"text": [
"'fish'"
]
}
],
"prompt_number": 5
"prompt_number": 14
},
{
"cell_type": "code",
Expand All @@ -42,13 +42,13 @@
{
"metadata": {},
"output_type": "pyout",
"prompt_number": 8,
"prompt_number": 15,
"text": [
"3"
]
}
],
"prompt_number": 8
"prompt_number": 15
},
{
"cell_type": "code",
Expand Down Expand Up @@ -84,13 +84,13 @@
{
"metadata": {},
"output_type": "pyout",
"prompt_number": 18,
"prompt_number": 17,
"text": [
"False"
]
}
],
"prompt_number": 18
"prompt_number": 17
},
{
"cell_type": "code",
Expand All @@ -106,13 +106,13 @@
{
"metadata": {},
"output_type": "pyout",
"prompt_number": 23,
"prompt_number": 18,
"text": [
"5"
]
}
],
"prompt_number": 23
"prompt_number": 18
},
{
"cell_type": "code",
Expand All @@ -127,13 +127,13 @@
{
"metadata": {},
"output_type": "pyout",
"prompt_number": 25,
"prompt_number": 19,
"text": [
"'fish'"
]
}
],
"prompt_number": 25
"prompt_number": 19
},
{
"cell_type": "code",
Expand All @@ -143,7 +143,8 @@
],
"language": "python",
"metadata": {},
"outputs": []
"outputs": [],
"prompt_number": 20
},
{
"cell_type": "code",
Expand All @@ -153,7 +154,8 @@
],
"language": "python",
"metadata": {},
"outputs": []
"outputs": [],
"prompt_number": 21
},
{
"cell_type": "code",
Expand All @@ -170,13 +172,33 @@
{
"metadata": {},
"output_type": "pyout",
"prompt_number": 34,
"prompt_number": 22,
"text": [
"True"
]
}
],
"prompt_number": 34
"prompt_number": 22
},
{
"cell_type": "code",
"collapsed": false,
"input": [
"3 == 2.9999999999999999999999999"
],
"language": "python",
"metadata": {},
"outputs": [
{
"metadata": {},
"output_type": "pyout",
"prompt_number": 23,
"text": [
"True"
]
}
],
"prompt_number": 23
},
{
"cell_type": "code",
Expand All @@ -190,13 +212,13 @@
{
"metadata": {},
"output_type": "pyout",
"prompt_number": 37,
"prompt_number": 24,
"text": [
"False"
]
}
],
"prompt_number": 37
"prompt_number": 24
}
],
"metadata": {}
Expand Down
64 changes: 38 additions & 26 deletions talk4/1 tuples.ipynb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"metadata": {
"name": "",
"signature": "sha256:8522f4fed92d513abea5b0d8d09f9cbd5d97479b2f37cb1de01a8a06f8f999fd"
"signature": "sha256:292c83828ffe3c1703926be958d4c24534c7d9646fab8d12f0adaa1425f383e4"
},
"nbformat": 3,
"nbformat_minor": 0,
Expand All @@ -22,13 +22,13 @@
{
"metadata": {},
"output_type": "pyout",
"prompt_number": 3,
"prompt_number": 7,
"text": [
"3"
]
}
],
"prompt_number": 3
"prompt_number": 7
},
{
"cell_type": "code",
Expand All @@ -42,13 +42,13 @@
{
"metadata": {},
"output_type": "pyout",
"prompt_number": 6,
"prompt_number": 8,
"text": [
"('fish', 3)"
]
}
],
"prompt_number": 6
"prompt_number": 8
},
{
"cell_type": "code",
Expand All @@ -64,13 +64,13 @@
{
"metadata": {},
"output_type": "pyout",
"prompt_number": 10,
"prompt_number": 9,
"text": [
"('fish', 7)"
]
}
],
"prompt_number": 10
"prompt_number": 9
},
{
"cell_type": "code",
Expand All @@ -81,75 +81,87 @@
"language": "python",
"metadata": {},
"outputs": [],
"prompt_number": 1
"prompt_number": 10
},
{
"cell_type": "code",
"collapsed": false,
"input": [
"# tuples support \"in\"\n",
"t = ('a', 'b', 'c')\n",
"-77 in t"
"'a' in t"
],
"language": "python",
"metadata": {},
"outputs": [
{
"metadata": {},
"output_type": "pyout",
"prompt_number": 13,
"prompt_number": 11,
"text": [
"False"
"True"
]
}
],
"prompt_number": 13
"prompt_number": 11
},
{
"cell_type": "code",
"collapsed": false,
"input": [
"# tuples are used for multiple assignment\n",
"a = 'me'\n",
"b = 'you'\n",
"c = 'them'\n",
"\n",
"(a, b, c) = ('me', 'you', 'them')"
"-77 in t"
],
"language": "python",
"metadata": {},
"outputs": [
{
"metadata": {},
"output_type": "pyout",
"prompt_number": 22,
"prompt_number": 12,
"text": [
"'you'"
"False"
]
}
],
"prompt_number": 22
"prompt_number": 12
},
{
"cell_type": "code",
"collapsed": false,
"input": [
"# tuples are used for multiple assignment\n",
"a = 'me'\n",
"b = 'you'\n",
"c = 'them'\n",
"\n",
"(a, b, c) = ('me', 'you', 'them')"
],
"language": "python",
"metadata": {},
"outputs": [],
"prompt_number": 13
},
{
"cell_type": "code",
"collapsed": false,
"input": [
"a = 1\n",
"(1, 2, 3) is (a, a+1, a+3)"
"# or just\n",
"a, b, c = ('me', 'you', 'them')\n",
"c"
],
"language": "python",
"metadata": {},
"outputs": [
{
"metadata": {},
"output_type": "pyout",
"prompt_number": 30,
"prompt_number": 14,
"text": [
"False"
"'them'"
]
}
],
"prompt_number": 30
"prompt_number": 14
}
],
"metadata": {}
Expand Down
Loading

0 comments on commit 44f6262

Please sign in to comment.