Commit 8283afa0 authored by drallensmith's avatar drallensmith

Merge branch 'master' into randomization - bring in updates, avoid rebase

parents b06bf087 8426776e
......@@ -73,6 +73,7 @@ example/mid_level_move_agent
example/mid_level_kick_agent
example/mid_level_dribble_agent
example/communication_agent
example/hand_coded_defense_agent
# Dependency directories
librcsc-prefix/
......
#!/bin/bash
# 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 20 --headless --port=7000 &
sleep 5
./hand_coded_defense_agent &> agent1.txt &
sleep 5
# The magic line
# $$ holds the PID for this script
# Negation means kill by process group id instead of PID
trap "kill -TERM -$$" SIGINT
wait
\ No newline at end of file
......@@ -208,7 +208,8 @@ int main(int argc, char** argv) {
HFOEnvironment hfo;
int random = 0;
double numGoals = 0;
double numEpisodes = 5000;
int numEpisodes = 5000;
double actualNumEpisodes = 0;
// Connect to the server and request high-level feature set. See
// manual for more information on feature sets.
hfo.connectToServer(features, config_dir, port, server_addr,
......@@ -233,10 +234,10 @@ int main(int argc, char** argv) {
string s = hfo::ActionToString(a.action) + " " +to_string(a.param) + "\n";
// std::cout << s;
} else {
std::cout <<"Randm";
std::cout <<"Random";
action_t a = get_random_high_lv_action();
if (a == hfo :: MARK_PLAYER) {
hfo.act(NOOP);
hfo.act(NOOP); // why not MOVE?
} else {
hfo.act(a);
}
......@@ -249,8 +250,14 @@ int main(int argc, char** argv) {
// Check what the outcome of the episode was
cout << "Episode " << episode << " ended with status: "
<< StatusToString(status) << std::endl;
if (status==SERVER_DOWN) {
break;
} else {
actualNumEpisodes++;
}
}
double cost = numGoals/numEpisodes;
double cost = numGoals/actualNumEpisodes;
hfo.act(QUIT);
//write_cost(cost);
};
......
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