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

Add static_ prefix to all static features

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-08-04 13:35:16 -05:00
parent 10eed9b306
commit ca925119b3
10 changed files with 82 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
miplearn/components/dynamic_common.py
View File

@@ -52,7 +52,7 @@ class DynamicConstraintsComponent(Component):
cids: Dict[str, List[str]] = {}
constr_categories_dict = instance.get_constraint_categories()
constr_features_dict = instance.get_constraint_features()
instance_features = sample.get_vector("instance_features")
instance_features = sample.get_vector("static_instance_features")
assert instance_features is not None
for cid in self.known_cids:
# Initialize categories

2
miplearn/components/objective.py
View File

@@ -79,7 +79,7 @@ class ObjectiveValueComponent(Component):
) -> 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("instance_features")
lp_instance_features = sample.get_vector("static_instance_features")
assert lp_instance_features is not None
# Features

14
miplearn/components/primal.py
View File

@@ -95,8 +95,8 @@ class PrimalSolutionComponent(Component):
)
def sample_predict(self, sample: Sample) -> Solution:
var_names = sample.get_vector("var_names")
var_categories = sample.get_vector("var_categories")
var_names = sample.get_vector("static_var_names")
var_categories = sample.get_vector("static_var_categories")
assert var_names is not None
assert var_categories is not None
@@ -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("instance_features")
instance_features = sample.get_vector("static_instance_features")
mip_var_values = sample.get_vector("mip_var_values")
var_features = sample.get_vector_list("lp_var_features")
var_names = sample.get_vector("var_names")
var_categories = sample.get_vector("var_categories")
var_names = sample.get_vector("static_var_names")
var_categories = sample.get_vector("static_var_categories")
if var_features is None:
var_features = sample.get_vector_list("var_features")
var_features = sample.get_vector_list("static_var_features")
assert instance_features is not None
assert var_features is not None
assert var_names is not None
@@ -188,7 +188,7 @@ class PrimalSolutionComponent(Component):
sample: Sample,
) -> Dict[str, Dict[str, float]]:
mip_var_values = sample.get_vector("mip_var_values")
var_names = sample.get_vector("var_names")
var_names = sample.get_vector("static_var_names")
assert mip_var_values is not None
assert var_names is not None

12
miplearn/components/static_lazy.py
View File

@@ -75,7 +75,7 @@ class StaticLazyConstraintsComponent(Component):
sample: Sample,
) -> None:
assert solver.internal_solver is not None
static_lazy_count = sample.get_scalar("static_lazy_count")
static_lazy_count = sample.get_scalar("static_constr_lazy_count")
assert static_lazy_count is not None
logger.info("Predicting violated (static) lazy constraints...")
@@ -204,14 +204,14 @@ class StaticLazyConstraintsComponent(Component):
x: Dict[str, List[List[float]]] = {}
y: Dict[str, List[List[float]]] = {}
cids: Dict[str, List[str]] = {}
instance_features = sample.get_vector("instance_features")
instance_features = sample.get_vector("static_instance_features")
constr_features = sample.get_vector_list("lp_constr_features")
constr_names = sample.get_vector("constr_names")
constr_categories = sample.get_vector("constr_categories")
constr_lazy = sample.get_vector("constr_lazy")
constr_names = sample.get_vector("static_constr_names")
constr_categories = sample.get_vector("static_constr_categories")
constr_lazy = sample.get_vector("static_constr_lazy")
lazy_enforced = sample.get_set("lazy_enforced")
if constr_features is None:
constr_features = sample.get_vector_list("constr_features")
constr_features = sample.get_vector_list("static_constr_features")
assert instance_features is not None
assert constr_features is not None