Determine winner works

Author: john-b-yang

codeclash/games/battlecode/main.py

@@ -1,5 +1,7 @@
+import re
 from typing import Any
 
+from codeclash.constants import RESULT_TIE
 from codeclash.games.abstract import CodeGame
 
 
@@ -10,13 +12,25 @@ def __init__(self, config):
         super().__init__(config)
         assert len(config["players"]) == 2, "BattleCode is a two-player game"
         self.run_cmd_round: str = "python run.py run"
-    
+        for arg, val in config.get("args", {}).items():
+            if isinstance(val, bool):
+                if val:
+                    self.run_cmd_round += f" --{arg}"
+            else:
+                self.run_cmd_round += f" --{arg} {val}"
+
     def determine_winner(self, agents: list[Any]):
-        response = self.environment.execute(f"tail -2 {self.round_log_path}")
-        self.scoreboard.append((self.round, "BLAH")) # TODO
-    
+        response = self.environment.execute(f"tail -3 {self.round_log_path} | head -1")
+        winner = re.search(r"\s\((.*)\)\swins\s\(", response["output"]).group(1)
+        winner = {"A": agents[0].name, "B": agents[1].name}.get(winner, RESULT_TIE)
+        self.scoreboard.append((self.round, winner))
+
     def execute_round(self, agents: list[Any]):
-        args = [f"/{agent.name}/src/" for agent in agents]
-        cmd = f"{self.run_cmd_round}" # TODO
+        args = [
+            f" --p{idx+1}-dir /{agent.name}/src/ --p{idx+1} {agent.name}"
+            for idx, agent in enumerate(agents)
+        ]
+        cmd = f"{self.run_cmd_round} {' '.join(args)} > {self.round_log_path}"
+        print(f"Running command: {cmd}")
         response = self.environment.execute(cmd)
-        assert response["returncode"] == 0, response
+        assert response["returncode"] == 0, response

configs/battlecode.yaml

@@ -1,6 +1,8 @@
 game:
   name: BattleCode
   rounds: 2
+  args:
+    maps: quack
 players:
 - agent: dummy
   name: p1