openstack/deb-python-pulp
Code Issues Proposed changes

Fixing issue with file names that have spaces, and issue with SCIP not writing 0-valued variables to .sol file.

Browse Source
This commit is contained in:
Ryan J. O'Neil
2015-12-29 08:08:58 -05:00
parent ccf7c9c95c
commit 07a2ea11af
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/pulp/solvers.py
View File

@@ -2545,7 +2545,7 @@ class SCIP_CMD(LpSolver_CMD):
'solution improvement limit reached': LpStatusNotSolved, 'solution improvement limit reached': LpStatusNotSolved,
'restart limit reached': LpStatusNotSolved, 'restart limit reached': LpStatusNotSolved,
'optimal solution found': LpStatusOptimal, 'optimal solution found': LpStatusOptimal,
'infeasible': LpStatusInfeasible, 'infeasible': LpStatusInfeasible,
'unbounded': LpStatusUnbounded, 'unbounded': LpStatusUnbounded,
'infeasible or unbounded': LpStatusNotSolved, 'infeasible or unbounded': LpStatusNotSolved,
} }
@@ -2568,13 +2568,13 @@ class SCIP_CMD(LpSolver_CMD):
tmpLp = os.path.join(self.tmpDir, "%d-pulp.lp" % pid) tmpLp = os.path.join(self.tmpDir, "%d-pulp.lp" % pid)
tmpSol = os.path.join(self.tmpDir, "%d-pulp.sol" % pid) tmpSol = os.path.join(self.tmpDir, "%d-pulp.sol" % pid)
else: else:
tmpLp = lp.name+"-pulp.lp" tmpLp = lp.name + "-pulp.lp"
tmpSol = lp.name+"-pulp.sol" tmpSol = lp.name + "-pulp.sol"
lp.writeLP(tmpLp) lp.writeLP(tmpLp)
proc = [ proc = [
'scip', '-c', 'read %s' % tmpLp, '-c', 'optimize', 'scip', '-c', 'read "%s"' % tmpLp, '-c', 'optimize',
'-c', 'write solution %s' % tmpSol, '-c', 'quit' '-c', 'write solution "%s"' % tmpSol, '-c', 'quit'
] ]
proc.extend(self.options) proc.extend(self.options)
if not self.msg: if not self.msg:
@@ -2588,7 +2588,14 @@ class SCIP_CMD(LpSolver_CMD):
raise PulpSolverError("PuLP: Error while executing "+self.path) raise PulpSolverError("PuLP: Error while executing "+self.path)
lp.status, values = self.readsol(tmpSol) lp.status, values = self.readsol(tmpSol)
lp.assignVarsVals(values)
# Make sure to add back in any 0-valued variables SCIP leaves out.
finalVals = {}
for v in lp.variables():
finalVals[v.name] = values.get(v.name, 0.0)
lp.assignVarsVals(finalVals)
if not self.keepFiles: if not self.keepFiles:
for f in (tmpLp, tmpSol): for f in (tmpLp, tmpSol):
try: try:
@@ -2598,7 +2605,7 @@ class SCIP_CMD(LpSolver_CMD):
return lp.status return lp.status
def readsol(self,filename): def readsol(self, filename):
"""Read a SCIP solution file""" """Read a SCIP solution file"""
with open(filename) as f: with open(filename) as f:
# First line must containt 'solution status: <something>' # First line must containt 'solution status: <something>'