Refactor 2024 (#15)

* refactor 2023 code

* convert to dat file xt

* renaming

* fix input file typo

* refactoring

* remove txt files

* refacotr inputs and tessts filenames

* fix filenaming

* add run_all_solutions.py sscript

* ruff

Author: jameslawlor

Makefile

@@ -1,33 +1,23 @@
 .PHONY: all clean black flake test solutions 
 
 # Default target
-all: black flake test solutions clean
+all: ruff test solutions clean
 
 # Clean temporary and generated files
 clean:
 	find . \( -type f -name '*.pyc' -or -type d -name '__pycache__' \) -delete
 	find . \( -type d -name '.eggs' -or -type d -name '*.egg-info' -or -type d -name '.pytest_cache' \) | xargs rm -rf
 
 # Format code using black
-black:
-	black ./src ./tests
-
-# Run flake8 for linting
-flake:
-	flake8 ./src ./tests
+ruff:
+	ruff check .
 
 # Run tests
 test:
 	python3 -m pytest
 
-# Run specific solutions for Advent of Code 2023
 solutions:
-	python3 src/advent_of_code/year_2023/days/1.py --input_file inputs/2023/1.txt --part 1
-	python3 src/advent_of_code/year_2023/days/1.py --input_file inputs/2023/1.txt --part 2
-	python3 src/advent_of_code/year_2023/days/2.py --input_file inputs/2023/2.txt
-	python3 src/advent_of_code/year_2023/days/3.py --input_file inputs/2023/3.txt
-	python3 src/advent_of_code/year_2023/days/4.py --input_file inputs/2023/4.txt
-	python3 src/advent_of_code/year_2023/days/6.py --input_file inputs/2023/6.txt
+	python3 scripts/run_all_solutions.py
 
 .PHONY: new-day-skeleton-files-from-template
 new-day-skeleton-files-from-template:

inputs/2023/1.txt renamed to inputs/year_2023/01.dat

@@ -1,5 +1,4 @@
-black==23.12.1
-flake8==6.1.0
+ruff==0.1.9
 numpy==1.26.2
 pytest==7.4.3
 setuptools==68.2.2

inputs/2023/2.txt renamed to inputs/year_2023/02.dat

@@ -0,0 +1,48 @@
+import os
+import re
+import subprocess
+
+BASE_DIR = "src/advent_of_code"
+YEARS_DIR = os.path.join(BASE_DIR, "year_")
+RUN_DAY_SCRIPT = "scripts/run_day.py"
+INPUTS_DIR = "inputs"
+
+def discover_and_run_solutions():
+    # Regex to match "day_<number>.py"
+    day_pattern = re.compile(r"day_(\d{2})\.py")
+    
+    for year in sorted(os.listdir(BASE_DIR)):
+        if year.startswith("year_"):
+            year_path = os.path.join(BASE_DIR, year)
+            year_number = year.split("_")[1]
+
+            # Look for days in the "days" directory
+            days_dir = os.path.join(year_path)
+            for file in sorted(os.listdir(days_dir)):
+                match = day_pattern.match(file)
+                if match:
+                    day_number = match.group(1)
+
+                    # Build input file path
+                    input_file = os.path.join(INPUTS_DIR, f"year_{year_number}", f"{day_number}.dat")
+                    if not os.path.exists(input_file):
+                        print(f"Input file for {year_number} Day {day_number} not found, skipping.")
+                        continue
+
+                    # Run the solution using run_day.py
+                    try:
+                        print(f"Running {year_number} Day {day_number}...")
+                        subprocess.run(
+                            [
+                                "python3", RUN_DAY_SCRIPT,
+                                "--year", year_number,
+                                "--day", str(int(day_number)),  # Remove leading zero for argument
+                            ],
+                            check=True
+                        )
+                        print("\n")
+                    except subprocess.CalledProcessError as e:
+                        print(f"Error running {year_number} Day {day_number}: {e}")
+
+if __name__ == "__main__":
+    discover_and_run_solutions()

inputs/2023/3.txt renamed to inputs/year_2023/03.dat

@@ -0,0 +1,44 @@
+import importlib
+import sys
+import argparse
+
+def main():
+    parser = argparse.ArgumentParser(description="Run a specific Advent of Code solution.")
+    # parser.add_argument(
+    #     "--input_file", 
+    #     required=True, 
+    #     type=str, 
+    #     help="Path to the input file for the day's solution."
+    # )
+    parser.add_argument(
+        "--year", 
+        required=True, 
+        type=int, 
+    )
+    parser.add_argument(
+        "--day", 
+        required=True, 
+        type=str, 
+    )
+
+    args = parser.parse_args()
+    day_zero_padded_str = str(args.day).zfill(2)
+    input_file = f"inputs/year_{args.year}/{day_zero_padded_str}.dat"
+
+    day_module = f"advent_of_code.year_{args.year}.day_{day_zero_padded_str}"
+
+    try:
+        # Dynamically import the module for the specified day
+        module = importlib.import_module(day_module)
+        # Run the solution (assumes each solver module has a `main()` function)
+        if hasattr(module, "main"):
+            module.main(input_file)
+        else:
+            print("man")
+            print(f"The module {day_module} does not have a 'main(input_file)' function.")
+    except ModuleNotFoundError:
+        print(f"Could not find module: {day_module}")
+        sys.exit(1)
+
+if __name__ == "__main__":
+    main()