Merge branch 'master' into axesarray-indexing

Conflicts dealing with swapping out scipy factorial for numpy factorial Also require newaxis slice to be named.
jpcurbelo · Jan 31, 2024 · 5514254 · 5514254
2 parents f35e18a + bf74c27
commit 5514254
Show file tree

Hide file tree

Showing 14 changed files with 985 additions and 1,459 deletions.
diff --git a/examples/10_PDEFIND_examples.ipynb b/examples/10_PDEFIND_examples.ipynb
diff --git a/examples/12_weakform_SINDy_examples.ipynb b/examples/12_weakform_SINDy_examples.ipynb
diff --git a/examples/13_ensembling.ipynb b/examples/13_ensembling.ipynb
@@ -42,7 +42,16 @@
      "start_time": "2020-10-22T22:20:40.308783Z"
     }
    },
-   "outputs": [],
+   "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "/var/folders/37/5qnc4jls0l90nkqjm2xxg1bm0000gp/T/ipykernel_80870/1554735471.py:10: DeprecationWarning: Please use `ODEintWarning` from the `scipy.integrate` namespace, the `scipy.integrate.odepack` namespace is deprecated.\n",
+      "  from scipy.integrate.odepack import ODEintWarning\n"
+     ]
+    }
+   ],
    "source": [
     "import matplotlib.pyplot as plt\n",
     "from mpl_toolkits.mplot3d import Axes3D\n",
@@ -86,12 +95,14 @@
    "metadata": {},
    "outputs": [
     {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "(x)' = 0.018 1 + -10.024 x + 10.013 y\n",
-      "(y)' = 27.808 x + -0.930 y + -0.996 x z\n",
-      "(z)' = 0.169 1 + -2.669 z + 0.998 x y\n"
+     "ename": "TypeError",
+     "evalue": "SINDy.fit() got an unexpected keyword argument 'ensemble'",
+     "output_type": "error",
+     "traceback": [
+      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
+      "\u001b[0;31mTypeError\u001b[0m                                 Traceback (most recent call last)",
+      "Cell \u001b[0;32mIn[2], line 25\u001b[0m\n\u001b[1;32m     23\u001b[0m model \u001b[38;5;241m=\u001b[39m ps\u001b[38;5;241m.\u001b[39mSINDy(feature_names\u001b[38;5;241m=\u001b[39mfeature_names, optimizer\u001b[38;5;241m=\u001b[39mensemble_optimizer)\n\u001b[1;32m     24\u001b[0m \u001b[38;5;66;03m# Ensemble with replacement (V1)\u001b[39;00m\n\u001b[0;32m---> 25\u001b[0m model\u001b[38;5;241m.\u001b[39mfit(x_train, t\u001b[38;5;241m=\u001b[39mdt, ensemble\u001b[38;5;241m=\u001b[39m\u001b[38;5;28;01mTrue\u001b[39;00m, quiet\u001b[38;5;241m=\u001b[39m\u001b[38;5;28;01mTrue\u001b[39;00m)\n\u001b[1;32m     26\u001b[0m model\u001b[38;5;241m.\u001b[39mprint()\n\u001b[1;32m     27\u001b[0m ensemble_coefs \u001b[38;5;241m=\u001b[39m model\u001b[38;5;241m.\u001b[39mcoef_list\n",
+      "\u001b[0;31mTypeError\u001b[0m: SINDy.fit() got an unexpected keyword argument 'ensemble'"
      ]
     }
    ],
@@ -1079,7 +1090,7 @@
    "hash": "3ee6f1cb9fc3b265a5f24cdb7fa225f31e54d7494aa3be0e32b8f891af359708"
   },
   "kernelspec": {
-   "display_name": "Python 3",
+   "display_name": "Python 3 (ipykernel)",
    "language": "python",
    "name": "python3"
   },
@@ -1093,7 +1104,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.4"
+   "version": "3.11.5"
   },
   "toc": {
    "base_numbering": 1,

diff --git a/examples/1_feature_overview/example.ipynb b/examples/1_feature_overview/example.ipynb