Merge branch 'staging' into develop

src/bots.py

@@ -64,7 +64,7 @@ def restful_bid(self, auction) -> BidResp:
         start = time.time()
         auction = [element for element in auction if element != "PAD_START"]
         self.getting_doubled = len(auction)>=3 and ((auction[-3:]==['X',"PASS","PASS"] )  or auction[-2:]==['XX',"PASS"])
-        self.min_candidate_score = 0.01 if self.getting_doubled else self.min_candidate_score 
+        self.min_candidate_score = 0.01 if self.getting_doubled else self.min_candidate_score
 
         position_minus_1 = len(auction) % 4
 
@@ -306,7 +306,7 @@ def lead(self, auction):
         level = int(contract[0])
         tricks_to_defeat_contract = 13-(6+level)+1
         strain = bidding.get_strain_i(contract)
-        
+
         lead_card_indexes, lead_softmax = self.get_lead_candidates(auction)
         accepted_samples = self.get_accepted_samples(
             4096, auction, lead_card_indexes)
@@ -563,7 +563,7 @@ def get_base_diag() -> Diag:
             print("   {}".format([i for i in range(len(samples_as_diag))]))
             for key, value in (dd_solved.items()):
                 print(Card_.get_from_52(key), value)
-            
+
 
         return card_result
 

src/generate_alerts.py

@@ -194,7 +194,7 @@ def generate_suits_length_alert(bid_explanation: BidExplanations) -> str:
         if len(long_suits) == 1 and len(short_suits) == 1 and suits_length_alert_as_dict[short_suits[0]]["usual_max_length"] <= 1:
             return "Splinter : {}".format(suits_text)
         if len(long_suits) == 1:
-            return "Two suiter : {} and another".format(suits_text)
+            return "{} and 4+ other".format(suits_text)
         else:
             return "Unknown two suiter".format()
 
@@ -217,7 +217,7 @@ def generate_suits_length_alert(bid_explanation: BidExplanations) -> str:
     return "{}".format(suits_text)
 
 
-def generate_alert_from_bid_explanation(bid_explanation: BidExplanations) -> str | None:
+def generate_alert_from_bid_explanation(bid_explanation: BidExplanations) -> str|None:
     if bid_explanation.n_samples >= 5:
         # print("Number of samples : {}".format(bid_explanation.n_samples))
         hcp_text = generete_hcp_alert(bid_explanation=bid_explanation)
@@ -239,5 +239,5 @@ def request_from_pickle_file(str_sequence: List[str]) -> BidExplanations:
 
 if __name__ == "__main__":
     generate_alerts(1000)
-    # print(request_from_pickle_file(["2N"]).hcp_distribution)
+    # request_from_pickle_file(["2N","PASS","3S"])
     # print(manual_alert(["PASS", "PASS", "1S"]))

src/utils.py

@@ -423,8 +423,8 @@ def __repr__(self) -> str:
         return f"PlayerHand({repr_str})"
 
     def __str__(self) -> str:
-        suit_arrays = [["♠"], ["♥"],
-                       ["♦"], ["♣"]]
+        suit_arrays = [[SPADES_SYMBOL], [HEARTS_SYMBOL],
+                       [DIAMONDS_SYMBOL], [CLUBS_SYMBOL]]
         for card in sorted(self.cards, reverse=True):
             suit_arrays[card.suit.value].append(repr(card))
         repr_str = " ".join("".join(suit) for suit in suit_arrays)