X-Git-Url: https://git.ucc.asn.au/?p=progcomp2012.git;a=blobdiff_plain;f=progcomp%2Fjudge%2Fsimulator%2Fsimulate.py;fp=progcomp%2Fjudge%2Fsimulator%2Fsimulate.py;h=aead755beaafc63361e2b9a6375d6791ee7ca236;hp=9b79194e686c043a3ff47059eb4367c9b0111c25;hb=e8a611c553bd336550c50ed7491d5800a2ae7142;hpb=f74c2985f8082fffd45252f1349520449f689c46 diff --git a/progcomp/judge/simulator/simulate.py b/progcomp/judge/simulator/simulate.py index 9b79194..aead755 100755 --- a/progcomp/judge/simulator/simulate.py +++ b/progcomp/judge/simulator/simulate.py @@ -39,8 +39,8 @@ if len(sys.argv) >= 6: print "Useage: " +sys.argv[0] + " [nRounds=1] [nGames=10] [baseDirectory=\""+baseDirectory+"\"] [managerPath=baseDirectory+\"/judge/manager/stratego\"]" sys.exit(1) -resultsDirectory = baseDirectory+"/results/" #Where results will go (results are in the form of text files of agent names and scores) -logDirectory = baseDirectory+"/log/" #Where log files go (direct output of manager program) +resultsDirectory = baseDirectory+"/web/results/" #Where results will go (results are in the form of text files of agent names and scores) +logDirectory = baseDirectory+"/web/log/" #Where log files go (direct output of manager program) agentsDirectory = baseDirectory+"/agents/" #Where agents are found (each agent has its own subdirectory within this directory) managerPath = baseDirectory+"/judge/manager/stratego" #Path to the executable that plays the games if len(sys.argv) >= 5: @@ -65,16 +65,22 @@ if os.path.exists(managerPath) == False: if os.path.exists(resultsDirectory) == False: os.mkdir(resultsDirectory) #Make the results directory if it didn't exist -''' - Obselete older version doesn't work with new .html files -#Identify the round number by reading the results directory -totalRounds = len(os.listdir(resultsDirectory)) + 1 -if totalRounds > 1: - totalRounds -= 1 -''' -totalRounds = 1 -#TODO: Fix this bit! + +#Identify the round number by reading from the "info" file in the results directory, if it doesn't exist then start at round 1. +if os.path.exists(resultsDirectory+"info") == False: + totalRounds = 1 +else: + info = open(resultsDirectory+"info", "r") + totalRounds = int(info.readline().strip()) + info.close() + os.remove(resultsDirectory+"info") + +info = open(resultsDirectory+"info", "w") +info.write(str(totalRounds + nRounds) + "\n") +info.close() + + if os.path.exists(logDirectory) == False: os.mkdir(logDirectory) #Make the log directory if it didn't exist @@ -106,7 +112,18 @@ for name in agentNames: sys.stdout.write(" Invalid! (No \"info\" file found)\n") continue - agentExecutable = agentsDirectory+name+"/"+(open(agentsDirectory+name+"/info").readline().strip()) + infoFile = open(agentsDirectory+name+"/info", "r") + agentExecutable = agentsDirectory+name+"/"+(infoFile.readline().strip()) + author = infoFile.readline().strip() + language = infoFile.readline().strip() + description = "" + while True: + line = infoFile.readline() + if len(line) > 0: + description += line + else: + break + infoFile.close() if os.path.exists(agentExecutable) == False: if verbose: @@ -119,7 +136,7 @@ for name in agentNames: #Convert array of valid names into array of dictionaries containing information about each agent #I'm starting to like python... - agents.append({"name":name, "path":agentExecutable, "score":[0], "VICTORY":[], "DEFEAT":[], "DRAW":[], "ILLEGAL":[], "DEFAULT":[], "INTERNAL_ERROR":[], "SURRENDER":[], "DRAW_DEFAULT":[], "BOTH_ILLEGAL":[], "BAD_SETUP":[], "ALL":[], "totalScore":0, "Wins":0, "Losses":0, "Draws":0, "Illegal":0, "Errors":0}) + agents.append({"name":name, "path":agentExecutable, "author":author, "language":language, "description":description, "score":[0], "VICTORY":[], "DEFEAT":[], "DRAW":[], "ILLEGAL":[], "DEFAULT":[], "INTERNAL_ERROR":[], "SURRENDER":[], "DRAW_DEFAULT":[], "BOTH_ILLEGAL":[], "BAD_SETUP":[], "ALL":[], "totalScore":0, "Wins":0, "Losses":0, "Draws":0, "Illegal":0, "Errors":0}) if len(agents) == 0: print "Couldn't find any agents! Check paths (Edit this script) or generate \"info\" files for agents." @@ -131,23 +148,25 @@ if verbose: #Prepare the pretty .html files if they don't exist if verbose: print "Preparing .html results files..." -htmlDir = resultsDirectory + "pretty/" -if os.path.exists(htmlDir) == False: - os.mkdir(htmlDir) -if os.path.exists(htmlDir) == False: - print "Couldn't create directory \""+htmlDir+"\"." - sys.exit(1) + for agent in agents: - if os.path.exists(htmlDir+agent["name"] + ".html") == False: - agentFile = open(htmlDir+agent["name"] + ".html", "w") - agentFile.write("\n
\nName | Author | Language |
---|---|---|
"+agent["name"]+" | "+agent["author"]+" | "+agent["language"]+" |
Description
\n") + agentFile.write("" + agent["description"] + "
\n") agentFile.close() - os.rename(htmlDir+agent["name"] + ".html", "tmpfile") + os.rename(resultsDirectory+agent["name"] + ".html", "tmpfile") oldFile = open("tmpfile", "r") - agentFile = open(htmlDir+agent["name"] + ".html", "w") + agentFile = open(resultsDirectory+agent["name"] + ".html", "w") line = oldFile.readline() while line != "": #if verbose: @@ -169,7 +188,7 @@ for agent in agents: line = oldFile.readline() if verbose: - print "Prepared results file \"" + htmlDir+agent["name"] + ".html\"." + print "Prepared results file \"" + resultsDirectory+agent["name"] + ".html\"." oldFile.close() agentFile.close() os.remove("tmpfile") @@ -206,7 +225,7 @@ for roundNumber in range(totalRounds, totalRounds + nRounds): #Play a game and read the result. Note the game is logged to a file based on the agent's names if verbose: sys.stdout.write("Agents: \""+red["name"]+"\" and \""+blue["name"]+"\" playing game (ID: " + gameID + ") ... ") - logFile = logDirectory + "round"+str(roundNumber) + "/"+red["name"]+".vs."+blue["name"]+"."+str(i) + logFile = logDirectory + "round"+str(roundNumber) + "/"+red["name"]+".vs."+blue["name"]+"."+str(gameID) outline = os.popen(managerPath + " -o " + logFile + " " + red["path"] + " " + blue["path"], "r").read() results = outline.split(' ') @@ -317,7 +336,7 @@ for roundNumber in range(totalRounds, totalRounds + nRounds): print "Updating pretty .html files... " for agent in agents: - agentFile = open(htmlDir + agent["name"]+".html", "a") + agentFile = open(resultsDirectory + agent["name"]+".html", "a") agentFile.write(""+str(agent["score"][0])+" | "+str(len(agent["VICTORY"]) + len(agent["DEFAULT"]))+" | "+str(len(agent["DEFEAT"]) + len(agent["SURRENDER"]))+" | "+str(len(agent["DRAW"]) + len(agent["DRAW_DEFAULT"]))+" | "+str(len(agent["ILLEGAL"]) + len(agent["BOTH_ILLEGAL"]) + len(agent["BAD_SETUP"]))+" | " +str(len(agent["INTERNAL_ERROR"]))+" |
Round "+str(roundNumber) + " Scoreboard
\n") agentFile.write("Game ID | Opponent | Played as | Outcome | Score | Accumulated Score |
---|---|---|---|---|---|
" + str(agent["ALL"][index][1]) + " | "+agent["ALL"][index][0] + " | " + agent["ALL"][index][4] + " | " + agent["ALL"][index][3] + " | " + str(agent["ALL"][index][2]) + " | " + str(agent["score"][len(agent["score"])-index -2]) + " |
" + str(agent["ALL"][index][1]) + " | "+agent["ALL"][index][0] + " | " + agent["ALL"][index][4] + " | " + agent["ALL"][index][3] + " | " + str(agent["ALL"][index][2]) + " | " + str(agent["score"][len(agent["score"])-index -2]) + " |
"+agent["name"] + " | " + str(agent["score"][0]) + " | " + str(agent["totalScore"]) + " |