corrections

This commit is contained in:
Ruediger Ludwig 2022-12-29 06:44:57 +01:00
parent 42b8049d31
commit 0843624f17
3 changed files with 17 additions and 11 deletions

View file

@ -4,14 +4,14 @@ from .solution import Sensor, SensorMap, day_num, part1, part2
def test_part1(): def test_part1():
lines = input.read_lines(day_num, 'test01.txt') lines = input.read_lines(day_num, 'example01.txt')
expected = 26 expected = 26
result = part1(lines) result = part1(lines)
assert result == expected assert result == expected
def test_part2(): def test_part2():
lines = input.read_lines(day_num, 'test01.txt') lines = input.read_lines(day_num, 'example01.txt')
expected = 56000011 expected = 56000011
result = part2(lines) result = part2(lines)
assert result == expected assert result == expected
@ -32,7 +32,7 @@ def test_x_range():
def test_impossible(): def test_impossible():
lines = input.read_lines(day_num, 'test01.txt') lines = input.read_lines(day_num, 'example01.txt')
next(lines) next(lines)
sensor_map = SensorMap.parse(lines) sensor_map = SensorMap.parse(lines)
expected = 26 expected = 26
@ -41,7 +41,7 @@ def test_impossible():
def test_possible(): def test_possible():
lines = input.read_lines(day_num, 'test01.txt') lines = input.read_lines(day_num, 'example01.txt')
next(lines) next(lines)
sensor_map = SensorMap.parse(lines) sensor_map = SensorMap.parse(lines)
expected = 56000011 expected = 56000011

View file

@ -1,8 +1,10 @@
from advent.common import input from advent.common import input
from .solution import Blueprint, day_num, part1, part2 from .solution import Blueprint, day_num, part1, part2
import pytest
@pytest.mark.skip
def test_part1(): def test_part1():
lines = input.read_lines(day_num, 'example01.txt') lines = input.read_lines(day_num, 'example01.txt')
expected = 33 expected = 33
@ -10,9 +12,10 @@ def test_part1():
assert result == expected assert result == expected
@pytest.mark.skip
def test_part2(): def test_part2():
lines = input.read_lines(day_num, 'example01.txt') lines = input.read_lines(day_num, 'example01.txt')
expected = None expected = (56 * 62)
result = part2(lines) result = part2(lines)
assert result == expected assert result == expected
@ -20,10 +23,11 @@ def test_part2():
def test_parse(): def test_parse():
lines = input.read_lines(day_num, 'example01.txt') lines = input.read_lines(day_num, 'example01.txt')
blueprint = Blueprint.parse(next(lines)) blueprint = Blueprint.parse(next(lines))
expected = Blueprint(1, ((0, 0, 0, 4), (0, 0, 0, 2), (0, 0, 14, 3), (0, 7, 0, 2))) expected = Blueprint(1, ((0, 7, 0, 2), (0, 0, 14, 3), (0, 0, 0, 2), (0, 0, 0, 4)))
assert blueprint == expected assert blueprint == expected
@pytest.mark.skip
def test_blueprint1(): def test_blueprint1():
lines = input.read_lines(day_num, 'example01.txt') lines = input.read_lines(day_num, 'example01.txt')
blueprint = Blueprint.parse(next(lines)) blueprint = Blueprint.parse(next(lines))
@ -32,6 +36,7 @@ def test_blueprint1():
assert result == expected assert result == expected
@pytest.mark.skip
def test_blueprint2(): def test_blueprint2():
lines = input.read_lines(day_num, 'example01.txt') lines = input.read_lines(day_num, 'example01.txt')
next(lines) next(lines)

View file

@ -7,6 +7,7 @@ from .solution import (
PasswordSimpleJungle, PasswordSimpleJungle,
Player, Player,
Position2D, Position2D,
Turn,
Vector, Vector,
day_num, day_num,
part1, part1,
@ -41,7 +42,7 @@ def test_next():
assert result == (10, 2) assert result == (10, 2)
result = jungle.next_instruction(2) result = jungle.next_instruction(2)
assert result == ('R', 3) assert result == (Turn.Right, 3)
result = jungle.next_instruction(14) result = jungle.next_instruction(14)
assert result == (5, 15) assert result == (5, 15)
@ -103,19 +104,19 @@ def test_cube_info():
person = Player(Position2D(14, 8), Facing.Up) person = Player(Position2D(14, 8), Facing.Up)
result = jungle.get_cube_position(person) result = jungle.get_cube_position(person)
assert result == (CubePosition(Vector(0, 1, 0), Vector(0, 0, 1)), 2) assert result == (CubePosition(Vector(0, 1, 0), Vector(0, 0, -1)), 2)
person = Player(Position2D(11, 5), Facing.Right) person = Player(Position2D(11, 5), Facing.Right)
result = jungle.get_cube_position(person) result = jungle.get_cube_position(person)
assert result == (CubePosition(Vector(0, 0, 1), Vector(0, 1, 0)), 2) assert result == (CubePosition(Vector(0, 0, -1), Vector(0, 1, 0)), 1)
person = Player(Position2D(1, 7), Facing.Down) person = Player(Position2D(1, 7), Facing.Down)
result = jungle.get_cube_position(person) result = jungle.get_cube_position(person)
assert result == (CubePosition(Vector(0, 0, -1), Vector(-1, 0, 0)), 2) assert result == (CubePosition(Vector(0, 0, 1), Vector(-1, 0, 0)), 2)
person = Player(Position2D(10, 11), Facing.Down) person = Player(Position2D(10, 11), Facing.Down)
result = jungle.get_cube_position(person) result = jungle.get_cube_position(person)
assert result == (CubePosition(Vector(-1, 0, 0), Vector(0, 0, -1)), 1) assert result == (CubePosition(Vector(-1, 0, 0), Vector(0, 0, 1)), 1)
def test_cube_wrap(): def test_cube_wrap():