diff --git a/agents/basic_cpp/Makefile b/agents/basic_cpp/Makefile index 0a249b3a86b068709f01e66b7f966d7499f3cfef..6c1f9fb804a63fba9557edb26c1e7d1163ba08d0 100644 --- a/agents/basic_cpp/Makefile +++ b/agents/basic_cpp/Makefile @@ -2,7 +2,7 @@ # Sample C++ Stratego AI # UCC Programming Competition 2012 -CPP = g++ -Wall -pedantic -lSDL -lGL -g +CPP = g++ -Wall -pedantic -g OBJ = basic_cpp.o BIN = basic_cpp diff --git a/judge/manager/ai_controller.h b/judge/manager/ai_controller.h index 7d62591df520168880cf331836f897e668b77002..ee053e6ea8200fb0be2ddec57dec6649b3b83de3 100644 --- a/judge/manager/ai_controller.h +++ b/judge/manager/ai_controller.h @@ -11,7 +11,7 @@ class AI_Controller : public Controller, private Program { public: - AI_Controller(const Piece::Colour & newColour, const char * executablePath, const double newTimeout = 2.0) : Controller(newColour, executablePath), Program(executablePath), timeout(newTimeout) {} + AI_Controller(const Piece::Colour & newColour, const char * executablePath, const double newTimeout = 60.0) : Controller(newColour, executablePath), Program(executablePath), timeout(newTimeout) {} virtual ~AI_Controller() {} diff --git a/judge/simulator/Makefile b/judge/simulator/Makefile index 6296c3a2726429e70973e927480f72c05923b771..c95e891518d8912ddc2b010ae8169a3059bf9410 100644 --- a/judge/simulator/Makefile +++ b/judge/simulator/Makefile @@ -2,11 +2,11 @@ # Not used for building simulate.py # Used for building/removing results -BASEDIR = /home/sam/Documents/progcomp2012/progcomp -RESULTSDIR = /home/sam/Documents/progcomp2012/progcomp/web/results -LOGDIR = /home/sam/Documents/progcomp2012/progcomp/web/log -AGENTSDIR = /home/sam/Documents/progcomp2012/progcomp/agents -MANAGER = /home/sam/Documents/progcomp2012/progcomp/judge/manager/stratego +BASEDIR = /../../ +RESULTSDIR = /../../web/results +LOGDIR = /../../web/log +AGENTSDIR = /../../agents +MANAGER = /../../judge/manager/stratego diff --git a/judge/simulator/simulate.py b/judge/simulator/simulate.py index aead755beaafc63361e2b9a6375d6791ee7ca236..b84a525d50ae8dc765b662f86da26ba506e4b743 100755 --- a/judge/simulator/simulate.py +++ b/judge/simulator/simulate.py @@ -234,8 +234,8 @@ for roundNumber in range(totalRounds, totalRounds + nRounds): sys.stdout.write("Garbage output! \"" + outline + "\"\n") red["INTERNAL_ERROR"].append((blue["name"], gameID, scores["INTERNAL_ERROR"][0])) blue["INTERNAL_ERROR"].append((red["name"], gameID, scores["INTERNAL_ERROR"][0])) - red["ALL"].append((blue["name"], gameID, scores["INTERNAL_ERROR"][0], "INTERNAL_ERROR")) - blue["ALL"].append((red["name"], gameID, scores["INTERNAL_ERROR"][0], "INTERNAL_ERROR")) + red["ALL"].append((blue["name"], gameID, scores["INTERNAL_ERROR"][0], "INTERNAL_ERROR", "RED")) + blue["ALL"].append((red["name"], gameID, scores["INTERNAL_ERROR"][0], "INTERNAL_ERROR", "BLUE")) managerErrors += 1 else: