From d8b9bf2b391fbc6fdd95b918c81c0d362eafe3be Mon Sep 17 00:00:00 2001 From: "Jip J. Dekker" Date: Mon, 22 Mar 2021 10:58:24 +1100 Subject: [PATCH] Setup new MiniZinc Challenge benchmark with CSE fix --- mznc_benchmark.py | 20 ++++++++++++++++---- software/minizinc | 2 +- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/mznc_benchmark.py b/mznc_benchmark.py index 7190828..3b52d48 100644 --- a/mznc_benchmark.py +++ b/mznc_benchmark.py @@ -14,13 +14,19 @@ schedule( solver=minizinc.Solver.lookup("cbc"), other_flags={"no-half-reifications": True, "no-chain-compression": True}, ), - Configuration("CBC HR", solver=minizinc.Solver.lookup("cbc")), + Configuration( + "CBC HR", + solver=minizinc.Solver.lookup("cbc"), + ), Configuration( "CPLEX", solver=minizinc.Solver.lookup("cplex"), other_flags={"no-half-reifications": True, "no-chain-compression": True}, ), - Configuration("CPLEX HR", solver=minizinc.Solver.lookup("cplex")), + Configuration( + "CPLEX HR", + solver=minizinc.Solver.lookup("cplex"), + ), Configuration( "Gecode", solver=minizinc.Solver.lookup("gecode"), @@ -32,13 +38,19 @@ schedule( solver=minizinc.Solver.lookup("gurobi"), other_flags={"no-half-reifications": True, "no-chain-compression": True}, ), - Configuration("Gurobi HR", solver=minizinc.Solver.lookup("gurobi")), + Configuration( + "Gurobi HR", + solver=minizinc.Solver.lookup("gurobi"), + ), Configuration( "SCIP", solver=minizinc.Solver.lookup("scip"), other_flags={"no-half-reifications": True, "no-chain-compression": True}, ), - Configuration("SCIP HR", solver=minizinc.Solver.lookup("scip")), + Configuration( + "SCIP HR", + solver=minizinc.Solver.lookup("scip"), + ), ], memory=16384, nodelist=["critical001"], diff --git a/software/minizinc b/software/minizinc index 2f44e70..3f1e50f 160000 --- a/software/minizinc +++ b/software/minizinc @@ -1 +1 @@ -Subproject commit 2f44e70ea601b952bb735f87a8206c1798d0b67b +Subproject commit 3f1e50f9144a0c4cf2b090d17aba1b92a4657b18