X-Git-Url: https://git.ucc.asn.au/?p=progcomp2012.git;a=blobdiff_plain;f=judge%2Fsimulator%2Fsimulate.py;h=a7a138d2059b3f0c7d74b10fc305e65c4f686b82;hp=d8db77568245fd82bb17c76a090527871f13125f;hb=b1c6f5bee1c544be8b04d16d1bce9a66688df0c3;hpb=3b7e8befa3c75a9ac0aac03dc527c6637dd5fcd7

diff --git a/judge/simulator/simulate.py b/judge/simulator/simulate.py
index d8db775..a7a138d 100755
--- a/judge/simulator/simulate.py
+++ b/judge/simulator/simulate.py
@@ -152,6 +152,9 @@ if verbose:
 if verbose:
 	print "Preparing .html results files..."
 
+#BACKUP THE RESULTS DIRECTORY GOD DAMMIT
+os.system("mkdir .before_round"+str(totalRounds)+"_BACKUP/; cp " + resultsDirectory+"*" + " .before_round"+str(totalRounds)+"_BACKUP/")
+
 
 if os.path.exists(resultsDirectory + "index.html") == True:
 	os.remove(resultsDirectory + "index.html") #Delete the file
@@ -206,7 +209,7 @@ for agent in agents:
 				agentFile.write(line)
 				line = oldFile.readline()
 				values = line.split(' ')
-				agent["totalScore"] += int(values[2].strip())
+				agent["totalScore"] += float(values[2].strip())
 				agent["Wins"] += int(values[5].strip())
 				agent["Losses"] += int(values[8].strip())
 				agent["Draws"] += int(values[11].strip())
@@ -258,7 +261,8 @@ for roundNumber in range(totalRounds, totalRounds + nRounds):
 				logFile = logDirectory + "round"+str(roundNumber) + "/"+red["name"]+".vs."+blue["name"]+"."+str(gameID)
 				errorLog = [logDirectory + "error/" + red["name"] + "."+str(gameID), logDirectory + "error/" + blue["name"] + "."+str(gameID)]
 				#Run the game, outputting to logFile; stderr of (both) AI programs is directed to logFile.stderr
-				outline = os.popen(managerPath + " -o " + logFile + " -T " + str(timeoutValue) + " \"" + red["path"] + "\" \"" + blue["path"] + "\" 2>> " + logFile+".stderr", "r").read()
+				outline = os.popen(managerPath + " -m 1000 -o " + logFile + " -T " + str(timeoutValue) + " \"" + red["path"] + "\" \"" + blue["path"] + "\" 2>> " + logFile+".stderr", "r").read()
+				
 				#os.system("mv tmp.mp4 " + logFile + ".mp4")
 				
 				#If there were no errors, get rid of the stderr file