y2023 d7

k2bd · k2bd · commit 16c2db07222b · 2023-12-08T16:57:35.000Z
diff --git a/src/advent_of_code/y2023/d7.py b/src/advent_of_code/y2023/d7.py
@@ -26,29 +26,40 @@ class CamelCardsHand:
     @cached_property
     def hand_type_strength(self) -> int:
         card_value_counts = {
-            v: sum(1 for c in self.cards if c == v) for v in set(self.cards)
+            v: sum(1 for c in self.cards if c == v)
+            for v in {card for card in self.cards if card != 0}
         }
         card_counts = card_value_counts.values()
 
-        if set(card_counts) == {5}:
+        num_jokers = sum(1 for c in self.cards if c == 0)
+
+        if max(card_counts or [0]) + num_jokers == 5:
             return FIVE_OF_A_KIND
-        elif set(card_counts) == {4, 1}:
+        elif max(card_counts or [0]) + num_jokers == 4:
             return FOUR_OF_A_KIND
-        elif set(card_counts) == {3, 2}:
+        elif set(card_counts) == {3, 2} or (
+            sorted(card_counts) == [2, 2] and num_jokers == 1
+        ):
             return FULL_HOUSE
-        elif set(card_counts) == {3, 1}:
+        elif max(card_counts or [0]) + num_jokers == 3:
             return THREE_OF_A_KIND
         elif sorted(card_counts) == [1, 2, 2]:
             return TWO_PAIR
-        elif 2 in card_counts:
+        elif 2 in card_counts or num_jokers == 1:
             return ONE_PAIR
         else:
             return HIGH_CARD
 
-    def __eq__(self, other: "CamelCardsHand") -> bool:
+    def __eq__(self, other) -> bool:
+        if not isinstance(other, CamelCardsHand):
+            return NotImplemented
+
         return self.cards == other.cards
 
-    def __lt__(self, other: "CamelCardsHand") -> bool:
+    def __lt__(self, other) -> bool:
+        if not isinstance(other, CamelCardsHand):
+            return NotImplemented
+
         if self.hand_type_strength < other.hand_type_strength:
             return True
         if self.hand_type_strength == other.hand_type_strength:
@@ -62,12 +73,12 @@ def __lt__(self, other: "CamelCardsHand") -> bool:
         return False
 
     @classmethod
-    def from_input(cls, input_line: str) -> "CamelCardsHand":
+    def from_input(cls, input_line: str, joker_rule: bool = False) -> "CamelCardsHand":
         cards_part, bid_part = input_line.split()
 
         values_map = {
             "T": 10,
-            "J": 11,
+            "J": 0 if joker_rule else 11,
             "Q": 12,
             "K": 13,
             "A": 14,
@@ -79,7 +90,7 @@ def from_input(cls, input_line: str) -> "CamelCardsHand":
 
         return cls(
             bid=int(bid_part),
-            cards=card_values,
+            cards=card_values,  # type: ignore
         )
 
 
@@ -90,7 +101,9 @@ def part_1(cards_input: list[str]) -> int:
 
 
 def part_2(cards_input: list[str]) -> int:
-    pass
+    hands = [CamelCardsHand.from_input(line, joker_rule=True) for line in cards_input]
+
+    return sum(i * hand.bid for i, hand in enumerate(sorted(hands), start=1))
 
 
 if __name__ == "__main__":
diff --git a/tests/test_y2023/test_d7.py b/tests/test_y2023/test_d7.py
@@ -14,4 +14,4 @@ def test_part_1():
 
 
 def test_part_2():
-    assert part_2(TEST_INPUT) == 0
+    assert part_2(TEST_INPUT) == 5905

Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,4 @@ def test_part_1():`
`14`	`14`
`15`	`15`
`16`	`16`	`def test_part_2():`
`17`		`- assert part_2(TEST_INPUT) == 0`
	`17`	`+ assert part_2(TEST_INPUT) == 5905`