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.

Sign up for GitHub

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

Jump to bottom

Only bv implies check globals #394

Merged
merged 7 commits into from
Sep 8, 2023
Merged

Only bv implies check globals #394

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
407db72
small doc fix: abs as global
Wout4 Jul 6, 2023
f2dc092
Merge remote-tracking branch 'origin/master'
Wout4 Jul 6, 2023
b0a9163
Merge remote-tracking branch 'origin/master'
Wout4 Jul 7, 2023
41b7f2c
Merge remote-tracking branch 'origin/master'
Wout4 Jul 10, 2023
9a08c6b
Merge remote-tracking branch 'origin/master'
Wout4 Jul 10, 2023
89c7fab
Merge remote-tracking branch 'origin/master'
Wout4 Jul 11, 2023
d4ba423
check for globals to avoid infinite loop in only_bv_implies
Wout4 Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions cpmpy/transformations/reification.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,10 @@ def only_bv_implies(constraints):
else:
# BE0 == BVar1 :: ~BVar1 -> ~BE0, BVar1 -> BE0
newexprs = ((~a1).implies(recurse_negation(a0)), a1.implies(a0))
#newexprs = ((~a1).implies(~a0), a1.implies(a0)) # XXX when push_down_neg is separate, negated_normal no longer needed separately
newcons.extend(only_bv_implies(flatten_constraint(newexprs)))
if isinstance(a0, GlobalConstraint):
newcons.extend(newexprs)
else:
newcons.extend(only_bv_implies(flatten_constraint(newexprs)))
else:
# all other flat normal form expressions are fine
newcons.append(cpm_expr)
Expand Down