Fix imports

leonlan · Sep 22, 2023 · 7a86f20 · 7a86f20 · leonlan · Sep 22, 2023
1 parent 93821cd
commit 7a86f20
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/benchmark.py b/benchmark.py
@@ -5,6 +5,7 @@
 
 import numpy as np
 import tomli
+from pyvrp import CostEvaluator
 from tqdm import tqdm
 from tqdm.contrib.concurrent import process_map
 
@@ -13,7 +14,6 @@
 from ddwp.read import read
 from ddwp.sampling import SAMPLING_METHODS
 from ddwp.static_solvers import default_solver
-from pyvrp import CostEvaluator
 
 
 def parse_args():

diff --git a/ddwp/static_solvers/default_solver.py b/ddwp/static_solvers/default_solver.py
@@ -1,7 +1,8 @@
-from ddwp.VrpInstance import VrpInstance
 from pyvrp import Model, Result
 from pyvrp.stop import MaxRuntime
 
+from ddwp.VrpInstance import VrpInstance
+
 from .instance2data import instance2data
 
 

diff --git a/ddwp/static_solvers/instance2data.py b/ddwp/static_solvers/instance2data.py
@@ -1,9 +1,9 @@
 from collections import Counter
 
 import numpy as np
+from pyvrp import Client, ProblemData, VehicleType
 
 from ddwp.VrpInstance import VrpInstance
-from pyvrp import Client, ProblemData, VehicleType
 
 
 def instance2data(instance: VrpInstance) -> ProblemData:

diff --git a/ddwp/static_solvers/scenario_solver.py b/ddwp/static_solvers/scenario_solver.py
@@ -1,6 +1,5 @@
 import warnings
 
-from ddwp.VrpInstance import VrpInstance
 from pyvrp import (
     GeneticAlgorithm,
     PenaltyManager,
@@ -25,6 +24,8 @@
 )
 from pyvrp.stop import MaxRuntime
 
+from ddwp.VrpInstance import VrpInstance
+
 from .instance2data import instance2data
 
 warnings.filterwarnings("ignore", category=EmptySolutionWarning)

diff --git a/pyproject.toml b/pyproject.toml
@@ -61,7 +61,6 @@ ignore = [
     "C901",  # too complex
     "E741",  # ambiguous variable name
 ]
-extend-exclude = ["tune"]
 
 
 [tool.ruff.per-file-ignores]