Day 15 rust

(and fix test suite)

Author: OrangeBacon

data/day15.txt

@@ -84,7 +84,7 @@ pub fn aoc(attr: TokenStream, item: TokenStream) -> TokenStream {
                 let solution = libaoc::get_solution(&*crate::SOLUTIONS, #day_number)?;
                 let mut timer = Timer::new();
                 let res = #fn_name::#provided_name(&mut timer, solution.file.to_string())?;
-                assert_eq!(res.part1, #part1);
+                assert_eq!(res.results[0].1, #part1);
                 Ok(())
             }
 
@@ -93,7 +93,7 @@ pub fn aoc(attr: TokenStream, item: TokenStream) -> TokenStream {
                 let solution = libaoc::get_solution(&*crate::SOLUTIONS, #day_number)?;
                 let mut timer = Timer::new();
                 let res = #fn_name::#provided_name(&mut timer, solution.file.to_string())?;
-                assert_eq!(res.part2, #part2);
+                assert_eq!(res.results[1].1, #part2);
                 Ok(())
             }
         }

libaoc/aoc_attr/src/lib.rs

@@ -39,7 +39,7 @@ pub fn get_solution(solutions: &'static [Solution], day: usize) -> Result<&Solut
 
 /// generic result container for each day
 pub struct AocResult {
-    results: Vec<(&'static str, String)>,
+    pub results: Vec<(&'static str, String)>,
 }
 
 impl AocResult {

libaoc/src/lib.rs

@@ -0,0 +1,52 @@
+use anyhow::Result;
+use libaoc::{aoc, AocResult, Timer};
+use hashbrown::HashMap;
+
+fn run(numbers: &[usize], max: usize) -> usize{
+    let mut spoken = 0;
+    let len = numbers.len();
+    let mut numbers_map = HashMap::new();
+    for i in 0..max {
+        let num = numbers[i % len];
+        if i < numbers.len() {
+            numbers_map.insert(num, (1, i, 0));
+            spoken = num;
+        } else {
+            if let Some(last) = numbers_map.get_mut(&spoken) {
+                if last.0 == 1 {
+                    spoken = 0;
+                    let num = numbers_map.get_mut(&0).unwrap();
+                    num.0 += 1;
+                    num.2 = num.1;
+                    num.1 = i;
+                } else {
+                    spoken = last.1 - last.2;
+                    let temp = (1,i,0);
+                    let mut num = *numbers_map.get(&spoken).unwrap_or(&temp);
+                    num.0 += 1;
+                    num.2 = num.1;
+                    num.1 = i;
+                    numbers_map.insert(spoken, num);
+                }
+            } else {
+                numbers_map.insert(spoken, (1, i, 0));
+                spoken = 0;
+            }
+        }
+    }
+    spoken
+}
+
+#[aoc("1015", "201")]
+pub fn solve(timer: &mut Timer, _input: String) -> Result<AocResult> {
+    let numbers = vec![19,0,5,1,10,13];
+    timer.lap("Parse");
+
+    let part1 = run(&numbers, 2020);
+    timer.lap("Part 1");
+
+    let part2 = run(&numbers, 30000000);
+    timer.lap("Part 2");
+
+    Ok(AocResult::new(part1, part2))
+}

src/days/day15.rs

@@ -12,3 +12,4 @@ mod day11;
 mod day12;
 mod day13;
 mod day14;
+mod day15;