ANL-CEEESA/MIPLearn
1
0
Fork 0
mirror of https://github.com/ANL-CEEESA/MIPLearn.git synced 2025-12-09 19:08:51 -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

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