Merge pull request #1 from LARG/master

Pull from LARG/HFO master - function changes, some cleanup

example/high_level_random_agent.py

@@ -4,6 +4,8 @@
 # Before running this program, first Start HFO server:
 # $> ./bin/HFO --offense-agents 1
 
+from __future__ import print_function
+
 import argparse
 import itertools
 import random
@@ -57,8 +59,9 @@ def main():
       status = hfo_env.step()
 
     # Check the outcome of the episode
-    print(('Episode %d ended with %s'%(episode,
-                                       hfo_env.statusToString(status))))
+    end_status = hfo_env.statusToString(status)
+    print("Episode {} ended with {}".format(episode, end_status))
+
     # Quit if the server goes down
     if status == hfo.SERVER_DOWN:
       hfo_env.act(hfo.QUIT)

example/python_agents_3v3.sh

@@ -3,9 +3,9 @@
 ./bin/HFO --offense-agents=2 --defense-npcs=3 --offense-npcs=1 --trials 20 --headless &
 sleep 5
 # -x is needed to skip first line - otherwise whatever default python version is will run
-python2.7 -x ./example/high_level_custom_agent.py --port 6000 &> agent1.txt &
+python -x ./example/high_level_custom_agent.py --port 6000 &> agent1.txt &
 sleep 5
-python3 -x ./example/high_level_custom_agent.py --port 6000 &> agent2.txt &
+python -x ./example/high_level_custom_agent.py --port 6000 &> agent2.txt &
 
 # The magic line
 #   $$ holds the PID for this script

example/python_agents_eps_3v3.sh

@@ -3,9 +3,9 @@
 ./bin/HFO --offense-agents=2 --defense-npcs=3 --offense-npcs=1 --trials 20 --headless &
 sleep 5
 # -x is needed to skip first line - otherwise whatever default python version is will run
-python2.7 -x ./example/high_level_custom_agent.py --eps 0.2 --numTeammates=2 --numOpponents=3 --port 6000 &> agent1.txt &
+python -x ./example/high_level_custom_agent.py --eps 0.2 --port 6000 &> agent1.txt &
 sleep 5
-python3 -x ./example/high_level_custom_agent.py --eps 0.2 --numTeammates=2 --numOpponents=3 --port 6000 &> agent2.txt &
+python -x ./example/high_level_custom_agent.py --eps 0.2 --port 6000 &> agent2.txt &
 
 # The magic line
 #   $$ holds the PID for this script

example/random_python_2v1.sh

@@ -2,9 +2,9 @@
 
 ./bin/HFO --offense-agents=2 --defense-npcs=1 --trials 20 --headless &
 sleep 5
-python2.7 -x example/high_level_random_agent.py --port 6000 &> agent1.txt &
+python -x example/high_level_random_agent.py --port 6000 &> agent1.txt &
 sleep 5
-python3 -x example/high_level_random_agent.py --port 6000 &> agent2.txt &
+python -x example/high_level_random_agent.py --port 6000 &> agent2.txt &
 
 # The magic line
 #   $$ holds the PID for this script

hfo/hfo.py

@@ -29,6 +29,7 @@ LOW_LEVEL_FEATURE_SET, HIGH_LEVEL_FEATURE_SET = list(range(NUM_FEATURE_SETS))
 NUM_HFO_ACTIONS = 19
 DASH, TURN, TACKLE, KICK, KICK_TO, MOVE_TO, DRIBBLE_TO, INTERCEPT, \
     MOVE, SHOOT, PASS, DRIBBLE, CATCH, NOOP, QUIT, REDUCE_ANGLE_TO_GOAL,MARK_PLAYER,DEFEND_GOAL,GO_TO_BALL = list(range(NUM_HFO_ACTIONS))
+ACTION_STRINGS = ["Dash", "Turn", "Tackle", "Kick", "KickTo", "MoveTo", "DribbleTo", "Intercept", "Move", "Shoot", "Pass", "Dribble", "Catch", "No-op", "Quit", "Reduce_Angle_To_Goal", "Mark_Player", "Defend_Goal", "Go_To_Ball"]
 
 ''' Possible game status
   [IN_GAME] Game is currently active
@@ -40,6 +41,7 @@ DASH, TURN, TACKLE, KICK, KICK_TO, MOVE_TO, DRIBBLE_TO, INTERCEPT, \
 '''
 NUM_GAME_STATUS_STATES = 6
 IN_GAME, GOAL, CAPTURED_BY_DEFENSE, OUT_OF_BOUNDS, OUT_OF_TIME, SERVER_DOWN = list(range(NUM_GAME_STATUS_STATES))
+STATUS_STRINGS = ["InGame", "Goal", "CapturedByDefense", "OutOfBounds", "OutOfTime", "ServerDown"]
 
 ''' Possible sides '''
 RIGHT, NEUTRAL, LEFT = list(range(-1,2))
@@ -73,10 +75,6 @@ hfo_lib.step.argtypes = [c_void_p]
 hfo_lib.step.restype = c_int
 hfo_lib.numParams.argtypes = [c_int]
 hfo_lib.numParams.restype = c_int
-hfo_lib.actionToString.argtypes = [c_int]
-hfo_lib.actionToString.restype = c_char_p
-hfo_lib.statusToString.argtypes = [c_int]
-hfo_lib.statusToString.restype = c_char_p
 hfo_lib.getUnum.argtypes = [c_void_p]
 hfo_lib.getUnum.restype = c_int
 hfo_lib.getNumTeammates.argtypes = [c_void_p]
@@ -149,11 +147,11 @@ class HFOEnvironment(object):
 
   def actionToString(self, action):
     """ Returns a string representation of an action """
-    return hfo_lib.actionToString(action).decode('utf-8')
+    return ACTION_STRINGS[action]
 
   def statusToString(self, status):
     """ Returns a string representation of a game status """
-    return hfo_lib.statusToString(status).decode('utf-8')
+    return STATUS_STRINGS[status]
 
   def getUnum(self):
     """ Return the uniform number of the agent """

hfo/hfo_c_wrapper.h

@@ -40,13 +40,6 @@ extern "C" {
   hfo::status_t step(hfo::HFOEnvironment *hfo) { return hfo->step(); }
 
   int numParams(const hfo::action_t action) { return NumParams(action); }
-  const char* actionToString(const hfo::action_t action) {
-    return ActionToString(action).c_str();
-  }
-  const char* statusToString(const hfo::status_t status) {
-    StatusToString(status); // TODO: OSX requires two calls...?!
-    return StatusToString(status).c_str();
-  }
   int getUnum(hfo::HFOEnvironment *hfo) {return hfo->getUnum();}
   int getNumTeammates(hfo::HFOEnvironment *hfo) {return hfo->getNumTeammates();}
   int getNumOpponents(hfo::HFOEnvironment *hfo) {return hfo->getNumOpponents();}