formatting and cosmetic updates to 2020.
This commit is contained in:
parent
84c4cf9991
commit
cd75e58f77
28 changed files with 320 additions and 287 deletions
|
|
@ -2,25 +2,35 @@
|
|||
|
||||
import pathlib
|
||||
import sys
|
||||
import re
|
||||
from dataclasses import dataclass
|
||||
from pprint import pprint
|
||||
|
||||
|
||||
def parse(puzzle_input: str):
|
||||
"""Parse input"""
|
||||
# returns a 2 dimentional array where true means there is a tree there.
|
||||
return [[i=='#' for i in j] for j in puzzle_input.splitlines()]
|
||||
return [[i == "#" for i in j] for j in puzzle_input.splitlines()]
|
||||
|
||||
|
||||
def part1(data):
|
||||
"""Solve part 1"""
|
||||
return solveForSlope(data, 3, 1)
|
||||
|
||||
|
||||
def solveForSlope(data, right: int, down: int):
|
||||
return sum(1 for index, row in enumerate(data[::down]) if row[(right*index)%len(row)])
|
||||
return sum(
|
||||
1 for index, row in enumerate(data[::down]) if row[(right * index) % len(row)]
|
||||
)
|
||||
|
||||
|
||||
def part2(data):
|
||||
"""Solve part 2"""
|
||||
return solveForSlope(data,1,1)*solveForSlope(data,3,1)*solveForSlope(data,5,1)*solveForSlope(data,7,1)*solveForSlope(data,1,2)
|
||||
return (
|
||||
solveForSlope(data, 1, 1)
|
||||
* solveForSlope(data, 3, 1)
|
||||
* solveForSlope(data, 5, 1)
|
||||
* solveForSlope(data, 7, 1)
|
||||
* solveForSlope(data, 1, 2)
|
||||
)
|
||||
|
||||
|
||||
def solve(puzzle_input):
|
||||
"""Solve the puzzle for the given input"""
|
||||
|
|
@ -30,6 +40,7 @@ def solve(puzzle_input):
|
|||
|
||||
return solution1, solution2
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
for path in sys.argv[1:]:
|
||||
print(f"{path}:")
|
||||
|
|
|
|||
|
|
@ -6,38 +6,38 @@ import day3 as aoc
|
|||
|
||||
PUZZLE_DIR = pathlib.Path(__file__).parent
|
||||
|
||||
#these test fixtures setup the test, mainly by reading the filename into a string in this simple case.
|
||||
|
||||
# these test fixtures setup the test, mainly by reading the filename into a string in this simple case.
|
||||
@pytest.fixture
|
||||
def example1():
|
||||
puzzle_input = (PUZZLE_DIR / "example1").read_text().strip()
|
||||
def example():
|
||||
puzzle_input = (PUZZLE_DIR / "example.txt").read_text().strip()
|
||||
return aoc.parse(puzzle_input)
|
||||
|
||||
@pytest.fixture
|
||||
def example2():
|
||||
puzzle_input = (PUZZLE_DIR / "example1").read_text().strip()
|
||||
return aoc.parse(puzzle_input)
|
||||
|
||||
# @pytest.mark.skip(reason="Not implemented")
|
||||
def test_parse_example1(example1):
|
||||
def test_parse(example):
|
||||
"""Test that input is parsed properly"""
|
||||
assert example1 == [[False, False, True, True, False, False, False, False, False, False, False],
|
||||
[True, False, False, False, True, False, False, False, True, False, False],
|
||||
[False, True, False, False, False, False, True, False, False, True, False],
|
||||
[False, False, True, False, True, False, False, False, True, False, True],
|
||||
[False, True, False, False, False, True, True, False, False, True, False],
|
||||
[False, False, True, False, True, True, False, False, False, False, False],
|
||||
[False, True, False, True, False, True, False, False, False, False, True],
|
||||
[False, True, False, False, False, False, False, False, False, False, True],
|
||||
[True, False, True, True, False, False, False, True, False, False, False],
|
||||
[True, False, False, False, True, True, False, False, False, False, True],
|
||||
[False, True, False, False, True, False, False, False, True, False, True]]
|
||||
assert example == [
|
||||
[False, False, True, True, False, False, False, False, False, False, False],
|
||||
[True, False, False, False, True, False, False, False, True, False, False],
|
||||
[False, True, False, False, False, False, True, False, False, True, False],
|
||||
[False, False, True, False, True, False, False, False, True, False, True],
|
||||
[False, True, False, False, False, True, True, False, False, True, False],
|
||||
[False, False, True, False, True, True, False, False, False, False, False],
|
||||
[False, True, False, True, False, True, False, False, False, False, True],
|
||||
[False, True, False, False, False, False, False, False, False, False, True],
|
||||
[True, False, True, True, False, False, False, True, False, False, False],
|
||||
[True, False, False, False, True, True, False, False, False, False, True],
|
||||
[False, True, False, False, True, False, False, False, True, False, True],
|
||||
]
|
||||
|
||||
|
||||
# @pytest.mark.skip(reason="Not implemented")
|
||||
def test_part1_example1(example1):
|
||||
def test_part1(example):
|
||||
"""Test part 1 on example input"""
|
||||
assert aoc.part1(example1) == 7
|
||||
assert aoc.part1(example) == 7
|
||||
|
||||
|
||||
# @pytest.mark.skip(reason="Not implemented")
|
||||
def test_part2_example2(example2):
|
||||
def test_part2(example):
|
||||
"""Test part 2 on example input"""
|
||||
assert aoc.part2(example2) == 336
|
||||
assert aoc.part2(example) == 336
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue