Skip to content

S
Seminar-HFO
Commit 21b0fe35 authored by Matthew Hausknecht's avatar Matthew Hausknecht
Browse files
Options

Fixed bug in launching agents.

parent f8ec967c
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 19 deletions
bin/Trainer.py
View file @ 21b0fe35
...@@ -365,7 +365,7 @@ class Trainer(object): ...@@ -365,7 +365,7 @@ class Trainer(object):
server. server.
""" """
print 'Wait on player', player_num, on_offense #print 'Wait on player', player_num, on_offense
self.send('(look)') self.send('(look)')
partial = ['ok','look'] partial = ['ok','look']
self._numPlayers = 0 self._numPlayers = 0
...@@ -433,11 +433,9 @@ class Trainer(object): ...@@ -433,11 +433,9 @@ class Trainer(object):
# Launch offense # Launch offense
agent_num = 0 agent_num = 0
for player_num in xrange(1, 12): for player_num in xrange(1, 12):
if agent_num < self._offenseAgents: if agent_num < self._offenseAgents and player_num == sorted_offense_agent_unums[agent_num]:
agent_ext_num = sorted_offense_agent_unums[agent_num]
if agent_ext_num == player_num:
port = self._agentServerPort + agent_num port = self._agentServerPort + agent_num
agent = self.launch_agent(agent_num, agent_ext_num, agent = self.launch_agent(agent_num, sorted_offense_agent_unums[agent_num],
play_offense=True, port=port) play_offense=True, port=port)
self._agentPopen.append(agent) self._agentPopen.append(agent)
necProcesses.append([agent, 'offense_agent_' + str(agent_num)]) necProcesses.append([agent, 'offense_agent_' + str(agent_num)])
...@@ -454,11 +452,9 @@ class Trainer(object): ...@@ -454,11 +452,9 @@ class Trainer(object):
# Launch defense # Launch defense
agent_num = 0 agent_num = 0
for player_num in xrange(1, 12): for player_num in xrange(1, 12):
if agent_num < self._defenseAgents: if agent_num < self._defenseAgents and player_num == sorted_defense_agent_unums[agent_num]:
agent_ext_num = sorted_offense_agent_unums[agent_num]
if agent_ext_num == player_num:
port = self._agentServerPort + agent_num + self._offenseAgents port = self._agentServerPort + agent_num + self._offenseAgents
agent = self.launch_agent(agent_num, agent_ext_num, agent = self.launch_agent(agent_num, sorted_defense_agent_unums[agent_num],
play_offense=False, port=port) play_offense=False, port=port)
self._agentPopen.append(agent) self._agentPopen.append(agent)
necProcesses.append([agent, 'defense_agent_' + str(agent_num)]) necProcesses.append([agent, 'defense_agent_' + str(agent_num)])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment