From fa5adf18d82e806fafa1f22db5f46221e5ecf0d8 Mon Sep 17 00:00:00 2001 From: mmcilree Date: Fri, 12 Jul 2024 15:38:26 +0200 Subject: [PATCH] gcs: fix proof name. --- cpmpy/solvers/gcs.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cpmpy/solvers/gcs.py b/cpmpy/solvers/gcs.py index 5b06b6b3d..ef12db0f8 100644 --- a/cpmpy/solvers/gcs.py +++ b/cpmpy/solvers/gcs.py @@ -101,7 +101,7 @@ def has_objective(self): return self.objective_var != None def solve(self, time_limit=None, prove=False, proof_name=None, proof_location=".", - verify=False, verify_time_limit=None, veripb_args = [], display_verifier_output=False, **kwargs): + verify=True, verify_time_limit=30, veripb_args = [], display_verifier_output=True, **kwargs): """ Run the Glasgow Constraint Solver, get just one (optimal) solution. Arguments: @@ -128,6 +128,8 @@ def solve(self, time_limit=None, prove=False, proof_name=None, proof_location=". self.proof_name = path.splitext(path.basename(sys.modules['__main__'].__file__))[0] else: self.proof_name = "gcs_proof" + else: + self.proof_name = proof_name self.proof_location = proof_location # call the solver, with parameters @@ -178,7 +180,7 @@ def solve(self, time_limit=None, prove=False, proof_name=None, proof_location=". return has_sol def solveAll(self, time_limit=None, display=None, solution_limit=None, call_from_model=False, - prove=False, proof_name=None, proof_location=".", verify=False, verify_time_limit=None, veripb_args = [], display_verifier_output=False, **kwargs): + prove=False, proof_name=None, proof_location=".", verify=True, verify_time_limit=30, veripb_args = [], display_verifier_output=True, **kwargs): """ Run the Glasgow Constraint Solver, and get a number of solutions, with optional solution callbacks.