From 127e88ae8e7be02fcf8903ab07ca79600bcaf693 Mon Sep 17 00:00:00 2001
From: drallensmith <drallensmith@users.noreply.github.com>
Date: Mon, 17 Jul 2017 22:55:15 -0500
Subject: [PATCH] Think have worked out random proportions for hand*py
---
example/defense_long_2v2.sh | 4 +++-
example/defense_python_long_2v2.sh | 4 +++-
example/hand_coded_defense_agent.py | 13 +++++++------
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/example/defense_long_2v2.sh b/example/defense_long_2v2.sh
index c6b11d3..978b4a3 100755
--- a/example/defense_long_2v2.sh
+++ b/example/defense_long_2v2.sh
@@ -2,7 +2,9 @@
# HAS TO BE RUN FROM EXAMPLE DIR DUE TO hand_coded_defense_agent CONFIG!
-../bin/HFO --offense-npcs=2 --defense-agents=1 --defense-npcs=1 --trials 5000 --headless --port=7000 --seed 1500310928 --no-logging &
+# Change to a new seed for different experiments!
+
+../bin/HFO --offense-npcs=2 --defense-agents=1 --defense-npcs=1 --trials 5000 --headless --port=7000 --seed 1500348586 --no-logging &
sleep 15
./hand_coded_defense_agent &> agent1.txt &
sleep 5
diff --git a/example/defense_python_long_2v2.sh b/example/defense_python_long_2v2.sh
index a99f443..0a7cb3a 100755
--- a/example/defense_python_long_2v2.sh
+++ b/example/defense_python_long_2v2.sh
@@ -1,6 +1,8 @@
#!/bin/bash
-./bin/HFO --offense-npcs=2 --defense-agents=1 --defense-npcs=1 --trials 5000 --headless --seed 1500310928 --no-logging &
+# Change to a different seed for different experiments!
+
+./bin/HFO --offense-npcs=2 --defense-agents=1 --defense-npcs=1 --trials 5000 --headless --seed 1500348586 --no-logging &
sleep 15
./example/hand_coded_defense_agent.py &> agent1.txt &
sleep 5
diff --git a/example/hand_coded_defense_agent.py b/example/hand_coded_defense_agent.py
index d5c8459..e4723d2 100755
--- a/example/hand_coded_defense_agent.py
+++ b/example/hand_coded_defense_agent.py
@@ -258,14 +258,15 @@ def do_defense_action(state_vec, hfo_env, episode,
def do_random_defense_action(state, hfo_env):
if state[5] > 0: # kickable
- if random.random() < 0.5:
- hfo_env.act(hfo.INTERCEPT)
+ hfo_env.act(random.choice([hfo.REDUCE_ANGLE_TO_GOAL,
+ hfo.MOVE,
+ HFO.GO_TO_BALL]))
+ else:
+ if random.random() < 0.25:
+ hfo_env.act(hfo.REDUCE_ANGLE_TO_GOAL)
else:
hfo_env.act(hfo.MOVE)
- else:
- hfo_env.act(random.choose(hfo.MOVE,hfo.DEFEND_GOAL,
- hfo.REDUCE_ANGLE_TO_GOAL,hfo.REDUCE_ANGLE_TO_GOAL,
- hfo.GO_TO_BALL,hfo.INTERCEPT))
+
return
def main():
--
2.24.1