Skip to content

Commit

Permalink
fixes #479
Browse files Browse the repository at this point in the history
  • Loading branch information
pchtsp committed Aug 31, 2021
1 parent 6a24ed5 commit c3be1f0
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
5 changes: 5 additions & 0 deletions HISTORY
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
# Copyright S.A.Mitchell (s.mitchell@auckland.ac.nz), 2007-
# Copyright F.Peschiera (pchtsp@gmail.com), 2019-
# See the LICENSE file for copyright information.
2.6.0 2021-
dropped packaged choco
fixed bugs
added HiGHS solver
added pysmps dependency for mps parsing
2.5.0 2021-08-11
measuring wall time and cpu time
unittests of timeLimit
Expand Down
2 changes: 2 additions & 0 deletions pulp/apis/coin_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,8 @@ def solve_CBC(self, lp, use_mps=True):
args.extend(cmds[1:].split())
cbc = subprocess.Popen(args, stdout=pipe, stderr=pipe, stdin=devnull)
if cbc.wait() != 0:
if pipe:
pipe.close()
raise PulpSolverError(
"Pulp: Error while trying to execute, use msg=True for more details"
+ self.path
Expand Down
2 changes: 1 addition & 1 deletion pulp/pulp.py
Original file line number Diff line number Diff line change
Expand Up @@ -1998,7 +1998,7 @@ def assignStatus(self, status, sol_status=None):
class FixedElasticSubProblem(LpProblem):
"""
Contains the subproblem generated by converting a fixed constraint
:math:`\sum_{i}a_i x_i = b` into an elastic constraint.
:math:`\\sum_{i}a_i x_i = b` into an elastic constraint.
:param constraint: The LpConstraint that the elastic constraint is based on
:param penalty: penalty applied for violation (+ve or -ve) of the constraints
Expand Down

0 comments on commit c3be1f0

Please sign in to comment.