Some clean up

Author: Emrys-Merlin

.pre-commit-config.yaml

@@ -7,11 +7,6 @@ repos:
           - id: check-yaml
           - id: check-added-large-files
 
-    - repo: https://github.com/psf/black
-      rev: 23.11.0
-      hooks:
-          - id: black
-
     - repo: https://github.com/astral-sh/ruff-pre-commit
       # Ruff version.
       rev: v0.1.6

2024/README.md

@@ -0,0 +1,27 @@
+# My solutions for Advent of Code 2024
+
+I decided together with some friends to learn [Rust](https://www.rust-lang.org/) with this year's AoC. So all except one task (day 24 task 2) were solved in Rust. For the one task, I ended up using a semi-manual approach using graph plotting (with graphviz). To speed up the plotting process, I decided to resort to python. I might add a rust solution in the futures.
+
+## Solutions
+
+| Day | 01 | 02 | 03 | 04 | 05 | 06 | 07 | 08 | 09 | 10 | 11 | 12 | 13 |
+| --- | -- | -- | -- | -- | -- | -- | -- | -- | -- | -- | -- | -- | -- |
+| Task 01 | [![ferris]](./rust/src/day01.rs) | [![ferris]](./rust/src/day02.rs) | [![ferris]](./rust/src/day03.rs) | [![ferris]](./rust/src/day04.rs) | [![ferris]](./rust/src/day05.rs) | [![ferris]](./rust/src/day06.rs) | [![ferris]](./rust/src/day07.rs) | [![ferris]](./rust/src/day08.rs) | [![ferris]](./rust/src/day09.rs) | [![ferris]](./rust/src/day10.rs) | [![ferris]](./rust/src/day11.rs) | [![ferris]](./rust/src/day12.rs) | [![ferris]](./rust/src/day13.rs) |
+| Task 02 | [![ferris]](./rust/src/day01.rs) | [![ferris]](./rust/src/day02.rs) | [![ferris]](./rust/src/day03.rs) | [![ferris]](./rust/src/day04.rs) | [![ferris]](./rust/src/day05.rs) | [![ferris]](./rust/src/day06.rs) | [![ferris]](./rust/src/day07.rs) | [![ferris]](./rust/src/day08.rs) | [![ferris]](./rust/src/day09.rs) | [![ferris]](./rust/src/day10.rs) | [![ferris]](./rust/src/day11.rs) | [![ferris]](./rust/src/day12.rs) | [![ferris]](./rust/src/day13.rs) |
+
+| Day |  14 | 15 | 16 | 17 | 18 | 19 | 20 |21 | 22 | 23 | 24 | 25 |
+| --- |  -- | -- | -- | -- | -- | -- | -- |-- | -- | -- | -- | -- |
+| Task 01 | [![ferris]](./rust/src/day14.rs) | [![ferris]](./rust/src/day15.rs) | [![ferris]](./rust/src/day16.rs) | [![ferris]](./rust/src/day17.rs) | [![ferris]](./rust/src/day18.rs) | [![ferris]](./rust/src/day19.rs) | [![ferris]](./rust/src/day20.rs) | [![ferris]](./rust/src/day21.rs) | [![ferris]](./rust/src/day22.rs) | [![ferris]](./rust/src/day23.rs) | [![ferris]](./rust/src/day24.rs) | [![ferris]](./rust/src/day25.rs) |
+| Task 02 | [![ferris]](./rust/src/day14.rs) | [![ferris]](./rust/src/day15.rs) | [![ferris]](./rust/src/day16.rs) | [![ferris]](./rust/src/day17.rs) | [![ferris]](./rust/src/day18.rs) | [![ferris]](./rust/src/day19.rs) | [![ferris]](./rust/src/day20.rs) | [![ferris]](./rust/src/day21.rs) | [![ferris]](./rust/src/day22.rs) | [![ferris]](./rust/src/day23.rs) | [<img src="https://upload.wikimedia.org/wikipedia/commons/c/c3/Python-logo-notext.svg" width="18"/>](./python/src/aoc2024/day24.py) | :star: |
+
+The ferris icon is licensed under CC0 and can be found [here](https://commons.wikimedia.org/wiki/File:Original_Ferris.svg).
+The python icon is licensed under the GPL and can be found [here](https://en.m.wikipedia.org/wiki/File:Python-logo-notext.svg).
+
+## Structure
+
+- [`examples`](./examples) contains the examples as separate files. The file names follow the format `day{day:02d}_{counter:02d}.txt`
+- [`inputs`](./inputs) the same for the inputs, but without the counter, i.e., `day{day:02d}.txt`.
+- The other directories are named after a programming language and contain the solutions to AoC in that programming language. This year, there is a [`rust`](./rust) and a [`python`](./python) directory. The READMEs in each directory tell you how to run the solutions.
+
+[ferris]: https://upload.wikimedia.org/wikipedia/commons/0/0f/Original_Ferris.svg
+[python]: https://upload.wikimedia.org/wikipedia/commons/c/c3/Python-logo-notext.svg

2024/python/README.md

@@ -1,3 +1,37 @@
 # Solutions for AoC 2024
 
 This year I wanted to learn rust. So, all except one task were solved in rust only. I took a semi-manual approach for day24 part2 which required to plot a graph using graphviz. The tooling for python seemed easier than the one for rust, so I decided to go for python to speed up the process.
+
+## Setup
+
+Make sure you have [uv](https://docs.astral.sh/uv/getting-started/installation/) installed.
+
+
+## Run an example
+
+To run an example, you can simply run:
+```shell
+uv run aoc2024 <day> <task> -e <example_id>
+```
+For example, if you want to run the first example for day 13 task 2, you would enter
+
+```shell
+uv run aoc2024 13 2 -e 1
+```
+
+## Run a solution
+
+To run a solution, you can simply leave out the `-e <example_id>`:
+```shell
+uv run aoc2024 <day> <task>
+```
+For example, if you want to run the solution for day 16 task 1, you would enter
+
+```shell
+uv run aoc2024 16 1
+```
+
+## Future directions
+
+1. Adding unittests
+2. Adding timing information

2024/rust.code-workspace

@@ -10,5 +10,8 @@
 			"path": "inputs"
 		}
 	],
-	"settings": {}
-}
+	"settings": {
+		"editor.formatOnSave": true,
+		"editor.defaultFormatter": "rust-lang.rust-analyzer"
+	}
+}

2024/rust/README.md

@@ -0,0 +1,34 @@
+# My solutions for Advent of Code 2024 in Rust
+
+## Setup
+
+Make sure you have [Rust installed](https://www.rust-lang.org/tools/install).
+
+## Run an example
+
+To run an example, you can simply run:
+```shell
+cargo run -- <day> <task> -e <example_id>
+```
+The double-dash between `run` and the arguments is important. For example, if you want to run the first example for day 13 task 2, you would enter
+
+```shell
+cargo run -- 13 2 -e 1
+```
+
+## Run a solution
+
+To run a solution, you can simply leave out the `-e <example_id>`:
+```shell
+cargo run -- <day> <task>
+```
+The double-dash between `run` and the arguments is important. For example, if you want to run the solution for day 16 task 1, you would enter
+
+```shell
+cargo run -- 16 1
+```
+
+## Future directions
+
+1. Adding unittests
+2. Adding timing information

2024/rust/src/day01.rs

@@ -51,4 +51,4 @@ pub fn task02(input: &str) -> String {
     }
 
     result.to_string()
-}
+}

2024/rust/src/day02.rs

@@ -6,21 +6,24 @@ pub fn task01(input: &str) -> String {
             continue;
         }
 
-        let parts: Vec<i32> = trimmed_line.split(" ").map(|x| x.trim().parse().expect("Should contain integers")).collect();
+        let parts: Vec<i32> = trimmed_line
+            .split(" ")
+            .map(|x| x.trim().parse().expect("Should contain integers"))
+            .collect();
         let mut safe: bool = true;
 
         let mut last = parts[1];
         let mut delta = parts[1] - parts[0];
-        if delta.abs() > 3  || delta == 0 {
-            continue
+        if delta.abs() > 3 || delta == 0 {
+            continue;
         }
 
         for i in 2..parts.len() {
             let current = parts[i];
             let new_delta = current - last;
-            if new_delta.abs() > 3 || new_delta == 0  || new_delta*delta < 0 {
+            if new_delta.abs() > 3 || new_delta == 0 || new_delta * delta < 0 {
                 safe = false;
-                break
+                break;
             }
             delta = new_delta;
             last = current;
@@ -41,7 +44,10 @@ pub fn task02(input: &str) -> String {
             continue;
         }
 
-        let parts: Vec<i32> = trimmed_line.split(" ").map(|x| x.trim().parse().expect("Should contain integers")).collect();
+        let parts: Vec<i32> = trimmed_line
+            .split(" ")
+            .map(|x| x.trim().parse().expect("Should contain integers"))
+            .collect();
 
         for skip in 0..parts.len() {
             let mut safe: bool = true;
@@ -55,28 +61,28 @@ pub fn task02(input: &str) -> String {
 
             let mut last = parts[i1];
             let mut delta = parts[i1] - parts[i0];
-            if delta.abs() > 3  || delta == 0 {
-                continue
+            if delta.abs() > 3 || delta == 0 {
+                continue;
             }
 
             for i in offset..parts.len() {
                 if i == skip {
-                    continue
+                    continue;
                 }
                 let current = parts[i];
                 let new_delta = current - last;
-                if new_delta.abs() > 3 || new_delta == 0  || new_delta*delta < 0 {
+                if new_delta.abs() > 3 || new_delta == 0 || new_delta * delta < 0 {
                     safe = false;
-                    break
+                    break;
                 }
                 delta = new_delta;
                 last = current;
             }
             if safe {
                 safe_lines += 1;
-                break
+                break;
             }
         }
     }
     safe_lines.to_string()
-}
+}

2024/rust/src/day03.rs

@@ -2,12 +2,13 @@ use regex::Regex;
 
 fn task(input: &str) -> i32 {
     let re = Regex::new(r"mul\((?<left>\d+),(?<right>\d+)\)").unwrap();
-    re.captures_iter(input).map(|m| {
-        let left = m.name("left").unwrap().as_str().parse::<i32>().unwrap();
-        let right = m.name("right").unwrap().as_str().parse::<i32>().unwrap();
-        left * right
-    }).sum()
-
+    re.captures_iter(input)
+        .map(|m| {
+            let left = m.name("left").unwrap().as_str().parse::<i32>().unwrap();
+            let right = m.name("right").unwrap().as_str().parse::<i32>().unwrap();
+            left * right
+        })
+        .sum()
 }
 
 pub fn task01(input: &str) -> String {
@@ -16,11 +17,11 @@ pub fn task01(input: &str) -> String {
 }
 
 pub fn task02(mut input: &str) -> String {
-    input = input.trim();   
+    input = input.trim();
     let mut active = true;
 
     let mut result = 0;
-    let mut content: &str; 
+    let mut content: &str;
     while input.len() != 0 {
         if active {
             (content, input) = input.split_once("don't()").unwrap_or((input, ""));
@@ -30,7 +31,6 @@ pub fn task02(mut input: &str) -> String {
             (_, input) = input.split_once("do()").unwrap_or((input, ""));
             active = true
         }
-
     }
     result.to_string()
-}
+}