From 246bf8d0b0f75709d4cf2daa3d98bb5c1d8e2a4e Mon Sep 17 00:00:00 2001 From: Stefan Harmuth Date: Tue, 7 Dec 2021 08:48:36 +0100 Subject: [PATCH] import updates due to changed py-tools package --- day01.py | 2 +- day02.py | 5 ++--- day03.py | 4 ++-- day04.py | 2 +- day05.py | 2 +- day06.py | 2 +- day07.py | 4 +--- day08.py | 2 +- day09.py | 5 ++--- day10.py | 6 +++--- day11.py | 6 +++--- day12.py | 4 ++-- day13.py | 4 ++-- day14.py | 2 +- day15.py | 6 +++--- intcode.py | 2 +- main.py | 2 +- skel_day.py | 2 +- 18 files changed, 29 insertions(+), 33 deletions(-) diff --git a/day01.py b/day01.py index 275419a..9b79fc9 100644 --- a/day01.py +++ b/day01.py @@ -1,4 +1,4 @@ -from aoc import AOCDay +from tools.aoc import AOCDay class Day(AOCDay): diff --git a/day02.py b/day02.py index 82080f4..0834d9d 100644 --- a/day02.py +++ b/day02.py @@ -1,7 +1,6 @@ -from aoc import AOCDay -from typing import Any - from intcode import IntCode +from tools.aoc import AOCDay +from typing import Any class Day(AOCDay): diff --git a/day03.py b/day03.py index 19ef84a..ffd05b1 100644 --- a/day03.py +++ b/day03.py @@ -1,6 +1,6 @@ -from aoc import AOCDay -from coordinate import Coordinate, DistanceAlgorithm from math import inf +from tools.aoc import AOCDay +from tools.coordinate import Coordinate, DistanceAlgorithm from typing import Any, Dict, List diff --git a/day04.py b/day04.py index e199649..e1c9208 100644 --- a/day04.py +++ b/day04.py @@ -1,4 +1,4 @@ -from aoc import AOCDay +from tools.aoc import AOCDay from typing import Any diff --git a/day05.py b/day05.py index 9e19e18..2a98d58 100644 --- a/day05.py +++ b/day05.py @@ -1,5 +1,5 @@ -from aoc import AOCDay from intcode import IntCode +from tools.aoc import AOCDay from typing import Any diff --git a/day06.py b/day06.py index b36df5f..acfd1e1 100644 --- a/day06.py +++ b/day06.py @@ -1,4 +1,4 @@ -from aoc import AOCDay +from tools.aoc import AOCDay from typing import Any diff --git a/day07.py b/day07.py index bc14a1d..4a1c9ff 100644 --- a/day07.py +++ b/day07.py @@ -1,8 +1,6 @@ import itertools - -from aoc import AOCDay - from intcode import IntCode +from tools.aoc import AOCDay from typing import Any, List diff --git a/day08.py b/day08.py index 80db074..350c51c 100644 --- a/day08.py +++ b/day08.py @@ -1,4 +1,4 @@ -from aoc import AOCDay +from tools.aoc import AOCDay from typing import Any diff --git a/day09.py b/day09.py index 05f640e..b43356c 100644 --- a/day09.py +++ b/day09.py @@ -1,7 +1,6 @@ -from aoc import AOCDay -from typing import Any - import intcode +from tools.aoc import AOCDay +from typing import Any class Day(AOCDay): diff --git a/day10.py b/day10.py index 6181e80..deba534 100644 --- a/day10.py +++ b/day10.py @@ -1,6 +1,6 @@ -from aoc import AOCDay -from coordinate import Coordinate -from grid import Grid +from tools.aoc import AOCDay +from tools.coordinate import Coordinate +from tools.grid import Grid from typing import Any, List diff --git a/day11.py b/day11.py index 338c8b9..8518f14 100644 --- a/day11.py +++ b/day11.py @@ -1,7 +1,7 @@ -from aoc import AOCDay -from coordinate import Coordinate -from grid import Grid, GridTransformation from intcode import IntCode +from tools.aoc import AOCDay +from tools.coordinate import Coordinate +from tools.grid import Grid, GridTransformation from typing import Any MOVEMENTS = [Coordinate(0, -1), Coordinate(1, 0), Coordinate(0, 1), Coordinate(-1, 0)] diff --git a/day12.py b/day12.py index 5454934..006ca5a 100644 --- a/day12.py +++ b/day12.py @@ -1,7 +1,7 @@ -from aoc import AOCDay from math import lcm from re import compile, findall -from tools import compare +from tools.aoc import AOCDay +from tools.tools import compare from typing import Any, List scanline_regex = compile(r"^$") diff --git a/day13.py b/day13.py index 8071599..d8520cf 100644 --- a/day13.py +++ b/day13.py @@ -1,8 +1,8 @@ import time -from aoc import AOCDay from intcode import IntCode -from tools import compare +from tools.aoc import AOCDay +from tools.tools import compare from typing import Any diff --git a/day14.py b/day14.py index efece18..5c89c89 100644 --- a/day14.py +++ b/day14.py @@ -1,5 +1,5 @@ -from aoc import AOCDay from math import ceil +from tools.aoc import AOCDay from typing import Any diff --git a/day15.py b/day15.py index 56b51c0..88bba3a 100644 --- a/day15.py +++ b/day15.py @@ -1,7 +1,7 @@ -from aoc import AOCDay -from coordinate import Coordinate -from grid import Grid from intcode import IntCode +from tools.aoc import AOCDay +from tools.coordinate import Coordinate +from tools.grid import Grid from typing import Any diff --git a/intcode.py b/intcode.py index db941f8..55185fc 100644 --- a/intcode.py +++ b/intcode.py @@ -1,6 +1,6 @@ +import threading from enum import Enum from queue import Queue -import threading from typing import List, Union diff --git a/main.py b/main.py index dbad1a8..9860a93 100644 --- a/main.py +++ b/main.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -import aoc +import tools.aoc as aoc import argparse import importlib import os diff --git a/skel_day.py b/skel_day.py index 82bab2d..2744f2a 100644 --- a/skel_day.py +++ b/skel_day.py @@ -1,4 +1,4 @@ -from aoc import AOCDay +from tools.aoc import AOCDay from typing import Any