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

Add _gurobipy suffix to all build_model functions

Browse Source
This commit is contained in:
Alinson S. Xavier
2024-02-06 16:08:24 -06:00
parent fb3f219ea8
commit b55554d410
28 changed files with 99 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
miplearn/solvers/gurobi.py
View File

@@ -184,7 +184,7 @@ class GurobiModel(AbstractModel):
assert var_names.shape == var_values.shape
n_fixed = 0
for (var_idx, var_name) in enumerate(var_names):
for var_idx, var_name in enumerate(var_names):
var_val = var_values[var_idx]
if np.isfinite(var_val):
var = self.inner.getVarByName(var_name.decode())
@@ -229,7 +229,7 @@ class GurobiModel(AbstractModel):
self.inner.numStart = n_starts
for start_idx in range(n_starts):
self.inner.params.startNumber = start_idx
for (var_idx, var_name) in enumerate(var_names):
for var_idx, var_name in enumerate(var_names):
var_val = var_values[start_idx, var_idx]
if np.isfinite(var_val):
var = self.inner.getVarByName(var_name.decode())
@@ -243,14 +243,14 @@ class GurobiModel(AbstractModel):
def _extract_after_load_vars(self, h5: H5File) -> None:
gp_vars = self.inner.getVars()
for (h5_field, gp_field) in {
for h5_field, gp_field in {
"static_var_names": "varName",
"static_var_types": "vtype",
}.items():
h5.put_array(
h5_field, np.array(self.inner.getAttr(gp_field, gp_vars), dtype="S")
)
for (h5_field, gp_field) in {
for h5_field, gp_field in {
"static_var_upper_bounds": "ub",
"static_var_lower_bounds": "lb",
"static_var_obj_coeffs": "obj",
@@ -267,7 +267,7 @@ class GurobiModel(AbstractModel):
names = np.array(self.inner.getAttr("constrName", gp_constrs), dtype="S")
nrows, ncols = len(gp_constrs), len(gp_vars)
tmp = lil_matrix((nrows, ncols), dtype=float)
for (i, gp_constr) in enumerate(gp_constrs):
for i, gp_constr in enumerate(gp_constrs):
expr = self.inner.getRow(gp_constr)
for j in range(expr.size()):
tmp[i, expr.getVar(j).index] = expr.getCoeff(j)
@@ -302,7 +302,7 @@ class GurobiModel(AbstractModel):
dtype="S",
),
)
for (h5_field, gp_field) in {
for h5_field, gp_field in {
"lp_var_reduced_costs": "rc",
"lp_var_sa_obj_up": "saobjUp",
"lp_var_sa_obj_down": "saobjLow",
@@ -336,7 +336,7 @@ class GurobiModel(AbstractModel):
dtype="S",
),
)
for (h5_field, gp_field) in {
for h5_field, gp_field in {
"lp_constr_dual_values": "pi",
"lp_constr_sa_rhs_up": "saRhsUp",
"lp_constr_sa_rhs_down": "saRhsLow",

10
miplearn/solvers/pyomo.py
View File

@@ -141,7 +141,7 @@ class PyomoModel(AbstractModel):
stats: Optional[Dict] = None,
) -> None:
variables = self._var_names_to_vars(var_names)
for (var, val) in zip(variables, var_values):
for var, val in zip(variables, var_values):
if np.isfinite(val):
var.fix(val)
self.solver.update_var(var)
@@ -195,7 +195,7 @@ class PyomoModel(AbstractModel):
assert var_names.shape[0] == n_vars
assert n_starts == 1, "Pyomo does not support multiple warm starts"
variables = self._var_names_to_vars(var_names)
for (var, val) in zip(variables, var_values[0, :]):
for var, val in zip(variables, var_values[0, :]):
if np.isfinite(val):
var.value = val
self._is_warm_start_available = True
@@ -215,7 +215,7 @@ class PyomoModel(AbstractModel):
obj_count += 1
assert obj_count == 1, f"One objective function expected; found {obj_count}"
for (i, var) in enumerate(self.inner.component_objects(pyomo.core.Var)):
for i, var in enumerate(self.inner.component_objects(pyomo.core.Var)):
for idx in var:
v = var[idx]
@@ -316,9 +316,7 @@ class PyomoModel(AbstractModel):
raise Exception(f"Unknown expression type: {expr.__class__.__name__}")
curr_row = 0
for (i, constr) in enumerate(
self.inner.component_objects(pyomo.core.Constraint)
):
for i, constr in enumerate(self.inner.component_objects(pyomo.core.Constraint)):
if len(constr) > 1:
for idx in constr:
names.append(constr[idx].name)