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

2022 rust cleanup

Browse source
This commit is contained in:
Maciej Jur 2022-12-06 01:14:15 +01:00
parent 3ba934ce7b
commit 9b154dccf8
5 changed files with 57 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
2022/rust/src/solutions/day01.rs
View file

@ -60,7 +60,7 @@ fn parse_data(data: Vec<String>) -> Vec<Vec<i32>> {
mod tests {
use super::*;
fn data() -> Vec<&'static str> {
fn data() -> Vec<String> {
vec![
"1000", "2000", "3000", "",
"4000", "",
@ -68,17 +68,18 @@ mod tests {
"7000", "8000", "9000", "",
"10000",
]
.into_iter().map(String::from).collect()
}
#[test]
fn part1() {
let data = parse_data(data().into_iter().map(String::from).collect());
let data = parse_data(data());
assert_eq!(24000, solve1(&data));
}
#[test]
fn part2() {
let data = parse_data(data().into_iter().map(String::from).collect());
let data = parse_data(data());
assert_eq!(45000, solve2(&data));
}
}

7
2022/rust/src/solutions/day02.rs
View file

@ -127,19 +127,20 @@ fn parse_data(data: Vec<String>) -> Vec<(char, char)> {
mod tests {
use super::*;
fn data() -> Vec<&'static str> {
fn data() -> Vec<String> {
vec!["A Y", "B X", "C Z"]
.into_iter().map(String::from).collect()
}
#[test]
fn part1() {
let data = parse_data(data().into_iter().map(String::from).collect());
let data = parse_data(data());
assert_eq!(15, solve1(&data));
}
#[test]
fn part2() {
let data = parse_data(data().into_iter().map(String::from).collect());
let data = parse_data(data());
assert_eq!(12, solve2(&data));
}
}

7
2022/rust/src/solutions/day03.rs
View file

@ -64,7 +64,7 @@ fn parse_data(data: Vec<String>) -> Vec<(HashSet<char>, HashSet<char>)> {
mod tests {
use super::*;
fn data() -> Vec<&'static str> {
fn data() -> Vec<String> {
vec![
"vJrwpWtwJgWrhcsFMMfFFhFp",
"jqHRNqRjqzjGDLGLrsFMfFZSrLrFZsSL",
@ -73,17 +73,18 @@ mod tests {
"ttgJtRGJQctTZtZT",
"CrZsJsPPZsGzwwsLwLmpwMDw"
]
.into_iter().map(String::from).collect()
}
#[test]
fn part1() {
let data = parse_data(data().into_iter().map(String::from).collect());
let data = parse_data(data());
assert_eq!(157, solve1(&data));
}
#[test]
fn part2() {
let data = parse_data(data().into_iter().map(String::from).collect());
let data = parse_data(data());
assert_eq!(70, solve2(&data));
}
}

7
2022/rust/src/solutions/day04.rs
View file

@ -53,19 +53,20 @@ fn parse_data(data: Vec<String>) -> Vec<((i32, i32), (i32, i32))> {
mod tests {
use super::*;
fn data() -> Vec<&'static str> {
fn data() -> Vec<String> {
vec!["2-4,6-8", "2-3,4-5", "5-7,7-9", "2-8,3-7", "6-6,4-6", "2-6,4-8"]
.into_iter().map(String::from).collect()
}
#[test]
fn part1() {
let data = parse_data(data().into_iter().map(String::from).collect());
let data = parse_data(data());
assert_eq!(2, solve1(&data));
}
#[test]
fn part2() {
let data = parse_data(data().into_iter().map(String::from).collect());
let data = parse_data(data());
assert_eq!(4, solve2(&data));
}
}

81
2022/rust/src/solutions/day05.rs
View file

@ -43,47 +43,48 @@ fn solve2((stacks, actions): &Data) -> String {
fn parse_data(data: Vec<String>) -> Data {
let re = Regex::new("( {3}|[\\[\\w\\]]{3}) ?").unwrap();
let iter = data.iter();
let mut boxes = iter
.map_while(|s| {
let cap = re.find_iter(s)
.map(|x| x.as_str().trim())
.enumerate()
.filter_map(|(idx, str)| match str.len() {
0 => None,
_ => Some((idx, str.chars().nth(1).unwrap()))
})
.collect::<Vec<_>>();
if cap.is_empty() { None } else { Some(cap) }
})
.collect::<Vec<_>>()
.into_iter()
.rev();
let stacks = boxes.next()
.map(|bottom| {
let stacks = bottom.into_iter()
.map(|(_, c)| vec![c])
.collect::<Vec<_>>();
boxes.fold(stacks, |mut acc, next| {
next.into_iter().for_each(|(i, c)|
acc[i].push(c)
);
acc
let stacks = {
let re = Regex::new("( {3}|[\\[\\w\\]]{3}) ?").unwrap();
let mut boxes = data.iter()
.map_while(|s| {
let cap = re.find_iter(s)
.map(|x| x.as_str().trim())
.enumerate()
.filter_map(|(idx, str)| match str.len() {
0 => None,
_ => Some((idx, str.chars().nth(1).unwrap()))
})
.collect::<Vec<_>>();
if cap.is_empty() { None } else { Some(cap) }
})
})
.unwrap();
let re = Regex::new("^move (\\d+) from (\\d+) to (\\d+)$").unwrap();
let actions = data.iter()
.filter_map(|str| re.captures(str))
.map(|cap| (
cap.get(1).unwrap().as_str().parse().unwrap(),
cap.get(2).unwrap().as_str().parse::<usize>().unwrap() - 1,
cap.get(3).unwrap().as_str().parse::<usize>().unwrap() - 1,
))
.collect();
.collect::<Vec<_>>()
.into_iter()
.rev();
boxes.next()
.map(|bottom| {
let stacks = bottom.into_iter()
.map(|(_, c)| vec![c])
.collect::<Vec<_>>();
boxes.fold(stacks, |mut acc, next| {
next.into_iter().for_each(|(i, c)|
acc[i].push(c)
);
acc
})
})
.unwrap()
};
let actions = {
let re = Regex::new("^move (\\d+) from (\\d+) to (\\d+)$").unwrap();
data.iter()
.filter_map(|str| re.captures(str))
.map(|cap| (
cap.get(1).unwrap().as_str().parse().unwrap(),
cap.get(2).unwrap().as_str().parse::<usize>().unwrap() - 1,
cap.get(3).unwrap().as_str().parse::<usize>().unwrap() - 1,
))
.collect()
};
(stacks, actions)
}