lots of cleanup

This commit is contained in:
Ruediger Ludwig 2022-12-10 19:30:10 +01:00
parent 7d0d3e504e
commit 0385cbd62e
26 changed files with 337 additions and 417 deletions

View file

@ -53,7 +53,7 @@ def draw(lines: Iterator[str], width: int, height: int) -> list[str]:
picture = ""
for cycle, sprite in enumerate(cycles(lines)):
crt_pos = cycle % width
if sprite - 1 <= crt_pos and crt_pos <= sprite + 1:
if sprite - 1 <= crt_pos <= sprite + 1:
picture += '#'
else:
picture += ' '

View file

@ -1,38 +1,38 @@
from advent.common import utils
from advent.common import input
from .solution import cycles, day_num, draw, grab_values, part1, part2
def test_part1():
lines = utils.read_data(day_num, 'test01.txt')
lines = input.read_lines(day_num, 'test01.txt')
expected = 13140
result = part1(lines)
assert result == expected
def test_part2():
lines = utils.read_data(day_num, 'test01.txt')
expected = list(utils.read_data(day_num, 'expected.txt'))
lines = input.read_lines(day_num, 'test01.txt')
expected = list(input.read_lines(day_num, 'expected.txt'))
result = part2(lines)
assert result == expected
def test_small():
lines = utils.read_data(day_num, 'test02.txt')
lines = input.read_lines(day_num, 'test02.txt')
expected = [1, 1, 1, 4, 4, -1]
result = list(cycles(lines))
assert result == expected
def test_grab_values():
lines = utils.read_data(day_num, 'test01.txt')
lines = input.read_lines(day_num, 'test01.txt')
expected = [420, 1140, 1800, 2940, 2880, 3960]
result = list(grab_values(lines))
assert result == expected
def test_draw():
lines = utils.read_data(day_num, 'test01.txt')
expected = list(utils.read_data(day_num, 'expected.txt'))
lines = input.read_lines(day_num, 'test01.txt')
expected = list(input.read_lines(day_num, 'expected.txt'))
result = draw(lines, 40, 6)
assert result == expected