update maneatingape code

Author: majcn

src/maneatingape/ansi.rs

@@ -1,4 +1,4 @@
-// source: https://github.com/maneatingape/advent-of-code-rust/blob/109bf05f8cb5026d97af42b42ea3985afe600dfb/src/util/ansi.rs
+// source: https://github.com/maneatingape/advent-of-code-rust/blob/177fc32fbfc3ce814b26b10263b2cc081e121b50/src/util/ansi.rs
 
 //! [ANSI escape codes](https://en.wikipedia.org/wiki/ANSI_escape_code)
 //!

src/maneatingape/bitset.rs

@@ -1,4 +1,4 @@
-// source: https://github.com/maneatingape/advent-of-code-rust/blob/109bf05f8cb5026d97af42b42ea3985afe600dfb/src/util/bitset.rs
+// source: https://github.com/maneatingape/advent-of-code-rust/blob/177fc32fbfc3ce814b26b10263b2cc081e121b50/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.

src/maneatingape/grid.rs

@@ -1,4 +1,4 @@
-// source: https://github.com/maneatingape/advent-of-code-rust/blob/109bf05f8cb5026d97af42b42ea3985afe600dfb/src/util/grid.rs
+// source: https://github.com/maneatingape/advent-of-code-rust/blob/177fc32fbfc3ce814b26b10263b2cc081e121b50/src/util/grid.rs
 
 //! Fast 2 dimensional Grid backed by a single `vec`. This module is designed to work with [`Point`].
 //!
@@ -19,13 +19,13 @@
 //! ```
 //!
 //! A convenience [`parse`] method creates a `Grid` directly from a 2 dimenionsal set of
-//! ASCII characters, a common occurence in Advent of Code inputs. The [`default_copy`] function
+//! ASCII characters, a common occurence in Advent of Code inputs. The [`same_size_with`] function
 //! creates a grid of the same size, that can be used for in BFS algorithms for tracking visited
 //! location or for tracking cost in Djikstra.
 //!
-//! [`Point`]: crate::util::point
+//! [`Point`]: crate::maneatingape::point
 //! [`parse`]: Grid::parse
-//! [`default_copy`]: Grid::default_copy
+//! [`same_size_with`]: Grid::same_size_with
 use crate::maneatingape::point::*;
 use std::ops::{Index, IndexMut};
 
@@ -37,6 +37,7 @@ pub struct Grid<T> {
 }
 
 impl Grid<u8> {
+    #[inline]
     pub fn parse(input: &str) -> Self {
         let raw: Vec<_> = input.lines().map(str::as_bytes).collect();
         let width = raw[0].len() as i32;
@@ -49,9 +50,21 @@ impl Grid<u8> {
             bytes,
         }
     }
+
+    pub fn print(&self) {
+        for y in 0..self.height {
+            for x in 0..self.width {
+                let point = Point::new(x, y);
+                print!("{}", self[point] as char);
+            }
+            println!();
+        }
+        println!();
+    }
 }
 
 impl<T: Copy + PartialEq> Grid<T> {
+    #[inline]
     pub fn find(&self, needle: T) -> Option<Point> {
         let to_point = |index| {
             let x = (index as i32) % self.width;
@@ -73,11 +86,12 @@ impl<T: Copy> Grid<T> {
 }
 
 impl<T> Grid<T> {
-    pub fn default_copy<U: Default + Copy>(&self) -> Grid<U> {
+    #[inline]
+    pub fn same_size_with<U: Copy>(&self, value: U) -> Grid<U> {
         Grid {
             width: self.width,
             height: self.height,
-            bytes: vec![U::default(); (self.width * self.height) as usize],
+            bytes: vec![value; (self.width * self.height) as usize],
         }
     }
 

src/maneatingape/hash.rs

@@ -1,4 +1,4 @@
-// source: https://github.com/maneatingape/advent-of-code-rust/blob/109bf05f8cb5026d97af42b42ea3985afe600dfb/src/util/hash.rs
+// source: https://github.com/maneatingape/advent-of-code-rust/blob/177fc32fbfc3ce814b26b10263b2cc081e121b50/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
@@ -8,7 +8,7 @@
 //! resistant but slower hashing algorithm. [`FxHasher`] is much faster (between 2x to 5x from my testing).
 use std::collections::{HashMap, HashSet};
 use std::hash::{BuildHasher, Hash, Hasher};
-use std::ops::BitXor;
+use std::ops::BitXor as _;
 
 /// Type alias for [`HashSet`] using [`FxHasher`].
 pub type FastSet<T> = HashSet<T, BuildFxHasher>;

src/maneatingape/heap.rs

@@ -1,4 +1,4 @@
-// source: https://github.com/maneatingape/advent-of-code-rust/blob/109bf05f8cb5026d97af42b42ea3985afe600dfb/src/util/heap.rs
+// source: https://github.com/maneatingape/advent-of-code-rust/blob/177fc32fbfc3ce814b26b10263b2cc081e121b50/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
@@ -65,4 +65,9 @@ impl<K: Ord, V> MinHeap<K, V> {
     pub fn pop(&mut self) -> Option<(K, V)> {
         self.heap.pop().map(|w| (w.key, w.value))
     }
+
+    #[inline]
+    pub fn peek(&self) -> Option<(&K, &V)> {
+        self.heap.peek().map(|w| (&w.key, &w.value))
+    }
 }

src/maneatingape/integer.rs

@@ -1,4 +1,4 @@
-// source: https://github.com/maneatingape/advent-of-code-rust/blob/109bf05f8cb5026d97af42b42ea3985afe600dfb/src/util/integer.rs
+// source: https://github.com/maneatingape/advent-of-code-rust/blob/177fc32fbfc3ce814b26b10263b2cc081e121b50/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.

src/maneatingape/iter.rs

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

src/maneatingape/math.rs

@@ -1,4 +1,4 @@
-// source: https://github.com/maneatingape/advent-of-code-rust/blob/109bf05f8cb5026d97af42b42ea3985afe600dfb/src/util/math.rs
+// source: https://github.com/maneatingape/advent-of-code-rust/blob/177fc32fbfc3ce814b26b10263b2cc081e121b50/src/util/math.rs
 
 //! Extended mathematical operations.
 //!
@@ -29,7 +29,7 @@ pub trait UnsignedMathOps<T: Unsigned<T>> {
 }
 
 pub trait SignedMathOps<T: Signed<T>> {
-    fn mod_inv(self, m: T) -> T;
+    fn mod_inv(self, m: T) -> Option<T>;
 }
 
 impl<T: Integer<T>> IntegerMathOps<T> for T {
@@ -86,7 +86,7 @@ impl<T: Unsigned<T>> UnsignedMathOps<T> for T {
 
 impl<T: Signed<T>> SignedMathOps<T> for T {
     // Modular multiplicative inverse
-    fn mod_inv(self, m: T) -> T {
+    fn mod_inv(self, m: T) -> Option<T> {
         let mut t = T::ZERO;
         let mut newt = T::ONE;
         let mut r = m;
@@ -98,9 +98,13 @@ impl<T: Signed<T>> SignedMathOps<T> for T {
             (r, newr) = (newr, r - quotient * newr);
         }
 
+        if r > T::ONE {
+            return None;
+        }
         if t < T::ZERO {
             t = t + m;
         }
-        t
+
+        Some(t)
     }
 }

src/maneatingape/md5.rs

@@ -1,4 +1,4 @@
-// source: https://github.com/maneatingape/advent-of-code-rust/blob/109bf05f8cb5026d97af42b42ea3985afe600dfb/src/util/md5.rs
+// source: https://github.com/maneatingape/advent-of-code-rust/blob/177fc32fbfc3ce814b26b10263b2cc081e121b50/src/util/md5.rs
 
 //! MD5 hash algorithm
 //!

src/maneatingape/parse.rs

@@ -1,4 +1,4 @@
-// source: https://github.com/maneatingape/advent-of-code-rust/blob/109bf05f8cb5026d97af42b42ea3985afe600dfb/src/util/parse.rs
+// source: https://github.com/maneatingape/advent-of-code-rust/blob/177fc32fbfc3ce814b26b10263b2cc081e121b50/src/util/parse.rs
 
 //! Extracts and parses signed and unsigned integers from surrounding text and whitespace.
 //!

src/maneatingape/point.rs

@@ -1,4 +1,4 @@
-// source: https://github.com/maneatingape/advent-of-code-rust/blob/109bf05f8cb5026d97af42b42ea3985afe600dfb/src/util/point.rs
+// source: https://github.com/maneatingape/advent-of-code-rust/blob/177fc32fbfc3ce814b26b10263b2cc081e121b50/src/util/point.rs
 
 //! Comprehensive 2 dimensional point implementation. This class is designed to work together
 //! with the [`Grid`] class.
@@ -26,7 +26,7 @@
 //! [`clockwise`]: Point::clockwise
 //! [`counter_clockwise`]: Point::counter_clockwise
 //! [`manhattan`]: Point::manhattan
-//! [`Grid`]: crate::util::grid
+//! [`Grid`]: crate::maneatingape::grid
 use std::hash::{Hash, Hasher};
 use std::ops::{Add, AddAssign, Mul, Sub, SubAssign};
 

src/maneatingape/slice.rs

@@ -1,4 +1,4 @@
-// source: https://github.com/maneatingape/advent-of-code-rust/blob/109bf05f8cb5026d97af42b42ea3985afe600dfb/src/util/slice.rs
+// source: https://github.com/maneatingape/advent-of-code-rust/blob/177fc32fbfc3ce814b26b10263b2cc081e121b50/src/util/slice.rs
 
 //! Extension methods for slices.
 //!

src/maneatingape/thread.rs

@@ -1,4 +1,4 @@
-// source: https://github.com/maneatingape/advent-of-code-rust/blob/109bf05f8cb5026d97af42b42ea3985afe600dfb/src/util/thread.rs
+// source: https://github.com/maneatingape/advent-of-code-rust/blob/177fc32fbfc3ce814b26b10263b2cc081e121b50/src/util/thread.rs
 
 //! Utility methods to spawn a number of
 //! [scoped](https://doc.rust-lang.org/stable/std/thread/fn.scope.html)