-
Notifications
You must be signed in to change notification settings - Fork 566
Simplify _Q_opt in parmest with block scenario structure. #3789
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
108
commits into
Pyomo:main
Choose a base branch
from
sscini:Q_opt-redesign
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.
+515
−578
Open
Changes from 57 commits
Commits
Show all changes
108 commits
Select commit
Hold shift + click to select a range
10f6b37
First pass at code redesign, still need to figure out more
sscini b0b7e2c
Merge branch 'Pyomo:main' into Q_opt-redesign
sscini 3e95e91
Added comments where I have question
sscini 8d3a4d5
Merge branch 'Q_opt-redesign' of https://github.com/sscini/pyomo into…
sscini 3982e1b
Got preliminary _Q_opt simple working with example!
sscini e829344
Ran black
sscini e464097
Changed name to _Q_opt_blocks
sscini dc5ee76
Update parmest.py
sscini 6355818
Ran black
sscini 099f541
Added in case for bootlist, works with example
sscini 76ee05e
Ran black
sscini d91ce3f
Simplified structure, ran black
sscini 1aea99f
Removed _Q_opt, and replicate functions, only using _Q_opt_blocks
sscini 7d93cc0
Ran black on mac
sscini d7d2214
Revert "Removed _Q_opt, and replicate functions, only using _Q_opt_bl…
sscini 7f21344
Added testing statement
sscini 32d8d41
Ran black
sscini 4e8c3ee
Merge branch 'Pyomo:main' into Q_opt-redesign
sscini 1e802ba
Made small design changes, in progress, ran black.
sscini 4b89bb3
Merge branch 'Q_opt-redesign' of https://github.com/sscini/pyomo into…
sscini 4777253
Progress made on objective_at_theta_blocks, unfinished.
sscini c58d5f3
Merge branch 'Pyomo:main' into Q_opt-redesign
sscini ea734b7
Merge branch 'Q_opt-redesign' of https://github.com/sscini/pyomo into…
sscini 490abea
Added notes for design meeting 01/12/26
sscini 1074fb0
Merge branch 'Pyomo:main' into Q_opt-redesign
sscini 9543456
Removed answered reviewer question, attempted adding covariance
sscini af4df1a
Added assertions for cov_n
sscini d4c4125
Finished implementing covariance
sscini 9d396fa
Added functional return values argument
sscini a97b21e
Ran black
sscini 0afb5ba
Corrected extraction for unknown parameters
sscini 191b131
Initial attempt at objective_at_theta_blocks
sscini 2c0760e
Working out bugs in _Q_at_theta implement. In progress.
sscini bbe994b
Corrected obj_at_theta_blocks
sscini 2c2e024
Removed _Q_opt, commented out _Q_at_theta, ran black
sscini 2333a4b
Fixed for loop issue
sscini b9af9f1
Removed fix_theta from create_parm_model
sscini 6cd3b4b
Renamed objective_at_theta_blocks, ran black.
sscini b46e1a7
Removed mentions of _Q_opt_blocks
sscini 3261798
Changed back to get_labeled_model in _cov_at_theta()
sscini fc478be
Added notes in unused files.
sscini acba985
Removed _Q_at_theta and objective_at_theta
sscini 145c2d8
Added comments for reviewers, ran black.
sscini 337095d
Corrected count_total_experiments to divide by # outputs.
sscini 837192c
Ran black.
sscini 4b46c30
Undo change to count_total_experiments.
sscini b9cf010
Update mpi_utils.py
sscini 062a9ee
Switched unknown_params to Vars
sscini 5baaa2f
Fixed number for cov_n, still need to adjust counting function
sscini c8194ac
Added question for reviewers
sscini 26d70e3
Ran black
sscini 4aa027d
Changed retrieval of variables for ind_red_hes.
sscini 26ba2ea
Added note related to count_total_experiments, commented out assertion.
sscini dd926f8
Ran black
sscini 7b70d1d
Removed dependence on cov_est for theta_est(), added bool for len(exp…
sscini 43cbaa4
Merge branch 'main' into Q_opt-redesign
sscini 07798c9
Ran black
sscini b325f0d
Attempted adding support for indexed vars
sscini 8b47430
Ran black
sscini aac1476
Addressed some review comments.
sscini 66a1396
Merge branch 'Pyomo:main' into Q_opt-redesign
sscini 3957dc9
Added Shammah fix for exp count
sscini 382ea20
Updates to address comments.
sscini 0da606f
Addressed some comments, simplified scenarios
sscini 935b700
Replaced getattr with suffix calls.
sscini 1fc71ee
Updated, ran black.
sscini 56ac15d
Noted failing tests, currently 15
sscini 60dc796
Removed old comment during dev
sscini 6bf439e
Fixed scenario count issue, ran black.
sscini a68906b
Added else statement in cov calc
sscini f31a35f
Update test_parmest.py
sscini b124def
Update parmest.py
sscini 2908c78
Update simple_reaction_parmest_example.py
sscini 58435d3
Added measurement error to reactor_design
sscini db646ba
Changed to built-in SSE
sscini d222c4f
Commented out model_initialized
sscini 9d829c4
Merge branch 'Pyomo:main' into Q_opt-redesign
sscini 7ffab76
Merge remote-tracking branch 'refs/remotes/origin/Q_opt-redesign' int…
sscini e267983
Remove solver import
sscini e3ae6e6
Ran black
sscini 345c3f2
Update test_parmest.py
sscini 6c3d5a0
Added back option, ran black
sscini 49b787a
Rearranged _Q_opt for fix_theta
sscini 8cf624e
Ran black
sscini c248c74
Adjusting parmest models, in progress
sscini b975089
Added more description, simplified comparison
sscini a63e4fc
Update parameter_estimation_example.py
sscini b92aa7d
Ran black
sscini 471dbe7
Adjusted if statement
sscini 98d91fc
Removed answered questions
sscini a6821ae
Merge branch 'Pyomo:main' into Q_opt-redesign
sscini f0ef6d6
Update parmest.py
sscini 1f86b03
Fixed models in variants test
sscini 72b4345
Merge branch 'Pyomo:main' into Q_opt-redesign
sscini c495e0f
Merge remote-tracking branch 'refs/remotes/origin/Q_opt-redesign' int…
sscini 82ee4ce
Update test_parmest.py
sscini 559a900
Update parmest.py
sscini 65067d5
Update parmest.py
sscini db26533
Temporary remove failing test.
sscini c9b19d7
Fixed experiment counter
sscini 7bba006
Modified testing
sscini 2cd2614
Removed extra print statements
sscini 5ba4fab
Updated error message.
sscini ee57ec9
Adjusted experimental counter
sscini 7cffb34
Update test_examples.py
sscini ebbd279
Addressed comments
sscini 0c1e605
Merge branch 'Pyomo:main' into Q_opt-redesign
sscini 92a2dd6
Update simple_reaction_parmest_example.py
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.