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.

Sign up for GitHub

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

Jump to bottom

New Parmest UI #3160

Merged
merged 72 commits into from
May 7, 2024
Merged

New Parmest UI #3160

merged 72 commits into from
May 7, 2024

Conversation

smartin71
Copy link
Contributor

@smartin71 smartin71 commented Feb 22, 2024 •
edited
Loading

Fixes # .

Summary/Motivation:

This is the same as the previous pull request for the new parmest UI, but with the deprecated folder removed and the deprecated UI/tests integrated into the original parmest code. I have copied the goals of the original pull request below.

Changes proposed in this PR:

Legal Acknowledgement

By contributing to this software project, I have read the contribution guide and agree to the following terms and conditions for my contribution:

  1. I agree my contributions are submitted under the BSD license.
  2. I represent I am authorized to make the contributions and grant the license. If my employer has rights to intellectual property that includes these contributions, I represent that I have received permission to make contributions and grant the required license on behalf of that employer.

smartin71 and others added 24 commits January 9, 2024 12:19
@smartin71
Added interface to ensure parmest backwards compatiblity.
e889912
@smartin71
Moved parmest deprecated files to folder.
87aa19d
@smartin71
Finished parmest reactor_design example using new interface.
19ed448
@smartin71
Fixed parmest reaction kinetics example to work with new interface.
280cd80
@smartin71
Added parmest rooney-biegler example wtih new interface.
c7caf80
@smartin71
Fixed parmest tests of new interface.
ed87c16
@blnicho
Merge branch 'main' into main
d57a49e
@smartin71
Reformatted parmest files using black.
90c98c8
@smartin71
Merge branch 'main' of github.com:smartin71/pyomo
8df0baf
@smartin71
Fixed typo parmest.py.
70d66e6
@smartin71
Another typo in parmest.py.
922c715
@kaklise
removed group_data function
7965ac5
@kaklise
Removed group_data from example, data is now grouped using data_i, an…
edfc620 
…d mean of sv and caf
@kaklise
Data formatting moved to create_model
2bcb0e0
@blnicho
Merge branch 'main' into main
3a9b3b0
@smartin71
Merge pull request #1 from kaklise/parmest-redesign
2600406 
Updates for parmest redesign
Added __init__.py to parmest deprecated folder.
8f581df
Merge branch 'main' of github.com:smartin71/pyomo
fed073f
More parmest black formatting.
030aa57
Added exp1.out to exp14.out by force for deprecated semibatch example…
3f787a3 
…s in parmest.
Removed group_data from parmest documentation.
07b612a
Fixed parmest documentation to use examples with new UI.
ff5077b
Fixed parmest datarec documentation for new UI.
abbda5d
@smartin71
Integrated deprecated parmest UI into new UI. Removed deprecated folder.
04f68dc
@blnicho blnicho requested review from blnicho and kaklise February 27, 2024 19:40
kaklise and others added 24 commits April 30, 2024 09:31
@kaklise
removed _treemaker, not used
e68c415
@kaklise
removed _SecondStageCostExpr class, call objective function directly
63634c9
@smartin71
Merge pull request #5 from kaklise/parmest-redesign
ff90e3e 
added missing commas
@kaklise
changed yhat to y_hat
a92b4f5
@smartin71
Merge pull request #6 from kaklise/parmest-redesign
2b542e9 
changed yhat to y_hat
@blnicho
Update Estimator constructor in parmest to more robustly support both…
097849d 
… the new and deprecated APIs
@blnicho
Fixing formatting in parmest
efe4dab
@blnicho
Fix formatting in parmest
8638268
@blnicho
Reworking parmest Estimator constructor
eeec88e
@blnicho
Adding comments to parmest Estimator constructor logic
dcd5db1
@blnicho
Adding default values to the parmest Estimator docstring
9274769
@blnicho
Removing list of parmest TODO items that was opened as a GitHub issue
48624f4
@blnicho
Simplify checking for naming conflicts in parmest
e01830e
@blnicho
Simplifying _expand_indexed_unknowns
d5a289b
@blnicho
Cleaning up logic in parmest
27e84a8
@blnicho
More parmest cleanup
ae2c5ab
@blnicho
Remove fixed TODO and fix typo in parmest test
88c1227
@blnicho
Fixing non deterministic fragile test in parmest
cff93a1
@blnicho
Minor edits to scenariocreator in parmest
97b3b0a
@blnicho
Simplify scenariocreator code in parmest to remove duplication
ff26f63
@blnicho
Merge branch 'main' into main
d775d2e
@blnicho
Cleaning up a few docstrings in parmest
de1c782
@blnicho
Merge branch 'main' of https://github.com/smartin71/pyomo into parmes…
d383e57 
…t-v2
@blnicho
Cleaning up a few assert statements in test_parmest.py
7f27d2f
@blnicho blnicho requested a review from kaklise May 6, 2024 22:53
kaklise
kaklise approved these changes May 7, 2024
View reviewed changes
Copy link
Member

@kaklise kaklise left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved

@blnicho blnicho merged commit a0765b4 into Pyomo:main May 7, 2024
32 of 33 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kaklise kaklise kaklise approved these changes

@blnicho blnicho blnicho approved these changes

@jsiirola jsiirola Awaiting requested review from jsiirola

@mrmundt mrmundt Awaiting requested review from mrmundt

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@smartin71 @kaklise @blnicho @pyomo-autotest