cleanup

TedCassirer · Dec 1, 2023 · 42b2d2c · 42b2d2c
1 parent b1f7018
commit 42b2d2c
Show file tree

Hide file tree

Showing 68 changed files with 94 additions and 112 deletions.
diff --git a/aoc_cas/aoc2019/day11.py b/aoc_cas/aoc2019/day11.py
@@ -1,4 +1,4 @@
-from aoc2019.IntCodeComputer import IntCodeComputerVM
+from aoc_cas.aoc2019.IntCodeComputer import IntCodeComputerVM
 from collections import defaultdict
 
 BLACK = 0

diff --git a/aoc_cas/aoc2019/day21.py b/aoc_cas/aoc2019/day21.py
@@ -1,4 +1,4 @@
-from aoc2019.IntCodeComputer import IntCodeComputerVM, read_program
+from aoc_cas.aoc2019.IntCodeComputer import IntCodeComputerVM, read_program
 
 
 def instructions(*inputs):

diff --git a/aoc_cas/aoc2022/day5.py b/aoc_cas/aoc2022/day5.py
@@ -1,6 +1,6 @@
 def parseData(data):
     stackData, instructionData = data.split("\n\n")
-    numStacks = (data.index("\n") + 1) // 4
+    numStacks = int(stackData.split("   ")[-1])
     stacks = [[] for _ in range(numStacks)]
     instructions = []
 

diff --git a/tests/2019/test_2019_day16.py b/tests/2019/test_2019_day16.py
@@ -1,4 +1,4 @@
-from aoc2019 import day16 as aoc
+from aoc_cas.aoc2019 import day16 as aoc
 
 
 def testPart1():

diff --git a/tests/2019/test_2019_day20.py b/tests/2019/test_2019_day20.py
@@ -1,4 +1,4 @@
-from aoc2019 import day20 as aoc
+from aoc_cas.aoc2019 import day20 as aoc
 
 
 def testPart1():

diff --git a/tests/2019/test_2019_day22.py b/tests/2019/test_2019_day22.py
@@ -1,4 +1,4 @@
-from aoc2019 import day22 as aoc
+from aoc_cas.aoc2019 import day22 as aoc
 
 
 def testPart1():

diff --git a/tests/2019/test_2019_day7.py b/tests/2019/test_2019_day7.py
@@ -1,4 +1,4 @@
-from aoc2019 import day7 as aoc
+from aoc_cas.aoc2019 import day7 as aoc
 
 
 def testPart1():

diff --git a/tests/2020/test_2020_day1.py b/tests/2020/test_2020_day1.py
@@ -1,4 +1,4 @@
-import aoc2020.day1 as aoc
+import aoc_cas.aoc2020.day1 as aoc
 
 testData1 = """
     1721

diff --git a/tests/2020/test_2020_day10.py b/tests/2020/test_2020_day10.py
@@ -1,4 +1,4 @@
-from aoc2020 import day10 as aoc
+from aoc_cas.aoc2020 import day10 as aoc
 
 
 data = """

diff --git a/tests/2020/test_2020_day11.py b/tests/2020/test_2020_day11.py
@@ -1,4 +1,4 @@
-from aoc2020 import day11 as aoc
+from aoc_cas.aoc2020 import day11 as aoc
 
 
 data = """

diff --git a/tests/2020/test_2020_day12.py b/tests/2020/test_2020_day12.py
@@ -1,4 +1,4 @@
-from aoc2020 import day12 as aoc
+from aoc_cas.aoc2020 import day12 as aoc
 
 
 data = """

diff --git a/tests/2020/test_2020_day13.py b/tests/2020/test_2020_day13.py
@@ -1,4 +1,4 @@
-from aoc2020 import day13 as aoc
+from aoc_cas.aoc2020 import day13 as aoc
 
 
 data = """

diff --git a/tests/2020/test_2020_day14.py b/tests/2020/test_2020_day14.py
@@ -1,4 +1,4 @@
-from aoc2020 import day14 as aoc
+from aoc_cas.aoc2020 import day14 as aoc
 
 
 def testPart1():

diff --git a/tests/2020/test_2020_day15.py b/tests/2020/test_2020_day15.py
@@ -1,4 +1,4 @@
-from aoc2020 import day15 as aoc
+from aoc_cas.aoc2020 import day15 as aoc
 import pytest
 
 

diff --git a/tests/2020/test_2020_day16.py b/tests/2020/test_2020_day16.py
@@ -1,4 +1,4 @@
-from aoc2020 import day16 as aoc
+from aoc_cas.aoc2020 import day16 as aoc
 
 
 def testPart1():

diff --git a/tests/2020/test_2020_day17.py b/tests/2020/test_2020_day17.py
@@ -1,4 +1,4 @@
-from aoc2020 import day17 as aoc
+from aoc_cas.aoc2020 import day17 as aoc
 
 
 data = """

diff --git a/tests/2020/test_2020_day18.py b/tests/2020/test_2020_day18.py
@@ -1,4 +1,4 @@
-from aoc2020 import day18 as aoc
+from aoc_cas.aoc2020 import day18 as aoc
 
 
 def testPart1():

diff --git a/tests/2020/test_2020_day19.py b/tests/2020/test_2020_day19.py
@@ -1,4 +1,4 @@
-from aoc2020 import day19 as aoc
+from aoc_cas.aoc2020 import day19 as aoc
 
 data1 = """
 0: 4 1 5

diff --git a/tests/2020/test_2020_day2.py b/tests/2020/test_2020_day2.py
@@ -1,4 +1,4 @@
-import aoc2020.day2 as aoc
+import aoc_cas.aoc2020.day2 as aoc
 
 testData = """
 1-3 a: abcde

diff --git a/tests/2020/test_2020_day20.py b/tests/2020/test_2020_day20.py
@@ -1,4 +1,4 @@
-from aoc2020 import day20 as aoc
+from aoc_cas.aoc2020 import day20 as aoc
 
 
 def testPart1():

diff --git a/tests/2020/test_2020_day21.py b/tests/2020/test_2020_day21.py
@@ -1,4 +1,4 @@
-from aoc2020 import day21 as aoc
+from aoc_cas.aoc2020 import day21 as aoc
 
 data = """
 mxmxvkd kfcds sqjhc nhms (contains dairy, fish)

diff --git a/tests/2020/test_2020_day22.py b/tests/2020/test_2020_day22.py
@@ -1,4 +1,4 @@
-from aoc2020 import day22 as aoc
+from aoc_cas.aoc2020 import day22 as aoc
 
 data = """
 Player 1:

diff --git a/tests/2020/test_2020_day23.py b/tests/2020/test_2020_day23.py
@@ -1,4 +1,4 @@
-from aoc2020 import day23 as aoc
+from aoc_cas.aoc2020 import day23 as aoc
 import pytest
 
 data = "389125467"

diff --git a/tests/2020/test_2020_day24.py b/tests/2020/test_2020_day24.py
@@ -1,4 +1,4 @@
-from aoc2020 import day24 as aoc
+from aoc_cas.aoc2020 import day24 as aoc
 
 data = """
 sesenwnenenewseeswwswswwnenewsewsw

diff --git a/tests/2020/test_2020_day25.py b/tests/2020/test_2020_day25.py
@@ -1,4 +1,4 @@
-from aoc2020 import day25 as aoc
+from aoc_cas.aoc2020 import day25 as aoc
 
 data = """
 5764801

diff --git a/tests/2020/test_2020_day3.py b/tests/2020/test_2020_day3.py
@@ -1,4 +1,4 @@
-import aoc2020.day3 as aoc
+import aoc_cas.aoc2020.day3 as aoc
 
 testData = """
 ..##.......

diff --git a/tests/2020/test_2020_day4.py b/tests/2020/test_2020_day4.py
@@ -1,4 +1,4 @@
-import aoc2020.day4 as aoc
+import aoc_cas.aoc2020.day4 as aoc
 
 testData = """
     ecl:gry pid:860033327 eyr:2020 hcl:#fffffd

diff --git a/tests/2020/test_2020_day5.py b/tests/2020/test_2020_day5.py
@@ -1,4 +1,4 @@
-import aoc2020.day5 as aoc
+import aoc_cas.aoc2020.day5 as aoc
 
 
 def testSeatId():

diff --git a/tests/2020/test_2020_day6.py b/tests/2020/test_2020_day6.py
@@ -1,4 +1,4 @@
-from aoc2020 import day6 as aoc
+from aoc_cas.aoc2020 import day6 as aoc
 
 
 def testPart1():

diff --git a/tests/2020/test_2020_day7.py b/tests/2020/test_2020_day7.py
@@ -1,4 +1,4 @@
-from aoc2020 import day7 as aoc
+from aoc_cas.aoc2020 import day7 as aoc
 
 
 def testPart1():

diff --git a/tests/2020/test_2020_day8.py b/tests/2020/test_2020_day8.py
@@ -1,4 +1,4 @@
-from aoc2020 import day8 as aoc
+from aoc_cas.aoc2020 import day8 as aoc
 
 
 testProgram = """

diff --git a/tests/2020/test_2020_day9.py b/tests/2020/test_2020_day9.py
@@ -1,4 +1,4 @@
-from aoc2020 import day9 as aoc
+from aoc_cas.aoc2020 import day9 as aoc
 
 
 data = """

diff --git a/tests/2021/test_2021_day1.py b/tests/2021/test_2021_day1.py
@@ -1,4 +1,4 @@
-import aoc2021.day1 as aoc
+import aoc_cas.aoc2021.day1 as aoc
 
 testData = """
     199

diff --git a/tests/2021/test_2021_day10.py b/tests/2021/test_2021_day10.py
@@ -1,4 +1,4 @@
-import aoc2021.day10 as aoc
+import aoc_cas.aoc2021.day10 as aoc
 
 testData = """
 [({(<(())[]>[[{[]{<()<>>

diff --git a/tests/2021/test_2021_day11.py b/tests/2021/test_2021_day11.py
@@ -1,4 +1,4 @@
-import aoc2021.day11 as aoc
+import aoc_cas.aoc2021.day11 as aoc
 
 testData = """
 5483143223

diff --git a/tests/2021/test_2021_day12.py b/tests/2021/test_2021_day12.py
@@ -1,4 +1,4 @@
-import aoc2021.day12 as aoc
+import aoc_cas.aoc2021.day12 as aoc
 
 testData1 = """
 start-A

diff --git a/tests/2021/test_2021_day14.py b/tests/2021/test_2021_day14.py
@@ -1,4 +1,4 @@
-import aoc2021.day14 as aoc
+import aoc_cas.aoc2021.day14 as aoc
 
 testData = """
 NNCB

diff --git a/tests/2021/test_2021_day15.py b/tests/2021/test_2021_day15.py
@@ -1,4 +1,4 @@
-import aoc2021.day15 as aoc
+import aoc_cas.aoc2021.day15 as aoc
 
 testData = """
 1163751742

diff --git a/tests/2021/test_2021_day16.py b/tests/2021/test_2021_day16.py
@@ -1,4 +1,4 @@
-import aoc2021.day16 as aoc
+import aoc_cas.aoc2021.day16 as aoc
 
 
 def testPart1():

diff --git a/tests/2021/test_2021_day17.py b/tests/2021/test_2021_day17.py
@@ -1,4 +1,4 @@
-import aoc2021.day17 as aoc
+import aoc_cas.aoc2021.day17 as aoc
 
 
 def testPart1():

diff --git a/tests/2021/test_2021_day18.py b/tests/2021/test_2021_day18.py
@@ -1,4 +1,4 @@
-import aoc2021.day18 as aoc
+import aoc_cas.aoc2021.day18 as aoc
 
 data = """
 [[[0,[5,8]],[[1,7],[9,6]]],[[4,[1,2]],[[1,4],2]]]

diff --git a/tests/2021/test_2021_day2.py b/tests/2021/test_2021_day2.py
@@ -1,4 +1,4 @@
-import aoc2021.day2 as aoc
+import aoc_cas.aoc2021.day2 as aoc
 
 testData = """
 forward 5

diff --git a/tests/2021/test_2021_day3.py b/tests/2021/test_2021_day3.py
@@ -1,4 +1,4 @@
-import aoc2021.day3 as aoc
+import aoc_cas.aoc2021.day3 as aoc
 
 testData = """
 00100

diff --git a/tests/2021/test_2021_day4.py b/tests/2021/test_2021_day4.py
@@ -1,4 +1,4 @@
-import aoc2021.day4 as aoc
+import aoc_cas.aoc2021.day4 as aoc
 
 testData = """
 7,4,9,5,11,17,23,2,0,14,21,24,10,16,13,6,15,25,12,22,18,20,8,19,3,26,1

diff --git a/tests/2021/test_2021_day5.py b/tests/2021/test_2021_day5.py
@@ -1,4 +1,4 @@
-import aoc2021.day5 as aoc
+import aoc_cas.aoc2021.day5 as aoc
 
 testData = """
 0,9 -> 5,9

diff --git a/tests/2021/test_2021_day6.py b/tests/2021/test_2021_day6.py
@@ -1,4 +1,4 @@
-import aoc2021.day6 as aoc
+import aoc_cas.aoc2021.day6 as aoc
 
 testData = """
 3,4,3,1,2

diff --git a/tests/2021/test_2021_day7.py b/tests/2021/test_2021_day7.py
@@ -1,4 +1,4 @@
-import aoc2021.day7 as aoc
+import aoc_cas.aoc2021.day7 as aoc
 
 testData = """
 16,1,2,0,4,2,7,1,2,14

diff --git a/tests/2021/test_2021_day8.py b/tests/2021/test_2021_day8.py
@@ -1,4 +1,4 @@
-import aoc2021.day8 as aoc
+import aoc_cas.aoc2021.day8 as aoc
 
 testData = """
 be cfbegad cbdgef fgaecd cgeb fdcge agebfd fecdb fabcd edb | fdgacbe cefdb cefbgd gcbe

diff --git a/tests/2021/test_2021_day9.py b/tests/2021/test_2021_day9.py
@@ -1,4 +1,4 @@
-import aoc2021.day9 as aoc
+import aoc_cas.aoc2021.day9 as aoc
 
 testData = """
 2199943210

diff --git a/tests/2022/a.txt b/tests/2022/a.txt
diff --git a/tests/2022/test_2022_day10.py b/tests/2022/test_2022_day10.py
@@ -1,4 +1,4 @@
-import aoc2022.day10 as aoc
+import aoc_cas.aoc2022.day10 as aoc
 
 testData = """
 addx 15

diff --git a/tests/2022/test_2022_day11.py b/tests/2022/test_2022_day11.py
@@ -1,4 +1,4 @@
-import aoc2022.day11 as aoc
+import aoc_cas.aoc2022.day11 as aoc
 
 testData = """
 Monkey 0:

diff --git a/tests/2022/test_2022_day12.py b/tests/2022/test_2022_day12.py
@@ -1,4 +1,4 @@
-import aoc2022.day12 as aoc
+import aoc_cas.aoc2022.day12 as aoc
 
 testData = """
 Sabqponm

diff --git a/tests/2022/test_2022_day13.py b/tests/2022/test_2022_day13.py
@@ -1,4 +1,4 @@
-import aoc2022.day13 as aoc
+import aoc_cas.aoc2022.day13 as aoc
 
 testData = """
 [1,1,3,1,1]

diff --git a/tests/2022/test_2022_day14.py b/tests/2022/test_2022_day14.py
@@ -1,4 +1,4 @@
-import aoc2022.day14 as aoc
+import aoc_cas.aoc2022.day14 as aoc
 
 testData = """
 498,4 -> 498,6 -> 496,6

diff --git a/tests/2022/test_2022_day15.py b/tests/2022/test_2022_day15.py
@@ -1,4 +1,4 @@
-import aoc2022.day15 as aoc
+import aoc_cas.aoc2022.day15 as aoc
 
 testData = """
 Sensor at x=2, y=18: closest beacon is at x=-2, y=15

diff --git a/tests/2022/test_2022_day16.py b/tests/2022/test_2022_day16.py
@@ -1,4 +1,4 @@
-import aoc2022.day16 as aoc
+import aoc_cas.aoc2022.day16 as aoc
 
 testData = """
 Valve AA has flow rate=0; tunnels lead to valves DD, II, BB

diff --git a/tests/2022/test_2022_day2.py b/tests/2022/test_2022_day2.py
@@ -1,4 +1,4 @@
-import aoc2022.day2 as aoc
+import aoc_cas.aoc2022.day2 as aoc
 
 testData = """
 A Y

diff --git a/tests/2022/test_2022_day3.py b/tests/2022/test_2022_day3.py
@@ -1,4 +1,4 @@
-import aoc2022.day3 as aoc
+import aoc_cas.aoc2022.day3 as aoc
 
 testData = """
 vJrwpWtwJgWrhcsFMMfFFhFp

diff --git a/tests/2022/test_2022_day4.py b/tests/2022/test_2022_day4.py
@@ -1,4 +1,4 @@
-import aoc2022.day4 as aoc
+import aoc_cas.aoc2022.day4 as aoc
 
 testData = """
 2-4,6-8

diff --git a/tests/2022/test_2022_day5.py b/tests/2022/test_2022_day5.py
@@ -1,4 +1,4 @@
-import aoc2022.day5 as aoc
+import aoc_cas.aoc2022.day5 as aoc
 
 testData = """    [D]    
 [N] [C]    

diff --git a/tests/2022/test_2022_day6.py b/tests/2022/test_2022_day6.py
@@ -1,4 +1,4 @@
-import aoc2022.day6 as aoc
+import aoc_cas.aoc2022.day6 as aoc
 
 
 def testPart1():

diff --git a/tests/2022/test_2022_day7.py b/tests/2022/test_2022_day7.py
@@ -1,4 +1,4 @@
-import aoc2022.day7 as aoc
+import aoc_cas.aoc2022.day7 as aoc
 
 testData = """
 $ cd /

diff --git a/tests/2022/test_2022_day8.py b/tests/2022/test_2022_day8.py
@@ -1,4 +1,4 @@
-import aoc2022.day8 as aoc
+import aoc_cas.aoc2022.day8 as aoc
 
 testData = """
 30373