Merge pull request #197 from asdawej/patch-pyapi

fix wrong `ShipPlay` in `TeamDebugAPI` & improve log file name

Author: asdawej

CAPI/python/PyAPI/DebugAPI.py

@@ -10,7 +10,7 @@
 
 class ShipDebugAPI(IShipAPI, IGameTimer):
     def __init__(
-        self, logic: ILogic, file: bool, screen: bool, warnOnly: bool, playerID: int
+        self, logic: ILogic, file: bool, screen: bool, warnOnly: bool, playerID: int, teamID: int
     ) -> None:
         self.__logic = logic
         self.__pool = ThreadPoolExecutor(20)
@@ -31,9 +31,7 @@ def __init__(
 
         fileHandler = logging.FileHandler(
             os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-            + "/logs/api-"
-            + str(playerID)
-            + "-log.txt",
+            + f"/logs/api-{teamID}-{playerID}-log.txt",
             mode="w+",
             encoding="utf-8",
         )
@@ -302,7 +300,7 @@ def Play(self, ai: IAI) -> None:
 
 class TeamDebugAPI(ITeamAPI, IGameTimer):
     def __init__(
-        self, logic: ILogic, file: bool, screen: bool, warnOnly: bool, playerID: int
+        self, logic: ILogic, file: bool, screen: bool, warnOnly: bool, playerID: int, teamID: int
     ) -> None:
         self.__logic = logic
         self.__pool = ThreadPoolExecutor(20)
@@ -323,9 +321,7 @@ def __init__(
 
         fileHandler = logging.FileHandler(
             os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-            + "/logs/api-"
-            + str(playerID)
-            + "-log.txt",
+            + f"/logs/api-{teamID}-{playerID}-log.txt",
             mode="w+",
             encoding="utf-8",
         )
@@ -518,4 +514,4 @@ def EndTimer(self) -> None:
         self.__logger.info(f"Time elapsed: {self.__GetTime()}ms")
 
     def Play(self, ai: IAI) -> None:
-        ai.ShipPlay(self)
+        ai.TeamPlay(self)

CAPI/python/PyAPI/logic.py

@@ -843,9 +843,7 @@ def Main(
 
         fileHandler = logging.FileHandler(
             os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-            + "/logs/logic"
-            + str(self.__playerID)
-            + "-log.txt",
+            + f"/logs/logic-{self.__teamID}-{self.__playerID}-log.txt",
             "w+",
             encoding="utf-8",
         )
@@ -881,11 +879,11 @@ def Main(
         else:
             if self.__playerID == 0:
                 self.__timer = TeamDebugAPI(
-                    self, file, screen, warnOnly, self.__playerID
+                    self, file, screen, warnOnly, self.__playerID, self.__teamID
                 )
             else:
                 self.__timer = ShipDebugAPI(
-                    self, file, screen, warnOnly, self.__playerID
+                    self, file, screen, warnOnly, self.__playerID, self.__teamID
                 )
 
         # 构建AI线程

CAPI/python_exp/PyAPI/DebugAPI.py

@@ -10,7 +10,9 @@
 
 
 class ShipDebugAPI(IShipAPI, IGameTimer):
-    def __init__(self, logic: ILogic, file: bool, screen: bool, warnOnly: bool, playerID: int) -> None:
+    def __init__(self, logic: ILogic,
+                 file: bool, screen: bool, warnOnly: bool,
+                 playerID: int, teamID: int) -> None:
         self.__logic = logic
         self.__pool = ThreadPoolExecutor(20)
         self.__startPoint = datetime.datetime.now()
@@ -25,11 +27,9 @@ def __init__(self, logic: ILogic, file: bool, screen: bool, warnOnly: bool, play
 
         fileHandler = logging.FileHandler(
             os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-            + "/logs/api-"
-            + str(playerID)
-            + "-log.txt",
+            + f"/logs/api-{teamID}-{playerID}-log.txt",
             mode="w+",
-            encoding="utf-8",
+            encoding="utf-8"
         )
         screenHandler = logging.StreamHandler()
         if file:
@@ -224,17 +224,16 @@ def GetScore(self) -> int:
 
     def HaveView(self, gridX: int, gridY: int) -> bool:
         return self.__logic.HaveView(
-            gridX,
-            gridY,
-            self.GetSelfInfo().x,
-            self.GetSelfInfo().y,
+            gridX, gridY,
+            self.GetSelfInfo().x, self.GetSelfInfo().y,
             self.GetSelfInfo().viewRange,
         )
 
     def Print(self, cont: str) -> None:
         self.__logger.info(cont)
 
     def PrintShip(self) -> None:
+        self.__logger.info("START PrintShip")
         for ship in self.__logic.GetShips():
             self.__logger.info("******ship Info******")
             self.__logger.info(
@@ -253,6 +252,7 @@ def PrintShip(self) -> None:
                 f"armorType:{ship.armorType} shieldType:{ship.shieldType} weaponType:{ship.weaponType}"
             )
             self.__logger.info("************************\n")
+        self.__logger.info("END PrintShip")
 
     def PrintTeam(self) -> None:
         pass
@@ -295,33 +295,26 @@ def Play(self, ai: IAI) -> None:
 
 
 class TeamDebugAPI(ITeamAPI, IGameTimer):
-    def __init__(
-        self, logic: ILogic, file: bool, screen: bool, warnOnly: bool, playerID: int
-    ) -> None:
+    def __init__(self, logic: ILogic,
+                 file: bool, screen: bool, warnOnly: bool,
+                 playerID: int, teamID: int) -> None:
         self.__logic = logic
         self.__pool = ThreadPoolExecutor(20)
         self.__startPoint = datetime.datetime.now()
         self.__logger = logging.getLogger("api " + str(playerID))
         self.__logger.setLevel(logging.DEBUG)
         formatter = logging.Formatter(
-            "[%(name)s] [%(asctime)s.%(msecs)03d] [%(levelname)s] %(message)s",
-            "%H:%M:%S",
+            "[%(name)s] [%(asctime)s.%(msecs)03d] [%(levelname)s] %(message)s", "%H:%M:%S"
         )
         # 确保文件存在
-        if not os.path.exists(
-            os.path.dirname(os.path.dirname(os.path.realpath(__file__))) + "/logs"
-        ):
-            os.makedirs(
-                os.path.dirname(os.path.dirname(os.path.realpath(__file__))) + "/logs"
-            )
+        if not os.path.exists(os.path.dirname(os.path.dirname(os.path.realpath(__file__))) + "/logs"):
+            os.makedirs(os.path.dirname(os.path.dirname(os.path.realpath(__file__))) + "/logs")
 
         fileHandler = logging.FileHandler(
             os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-            + "/logs/api-"
-            + str(playerID)
-            + "-log.txt",
+            + f"/logs/api-{teamID}-{playerID}-log.txt",
             mode="w+",
-            encoding="utf-8",
+            encoding="utf-8"
         )
         screenHandler = logging.StreamHandler()
         if file:
@@ -469,6 +462,7 @@ def Print(self, cont: str) -> None:
         self.__logger.info(cont)
 
     def PrintShip(self) -> None:
+        self.__logger.info("START PrintShip")
         for ship in self.__logic.GetShips():
             self.__logger.info("******ship Info******")
             self.__logger.info(
@@ -487,6 +481,7 @@ def PrintShip(self) -> None:
                 f"armorType:{ship.armorType} shieldType:{ship.shieldType} weaponType:{ship.weaponType}"
             )
             self.__logger.info("************************\n")
+        self.__logger.info("END PrintShip")
 
     def PrintTeam(self) -> None:
         self.PrintSelfInfo()
@@ -499,9 +494,7 @@ def PrintSelfInfo(self) -> None:
         self.__logger.info("************************\n")
 
     def __GetTime(self) -> float:
-        return (datetime.datetime.now() - self.__startPoint) / datetime.timedelta(
-            milliseconds=1
-        )
+        return (datetime.datetime.now() - self.__startPoint) / datetime.timedelta(milliseconds=1)
 
     def StartTimer(self) -> None:
         self.__startPoint = datetime.datetime.now()
@@ -512,4 +505,4 @@ def EndTimer(self) -> None:
         self.__logger.info(f"Time elapsed: {self.__GetTime()}ms")
 
     def Play(self, ai: IAI) -> None:
-        ai.ShipPlay(self)
+        ai.TeamPlay(self)

CAPI/python_exp/PyAPI/logic.py

@@ -720,9 +720,7 @@ def Main(self, createAI: Callable) -> None:
 
         fileHandler = logging.FileHandler(
             os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-            + "/logs/logic"
-            + str(self.__playerID)
-            + "-log.txt",
+            + f"/logs/logic-{self.__teamID}-{self.__playerID}-log.txt",
             "w+",
             encoding="utf-8",
         )
@@ -762,14 +760,14 @@ def Main(self, createAI: Callable) -> None:
                     self.__processEnv.file,
                     self.__processEnv.screen,
                     self.__processEnv.warnOnly,
-                    self.__playerID)
+                    self.__playerID, self.__teamID)
             else:
                 self.__timer = ShipDebugAPI(
                     self,
                     self.__processEnv.file,
                     self.__processEnv.screen,
                     self.__processEnv.warnOnly,
-                    self.__playerID)
+                    self.__playerID, self.__teamID)
 
         # 构建AI线程
         def AIThread():