From fc4c917b78350ebb0628d9d49ea406d4efc919ec Mon Sep 17 00:00:00 2001 From: Dimos Tsouros Date: Mon, 2 Oct 2023 16:45:23 +0200 Subject: [PATCH] canonical_comparison after flatten --- cpmpy/solvers/choco.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpmpy/solvers/choco.py b/cpmpy/solvers/choco.py index e1f0eb05c..e274e2a6b 100644 --- a/cpmpy/solvers/choco.py +++ b/cpmpy/solvers/choco.py @@ -323,8 +323,8 @@ def transform(self, cpm_expr): supported_reified = {"alldifferent", "alldifferent_except0", "allequal", "table", "InDomain", "cumulative", "circuit", "gcc", "inverse"} cpm_cons = decompose_in_tree(cpm_cons, supported, supported_reified) - cpm_cons = canonical_comparison(cpm_cons) cpm_cons = flatten_constraint(cpm_cons) # flat normal form + cpm_cons = canonical_comparison(cpm_cons) cpm_cons = only_numexpr_equality(cpm_cons, supported=frozenset(["sum", "wsum", "sub"])) # support >, <, != cpm_cons = reify_rewrite(cpm_cons, supported=supported_reified | {"sum", "wsum"}) # constraints that support reification cpm_cons = only_bv_reifies(cpm_cons)