Learning OOP with poker hands

KitN · KitN · commit 4f8b7f35ba9a · 2022-04-11T14:02:10.000+08:00
diff --git a/code/Card.py b/code/Card.py
@@ -114,6 +114,18 @@ def move_cards(self, hand, num):
         for i in range(num):
             hand.add_card(self.pop_card())
 
+    def deal_hands(self, hands, handsize):
+        """ Deals a given number of hands of a given size.
+
+        hands: number of hands to be dealt
+        handsize: how many Cards should be in each Hand
+        """
+        table = []
+        for i in range(hands):
+            curhand = Hand()
+            self.move_cards(curhand, handsize)
+            table.append(curhand)
+        return table
 
 class Hand(Deck):
     """Represents a hand of playing cards."""
@@ -147,3 +159,9 @@ def find_defining_class(obj, method_name):
     deck.move_cards(hand, 5)
     hand.sort()
     print(hand)
+
+    print('***')
+    headsup = deck.deal_hands(2,5)
+    for hand in headsup:
+        print(hand)
+        print('---')
diff --git a/code/PokerHand.py b/code/PokerHand.py
@@ -26,6 +26,80 @@ def suit_hist(self):
         for card in self.cards:
             self.suits[card.suit] = self.suits.get(card.suit, 0) + 1
 
+    def rank_hist(self):
+        """Builds a histogram of the ranks (number value) that appear.
+
+        Stores the result in attribute ranks.
+        """
+        self.ranks = {}
+        for card in self.cards:
+            self.ranks[card.rank] = self.ranks.get(card.rank, 0) + 1
+
+    def has_flush(self):
+        """Returns True if the hand has a flush, False otherwise.
+      
+        Note that this works correctly for hands with more than 5 cards.
+        """
+        self.suit_hist()
+        for val in self.suits.values():
+            if val >= 5:
+                return True
+        return False
+
+    def has_pair(self):
+        """Returns True if the hand has two of a kind at least once, False
+        otherwise
+
+        Note that a hand with three fives will also 'have a pair'
+        """
+        self.rank_hist()
+        for val in self.ranks.values():
+            if val >= 2:
+                return True
+        return False
+
+    def has_two_pair(self):
+        """Returns True if the hand has two of a kind at least TWICE, False
+        otherwise
+
+        Note that a hand with three fives will also 'have a pair'
+        """
+        self.rank_hist()
+        count = 0
+        for val in self.ranks.values():
+            if val >= 2:
+                count += 1
+        if count >= 2:
+            return True
+        return False
+
+    def has_three_o_kind(self):
+        """Returns True if the hand has a three of a kind, False otherwise
+
+        Overlaps with better hands (e.g. four o' a kind)
+        """
+        self.rank_hist()
+        for val in self.ranks.values():
+            if val >= 3:
+                return True
+        return False
+
+    def has_straight(self):
+        """ Aces high or lo"""
+        self.rank_hist()
+        prevkey = 0
+        count = 0
+        for key in self.ranks.keys():
+            if key == prevkey + 1:
+                count += 1
+                if count == 5:
+                    return True
+            else:
+                count = 0
+            prevkey = key
+
+        return False
+
     def has_flush(self):
         """Returns True if the hand has a flush, False otherwise.
       
@@ -37,6 +111,14 @@ def has_flush(self):
                 return True
         return False
 
+    def has_full_house(self):
+        pass
+
+    def has_four_o_kind(self):
+        pass
+
+    def has_straight_flush(self):
+        pass
 
 if __name__ == '__main__':
     # make a deck
@@ -49,6 +131,6 @@ def has_flush(self):
         deck.move_cards(hand, 7)
         hand.sort()
         print(hand)
-        print(hand.has_flush())
+        print(hand.has_straight())
         print('')
 
diff --git a/code/Time2_soln.py b/code/Time2_soln.py
@@ -33,6 +33,9 @@ def __str__(self):
         hour, minute = divmod(minutes, 60)
         return '%.2d:%.2d:%.2d' % (hour, minute, second)
 
+    def __lt__(self, other):
+        return self.seconds < other.seconds
+
     def print_time(self):
         """Prints a string representation of the time."""
         print(str(self))
@@ -109,6 +112,10 @@ def main():
     total = sum([t1, t2, t3])
     print(total)
 
+    print( t1 < t2)
+    print( t2 < t3)
+    print( t3 < t1)
+
 
 if __name__ == '__main__':
     main()
