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

Rename features.variables to variables_old; update FeatureExtractor

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-04-15 06:54:27 -05:00
parent 08f0bedbe0
commit fec0113722
9 changed files with 150 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -210,13 +210,13 @@ class BasePyomoSolver(InternalSolver):
for idx in var:
v = var[idx]
if with_static:
# Variable name
if idx is None:
names.append(str(var))
else:
names.append(f"{var}[{idx}]")
# Variable name
if idx is None:
names.append(str(var))
else:
names.append(f"{var}[{idx}]")
if with_static:
# Variable type
if v.domain == pyomo.core.Binary:
types.append("B")
@@ -250,7 +250,6 @@ class BasePyomoSolver(InternalSolver):
if self._has_lp_solution or self._has_mip_solution:
values.append(v.value)
names_t: Optional[Tuple[str, ...]] = None
types_t: Optional[Tuple[str, ...]] = None
upper_bounds_t: Optional[Tuple[float, ...]] = None
lower_bounds_t: Optional[Tuple[float, ...]] = None
@@ -259,7 +258,6 @@ class BasePyomoSolver(InternalSolver):
values_t: Optional[Tuple[float, ...]] = None
if with_static:
names_t = tuple(names)
types_t = tuple(types)
upper_bounds_t = tuple(upper_bounds)
lower_bounds_t = tuple(lower_bounds)
@@ -272,7 +270,7 @@ class BasePyomoSolver(InternalSolver):
values_t = tuple(values)
return VariableFeatures(
names=names_t,
names=tuple(names),
types=types_t,
upper_bounds=upper_bounds_t,
lower_bounds=lower_bounds_t,