From cd2cc285654a297accd2a4a202052511675b9052 Mon Sep 17 00:00:00 2001 From: Loic Grumiaux Date: Fri, 28 Jul 2023 14:24:01 -0400 Subject: [PATCH] Demo setup --- src/abalone.py | 4 ++-- src/seahorse/examples/abalone/board_abalone.py | 2 +- src/seahorse/execution/web/examples/abalone/auto/main.js | 2 +- .../execution/web/examples/abalone/interactive/main.js | 2 +- src/seahorse/game/io_stream.py | 4 ++-- src/seahorse/game/master.py | 2 +- src/standalone_abalone.py | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/abalone.py b/src/abalone.py index f02714b..348667b 100644 --- a/src/abalone.py +++ b/src/abalone.py @@ -36,8 +36,8 @@ async def play(self, current_state: GameState) -> Action: def run_multiple_games(): for _ in range(1): - player2 = LocalPlayerProxy(RandomPlayerAbalone(piece_type="W")) - player1 = LocalPlayerProxy(AlphaPlayerAbalone(piece_type="B")) + player2 = RemotePlayerProxy(mimics=RandomPlayerAbalone,piece_type="W",name="marcel") + player1 = InteractivePlayerProxy(AlphaPlayerAbalone(piece_type="B")) list_players = [player1, player2] init_scores = {player1.get_id(): 0, player2.get_id(): 0} diff --git a/src/seahorse/examples/abalone/board_abalone.py b/src/seahorse/examples/abalone/board_abalone.py index 2162571..f71c7e0 100644 --- a/src/seahorse/examples/abalone/board_abalone.py +++ b/src/seahorse/examples/abalone/board_abalone.py @@ -155,5 +155,5 @@ def from_json(cls, data) -> Serializable: for x,y in d["env"].items(): # TODO eval is unsafe del dd["env"][x] - dd["env"][eval(x)] = Piece.from_json(**json.dumps(y)) + dd["env"][eval(x)] = Piece.from_json(json.dumps(y)) return cls(**dd) diff --git a/src/seahorse/execution/web/examples/abalone/auto/main.js b/src/seahorse/execution/web/examples/abalone/auto/main.js index 773c45c..cf49957 100644 --- a/src/seahorse/execution/web/examples/abalone/auto/main.js +++ b/src/seahorse/execution/web/examples/abalone/auto/main.js @@ -3,7 +3,7 @@ $(document).ready(function () { var index = -1; const logElement = document.getElementById("log"); var play = false; - const socket = io("ws://localhost:8080"); + const socket = io("ws://10.200.37.65:16001"); socket.on("play", (...args) => { json = JSON.parse(args[0]); //console.log(json); diff --git a/src/seahorse/execution/web/examples/abalone/interactive/main.js b/src/seahorse/execution/web/examples/abalone/interactive/main.js index 74cf67f..7c1fafe 100644 --- a/src/seahorse/execution/web/examples/abalone/interactive/main.js +++ b/src/seahorse/execution/web/examples/abalone/interactive/main.js @@ -3,7 +3,7 @@ $(document).ready(function () { var index = -1; const logElement = document.getElementById("log"); var play = false; - const socket = io("ws://localhost:16001"); + const socket = io("ws://10.200.37.65:16001"); socket.on("play", (...args) => { diff --git a/src/seahorse/game/io_stream.py b/src/seahorse/game/io_stream.py index 1a56113..63be8ae 100644 --- a/src/seahorse/game/io_stream.py +++ b/src/seahorse/game/io_stream.py @@ -260,12 +260,12 @@ def start(self, task: Callable[[None], None], listeners: list[EventSlave]) -> No # Sets the runner up and starts the tcp server self.event_loop.run_until_complete(self.runner.setup()) #print(self.port) - site = web.TCPSite(self.runner, "localhost", self.port) + site = web.TCPSite(self.runner, "10.200.37.65", self.port) self.event_loop.run_until_complete(site.start()) async def stop(): for x in listeners: - await x.listen(master_address="http://localhost:"+str(self.port), keep_alive=False) + await x.listen(master_address="http://10.200.37.65:"+str(self.port), keep_alive=False) # Waiting for all listeners await self._wait_for_connexion() diff --git a/src/seahorse/game/master.py b/src/seahorse/game/master.py index 0e2e3c2..7d8b2d2 100644 --- a/src/seahorse/game/master.py +++ b/src/seahorse/game/master.py @@ -48,7 +48,7 @@ def __init__( self.log_file = log_file self.players_iterator = cycle(players_iterator) if isinstance(players_iterator, list) else players_iterator next(self.players_iterator) - self.emitter = EventMaster.get_instance(3,initial_game_state.__class__,port=port) + self.emitter = EventMaster.get_instance(4,initial_game_state.__class__,port=port) async def step(self) -> GameState: """ diff --git a/src/standalone_abalone.py b/src/standalone_abalone.py index 04a12e3..a4820f3 100644 --- a/src/standalone_abalone.py +++ b/src/standalone_abalone.py @@ -4,5 +4,5 @@ from seahorse.examples.abalone.random_player_abalone import MyPlayer as RandomPlayerAbalone from seahorse.player.proxies import LocalPlayerProxy -player1 = LocalPlayerProxy(RandomPlayerAbalone(piece_type="W", name= "bob"),masterless=True,gs=GameStateAbalone) -asyncio.new_event_loop().run_until_complete(player1.listen(keep_alive=True,master_address="http://localhost:16001")) +player1 = LocalPlayerProxy(RandomPlayerAbalone(piece_type="W", name= "marcel"),masterless=True,gs=GameStateAbalone) +asyncio.new_event_loop().run_until_complete(player1.listen(keep_alive=True,master_address="http://10.200.37.65:16001"))