polish up the demos

Author: marcrasi

notebooks/talk_demos/Differentiable_Physics.ipynb

@@ -211,7 +211,7 @@
         "    var balls: [Ball]\n",
         "\n",
         "    /// Minimum ball distance (over all previous states) to each target.\n",
-        "    var minDistanceToTarget: [Float]\n",
+        "    var targetDistances: [Float]\n",
         "\n",
         "    /// Amount of time simulation has been running.\n",
         "    var t: Float\n",
@@ -225,13 +225,13 @@
         "    @differentiable\n",
         "    init(\n",
         "      balls: [Ball],\n",
-        "      minDistanceToTarget: [Float],\n",
+        "      targetDistances: [Float],\n",
         "      t: Float,\n",
         "      targets: [Vec2],\n",
         "      walls: [Wall]\n",
         "    ) {\n",
         "        self.balls = balls\n",
-        "        self.minDistanceToTarget = minDistanceToTarget\n",
+        "        self.targetDistances = targetDistances\n",
         "        self.t = t\n",
         "        self.targets = targets\n",
         "        self.walls = walls\n",
@@ -257,7 +257,7 @@
         "  init(balls: [Ball], targets: [Vec2], walls: [Wall]) {\n",
         "      self.init(\n",
         "          balls: balls,\n",
-        "          minDistanceToTarget: Array(repeating: Float.infinity, count: withoutDerivative(at: targets.count)),\n",
+        "          targetDistances: Array(repeating: Float.infinity, count: withoutDerivative(at: targets.count)),\n",
         "          t: 0,\n",
         "          targets: targets,\n",
         "          walls: walls\n",
@@ -325,16 +325,16 @@
         "        let distTo2 = (updatedBalls[1].position - targets[i]).magnitude\n",
         "        var curTargetDistance = distTo1 < distTo2 ? distTo1 : distTo2\n",
         "        if curTargetDistance < 2 * Ball.ballRadius { curTargetDistance = 2 * Ball.ballRadius }\n",
-        "        if curTargetDistance < minDistanceToTarget[i] {\n",
+        "        if curTargetDistance < targetDistances[i] {\n",
         "            newMinTargetDistance = newMinTargetDistance + [curTargetDistance]\n",
         "        } else {\n",
-        "            newMinTargetDistance = newMinTargetDistance + [minDistanceToTarget[i]]\n",
+        "            newMinTargetDistance = newMinTargetDistance + [targetDistances[i]]\n",
         "        }\n",
         "    }\n",
         "\n",
         "    return World(\n",
         "        balls: updatedBalls,\n",
-        "        minDistanceToTarget: newMinTargetDistance.withDerivative { [count = withoutDerivative(at: newMinTargetDistance.count)] (d: inout Array<Float>.DifferentiableView) -> () in\n",
+        "        targetDistances: newMinTargetDistance.withDerivative { [count = withoutDerivative(at: newMinTargetDistance.count)] (d: inout Array<Float>.DifferentiableView) -> () in\n",
         "            if d.base.count == 0 {\n",
         "                d = Array.DifferentiableView(Array(repeating: 0, count: count))\n",
         "            }\n",
@@ -501,7 +501,7 @@
         "      r += animate(attributeName: \"cy\", from: String(position.y), to: String(nextPosition.y))\n",
         "    }\n",
         "\n",
-        "    for (targetIndex, (targetDistance, nextTargetDistance)) in zip(state.minDistanceToTarget, nextState.minDistanceToTarget).enumerated() {\n",
+        "    for (targetIndex, (targetDistance, nextTargetDistance)) in zip(state.targetDistances, nextState.targetDistances).enumerated() {\n",
         "        if targetDistance > 2 && nextTargetDistance <= 2 {\n",
         "            r += \"\"\"\n",
         "                <animate\n",
@@ -595,7 +595,7 @@
       "metadata": {
         "id": "Ht1A90N00Nzv",
         "colab_type": "code",
-        "outputId": "afe4cc52-c198-4ced-9338-cfa7f70c523f",
+        "outputId": "9a4bfb71-72d7-42a2-c792-c247df422930",
         "colab": {
           "base_uri": "https://localhost:8080/",
           "height": 245
@@ -605,7 +605,7 @@
         "var v0 = Vector2(20, 0.01)\n",
         "drawSimulation(ball1InitialVelocity: v0)"
       ],
-      "execution_count": 73,
+      "execution_count": 13,
       "outputs": [
         {
           "output_type": "display_data",
@@ -10562,7 +10562,7 @@
         "    let finalState = simulate(initialState)\n",
         "\n",
         "    // Sum the closest approaches to the targets.\n",
-        "    return finalState.minDistanceToTarget.sum()\n",
+        "    return finalState.targetDistances.sum()\n",
         "}\n",
         "\n",
         "loss(v0)"
@@ -10630,6 +10630,19 @@
       ],
       "execution_count": 0,
       "outputs": []
+    },
+    {
+      "cell_type": "code",
+      "metadata": {
+        "id": "NjYQ033qCOKK",
+        "colab_type": "code",
+        "colab": {}
+      },
+      "source": [
+        ""
+      ],
+      "execution_count": 0,
+      "outputs": []
     }
   ]
 }