summary refs log tree commit diff homepage
diff options
context:
space:
mode:
-rw-r--r--2017/src/bin/day09.rs29
1 files changed, 27 insertions, 2 deletions
diff --git a/2017/src/bin/day09.rs b/2017/src/bin/day09.rs
index a8492d0..e88b6f4 100644
--- a/2017/src/bin/day09.rs
+++ b/2017/src/bin/day09.rs
@@ -1,6 +1,6 @@
 use std::io::{self, Read};
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 enum State {
     Group,
     Garbage,
@@ -9,7 +9,7 @@ enum State {
 
 use self::State::*;
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 struct Machine(State, u32);
 
 impl Machine {
@@ -41,11 +41,25 @@ fn solve1(input: &str) -> u32 {
     score
 }
 
+fn solve2(input: &str) -> u32 {
+    let mut garbage = 0;
+    let mut state = Machine(Group, 0);
+    for c in input.chars() {
+        let next = state.next(c);
+        if next == state && state.0 == Garbage {
+            garbage += 1;
+        }
+        state = next;
+    }
+    garbage
+}
+
 fn main() {
     let mut input = String::new();
     io::stdin().read_to_string(&mut input).unwrap();
 
     println!("Part 1: {}", solve1(input.trim()));
+    println!("Part 2: {}", solve2(input.trim()));
 }
 
 #[test]
@@ -59,3 +73,14 @@ fn part1() {
     assert_eq!(9, solve1("{{<!!>},{<!!>},{<!!>},{<!!>}}"));
     assert_eq!(3, solve1("{{<a!>},{<a!>},{<a!>},{<ab>}}"));
 }
+
+#[test]
+fn part2() {
+    assert_eq!(0, solve2("<>"));
+    assert_eq!(17, solve2("<random characters>"));
+    assert_eq!(3, solve2("<<<<>"));
+    assert_eq!(2, solve2("<{!>}>"));
+    assert_eq!(0, solve2("<!!>"));
+    assert_eq!(0, solve2("<!!!>>"));
+    assert_eq!(10, solve2("<{o\"i!a,<{i<a>"));
+}
/ui-diff.c?id=ddfaef6bb28e697491b25bff5a7b260d44ce6ccf&follow=1'>ui-diff: add "stat only" diff typeJohn Keeping 2014-12-13Change "ss" diff flag to an enumJohn Keeping 2014-12-13ui-shared: remove toggle_ssdiff arg to cgit_diff_link()John Keeping 2014-12-13ui-shared: remove toggle_ssdiff arg to cgit_commit_link()John Keeping 2014-08-07git: update to v2.0.4John Keeping 2014-08-07Always check if README exists in choose_readme()Lukas Fleischer 2014-08-01cgitrc.5: we mean a cgi response, not requestJason A. Donenfeld 2014-07-28ui-stats.c: set parent pointer to NULL after freeing itJohn Keeping 2014-07-28git: update to v2.0.3John Keeping 2014-07-28parsing.c: make commit buffer constJohn Keeping 2014-06-30Bump version.Jason A. Donenfeld 2014-06-29remove debug fprinf() calls that sneaked in with commit 79c985Christian Hesse 2014-06-28git: update to 2.0.1Christian Hesse 2014-06-28ui-patch: Flush stdout after outputting dataJohn Keeping 2014-06-28ui-log: ignore unhandled argumentsJohn Keeping 2014-06-28git: update for git 2.0Christian Hesse 2014-04-17remove trailing whitespaces from source filesChristian Hesse 2014-04-12git: update to 1.9.2Christian Hesse 2014-04-05Fix cgit_parse_url when a repo url is contained in another repo urlJulian Maurice 2014-03-20Makefile: use more reliable git tarball mirrorJason A. Donenfeld 2014-03-20git: update to 1.9.1Christian Hesse