Fixed discard logic bug in _check_three_of_a_kind and _check_pair

Author: aconconi

71_Poker/python/game.py

@@ -27,7 +27,6 @@ def __init__(self) -> None:
         """Initialise game state and allocate both sides' starting stack."""
         self.human = Human(PokerGame.INITIAL_MONEY)
         self.dealer = Dealer(PokerGame.INITIAL_MONEY)
-        self.deck: Deck
         self.pot = 0
 
     # ------------------------------------------------------------------

71_Poker/python/pokerhand/evaluation.py

@@ -1,5 +1,6 @@
 """Hand evaluation logic."""
 
+import functools
 from collections import Counter
 from collections.abc import Callable
 from typing import TYPE_CHECKING
@@ -12,6 +13,7 @@
     from .hand import Hand
 
 
+@functools.total_ordering
 class HandEvaluation:
     """
     Evaluator and Result container for a poker hand.
@@ -156,7 +158,8 @@ def _check_three_of_a_kind(self, ctx: _EvaluationContext) -> bool:
             for _, c in reversed(ctx.rank_indexed)
             if c.rank == ctx.ranks_by_freq[0]
         )
-        self.discard_indices = [idx for idx, _ in ctx.rank_indexed[0:3]]
+        keep_rank = ctx.ranks_by_freq[0]
+        self.discard_indices = [i for i, c in enumerate(ctx.cards) if c.rank != keep_rank]
         return True
 
     def _check_two_pair(self, ctx: _EvaluationContext) -> bool:
@@ -183,7 +186,8 @@ def _check_pair(self, ctx: _EvaluationContext) -> bool:
             for _, c in reversed(ctx.rank_indexed)
             if c.rank == ctx.ranks_by_freq[0]
         )
-        self.discard_indices = [idx for idx, _ in ctx.rank_indexed[0:3]]
+        keep_rank = ctx.ranks_by_freq[0]
+        self.discard_indices = [i for i, c in enumerate(ctx.cards) if c.rank != keep_rank]
         return True
 
     def _check_partial_straight(self, ctx: _EvaluationContext) -> bool: