From 0d2debade242556601ffe5d509e501aeb98f0d74 Mon Sep 17 00:00:00 2001
From: "Jip J. Dekker" <jip@dekker.one>
Date: Fri, 5 Mar 2021 11:16:09 +1100
Subject: [PATCH] Add other MIP solvers for more results

---
 bench_env.sh      |  2 ++
 mznc_benchmark.py | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/bench_env.sh b/bench_env.sh
index d6cfb19..0c4308c 100644
--- a/bench_env.sh
+++ b/bench_env.sh
@@ -16,9 +16,11 @@ fi
 module load Bison
 module load CMake
 module load Cbc/2.10.5-foss-2020a
+module load CPLEX/12.10-GCCcore-9.3.0
 module load flex
 module load Gecode/431520083a51fc2f31c22fbc7b0378e7a1588e42-GCCcore-9.3.0
 module load Gurobi/9.1.0
+module load SCIPOptSuite/7.0.0-gompi-2020a
 
 cmake -S software/minizinc -B software/minizinc/build -DCMAKE_INSTALL_PREFIX=`pwd`/software/install/
 cmake --build software/minizinc/build --config Release --target install
diff --git a/mznc_benchmark.py b/mznc_benchmark.py
index 5f305d0..7190828 100644
--- a/mznc_benchmark.py
+++ b/mznc_benchmark.py
@@ -9,6 +9,18 @@ schedule(
     instances=Path("./mznc_instances.csv"),
     timeout=timedelta(minutes=20),
     configurations=[
+        Configuration(
+            "CBC",
+            solver=minizinc.Solver.lookup("cbc"),
+            other_flags={"no-half-reifications": True, "no-chain-compression": True},
+        ),
+        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(
             "Gecode",
             solver=minizinc.Solver.lookup("gecode"),
@@ -22,11 +34,11 @@ schedule(
         ),
         Configuration("Gurobi HR", solver=minizinc.Solver.lookup("gurobi")),
         Configuration(
-            "CBC",
-            solver=minizinc.Solver.lookup("cbc"),
+            "SCIP",
+            solver=minizinc.Solver.lookup("scip"),
             other_flags={"no-half-reifications": True, "no-chain-compression": True},
         ),
-        Configuration("CBC HR", solver=minizinc.Solver.lookup("cbc")),
+        Configuration("SCIP HR", solver=minizinc.Solver.lookup("scip")),
     ],
     memory=16384,
     nodelist=["critical001"],