merged and resolved conflicts

Author: rlabbe

01-g-h-filter.ipynb

@@ -12,7 +12,7 @@
        "        <style>\n",
        "        .output_wrapper, .output {\n",
        "            height:auto !important;\n",
-       "            max-height:100000px; \n",
+       "            max-height:100000px;\n",
        "        }\n",
        "        .output_scroll {\n",
        "            box-shadow:none !important;\n",
@@ -93,23 +93,13 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
-   "metadata": {
-    "scrolled": true
-   },
+   "execution_count": 5,
+   "metadata": {},
    "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "C:\\Anaconda3\\lib\\site-packages\\IPython\\html.py:14: ShimWarning: The `IPython.html` package has been deprecated since IPython 4.0. You should import from `notebook` instead. `IPython.html.widgets` has moved to `ipywidgets`.\n",
-      "  \"`IPython.html.widgets` has moved to `ipywidgets`.\", ShimWarning)\n"
-     ]
-    },
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "609e5b01d9564d6b8c6e025cab5df9cb",
+       "model_id": "5f6d72e65be24e628d9f6f144f309234",
        "version_major": 2,
        "version_minor": 0
       },
@@ -160,6 +150,7 @@
     "    plt.title(str(F))\n",
     "    plt.xlabel('position')\n",
     "    plt.ylabel('velocity')\n",
+    "    plt.show()\n",
     "                 \n",
     "interact(plot_FPFT, \n",
     "         F00=widgets.IntSlider(value=1, min=0, max=2.), \n",
@@ -188,7 +179,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "94a56f8ac01144e0b32bbb39a353e40a",
+       "model_id": "cc2e30d2d25946d598ba42683e49c891",
        "version_major": 2,
        "version_minor": 0
       },
@@ -255,7 +246,7 @@
     {
      "data": {
       "application/vnd.jupyter.widget-view+json": {
-       "model_id": "690c1af2d34845dd837f33de97469854",
+       "model_id": "c8a6dc551eae4845beaae8da7b8f72b3",
        "version_major": 2,
        "version_minor": 0
       },
@@ -313,7 +304,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -327,9 +318,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.1"
+   "version": "3.7.12"
   }
  },
  "nbformat": 4,
- "nbformat_minor": 1
+ "nbformat_minor": 4
 }