From 150bf3e15bc911bdf99b76d5a9439eb263ad8f49 Mon Sep 17 00:00:00 2001 From: Ruediger Ludwig Date: Sun, 18 Dec 2022 14:27:13 +0100 Subject: [PATCH] rename test01.txt to example01.txt --- .../days/day01/data/{test01.txt => example01.txt} | 0 advent/days/day01/test_solution.py | 4 ++-- .../days/day02/data/{test01.txt => example01.txt} | 0 advent/days/day02/test_solution.py | 4 ++-- .../days/day03/data/{test01.txt => example01.txt} | 0 advent/days/day03/test_solution.py | 4 ++-- .../days/day04/data/{test01.txt => example01.txt} | 0 advent/days/day04/test_solution.py | 4 ++-- .../days/day05/data/{test01.txt => example01.txt} | 0 advent/days/day05/test_solution.py | 12 ++++++------ .../days/day06/data/{test01.txt => example01.txt} | 0 advent/days/day06/test_solution.py | 4 ++-- .../days/day07/data/{test01.txt => example01.txt} | 0 advent/days/day07/test_solution.py | 10 +++++----- .../days/day08/data/{test01.txt => example01.txt} | 0 advent/days/day08/test_solution.py | 12 ++++++------ .../days/day09/data/{test01.txt => example01.txt} | 0 .../days/day09/data/{test02.txt => example02.txt} | 0 advent/days/day09/test_solution.py | 10 +++++----- .../days/day10/data/{test01.txt => example01.txt} | 0 .../days/day10/data/{test02.txt => example02.txt} | 0 .../day10/data/{expected.txt => expected01.txt} | 0 advent/days/day10/test_solution.py | 14 +++++++------- .../days/day11/data/{test01.txt => example01.txt} | 0 advent/days/day11/test_solution.py | 14 +++++++------- .../days/day12/data/{test01.txt => example01.txt} | 0 advent/days/day12/test_solution.py | 6 +++--- .../days/day13/data/{test01.txt => example01.txt} | 0 advent/days/day13/test_solution.py | 4 ++-- .../days/day14/data/{test01.txt => example01.txt} | 0 advent/days/day14/test_solution.py | 14 +++++++------- advent/parser/test_parser.py | 8 ++++++++ 32 files changed, 66 insertions(+), 58 deletions(-) rename advent/days/day01/data/{test01.txt => example01.txt} (100%) rename advent/days/day02/data/{test01.txt => example01.txt} (100%) rename advent/days/day03/data/{test01.txt => example01.txt} (100%) rename advent/days/day04/data/{test01.txt => example01.txt} (100%) rename advent/days/day05/data/{test01.txt => example01.txt} (100%) rename advent/days/day06/data/{test01.txt => example01.txt} (100%) rename advent/days/day07/data/{test01.txt => example01.txt} (100%) rename advent/days/day08/data/{test01.txt => example01.txt} (100%) rename advent/days/day09/data/{test01.txt => example01.txt} (100%) rename advent/days/day09/data/{test02.txt => example02.txt} (100%) rename advent/days/day10/data/{test01.txt => example01.txt} (100%) rename advent/days/day10/data/{test02.txt => example02.txt} (100%) rename advent/days/day10/data/{expected.txt => expected01.txt} (100%) rename advent/days/day11/data/{test01.txt => example01.txt} (100%) rename advent/days/day12/data/{test01.txt => example01.txt} (100%) rename advent/days/day13/data/{test01.txt => example01.txt} (100%) rename advent/days/day14/data/{test01.txt => example01.txt} (100%) diff --git a/advent/days/day01/data/test01.txt b/advent/days/day01/data/example01.txt similarity index 100% rename from advent/days/day01/data/test01.txt rename to advent/days/day01/data/example01.txt diff --git a/advent/days/day01/test_solution.py b/advent/days/day01/test_solution.py index da2414c..d97e03e 100644 --- a/advent/days/day01/test_solution.py +++ b/advent/days/day01/test_solution.py @@ -4,14 +4,14 @@ from .solution import day_num, part1, part2 def test_part1(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 24_000 result = part1(data) assert result == expected def test_part2(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 45_000 result = part2(data) assert result == expected diff --git a/advent/days/day02/data/test01.txt b/advent/days/day02/data/example01.txt similarity index 100% rename from advent/days/day02/data/test01.txt rename to advent/days/day02/data/example01.txt diff --git a/advent/days/day02/test_solution.py b/advent/days/day02/test_solution.py index 22bbda5..7170d2f 100644 --- a/advent/days/day02/test_solution.py +++ b/advent/days/day02/test_solution.py @@ -4,14 +4,14 @@ from .solution import day_num, part1, part2, Shape, Result def test_part1(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 15 result = part1(data) assert result == expected def test_part2(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 12 result = part2(data) assert result == expected diff --git a/advent/days/day03/data/test01.txt b/advent/days/day03/data/example01.txt similarity index 100% rename from advent/days/day03/data/test01.txt rename to advent/days/day03/data/example01.txt diff --git a/advent/days/day03/test_solution.py b/advent/days/day03/test_solution.py index 361776f..218b1b4 100644 --- a/advent/days/day03/test_solution.py +++ b/advent/days/day03/test_solution.py @@ -4,14 +4,14 @@ from .solution import day_num, part1, part2 def test_part1(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 157 result = part1(data) assert result == expected def test_part2(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 70 result = part2(data) assert result == expected diff --git a/advent/days/day04/data/test01.txt b/advent/days/day04/data/example01.txt similarity index 100% rename from advent/days/day04/data/test01.txt rename to advent/days/day04/data/example01.txt diff --git a/advent/days/day04/test_solution.py b/advent/days/day04/test_solution.py index ab6a67b..a8eaf4f 100644 --- a/advent/days/day04/test_solution.py +++ b/advent/days/day04/test_solution.py @@ -4,14 +4,14 @@ from .solution import Pair, Range, day_num, part1, part2 def test_part1(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 2 result = part1(data) assert result == expected def test_part2(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 4 result = part2(data) assert result == expected diff --git a/advent/days/day05/data/test01.txt b/advent/days/day05/data/example01.txt similarity index 100% rename from advent/days/day05/data/test01.txt rename to advent/days/day05/data/example01.txt diff --git a/advent/days/day05/test_solution.py b/advent/days/day05/test_solution.py index bab29a2..70d4fec 100644 --- a/advent/days/day05/test_solution.py +++ b/advent/days/day05/test_solution.py @@ -4,14 +4,14 @@ from .solution import Move, day_num, part1, part2, Crane def test_part1(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = "CMZ" result = part1(data) assert result == expected def test_part2(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = "MCD" result = part2(data) assert result == expected @@ -32,7 +32,7 @@ def test_parse_line2(): def test_drawing(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = ["ZN", "MCD", "P"] result = Crane.parse_stacks(data) assert result == expected @@ -46,7 +46,7 @@ def test_parse_move(): def test_parse_all(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = Crane( ["ZN", "MCD", "P"], [Move(1, 1, 0), Move(3, 0, 2), Move(2, 1, 0), Move(1, 0, 1)], True) @@ -55,7 +55,7 @@ def test_parse_all(): def test_all_moves(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') crane = Crane.parse(data, False) expected = ["C", "M", "PDNZ"] result = crane.perform_all_moves() @@ -63,7 +63,7 @@ def test_all_moves(): def test_all_moves9001(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') crane = Crane.parse(data, True) expected = ["M", "C", "PZND"] result = crane.perform_all_moves() diff --git a/advent/days/day06/data/test01.txt b/advent/days/day06/data/example01.txt similarity index 100% rename from advent/days/day06/data/test01.txt rename to advent/days/day06/data/example01.txt diff --git a/advent/days/day06/test_solution.py b/advent/days/day06/test_solution.py index 33127a8..43b016b 100644 --- a/advent/days/day06/test_solution.py +++ b/advent/days/day06/test_solution.py @@ -4,14 +4,14 @@ from .solution import day_num, marker, part1, part2 def test_part1(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 7 result = part1(data) assert result == expected def test_part2(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 19 result = part2(data) assert result == expected diff --git a/advent/days/day07/data/test01.txt b/advent/days/day07/data/example01.txt similarity index 100% rename from advent/days/day07/data/test01.txt rename to advent/days/day07/data/example01.txt diff --git a/advent/days/day07/test_solution.py b/advent/days/day07/test_solution.py index 3271cf4..34e3732 100644 --- a/advent/days/day07/test_solution.py +++ b/advent/days/day07/test_solution.py @@ -4,21 +4,21 @@ from .solution import day_num, part1, part2, Directory def test_part1(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 95437 result = part1(data) assert result == expected def test_part2(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 24933642 result = part2(data) assert result == expected def test_size(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 48381165 directory = Directory.parse(data) result = directory.get_size() @@ -26,7 +26,7 @@ def test_size(): def test_maxed_size(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 95437 directory = Directory.parse(data) result = directory.get_maxed_size(100_000) @@ -34,7 +34,7 @@ def test_maxed_size(): def test_find_to_delete(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 24933642 directory = Directory.parse(data) result = directory.get_min_delete_size(70_000_000, 30_000_000) diff --git a/advent/days/day08/data/test01.txt b/advent/days/day08/data/example01.txt similarity index 100% rename from advent/days/day08/data/test01.txt rename to advent/days/day08/data/example01.txt diff --git a/advent/days/day08/test_solution.py b/advent/days/day08/test_solution.py index 982ccee..d2d079e 100644 --- a/advent/days/day08/test_solution.py +++ b/advent/days/day08/test_solution.py @@ -4,42 +4,42 @@ from .solution import Forest, day_num, part1, part2 def test_part1(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 21 result = part1(data) assert result == expected def test_part2(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 8 result = part2(data) assert result == expected def test_visible(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 21 result = Forest.parse(data).count_visible_trees() assert result == expected def test_distance(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 4 result = Forest.parse(data).single_scenic_score(2, 1) assert result == expected def test_distance2(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 8 result = Forest.parse(data).single_scenic_score(2, 3) assert result == expected def test_max_distance(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 8 result = Forest.parse(data).max_scenic_score() assert result == expected diff --git a/advent/days/day09/data/test01.txt b/advent/days/day09/data/example01.txt similarity index 100% rename from advent/days/day09/data/test01.txt rename to advent/days/day09/data/example01.txt diff --git a/advent/days/day09/data/test02.txt b/advent/days/day09/data/example02.txt similarity index 100% rename from advent/days/day09/data/test02.txt rename to advent/days/day09/data/example02.txt diff --git a/advent/days/day09/test_solution.py b/advent/days/day09/test_solution.py index 9e1c117..d2547f2 100644 --- a/advent/days/day09/test_solution.py +++ b/advent/days/day09/test_solution.py @@ -4,21 +4,21 @@ from .solution import Command, day_num, part1, part2, simulate def test_part1(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 13 result = part1(data) assert result == expected def test_part2(): - data = input.read_lines(day_num, 'test02.txt') + data = input.read_lines(day_num, 'example02.txt') expected = 36 result = part2(data) assert result == expected def test_short(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 13 lst = (Command.parse(line) for line in data) result = simulate(lst, 2) @@ -26,7 +26,7 @@ def test_short(): def test_long1(): - data = input.read_lines(day_num, 'test01.txt') + data = input.read_lines(day_num, 'example01.txt') expected = 1 lst = (Command.parse(line) for line in data) result = simulate(lst, 10) @@ -34,7 +34,7 @@ def test_long1(): def test_long2(): - data = input.read_lines(day_num, 'test02.txt') + data = input.read_lines(day_num, 'example02.txt') expected = 36 lst = (Command.parse(line) for line in data) result = simulate(lst, 10) diff --git a/advent/days/day10/data/test01.txt b/advent/days/day10/data/example01.txt similarity index 100% rename from advent/days/day10/data/test01.txt rename to advent/days/day10/data/example01.txt diff --git a/advent/days/day10/data/test02.txt b/advent/days/day10/data/example02.txt similarity index 100% rename from advent/days/day10/data/test02.txt rename to advent/days/day10/data/example02.txt diff --git a/advent/days/day10/data/expected.txt b/advent/days/day10/data/expected01.txt similarity index 100% rename from advent/days/day10/data/expected.txt rename to advent/days/day10/data/expected01.txt diff --git a/advent/days/day10/test_solution.py b/advent/days/day10/test_solution.py index 6c6100e..d586ed3 100644 --- a/advent/days/day10/test_solution.py +++ b/advent/days/day10/test_solution.py @@ -4,35 +4,35 @@ from .solution import cycles, day_num, draw, grab_values, part1, part2 def test_part1(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') expected = 13140 result = part1(lines) assert result == expected def test_part2(): - lines = input.read_lines(day_num, 'test01.txt') - expected = list(input.read_lines(day_num, 'expected.txt')) + lines = input.read_lines(day_num, 'example01.txt') + expected = list(input.read_lines(day_num, 'expected01.txt')) result = part2(lines) assert result == expected def test_small(): - lines = input.read_lines(day_num, 'test02.txt') + lines = input.read_lines(day_num, 'example02.txt') expected = [1, 1, 1, 4, 4, -1] result = list(cycles(lines)) assert result == expected def test_grab_values(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') expected = [420, 1140, 1800, 2940, 2880, 3960] result = list(grab_values(lines)) assert result == expected def test_draw(): - lines = input.read_lines(day_num, 'test01.txt') - expected = list(input.read_lines(day_num, 'expected.txt')) + lines = input.read_lines(day_num, 'example01.txt') + expected = list(input.read_lines(day_num, 'expected01.txt')) result = draw(lines, 40, 6) assert result == expected diff --git a/advent/days/day11/data/test01.txt b/advent/days/day11/data/example01.txt similarity index 100% rename from advent/days/day11/data/test01.txt rename to advent/days/day11/data/example01.txt diff --git a/advent/days/day11/test_solution.py b/advent/days/day11/test_solution.py index 349c609..12a4f3d 100644 --- a/advent/days/day11/test_solution.py +++ b/advent/days/day11/test_solution.py @@ -4,28 +4,28 @@ from .solution import Troop_While_Kinda_Relieved, Troop_While_Worried, day_num, def test_part1(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') expected = 10605 result = part1(lines) assert result == expected def test_part2(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') expected = 2713310158 result = part2(lines) assert result == expected def test_parse_all(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') expected = 4 result = Troop_While_Worried.parse(lines) assert len(result.monkeys) == expected def test_one_round(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') expected = [2080, 25, 167, 207, 401, 1046] result = Troop_While_Worried.parse(lines) result.single_round() @@ -33,7 +33,7 @@ def test_one_round(): def test_rounds(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') expected = 101 result = Troop_While_Worried.parse(lines) result.rounds(20) @@ -41,7 +41,7 @@ def test_rounds(): def test_inspected(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') expected = 10605 result = Troop_While_Worried.parse(lines) result.rounds(20) @@ -49,7 +49,7 @@ def test_inspected(): def test_inspected2(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') expected = 2713310158 result = Troop_While_Kinda_Relieved.parse(lines) result.rounds(10_000) diff --git a/advent/days/day12/data/test01.txt b/advent/days/day12/data/example01.txt similarity index 100% rename from advent/days/day12/data/test01.txt rename to advent/days/day12/data/example01.txt diff --git a/advent/days/day12/test_solution.py b/advent/days/day12/test_solution.py index ca0cbce..3e92b23 100644 --- a/advent/days/day12/test_solution.py +++ b/advent/days/day12/test_solution.py @@ -4,21 +4,21 @@ from .solution import Map, day_num, part1, part2 def test_part1(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') expected = 31 result = part1(lines) assert result == expected def test_part2(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') expected = 29 result = part2(lines) assert result == expected def test_path(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') expected = 31 result = Map.create(lines).find_path('S') assert result == expected diff --git a/advent/days/day13/data/test01.txt b/advent/days/day13/data/example01.txt similarity index 100% rename from advent/days/day13/data/test01.txt rename to advent/days/day13/data/example01.txt diff --git a/advent/days/day13/test_solution.py b/advent/days/day13/test_solution.py index 928491c..322bdcc 100644 --- a/advent/days/day13/test_solution.py +++ b/advent/days/day13/test_solution.py @@ -4,14 +4,14 @@ from .solution import day_num, parse_single_pair, PacketList, part1, part2 def test_part1(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') expected = 13 result = part1(lines) assert result == expected def test_part2(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') expected = 140 result = part2(lines) assert result == expected diff --git a/advent/days/day14/data/test01.txt b/advent/days/day14/data/example01.txt similarity index 100% rename from advent/days/day14/data/test01.txt rename to advent/days/day14/data/example01.txt diff --git a/advent/days/day14/test_solution.py b/advent/days/day14/test_solution.py index fb268cf..7041941 100644 --- a/advent/days/day14/test_solution.py +++ b/advent/days/day14/test_solution.py @@ -4,14 +4,14 @@ from .solution import CaveMap, FlooredCave, BottomLessCave, day_num, part1, part def test_part1(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') expected = 24 result = part1(lines) assert result == expected def test_part2(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') expected = 93 result = part2(lines) assert result == expected @@ -41,13 +41,13 @@ def test_get_path2(): def test_parser_test(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') cave = BottomLessCave.create(lines) assert cave.cave_map.max_depths == 9 def test_drip(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') cave = BottomLessCave.create(lines) result = cave.drip() assert result is True @@ -55,7 +55,7 @@ def test_drip(): def test_drip2(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') cave = BottomLessCave.create(lines) cave.drip() cave.drip() @@ -63,7 +63,7 @@ def test_drip2(): def test_drip_forever(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') cave = BottomLessCave.create(lines) result = cave.drip_till_forever() expected = 24 @@ -71,7 +71,7 @@ def test_drip_forever(): def test_drip_forever2(): - lines = input.read_lines(day_num, 'test01.txt') + lines = input.read_lines(day_num, 'example01.txt') cave = FlooredCave.create(lines, floor=2) result = cave.drip_till_full() expected = 93 diff --git a/advent/parser/test_parser.py b/advent/parser/test_parser.py index 2593743..3ca9057 100644 --- a/advent/parser/test_parser.py +++ b/advent/parser/test_parser.py @@ -73,6 +73,14 @@ def test_between(): assert result == expected +def test_sep_by_single(): + parser = P.signed().sep_by(P.char(',')) + input = '2' + expected = [[2]] + result = list(parser.parse_multi(input)) + assert result == expected + + def test_sep_by(): parser = P.signed().sep_by(P.char(',')) input = '2,3,5'