work on toplevel

cpmpy/solvers/ortools.py

@@ -330,9 +330,8 @@ def transform(self, cpm_expr):
         cpm_cons = toplevel_list(cpm_expr)
         supported = {"min", "max", "abs", "element", "alldifferent", "xor", "table", "cumulative", "circuit", "inverse"}
         cpm_cons = decompose_in_tree(cpm_cons, supported)
-        cpm_cons = flatten_constraint(cpm_cons)  # flat normal form
         cpm_cons = reel_to_int(cpm_cons)
-        cpm_cons = flatten_constraint(cpm_cons)
+        cpm_cons = flatten_constraint(cpm_cons)  # flat normal form
         cpm_cons = reify_rewrite(cpm_cons, supported=frozenset(['sum', 'wsum']))  # constraints that support reification
         cpm_cons = only_numexpr_equality(cpm_cons, supported=frozenset(["sum", "wsum", "sub"]))  # supports >, <, !=
         cpm_cons = only_bv_reifies(cpm_cons)

cpmpy/transformations/normalize.py

@@ -65,6 +65,15 @@ def reel_to_int(lst_of_expr):
                 lhs.args[0] = newcoeffs
                 expr.args = lhs, (factor * rhs)
 
+            elif isinstance(lhs,Expression) and lhs.name == 'mul':
+                c, e = left_extract_reel_from_mul(lhs)
+                if c is not None:
+                    for i in range(1, 100):
+                        r = i * c
+                        if r == int(r):
+                            break
+                    expr.args = int(r) * e, i * rhs
+
             if isinstance(rhs, Expression) and rhs.name == 'wsum':
                 coeffs, vars = rhs.args
                 factor = 1
@@ -80,6 +89,15 @@ def reel_to_int(lst_of_expr):
                     newcoeffs.append(int(c * factor))
                 rhs.args[0] = newcoeffs
                 expr.args = (factor * lhs), rhs
+
+            elif isinstance(rhs,Expression) and rhs.name == 'mul':
+                c, e = left_extract_reel_from_mul(rhs)
+                if c is not None:
+                    for i in range(1, 100):
+                        r = i * c
+                        if r == int(r):
+                            break
+                    expr.args = i * lhs, int(r) * e
         newlist.append(expr)
     return newlist
 
@@ -98,9 +116,10 @@ def left_extract_reel_from_mul(expr):
                 return real, lhsexpr * rhs
 
         elif expr.name == 'wsum':
-            return
+            return None, None
     else:
         assert False, 'must be an expression'
+    return None, None
 
 
 def simplify_boolean(lst_of_expr, num_context=False):