smellyfis/AOC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reformatting

Browse Source
This commit is contained in:
Dylan Thies
2024-01-06 11:46:37 -05:00
parent 27613db8f7
commit 26262dcdb7
4 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
2023/day-7/src/part1.rs
View File

@@ -86,11 +86,7 @@ impl From<&Hand> for HandType {
acc.entry(card).and_modify(|c| *c += 1).or_insert(1);
acc
});
match map
.into_values()
.sorted_by(|a, &b| b.cmp(a))
.as_slice()
{
match map.into_values().sorted_by(|a, &b| b.cmp(a)).as_slice() {
[5, ..] => Self::FiveOfAKind,
[4, ..] => Self::FourOfAKind,
[3, 2, ..] => Self::FullHouse,

17
2023/day-7/src/part2.rs
View File

@@ -101,16 +101,15 @@ enum HandType {
impl From<&Hand> for HandType {
fn from(value: &Hand) -> Self {
let mut map = value.cards.into_iter().fold(BTreeMap::new(), |mut acc, card| {
acc.entry(card).and_modify(|c| *c += 1).or_insert(1);
acc
});
let mut map = value
.cards
.into_iter()
.fold(BTreeMap::new(), |mut acc, card| {
acc.entry(card).and_modify(|c| *c += 1).or_insert(1);
acc
});
let jokers = map.remove(&Card::Joker).unwrap_or(0);
match map
.into_values()
.sorted_by(|a, &b| b.cmp(a))
.as_slice()
{
match map.into_values().sorted_by(|a, &b| b.cmp(a)).as_slice() {
[x, ..] if jokers + x == 5 => Self::FiveOfAKind,
[] if jokers == 5 => Self::FiveOfAKind,
[x, ..] if jokers + x == 4 => Self::FourOfAKind,