Merge branch 'master' into indomain-second-arg

Author: Dimosts

cpmpy/expressions/globalconstraints.py

@@ -890,6 +890,9 @@ def decompose(self):
         """
         X, Y = cpm_array(self.args)
 
+        if len(X) == 0 == len(Y):
+            return [cp.BoolVal(False)], [] # based on the decomp, it's false...
+
         bvar = boolvar(shape=(len(X) + 1))
 
         # Constraint ensuring that each element in X is less than or equal to the corresponding element in Y,
@@ -936,6 +939,9 @@ def decompose(self):
         """
         X, Y = cpm_array(self.args)
 
+        if len(X) == 0 == len(Y):
+            return [cp.BoolVal(False)], [] # based on the decomp, it's false...
+
         bvar = boolvar(shape=(len(X) + 1))
         defining = [bvar == ((X <= Y) & ((X < Y) | bvar[1:]))]
         defining.append(bvar[-1] == (X[-1] <= Y[-1]))

cpmpy/expressions/globalfunctions.py

@@ -395,7 +395,7 @@ def decompose_comparison(self, cmp_op, cpm_rhs):
         constraints = []
 
         # introduce boolvar for each possible value
-        bvars = boolvar(shape=(ub+1-lb))
+        bvars = boolvar(shape=(ub+1-lb,)) # shape is tuple to ensure it is a 1D array
 
         args = cpm_array(self.args)
         # bvar is true if the value is taken by any variable
@@ -447,7 +447,7 @@ def decompose_comparison(self, cmp_op, cpm_rhs):
         constraints = []
 
         # introduce boolvar for each possible value
-        bvars = boolvar(shape=(ub + 1 - lb))
+        bvars = boolvar(shape=(ub+1-lb,)) # shape is tuple to ensure it is a 1D array
         idx_of_n = n - lb
         if 0 <= idx_of_n < len(bvars):
             count_of_vals = cp.sum(bvars[:idx_of_n]) + cp.sum(bvars[idx_of_n+1:])

cpmpy/solvers/choco.py

@@ -592,7 +592,7 @@ def _get_constraint(self, cpm_expr):
                 return self.chc_model.int_value_precede_chain(self._to_vars(cpm_expr.args[0]), cpm_expr.args[1])
             elif cpm_expr.name == "gcc":
                 vars, vals, occ = cpm_expr.args
-                return self.chc_model.global_cardinality(*self.solver_vars([vars, vals]), self._to_vars(occ), cpm_expr.closed)
+                return self.chc_model.global_cardinality(self._to_vars(vars), self.solver_vars(vals), self._to_vars(occ), cpm_expr.closed)
             else:
                 raise NotImplementedError(f"Unknown global constraint {cpm_expr}, should be decomposed! If you reach this, please report on github.")