Fix constants in Xor#778
Closed
IgnaceBleukx wants to merge 12 commits intomasterfrom
Closed
Conversation
Collaborator
|
Looks good to me, waiting for the tests to finish. |
Collaborator
Author
|
I was a bit too quick with adding the trivially true/false cases in simplify_bool. Can probably do with a re-review |
ThomSerg
approved these changes
Nov 6, 2025
| elif lb == 1 == ub: | ||
| self.assertEqual(cp.Model(expr).solveAll(), total_vals) | ||
| else: | ||
| self.assertNotEqual(cp.Model(expr).solveAll(), total_vals) |
Collaborator
There was a problem hiding this comment.
use assertLess()?
What with assertMore(..., 0)?
Merged
Collaborator
|
solved in #908 what remains in this PR is that the bounds of Comparison now check for trivial true/falseness; we do not currently plan to put this optimisation in main |
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
3 participants
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.
Some changes to how we handle constants in Xor, fixing both #620 and #747
Trivially true comparisons are now simplified away during
simplify_bool, and we cannsimplify_boolon the decomposition of Xor.This is not needed for any other global constraint, as it is the only one that takes Boolean arguments.
(Actually also IfThenElse does, but it's decomposition uses
impliesconstraints, and the simplifications are built-in to that constructor)