dropped CPLEX_DLL (coin-or#469)

* dropped CPLEX_DLL

* fixed timeLimit test.

* increase delta for cbc

.gitignore

@@ -62,4 +62,11 @@ py-ve*
 .c9
 
 #pycharm
-.idea/
+.idea/
+venv/
+
+# OR files
+*.lp
+*.mps
+*.mst
+*.sol

HISTORY

@@ -2,6 +2,12 @@
 #       Copyright S.A.Mitchell ([email protected]), 2007-
 #       Copyright F.Peschiera ([email protected]), 2019-
 # See the LICENSE file for copyright information.
+2.5
+    measuring wall time and cpu time
+    unittests
+    black formatting
+    refactored tests per solver
+    dropped support for CPLEX_DLL
 2.4 2020-12-22
     added mps reading support
     updated docs

pulp/apis/__init__.py

@@ -14,7 +14,6 @@
     PYGLPK,
     CPLEX_CMD,
     CPLEX_PY,
-    CPLEX_DLL,
     GUROBI,
     GUROBI_CMD,
     MOSEK,

pulp/apis/coin_api.py

@@ -164,8 +164,7 @@ def solve_CBC(self, lp, use_mps=True):
             self.writesol(tmpMst, lp, vs, variablesNames, constraintsNames)
             cmds += "mips {} ".format(tmpMst)
         if self.timeLimit is not None:
-            num_threads = self.optionsDict.get("threads", 1)
-            if num_threads is not None and int(num_threads) > 1:
+            if self.optionsDict.get("threads", 1) > 1:
                 warnings.warn("Beware: CBC uses timeLimit as cpu_time, not wall_time")
             cmds += "sec %s " % self.timeLimit
         options = self.options + self.getOptions()
@@ -470,8 +469,8 @@ def __init__(
             self.fracGap = None
             if epgap is not None:
                 self.fracGap = float(epgap)
-            if self.timelimit is not None:
-                self.timelimit = float(self.timelimit)
+            if self.timeLimit is not None:
+                self.timeLimit = float(self.timeLimit)
             # Todo: these options are not yet implemented
             self.cuts = cuts
             self.presolve = presolve

pulp/apis/core.py

@@ -229,7 +229,7 @@ def __init__(
 
         # here we will store all other relevant information including:
         # gapRel, gapAbs, maxMemory, maxNodes, threads, logPath
-        self.optionsDict = kwargs
+        self.optionsDict = {k: v for k, v in kwargs.items() if v is not None}
 
     def available(self):
         """True if the solver is available"""