ANL-CEEESA/MIPLearn
1
0
Fork 0
mirror of https://github.com/ANL-CEEESA/MIPLearn.git synced 2025-12-06 09:28:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use np.ndarray in Constraints.{basis_status,senses}

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-08-09 06:04:14 -05:00
parent 9ddda7e1e2
commit f809dd7de4
7 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
miplearn/solvers/pyomo/base.py
View File

@@ -89,12 +89,14 @@ class BasePyomoSolver(InternalSolver):
for (varname, coeff) in cf.lhs[i]:
var = self._varname_to_var[varname]
lhs += var * coeff
if cf.senses[i] == "=":
if cf.senses[i] == b"=":
expr = lhs == cf.rhs[i]
elif cf.senses[i] == "<":
elif cf.senses[i] == b"<":
expr = lhs <= cf.rhs[i]
else:
elif cf.senses[i] == b">":
expr = lhs >= cf.rhs[i]
else:
raise Exception(f"Unknown sense: {cf.senses[i]}")
cl = pe.Constraint(expr=expr, name=name)
self.model.add_component(name.decode(), cl)
self._pyomo_solver.add_constraint(cl)
@@ -235,7 +237,7 @@ class BasePyomoSolver(InternalSolver):
return Constraints(
names=_none_if_empty(np.array(names, dtype="S")),
rhs=_none_if_empty(np.array(rhs, dtype=float)),
senses=_none_if_empty(senses),
senses=_none_if_empty(np.array(senses, dtype="S")),
lhs=_none_if_empty(lhs),
slacks=_none_if_empty(np.array(slacks, dtype=float)),
dual_values=_none_if_empty(np.array(dual_values, dtype=float)),