From f14c60323ead408bec35836e7b045c6cfb114546 Mon Sep 17 00:00:00 2001
From: daniPclos <43723008+daniPclos@users.noreply.github.com>
Date: Tue, 16 Apr 2024 20:32:46 +0200
Subject: [PATCH] Added dic_win_lose_type dictionary to compute types of
 victories for each player in test

---
 examples/player_list_evaluator.py | 11 ++++++++-
 santorinai/tester.py              | 39 ++++++++++++++++++++++++++++---
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/examples/player_list_evaluator.py b/examples/player_list_evaluator.py
index 2d140cf..6587d3d 100644
--- a/examples/player_list_evaluator.py
+++ b/examples/player_list_evaluator.py
@@ -25,6 +25,9 @@
 nb_games = 1000
 results = {}  # We will count the number of victories for each player
 
+# Initialize global victory type evaluator
+dic_global_win_lose_type = {}
+
 # Match all combinations of players
 for i, player1_class in enumerate(players_classes):
     # Get the name of the player
@@ -39,6 +42,9 @@
         p1 = player1_class(1)
         p2 = player2_class(2)
 
+        # Initialize victory type evaluator dic
+        dic_win_lose_type = {p1.name(): {}, p2.name(): {}}
+
         # Get the name of the player 2
         player2_name = p2.name()
         results[player1_name][player2_name] = 0
@@ -46,9 +52,12 @@
         print(f"\n\nPlaying {player1_name} vs {player2_name}:")
 
         # Play 100 games
-        victories_number = tester.play_1v1(p1, p2, nb_games=nb_games)
+        victories_number,  dic_global_win_lose_type[f"{p1.name()}vs{p2.name()}"] = \
+            tester.play_1v1(p1, p2, nb_games=nb_games, dic_win_lose_type=dic_win_lose_type)
+
         results[player1_name][player2_name] = victories_number[player1_name]
 
+print(f"dic_global_win_lose_type = \n{dic_global_win_lose_type}")
 
 print()
 print("Results:")
diff --git a/santorinai/tester.py b/santorinai/tester.py
index cdf9c5a..fe35796 100644
--- a/santorinai/tester.py
+++ b/santorinai/tester.py
@@ -27,7 +27,7 @@ def display_message(self, message, verbose_level=1):
         if self.verbose_level >= verbose_level:
             print(message)
 
-    def play_1v1(self, player1: Player, player2: Player, nb_games: int = 1):
+    def play_1v1(self, player1: Player, player2: Player, nb_games: int = 1, dic_win_lose_type=None):
         """
         Play a 1v1 game between player1 and player2
 
@@ -39,6 +39,10 @@ def play_1v1(self, player1: Player, player2: Player, nb_games: int = 1):
         NB_PAWNS = NB_PLAYERS * 2
 
         nb_victories = [0, 0]
+        # Initialize empty dic_win_lose_type in not passed
+        if not dic_win_lose_type:
+            dic_win_lose_type = {player1.name(): {},
+                                 player2.name(): {}}
 
         # Check if the players are objects of the Player class
         if player1 is None or not isinstance(player1, Player):
@@ -85,6 +89,9 @@ def play_1v1(self, player1: Player, player2: Player, nb_games: int = 1):
                         f"   Pawn placed at an invalid position: {reason}", 1
                     )
                     self.display_message(f"   Player {player.name()} loses")
+                    dic_win_lose_type[player.name()] = \
+                        register_new_victory_type(dic_win_lose_type[player.name()],
+                                                  f"   Pawn placed at an invalid position: {reason}")
                     nb_victories[(pawn_nb + 2) % NB_PLAYERS] += 1
                     break
 
@@ -125,6 +132,9 @@ def play_1v1(self, player1: Player, player2: Player, nb_games: int = 1):
                         f"   Pawn moved at an invalid position: {reason}", 1
                     )
                     self.display_message(f"   Player {current_player.name()} loses")
+                    dic_win_lose_type[current_player.name()] = \
+                        register_new_victory_type(dic_win_lose_type[current_player.name()],
+                                                  f"   Player {current_player.name()} loses")
                     nb_victories[(current_player.player_number) % NB_PLAYERS] += 1
                     break
 
@@ -146,7 +156,11 @@ def play_1v1(self, player1: Player, player2: Player, nb_games: int = 1):
                 self.display_message(
                     f"Player {players[winner_number - 1].name()} wins!"
                 )
-                nb_victories[winner_number - 1] += 1
+                dic_win_lose_type[players[winner_number - 1].name()] = \
+                    register_new_victory_type(dic_win_lose_type[players[winner_number - 1].name()],
+                                              f"Player {players[winner_number - 1].name()} wins!")
+
+            nb_victories[winner_number - 1] += 1
 
         # Display the results
         print("\nResults:")
@@ -168,4 +182,23 @@ def play_1v1(self, player1: Player, player2: Player, nb_games: int = 1):
         return {
             players[0].name(): nb_victories[0],
             players[1].name(): nb_victories[1],
-        }
+        }, dic_win_lose_type
+
+def register_new_victory_type(dic_win_lose_types, s_msg):
+    """
+    Function that registers types of winning and loosing conditions
+    and keeps track on a counter for each type of already registered
+    type
+    Args:
+        dic_win_lose_types:
+        s_msg:
+
+    Returns:
+
+    """
+    try:
+        dic_win_lose_types[s_msg] += 1
+    except KeyError:
+        dic_win_lose_types[s_msg] = 1
+
+    return dic_win_lose_types
\ No newline at end of file