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

Make xy_sample receive features, not instances

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-03-31 09:57:57 -05:00
parent 8fc9979b37
commit fe7bad885c
12 changed files with 158 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
miplearn/components/primal.py
View File

@@ -211,15 +211,15 @@ class PrimalSolutionComponent(Component):
@staticmethod
def xy_sample(
instance: Any,
features: Features,
sample: TrainingSample,
) -> Tuple[Dict, Dict]:
) -> Optional[Tuple[Dict, Dict]]:
if "Solution" not in sample:
return {}, {}
return None
assert sample["Solution"] is not None
return cast(
Tuple[Dict, Dict],
PrimalSolutionComponent._extract(instance.features, sample),
PrimalSolutionComponent._extract(features, sample),
)
@staticmethod
@@ -227,7 +227,10 @@ class PrimalSolutionComponent(Component):
features: Features,
sample: TrainingSample,
) -> Dict:
return cast(Dict, PrimalSolutionComponent._extract(features, sample))
return cast(
Dict,
PrimalSolutionComponent._extract(features, sample),
)
@staticmethod
def _extract(