update external template and utils

Author: majcn

.vscode/launch.json

@@ -12,8 +12,10 @@
                 "args": [
                     "test",
                     "--no-run",
-                    // replace `01` here with the solution you like to debug.
-                    "--bin=01",
+                    // replace with binary name (e.g. "01") here if you always
+                    // want to debug one file regardless of the active file in
+                    // the editor.
+                    "--bin=${fileBasenameNoExtension}",
                     "--package=advent_of_code"
                 ],
             },
@@ -27,8 +29,10 @@
             "cargo": {
                 "args": [
                     "build",
-                    // replace `01` here with the solution you like to debug.
-                    "--bin=01",
+                    // replace with binary name (e.g. "01") here if you always
+                    // want to debug one file regardless of the active file in
+                    // the editor
+                    "--bin=${fileBasenameNoExtension}",
                     "--package=advent_of_code"
                 ],
             },

Cargo.toml

@@ -28,5 +28,5 @@ pico-args = "0.5.0"
 tinyjson = "2.5.1"
 
 # Solution dependencies
-fastrand = "2.0.1"
+fastrand = "2.2.0"
 regex = "1.11.1"

src/maneatingape/LICENSE.md

@@ -1,6 +1,6 @@
 # MIT License
 
-**Copyright © 2023 maneatingape**
+**Copyright © 2023-2024 maneatingape**
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/maneatingape/ansi.rs

@@ -0,0 +1,16 @@
+// source: https://github.com/maneatingape/advent-of-code-rust/blob/109bf05f8cb5026d97af42b42ea3985afe600dfb/src/util/ansi.rs
+
+//! [ANSI escape codes](https://en.wikipedia.org/wiki/ANSI_escape_code)
+//!
+//! These codes allow command line applications to show colored or styled text in most terminals.
+//! Advanced commands can move the cursor or clear the screen.
+
+pub const RESET: &str = "\x1b[0m";
+pub const BOLD: &str = "\x1b[1m";
+pub const RED: &str = "\x1b[31m";
+pub const GREEN: &str = "\x1b[32m";
+pub const YELLOW: &str = "\x1b[33m";
+pub const BLUE: &str = "\x1b[94m";
+pub const WHITE: &str = "\x1b[97m";
+pub const HOME: &str = "\x1b[H";
+pub const CLEAR: &str = "\x1b[J";

src/maneatingape/bitset.rs

@@ -0,0 +1,42 @@
+// source: https://github.com/maneatingape/advent-of-code-rust/blob/109bf05f8cb5026d97af42b42ea3985afe600dfb/src/util/bitset.rs
+
+//! Add `biterator` method that treats an integer as a set, iterating over each element where
+//! the respective bit is set. For example `1101` would return 0, 2 and 3.
+use crate::maneatingape::integer::*;
+
+pub trait BitOps<T> {
+    fn biterator(self) -> Bitset<T>;
+}
+
+impl<T> BitOps<T> for T
+where
+    T: Integer<T>,
+{
+    fn biterator(self) -> Bitset<T> {
+        Bitset { t: self }
+    }
+}
+
+pub struct Bitset<T> {
+    t: T,
+}
+
+impl<T> Iterator for Bitset<T>
+where
+    T: Integer<T>,
+    T: TryInto<usize>,
+{
+    type Item = usize;
+
+    #[inline]
+    fn next(&mut self) -> Option<Self::Item> {
+        if self.t == T::ZERO {
+            return None;
+        }
+
+        let tz = self.t.trailing_zeros();
+        self.t = self.t ^ (T::ONE << tz);
+
+        tz.try_into().ok()
+    }
+}

src/maneatingape/grid.rs

@@ -1,4 +1,4 @@
-// source: https://github.com/maneatingape/advent-of-code-rust/blob/72c8feb22030d55d7a08f16c119425b2ba759470/src/util/hash.rs
+// source: https://github.com/maneatingape/advent-of-code-rust/blob/109bf05f8cb5026d97af42b42ea3985afe600dfb/src/util/grid.rs
 
 //! Fast 2 dimensional Grid backed by a single `vec`. This module is designed to work with [`Point`].
 //!
@@ -52,14 +52,6 @@ impl Grid<u8> {
 }
 
 impl<T: Copy + PartialEq> Grid<T> {
-    pub fn default_copy<U: Default + Copy>(&self) -> Grid<U> {
-        Grid {
-            width: self.width,
-            height: self.height,
-            bytes: vec![U::default(); (self.width * self.height) as usize],
-        }
-    }
-
     pub fn find(&self, needle: T) -> Option<Point> {
         let to_point = |index| {
             let x = (index as i32) % self.width;
@@ -68,6 +60,26 @@ impl<T: Copy + PartialEq> Grid<T> {
         };
         self.bytes.iter().position(|&h| h == needle).map(to_point)
     }
+}
+
+impl<T: Copy> Grid<T> {
+    pub fn new(width: i32, height: i32, value: T) -> Grid<T> {
+        Grid {
+            width,
+            height,
+            bytes: vec![value; (width * height) as usize],
+        }
+    }
+}
+
+impl<T> Grid<T> {
+    pub fn default_copy<U: Default + Copy>(&self) -> Grid<U> {
+        Grid {
+            width: self.width,
+            height: self.height,
+            bytes: vec![U::default(); (self.width * self.height) as usize],
+        }
+    }
 
     #[inline]
     pub fn contains(&self, point: Point) -> bool {
@@ -79,14 +91,14 @@ impl<T> Index<Point> for Grid<T> {
     type Output = T;
 
     #[inline]
-    fn index(&self, point: Point) -> &Self::Output {
-        &self.bytes[(self.width * point.y + point.x) as usize]
+    fn index(&self, index: Point) -> &Self::Output {
+        &self.bytes[(self.width * index.y + index.x) as usize]
     }
 }
 
 impl<T> IndexMut<Point> for Grid<T> {
     #[inline]
-    fn index_mut(&mut self, point: Point) -> &mut Self::Output {
-        &mut self.bytes[(self.width * point.y + point.x) as usize]
+    fn index_mut(&mut self, index: Point) -> &mut Self::Output {
+        &mut self.bytes[(self.width * index.y + index.x) as usize]
     }
 }

src/maneatingape/hash.rs

@@ -1,4 +1,4 @@
-// source: https://github.com/maneatingape/advent-of-code-rust/blob/8d753cc778bdb74c18ecd48f6ab116d86a2ed70a/src/util/hash.rs
+// source: https://github.com/maneatingape/advent-of-code-rust/blob/109bf05f8cb5026d97af42b42ea3985afe600dfb/src/util/hash.rs
 
 //! Provides fast [`HashSet`] and [`HashMap`] implementations based on a simplified implementation of
 //! the fast [Rust C hash algorithm](https://github.com/rust-lang/rustc-hash) also used by

src/maneatingape/heap.rs

@@ -1,4 +1,4 @@
-// source: // source: https://github.com/maneatingape/advent-of-code-rust/blob/2f5d0220ea44f33545f741e307d4481b50d632c7/src/util/heap.rs
+// source: https://github.com/maneatingape/advent-of-code-rust/blob/109bf05f8cb5026d97af42b42ea3985afe600dfb/src/util/heap.rs
 
 //! [Min heap] more suitable for algorithms such as [Dijkstra] and [A*] than Rust's default
 //! max heap. Splits the sorting key and value, so that you can order items without having

src/maneatingape/integer.rs

@@ -1,9 +1,8 @@
-// source: https://github.com/maneatingape/advent-of-code-rust/blob/ff407999fc459d7bbf1d053b61c9ad957a8cdf2f/src/util/integer.rs
+// source: https://github.com/maneatingape/advent-of-code-rust/blob/109bf05f8cb5026d97af42b42ea3985afe600dfb/src/util/integer.rs
 
 //! Combines common [operators](https://doc.rust-lang.org/book/appendix-02-operators.html)
 //! and constants `0`, `1` and `10` to enable generic methods on integer types.
-use std::cmp::{PartialEq, PartialOrd};
-use std::ops::{Add, BitAnd, BitOr, Div, Mul, Neg, Rem, Shl, Shr, Sub};
+use std::ops::*;
 
 pub trait Integer<T>:
     Copy
@@ -13,6 +12,7 @@ pub trait Integer<T>:
     + Add<Output = T>
     + BitAnd<Output = T>
     + BitOr<Output = T>
+    + BitXor<Output = T>
     + Div<Output = T>
     + Mul<Output = T>
     + Rem<Output = T>
@@ -25,6 +25,7 @@ pub trait Integer<T>:
     const TEN: T;
 
     fn ilog2(self) -> T;
+    fn trailing_zeros(self) -> T;
 }
 
 pub trait Unsigned<T>: Integer<T> {}
@@ -41,7 +42,13 @@ macro_rules! integer {
             #[inline]
             #[allow(trivial_numeric_casts)]
             fn ilog2(self) -> $t {
-                self.ilog2() as $t
+                <$t>::ilog2(self) as $t
+            }
+
+            #[inline]
+            #[allow(trivial_numeric_casts)]
+            fn trailing_zeros(self) -> $t {
+                <$t>::trailing_zeros(self) as $t
             }
         }
     )*)

src/maneatingape/iter.rs

@@ -1,4 +1,4 @@
-// source: https://github.com/maneatingape/advent-of-code-rust/blob/589ff1a347c70570c2a1ef5a51dfed105d6756d4/src/util/iter.rs
+// source: https://github.com/maneatingape/advent-of-code-rust/blob/109bf05f8cb5026d97af42b42ea3985afe600dfb/src/util/iter.rs
 
 //! Add a `chunk` method to [`Iterator`] that duplicates the functionality of the unstable
 //! [`array_chunks`] method.