Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Begin incorporating notebook from trapping_extended and aligning __init__ #510

Merged
merged 9 commits into from
May 30, 2024

Conversation

Jacob-Stevens-Haas
Copy link
Member

@Jacob-Stevens-Haas Jacob-Stevens-Haas commented May 26, 2024

Draft - still need to properly handle relax_optim

Also:
* change global rng to explicit rng (np.random.Generator)
* Fix latex error (removing \label) for local build

WIP
A bit wonky MHD images, and slightly less OOM good performance.
But term indexes look correct, no?

WIP
Seem to be doing better with the optimizer steps, but too large deviation from
constraints, leading to solution with As indefinite (some eigvals > 0)

Also:
    check_stability now returns False if not stable (and avoids printing)

WIP
Add beta, alpha, mod_matrix, remove relax_optim

relax_optim = `False` tried to directly minimize eigenvalues of A, rather
than applying trapping theorem.  This resulted in a nonconvex problem (convex
composite) that did not work well.
@Jacob-Stevens-Haas Jacob-Stevens-Haas requested a review from MPeng5 May 26, 2024 18:17
@Jacob-Stevens-Haas Jacob-Stevens-Haas marked this pull request as draft May 26, 2024 19:01
@Jacob-Stevens-Haas Jacob-Stevens-Haas marked this pull request as ready for review May 30, 2024 00:12
Copy link

codecov bot commented May 30, 2024

Codecov Report

Attention: Patch coverage is 91.66667% with 2 lines in your changes are missing coverage. Please review.

Project coverage is 94.68%. Comparing base (7f5c7b7) to head (2fc5fcd).
Report is 1 commits behind head on master.

Files Patch % Lines
pysindy/optimizers/trapping_sr3.py 91.66% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master     #510      +/-   ##
==========================================
- Coverage   94.70%   94.68%   -0.02%     
==========================================
  Files          38       38              
  Lines        4114     4105       -9     
==========================================
- Hits         3896     3887       -9     
  Misses        218      218              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Jacob-Stevens-Haas Jacob-Stevens-Haas merged commit 024bc9e into master May 30, 2024
4 of 7 checks passed
@Jacob-Stevens-Haas Jacob-Stevens-Haas deleted the trapping-resolve branch May 30, 2024 00:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant