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

Update the IDAES branch of Pyomo #3

Merged
merged 700 commits into from
Jun 10, 2020
Merged

Update the IDAES branch of Pyomo #3

merged 700 commits into from
Jun 10, 2020

Conversation

blnicho
Copy link
Member

@blnicho blnicho commented Jun 10, 2020

Summary/Motivation:

Bring the IDAES branch on the IDAES fork of Pyomo up-to-date with Pyomo master.

Legal Acknowledgement

By contributing to this software project, I 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.

michaelbynum and others added 30 commits May 13, 2020 12:23
Fix component_data_objects for scalar components with no len()
merge master into pynumero_interior_point
merge master into pynumero_interior_point
@blnicho blnicho requested review from jsiirola and eslickj June 10, 2020 05:10
Copy link
Member

@eslickj eslickj left a comment

Choose a reason for hiding this comment

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

Looks good

@blnicho blnicho merged commit f36f307 into IDAES:IDAES Jun 10, 2020
andrewlee94 pushed a commit that referenced this pull request Jun 16, 2020
andrewlee94 pushed a commit that referenced this pull request Jun 19, 2020
Minor changes to parmest for covariance estimation
andrewlee94 pushed a commit that referenced this pull request Dec 14, 2020
jsiirola pushed a commit that referenced this pull request Dec 17, 2020
jsiirola pushed a commit that referenced this pull request Feb 24, 2022
Separating contrib changes into distinct lines
blnicho pushed a commit that referenced this pull request Nov 17, 2022
Update for cases where the model contains a single scenario
blnicho pushed a commit that referenced this pull request May 8, 2024
Minor updates to parmest redesign
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.