Update slides.

eigenholser · eigenholser · commit e36c46242e71 · 2016-06-07T22:07:40.000-06:00
diff --git a/slides.ipynb b/slides.ipynb
@@ -25,28 +25,10 @@
     }
    },
    "source": [
-    "# Terminology"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "slideshow": {
-     "slide_type": "fragment"
-    }
-   },
-   "source": [
-    "* \"Dunder\" is used to reference \"double underscore\" names."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "slideshow": {
-     "slide_type": "fragment"
-    }
-   },
-   "source": [
+    "# Terminology\n",
+    "\n",
+    "* \"Dunder\" is used to reference \"double underscore\" names.\n",
+    "\n",
     "* E.g. `__init__()` is called \"dunder init\"."
    ]
   },
@@ -58,28 +40,12 @@
     }
    },
    "source": [
-    "# Magic Methods"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "slideshow": {
-     "slide_type": "fragment"
-    }
-   },
-   "source": [
-    "* Beautiful, intuitive, and standard ways of performing basic operations."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "slideshow": {
-     "slide_type": "fragment"
-    }
-   },
-   "source": [
+    "# Magic Methods\n",
+    "\n",
+    "* Special methods with reserved names.\n",
+    "\n",
+    "* Beautiful, intuitive, and standard ways of performing basic operations.\n",
+    "\n",
     "* Define meaning for operators so that we can use them on our own classes like they were built in types."
    ]
   },
@@ -163,7 +129,7 @@
    },
    "outputs": [],
    "source": [
-    "(2).__pow__(3) "
+    "(2).__pow__(3)  "
    ]
   },
   {
@@ -188,51 +154,15 @@
     }
    },
    "source": [
-    "# What about our own custom objects?"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "slideshow": {
-     "slide_type": "fragment"
-    }
-   },
-   "source": [
-    "* We can add magic methods to make our own objects behave like built-in types."
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "slideshow": {
-     "slide_type": "fragment"
-    }
-   },
-   "source": [
-    "* Why would we do that?"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "slideshow": {
-     "slide_type": "fragment"
-    }
-   },
-   "source": [
-    "* Expressiveness!"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {
-    "slideshow": {
-     "slide_type": "fragment"
-    }
-   },
-   "source": [
-    "* ...and it's zen."
+    "# What about our own custom objects?\n",
+    "\n",
+    "* We can add magic methods to make our own objects behave like built-in types.\n",
+    "\n",
+    "* Why would we do that?\n",
+    "\n",
+    "* Expressiveness!\n",
+    "\n",
+    "* It is Zen."
    ]
   },
   {
@@ -441,6 +371,31 @@
     "### This is why!"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "slideshow": {
+     "slide_type": "fragment"
+    }
+   },
+   "source": [
+    "The identity operator `is` returns true only if the `id()` function on both objects is equal."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false,
+    "slideshow": {
+     "slide_type": "fragment"
+    }
+   },
+   "outputs": [],
+   "source": [
+    "hex(id(slc1)), hex(id(slc2)) "
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -452,7 +407,7 @@
    },
    "outputs": [],
    "source": [
-    "hex(id(slc1)), hex(id(slc2))"
+    "slc1 is slc2"
    ]
   },
   {
@@ -699,7 +654,7 @@
     }
    },
    "source": [
-    "# One solution\n",
+    "# Old and busted\n",
     "\n",
     "* Create a method to compute distance from the instance to supplied Point instance."
    ]
@@ -751,7 +706,7 @@
     }
    },
    "source": [
-    "# The magic solution\n",
+    "# New hotness\n",
     "\n",
     "* The `__sub__()` magic method."
    ]
@@ -926,7 +881,7 @@
     }
    },
    "source": [
-    "# Point without magic"
+    "# Old and busted"
    ]
   },
   {
@@ -987,7 +942,7 @@
     }
    },
    "source": [
-    "# Point with magic"
+    "# New hotness"
    ]
   },
   {
@@ -1048,7 +1003,7 @@
     }
    },
    "source": [
-    "# Distance with magic"
+    "# More new hotness"
    ]
   },
   {
