update formation file

Author: naderzare

server.py

@@ -13,6 +13,7 @@
 from src.sample_coach_agent import SampleCoachAgent
 from src.sample_player_agent import SamplePlayerAgent
 from src.sample_trainer_agent import SampleTrainerAgent
+import traceback
 
 
 console_logging_level = logging.INFO
@@ -51,8 +52,7 @@ def GetAction(self, state: pb2.State):
                 return self.GetTrainerActions(state)
         except Exception as e:
             self.logger.error(f"Error in GetAction: {e}")
-            import traceback
-            traceback.print_exc()
+            self.logger.error(traceback.format_exc())
             return pb2.PlayerActions()
 
     def GetPlayerActions(self, state: pb2.State):
@@ -81,16 +81,31 @@ def GetTrainerActions(self, state: pb2.State):
         return pb2.TrainerActions(actions=self.agent.get_actions())
 
     def SetServerParams(self, server_params: pb2.ServerParam):
-        self.logger.debug(f"Server params received unum {server_params.register_response.uniform_number}")
-        self.agent.set_server_params(server_params)
+        try:
+            self.logger.debug(f"Server params received unum {server_params.register_response.uniform_number}")
+            self.agent.set_server_params(server_params)
+        except Exception as e:
+            self.logger.error(f"Error in GetAction: {e}")
+            self.logger.error(traceback.format_exc())
+            return pb2.PlayerActions()
 
     def SetPlayerParams(self, player_params: pb2.PlayerParam):
-        self.logger.debug(f"Player params received unum {player_params.register_response.uniform_number}")
-        self.agent.set_player_params(player_params)
+        try:
+            self.logger.debug(f"Player params received unum {player_params.register_response.uniform_number}")
+            self.agent.set_player_params(player_params)
+        except Exception as e:
+            self.logger.error(f"Error in GetAction: {e}")
+            self.logger.error(traceback.format_exc())
+            return pb2.PlayerActions()
 
     def SetPlayerType(self, player_type: pb2.PlayerType):
-        self.logger.debug(f"Player type received unum {player_type.register_response.uniform_number}")
-        self.agent.set_player_types(player_type)
+        try:
+            self.logger.debug(f"Player type received unum {player_type.register_response.uniform_number}")
+            self.agent.set_player_types(player_type)
+        except Exception as e:
+            self.logger.error(f"Error in GetAction: {e}")
+            self.logger.error(traceback.format_exc())
+            return pb2.PlayerActions()
 
 class GameHandler(pb2_grpc.GameServicer):
     def __init__(self, shared_lock, shared_number_of_connections) -> None:
@@ -158,8 +173,7 @@ def Register(self, register_request: pb2.RegisterRequest, context):
             return register_response
         except Exception as e:
             main_logger.error(f"Error in Register: {e}")
-            import traceback
-            traceback.print_exc()
+            main_logger.error(traceback.format_exc())
             return pb2.RegisterResponse()
 
     def SendByeCommand(self, register_response: pb2.RegisterResponse, context):

src/sample_player_agent.py

@@ -10,7 +10,7 @@ def __init__(self, logger) -> None:
         super().__init__(logger)
         self.logger.info('SamplePlayerAgent created')
         self.decision_maker = DecisionMaker()
-        self.strategy = FormationStrategy()
+        self.strategy = FormationStrategy(self.logger)
         self.wm: WorldModel = None
 
     def update_actions(self, wm:WorldModel):

src/strategy/formation_file.py

@@ -2,14 +2,45 @@
 from pyrusgeom.geom_2d import *
 from enum import Enum
 from pyrusgeom.soccer_math import min_max
+import logging
+from abc import ABC, abstractmethod
 
 class FormationType(Enum):
     Static = 's'
     DelaunayTriangulation2 = 'D'
 
+class FormationIndexData:
+    def __init__(self, ball, players):
+        self._ball: list[float] = ball
+        self._players: list[list[float]] = players
+        
+    def ball(self) -> list[float]:
+        return self._ball
+    
+    def players(self) -> list[list[float]]:
+        return self._players
+
+class IFormationFileReader(ABC):
+    @abstractmethod
+    def read_file(self, path):
+        pass
+    
+class OldStaticFormationFileReader(IFormationFileReader):
+    def read_file(self, lines):
+        players = []
+        for i in range(len(lines)):
+            if i == 0 or lines[i].startswith('#'):
+                continue
+            player = lines[i].split()
+            players.append([float(player[2]), float(player[3])])
+        
+        return FormationIndexData(None, players)
+            
+    
 
 class FormationFile:
-    def __init__(self, path):
+    def __init__(self, path, logger: logging.Logger):
+        self._logger = logger
         self._balls = []
         self._players = []
         self._triangles = []
@@ -25,7 +56,11 @@ def read_file(self, path):
         if lines[0].find('Static') < 0:
             self._formation_type = FormationType.DelaunayTriangulation2
         if self._formation_type == FormationType.Static:
-            self.read_static(lines)
+            data = OldStaticFormationFileReader().read_file(lines)
+            players = data.players()
+            # self._players = data.players()
+            for i in range(11):
+                self._target_players[i + 1] = Vector2D(float(players[i][0]), float(players[i][1]))
         else:
             self.read_delaunay(lines)
 

src/strategy/formation_strategy.py

@@ -15,21 +15,24 @@ class Situation(Enum):
     PenaltyKick_Situation = 4
 
 class Formation:
-    def __init__(self, path):
-        self.before_kick_off_formation: FormationFile = FormationFile(f'{path}/before_kick_off.conf')
-        self.defense_formation: FormationFile = FormationFile(f'{path}/defense_formation.conf')
-        self.offense_formation: FormationFile = FormationFile(f'{path}/offense_formation.conf')
-        self.goalie_kick_opp_formation: FormationFile = FormationFile(f'{path}/goalie_kick_opp_formation.conf')
-        self.goalie_kick_our_formation: FormationFile = FormationFile(f'{path}/goalie_kick_our_formation.conf')
-        self.kickin_our_formation: FormationFile = FormationFile(f'{path}/kickin_our_formation.conf')
-        self.setplay_opp_formation: FormationFile = FormationFile(f'{path}/setplay_opp_formation.conf')
-        self.setplay_our_formation: FormationFile = FormationFile(f'{path}/setplay_our_formation.conf')
+    def __init__(self, path, logger: logging.Logger):
+        self.before_kick_off_formation: FormationFile = FormationFile(f'{path}/before_kick_off.conf', logger)
+        self.defense_formation: FormationFile = FormationFile(f'{path}/defense_formation.conf', logger)
+        self.offense_formation: FormationFile = FormationFile(f'{path}/offense_formation.conf', logger)
+        self.goalie_kick_opp_formation: FormationFile = FormationFile(f'{path}/goalie_kick_opp_formation.conf', logger)
+        self.goalie_kick_our_formation: FormationFile = FormationFile(f'{path}/goalie_kick_our_formation.conf', logger)
+        self.kickin_our_formation: FormationFile = FormationFile(f'{path}/kickin_our_formation.conf', logger)
+        self.setplay_opp_formation: FormationFile = FormationFile(f'{path}/setplay_opp_formation.conf', logger)
+        self.setplay_our_formation: FormationFile = FormationFile(f'{path}/setplay_our_formation.conf', logger)
 
 class FormationStrategy(IPositionStrategy):
-    def __init__(self):
+    def __init__(self, logger: logging.Logger):
+        self.logger = logger
         self.formations: dict[str, Formation] = {}
-        self.formations['4-3-3'] = Formation('src/formations/4-3-3')
-        self.selected_formation_name = '4-3-3'
+        self.formations['4-3-3'] = Formation('src/formations/4-3-3', logger)
+        # self.formations['4-3-3-cyrus-base'] = Formation('src/formations/4-3-3-cyrus-base')
+        # self.selected_formation_name = '4-3-3-cyrus-base' # '4-3-3'
+        self.selected_formation_name = '4-3-3' # '4-3-3'
 
         self._poses: dict[int, Vector2D] = {(i, Vector2D(0, 0)) for i in range(11)}
         self.current_situation = Situation.Offense_Situation