Repository navigation
Speed up PowExpr._evaluate via the C-level API
#1278
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
Open
Zeroto521
wants to merge
4
commits into
scipopt:master
Choose a base branch
from
Zeroto521:p3d-pow-cpow
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
a54ddaa
Fix negative-power expression evaluation
Zeroto521 854a7e3
Merge branch 'master' of https://github.com/scipopt/PySCIPOpt into p3…
Zeroto521 751c7be
Update CHANGELOG with PowExpr._evaluate speedup
Zeroto521 ed1156b
Clarify power expression base variable
Zeroto521 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -257,6 +257,23 @@ def test_getVal_with_GenExpr(): | |
| with pytest.raises(ValueError, match="math domain error"): | ||
| m.getVal(sin(math.inf)) | ||
|
|
||
|
|
||
| def test_getVal_pow_negative_exponent(): | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This test is in the middle of another test |
||
| m = Model() | ||
| x = m.addVar(lb=1, ub=1, name="x") | ||
| y = m.addVar(lb=2, ub=2, name="y") | ||
| z = m.addVar(lb=0, ub=0, name="z") | ||
| m.optimize() | ||
|
|
||
| # C-level pow with a negative exponent (matches Python: 2.0**-2.0 == 0.25) | ||
| assert 2.0 ** -2.0 == 0.25 | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What's the point of this? |
||
| assert m.getVal(x ** -2.0) == 1 | ||
|
|
||
| # zero to a negative power raises, like Python's 0.0**-1.0; | ||
| # z / x would short-circuit to 0 in ProdExpr before evaluating x**-1, so divide by z | ||
| with pytest.raises(ZeroDivisionError): | ||
| m.getVal(y / z) | ||
|
|
||
| with pytest.raises(ValueError, match="math domain error"): | ||
| m.getVal(cos(-math.inf)) | ||
|
|
||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should also raise if we have a negative base and a fractional exponent.