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

Remove sample.after_lp

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-07-01 12:25:50 -05:00
parent 4093ac62fd
commit b4a267a524
8 changed files with 95 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
miplearn/components/primal.py
View File

@@ -155,7 +155,15 @@ class PrimalSolutionComponent(Component):
assert sample.after_load.variables is not None
assert sample.after_load.variables.names is not None
assert sample.after_load.variables.categories is not None
instance_features = sample.get("instance_features_user")
mip_var_values = sample.get("mip_var_values")
var_features = sample.get("lp_var_features")
if var_features is None:
var_features = sample.get("var_features")
assert instance_features is not None
assert var_features is not None
for (i, var_name) in enumerate(sample.after_load.variables.names):
# Initialize categories
@@ -167,11 +175,8 @@ class PrimalSolutionComponent(Component):
y[category] = []
# Features
features = list(sample.after_load.instance.to_list())
features.extend(sample.after_load.variables.to_list(i))
if sample.after_lp is not None:
assert sample.after_lp.variables is not None
features.extend(sample.after_lp.variables.to_list(i))
features = list(instance_features)
features.extend(var_features[i])
x[category].append(features)
# Labels