Updating spiderman.ipynb

AllenDowney · AllenDowney · commit fb83b3cae96d · 2017-11-08T10:22:04.000-05:00
diff --git a/code/spiderman.ipynb b/code/spiderman.ipynb
@@ -6,7 +6,7 @@
    "source": [
     "# Modeling and Simulation in Python\n",
     "\n",
-    "Chapter 10 Example: Spiderman\n",
+    "Chapter 10 Example: Spider-Man\n",
     "\n",
     "Copyright 2017 Allen Downey\n",
     "\n",
@@ -80,7 +80,7 @@
     "\n",
     "Initially, Spider-Man is at the top of a nearby builing.  I'll create a `Condition` object to contain the quantities we'll need:\n",
     "\n",
-    "1. According to [the Spider-Man Wiki](http://spiderman.wikia.com/wiki/Peter_Parker_(Earth-616)) Spider-Man weighs 76 kg.\n",
+    "1. According to [the Spider-Man Wiki](http://spiderman.wikia.com/wiki/Peter_Parker_(Earth-616), Spider-Man weighs 76 kg.\n",
     "\n",
     "2. Let's assume his terminal velocity is 60 m/s.\n",
     "\n",
@@ -103,7 +103,7 @@
     "                      area = 1 * m**2,\n",
     "                      rho = 1.2 * kg/m**3,\n",
     "                      v_term = 60 * m / s,\n",
-    "                      duration = 60 * s,\n",
+    "                      duration = 30 * s,\n",
     "                      length = 100 * m,\n",
     "                      angle = (270 - 45) * degree,\n",
     "                      k = 20 * N / m)"
@@ -138,12 +138,12 @@
     "    \"\"\"\n",
     "    unpack(condition)\n",
     "    \n",
-    "    A = Vector(0, height)\n",
+    "    H = Vector(0, height)\n",
     "    \n",
     "    theta = angle.to(radian)\n",
     "    x, y = pol2cart(theta, length)\n",
     "    L = Vector(x, y)\n",
-    "    P = A + L\n",
+    "    P = H + L\n",
     "    V = Vector(0*m/s, 0*m/s)\n",
     "    \n",
     "    init = State(x=P.x, y=P.y, vx=V.x, vy=V.y)\n",
@@ -153,7 +153,7 @@
     "    \n",
     "    return System(init=init, g=g, mass=mass, rho=rho,\n",
     "                  C_d=C_d, area=area, length=length,\n",
-    "                  A=A, k=k, ts=ts)"
+    "                  H=H, k=k, ts=ts)"
    ]
   },
   {
@@ -208,7 +208,7 @@
     "\n",
     "    P = Vector(x, y)\n",
     "    V = Vector(vx, vy)\n",
-    "    L = P - A\n",
+    "    L = P - H\n",
     "    \n",
     "    f_spring = -k * (L.mag - length) * L.hat()\n",
     "    a_spring = f_spring / mass\n",
@@ -251,12 +251,10 @@
   {
    "cell_type": "code",
    "execution_count": null,
-   "metadata": {
-    "collapsed": true
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
-    "run_odeint(system, slope_func)"
+    "%time run_odeint(system, slope_func)"
    ]
   },
   {
@@ -372,7 +370,7 @@
     "newfig()\n",
     "decorate(xlabel='x position (m)',\n",
     "         ylabel='y position (m)',\n",
-    "         xlim=[-105, 105],\n",
+    "         xlim=[-80, 80],\n",
     "         ylim=[0, 381],\n",
     "         legend=False)\n",
     "\n",
