2023 day 1

TedCassirer · Dec 1, 2023 · 36a3600 · 36a3600
1 parent f971ffe
commit 36a3600
Show file tree

Hide file tree

Showing 244 changed files with 1,558 additions and 141 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,17 +16,18 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up Python 3.10
+    - name: Set up Python 3.11
       uses: actions/setup-python@v4
       with:
-        python-version: '3.10'
+        python-version: '3.11'
+    - name: Install Poetry
+      uses: snok/install-poetry@v1
+
     - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -e .
+      run: poetry install
     - name: Black code style check
       run: |
-        black --check -l 120 .
+        poetry run black --check -l 120 .
     - name: Test with pytest
       run: |
-        pytest
+        poetry run pytest
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,12 @@
 .vscode
 __pycache__/
-venv/
 *.egg-info/
-*.pyc
+*.pyc
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
diff --git a/aoc_cas/aoc2015/__init__.py → .idea/.gitignore b/aoc_cas/aoc2015/__init__.py → .idea/.gitignore
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/aoc_cas/__init__.py b/aoc_cas/__init__.py
diff --git a/aoc_cas/cli.py b/aoc_cas/cli.py
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,43 @@
+[tool.poetry]
+name = "advent-of-code"
+version = "0.1.0"
+description = ""
+authors = ["Ted Cassirer <[email protected]>"]
+readme = "README.md"
+
+packages = [
+    {include = "aoc2015", from = "src/"},
+    {include = "aoc2016", from = "src/"},
+    {include = "aoc2019", from = "src/"},
+    {include = "aoc2020", from = "src/"},
+    {include = "aoc2021", from = "src/"},
+    {include = "aoc2022", from = "src/"},
+    {include = "scripts", from = "src/"},
+]
+
+
+
+[tool.poetry.dependencies]
+python = "^3.11"
+advent-of-code-data = "^2.0.1"
+black = "^23.11.0"
+numpy = "^1.26.2"
+pytest = "^7.4.3"
+poetry = "^1.7.1"
+click = "^8.1.7"
+
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+#
+#[tool.poetry.scripts]
+#aoccas = "scripts.cli:main"
+#bsamseth = "aoc_runner:plugin"
+
+[tool.poetry.plugins."cli"]
+foo = "cli"
+
+[tool.pytest.ini_options]
+testpaths = "tests/"
+
diff --git a/setup.py b/setup.py
diff --git a/aoc_cas/aoc2016/__init__.py → src/2018/__init__.py b/aoc_cas/aoc2016/__init__.py → src/2018/__init__.py
diff --git a/aoc_cas/2018/data/day_1 → src/2018/data/day_1 b/aoc_cas/2018/data/day_1 → src/2018/data/day_1
diff --git a/aoc_cas/2018/data/day_10 → src/2018/data/day_10 b/aoc_cas/2018/data/day_10 → src/2018/data/day_10
diff --git a/aoc_cas/2018/data/day_11 → src/2018/data/day_11 b/aoc_cas/2018/data/day_11 → src/2018/data/day_11
diff --git a/aoc_cas/2018/data/day_12 → src/2018/data/day_12 b/aoc_cas/2018/data/day_12 → src/2018/data/day_12
diff --git a/aoc_cas/2018/data/day_13 → src/2018/data/day_13 b/aoc_cas/2018/data/day_13 → src/2018/data/day_13
diff --git a/aoc_cas/2018/data/day_13_test → src/2018/data/day_13_test b/aoc_cas/2018/data/day_13_test → src/2018/data/day_13_test
diff --git a/aoc_cas/2018/data/day_2 → src/2018/data/day_2 b/aoc_cas/2018/data/day_2 → src/2018/data/day_2
diff --git a/aoc_cas/2018/data/day_3 → src/2018/data/day_3 b/aoc_cas/2018/data/day_3 → src/2018/data/day_3
diff --git a/aoc_cas/2018/data/day_4 → src/2018/data/day_4 b/aoc_cas/2018/data/day_4 → src/2018/data/day_4
diff --git a/aoc_cas/2018/data/day_5 → src/2018/data/day_5 b/aoc_cas/2018/data/day_5 → src/2018/data/day_5
diff --git a/aoc_cas/2018/data/day_6 → src/2018/data/day_6 b/aoc_cas/2018/data/day_6 → src/2018/data/day_6
diff --git a/aoc_cas/2018/data/day_7 → src/2018/data/day_7 b/aoc_cas/2018/data/day_7 → src/2018/data/day_7
diff --git a/aoc_cas/2018/data/day_8 → src/2018/data/day_8 b/aoc_cas/2018/data/day_8 → src/2018/data/day_8
diff --git a/aoc_cas/2018/data/day_9 → src/2018/data/day_9 b/aoc_cas/2018/data/day_9 → src/2018/data/day_9
diff --git a/aoc_cas/2018/day_1.py → src/2018/day_1.py b/aoc_cas/2018/day_1.py → src/2018/day_1.py
diff --git a/aoc_cas/2018/day_10.py → src/2018/day_10.py b/aoc_cas/2018/day_10.py → src/2018/day_10.py
diff --git a/aoc_cas/2018/day_11.py → src/2018/day_11.py b/aoc_cas/2018/day_11.py → src/2018/day_11.py
diff --git a/aoc_cas/2018/day_12.py → src/2018/day_12.py b/aoc_cas/2018/day_12.py → src/2018/day_12.py
diff --git a/aoc_cas/2018/day_13.py → src/2018/day_13.py b/aoc_cas/2018/day_13.py → src/2018/day_13.py
diff --git a/aoc_cas/2018/day_14.py → src/2018/day_14.py b/aoc_cas/2018/day_14.py → src/2018/day_14.py
diff --git a/aoc_cas/2018/day_2.py → src/2018/day_2.py b/aoc_cas/2018/day_2.py → src/2018/day_2.py
diff --git a/aoc_cas/2018/day_3.py → src/2018/day_3.py b/aoc_cas/2018/day_3.py → src/2018/day_3.py
diff --git a/aoc_cas/2018/day_4.py → src/2018/day_4.py b/aoc_cas/2018/day_4.py → src/2018/day_4.py
diff --git a/aoc_cas/2018/day_5.py → src/2018/day_5.py b/aoc_cas/2018/day_5.py → src/2018/day_5.py
diff --git a/aoc_cas/2018/day_6.py → src/2018/day_6.py b/aoc_cas/2018/day_6.py → src/2018/day_6.py
diff --git a/aoc_cas/2018/day_7.py → src/2018/day_7.py b/aoc_cas/2018/day_7.py → src/2018/day_7.py
diff --git a/aoc_cas/2018/day_8.py → src/2018/day_8.py b/aoc_cas/2018/day_8.py → src/2018/day_8.py
diff --git a/aoc_cas/2018/day_9.py → src/2018/day_9.py b/aoc_cas/2018/day_9.py → src/2018/day_9.py
diff --git a/aoc_cas/2018/utils.py → src/2018/utils.py b/aoc_cas/2018/utils.py → src/2018/utils.py
diff --git a/src/__init__.py b/src/__init__.py
@@ -0,0 +1,9 @@
+import importlib
+
+
+def solve(day, year, data):
+    moduleName = "aoc{}.day{}".format(year, day)
+    mod = importlib.import_module(moduleName)
+    part1 = mod.part1(data)
+    part2 = mod.part2(data)
+    return part1, part2
diff --git a/aoc_cas/aoc2019/__init__.py → src/aoc2015/__init__.py b/aoc_cas/aoc2019/__init__.py → src/aoc2015/__init__.py
diff --git a/aoc_cas/aoc2015/day1.py → src/aoc2015/day1.py b/aoc_cas/aoc2015/day1.py → src/aoc2015/day1.py
diff --git a/aoc_cas/aoc2015/day10.py → src/aoc2015/day10.py b/aoc_cas/aoc2015/day10.py → src/aoc2015/day10.py
diff --git a/aoc_cas/aoc2015/day11.py → src/aoc2015/day11.py b/aoc_cas/aoc2015/day11.py → src/aoc2015/day11.py
diff --git a/aoc_cas/aoc2015/day12.py → src/aoc2015/day12.py b/aoc_cas/aoc2015/day12.py → src/aoc2015/day12.py
diff --git a/aoc_cas/aoc2015/day13.py → src/aoc2015/day13.py b/aoc_cas/aoc2015/day13.py → src/aoc2015/day13.py
diff --git a/aoc_cas/aoc2015/day14.py → src/aoc2015/day14.py b/aoc_cas/aoc2015/day14.py → src/aoc2015/day14.py
diff --git a/aoc_cas/aoc2015/day15.py → src/aoc2015/day15.py b/aoc_cas/aoc2015/day15.py → src/aoc2015/day15.py
diff --git a/aoc_cas/aoc2015/day16.py → src/aoc2015/day16.py b/aoc_cas/aoc2015/day16.py → src/aoc2015/day16.py
diff --git a/aoc_cas/aoc2015/day17.py → src/aoc2015/day17.py b/aoc_cas/aoc2015/day17.py → src/aoc2015/day17.py
diff --git a/aoc_cas/aoc2015/day18.py → src/aoc2015/day18.py b/aoc_cas/aoc2015/day18.py → src/aoc2015/day18.py
diff --git a/aoc_cas/aoc2015/day19.py → src/aoc2015/day19.py b/aoc_cas/aoc2015/day19.py → src/aoc2015/day19.py
diff --git a/aoc_cas/aoc2015/day2.py → src/aoc2015/day2.py b/aoc_cas/aoc2015/day2.py → src/aoc2015/day2.py
diff --git a/aoc_cas/aoc2015/day20.py → src/aoc2015/day20.py b/aoc_cas/aoc2015/day20.py → src/aoc2015/day20.py
diff --git a/aoc_cas/aoc2015/day21.py → src/aoc2015/day21.py b/aoc_cas/aoc2015/day21.py → src/aoc2015/day21.py
diff --git a/aoc_cas/aoc2015/day22.py → src/aoc2015/day22.py b/aoc_cas/aoc2015/day22.py → src/aoc2015/day22.py
diff --git a/aoc_cas/aoc2015/day23.py → src/aoc2015/day23.py b/aoc_cas/aoc2015/day23.py → src/aoc2015/day23.py
diff --git a/aoc_cas/aoc2015/day24.py → src/aoc2015/day24.py b/aoc_cas/aoc2015/day24.py → src/aoc2015/day24.py
diff --git a/aoc_cas/aoc2015/day25.py → src/aoc2015/day25.py b/aoc_cas/aoc2015/day25.py → src/aoc2015/day25.py
diff --git a/aoc_cas/aoc2015/day3.py → src/aoc2015/day3.py b/aoc_cas/aoc2015/day3.py → src/aoc2015/day3.py
diff --git a/aoc_cas/aoc2015/day4.py → src/aoc2015/day4.py b/aoc_cas/aoc2015/day4.py → src/aoc2015/day4.py
diff --git a/aoc_cas/aoc2015/day5.py → src/aoc2015/day5.py b/aoc_cas/aoc2015/day5.py → src/aoc2015/day5.py
diff --git a/aoc_cas/aoc2015/day6.py → src/aoc2015/day6.py b/aoc_cas/aoc2015/day6.py → src/aoc2015/day6.py
diff --git a/aoc_cas/aoc2015/day7.py → src/aoc2015/day7.py b/aoc_cas/aoc2015/day7.py → src/aoc2015/day7.py
diff --git a/aoc_cas/aoc2015/day8.py → src/aoc2015/day8.py b/aoc_cas/aoc2015/day8.py → src/aoc2015/day8.py
diff --git a/aoc_cas/aoc2015/day9.py → src/aoc2015/day9.py b/aoc_cas/aoc2015/day9.py → src/aoc2015/day9.py
diff --git a/aoc_cas/aoc2020/__init__.py → src/aoc2016/__init__.py b/aoc_cas/aoc2020/__init__.py → src/aoc2016/__init__.py
diff --git a/aoc_cas/aoc2016/day1.py → src/aoc2016/day1.py b/aoc_cas/aoc2016/day1.py → src/aoc2016/day1.py
diff --git a/aoc_cas/aoc2016/day10.py → src/aoc2016/day10.py b/aoc_cas/aoc2016/day10.py → src/aoc2016/day10.py
diff --git a/aoc_cas/aoc2016/day11.py → src/aoc2016/day11.py b/aoc_cas/aoc2016/day11.py → src/aoc2016/day11.py
diff --git a/aoc_cas/aoc2016/day12.py → src/aoc2016/day12.py b/aoc_cas/aoc2016/day12.py → src/aoc2016/day12.py
diff --git a/aoc_cas/aoc2016/day13.py → src/aoc2016/day13.py b/aoc_cas/aoc2016/day13.py → src/aoc2016/day13.py
diff --git a/aoc_cas/aoc2016/day2.py → src/aoc2016/day2.py b/aoc_cas/aoc2016/day2.py → src/aoc2016/day2.py
diff --git a/aoc_cas/aoc2016/day3.py → src/aoc2016/day3.py b/aoc_cas/aoc2016/day3.py → src/aoc2016/day3.py
diff --git a/aoc_cas/aoc2016/day4.py → src/aoc2016/day4.py b/aoc_cas/aoc2016/day4.py → src/aoc2016/day4.py
diff --git a/aoc_cas/aoc2016/day5.py → src/aoc2016/day5.py b/aoc_cas/aoc2016/day5.py → src/aoc2016/day5.py
diff --git a/aoc_cas/aoc2016/day6.py → src/aoc2016/day6.py b/aoc_cas/aoc2016/day6.py → src/aoc2016/day6.py
diff --git a/aoc_cas/aoc2016/day7.py → src/aoc2016/day7.py b/aoc_cas/aoc2016/day7.py → src/aoc2016/day7.py
diff --git a/aoc_cas/aoc2016/day8.py → src/aoc2016/day8.py b/aoc_cas/aoc2016/day8.py → src/aoc2016/day8.py
diff --git a/aoc_cas/aoc2016/day9.py → src/aoc2016/day9.py b/aoc_cas/aoc2016/day9.py → src/aoc2016/day9.py
diff --git a/aoc_cas/aoc2016/template.py → src/aoc2016/template.py b/aoc_cas/aoc2016/template.py → src/aoc2016/template.py
diff --git a/aoc_cas/aoc2019/IntCodeComputer.py → src/aoc2019/IntCodeComputer.py b/aoc_cas/aoc2019/IntCodeComputer.py → src/aoc2019/IntCodeComputer.py
diff --git a/aoc_cas/aoc2021/__init__.py → src/aoc2019/__init__.py b/aoc_cas/aoc2021/__init__.py → src/aoc2019/__init__.py
diff --git a/aoc_cas/aoc2019/day1.py → src/aoc2019/day1.py b/aoc_cas/aoc2019/day1.py → src/aoc2019/day1.py
diff --git a/aoc_cas/aoc2019/day10.py → src/aoc2019/day10.py b/aoc_cas/aoc2019/day10.py → src/aoc2019/day10.py
diff --git a/aoc_cas/aoc2019/day11.py → src/aoc2019/day11.py b/aoc_cas/aoc2019/day11.py → src/aoc2019/day11.py
@@ -1,4 +1,4 @@
-from aoc_cas.aoc2019.IntCodeComputer import IntCodeComputerVM
+from aoc2019.IntCodeComputer import IntCodeComputerVM
 from collections import defaultdict
 
 BLACK = 0

diff --git a/aoc_cas/aoc2019/day12.py → src/aoc2019/day12.py b/aoc_cas/aoc2019/day12.py → src/aoc2019/day12.py
diff --git a/aoc_cas/aoc2019/day13.py → src/aoc2019/day13.py b/aoc_cas/aoc2019/day13.py → src/aoc2019/day13.py
diff --git a/aoc_cas/aoc2019/day14.py → src/aoc2019/day14.py b/aoc_cas/aoc2019/day14.py → src/aoc2019/day14.py
diff --git a/aoc_cas/aoc2019/day15.py → src/aoc2019/day15.py b/aoc_cas/aoc2019/day15.py → src/aoc2019/day15.py
diff --git a/aoc_cas/aoc2019/day16.py → src/aoc2019/day16.py b/aoc_cas/aoc2019/day16.py → src/aoc2019/day16.py
diff --git a/aoc_cas/aoc2019/day17.py → src/aoc2019/day17.py b/aoc_cas/aoc2019/day17.py → src/aoc2019/day17.py
diff --git a/aoc_cas/aoc2019/day18.py → src/aoc2019/day18.py b/aoc_cas/aoc2019/day18.py → src/aoc2019/day18.py
diff --git a/aoc_cas/aoc2019/day19.py → src/aoc2019/day19.py b/aoc_cas/aoc2019/day19.py → src/aoc2019/day19.py
diff --git a/aoc_cas/aoc2019/day2.py → src/aoc2019/day2.py b/aoc_cas/aoc2019/day2.py → src/aoc2019/day2.py
diff --git a/aoc_cas/aoc2019/day20.py → src/aoc2019/day20.py b/aoc_cas/aoc2019/day20.py → src/aoc2019/day20.py
diff --git a/aoc_cas/aoc2019/day21.py → src/aoc2019/day21.py b/aoc_cas/aoc2019/day21.py → src/aoc2019/day21.py
@@ -1,4 +1,4 @@
-from aoc_cas.aoc2019.IntCodeComputer import IntCodeComputerVM, read_program
+from aoc2019.IntCodeComputer import IntCodeComputerVM, read_program
 
 
 def instructions(*inputs):

diff --git a/aoc_cas/aoc2019/day22.py → src/aoc2019/day22.py b/aoc_cas/aoc2019/day22.py → src/aoc2019/day22.py
diff --git a/aoc_cas/aoc2019/day24.py → src/aoc2019/day24.py b/aoc_cas/aoc2019/day24.py → src/aoc2019/day24.py
diff --git a/aoc_cas/aoc2019/day3.py → src/aoc2019/day3.py b/aoc_cas/aoc2019/day3.py → src/aoc2019/day3.py
diff --git a/aoc_cas/aoc2019/day4.py → src/aoc2019/day4.py b/aoc_cas/aoc2019/day4.py → src/aoc2019/day4.py
diff --git a/aoc_cas/aoc2019/day5.py → src/aoc2019/day5.py b/aoc_cas/aoc2019/day5.py → src/aoc2019/day5.py
diff --git a/aoc_cas/aoc2019/day6.py → src/aoc2019/day6.py b/aoc_cas/aoc2019/day6.py → src/aoc2019/day6.py
diff --git a/aoc_cas/aoc2019/day7.py → src/aoc2019/day7.py b/aoc_cas/aoc2019/day7.py → src/aoc2019/day7.py
diff --git a/aoc_cas/aoc2019/day8.py → src/aoc2019/day8.py b/aoc_cas/aoc2019/day8.py → src/aoc2019/day8.py
diff --git a/aoc_cas/aoc2019/day9.py → src/aoc2019/day9.py b/aoc_cas/aoc2019/day9.py → src/aoc2019/day9.py
diff --git a/aoc_cas/aoc2019/template.py → src/aoc2019/template.py b/aoc_cas/aoc2019/template.py → src/aoc2019/template.py
diff --git a/aoc_cas/aoc2019/utils.py → src/aoc2019/utils.py b/aoc_cas/aoc2019/utils.py → src/aoc2019/utils.py
diff --git a/src/aoc2020/__init__.py b/src/aoc2020/__init__.py
diff --git a/aoc_cas/aoc2020/day1.py → src/aoc2020/day1.py b/aoc_cas/aoc2020/day1.py → src/aoc2020/day1.py
diff --git a/aoc_cas/aoc2020/day10.py → src/aoc2020/day10.py b/aoc_cas/aoc2020/day10.py → src/aoc2020/day10.py
diff --git a/aoc_cas/aoc2020/day11.py → src/aoc2020/day11.py b/aoc_cas/aoc2020/day11.py → src/aoc2020/day11.py
diff --git a/aoc_cas/aoc2020/day12.py → src/aoc2020/day12.py b/aoc_cas/aoc2020/day12.py → src/aoc2020/day12.py
diff --git a/aoc_cas/aoc2020/day13.py → src/aoc2020/day13.py b/aoc_cas/aoc2020/day13.py → src/aoc2020/day13.py
diff --git a/aoc_cas/aoc2020/day14.py → src/aoc2020/day14.py b/aoc_cas/aoc2020/day14.py → src/aoc2020/day14.py
diff --git a/aoc_cas/aoc2020/day15.py → src/aoc2020/day15.py b/aoc_cas/aoc2020/day15.py → src/aoc2020/day15.py
diff --git a/aoc_cas/aoc2020/day16.py → src/aoc2020/day16.py b/aoc_cas/aoc2020/day16.py → src/aoc2020/day16.py
diff --git a/aoc_cas/aoc2020/day17.py → src/aoc2020/day17.py b/aoc_cas/aoc2020/day17.py → src/aoc2020/day17.py
diff --git a/aoc_cas/aoc2020/day18.py → src/aoc2020/day18.py b/aoc_cas/aoc2020/day18.py → src/aoc2020/day18.py
diff --git a/aoc_cas/aoc2020/day19.py → src/aoc2020/day19.py b/aoc_cas/aoc2020/day19.py → src/aoc2020/day19.py
diff --git a/aoc_cas/aoc2020/day2.py → src/aoc2020/day2.py b/aoc_cas/aoc2020/day2.py → src/aoc2020/day2.py
diff --git a/aoc_cas/aoc2020/day20.py → src/aoc2020/day20.py b/aoc_cas/aoc2020/day20.py → src/aoc2020/day20.py
diff --git a/aoc_cas/aoc2020/day21.py → src/aoc2020/day21.py b/aoc_cas/aoc2020/day21.py → src/aoc2020/day21.py
diff --git a/aoc_cas/aoc2020/day22.py → src/aoc2020/day22.py b/aoc_cas/aoc2020/day22.py → src/aoc2020/day22.py
diff --git a/aoc_cas/aoc2020/day23.py → src/aoc2020/day23.py b/aoc_cas/aoc2020/day23.py → src/aoc2020/day23.py
diff --git a/aoc_cas/aoc2020/day24.py → src/aoc2020/day24.py b/aoc_cas/aoc2020/day24.py → src/aoc2020/day24.py
diff --git a/aoc_cas/aoc2020/day25.py → src/aoc2020/day25.py b/aoc_cas/aoc2020/day25.py → src/aoc2020/day25.py
diff --git a/aoc_cas/aoc2020/day3.py → src/aoc2020/day3.py b/aoc_cas/aoc2020/day3.py → src/aoc2020/day3.py
diff --git a/aoc_cas/aoc2020/day4.py → src/aoc2020/day4.py b/aoc_cas/aoc2020/day4.py → src/aoc2020/day4.py
diff --git a/aoc_cas/aoc2020/day5.py → src/aoc2020/day5.py b/aoc_cas/aoc2020/day5.py → src/aoc2020/day5.py
diff --git a/aoc_cas/aoc2020/day6.py → src/aoc2020/day6.py b/aoc_cas/aoc2020/day6.py → src/aoc2020/day6.py
diff --git a/aoc_cas/aoc2020/day7.py → src/aoc2020/day7.py b/aoc_cas/aoc2020/day7.py → src/aoc2020/day7.py
diff --git a/aoc_cas/aoc2020/day8.py → src/aoc2020/day8.py b/aoc_cas/aoc2020/day8.py → src/aoc2020/day8.py
diff --git a/aoc_cas/aoc2020/day9.py → src/aoc2020/day9.py b/aoc_cas/aoc2020/day9.py → src/aoc2020/day9.py
diff --git a/src/aoc2021/__init__.py b/src/aoc2021/__init__.py
diff --git a/aoc_cas/aoc2021/day1.py → src/aoc2021/day1.py b/aoc_cas/aoc2021/day1.py → src/aoc2021/day1.py
diff --git a/aoc_cas/aoc2021/day10.py → src/aoc2021/day10.py b/aoc_cas/aoc2021/day10.py → src/aoc2021/day10.py
diff --git a/aoc_cas/aoc2021/day11.py → src/aoc2021/day11.py b/aoc_cas/aoc2021/day11.py → src/aoc2021/day11.py
diff --git a/aoc_cas/aoc2021/day12.py → src/aoc2021/day12.py b/aoc_cas/aoc2021/day12.py → src/aoc2021/day12.py
diff --git a/aoc_cas/aoc2021/day13.py → src/aoc2021/day13.py b/aoc_cas/aoc2021/day13.py → src/aoc2021/day13.py
diff --git a/aoc_cas/aoc2021/day14.py → src/aoc2021/day14.py b/aoc_cas/aoc2021/day14.py → src/aoc2021/day14.py
diff --git a/aoc_cas/aoc2021/day15.py → src/aoc2021/day15.py b/aoc_cas/aoc2021/day15.py → src/aoc2021/day15.py
diff --git a/aoc_cas/aoc2021/day16.py → src/aoc2021/day16.py b/aoc_cas/aoc2021/day16.py → src/aoc2021/day16.py
diff --git a/aoc_cas/aoc2021/day17.py → src/aoc2021/day17.py b/aoc_cas/aoc2021/day17.py → src/aoc2021/day17.py
diff --git a/aoc_cas/aoc2021/day18.py → src/aoc2021/day18.py b/aoc_cas/aoc2021/day18.py → src/aoc2021/day18.py
diff --git a/aoc_cas/aoc2021/day19.py → src/aoc2021/day19.py b/aoc_cas/aoc2021/day19.py → src/aoc2021/day19.py
diff --git a/aoc_cas/aoc2021/day2.py → src/aoc2021/day2.py b/aoc_cas/aoc2021/day2.py → src/aoc2021/day2.py
diff --git a/aoc_cas/aoc2021/day3.py → src/aoc2021/day3.py b/aoc_cas/aoc2021/day3.py → src/aoc2021/day3.py
diff --git a/aoc_cas/aoc2021/day4.py → src/aoc2021/day4.py b/aoc_cas/aoc2021/day4.py → src/aoc2021/day4.py
diff --git a/aoc_cas/aoc2021/day5.py → src/aoc2021/day5.py b/aoc_cas/aoc2021/day5.py → src/aoc2021/day5.py
diff --git a/aoc_cas/aoc2021/day6.py → src/aoc2021/day6.py b/aoc_cas/aoc2021/day6.py → src/aoc2021/day6.py
diff --git a/aoc_cas/aoc2021/day7.py → src/aoc2021/day7.py b/aoc_cas/aoc2021/day7.py → src/aoc2021/day7.py
diff --git a/aoc_cas/aoc2021/day8.py → src/aoc2021/day8.py b/aoc_cas/aoc2021/day8.py → src/aoc2021/day8.py
diff --git a/aoc_cas/aoc2021/day9.py → src/aoc2021/day9.py b/aoc_cas/aoc2021/day9.py → src/aoc2021/day9.py
diff --git a/aoc_cas/aoc2021/template.py → src/aoc2021/template.py b/aoc_cas/aoc2021/template.py → src/aoc2021/template.py
diff --git a/aoc_cas/aoc2022/__init__.py → src/aoc2022/__init__.py b/aoc_cas/aoc2022/__init__.py → src/aoc2022/__init__.py
diff --git a/aoc_cas/aoc2022/day1.py → src/aoc2022/day1.py b/aoc_cas/aoc2022/day1.py → src/aoc2022/day1.py
diff --git a/aoc_cas/aoc2022/day10.py → src/aoc2022/day10.py b/aoc_cas/aoc2022/day10.py → src/aoc2022/day10.py
diff --git a/aoc_cas/aoc2022/day11.py → src/aoc2022/day11.py b/aoc_cas/aoc2022/day11.py → src/aoc2022/day11.py
diff --git a/aoc_cas/aoc2022/day12.py → src/aoc2022/day12.py b/aoc_cas/aoc2022/day12.py → src/aoc2022/day12.py
diff --git a/aoc_cas/aoc2022/day13.py → src/aoc2022/day13.py b/aoc_cas/aoc2022/day13.py → src/aoc2022/day13.py
diff --git a/aoc_cas/aoc2022/day14.py → src/aoc2022/day14.py b/aoc_cas/aoc2022/day14.py → src/aoc2022/day14.py
diff --git a/aoc_cas/aoc2022/day15.py → src/aoc2022/day15.py b/aoc_cas/aoc2022/day15.py → src/aoc2022/day15.py
diff --git a/aoc_cas/aoc2022/day16.py → src/aoc2022/day16.py b/aoc_cas/aoc2022/day16.py → src/aoc2022/day16.py
diff --git a/aoc_cas/aoc2022/day2.py → src/aoc2022/day2.py b/aoc_cas/aoc2022/day2.py → src/aoc2022/day2.py
diff --git a/aoc_cas/aoc2022/day3.py → src/aoc2022/day3.py b/aoc_cas/aoc2022/day3.py → src/aoc2022/day3.py
diff --git a/aoc_cas/aoc2022/day4.py → src/aoc2022/day4.py b/aoc_cas/aoc2022/day4.py → src/aoc2022/day4.py
diff --git a/aoc_cas/aoc2022/day5.py → src/aoc2022/day5.py b/aoc_cas/aoc2022/day5.py → src/aoc2022/day5.py
diff --git a/aoc_cas/aoc2022/day6.py → src/aoc2022/day6.py b/aoc_cas/aoc2022/day6.py → src/aoc2022/day6.py
diff --git a/aoc_cas/aoc2022/day7.py → src/aoc2022/day7.py b/aoc_cas/aoc2022/day7.py → src/aoc2022/day7.py
diff --git a/aoc_cas/aoc2022/day8.py → src/aoc2022/day8.py b/aoc_cas/aoc2022/day8.py → src/aoc2022/day8.py
diff --git a/aoc_cas/aoc2022/day9.py → src/aoc2022/day9.py b/aoc_cas/aoc2022/day9.py → src/aoc2022/day9.py
diff --git a/aoc_cas/aoc2022/template.py → src/aoc2022/template.py b/aoc_cas/aoc2022/template.py → src/aoc2022/template.py
diff --git a/src/aoc2023/__init__.py b/src/aoc2023/__init__.py
diff --git a/src/aoc2023/day1.py b/src/aoc2023/day1.py
@@ -0,0 +1,44 @@
+def part1(data):
+    def get_edge_sum(line):
+        digits = [int(char) for char in line if char.isdigit()]
+        res = digits[0] * 10 + digits[-1]
+        return res
+
+    return sum(map(get_edge_sum, data.splitlines()))
+
+
+def part2(data):
+    spelled_out = {
+        "1": 1,
+        "2": 2,
+        "3": 3,
+        "4": 4,
+        "5": 5,
+        "6": 6,
+        "7": 7,
+        "8": 8,
+        "9": 9,
+        "one": 1,
+        "two": 2,
+        "three": 3,
+        "four": 4,
+        "five": 5,
+        "six": 6,
+        "seven": 7,
+        "eight": 8,
+        "nine": 9,
+    }
+    result = 0
+    for line in data.splitlines():
+        left_digit = min(((line + k).find(k), v) for k, v in spelled_out.items())[1]
+        right_digit = max((line.rfind(k), v) for k, v in spelled_out.items())[1]
+        result += 10 * left_digit + right_digit
+    return result
+
+
+if __name__ == "__main__":
+    from aocd import get_data
+
+    data = get_data(year=2023, day=1)
+    print(part1(data))
+    print(part2(data))
diff --git a/src/scripts/__init__.py b/src/scripts/__init__.py
@@ -0,0 +1,8 @@
+import importlib
+
+# def solve(day, year, data):
+#     moduleName = "aoc{}.day{}".format(year, day)
+#     mod = importlib.import_module(moduleName)
+#     part1 = mod.part1(data)
+#     part2 = mod.part2(data)
+#     return part1, part2
diff --git a/src/scripts/cli.py b/src/scripts/cli.py
@@ -0,0 +1,44 @@
+# import argparse
+# import importlib
+# from aocd import get_data
+# parser = argparse.ArgumentParser(description="Process some integers.")
+# parser.add_argument("--year", "-y", type=int, default=2021)
+# parser.add_argument("--day", "-d", type=int)
+# parser.add_argument("--file", "-f", type=argparse.FileType("r"))
+#
+# args = parser.parse_args()
+#
+#
+#
+#
+# def main():
+#     moduleName = "aoc{}.day{}".format(args.year, args.day)
+#     try:
+#         mod = importlib.import_module(moduleName)
+#     except:
+#         raise Exception(f"Unable to load module %s" % moduleName)
+#     if args.file:
+#         data = args.file.read()
+#     else:
+#         data = get_data(day=args.day, year=args.year)
+#     part1 = mod.part1(data)
+#     part2 = mod.part2(data)
+#
+#     return part1, part2
+#
+#
+# if __name__ == "__main__":
+#     print(main())
+
+
+import click
+
+
+@click.command()
+def mycommand():
+    """Your command description."""
+    # Your command logic here
+    print("Running my command...")
+
+
+print("poop")
diff --git a/tests/2019/__init__.py b/tests/2019/__init__.py
diff --git a/test/2019/test_2019_day16.py → tests/2019/test_2019_day16.py b/test/2019/test_2019_day16.py → tests/2019/test_2019_day16.py
@@ -1,4 +1,4 @@
-from aoc_cas.aoc2019 import day16 as aoc
+from aoc2019 import day16 as aoc
 
 
 def testPart1():

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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