Fixed bug in launching agents.

bin/Trainer.py

@@ -365,7 +365,7 @@ class Trainer(object):
     server.
 
     """
-    print 'Wait on player', player_num, on_offense
+    #print 'Wait on player', player_num, on_offense
     self.send('(look)')
     partial = ['ok','look']
     self._numPlayers = 0
@@ -433,11 +433,9 @@ class Trainer(object):
       # Launch offense
       agent_num = 0
       for player_num in xrange(1, 12):
-        if agent_num < self._offenseAgents:
-          agent_ext_num = sorted_offense_agent_unums[agent_num]
-          if agent_ext_num == player_num:
+        if agent_num < self._offenseAgents and player_num == sorted_offense_agent_unums[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)
           self._agentPopen.append(agent)
           necProcesses.append([agent, 'offense_agent_' + str(agent_num)])
@@ -454,11 +452,9 @@ class Trainer(object):
       # Launch defense
       agent_num = 0
       for player_num in xrange(1, 12):
-        if agent_num < self._defenseAgents:
-          agent_ext_num = sorted_offense_agent_unums[agent_num]
-          if agent_ext_num == player_num:
+        if agent_num < self._defenseAgents and player_num == sorted_defense_agent_unums[agent_num]:
           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)
           self._agentPopen.append(agent)
           necProcesses.append([agent, 'defense_agent_' + str(agent_num)])