added hfo args for server.

bin/HFO

@@ -45,14 +45,15 @@ def main(args, team1='left', team2='right', rng=numpy.random.RandomState()):
   serverOptions = ' server::port=%i server::coach_port=%i ' \
                   'server::olcoach_port=%i server::coach=1 ' \
                   'server::game_logging=%i server::text_logging=%i ' \
+                  'server::hfo_logging=%i server::hfo_log_dir=%s ' \
                   'server::game_log_dir=%s server::text_log_dir=%s '\
-                  'server::synch_mode=%i ' \
-                  'server::fullstate_l=%i server::fullstate_r=%i' \
+                  'server::synch_mode=%i server::hfo=1 ' \
+                  'server::fullstate_l=%i server::fullstate_r=%i ' \
+                  'server::coach_w_referee=on server::record_messages=on' \
                   %(server_port, coach_port, olcoach_port,
-                    args.logging, args.logging,
-                    args.logDir, args.logDir,
-                    args.sync,
-                    args.fullstate, args.fullstate)
+                    args.logging, args.logging, args.logging,
+                    args.logDir, args.logDir, args.logDir,
+                    args.sync, args.fullstate, args.fullstate)
   try:
     # Launch the Server
     server = launch(serverCommand + serverOptions, name='server')

bin/Trainer.py

@@ -671,7 +671,6 @@ class Trainer(object):
       sorted_offense_agent_unums = sorted(self._offenseOrder[1:self._offenseAgents+1])
       defense_unums = self._defenseOrder[: self._numDefense]
       sorted_defense_agent_unums = sorted(self._defenseOrder[:self._defenseAgents])
-      #unnecessary_players = []
 
       # Launch offense
       agent_num = 0
@@ -693,7 +692,6 @@ class Trainer(object):
             player.terminate()
             time.sleep(0.1)
             continue
-            #unnecessary_players.append(player)
         self.waitOnPlayer(player_num, on_offense=True)
       self.waitOnTeam(first = False)
 
@@ -717,7 +715,6 @@ class Trainer(object):
             player.terminate()
             time.sleep(0.1)
             continue
-            #unnecessary_players.append(player)
         self.waitOnPlayer(player_num, on_offense=False)
       self.waitOnTeam(first = False)
       self.checkIfAllPlayersConnected()
@@ -729,11 +726,6 @@ class Trainer(object):
       while self.checkLive(necProcesses) and self._agentReady != necAgents:
         self.listenAndProcess(1000)
 
-      # Terminate unnecessary players
-      #print '[Trainer] Removing unnecessary players'
-      #for player in unnecessary_players:
-      #  player.terminate()
-
       # Broadcast the HFO configuration
       offense_nums = ' '.join([str(self.convertToExtPlayer(self._offenseTeamName, i))
                                for i in xrange(1, self._numOffense + 1)])
@@ -749,8 +741,8 @@ class Trainer(object):
       while self.checkLive(necProcesses):
         prevFrame = self._frame
         self.listenAndProcess()
-        if self._frame != prevFrame:
-          self.step()
+        # if self._frame != prevFrame:
+        #   self.step()
     except TimeoutError:
       print '[Trainer] Haven\'t heard from the server for too long, Exiting'
     except (KeyboardInterrupt, DoneError):