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

Remove most usages of put_{vector,vector_list}; deprecate get_set

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-08-10 11:52:02 -05:00
parent 60b9a6775f
commit ed58242b5c
9 changed files with 40 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
miplearn/components/objective.py
View File

@@ -3,7 +3,7 @@
# Released under the modified BSD license. See COPYING.md for more details.
import logging
from typing import List, Dict, Any, TYPE_CHECKING, Tuple, Optional
from typing import List, Dict, Any, TYPE_CHECKING, Tuple, Optional, cast
import numpy as np
from overrides import overrides
@@ -77,10 +77,11 @@ class ObjectiveValueComponent(Component):
_: Optional[Instance],
sample: Sample,
) -> Tuple[Dict[str, List[List[float]]], Dict[str, List[List[float]]]]:
lp_instance_features = sample.get_vector("lp_instance_features")
if lp_instance_features is None:
lp_instance_features = sample.get_vector("static_instance_features")
assert lp_instance_features is not None
lp_instance_features_np = sample.get_array("lp_instance_features")
if lp_instance_features_np is None:
lp_instance_features_np = sample.get_array("static_instance_features")
assert lp_instance_features_np is not None
lp_instance_features = cast(List[float], lp_instance_features_np.tolist())
# Features
x: Dict[str, List[List[float]]] = {

6
miplearn/components/primal.py
View File

@@ -142,13 +142,13 @@ class PrimalSolutionComponent(Component):
) -> Tuple[Dict[Category, List[List[float]]], Dict[Category, List[List[float]]]]:
x: Dict = {}
y: Dict = {}
instance_features = sample.get_vector("static_instance_features")
instance_features = sample.get_array("static_instance_features")
mip_var_values = sample.get_array("mip_var_values")
var_features = sample.get_vector_list("lp_var_features")
var_features = sample.get_array("lp_var_features")
var_names = sample.get_array("static_var_names")
var_categories = sample.get_array("static_var_categories")
if var_features is None:
var_features = sample.get_vector_list("static_var_features")
var_features = sample.get_array("static_var_features")
assert instance_features is not None
assert var_features is not None
assert var_names is not None

10
miplearn/components/static_lazy.py
View File

@@ -207,14 +207,14 @@ class StaticLazyConstraintsComponent(Component):
x: Dict[ConstraintCategory, List[List[float]]] = {}
y: Dict[ConstraintCategory, List[List[float]]] = {}
cids: Dict[ConstraintCategory, List[ConstraintName]] = {}
instance_features = sample.get_vector("static_instance_features")
constr_features = sample.get_vector_list("lp_constr_features")
instance_features = sample.get_array("static_instance_features")
constr_features = sample.get_array("lp_constr_features")
constr_names = sample.get_array("static_constr_names")
constr_categories = sample.get_vector("static_constr_categories")
constr_categories = sample.get_array("static_constr_categories")
constr_lazy = sample.get_array("static_constr_lazy")
lazy_enforced = sample.get_set("mip_constr_lazy_enforced")
if constr_features is None:
constr_features = sample.get_vector_list("static_constr_features")
constr_features = sample.get_array("static_constr_features")
assert instance_features is not None
assert constr_features is not None
@@ -227,7 +227,7 @@ class StaticLazyConstraintsComponent(Component):
if not constr_lazy[cidx]:
continue
category = constr_categories[cidx]
if category is None:
if len(category) == 0:
continue
if category not in x:
x[category] = []