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

Make SolutionExtractor use instance.solution and instance.lp_solution

Browse Source
This commit is contained in:
Alinson S. Xavier
2020-02-22 22:19:30 -06:00
parent 0048fcce13
commit 212e38d004
5 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
miplearn/extractors.py
View File

@@ -69,8 +69,13 @@ class UserFeaturesExtractor(Extractor):
class SolutionExtractor(Extractor):
def extract(self, instances, models):
def __init__(self, relaxation=False):
self.relaxation = relaxation
def extract(self, instances, models=None):
result = {}
if models is None:
models = [instance.to_model() for instance in instances]
for (index, instance) in enumerate(instances):
model = models[index]
var_split = self.split_variables(instance, model)
@@ -78,7 +83,10 @@ class SolutionExtractor(Extractor):
if category not in result.keys():
result[category] = []
for (var, index) in var_index_pairs:
v = var[index].value
if self.relaxation:
v = instance.lp_solution[str(var)][index]
else:
v = instance.solution[str(var)][index]
if v is None:
result[category] += [[0, 0]]
else: