summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2016-12-17 00:59:00 -0500
committerJune McEnroe <june@causal.agency>2020-11-22 00:14:25 -0500
commit4cc719c9b2b4a7ef4066c8435c6b1480eb9e309f (patch)
treeb91738652b8a7801ecb37468273407e8ab2066ef
parentDay 15 (diff)
downloadaoc-4cc719c9b2b4a7ef4066c8435c6b1480eb9e309f.tar.gz
aoc-4cc719c9b2b4a7ef4066c8435c6b1480eb9e309f.zip
Day 15 part 2
-rw-r--r--src/bin/day15.rs18
1 files changed, 15 insertions, 3 deletions
diff --git a/src/bin/day15.rs b/src/bin/day15.rs
index c7006eb..ec9df7a 100644
--- a/src/bin/day15.rs
+++ b/src/bin/day15.rs
@@ -64,7 +64,7 @@ impl<'a> From<&'a str> for Sculpture {
     }
 }
 
-fn solve(input: &str) -> u32 {
+fn solve1(input: &str) -> u32 {
     let mut sculpture = Sculpture::from(input);
     loop {
         if sculpture.clone().drop_capsule() {
@@ -74,11 +74,23 @@ fn solve(input: &str) -> u32 {
     }
 }
 
+fn solve2(input: &str) -> u32 {
+    let mut sculpture = Sculpture::from(input);
+    sculpture.discs.push(Disc { positions: 11, position: 0 });
+    loop {
+        if sculpture.clone().drop_capsule() {
+            return sculpture.time;
+        }
+        sculpture.tick();
+    }
+}
+
 fn main() {
     let mut input = String::new();
     io::stdin().read_to_string(&mut input).unwrap();
 
-    println!("Part 1: {}", solve(&input));
+    println!("Part 1: {}", solve1(&input));
+    println!("Part 2: {}", solve2(&input));
 }
 
 #[test]
@@ -87,5 +99,5 @@ fn part1() {
 Disc #1 has 5 positions; at time=0, it is at position 4.
 Disc #2 has 2 positions; at time=0, it is at position 1.
 ";
-    assert_eq!(5, solve(input.trim()));
+    assert_eq!(5, solve1(input.trim()));
 }