-
Notifications
You must be signed in to change notification settings - Fork 577
Adding regularization objective option to parmest #3550
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
Open
sscini
wants to merge
53
commits into
Pyomo:main
Choose a base branch
from
sscini:parmest_obj_regularization
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 9 commits
Commits
Show all changes
53 commits
Select commit
Hold shift + click to select a range
b3486ca
Add regularize term function, and modified SSE to add option
sscini 76ffb22
Fixed term in function
sscini 50d6417
Merge branch 'main' into parmest_obj_regularization
sscini 055f14c
Update parmest.py
sscini 626c1b9
Revert "Update parmest.py"
sscini e853cc2
Reapply "Update parmest.py"
sscini 77c2832
Add theta_ref and prior_FIM to keyword args
sscini cfe6460
Merge branch 'Pyomo:main' into parmest_obj_regularization
sscini 7d0c956
Adjust naming convention to ensure consistency.
sscini fae8500
Update parmest.py, DoE meeting work
sscini 7b16637
Merge branch 'Pyomo:main' into parmest_obj_regularization
sscini 22d9031
Merge branch 'Pyomo:main' into parmest_obj_regularization
sscini 61d72c7
Merge branch 'Pyomo:main' into parmest_obj_regularization
sscini 8f36179
Merge branch 'Pyomo:main' into parmest_obj_regularization
sscini 2d2ec2d
Updated for next round of review
sscini d1ab692
Added regularization weight to exp class initialize
sscini bd212f4
Still debugging, progress as of 7/15/2025
sscini 31bdf53
Merge branch 'main' into parmest_obj_regularization
sscini ec14208
Merge branch 'Pyomo:main' into parmest_obj_regularization
sscini a3b4b4c
Update parmest.py
sscini 7a0f623
Fixed issues with merging changes
sscini 31a61e9
Merge branch 'Pyomo:main' into parmest_obj_regularization
sscini d44f13d
L2 regularization working
sscini 906f280
Merge branch 'Pyomo:main' into parmest_obj_regularization
sscini fec94fd
Made the theta_ref a series.
sscini 6ecb2a3
Updated doc strings.
sscini 865e51e
Update parmest.py
sscini 5ffa566
added helper comments.
sscini 53ca679
Updated implementation to add vectorized L2 calc, and reviewer questions
sscini ab583bb
Adjusted logging, ran black
sscini ac96277
Changed value to avoid zero for L2 term
sscini 08bce8f
Commented out or removed print statements
sscini 26bc6b6
Merge branch 'Pyomo:main' into parmest_obj_regularization
sscini 7aa3b17
Merge branch 'main' into parmest_obj_regularization
sscini ec60888
Chose to apply in compute_covariance
sscini 9531d73
Update parmest.py
sscini bc79da5
Made weight default 1
sscini 0456910
Ran black
sscini 23eb2ea
Adjusted doc strings, ran black
sscini 933da0f
Update regularization_example.py
sscini ec100ae
Merge branch 'Pyomo:main' into parmest_obj_regularization
sscini e20e457
Added validation for prior_FIM and fixed inconsistencies
sscini 850819c
Merge branch 'Pyomo:main' into parmest_obj_regularization
sscini baadbf0
Added L1 reg support working prototype, black
sscini 351920f
Fixed testing issue, and example issues
sscini a0decd0
Merge branch 'main' into parmest_obj_regularization
sscini a7d1fb8
Merge branch 'main' into parmest_obj_regularization
sscini 9786fc5
Merge branch 'Pyomo:main' into parmest_obj_regularization
sscini 6d46119
Added tests to correct files, ran black.
sscini 14bc329
Updated model structure, reordered, ran black
sscini f84786c
Merge branch 'Pyomo:main' into parmest_obj_regularization
sscini a123706
Merge branch 'main' into parmest_obj_regularization
sscini 2bacc80
Archived L1 for now, removed from here, ran black
sscini File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this run? My intuition is that you need to write out the matrix multiplication and cannot use matrix multiplication.