openstack
/
deb-python-pulp
Code Issues Proposed changes

Merge pull request #117 from oprypin/one-dummy 

Don't write duplicate dummy constraints
This commit is contained in:
Stuart Mitchell 2017-02-06 22:54:44 +13:00 committed by GitHub
parent d4984e5a34 5ddb97f4fd
commit adfb1ae6e2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pulp/pulp.py
View File

@ -1505,6 +1505,7 @@ class LpProblem(object):
f.write("Subject To\n")
ks = list(self.constraints.keys())
ks.sort()
dummyWritten = False
for k in ks:
constraint = self.constraints[k]
if not list(constraint.keys()):
@ -1512,7 +1513,9 @@ class LpProblem(object):
dummyVar = self.get_dummyVar()
constraint += dummyVar
#set this dummyvar to zero so infeasible problems are not made feasible
f.write((dummyVar == 0.0).asCplexLpConstraint("_dummy"))
if not dummyWritten:
f.write((dummyVar == 0.0).asCplexLpConstraint("_dummy"))
dummyWritten = True
f.write(constraint.asCplexLpConstraint(k))
vs = self.variables()
# check if any names are longer than 100 characters