Update slides.

eigenholser · eigenholser · commit 92a4958123aa · 2016-05-15T21:45:37.000-06:00
diff --git a/slides.ipynb b/slides.ipynb
@@ -41,9 +41,24 @@
   },
   {
    "cell_type": "markdown",
-   "metadata": {},
+   "metadata": {
+    "slideshow": {
+     "slide_type": "fragment"
+    }
+   },
    "source": [
-    "* E.g. `__init__()` is"
+    "* E.g. `__init__()` is called \"dunder init\"."
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "slideshow": {
+     "slide_type": "slide"
+    }
+   },
+   "source": [
+    "# Python objects"
    ]
   },
   {
@@ -52,7 +67,7 @@
    "metadata": {
     "collapsed": false,
     "slideshow": {
-     "slide_type": "slide"
+     "slide_type": "fragment"
     }
    },
    "outputs": [],
@@ -138,6 +153,50 @@
      "slide_type": "slide"
     }
    },
+   "source": [
+    "# What about our own custom objects?"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {
+    "slideshow": {
+     "slide_type": "fragment"
+    }
+   },
+   "source": [
+    "* We can add magic methods to objects that we create."
+   ]
+  },
+  {
+   "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": "subslide"
+    }
+   },
    "source": [
     "## The Zen of Python"
    ]
@@ -160,13 +219,33 @@
    "cell_type": "markdown",
    "metadata": {
     "slideshow": {
-     "slide_type": "slide"
+     "slide_type": "subslide"
     }
    },
    "source": [
-    "# What about our own custom objects?\n",
-    "\n",
-    "* We can add magic methods to objects that we create."
+    "# 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": [
+    "* Define meaning for operators so that we can use them on our own classes like they were built in types."
    ]
   },
   {
@@ -187,7 +266,7 @@
    "cell_type": "markdown",
    "metadata": {
     "slideshow": {
-     "slide_type": "slide"
+     "slide_type": "subslide"
     }
    },
    "source": [
@@ -219,7 +298,7 @@
     }
    },
    "source": [
-    "## I asked Google Maps for the GPS coordinates of these three airports"
+    "## I asked Google Maps for the GPS coordinates of these airports"
    ]
   },
   {
@@ -240,7 +319,7 @@
    "cell_type": "markdown",
    "metadata": {
     "slideshow": {
-     "slide_type": "slide"
+     "slide_type": "subslide"
     }
    },
    "source": [
@@ -263,6 +342,7 @@
     "slc2 = Point(SLC)\n",
     "lax = Point(LAX)\n",
     "jfk = Point(JFK)\n",
+    "can = Point(CAN)\n",
     "\n",
     "# Initialize some objects with magic methods\n",
     "m_slc1 = MagicPoint(SLC)\n",
@@ -280,7 +360,7 @@
     }
    },
    "source": [
-    "# A test of equality\n",
+    "# Equality\n",
     "\n",
     "* The `__eq__()` magic method."
    ]
@@ -957,6 +1037,20 @@
     "\"Distance from LAX to SLC is {} nautical miles.\".format(dist_lax_slc)"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": false,
+    "slideshow": {
+     "slide_type": "fragment"
+    }
+   },
+   "outputs": [],
+   "source": [
+    "\"Distance from JFK to SLC is {} nautical miles.\".format(dist_jfk_slc)"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {
