Restructure solver modules with classes and unittest suites
This commit is contained in:
69
puzzles/1.py
69
puzzles/1.py
@@ -1,33 +1,48 @@
|
||||
from collections import Counter
|
||||
from textwrap import dedent
|
||||
from typing import override
|
||||
from unittest import TestCase
|
||||
|
||||
test_input = """
|
||||
3 4
|
||||
4 3
|
||||
2 5
|
||||
1 3
|
||||
3 9
|
||||
3 3
|
||||
"""
|
||||
|
||||
test_solution_p1 = 11
|
||||
test_solution_p2 = 31
|
||||
from puzzles._solver import Solver
|
||||
|
||||
|
||||
def solve_p1(puzzle_input: str) -> int:
|
||||
list1, list2 = _parse_lists(puzzle_input)
|
||||
pairs = zip(sorted(list1), sorted(list2))
|
||||
distances = (abs(pair[0] - pair[1]) for pair in pairs)
|
||||
return sum(distances)
|
||||
class DayOneSolver(Solver):
|
||||
list1: list[int]
|
||||
list2: list[int]
|
||||
|
||||
@override
|
||||
def __init__(self, puzzle_input: str):
|
||||
lines = (line.partition(" ") for line in puzzle_input.strip().split("\n"))
|
||||
list1, list2 = zip(*((int(line[0]), int(line[2])) for line in lines))
|
||||
self.list1 = list(list1)
|
||||
self.list2 = list(list2)
|
||||
|
||||
@override
|
||||
def solve_p1(self) -> int:
|
||||
minimum_pairs = zip(sorted(self.list1), sorted(self.list2))
|
||||
return sum(abs(a - b) for a, b in minimum_pairs)
|
||||
|
||||
@override
|
||||
def solve_p2(self) -> int:
|
||||
occurrences = Counter(self.list2)
|
||||
return sum(value * occurrences.get(value, 0) for value in self.list1)
|
||||
|
||||
|
||||
def solve_p2(puzzle_input: str) -> int:
|
||||
list1, list2 = _parse_lists(puzzle_input)
|
||||
occurrences = Counter(list2)
|
||||
similarities = (value * occurrences.get(value, 0) for value in list1)
|
||||
return sum(similarities)
|
||||
|
||||
|
||||
def _parse_lists(puzzle_input: str) -> tuple[list[int], list[int]]:
|
||||
lines = (line.partition(" ") for line in puzzle_input.strip().split("\n"))
|
||||
list1, list2 = zip(*((int(line[0]), int(line[2])) for line in lines))
|
||||
return list1, list2
|
||||
class TestDayOneSolver(TestCase):
|
||||
def test(self):
|
||||
solver = DayOneSolver(
|
||||
dedent(
|
||||
"""
|
||||
3 4
|
||||
4 3
|
||||
2 5
|
||||
1 3
|
||||
3 9
|
||||
3 3
|
||||
"""
|
||||
)
|
||||
)
|
||||
self.assertListEqual(solver.list1, [3, 4, 2, 1, 3, 3])
|
||||
self.assertListEqual(solver.list2, [4, 3, 5, 3, 9, 3])
|
||||
self.assertEqual(solver.solve_p1(), 11)
|
||||
self.assertEqual(solver.solve_p2(), 31)
|
||||
|
Reference in New Issue
Block a user