HiGHS API interface improvements including time_limit (#641)

* typo fix * speedup processing var values; handling of time_limit arg * add highs to time limit tests * remove unused arguments * support any parameters * black
coin-or · Apr 1, 2023 · a7684ac · a7684ac
1 parent 1366ad8
commit a7684ac
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/pulp/apis/highs_api.py b/pulp/apis/highs_api.py
@@ -254,14 +254,11 @@ def __init__(
             mip=True,
             msg=True,
             timeLimit=None,
-            epgap=None,
-            gapRel=None,
             warmStart=False,
             logPath=None,
-            *args,
             **solverParams,
         ):
-            super().__init__(mip, msg, timeLimit, gapRel=gapRel, *args, **solverParams)
+            super().__init__(mip, msg, timeLimit=timeLimit, **solverParams)
 
         def available(self):
             return True
@@ -275,6 +272,13 @@ def buildSolverModel(self, lp):
             gapRel = self.optionsDict.get("gapRel", 0)
             lp.solverModel.setOptionValue("mip_rel_gap", gapRel)
 
+            if self.timeLimit is not None:
+                lp.solverModel.setOptionValue("time_limit", float(self.timeLimit))
+
+            # set remaining parameter values
+            for key, value in self.optionsDict.items():
+                lp.solverModel.setOptionValue(key, value)
+
             inf = highspy.kHighsInf
 
             obj_mult = -1 if lp.sense == constants.LpMaximize else 1
@@ -342,8 +346,9 @@ def findSolutionValues(self, lp):
                 HighsModelStatus.kUnknown: constants.LpStatusNotSolved,
             }
 
+            col_values = list(solution.col_value)
             for var in lp.variables():
-                var.varValue = solution.col_value[var.index]
+                var.varValue = col_values[var.index]
 
             return status_dict[status]
 
@@ -355,6 +360,7 @@ def actualSolve(self, lp):
 
             for var in lp.variables():
                 var.modified = False
+
             for constraint in lp.constraints.values():
                 constraint.modifier = False
 

diff --git a/pulp/tests/bin_packing_problem.py b/pulp/tests/bin_packing_problem.py
@@ -3,7 +3,7 @@
 from itertools import product
 
 
-def _bin_packin_instance(bins, seed=0):
+def _bin_packing_instance(bins, seed=0):
     packed_bins = [[] for _ in range(bins)]
     bin_size = bins * 100
     random.seed(seed)
@@ -22,7 +22,7 @@ def _bin_packin_instance(bins, seed=0):
 
 
 def create_bin_packing_problem(bins, seed=0):
-    items, packing, bin_size = _bin_packin_instance(bins=bins, seed=seed)
+    items, packing, bin_size = _bin_packing_instance(bins=bins, seed=seed)
 
     prob = LpProblem("bin_packing", LpMinimize)
 

diff --git a/pulp/tests/test_pulp.py b/pulp/tests/test_pulp.py
@@ -1212,7 +1212,12 @@ def test_measuring_solving_time(self):
 
             time_limit = 10
             solver_settings = dict(
-                PULP_CBC_CMD=30, COIN_CMD=30, SCIP_CMD=30, GUROBI_CMD=50, CPLEX_CMD=50
+                PULP_CBC_CMD=30,
+                COIN_CMD=30,
+                SCIP_CMD=30,
+                GUROBI_CMD=50,
+                CPLEX_CMD=50,
+                HiGHS=50,
             )
             bins = solver_settings.get(self.solver.name)
             if bins is None:
@@ -1224,9 +1229,7 @@ def test_measuring_solving_time(self):
             delta = 20
             reported_time = prob.solutionTime
             if self.solver.name in ["PULP_CBC_CMD", "COIN_CMD"]:
-                # CBC is less exact with the timeLimit
                 reported_time = prob.solutionCpuTime
-                delta = 5
 
             self.assertAlmostEqual(
                 reported_time,