Handling Pass out boards

lorserker · Apr 13, 2024 · 998bcc9 · 998bcc9
1 parent a5dfaa4
commit 998bcc9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/bidding/bidding.py b/src/bidding/bidding.py
@@ -160,9 +160,13 @@ def get_contract(auction):
     return contract + xx + declarer
 
 def get_strain_i(contract):
+    if contract is None or contract == "PASS":
+        return None
     return 'NSHDC'.index(contract[1])
 
 def get_decl_i(contract):
+    if contract is None or contract == "PASS":
+        return None
     return 'NESW'.index(contract[-1])
 
 def get_bid_ids(auction, player_i, n_steps):

diff --git a/src/bots.py b/src/bots.py
@@ -453,9 +453,9 @@ def expected_tricks_sd(self, hands_np, auctions_np):
             contract = bidding.get_contract(sample_auction)
             # All pass doens't really fit, and is always 0 - we ignore it for now
             if contract is None:
-                contracts.append("pass")
-                strains[i] = -1
-                declarers[i] = -1
+                contracts.append("PASS")
+                strains[i] = None
+                declarers[i] = None
             else:
                 contracts.append(contract)
                 strains[i] = 'NSHDC'.index(contract[1])
@@ -505,7 +505,7 @@ def expected_tricks_sd_no_lead(self, hands_np, auctions_np):
             contract = bidding.get_contract(sample_auction)
             # All pass doesn't really fit, and is always 0 - we ignore it for now
             if contract is None:
-                contracts.append("pass")
+                contracts.append("PASS")
                 strains[i] = -1
                 declarers[i] = -1
             else:
@@ -548,7 +548,7 @@ def expected_tricks_dd(self, hands_np, auctions_np):
             contract = bidding.get_contract(sample_auction)
             # All pass doesn't really fit, and is always 0 - we ignore it for now
             if contract is None:
-                contracts.append("pass")
+                contracts.append("PASS")
                 strains[i] = -1
                 declarers[i] = -1
             else: