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

Fixes error pointed out by Jinliang in SOC interpolation function #1314

Merged
merged 5 commits into from
Jan 23, 2024

Conversation

dallan-keylogic
Copy link
Contributor

Fixes

Switches evaluation indexes in interpolation function used in SOC submodels

Summary/Motivation:

The original interpolation function had a typo, this PR fixes it. However, I don't believe it should affect anything we've published, because the incorrect formula gives the correct answer when a uniform discretization is used.

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 license terms described in the LICENSE.txt file at the top level of this directory.
  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.

@ksbeattie ksbeattie added the Priority:High High Priority Issue or PR label Jan 11, 2024
Copy link

codecov bot commented Jan 11, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (690eb5e) 77.41% compared to head (5401f33) 77.40%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1314      +/-   ##
==========================================
- Coverage   77.41%   77.40%   -0.01%     
==========================================
  Files         390      390              
  Lines       63631    63631              
  Branches    11702    11702              
==========================================
- Hits        49258    49255       -3     
- Misses      11835    11839       +4     
+ Partials     2538     2537       -1     

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

@lbianchi-lbl
Copy link
Contributor

@AlexNoring @NishantGiridhar would you be able to review this soon?

Copy link
Contributor

@AlexNoring AlexNoring left a comment

Choose a reason for hiding this comment

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

lgtm

Copy link

@NishantGiridhar NishantGiridhar left a comment

Choose a reason for hiding this comment

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

LGTM

@lbianchi-lbl
Copy link
Contributor

@dallan-keylogic I'll merge this after resolving the (new) failures that are happening because of #1317.

@lbianchi-lbl lbianchi-lbl enabled auto-merge (squash) January 23, 2024 18:48
@lbianchi-lbl lbianchi-lbl merged commit f07552d into IDAES:main Jan 23, 2024
37 checks passed
@dallan-keylogic dallan-keylogic deleted the soc-fix branch March 4, 2024 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Priority:High High Priority Issue or PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants