mirror of
https://github.com/ANL-CEEESA/MIPLearn.git
synced 2025-12-06 01:18:52 -06:00
mypy: Disable implicit optionals
This commit is contained in:
@@ -58,7 +58,7 @@ class AdaptiveClassifier(Classifier):
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
candidates: Dict[str, CandidateClassifierSpecs] = None,
|
||||
candidates: Optional[Dict[str, CandidateClassifierSpecs]] = None,
|
||||
) -> None:
|
||||
super().__init__()
|
||||
if candidates is None:
|
||||
|
||||
@@ -149,9 +149,9 @@ class GurobiSolver(InternalSolver):
|
||||
def solve(
|
||||
self,
|
||||
tee: bool = False,
|
||||
iteration_cb: IterationCallback = None,
|
||||
lazy_cb: LazyCallback = None,
|
||||
user_cut_cb: UserCutCallback = None,
|
||||
iteration_cb: Optional[IterationCallback] = None,
|
||||
lazy_cb: Optional[LazyCallback] = None,
|
||||
user_cut_cb: Optional[UserCutCallback] = None,
|
||||
) -> MIPSolveStats:
|
||||
self._raise_if_callback()
|
||||
assert self.model is not None
|
||||
|
||||
@@ -52,9 +52,9 @@ class InternalSolver(ABC, EnforceOverrides):
|
||||
def solve(
|
||||
self,
|
||||
tee: bool = False,
|
||||
iteration_cb: IterationCallback = None,
|
||||
lazy_cb: LazyCallback = None,
|
||||
user_cut_cb: UserCutCallback = None,
|
||||
iteration_cb: Optional[IterationCallback] = None,
|
||||
lazy_cb: Optional[LazyCallback] = None,
|
||||
user_cut_cb: Optional[UserCutCallback] = None,
|
||||
) -> MIPSolveStats:
|
||||
"""
|
||||
Solves the currently loaded instance. After this method finishes,
|
||||
|
||||
@@ -93,9 +93,9 @@ class LearningSolver:
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
components: List[Component] = None,
|
||||
components: Optional[List[Component]] = None,
|
||||
mode: str = "exact",
|
||||
solver: InternalSolver = None,
|
||||
solver: Optional[InternalSolver] = None,
|
||||
use_lazy_cb: bool = False,
|
||||
solve_lp: bool = True,
|
||||
simulate_perfect: bool = False,
|
||||
|
||||
@@ -88,9 +88,9 @@ class BasePyomoSolver(InternalSolver):
|
||||
def solve(
|
||||
self,
|
||||
tee: bool = False,
|
||||
iteration_cb: IterationCallback = None,
|
||||
lazy_cb: LazyCallback = None,
|
||||
user_cut_cb: UserCutCallback = None,
|
||||
iteration_cb: Optional[IterationCallback] = None,
|
||||
lazy_cb: Optional[LazyCallback] = None,
|
||||
user_cut_cb: Optional[UserCutCallback] = None,
|
||||
) -> MIPSolveStats:
|
||||
if lazy_cb is not None:
|
||||
raise Exception("lazy callback not currently supported")
|
||||
|
||||
@@ -28,7 +28,7 @@ class GurobiPyomoSolver(BasePyomoSolver):
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
params: SolverParams = None,
|
||||
params: Optional[SolverParams] = None,
|
||||
) -> None:
|
||||
if params is None:
|
||||
params = {}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
# Released under the modified BSD license. See COPYING.md for more details.
|
||||
|
||||
import logging
|
||||
from typing import Optional
|
||||
|
||||
from overrides import overrides
|
||||
from pyomo import environ as pe
|
||||
@@ -25,7 +26,10 @@ class XpressPyomoSolver(BasePyomoSolver):
|
||||
{"Threads": 4} to set the number of threads.
|
||||
"""
|
||||
|
||||
def __init__(self, params: SolverParams = None) -> None:
|
||||
def __init__(
|
||||
self,
|
||||
params: Optional[SolverParams] = None,
|
||||
) -> None:
|
||||
if params is None:
|
||||
params = {}
|
||||
params["randomseed"] = randint(low=0, high=1000).rvs()
|
||||
|
||||
Reference in New Issue
Block a user