From 037c2a4d3ce3db556b5acb971a8a234789d6a179 Mon Sep 17 00:00:00 2001 From: June McEnroe Date: Wed, 6 Dec 2017 00:28:02 -0500 Subject: Day 6, part 2 --- 2017/src/bin/day06.rs | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to '2017/src/bin') diff --git a/2017/src/bin/day06.rs b/2017/src/bin/day06.rs index dbc8d07..509e576 100644 --- a/2017/src/bin/day06.rs +++ b/2017/src/bin/day06.rs @@ -1,16 +1,17 @@ -use std::collections::HashSet; +use std::collections::hash_map::{Entry, HashMap}; use std::io::{self, Read}; -fn solve1(input: &str) -> u32 { +fn solve(input: &str) -> (u32, u32) { let mut banks: Vec = input.split_whitespace() .map(str::parse) .map(Result::unwrap) .collect(); - let mut states = HashSet::new(); + let mut states = HashMap::new(); for cycle in 0.. { - if !states.insert(banks.clone()) { - return cycle; + match states.entry(banks.clone()) { + Entry::Occupied(e) => return (cycle, cycle - e.get()), + Entry::Vacant(e) => { e.insert(cycle); }, } let (index, mut blocks) = banks.iter() @@ -32,14 +33,28 @@ fn solve1(input: &str) -> u32 { unreachable!() } +fn solve1(input: &str) -> u32 { + solve(input).0 +} + +fn solve2(input: &str) -> u32 { + solve(input).1 +} + 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] fn part1() { assert_eq!(5, solve1("0 2 7 0")); } + +#[test] +fn part2() { + assert_eq!(4, solve2("0 2 7 0")); +} -- cgit 1.4.1 'committer'>committer
path: root/bundle/vim-gitgutter (unfollow)
Commit message (Expand)Author
2013-05-23Remove vim-clojure-staticJune McEnroe
2013-05-23Replace VimClojure with vim-clojure-staticJune McEnroe
2013-05-18Do not run gitgutter eagerlyJune McEnroe
2013-05-15Remove tabularJune McEnroe
2013-05-15Use long names for all settingsJune McEnroe
2013-05-15Add vim-gitgutterJune McEnroe
2013-04-23Remove unused pluginsJune McEnroe
2013-04-23Switch to base16-default colorschemeJune McEnroe
2013-03-26Replace nerdcommenter with vim-commentaryJune McEnroe
2013-03-24Add paredit.vimJune McEnroe
2013-03-14Update base16-vimJune McEnroe
2013-03-12Hide mode from below statuslineJune McEnroe
2013-03-12Switch to powerlineJune McEnroe
2013-03-12Remove vim-powerlineJune McEnroe
2013-02-03Update base16 and refheapJune McEnroe
2013-02-03Ignore plugin/private.vimJune McEnroe
2012-09-29Disable GUI dialogsJune McEnroe