Changeset 6

Timestamp:

01/23/08 08:53:40 (4 years ago)

Author:

mike

Message:

had judge hand return tuples with the first item beign the rank of the highest type of hand

Files:

• hand.py (modified) (2 diffs)

hand.py

@@ -1 +1 @@
 import deck
 
-hand_orders = ["straight_flush",
+hand_orders = [ "high_card",
+                "pair",
+                "two_pair",
+                "three_of_a_kind",
+                "straight",
+                "flush",
+                "full_house",
                 "four_of_a_kind",
-                "full_house",
-                "flush",
-                "straight",
-                "three_of_a_kind",
-                "two_pair",
-                "pair",
-                "high_card"]
+                "straight_flush" ]
 
 #returns the best combination for the 5 cards
 def judge_hand(cards):
     ret = is_straight_flush(cards)
-    if ret: return ret
-    else: return is_n_kinds([a for (a,b) in cards])
+    if not ret: ret = is_n_kinds([a for (a,b) in cards])
+    #replace the text with a value
+    return (hand_orders.index(ret[0]), ret[1])
+
 
 #for all these functions, make sure cards are sorted DESCENDING!!!!
@@ -69 +71 @@
         #now check if it's two pair
         if len(whats_left) >= 2:
-            print highest_card
             ret = is_n_kinds(whats_left)
             #if the subset is a pair then this is a two pair