Code

Trapping 3-way merge#459

Code

Closed

Jacob-Stevens-Haas wants to merge 55 commits intomasterdynamicslab/pysindy:masterfrom trapping-mergedynamicslab/pysindy:trapping-mergeCopy head branch name to clipboard

+6,481-64

Commits

Commits on Jan 11, 2022

• Made a new branch where the generalized trapping SINDy work will go.

  

  Alan Kaptanoglu

  authored and

  Alan Kaptanoglu

  committed
  312f0c2

Commits on Feb 14, 2022

• Added example 16 with all the new trapping investigations

  

  Alan Kaptanoglu

  authored and

  Alan Kaptanoglu

  committed
  2478bd4

Commits on Feb 15, 2022

• Still working on trapping example.

  

  Alan Kaptanoglu

  authored and

  Alan Kaptanoglu

  committed
  7eaf249

Commits on Feb 20, 2022

• Added some more changes. Going to merge the main branch in

  

  Alan Kaptanoglu

  authored and

  Alan Kaptanoglu

  committed
  8da5db4

• Merged in the main branch.

  

  Alan Kaptanoglu

  authored and

  Alan Kaptanoglu

  committed
  95217b1

Commits on Feb 23, 2022

• Adding the new trapping examples, consolidated trapping SR3 algorithms into single file (and objective function), fixed some test errors, fixed issue where trapping algorithm Qijk piece was slightl…

  Show description for b4b53a1
  

  Alan Kaptanoglu

  committed
  b4b53a1

• Deleted the older trapping generalized sr3 file, and think I fixed the pytest issues.

  

  Alan Kaptanoglu

  committed
  5be87a2

Commits on Feb 25, 2022

• Still working on getting some of the new trapping loss functions working.

  

  user01

  authored and

  user01

  committed
  675fa06

Commits on Nov 4, 2022

• Added new file to get Mai started on this branch. Merging in main branch in a moment.

  

  Alan Kaptanoglu

  authored and

  Alan Kaptanoglu

  committed
  b326ccb

• merged in the main branch

  

  Alan Kaptanoglu

  authored and

  Alan Kaptanoglu

  committed
  7abb697

Commits on Nov 6, 2022

• Cleaned up a notebook for Mai to work on.

  

  Alan Kaptanoglu

  authored and

  Alan Kaptanoglu

  committed
  e5ad333

Commits on Feb 8, 2023

• PT_ added and fix the PQ_tensor

  MPeng5

  committed
  483f8f4

Commits on Feb 14, 2023

• Committing current version of the trapping notebook so I can move to lambda machine. Rerunning the 9 mode von karman example is too intensive for my computer.

  

  Alan Kaptanoglu

  authored and

  Alan Kaptanoglu

  committed
  695af36

Commits on Feb 17, 2023

• P modified for continuing working on the optimizer

  

  Mai Peng

  authored and

  Mai Peng

  committed
  ba435e0

• P modified to work on the optimizer

  

  Mai Peng

  authored and

  Mai Peng

  committed
  51bfc4e

Commits on Feb 21, 2023

• some TODOs updated, follow the TODOs

  MPeng5

  committed
  7c11d12

• Merge branch 'master' into trapping_extended

  MPeng5

  committed
  e15a07e

Commits on Feb 23, 2023

• modified optimizer now works for Lorenz and MHD model, wait for potential fix for Von Karman street

  MPeng5

  committed
  1f00e03

• fix PT check

  MPeng5

  committed
  0742399

Commits on Feb 24, 2023

• Simplified and reran the trapping notebook, which is looking good. Also cleaned up the linting in trapping_sr3.py

  

  Alan Kaptanoglu

  authored and

  Alan Kaptanoglu

  committed
  7f307fc

Commits on Feb 26, 2023

• updated stability check in notebook

  MPeng5

  committed
  e7ecae1

Commits on Feb 27, 2023

• Fixed some bugs. Continue to work on the radius next week

  MPeng5

  committed
  831d15e

Commits on Mar 1, 2023

• updated the definition for constraints

  MPeng5

  committed
  7f0d95a

Commits on Mar 7, 2023

• Merge branch 'trapping_extended' of https://github.com/dynamicslab/pysindy into trapping_extended

  

  Mai Peng

  authored and

  Mai Peng

  committed
  80d3c92

Commits on Mar 9, 2023

• fixed small bugs in _reduce

  MPeng5

  committed
  631c51e

• tried with suitable beta values

  MPeng5

  committed
  187eb67

Commits on Mar 10, 2023

• added stability radius drawing after 'soft constraint'

  MPeng5

  committed
  77baf32

Commits on Mar 14, 2023

• Merge branch 'trapping_extended' of https://github.com/dynamicslab/pysindy into trapping_extended

  

  Mai Peng

  authored and

  Mai Peng

  committed
  023744e

Commits on Mar 17, 2023

• Added a fix to the soft constraints functionality. Issue was the reshaping format needs to be fortran style. Added some of the examples from the dysts database, some of which dont seem to quite be …

  Show description for 6178df9
  

  Alan Kaptanoglu

  authored and

  Alan Kaptanoglu

  committed
  6178df9

• Think I fixed the sphinx issue and added unit tests for python3.9 to the repository

  

  Alan Kaptanoglu

  authored and

  Alan Kaptanoglu

  committed
  d31556c

Commits on Mar 25, 2023

• added a projection operator for the bias term

  MPeng5

  committed
  330a28d

Commits on Mar 27, 2023

• fixed a bug in the optimizer. Continue to work on the notebook

  MPeng5

  committed
  d02f4c2

• Merge branch 'trapping_extended' of https://github.com/dynamicslab/pysindy into trapping_extended

  

  Mai Peng

  authored and

  Mai Peng

  committed
  3106d8c

Commits on Apr 7, 2023

• Updated the example 16 notebook for the enstrophy.

  

  Alan Kaptanoglu

  authored and

  Alan Kaptanoglu

  committed
  bad090d

Commits on Apr 12, 2023

• Merge branch 'trapping_extended' of https://github.com/dynamicslab/pysindy into trapping_extended

  

  Mai Peng

  authored and

  Mai Peng

  committed
  1d27108

Commits on Apr 14, 2023

• fixed the stability radius and continue work on the notebook on Friday

  MPeng5

  committed
  902bf57

• Merge branch 'trapping_extended' of https://github.com/dynamicslab/pysindy into trapping_extended

  

  Mai Peng

  authored and

  Mai Peng

  committed
  7a63b2c

Commits on Apr 19, 2023

• local stability radius well defined. More examples to show

  MPeng5

  committed
  c68b873

• Merge branch 'trapping_extended' of https://github.com/dynamicslab/pysindy into trapping_extended

  

  Mai Peng

  authored and

  Mai Peng

  committed
  0d90a86

• Removed TODOs

  

  Mai Peng

  authored and

  Mai Peng

  committed
  5adc7f0

Commits on Apr 21, 2023

• Updated some plots

  

  Mai Peng

  authored and

  Mai Peng

  committed
  78b4645

Commits on Apr 23, 2023

• Renamed and reorganized some scripts. Added the von karman example using the enstrophy in the trapping theorem and split up the dysts examples into a separate script to make things easier to use.

  

  Alan Kaptanoglu

  authored and

  Alan Kaptanoglu

  committed
  2efe993

• Merge branch 'trapping_extended' of https://github.com/dynamicslab/pysindy into trapping_extended

  

  Alan Kaptanoglu

  authored and

  Alan Kaptanoglu

  committed
  ba71846

Commits on Apr 26, 2023

• Reorganized the trapping files under a single directory 8_trapping_sindy_examples/. Now includes four jupyter notebooks, for the local stability, for dysts and lid-cavity flow examples, for using t…

  Show description for 3ec8481
  

  Alan Kaptanoglu

  authored and

  Alan Kaptanoglu

  committed
  3ec8481

Commits on Apr 27, 2023

• cleaned repeating variables/definitions in functions

  MPeng5

  committed
  4327510

Commits on May 9, 2023

• Added the plot of trapping region of Lorenze. Renamed some of the functions

  MPeng5

  committed
  46ac661

Commits on May 19, 2023

• Added noise to the Lorenz example. Need to fix the std

  MPeng5

  committed
  7358911

Commits on May 23, 2023

• A contour of the evolution of the kinetic energy of 2d globally stable system was added. More to add and polish in the future

  

  Mai Peng

  authored and

  Mai Peng

  committed
  6c66c97

• More levels added

  

  Mai Peng

  authored and

  Mai Peng

  committed
  e9d64c9

Commits on Jun 22, 2023

• Updating notebook but not done comparing the lorenz noisy data performance.

  

  Alan Kaptanoglu

  authored and

  Alan Kaptanoglu

  committed
  6aa3e76

Commits on Jun 25, 2023

• Played around with the enstrophy version of the trapping theorem and think we have some bugs left. The global version is still imposing the constraints on Q instead of on PQ. I think I fixed this f…

  Show description for 59a335b
  

  Alan Kaptanoglu

  authored and

  Alan Kaptanoglu

  committed
  59a335b

Commits on Aug 6, 2023

• when check stability, print out the max deviation from having zero totally symmetric part as well

  MPeng5

  committed
  e956ce7

Commits on Aug 17, 2023

• fixed the trap_progress_plots: legend 'unstable -> possibly unstable'

  MPeng5

  committed
  497de09

Commits on Dec 24, 2023

• updated some results

  MPeng5

  committed
  8d46f27

Commits on Jan 11, 2024

• Merge remote-tracking branch 'origin/trapping_extended' into trapping-merge

  Jacob-Stevens-Haas

  committed
  4617a51