Implement more compact get_variables

This commit is contained in:
2021-04-15 06:19:54 -05:00
parent e6eca2ee7f
commit 08f0bedbe0
5 changed files with 306 additions and 170 deletions

View File

@@ -9,7 +9,7 @@ from typing import Any, Dict, List, Optional
from overrides import EnforceOverrides
from miplearn.features import Constraint, Variable
from miplearn.features import Constraint, Variable, VariableFeatures
from miplearn.instance.base import Instance
from miplearn.types import (
IterationCallback,
@@ -237,7 +237,15 @@ class InternalSolver(ABC, EnforceOverrides):
return False
@abstractmethod
def get_variables(self, with_static: bool = True) -> Dict[str, Variable]:
def get_variables_old(self, with_static: bool = True) -> Dict[str, Variable]:
pass
@abstractmethod
def get_variables(
self,
with_static: bool = True,
with_sa: bool = True,
) -> VariableFeatures:
pass
@abstractmethod