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

Fix for decorators in StateBlocks #1224

Merged
merged 4 commits into from
Jul 20, 2023
Merged

Fix for decorators in StateBlocks #1224

merged 4 commits into from
Jul 20, 2023

Conversation

eslickj
Copy link
Member

@eslickj eslickj commented Jul 18, 2023

Fixes

This should fix decorators for Expressions and Constraints not working in state blocks.

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.

Copy link
Member

@andrewlee94 andrewlee94 left a comment

Choose a reason for hiding this comment

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

This looks good, and I think I can see how and why it is necessary. My main request is if you could also add this to the reaction base class, as I believe there is a separate but equivalent method there.

idaes/core/base/property_base.py Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Jul 19, 2023

Codecov Report

Patch coverage: 100.00% and project coverage change: -0.01 ⚠️

Comparison is base (38b8333) 76.84% compared to head (e4dcd85) 76.83%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1224      +/-   ##
==========================================
- Coverage   76.84%   76.83%   -0.01%     
==========================================
  Files         390      390              
  Lines       61867    61873       +6     
  Branches    11388    11388              
==========================================
+ Hits        47539    47542       +3     
- Misses      11866    11870       +4     
+ Partials     2462     2461       -1     
Impacted Files Coverage Δ
idaes/core/base/property_base.py 93.79% <100.00%> (+0.07%) ⬆️
idaes/core/base/reaction_base.py 93.63% <100.00%> (+0.17%) ⬆️

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@eslickj eslickj merged commit a03ea47 into IDAES:main Jul 20, 2023
35 checks passed
@lbianchi-lbl lbianchi-lbl added the Priority:Normal Normal Priority Issue or PR label Jul 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Priority:Normal Normal Priority Issue or PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants