alarsyo/advent-of-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

2020: day04: refacto number range check

Browse source
This commit is contained in:
Antoine Martin 2020-12-04 15:29:11 +01:00
parent 3240ded93a
commit 9d85ca0ee5
1 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
aoc2020/src/day04.rs
View file

@ -1,5 +1,6 @@
use std::collections::HashMap;
use std::fmt::Write;
use std::ops::RangeInclusive;
use std::str::FromStr;
const INPUT: &str = include_str!("../input/day04.txt");
@ -138,42 +139,22 @@ impl CompletePassport {
}
fn byr_valid(&self) -> bool {
if let Ok(res) = self.byr.parse::<i64>() {
res >= 1920 && res <= 2002
} else {
false
}
is_number_in_range(&self.byr, 1920..=2002)
}
fn iyr_valid(&self) -> bool {
if let Ok(res) = self.iyr.parse::<i64>() {
res >= 2010 && res <= 2020
} else {
false
}
is_number_in_range(&self.iyr, 2010..=2020)
}
fn eyr_valid(&self) -> bool {
if let Ok(res) = self.eyr.parse::<i64>() {
res >= 2020 && res <= 2030
} else {
false
}
is_number_in_range(&self.eyr, 2020..=2030)
}
fn hgt_valid(&self) -> bool {
if let Some(num) = self.hgt.strip_suffix("in") {
if let Ok(res) = num.parse::<i64>() {
res >= 59 && res <= 76
} else {
false
}
is_number_in_range(&num, 59..=76)
} else if let Some(num) = self.hgt.strip_suffix("cm") {
if let Ok(res) = num.parse::<i64>() {
res >= 150 && res <= 193
} else {
false
}
is_number_in_range(&num, 150..=193)
} else {
false
}
@ -202,6 +183,13 @@ impl CompletePassport {
}
}
fn is_number_in_range(s: &str, range: RangeInclusive<i64>) -> bool {
match s.parse() {
Ok(res) => range.contains(&res),
Err(_) => false,
}
}
#[cfg(test)]
mod tests {
use super::*;