Merge pull request #83 from skent259/add-bet-string

Add `__str__` method for bets
Replace `__repr__` with `__str__` in most places

Author: skent259

CHANGELOG.md

@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-* New bets: `Horn`, `World` (Whirl), `Big6`/`Big8`, `Buy`, `Lay`, and `Put` (with or without odds) 
+* New bets: `Horn`, `World` (Whirl), `Big6`/`Big8`, `Buy`, `Lay`, and `Put` (with or without odds) from [@nova-rey](https://github.com/nova-rey)
   * Corresponding single bet strategies
   * Corresponding odds strategies: `PutOddsAmount`, `PutOddsMultiplier`
   * Corresponding examples strategies: `QuickProps`, `BuySampler`, `LaySampler`, `PutWithOdds`
@@ -22,11 +22,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * `ThreePointMolly` and `ThreePointDolly` strategies with variable odds/win mutipliers
 * Stress tests, expanded examples, tools as part of the Vanilla Expansion Project
 
+### Changed
+
+* The default printout for bets is now more compact and easy to read (the `__str__` method is defined; instead of only `__repr__`)
+
 ### Fixed
 
 *  `DontPass` and `DontCome` bets will now "push" on a come-out 12, bringing the bet down and returing the bet amount to the player. `_WinningLosingNumbersBet` gains `get_push_numbers()` method to accomodate. 
 *  The `Risk12` strategy will now take down place bets after hitting point (i.e. place bets not working), which is aligned to table conventions
-*  `OddsMultiplier `__repr__` logic so that floats, ints, and incomplete dictionaries all work for odds/win multiplier
+*  `OddsMultiplier` `__repr__` logic so that floats, ints, and incomplete dictionaries all work for odds/win multiplier
 
 ## [0.3.2] - 2025-10-11
 

crapssim/bet.py

@@ -116,6 +116,13 @@ class _MetaBetABC(ABCMeta):
     def __repr__(cls):
         return f"crapssim.bet.{cls.__name__}"
 
+    def __str__(cls):
+        return f"{cls.__name__}"
+
+
+def _compact_float(x) -> str:
+    return str(int(x)) if isinstance(x, float) and x.is_integer() else format(x, ".15g")
+
 
 class Bet(ABC, metaclass=_MetaBetABC):
     """
@@ -227,6 +234,9 @@ def __sub__(self, other: "Bet") -> "Bet":
     def __rsub__(self, other):
         return self.__sub__(other)
 
+    def __str__(self) -> str:
+        return f"${_compact_float(self.amount)} {self.__class__.__name__}"
+
 
 class _WinningLosingNumbersBet(Bet, ABC):
     """
@@ -438,6 +448,10 @@ def _placed_key(self) -> Hashable:
     def __repr__(self) -> str:
         return f"{self.__class__.__name__}(amount={self.amount}, number={self.number})"
 
+    def __str__(self) -> str:
+        number_str = f"({self.number})" if self.number is not None else ""
+        return f"{super().__str__()}{number_str}"
+
 
 class DontPass(_WinningLosingNumbersBet):
     """
@@ -547,6 +561,10 @@ def _placed_key(self) -> Hashable:
     def __repr__(self) -> str:
         return f"{self.__class__.__name__}(amount={self.amount}, number={self.number})"
 
+    def __str__(self) -> str:
+        number_str = f"({self.number})" if self.number is not None else ""
+        return f"{super().__str__()}{number_str}"
+
 
 # Odds bets -------------------------------------------------------------------
 
@@ -663,10 +681,19 @@ def _placed_key(self) -> Hashable:
 
     def __repr__(self):
         return (
-            f"Odds(base_type={self.base_type}, number={self.number}, amount={self.amount}"
+            f"Odds(base_type={self.base_type!r}, "
+            f"number={self.number}, amount={self.amount}"
             f"{self._get_always_working_repr()}"
         )
 
+    def __str__(self) -> str:
+        number_str = f", {self.number}" if self.number is not None else ""
+
+        if issubclass(self.base_type, (PassLine, DontPass)):
+            return f"{super().__str__()}({self.base_type})"
+        elif issubclass(self.base_type, (Come, Put, DontCome)):
+            return f"{super().__str__()}({self.base_type}{number_str})"
+
 
 class Put(_SimpleBet):
     """Flat line bet on a box number; point must be ON and odds obey table policy."""
@@ -692,6 +719,9 @@ def _placed_key(self) -> Hashable:
     def __repr__(self) -> str:
         return f"Put({self.number}, amount={self.amount})"
 
+    def __str__(self) -> str:
+        return f"{super().__str__()}({self.number})"
+
 
 # Place bets ------------------------------------------------------------------
 
@@ -728,6 +758,9 @@ def _placed_key(self) -> Hashable:
     def __repr__(self) -> str:
         return f"Place({self.winning_numbers[0]}, amount={self.amount})"
 
+    def __str__(self) -> str:
+        return f"{super().__str__()}({self.number})"
+
 
 def _compute_vig(
     bet_amount: float,
@@ -815,6 +848,9 @@ def _placed_key(self) -> Hashable:
     def __repr__(self) -> str:
         return f"Buy({self.number}, amount={self.amount})"
 
+    def __str__(self) -> str:
+        return f"{super().__str__()}({self.number})"
+
 
 class Lay(_SimpleBet):
     """True-odds bet against 4/5/6/8/9/10, paying if 7 arrives first.
@@ -872,6 +908,9 @@ def _placed_key(self) -> Hashable:
     def __repr__(self) -> str:
         return f"Lay({self.number}, amount={self.amount})"
 
+    def __str__(self) -> str:
+        return f"{super().__str__()}({self.number})"
+
 
 # _WinningLosingNumbersBets with variable payouts -----------------------------------------------------------------
 
@@ -1178,6 +1217,9 @@ def _placed_key(self) -> Hashable:
     def __repr__(self) -> str:
         return f"{self.__class__.__name__}({self.number}, amount={self.amount})"
 
+    def __str__(self) -> str:
+        return f"{super().__str__()}({self.number})"
+
 
 # Hop bets -------------------------------------------------------------------
 
@@ -1237,6 +1279,10 @@ def _placed_key(self) -> Hashable:
     def __repr__(self) -> str:
         return f"{self.__class__.__name__}({self.result}, amount={self.amount})"
 
+    def __str__(self) -> str:
+        result_str = f"({self.result[0]},{self.result[1]})"
+        return f"{super().__str__()}{result_str}"
+
 
 # Fire bet -------------------------------------------------------------------
 

crapssim/strategy/odds.py

@@ -88,7 +88,7 @@ def _get_always_working_repr(self) -> str:
 
     def __repr__(self):
         return (
-            f"{self.__class__.__name__}(base_type={self.base_type}, "
+            f"{self.__class__.__name__}(base_type={self.base_type!r}, "
             f"odds_amounts={self.odds_amounts}"
             f"{self._get_always_working_repr()}"
         )
@@ -227,7 +227,7 @@ def _get_always_working_repr(self) -> str:
 
     def __repr__(self) -> str:
         return (
-            f"{self.__class__.__name__}(base_type={self.base_type}, "
+            f"{self.__class__.__name__}(base_type={self.base_type!r}, "
             f"odds_multiplier={_condense_multiplier_dict(self.odds_multiplier)}"
             f"{self._get_always_working_repr()}"
         )
@@ -354,7 +354,7 @@ def _convert_win_to_odds_mult(
 
     def __repr__(self) -> str:
         return (
-            f"{self.__class__.__name__}(base_type={self.base_type}, "
+            f"{self.__class__.__name__}(base_type={self.base_type!r}, "
             f"win_multiplier={_condense_multiplier_dict(self.win_multiplier)}"
             f"{self._get_always_working_repr()}"
         )

crapssim/strategy/tools.py

@@ -420,8 +420,9 @@ def key(self, player: Player) -> bool:
 
     def __repr__(self) -> str:
         return (
-            f"{self.__class__.__name__}(bet_type={self.bet_type}, count={self.count}, "
-            f"bet={self.bet})"
+            f"{self.__class__.__name__}"
+            f"(bet_type={self.bet_type!r}, count={self.count}, "
+            f"bet={self.bet!r})"
         )
 
 

examples/run_examples.py

@@ -18,7 +18,7 @@ def run_example(name, strategy_factory):
     print(f"Final bankroll: {player.bankroll:.2f}")
     # Show remaining open bets (should be few or none in these demos)
     if player.bets:
-        print("Open bets:", [repr(bet) for bet in player.bets])
+        print("Open bets:", [str(bet) for bet in player.bets])
 
 
 def main():
@@ -43,3 +43,4 @@ def main():
 
 if __name__ == "__main__":
     main()
+    main()

examples/run_strategy_testing.py

@@ -29,7 +29,7 @@ def run_scenario(rolls):
     # Show remaining open bets (should be few or none in these demos)
     # Note this does not run strategy to add/clear bets for next roll
     if player.bets:
-        print("Open bets:", [repr(bet) for bet in player.bets])
+        print("Open bets:", [str(bet) for bet in player.bets])
 
 
 def main():

tests/integration/verified_table_output.txt

@@ -8,7 +8,7 @@ Player 1: Bankroll=1000.0, Bet amount=0, Bets=[]
 
 Dice out! (roll 1, shooter 1)
 Shooter rolled 7 (5, 2)
-Player 0 won $5.0 on PassLine(amount=5.0)!
+Player 0 won $5.0 on $5 PassLine!
 Point is Off (None)
 Player 0: Bankroll=100.0, Bet amount=5.0, Bets=[PassLine(amount=5.0)]
 Player 1: Bankroll=1000.0, Bet amount=0, Bets=[]
@@ -21,7 +21,7 @@ Player 1: Bankroll=968.0, Bet amount=32.0, Bets=[Place(5, amount=10.0), Place(6,
 
 Dice out! (roll 3, shooter 1)
 Shooter rolled 4 (2, 2)
-Player 1 won $18.0 on Place(4, amount=10.0)!
+Player 1 won $18.0 on $10 Place(4)!
 Point is On (8)
 Player 0: Bankroll=90.0, Bet amount=15.0, Bets=[PassLine(amount=5.0), Odds(base_type=crapssim.bet.PassLine, number=8, amount=10.0)]
 Player 1: Bankroll=986.0, Bet amount=32.0, Bets=[Place(5, amount=10.0), Place(6, amount=12.0), Place(4, amount=10.0)]
@@ -40,18 +40,18 @@ Player 1: Bankroll=986.0, Bet amount=32.0, Bets=[Place(5, amount=10.0), Place(6,
 
 Dice out! (roll 6, shooter 1)
 Shooter rolled 4 (1, 3)
-Player 1 won $18.0 on Place(4, amount=10.0)!
+Player 1 won $18.0 on $10 Place(4)!
 Point is On (8)
 Player 0: Bankroll=90.0, Bet amount=15.0, Bets=[PassLine(amount=5.0), Odds(base_type=crapssim.bet.PassLine, number=8, amount=10.0)]
 Player 1: Bankroll=1004.0, Bet amount=32.0, Bets=[Place(5, amount=10.0), Place(6, amount=12.0), Place(4, amount=10.0)]
 
 Dice out! (roll 7, shooter 1)
 Shooter rolled 7 (4, 3)
-Player 0 lost $5.0 on PassLine(amount=5.0).
-Player 0 lost $10.0 on Odds(base_type=crapssim.bet.PassLine, number=8, amount=10.0).
-Player 1 lost $10.0 on Place(5, amount=10.0).
-Player 1 lost $12.0 on Place(6, amount=12.0).
-Player 1 lost $10.0 on Place(4, amount=10.0).
+Player 0 lost $5.0 on $5 PassLine.
+Player 0 lost $10.0 on $10 Odds(PassLine).
+Player 1 lost $10.0 on $10 Place(5).
+Player 1 lost $12.0 on $12 Place(6).
+Player 1 lost $10.0 on $10 Place(4).
 Point is Off (None)
 Player 0: Bankroll=85.0, Bet amount=5.0, Bets=[PassLine(amount=5.0)]
 Player 1: Bankroll=1004.0, Bet amount=0, Bets=[]
@@ -70,11 +70,11 @@ Player 1: Bankroll=972.0, Bet amount=32.0, Bets=[Place(5, amount=10.0), Place(8,
 
 Dice out! (roll 10, shooter 2)
 Shooter rolled 7 (4, 3)
-Player 0 lost $5.0 on PassLine(amount=5.0).
-Player 0 lost $10.0 on Odds(base_type=crapssim.bet.PassLine, number=6, amount=10.0).
-Player 1 lost $10.0 on Place(5, amount=10.0).
-Player 1 lost $12.0 on Place(8, amount=12.0).
-Player 1 lost $10.0 on Place(4, amount=10.0).
+Player 0 lost $5.0 on $5 PassLine.
+Player 0 lost $10.0 on $10 Odds(PassLine).
+Player 1 lost $10.0 on $10 Place(5).
+Player 1 lost $12.0 on $12 Place(8).
+Player 1 lost $10.0 on $10 Place(4).
 Point is Off (None)
 Player 0: Bankroll=70.0, Bet amount=5.0, Bets=[PassLine(amount=5.0)]
 Player 1: Bankroll=972.0, Bet amount=0, Bets=[]
@@ -87,15 +87,15 @@ Player 1: Bankroll=940.0, Bet amount=32.0, Bets=[Place(5, amount=10.0), Place(6,
 
 Dice out! (roll 12, shooter 3)
 Shooter rolled 8 (6, 2)
-Player 0 won $5.0 on PassLine(amount=5.0)!
-Player 0 won $12.0 on Odds(base_type=crapssim.bet.PassLine, number=8, amount=10.0)!
+Player 0 won $5.0 on $5 PassLine!
+Player 0 won $12.0 on $10 Odds(PassLine)!
 Point is Off (None)
 Player 0: Bankroll=87.0, Bet amount=5.0, Bets=[PassLine(amount=5.0)]
 Player 1: Bankroll=972.0, Bet amount=0, Bets=[]
 
 Dice out! (roll 13, shooter 3)
 Shooter rolled 3 (1, 2)
-Player 0 lost $5.0 on PassLine(amount=5.0).
+Player 0 lost $5.0 on $5 PassLine.
 Point is Off (None)
 Player 0: Bankroll=82.0, Bet amount=5.0, Bets=[PassLine(amount=5.0)]
 Player 1: Bankroll=972.0, Bet amount=0, Bets=[]
@@ -114,7 +114,7 @@ Player 1: Bankroll=938.0, Bet amount=34.0, Bets=[Place(6, amount=12.0), Place(8,
 
 Dice out! (roll 16, shooter 3)
 Shooter rolled 8 (5, 3)
-Player 1 won $14.0 on Place(8, amount=12.0)!
+Player 1 won $14.0 on $12 Place(8)!
 Point is On (5)
 Player 0: Bankroll=72.0, Bet amount=15.0, Bets=[PassLine(amount=5.0), Odds(base_type=crapssim.bet.PassLine, number=5, amount=10.0)]
 Player 1: Bankroll=952.0, Bet amount=34.0, Bets=[Place(6, amount=12.0), Place(4, amount=10.0), Place(8, amount=12.0)]
@@ -127,25 +127,25 @@ Player 1: Bankroll=952.0, Bet amount=34.0, Bets=[Place(6, amount=12.0), Place(4,
 
 Dice out! (roll 18, shooter 3)
 Shooter rolled 7 (3, 4)
-Player 0 lost $5.0 on PassLine(amount=5.0).
-Player 0 lost $10.0 on Odds(base_type=crapssim.bet.PassLine, number=5, amount=10.0).
-Player 1 lost $12.0 on Place(6, amount=12.0).
-Player 1 lost $10.0 on Place(4, amount=10.0).
-Player 1 lost $12.0 on Place(8, amount=12.0).
+Player 0 lost $5.0 on $5 PassLine.
+Player 0 lost $10.0 on $10 Odds(PassLine).
+Player 1 lost $12.0 on $12 Place(6).
+Player 1 lost $10.0 on $10 Place(4).
+Player 1 lost $12.0 on $12 Place(8).
 Point is Off (None)
 Player 0: Bankroll=67.0, Bet amount=5.0, Bets=[PassLine(amount=5.0)]
 Player 1: Bankroll=952.0, Bet amount=0, Bets=[]
 
 Dice out! (roll 19, shooter 4)
 Shooter rolled 7 (3, 4)
-Player 0 won $5.0 on PassLine(amount=5.0)!
+Player 0 won $5.0 on $5 PassLine!
 Point is Off (None)
 Player 0: Bankroll=72.0, Bet amount=5.0, Bets=[PassLine(amount=5.0)]
 Player 1: Bankroll=952.0, Bet amount=0, Bets=[]
 
 Dice out! (roll 20, shooter 4)
 Shooter rolled 7 (3, 4)
-Player 0 won $5.0 on PassLine(amount=5.0)!
+Player 0 won $5.0 on $5 PassLine!
 Point is Off (None)
 Player 0: Bankroll=82.0, Bet amount=0, Bets=[]
 Player 1: Bankroll=952.0, Bet amount=0, Bets=[]