Request constraint features/categories in bulk

This commit is contained in:
2021-06-29 09:54:35 -05:00
parent 8118ab4110
commit a5092cc2b9
6 changed files with 51 additions and 38 deletions

View File

@@ -4,7 +4,7 @@
import logging
from abc import ABC, abstractmethod
from typing import Any, List, Optional, Hashable, TYPE_CHECKING, Dict
from typing import Any, List, Hashable, TYPE_CHECKING, Dict
from miplearn.features import Sample
@@ -96,11 +96,11 @@ class Instance(ABC):
"""
return {}
def get_constraint_features(self, cid: str) -> List[float]:
return [0.0]
def get_constraint_features(self) -> Dict[str, List[float]]:
return {}
def get_constraint_category(self, cid: str) -> Optional[Hashable]:
return cid
def get_constraint_categories(self) -> Dict[str, Hashable]:
return {}
def has_static_lazy_constraints(self) -> bool:
return False

View File

@@ -56,14 +56,14 @@ class PickleGzInstance(Instance):
return self.instance.get_variable_categories()
@overrides
def get_constraint_features(self, cid: str) -> Optional[List[float]]:
def get_constraint_features(self) -> Dict[str, List[float]]:
assert self.instance is not None
return self.instance.get_constraint_features(cid)
return self.instance.get_constraint_features()
@overrides
def get_constraint_category(self, cid: str) -> Optional[Hashable]:
def get_constraint_categories(self) -> Dict[str, Hashable]:
assert self.instance is not None
return self.instance.get_constraint_category(cid)
return self.instance.get_constraint_categories()
@overrides
def has_static_lazy_constraints(self) -> bool: