New/sindy eq discovery

.github/workflows/deploy.yml

@@ -1,11 +1,7 @@
 name: build-and-deploy-book
 
-# Trigger the workflow on push to main branch and PRs
-# on: [push, pull_request]
-on:
-  push:
-    branches:
-      - main
+
+on: [push, pull_request]
 # This job installs dependencies, builds the book, and deploys the html
 jobs:
   build-and-deploy-book:
@@ -37,6 +33,7 @@ jobs:
     - name: 👀 Check Conda environment
       shell: bash -l {0}
       run: |
+          pip install -r requirements.txt
           conda info
           conda list
     - name: 📦 Cache Notebooks

_toc.yml

@@ -24,6 +24,9 @@ parts:
     chapters:
       - file: notebooks/DA_demo_L96.ipynb
       - file: notebooks/Learning-DA-increments.ipynb
+  - caption: Equation Discovery with Lorenz-96
+    chapters:
+      - file: notebooks/sindy_L96_2scale.ipynb
   - caption: End Matter
     chapters:
       - file: bibliography.md

conda-linux-64.lock

@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 6e828ce921911f6bbbaa07412ac0dc8797c0a263dde7e0f3de50834dfe60d373
+# input_hash: 85a28087c3f811bff182c4a28b6a77293e79f25e42598ff6dc365e7665ebea8d
 @EXPLICIT
 https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2#d7c89558ba9fa0495403155b64376d81
 https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2022.12.7-ha878542_0.conda#ff9f73d45c4a07d6f424495288a26080
@@ -90,7 +90,7 @@ https://conda.anaconda.org/conda-forge/linux-64/libvorbis-1.3.7-h9c3ff4c_0.tar.b
 https://conda.anaconda.org/conda-forge/linux-64/libxcb-1.13-h7f98852_1004.tar.bz2#b3653fdc58d03face9724f602218a904
 https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.10.4-hfdac1af_0.conda#241845899caff54ac1d2b3102ad988cf
 https://conda.anaconda.org/conda-forge/linux-64/mpfr-4.2.0-hb012696_0.conda#14d87bdff2cbd3b1179a29fb316ed743
-https://conda.anaconda.org/conda-forge/linux-64/mysql-common-8.0.32-ha901b37_1.conda#2c18a7a26ec0d0c23a917f37a65fc9a2
+https://conda.anaconda.org/conda-forge/linux-64/mysql-common-8.0.32-hf1915f5_2.conda#cf4a8f520fdad3a63bb2bce74576cd2d
 https://conda.anaconda.org/conda-forge/linux-64/p11-kit-0.24.1-hc5aa10d_0.tar.bz2#56ee94e34b71742bbdfa832c974e47a8
 https://conda.anaconda.org/conda-forge/linux-64/pcre2-10.40-hc3806b6_0.tar.bz2#69e2c796349cd9b273890bee0febfe1b
 https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda#47d31b792659ce70f470b5c82fdfb7a4
@@ -109,13 +109,13 @@ https://conda.anaconda.org/conda-forge/linux-64/libgcrypt-1.10.1-h166bdaf_0.tar.
 https://conda.anaconda.org/conda-forge/linux-64/libglib-2.76.2-hebfc3b9_0.conda#db1d4a1dfc04f3eab50d97551850759a
 https://conda.anaconda.org/conda-forge/linux-64/libhwloc-2.9.1-hd6dc26d_0.conda#a3ede1b8e47f993ff1fe3908b23bb307
 https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-16_linux64_openblas.tar.bz2#955d993f41f9354bf753d29864ea20ad
-https://conda.anaconda.org/conda-forge/linux-64/libllvm16-16.0.2-hbf9e925_0.conda#2070ceff71efe2c80dfd9aac59c3f402
+https://conda.anaconda.org/conda-forge/linux-64/libllvm16-16.0.3-hbf9e925_1.conda#3d942f062d7656168bb42b3439bdfede
 https://conda.anaconda.org/conda-forge/linux-64/libsndfile-1.2.0-hb75c966_0.conda#c648d19cd9c8625898d5d370414de7c7
 https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.5.0-ha587672_6.conda#4e5ee4b062c21519efbee7e2ae608748
 https://conda.anaconda.org/conda-forge/linux-64/libxkbcommon-1.5.0-h79f4944_1.conda#04a39cdd663f295653fc143851830563
-https://conda.anaconda.org/conda-forge/linux-64/llvm-openmp-16.0.2-h4dfa4b3_0.conda#dca41421c0950d314181fbde9865f95b
+https://conda.anaconda.org/conda-forge/linux-64/llvm-openmp-16.0.3-h4dfa4b3_0.conda#540ca195771d87e180778d37c98410eb
 https://conda.anaconda.org/conda-forge/linux-64/mpc-1.3.1-hfe3b2da_0.conda#289c71e83dc0daa7d4c81f04180778ca
-https://conda.anaconda.org/conda-forge/linux-64/mysql-libs-8.0.32-hd7da12d_1.conda#a69fa6f218cfed8e2d61753eeacaf034
+https://conda.anaconda.org/conda-forge/linux-64/mysql-libs-8.0.32-hca2cd23_2.conda#20b4708cd04bdc8138d03314ddd97885
 https://conda.anaconda.org/conda-forge/linux-64/nss-3.89-he45b914_0.conda#2745719a58eeaab6657256a3f142f099
 https://conda.anaconda.org/conda-forge/linux-64/python-3.9.16-h2782a2a_0_cpython.conda#95c9b7c96a7fd7342e0c9d0a917b8f78
 https://conda.anaconda.org/conda-forge/linux-64/xcb-util-0.4.0-h166bdaf_0.tar.bz2#384e7fcb3cd162ba3e4aed4b687df566
@@ -159,7 +159,7 @@ https://conda.anaconda.org/conda-forge/noarch/jeepney-0.8.0-pyhd8ed1ab_0.tar.bz2
 https://conda.anaconda.org/conda-forge/noarch/json5-0.9.5-pyh9f0ad1d_0.tar.bz2#10759827a94e6b14996e81fb002c0bda
 https://conda.anaconda.org/conda-forge/linux-64/kiwisolver-1.4.4-py39hf939315_1.tar.bz2#41679a052a8ce841c74df1ebc802e411
 https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.15-haa2dc70_1.conda#980d8aca0bc23ca73fa8caa3e7c84c28
-https://conda.anaconda.org/conda-forge/linux-64/libclang13-16.0.2-default_hd781213_0.conda#a9cc7c017fc53ceefd4b859492bb1501
+https://conda.anaconda.org/conda-forge/linux-64/libclang13-16.0.3-default_hd781213_0.conda#e0f95087543b73c7bc2689f0aeb86a6d
 https://conda.anaconda.org/conda-forge/linux-64/libcups-2.3.3-h36d4200_3.conda#c9f4416a34bc91e0eb029f912c68f81f
 https://conda.anaconda.org/conda-forge/linux-64/libpq-15.2-hb675445_0.conda#4654b17eccaba55b8581d6b9c77f53cc
 https://conda.anaconda.org/conda-forge/linux-64/libsystemd0-253-h8c4010b_1.conda#9176b1e2cb8beca37a7510b0e801e38f
@@ -258,7 +258,7 @@ https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#
 https://conda.anaconda.org/conda-forge/noarch/joblib-1.2.0-pyhd8ed1ab_0.tar.bz2#7583652522d71ad78ba536bba06940eb
 https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40
 https://conda.anaconda.org/conda-forge/noarch/latexcodec-2.0.1-pyh9f0ad1d_0.tar.bz2#8d67904973263afd2985ba56aa2d6bb4
-https://conda.anaconda.org/conda-forge/linux-64/libclang-16.0.2-default_h83cc7fd_0.conda#0cd9e385d28fd2e728285075f7971ff0
+https://conda.anaconda.org/conda-forge/linux-64/libclang-16.0.3-default_h83cc7fd_0.conda#5b597bfd98734dd4d0d907656a7ea9d1
 https://conda.anaconda.org/conda-forge/linux-64/libva-2.18.0-h0b41bf4_0.conda#56e049224de34bbe0478aad422227942
 https://conda.anaconda.org/conda-forge/noarch/linkify-it-py-2.0.0-pyhd8ed1ab_0.tar.bz2#25b93e66067eb496ac10da888e25cc33
 https://conda.anaconda.org/conda-forge/noarch/markdown-it-py-2.2.0-pyhd8ed1ab_0.conda#b2928a6c6d52d7e3562b4a59c3214e3a
@@ -302,7 +302,7 @@ https://conda.anaconda.org/conda-forge/linux-64/ukkonen-1.0.1-py39hf939315_3.tar
 https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.6-pyhd8ed1ab_0.conda#078979d33523cb477bd1916ce41aacc9
 https://conda.anaconda.org/conda-forge/noarch/argon2-cffi-21.3.0-pyhd8ed1ab_0.tar.bz2#a0b402db58f73aaab8ee0ca1025a362e
 https://conda.anaconda.org/conda-forge/linux-64/gst-plugins-base-1.22.0-h4243ec0_2.conda#0d0c6604c8ac4ad5e51efa7bb58da05c
-https://conda.anaconda.org/conda-forge/noarch/identify-2.5.23-pyhd8ed1ab_0.conda#a8c75801862679b3d0bb0a4bd6927423
+https://conda.anaconda.org/conda-forge/noarch/identify-2.5.24-pyhd8ed1ab_0.conda#a4085ab0562d5081a9333435837b538a
 https://conda.anaconda.org/conda-forge/linux-64/jupyter_core-5.3.0-py39hf3d152e_0.conda#09aafa6fee56aab97695c6a70194f5e5
 https://conda.anaconda.org/conda-forge/noarch/jupyter_events-0.6.3-pyhd8ed1ab_0.conda#d98c5196ab6ffeb0c2feca2912801353
 https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.7.1-py39he190548_0.conda#f2a931db797bb58bd335f4a857b4c898
@@ -319,7 +319,7 @@ https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.38-hd8ed1ab_0.c
 https://conda.anaconda.org/conda-forge/linux-64/qt-main-5.15.8-h5c52f38_9.conda#a80700497d2f343a8448778308aa5dfa
 https://repo.anaconda.com/pkgs/main/noarch/torch-lr-finder-0.2.1-pyhd3eb1b0_0.conda#f3a251d14fde4f7be34973be3fbacf6e
 https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.15-pyhd8ed1ab_0.conda#27db656619a55d727eaf5a6ece3d2fd6
-https://conda.anaconda.org/conda-forge/noarch/ipython-8.13.1-pyh41d4057_0.conda#b3ccf14923518214f2020f8073d247ab
+https://conda.anaconda.org/conda-forge/noarch/ipython-8.13.2-pyh41d4057_0.conda#e8563c13eee80a5f1c7bdfc2a1b20077
 https://conda.anaconda.org/conda-forge/noarch/nbclient-0.7.4-pyhd8ed1ab_0.conda#f7aa15f77d29b11caa1df1eb15383c59
 https://conda.anaconda.org/conda-forge/linux-64/pyqt-5.15.7-py39h5c7b992_3.conda#19e30314fe824605750da905febb8ee6
 https://conda.anaconda.org/conda-forge/noarch/requests-2.29.0-pyhd8ed1ab_0.conda#5fa992d972fbccfc069161805122cb8d
@@ -353,7 +353,6 @@ https://conda.anaconda.org/conda-forge/noarch/notebook-shim-0.2.3-pyhd8ed1ab_0.c
 https://conda.anaconda.org/conda-forge/linux-64/scikit-learn-1.2.2-py39hd189fd4_1.conda#4ad12d81a9672faa131d64abe2f1060f
 https://conda.anaconda.org/conda-forge/noarch/sphinx-book-theme-1.0.1-pyhd8ed1ab_0.conda#1ef419576de2c51b6e3a5a393eb35cda
 https://conda.anaconda.org/conda-forge/noarch/jupyter-book-0.15.1-pyhd8ed1ab_0.conda#f10d556d3b3dc0aeae6aee37c412ea60
-https://conda.anaconda.org/conda-forge/noarch/nbclassic-0.5.6-pyh8b2e9e2_0.conda#f73c8310a096cbac87c88a9af4fc019d
+https://conda.anaconda.org/conda-forge/noarch/nbclassic-1.0.0-pyh8b2e9e2_0.conda#40a29ee33012f92acdf45e41487b7206
 https://conda.anaconda.org/conda-forge/noarch/notebook-6.5.4-pyha770c72_0.conda#ec4ce3ce0a55ce21b6f5b86049b97af9
 https://conda.anaconda.org/conda-forge/noarch/jupyterlab-3.5.3-pyhd8ed1ab_0.conda#69f71bc3d176b3ad3d9564a32bd049b8
-# pip jupyterlab-myst @ https://files.pythonhosted.org/packages/bc/22/3dd1ef3acfe5a0436f7de8609ae4fc1f7454461931020f6f5b02e8af8544/jupyterlab_myst-1.1.3-py3-none-any.whl#sha256=73a50ac2e9653e2ee411e482f7fff3699966b7e6fa8588dc7345cc73a79fbd16

environment.yaml

@@ -20,5 +20,6 @@ dependencies:
   - pandas
   - conda-lock
   - pip
-  - pip:
-      - jupyterlab_myst
+  # - pip:
+  #     - jupyterlab_myst
+  #     - pysindy