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

Resolve bugs in create_node_with_local_data #3376

Merged
merged 4 commits into from
Oct 9, 2024

Conversation

jsiirola
Copy link
Member

@jsiirola jsiirola commented Oct 3, 2024

Fixes # .

Summary/Motivation:

IDAES/idaes-pse#1454 found bugs in ExpressionData's implementation of create_node_with_local_data(). In particular, ScalarExpression.create_node_with_local_data was returning an unconstructed ScalarExpression. This PR resolves that bug (and another found when debugging create_node_with_local_data)

Changes proposed in this PR:

  • ExpressionData.create_node_with_local_data: always return a bare ExpressionData object, even if the original Expression was a ScalarExpression.
  • Fixing an issue where MonomialTermExpression.create_node_with_local_data was ignoring the user-specified classtype argument
  • Test both fixes

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.

Copy link

codecov bot commented Oct 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.63%. Comparing base (f32f122) to head (9c287c1).
Report is 12 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #3376   +/-   ##
=======================================
  Coverage   88.63%   88.63%           
=======================================
  Files         879      879           
  Lines      100221   100223    +2     
=======================================
+ Hits        88827    88832    +5     
+ Misses      11394    11391    -3     
Flag Coverage Δ
linux 86.27% <100.00%> (+<0.01%) ⬆️
osx 75.65% <100.00%> (+<0.01%) ⬆️
other 86.76% <100.00%> (+<0.01%) ⬆️
win 84.02% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

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

Copy link
Contributor

@mrmundt mrmundt left a comment

Choose a reason for hiding this comment

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

This is clever, I like this.

@jsiirola jsiirola merged commit 23fb726 into Pyomo:main Oct 9, 2024
32 checks passed
@jsiirola jsiirola deleted the expr-cnwld-fix branch October 9, 2024 19:16
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.

3 participants