reorg cont'd

Author: rene-d

2015/day21/day21.rs

@@ -1,6 +1,5 @@
 //! [Day 21: RPG Simulator 20XX](https://adventofcode.com/2015/day/21)
 
-//! [Day 21: RPG Simulator 20XX](https://adventofcode.com/2015/day/21)
 use std::cmp::{max, min};
 use std::str::FromStr;
 
@@ -153,41 +152,23 @@ Defense +3   80     0       3
     (min_win_cost, max_loose_cost)
 }
 
-struct Puzzle {
-    min_win_cost: i32,
-    max_loose_cost: i32,
-}
+fn solve(data: &str) -> (i32, i32) {
+    let mut boss = Character::new("boss", 0, 0, 0);
 
-impl Puzzle {
-    const fn new() -> Self {
-        Self {
-            min_win_cost: 0,
-            max_loose_cost: 0,
+    for line in data.lines() {
+        let parts: Vec<&str> = line.split(": ").collect();
+        match parts.first() {
+            Some(&"Hit Points") => boss.hitpoints = parts[1].parse().unwrap(),
+            Some(&"Damage") => boss.damage = parts[1].parse().unwrap(),
+            Some(&"Armor") => boss.armor = parts[1].parse().unwrap(),
+            _ => {}
         }
     }
 
-    /// Get the puzzle input.
-    fn solve(&mut self, data: &str) {
-        let mut boss = Character::new("boss", 0, 0, 0);
-
-        for line in data.lines() {
-            let parts: Vec<&str> = line.split(": ").collect();
-            match parts.first() {
-                Some(&"Hit Points") => boss.hitpoints = parts[1].parse().unwrap(),
-                Some(&"Damage") => boss.damage = parts[1].parse().unwrap(),
-                Some(&"Armor") => boss.armor = parts[1].parse().unwrap(),
-                _ => {}
-            }
-        }
-
-        (self.min_win_cost, self.max_loose_cost) = play(&boss);
-    }
+    play(&boss)
 }
 
 fn main() {
-    let args = aoc::parse_args();
-    let mut puzzle = Puzzle::new();
-    puzzle.solve(&args.input);
-    println!("{}", puzzle.min_win_cost);
-    println!("{}", puzzle.max_loose_cost);
+    let mut args = aoc::parse_args();
+    args.run(solve);
 }

2019/day13/day13.py

@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 # [Day 13: Care Package](https://adventofcode.com/2019/day/13)
 
+import argparse
 import sys
 import time
 from pathlib import Path
-import argparse
 
 sys.path.append(Path(__file__).parent.parent.as_posix())
 from intcode.Intcode import Computer  # noqa
@@ -124,6 +124,7 @@ def main():
 
     parser = argparse.ArgumentParser()
     parser.add_argument("-v", "--verbose", action="store_true")
+    parser.add_argument("--elapsed", action="store_true")
     parser.add_argument("-p", "--play", action="store_true", help="play the game")
     parser.add_argument("input", nargs="?", default="input.txt")
     args = parser.parse_args()

2019/day25/day25.py

@@ -176,6 +176,7 @@ def main():
 
     parser = argparse.ArgumentParser()
     parser.add_argument("-v", "--verbose", action="store_true")
+    parser.add_argument("--elapsed", action="store_true")
     parser.add_argument("input", nargs="?", default="input.txt")
     args = parser.parse_args()
 

2023/day10/day10.py

@@ -9,6 +9,7 @@
 from shapely.geometry.polygon import Polygon
 
 parser = argparse.ArgumentParser()
+parser.add_argument("--elapsed", action="store_true")
 parser.add_argument("--png", action="store_true")
 parser.add_argument("-o", "--output", type=Path, default="pipemaze.png")
 parser.add_argument("-s", "--scale", type=int, default=5)

2024/day1/day1.js

@@ -6,7 +6,7 @@ const fs = require('fs');
 // Main function to handle file reading and calculations
 async function main() {
     // Default input file or the one provided as a command line argument
-    const inputFile = process.argv.length === 3 ? process.argv[2] : 'input.txt';
+    const inputFile = process.argv.length >= 3 ? process.argv[2] : 'input.txt';
 
     let left = [];
     let right = [];

2024/day1/day1.swift

@@ -3,7 +3,7 @@ import Foundation
 // Main function to handle file reading and calculations
 func main() {
     // Default input file or the one provided as a command line argument
-    let inputFile = CommandLine.arguments.count == 2 ? CommandLine.arguments[1] : "input.txt"
+    let inputFile = CommandLine.arguments.count >= 2 ? CommandLine.arguments[1] : "input.txt"
 
     var left: [Int] = []
     var right: [Int] = []

2024/day14/day14.rs

@@ -17,16 +17,9 @@ struct Puzzle {
 }
 
 impl Puzzle {
-    const fn new() -> Self {
-        Self {
-            robots: Vec::new(),
-            width: 101,
-            height: 103,
-        }
-    }
+    fn new(data: &str) -> Self {
+        let mut robots = Vec::new();
 
-    /// Get the puzzle input.
-    fn configure(&mut self, data: &str) {
         let re = Regex::new(r"p=(\d+),(\d+) v=(-?\d+),(-?\d+)").unwrap();
 
         for line in data.lines() {
@@ -39,13 +32,14 @@ impl Puzzle {
                 vy: caps.get(4).unwrap().as_str().parse().unwrap(),
             };
 
-            self.robots.push(robot);
+            robots.push(robot);
         }
 
-        #[cfg(test)]
-        {
-            self.width = 11;
-            self.height = 7;
+        // #[cfg(not(test))]
+        Self {
+            robots,
+            width: 101,
+            height: 103,
         }
     }
 
@@ -105,23 +99,25 @@ impl Puzzle {
 }
 
 fn main() {
-    let args = aoc::parse_args();
-    let mut puzzle = Puzzle::new();
-    puzzle.configure(&args.input);
-    println!("{}", puzzle.part1());
-    println!("{}", puzzle.part2());
+    let mut args = aoc::parse_args();
+    args.run(|data| {
+        let puzzle = Puzzle::new(data);
+        (puzzle.part1(), puzzle.part2())
+    });
 }
 
 /// Test from puzzle input
 #[cfg(test)]
 mod test {
     use super::*;
 
+    const TEST_INPUT: &str = include_str!("test.txt");
+
     #[test]
     fn test01() {
-        let mut puzzle = Puzzle::new();
-        let data = aoc::load_input_data("test.txt");
-        puzzle.configure(&data);
+        let mut puzzle = Puzzle::new(TEST_INPUT);
+        puzzle.width = 11;
+        puzzle.height = 7;
         assert_eq!(puzzle.part1(), 12);
     }
 }

2024/day5/day5.rs

@@ -8,15 +8,10 @@ struct Puzzle {
 }
 
 impl Puzzle {
-    fn new() -> Self {
-        Self {
-            ordering_rules: FxHashMap::default(),
-            page_updates: Vec::new(),
-        }
-    }
+    fn new(data: &str) -> Self {
+        let mut ordering_rules: FxHashMap<i32, FxHashSet<i32>> = FxHashMap::default();
+        let mut page_updates = Vec::new();
 
-    /// Get the puzzle input.
-    fn configure(&mut self, data: &str) {
         let data = data.split_once("\n\n").unwrap();
 
         //
@@ -26,13 +21,18 @@ impl Puzzle {
             let p1 = p1.parse().unwrap();
             let p2 = p2.parse().unwrap();
 
-            self.ordering_rules.entry(p1).or_default().insert(p2);
+            ordering_rules.entry(p1).or_default().insert(p2);
         }
 
         //
         for line in data.1.lines() {
             let v: Vec<_> = line.split(',').map(|x| x.parse::<i32>().unwrap()).collect();
-            self.page_updates.push(v);
+            page_updates.push(v);
+        }
+
+        Self {
+            ordering_rules,
+            page_updates,
         }
     }
 
@@ -105,31 +105,29 @@ impl Puzzle {
 }
 
 fn main() {
-    let args = aoc::parse_args();
-    let mut puzzle = Puzzle::new();
-    puzzle.configure(&args.input);
-    println!("{}", puzzle.part1());
-    println!("{}", puzzle.part2());
+    let mut args = aoc::parse_args();
+    args.run(|data| {
+        let puzzle = Puzzle::new(data);
+        (puzzle.part1(), puzzle.part2())
+    });
 }
 
 /// Test from puzzle input
 #[cfg(test)]
 mod test {
     use super::*;
 
+    const TEST_INPUT: &str = include_str!("test.txt");
+
     #[test]
     fn test01() {
-        let mut puzzle = Puzzle::new();
-        let data = aoc::load_input_data("test.txt");
-        puzzle.configure(&data);
+        let puzzle = Puzzle::new(TEST_INPUT);
         assert_eq!(puzzle.part1(), 143);
     }
 
     #[test]
     fn test02() {
-        let mut puzzle = Puzzle::new();
-        let data = aoc::load_input_data("test.txt");
-        puzzle.configure(&data);
+        let puzzle = Puzzle::new(TEST_INPUT);
         assert_eq!(puzzle.part2(), 123);
     }
 }

2024/day6/day6.rs

@@ -11,23 +11,11 @@ struct Puzzle {
 }
 
 impl Puzzle {
-    fn new() -> Self {
-        Self {
-            grid: Grid::default(),
-            start: Coord::ZERO,
-        }
-    }
-
-    /// Get the puzzle input.
-    fn configure(&mut self, data: &str) {
-        self.grid = Grid::parse(data);
+    fn new(data: &str) -> Self {
+        let grid = Grid::parse(data);
+        let start = grid.iter().find(|(_, c)| c == &&b'^').unwrap().0;
 
-        for (xy, p) in &self.grid {
-            if p == &b'^' {
-                self.start = xy;
-                break;
-            }
-        }
+        Self { grid, start }
     }
 
     fn move_guard(
@@ -151,31 +139,29 @@ impl Puzzle {
 }
 
 fn main() {
-    let args = aoc::parse_args();
-    let mut puzzle = Puzzle::new();
-    puzzle.configure(&args.input);
-    println!("{}", puzzle.part1());
-    println!("{}", puzzle.part2());
+    let mut args = aoc::parse_args();
+    args.run(|data| {
+        let puzzle = Puzzle::new(data);
+        (puzzle.part1(), puzzle.part2())
+    });
 }
 
 /// Test from puzzle input
 #[cfg(test)]
 mod test {
     use super::*;
 
+    const TEST_INPUT: &str = include_str!("test.txt");
+
     #[test]
     fn test01() {
-        let mut puzzle = Puzzle::new();
-        let data = aoc::load_input_data("test.txt");
-        puzzle.configure(&data);
+        let puzzle = Puzzle::new(TEST_INPUT);
         assert_eq!(puzzle.part1(), 41);
     }
 
     #[test]
     fn test02() {
-        let mut puzzle = Puzzle::new();
-        let data = aoc::load_input_data("test.txt");
-        puzzle.configure(&data);
+        let puzzle = Puzzle::new(TEST_INPUT);
         assert_eq!(puzzle.part2(), 6);
     }
 }