Merge remote-tracking branch 'origin/trapping_extended' into trapping…

…-merge
dynamicslab · Jan 11, 2024 · 4617a51 · 4617a51
2 parents 639ea9d + 8d46f27
commit 4617a51
Show file tree

Hide file tree

Showing 12 changed files with 6,481 additions and 64 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -29,7 +29,13 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
+<<<<<<< HEAD
         python-version: ["3.8", "3.10"]
+||||||| 5c6e9fd
+        python-version: [3.7, 3.8]
+=======
+        python-version: [3.7, 3.8, 3.9]
+>>>>>>> origin/trapping_extended
 
     steps:
     - uses: actions/checkout@v3

diff --git a/examples/8_trapping_sindy_examples/dysts_examples.ipynb b/examples/8_trapping_sindy_examples/dysts_examples.ipynb
diff --git a/examples/8_trapping_sindy_examples/trapping_extended.ipynb b/examples/8_trapping_sindy_examples/trapping_extended.ipynb
diff --git a/examples/8_trapping_sindy_examples/trapping_sindy_paper_examples.ipynb b/examples/8_trapping_sindy_examples/trapping_sindy_paper_examples.ipynb