diff --git a/duffing-estimation.ipynb b/duffing-estimation.ipynb index 781f88c..38978f8 100644 --- a/duffing-estimation.ipynb +++ b/duffing-estimation.ipynb @@ -1034,7 +1034,7 @@ { "data": { "text/html": [ - "" + "" ], "text/plain": [ "" @@ -1826,7 +1826,7 @@ { "data": { "text/html": [ - "" + "" ], "text/plain": [ "" @@ -2618,7 +2618,7 @@ { "data": { "text/html": [ - "" + "" ], "text/plain": [ "" @@ -2738,7 +2738,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 7, "metadata": {}, "outputs": [], "source": [ @@ -2890,7 +2890,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 8, "metadata": { "scrolled": false }, @@ -2925,25 +2925,17 @@ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "e56f952c73ae450a8eedbe43f4acbd5c", + "model_id": "e006610e2a494103b04c160e08a90aa4", "version_major": 2, "version_minor": 0 }, "text/plain": [ - "HBox(children=(IntProgress(value=0, max=8), HTML(value='')))" + "HBox(children=(IntProgress(value=0, max=19), HTML(value='')))" ] }, "metadata": {}, "output_type": "display_data" }, - { - "name": "stderr", - "output_type": "stream", - "text": [ - "/usr/local/lib/python3.5/dist-packages/scipy/integrate/_ivp/common.py:32: UserWarning: The following arguments have no effect for a chosen solver: `first_step`.\n", - " .format(\", \".join(\"`{}`\".format(x) for x in extraneous)))\n" - ] - }, { "name": "stdout", "output_type": "stream", @@ -3734,7 +3726,7 @@ { "data": { "text/html": [ - "" + "" ], "text/plain": [ "" @@ -4526,7 +4518,7 @@ { "data": { "text/html": [ - "" + "" ], "text/plain": [ "" @@ -5318,7 +5310,7 @@ { "data": { "text/html": [ - "" + "" ], "text/plain": [ "" @@ -5348,7 +5340,7 @@ "def ga(k1, k2):\n", " return 0.0\n", "\n", - "rows = [50, 65, 70, 75, 80, 85, 90, 100]\n", + "rows = [50, 65, 70, 71, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 90, 100]\n", "zeta1 = 0.1\n", "zeta2 = 0.1\n", "xyhat_data = simulate_experiment(xy_data, rows, zeta1, zeta2, gc, gk, ga, f1, f2, verbose=True)\n", diff --git a/duffing-response.ipynb b/duffing-response.ipynb index d0f8f35..d77d1d2 100644 --- a/duffing-response.ipynb +++ b/duffing-response.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "code", - "execution_count": 4, + "execution_count": 1, "metadata": {}, "outputs": [], "source": [ @@ -44,7 +44,7 @@ }, { "cell_type": "code", - "execution_count": 66, + "execution_count": 3, "metadata": {}, "outputs": [ { @@ -830,7 +830,7 @@ { "data": { "text/html": [ - "" + "" ], "text/plain": [ "" @@ -862,7 +862,7 @@ }, { "cell_type": "code", - "execution_count": 145, + "execution_count": 7, "metadata": {}, "outputs": [ { @@ -1648,7 +1648,7 @@ { "data": { "text/html": [ - "" + "" ], "text/plain": [ "" @@ -1677,7 +1677,7 @@ "\n", "z, fs = np.meshgrid(\n", " np.linspace(0, 1.2, 500),\n", - " np.linspace(6.5e3, 8.5e3, 500)\n", + " np.linspace(7e3, 9e3, 500)\n", ")\n", "\n", "plt.figure()\n",