Resolve errors in mapping ScalarVar to numpy ndarray#3423
Merged
blnicho merged 3 commits intoPyomo:mainfrom Nov 18, 2024
Merged
Resolve errors in mapping ScalarVar to numpy ndarray#3423blnicho merged 3 commits intoPyomo:mainfrom
blnicho merged 3 commits intoPyomo:mainfrom
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #3423 +/- ##
=======================================
Coverage 88.69% 88.69%
=======================================
Files 882 882
Lines 100615 100623 +8
=======================================
+ Hits 89237 89247 +10
+ Misses 11378 11376 -2
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
blnicho
approved these changes
Nov 18, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #3418 .
Summary/Motivation:
This resolves how we map ScalarVar (and other scalar numeric expression types) into numpy
ndarrayobjects. With this change, Pyomo Var objects behave in a manner consistent with other python scalars (likefloat).Changes proposed in this PR:
assertExpressionsEqualto allow for lists / ndarrays of expressions (and to comparelistand 1dndarrayas being equal)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: