cleanup and add tests

CPMpy · Sep 21, 2023 · 5543d5f · 5543d5f
1 parent 1c5ef0e
commit 5543d5f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/cpmpy/solvers/exact.py b/cpmpy/solvers/exact.py
@@ -592,9 +592,8 @@ def solution_hint(self, cpm_vars, vals):
         """
 
         cpm_vars = flatlist(cpm_vars)
-
         vals = flatlist(vals)
-
+        assert (len(cpm_vars) == len(vals)), "Variables and values must have the same size for hinting"
         try:
             pkg_resources.require("exact>=1.1.5")
             self.xct_solver.setSolutionHints(self.solver_vars(cpm_vars), vals)

diff --git a/cpmpy/solvers/ortools.py b/cpmpy/solvers/ortools.py
@@ -522,11 +522,8 @@ def solution_hint(self, cpm_vars, vals):
         self.ort_model.ClearHints() # because add just appends
 
         cpm_vars = flatlist(cpm_vars)
-
         vals = flatlist(vals)
-
         assert (len(cpm_vars) == len(vals)), "Variables and values must have the same size for hinting"
-
         for (cpm_var, val) in zip(cpm_vars, vals):
             self.ort_model.AddHint(self.solver_var(cpm_var), val)
 

diff --git a/cpmpy/solvers/pysat.py b/cpmpy/solvers/pysat.py
@@ -317,8 +317,8 @@ def solution_hint(self, cpm_vars, vals):
         """
 
         cpm_vars = flatlist(cpm_vars)
-
         vals = flatlist(vals)
+        assert (len(cpm_vars) == len(vals)), "Variables and values must have the same size for hinting"
 
         literals = []
         for (cpm_var, val) in zip(cpm_vars, vals):

diff --git a/tests/test_solvers_solhint.py b/tests/test_solvers_solhint.py
@@ -32,6 +32,9 @@ def test_hints(self):
                 slv.solution_hint([a,b], [True,True])
                 self.assertTrue(slv.solve(**args)) # should also work with an UNSAT hint
 
+                slv.solution_hint([a,[b]], [[[False]], True]) # check nested lists
+                self.assertTrue(slv.solve(**args))
+
             except NotSupportedError:
                 continue