mirror of
https://github.com/ANL-CEEESA/MIPLearn.git
synced 2025-12-06 01:18:52 -06:00
Minor fixes
This commit is contained in:
@@ -2,8 +2,6 @@
|
||||
# Copyright (C) 2020, UChicago Argonne, LLC. All rights reserved.
|
||||
# Released under the modified BSD license. See COPYING.md for more details.
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from abc import ABC, abstractmethod
|
||||
from typing import Any, List, Union, TYPE_CHECKING
|
||||
|
||||
@@ -25,7 +23,7 @@ class Component(ABC):
|
||||
|
||||
def before_solve(
|
||||
self,
|
||||
solver: LearningSolver,
|
||||
solver: "LearningSolver",
|
||||
instance: Instance,
|
||||
model: Any,
|
||||
) -> None:
|
||||
@@ -46,7 +44,7 @@ class Component(ABC):
|
||||
@abstractmethod
|
||||
def after_solve(
|
||||
self,
|
||||
solver: LearningSolver,
|
||||
solver: "LearningSolver",
|
||||
instance: Instance,
|
||||
model: Any,
|
||||
stats: MIPSolveStats,
|
||||
@@ -57,7 +55,7 @@ class Component(ABC):
|
||||
|
||||
Parameters
|
||||
----------
|
||||
solver: LearningSolver
|
||||
solver: "LearningSolver"
|
||||
The solver calling this method.
|
||||
instance: Instance
|
||||
The instance being solved.
|
||||
@@ -86,7 +84,7 @@ class Component(ABC):
|
||||
|
||||
def iteration_cb(
|
||||
self,
|
||||
solver: LearningSolver,
|
||||
solver: "LearningSolver",
|
||||
instance: Instance,
|
||||
model: Any,
|
||||
) -> bool:
|
||||
@@ -103,7 +101,7 @@ class Component(ABC):
|
||||
|
||||
Parameters
|
||||
----------
|
||||
solver: LearningSolver
|
||||
solver: "LearningSolver"
|
||||
The solver calling this method.
|
||||
instance: Instance
|
||||
The instance being solved.
|
||||
@@ -114,7 +112,7 @@ class Component(ABC):
|
||||
|
||||
def lazy_cb(
|
||||
self,
|
||||
solver: LearningSolver,
|
||||
solver: "LearningSolver",
|
||||
instance: Instance,
|
||||
model: Any,
|
||||
) -> None:
|
||||
|
||||
@@ -10,7 +10,6 @@ from typing import Any, List
|
||||
import numpy as np
|
||||
|
||||
from miplearn.types import TrainingSample
|
||||
import pyomo.environ as pe
|
||||
|
||||
|
||||
class Instance(ABC):
|
||||
|
||||
@@ -19,8 +19,6 @@ def test_knapsack_generator():
|
||||
)
|
||||
instances = gen.generate(100)
|
||||
w_sum = sum(instance.weights for instance in instances) / len(instances)
|
||||
p_sum = sum(instance.prices for instance in instances) / len(instances)
|
||||
b_sum = sum(instance.capacities for instance in instances) / len(instances)
|
||||
assert round(np.mean(w_sum), -1) == 500.0
|
||||
# assert round(np.mean(p_sum), -1) == 1200. # flaky
|
||||
assert round(np.mean(b_sum), -3) == 25000.0
|
||||
|
||||
@@ -7,7 +7,6 @@ import logging
|
||||
import os
|
||||
import pickle
|
||||
import tempfile
|
||||
from copy import deepcopy
|
||||
from typing import Optional, List, Any, IO, cast, BinaryIO, Union, Callable, Dict
|
||||
|
||||
from p_tqdm import p_map
|
||||
|
||||
@@ -7,7 +7,6 @@ from io import StringIO
|
||||
from warnings import warn
|
||||
|
||||
import pyomo.environ as pe
|
||||
from pytest import raises
|
||||
|
||||
from miplearn.solvers import RedirectOutput
|
||||
from miplearn.solvers.gurobi import GurobiSolver
|
||||
|
||||
Reference in New Issue
Block a user