combined a couple cells in 1 and 2a notebooks, updated a warning message

Author: pavelkomarov

examples/1_basic_tutorial.ipynb

@@ -78,7 +78,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -89,15 +89,8 @@
     "\n",
     "# time step size and time series length in TIME\n",
     "dt = 0.01\n",
-    "duration = 4"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 4,
-   "metadata": {},
-   "outputs": [],
-   "source": [
+    "duration = 4\n",
+    "\n",
     "x, x_truth, dxdt_truth, _ = simulate.pi_control(duration=duration, dt=dt, \n",
     "                                                noise_type=noise_type, noise_parameters=noise_parameters)"
    ]

examples/2a_optimizing_parameters_with_dxdt_known.ipynb

@@ -228,7 +228,7 @@ def suggest_method(x, dt, dxdt_truth=None, cutoff_frequency=None):
         import cvxpy
         methods += [acceleration, jerk, smooth_acceleration]
     except ImportError:
-        warn("CVXPY not installed, skipping velocity, acceleration, jerk, and smooth_acceleration")
+        warn("CVXPY not installed, skipping acceleration, jerk, and smooth_acceleration")
 
     best_value = float('inf') # core loop
     for func in tqdm(methods):