Commit f8ec967c authored by Matthew Hausknecht's avatar Matthew Hausknecht

removed most of trainer code.

parent 23696f8a
...@@ -62,7 +62,7 @@ class Communicator(object): ...@@ -62,7 +62,7 @@ class Communicator(object):
raise TimeoutError raise TimeoutError
else: else:
retryCount -= 1 retryCount -= 1
print '[Trainer] waiting for message' print '[Trainer] waiting for message, retry =', retryCount
time.sleep(0.3) time.sleep(0.3)
#raise ValueError('Error while receiving message') #raise ValueError('Error while receiving message')
(msg,sep,rest) = msg.partition('\0') (msg,sep,rest) = msg.partition('\0')
......
...@@ -49,11 +49,12 @@ def main(args, team1='left', team2='right', rng=numpy.random.RandomState()): ...@@ -49,11 +49,12 @@ def main(args, team1='left', team2='right', rng=numpy.random.RandomState()):
'server::game_log_dir=%s server::text_log_dir=%s '\ 'server::game_log_dir=%s server::text_log_dir=%s '\
'server::synch_mode=%i server::hfo=1 ' \ 'server::synch_mode=%i server::hfo=1 ' \
'server::fullstate_l=%i server::fullstate_r=%i ' \ 'server::fullstate_l=%i server::fullstate_r=%i ' \
'server::coach_w_referee=on server::record_messages=on' \ 'server::coach_w_referee=1' \
%(server_port, coach_port, olcoach_port, %(server_port, coach_port, olcoach_port,
args.logging, args.logging, args.logging, args.logging, args.logging, args.logging,
args.logDir, args.logDir, args.logDir, args.logDir, args.logDir, args.logDir,
args.sync, args.fullstate, args.fullstate) args.sync, args.fullstate, args.fullstate)
# server::record_messages=on -- useful for debug
try: try:
# Launch the Server # Launch the Server
server = launch(serverCommand + serverOptions, name='server') server = launch(serverCommand + serverOptions, name='server')
...@@ -67,8 +68,7 @@ def main(args, team1='left', team2='right', rng=numpy.random.RandomState()): ...@@ -67,8 +68,7 @@ def main(args, team1='left', team2='right', rng=numpy.random.RandomState()):
launch(monitorCommand + monitorOptions, name='monitor') launch(monitorCommand + monitorOptions, name='monitor')
# Launch the Trainer # Launch the Trainer
from Trainer import Trainer from Trainer import Trainer
trainer = Trainer(args=args, rng=rng, server_port=server_port, trainer = Trainer(args=args, server_port=server_port, coach_port=coach_port)
coach_port=coach_port)
trainer.initComm() trainer.initComm()
# Add Team1 # Add Team1
trainer.addTeam(team1) trainer.addTeam(team1)
......
This diff is collapsed.
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