From 2abdb9ca2b44a4ea7c30ff24d750c69a126d9e5f Mon Sep 17 00:00:00 2001 From: June McEnroe Date: Sat, 3 Dec 2016 23:15:39 -0500 Subject: Add tests to day 1 --- src/bin/day01.rs | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) (limited to 'src/bin') diff --git a/src/bin/day01.rs b/src/bin/day01.rs index 26dd306..c596099 100644 --- a/src/bin/day01.rs +++ b/src/bin/day01.rs @@ -14,8 +14,8 @@ impl Point { Point(-self.1, self.0) } - fn distance(self, other: Self) -> i32 { - (self.0 - other.0).abs() + (self.1 - other.1).abs() + fn distance(self) -> i32 { + self.0.abs() + self.1.abs() } } @@ -27,10 +27,7 @@ impl Add for Point { } } -fn main() { - let mut input = String::new(); - io::stdin().read_to_string(&mut input).unwrap(); - +fn solve(input: &str) -> (i32, Option) { let mut position = Point(0, 0); let mut direction = Point(0, -1); let mut visited = HashSet::new(); @@ -48,14 +45,34 @@ fn main() { let count: i32 = count.parse().unwrap(); for _ in 0..count { position = position + direction; - if !visited.insert(position) && collision.is_none() { + if collision.is_none() && !visited.insert(position) { collision = Some(position); } } } - println!("Part 1: {}", position.distance(Point(0, 0))); - if let Some(point) = collision { - println!("Part 2: {}", point.distance(Point(0, 0))); + (position.distance(), collision.map(Point::distance)) +} + +fn main() { + let mut input = String::new(); + io::stdin().read_to_string(&mut input).unwrap(); + + let (part1, part2) = solve(&input); + println!("Part 1: {}", part1); + if let Some(part2) = part2 { + println!("Part 2: {}", part2); } } + +#[test] +fn part1() { + assert_eq!(5, solve("R2, L3").0); + assert_eq!(2, solve("R2, R2, R2").0); + assert_eq!(12, solve("R5, L5, R5, R3").0); +} + +#[test] +fn part2() { + assert_eq!(Some(4), solve("R8, R4, R4, R8").1); +} -- cgit 1.4.1 rc/log/bin/1sh?id=66041211d17a25af0cd72662222b805fafd7a367&follow=1'>1sh/output.c (unfollow)
Commit message (Expand)Author
2019-09-22Revert "Enable cookies in title"June McEnroe
2019-09-20Enable cookies in titleJune McEnroe
2019-09-16Use sensitivity aliases in TF2June McEnroe
2019-09-16Add The Just CityJune McEnroe
2019-09-12Only GET the final redirect locationJune McEnroe
2019-09-12Consume entire bodyJune McEnroe
2019-09-10Add title -v flagJune McEnroe
2019-09-10Use curl error bufferJune McEnroe
2019-09-10Set Accept-Encoding in titleJune McEnroe
2019-09-08Set title User-AgentJune McEnroe
2019-09-07Add -x flag to titleJune McEnroe
2019-09-07Ignore SIGPIPE in relayJune McEnroe
2019-09-07Add A Memory Called EmpireJune McEnroe
2019-09-05Handle lack of Content-TypeJune McEnroe
2019-09-05Use CURLINFO_CONTENT_TYPEJune McEnroe
2019-09-05Decode entities in titlesJune McEnroe
2019-09-05Print title as soon as it's availableJune McEnroe
2019-09-05Use CURL_PREFIX to set flagsJune McEnroe
2019-09-05Add titleJune McEnroe
2019-09-04Add Avorter n'est pas tuerJune McEnroe
2019-08-29Unset executable on shell scriptsJune McEnroe
2019-08-29Add long-missing setopt to bin.7June McEnroe
2019-08-29Add editJune McEnroedc985c99d0285ae37de&follow=1'>Warn when date has changedJune McEnroe
2019-07-24Add whenJune McEnroe
2019-07-24Remove histedit from bitJune McEnroe