X-Git-Url: https://git.ucc.asn.au/?p=progcomp2013.git;a=blobdiff_plain;f=qchess%2Fqchess.py;h=8861d98e0cde301dbd9cb4cb13a624ca9077f036;hp=d2ec1bb6eda440a9a3573bc69aedf721e7070955;hb=7a6c3dd98ba430b9bcdf95b7a92100cb7c0a1bbe;hpb=a238aa7acac990bae67644d1dc7f518ce3e2e8c6 diff --git a/qchess/qchess.py b/qchess/qchess.py index d2ec1bb..8861d98 100755 --- a/qchess/qchess.py +++ b/qchess/qchess.py @@ -14,13 +14,13 @@ class Piece(): self.types = types # List of possible types the piece can be (should just be two) self.current_type = "unknown" # Current type self.choice = -1 # Index of the current type in self.types (-1 = unknown type) - self.types_revealed = [True, False] # Whether the types are known (by default the first type is always known at game start) - - # + self.last_state = None + self.move_pattern = None - + self.coverage = None + self.possible_moves = {} def init_from_copy(self, c): @@ -30,8 +30,7 @@ class Piece(): self.types = c.types[:] self.current_type = c.current_type self.choice = c.choice - self.types_revealed = c.types_revealed[:] - + self.last_state = None self.move_pattern = None @@ -59,8 +58,11 @@ class Piece(): # Draw the two possible types underneath the current_type image for i in range(len(self.types)): - if always_reveal_states == True or self.types_revealed[i] == True: - img = small_images[self.colour][self.types[i]] + if always_reveal_states == True or self.types[i][0] != '?': + if self.types[i][0] == '?': + img = small_images[self.colour][self.types[i][1:]] + else: + img = small_images[self.colour][self.types[i]] else: img = small_images[self.colour]["unknown"] # If the type hasn't been revealed, show a placeholder @@ -77,17 +79,18 @@ class Piece(): # Collapses the wave function! def select(self): - if self.current_type == "unknown": + if self.current_type == "unknown" or not self.choice in [0,1]: self.choice = random.randint(0,1) + if self.types[self.choice][0] == '?': + self.types[self.choice] = self.types[self.choice][1:] self.current_type = self.types[self.choice] - self.types_revealed[self.choice] = True return self.choice # Uncollapses (?) the wave function! def deselect(self): #print "Deselect called" if (self.x + self.y) % 2 != 0: - if (self.types[0] != self.types[1]) or (self.types_revealed[0] == False or self.types_revealed[1] == False): + if (self.types[0] != self.types[1]) or (self.types[0][0] == '?' or self.types[1][0] == '?'): self.current_type = "unknown" self.choice = -1 else: @@ -110,6 +113,9 @@ class Board(): self.grid = [[None] * w for _ in range(h)] # 2D List (you can get arrays in python, somehow, but they scare me) self.unrevealed_types = {"white" : piece_types.copy(), "black" : piece_types.copy()} self.king = {"white" : None, "black" : None} # We need to keep track of the king, because he is important + self.max_moves = None + self.moves = 0 + self.move_stack = [] for c in ["black", "white"]: del self.unrevealed_types[c]["unknown"] @@ -127,7 +133,6 @@ class Board(): c.append(Piece(s, 1, y, ["knight"])) c.append(Piece(s, 2, y, ["bishop"])) k = Piece(s, 3, y, ["king", "king"]) # There can only be one ruler! - k.types_revealed[1] = True k.current_type = "king" self.king[s] = k c.append(k) @@ -165,11 +170,10 @@ class Board(): types_left[choice] -= 1 if types_left[choice] <= 0: del types_left[choice] - piece.types.append(choice) + piece.types.append('?' + choice) elif style == "classical": piece.types.append(piece.types[0]) piece.current_type = piece.types[0] - piece.types_revealed[1] = True piece.choice = 0 def clone(self): @@ -179,6 +183,40 @@ class Board(): for i in range(len(mypieces)): newpieces[i].init_from_copy(mypieces[i]) + + # Reset the board from a string + def reset_board(self, s): + self.pieces = {"white" : [], "black" : []} + self.king = {"white" : None, "black" : None} + self.grid = [[None] * w for _ in range(h)] + for x in range(w): + for y in range(h): + self.grid[x][y] = None + + for line in s.split("\n"): + if line == "": + continue + if line[0] == "#": + continue + + tokens = line.split(" ") + [x, y] = map(int, tokens[len(tokens)-1].split(",")) + current_type = tokens[1] + types = map(lambda e : e.strip(" '[],"), line.split('[')[1].split(']')[0].split(',')) + + target = Piece(tokens[0], x, y, types) + target.current_type = current_type + + try: + target.choice = types.index(current_type) + except: + target.choice = -1 + + self.pieces[tokens[0]].append(target) + if target.current_type == "king": + self.king[tokens[0]] = target + + self.grid[x][y] = target def display_grid(self, window = None, grid_sz = [80,80]): @@ -234,25 +272,33 @@ class Board(): # Update the board when a piece has been selected # "type" is apparently reserved, so I'll use "state" - def update_select(self, x, y, type_index, state): + def update_select(self, x, y, type_index, state, sanity=True): piece = self.grid[x][y] if piece.types[type_index] == "unknown": - if not state in self.unrevealed_types[piece.colour].keys(): + if not state in self.unrevealed_types[piece.colour].keys() and sanity == True: raise Exception("SANITY: Too many " + piece.colour + " " + state + "s") self.unrevealed_types[piece.colour][state] -= 1 if self.unrevealed_types[piece.colour][state] <= 0: del self.unrevealed_types[piece.colour][state] piece.types[type_index] = state - piece.types_revealed[type_index] = True piece.current_type = state if len(self.possible_moves(piece)) <= 0: piece.deselect() # Piece can't move; deselect it + + # Piece needs to recalculate moves + piece.possible_moves = None # Update the board when a piece has been moved - def update_move(self, x, y, x2, y2): + def update_move(self, x, y, x2, y2, sanity=True): + piece = self.grid[x][y] + #print "Moving " + str(x) + "," + str(y) + " to " + str(x2) + "," + str(y2) + "; possible_moves are " + str(self.possible_moves(piece)) + + if not [x2,y2] in self.possible_moves(piece) and sanity == True: + raise Exception("ILLEGAL move " + str(x2)+","+str(y2)) + self.grid[x][y] = None taken = self.grid[x2][y2] if taken != None: @@ -275,11 +321,17 @@ class Board(): piece.current_type = "queen" piece.deselect() # Uncollapse (?) the wavefunction! - self.verify() + self.moves += 1 + + # All other pieces need to recalculate moves + for p in self.pieces["white"] + self.pieces["black"]: + p.possible_moves = None + + #self.verify() # Update the board from a string # Guesses what to do based on the format of the string - def update(self, result): + def update(self, result, sanity=True): #print "Update called with \"" + str(result) + "\"" # String always starts with 'x y' try: @@ -289,7 +341,7 @@ class Board(): raise Exception("GIBBERISH \""+ str(result) + "\"") # Raise expectations piece = self.grid[x][y] - if piece == None: + if piece == None and sanity == True: raise Exception("EMPTY") # If a piece is being moved, the third token is '->' @@ -302,7 +354,7 @@ class Board(): raise Exception("GIBBERISH \"" + str(result) + "\"") # Raise the alarm # Move the piece (take opponent if possible) - self.update_move(x, y, x2, y2) + self.update_move(x, y, x2, y2, sanity) else: # Otherwise we will just assume a piece has been selected @@ -312,8 +364,9 @@ class Board(): except: raise Exception("GIBBERISH \"" + result + "\"") # Throw a hissy fit + # Select the piece - self.update_select(x, y, type_index, state) + self.update_select(x, y, type_index, state, sanity) return result @@ -332,7 +385,7 @@ class Board(): if prob > 0: result.update({p : prob}) - self.verify() + #self.verify() return result @@ -356,25 +409,25 @@ class Board(): for i in range(len(p.types)): t = p.types[i] - prob = 0.5 - if t == "unknown" or p.types_revealed[i] == False: + prob = 1.0 / float(len(p.types)) + if t == "unknown" or p.types[i][0] == '?': total_types = 0 for t2 in self.unrevealed_types[p.colour].keys(): total_types += self.unrevealed_types[p.colour][t2] for t2 in self.unrevealed_types[p.colour].keys(): prob2 = float(self.unrevealed_types[p.colour][t2]) / float(total_types) - p.current_type = t2 - for point in self.possible_moves(p, reject_allied): + #p.current_type = t2 + for point in self.possible_moves(p, reject_allied, state=t2): result[point[0]][point[1]] += prob2 * prob else: - p.current_type = t - for point in self.possible_moves(p, reject_allied): - result[point[0]][point[1]] += prob + #p.current_type = t + for point in self.possible_moves(p, reject_allied, state=t): + result[point[0]][point[1]] += prob - self.verify() - p.current_type = "unknown" + #self.verify() + #p.current_type = "unknown" return result def prob_is_type(self, p, state): @@ -385,7 +438,7 @@ class Board(): if t == state: result += prob continue - if t == "unknown" or p.types_revealed[i] == False: + if t == "unknown" or p.types[i][0] == '?': total_prob = 0 for t2 in self.unrevealed_types[p.colour].keys(): total_prob += self.unrevealed_types[p.colour][t2] @@ -399,10 +452,24 @@ class Board(): # This is probably inefficient, but I looked at some sample chess games and they seem to actually do things this way # reject_allied indicates whether squares occupied by allied pieces will be removed # (set to false to check for defense) - def possible_moves(self, p, reject_allied = True): - result = [] + def possible_moves(self, p, reject_allied = True, state=None): if p == None: + raise Exception("SANITY: No piece") + + + + if state != None and state != p.current_type: + old_type = p.current_type + p.current_type = state + result = self.possible_moves(p, reject_allied, state=None) + p.current_type = old_type return result + + + + + result = [] + if p.current_type == "unknown": @@ -474,7 +541,9 @@ class Board(): if g != None and (g.colour == p.colour and reject_allied == True): result.remove(point) # Remove allied pieces - self.verify() + #self.verify() + + p.possible_moves = result return result @@ -498,16 +567,57 @@ class Board(): return p + # Returns "white", "black" or "DRAW" if the game should end + def end_condition(self): + if self.king["white"] == None: + if self.king["black"] == None: + return "DRAW" # This shouldn't happen + return "black" + elif self.king["black"] == None: + return "white" + elif len(self.pieces["white"]) == 1 and len(self.pieces["black"]) == 1: + return "DRAW" + elif self.max_moves != None and self.moves > self.max_moves: + return "DRAW" + return None # I typed the full statement about 30 times before writing this function... def on_board(self, x, y): return (x >= 0 and x < w) and (y >= 0 and y < h) + + # Pushes a move temporarily + def push_move(self, piece, x, y): + target = self.grid[x][y] + self.move_stack.append([piece, target, piece.x, piece.y, x, y]) + [piece.x, piece.y] = [x, y] + self.grid[x][y] = piece + self.grid[piece.x][piece.y] = None + + for p in self.pieces["white"] + self.pieces["black"]: + p.possible_moves = None + + # Restore move + def pop_move(self): + #print str(self.move_stack) + [piece, target, x1, y1, x2, y2] = self.move_stack[len(self.move_stack)-1] + self.move_stack = self.move_stack[:-1] + piece.x = x1 + piece.y = y1 + self.grid[x1][y1] = piece + if target != None: + target.x = x2 + target.y = y2 + self.grid[x2][y2] = target + + for p in self.pieces["white"] + self.pieces["black"]: + p.possible_moves = None + # --- board.py --- # import subprocess import select import platform - +import re agent_timeout = -1.0 # Timeout in seconds for AI players to make moves # WARNING: Won't work for windows based operating systems @@ -522,6 +632,9 @@ class Player(): self.colour = colour def update(self, result): + return result + + def reset_board(self, s): pass # Player that runs from another process @@ -556,7 +669,7 @@ class ExternalAgent(Player): if self.p.stdout in ready: #sys.stderr.write("Reading from " + str(self.p) + " 's stdout...\n") try: - result = self.p.stdout.readline().strip("\r\n") + result = self.p.stdout.readline().strip(" \t\r\n") #sys.stderr.write("Read \'" + result + "\' from " + str(self.p) + "\n") return result except: # Exception, e: @@ -570,7 +683,8 @@ class ExternalAgent(Player): line = self.get_response() try: - result = map(int, line.split(" ")) + m = re.match("\s*(\d+)\s+(\d+)\s*", line) + result = map(int, [m.group(1), m.group(2)]) except: raise Exception("GIBBERISH \"" + str(line) + "\"") return result @@ -578,7 +692,7 @@ class ExternalAgent(Player): def update(self, result): #print "Update " + str(result) + " called for AgentPlayer" self.send_message(result) - + return result def get_move(self): @@ -586,11 +700,19 @@ class ExternalAgent(Player): line = self.get_response() try: - result = map(int, line.split(" ")) + m = re.match("\s*(\d+)\s+(\d+)\s*", line) + result = map(int, [m.group(1), m.group(2)]) + except: raise Exception("GIBBERISH \"" + str(line) + "\"") return result + def reset_board(self, s): + self.send_message("BOARD") + for line in s.split("\n"): + self.send_message(line.strip(" \r\n")) + self.send_message("END BOARD") + def quit(self, final_result): try: self.send_message("QUIT " + final_result) @@ -656,6 +778,7 @@ class HumanPlayer(Player): pass else: sys.stdout.write(result + "\n") + return result # Default internal player (makes random moves) @@ -671,7 +794,11 @@ class InternalAgent(Player): def update(self, result): self.board.update(result) - self.board.verify() + #self.board.verify() + return result + + def reset_board(self, s): + self.board.reset_board(s) def quit(self, final_result): pass @@ -724,6 +851,14 @@ def run_agent(agent): #sys.stderr.write(sys.argv[0] + " : Quitting\n") agent.quit(" ".join(line.split(" ")[1:])) # Quits the game break + elif line.split(" ")[0] == "BOARD": + s = "" + line = sys.stdin.readline().strip(" \r\n") + while line != "END BOARD": + s += line + "\n" + line = sys.stdin.readline().strip(" \r\n") + agent.board.reset_board(s) + else: agent.update(line) # Updates agent.board return 0 @@ -743,7 +878,7 @@ class ExternalWrapper(ExternalAgent): # A sample agent -class AgentBishop(InternalAgent): # Inherits from InternalAgent (in qchess) +class AgentBishop(AgentRandom): # Inherits from AgentRandom (in qchess) def __init__(self, name, colour): InternalAgent.__init__(self, name, colour) self.value = {"pawn" : 1, "bishop" : 3, "knight" : 3, "rook" : 5, "queen" : 9, "king" : 100, "unknown" : 4} @@ -789,10 +924,9 @@ class AgentBishop(InternalAgent): # Inherits from InternalAgent (in qchess) # Get total probability that the move is protected - [xx,yy] = [piece.x, piece.y] - [piece.x, piece.y] = [x, y] - self.board.grid[x][y] = piece - self.board.grid[xx][yy] = None + self.board.push_move(piece, x, y) + + defenders = self.board.coverage(x, y, piece.colour, reject_allied = False) d_prob = 0.0 @@ -815,9 +949,8 @@ class AgentBishop(InternalAgent): # Inherits from InternalAgent (in qchess) if (a_prob > 1.0): a_prob = 1.0 - self.board.grid[x][y] = target - self.board.grid[xx][yy] = piece - [piece.x, piece.y] = [xx, yy] + self.board.pop_move() + # Score of the move @@ -905,6 +1038,7 @@ class AgentBishop(InternalAgent): # Inherits from InternalAgent (in qchess) def select(self): #sys.stderr.write("Getting choice...") self.choice = self.select_best(self.colour)[0] + #sys.stderr.write(" Done " + str(self.choice)+"\n") return [self.choice.x, self.choice.y] @@ -916,7 +1050,7 @@ class AgentBishop(InternalAgent): # Inherits from InternalAgent (in qchess) if len(moves) > 0: return moves[0][0] else: - return InternalAgent.get_move(self) + return AgentRandom.get_move(self) # --- agent_bishop.py --- # import multiprocessing @@ -1000,7 +1134,10 @@ network_timeout_delay = 1.0 # Maximum time between two characters being received class Network(): def __init__(self, colour, address = None): self.socket = socket.socket() + self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) #self.socket.setblocking(0) + + self.server = (address == None) if colour == "white": self.port = 4562 @@ -1012,7 +1149,7 @@ class Network(): # print str(self) + " listens on port " + str(self.port) if address == None: - self.host = socket.gethostname() + self.host = "0.0.0.0" #socket.gethostname() # Breaks things??? self.socket.bind((self.host, self.port)) self.socket.listen(5) @@ -1027,6 +1164,7 @@ class Network(): self.src.send("ok\n") if self.get_response() == "QUIT": self.src.close() + self.address = (address, self.port) def get_response(self): # Timeout the start of the message (first character) @@ -1072,6 +1210,7 @@ class Network(): game.stop() return True + class NetworkSender(Player,Network): @@ -1082,38 +1221,52 @@ class NetworkSender(Player,Network): self.address = address def connect(self): - Network.__init__(self, self.base_player.colour, self.address) - + nAttempts=3 + for i in range(nAttempts): + try: + Network.__init__(self, self.colour, self.address) + debug(str(self) +" connected to " + str(self.address)) + return + except Exception, e: + debug(str(self) +" attempt " + str(i) + ": " + str(e.message)) + + raise Exception("NETWORK - Can't connect to " + str(self.address)) def select(self): [x,y] = self.base_player.select() choice = self.board.grid[x][y] s = str(x) + " " + str(y) - #print str(self) + ".select sends " + s + #debug(str(self) + " sends: " + str(s)) self.send_message(s) return [x,y] def get_move(self): [x,y] = self.base_player.get_move() s = str(x) + " " + str(y) - #print str(self) + ".get_move sends " + s + #debug(str(self) + " sends: " + str(s)) self.send_message(s) return [x,y] def update(self, s): + self.base_player.update(s) + if self.server == True: + #debug(str(self) + " sends: " + str(s)) + self.send_message(s) + return s + s = s.split(" ") [x,y] = map(int, s[0:2]) selected = self.board.grid[x][y] if selected != None and selected.colour == self.colour and len(s) > 2 and not "->" in s: s = " ".join(s[0:3]) for i in range(2): - if selected.types_revealed[i] == True: + if selected.types[i][0] != '?': s += " " + str(selected.types[i]) else: s += " unknown" - #print str(self) + ".update sends " + s + #debug(str(self) +" sending: " + str(s)) self.send_message(s) @@ -1121,24 +1274,48 @@ class NetworkSender(Player,Network): self.base_player.quit(final_result) #self.src.send("QUIT " + str(final_result) + "\n") self.src.close() + + def __str__(self): + s = "NetworkSender:" + if self.server: + s += "server" + else: + s += "client" + s += ":"+str(self.address) + return s + class NetworkReceiver(Player,Network): def __init__(self, colour, address=None): - Player.__init__(self, address, colour) + s = "@network" + if address != None: + s += ":"+str(address) + Player.__init__(self, s, colour) self.address = address self.board = None + def connect(self): - Network.__init__(self, self.colour, self.address) + nAttempts=3 + for i in range(nAttempts): + try: + Network.__init__(self, self.colour, self.address) + debug(str(self) +" connected to " + str(self.address)) + return + except Exception, e: + debug(str(self) +" attempt " + str(i) + ": " + str(e.message)) + + raise Exception("NETWORK - Can't connect to " + str(self.address)) + def select(self): s = self.get_response() - #print str(self) + ".select gets " + s + #debug(str(self) +".select reads: " + str(s)) [x,y] = map(int,s.split(" ")) if x == -1 and y == -1: #print str(self) + ".select quits the game" @@ -1148,7 +1325,7 @@ class NetworkReceiver(Player,Network): return [x,y] def get_move(self): s = self.get_response() - #print str(self) + ".get_move gets " + s + #debug(str(self) +".get_move reads: " + str(s)) [x,y] = map(int,s.split(" ")) if x == -1 and y == -1: #print str(self) + ".get_move quits the game" @@ -1158,29 +1335,26 @@ class NetworkReceiver(Player,Network): return [x,y] def update(self, result): - - result = result.split(" ") - [x,y] = map(int, result[0:2]) - selected = self.board.grid[x][y] - if selected != None and selected.colour == self.colour and len(result) > 2 and not "->" in result: - s = self.get_response() - #print str(self) + ".update - receives " + str(s) - s = s.split(" ") - selected.choice = int(s[2]) - for i in range(2): - selected.types[i] = str(s[3+i]) - if s[3+i] == "unknown": - selected.types_revealed[i] = False - else: - selected.types_revealed[i] = True - selected.current_type = selected.types[selected.choice] - else: - pass - #print str(self) + ".update - ignore result " + str(result) + if self.server == True: + return result + s = self.get_response() + #debug(str(self) + ".update reads: " + str(s)) + if not "->" in s.split(" "): + self.board.update(s, sanity=False) + return s def quit(self, final_result): self.src.close() + + def __str__(self): + s = "NetworkReceiver:" + if self.server: + s += "server" + else: + s += "client" + s += ":"+str(self.address) + return s # --- network.py --- # import threading @@ -1199,7 +1373,7 @@ class StoppableThread(threading.Thread): def stopped(self): return self._stop.isSet() # --- thread_util.py --- # -log_file = None +log_files = [] import datetime import urllib2 @@ -1218,7 +1392,7 @@ class LogFile(): def setup(self, board, players): for p in players: - self.log.write("# " + p.colour + " : " + p.name + "\n") + self.log.write("# " + str(p.colour) + " : " + str(p.name) + "\n") self.log.write("# Initial board\n") for x in range(0, w): @@ -1230,11 +1404,16 @@ class LogFile(): def close(self): self.log.write("# EOF\n") - self.log.close() + if self.log != sys.stdout: + self.log.close() -class HttpLog(LogFile): +class ShortLog(LogFile): def __init__(self, file_name): - LogFile.__init__(self, open(file_name, "w", 0)) + if file_name == "": + self.log = sys.stdout + else: + self.log = open(file_name, "w", 0) + LogFile.__init__(self, self.log) self.file_name = file_name self.phase = 0 @@ -1243,8 +1422,9 @@ class HttpLog(LogFile): self.logged.append((now, s)) if self.phase == 0: - self.log.close() - self.log = open(self.file_name, "w", 0) + if self.log != sys.stdout: + self.log.close() + self.log = open(self.file_name, "w", 0) self.log.write("# Short log updated " + str(datetime.datetime.now()) + "\n") LogFile.setup(self, game.board, game.players) @@ -1255,8 +1435,12 @@ class HttpLog(LogFile): self.phase = (self.phase + 1) % 2 def close(self): + if self.phase == 1: + ending = self.logged[len(self.logged)-1] + self.log.write(str(ending[0]) + " : " + ending[1] + "\n") self.log.write("# EOF\n") - self.log.close() + if self.log != sys.stdout: + self.log.close() class HeadRequest(urllib2.Request): @@ -1322,15 +1506,55 @@ class HttpReplay(): def close(self): self.getter.stop() + +class FileReplay(): + def __init__(self, filename): + self.f = open(filename, "r", 0) + self.filename = filename + self.mod = os.path.getmtime(filename) + self.count = 0 + + def readline(self): + line = self.f.readline() + + while line == "": + mod2 = os.path.getmtime(self.filename) + if mod2 > self.mod: + #sys.stderr.write("File changed!\n") + self.mod = mod2 + self.f.close() + self.f = open(self.filename, "r", 0) + + new_line = self.f.readline() + + if " ".join(new_line.split(" ")[0:3]) != "# Short log": + for i in range(self.count): + new_line = self.f.readline() + #sys.stderr.write("Read back " + str(i) + ": " + str(new_line) + "\n") + new_line = self.f.readline() + else: + self.count = 0 + + line = new_line + + self.count += 1 + return line + + def close(self): + self.f.close() + def log(s): - if log_file != None: - log_file.write(s) + for l in log_files: + l.write(s) + +def debug(s): + sys.stderr.write("# DEBUG: " + s + "\n") def log_init(board, players): - if log_file != None: - log_file.setup(board, players) + for l in log_files: + l.setup(board, players) # --- log.py --- # @@ -1368,13 +1592,17 @@ class GameThread(StoppableThread): [x,y] = p.select() # Player selects a square if self.stopped(): break - + + if not (isinstance(p, Network) and p.server == False): + result = self.board.select(x, y, colour = p.colour) + else: + #debug(str(self) + " don't update local board") + result = "" - - - result = self.board.select(x, y, colour = p.colour) + result = p.update(result) for p2 in self.players: - p2.update(result) # Inform players of what happened + if p2 != p: + result = p2.update(result) # Inform players of what happened log(result) @@ -1437,20 +1665,15 @@ class GameThread(StoppableThread): # with self.lock: # self.final_result = self.state["turn"].colour + " " + e.message - if self.board.king["black"] == None: - if self.board.king["white"] == None: - with self.lock: - self.final_result = self.state["turn"].colour + " DRAW" - else: - with self.lock: - self.final_result = "white" - self.stop() - elif self.board.king["white"] == None: + end = self.board.end_condition() + if end != None: with self.lock: - self.final_result = "black" + if end == "DRAW": + self.final_result = self.state["turn"].colour + " " + end + else: + self.final_result = end self.stop() - - + if self.stopped(): break @@ -1466,70 +1689,73 @@ class GameThread(StoppableThread): # A thread that replays a log file class ReplayThread(GameThread): - def __init__(self, players, src, end=False,max_lines=None): + def __init__(self, players, src, end=False,max_moves=None): self.board = Board(style="empty") + self.board.max_moves = max_moves GameThread.__init__(self, self.board, players) self.src = src - self.max_lines = max_lines - self.line_number = 0 self.end = end self.reset_board(self.src.readline()) def reset_board(self, line): - pieces = {"white" : [], "black" : []} - king = {"white" : None, "black" : None} - grid = [[None] * w for _ in range(h)] - for x in range(w): - for y in range(h): - self.board.grid[x][y] = None - while line != "# Start game": - if line[0] == "#": + agent_str = "" + self_str = "" + while line != "# Start game" and line != "# EOF": + + while line == "": line = self.src.readline().strip(" \r\n") continue - tokens = line.split(" ") - [x, y] = map(int, tokens[len(tokens)-1].split(",")) - current_type = tokens[1] - types = map(lambda e : e.strip("'[], "), (tokens[2]+tokens[3]).split(",")) - - target = Piece(tokens[0], x, y, types) - target.current_type = current_type + if line[0] == '#': + line = self.src.readline().strip(" \r\n") + continue + + self_str += line + "\n" + + if self.players[0].name == "dummy" and self.players[1].name == "dummy": + line = self.src.readline().strip(" \r\n") + continue - try: - target.choice = types.index(current_type) - except: - target.choice = -1 + tokens = line.split(" ") + types = map(lambda e : e.strip("[] ,'"), tokens[2:4]) + for i in range(len(types)): + if types[i][0] == "?": + types[i] = "unknown" - pieces[tokens[0]].append(target) - if target.current_type == "king": - king[tokens[0]] = target - grid[x][y] = target - + agent_str += tokens[0] + " " + tokens[1] + " " + str(types) + " ".join(tokens[4:]) + "\n" line = self.src.readline().strip(" \r\n") - self.board.pieces = pieces - self.board.king = king - self.board.grid = grid + for p in self.players: + p.reset_board(agent_str) + + + self.board.reset_board(self_str) - # Update the player's boards def run(self): move_count = 0 + last_line = "" line = self.src.readline().strip(" \r\n") while line != "# EOF": + + if self.stopped(): break - + + if len(line) <= 0: + continue if line[0] == '#': + last_line = line line = self.src.readline().strip(" \r\n") continue tokens = line.split(" ") if tokens[0] == "white" or tokens[0] == "black": self.reset_board(line) + last_line = line line = self.src.readline().strip(" \r\n") continue @@ -1541,6 +1767,7 @@ class ReplayThread(GameThread): try: [x,y] = map(int, tokens[0:2]) except: + last_line = line self.stop() break @@ -1565,7 +1792,10 @@ class ReplayThread(GameThread): self.board.update_select(x, y, int(tokens[2]), tokens[len(tokens)-1]) if isinstance(graphics, GraphicsThread): with graphics.lock: - graphics.state["moves"] = self.board.possible_moves(target) + if target.current_type != "unknown": + graphics.state["moves"] = self.board.possible_moves(target) + else: + graphics.state["moves"] = None time.sleep(turn_delay) else: self.board.update_move(x, y, x2, y2) @@ -1585,10 +1815,15 @@ class ReplayThread(GameThread): for p in self.players: p.update(move) + last_line = line line = self.src.readline().strip(" \r\n") - + end = self.board.end_condition() + if end != None: + self.final_result = end + self.stop() + break @@ -1602,18 +1837,28 @@ class ReplayThread(GameThread): - if self.max_lines != None and self.max_lines > count: - sys.stderr.write(sys.argv[0] + " : Replaying from file; stopping at last line (" + str(count) + ")\n") - sys.stderr.write(sys.argv[0] + " : (You requested line " + str(self.max_lines) + ")\n") + if self.end and isinstance(graphics, GraphicsThread): #graphics.stop() pass # Let the user stop the display - elif not self.end: + elif not self.end and self.board.end_condition() == None: global game + # Work out the last move + + t = last_line.split(" ") + if t[len(t)-2] == "black": + self.players.reverse() + elif t[len(t)-2] == "white": + pass + elif self.state["turn"] != None and self.state["turn"].colour == "white": + self.players.reverse() + + game = GameThread(self.board, self.players) game.run() - + else: + pass @@ -1679,11 +1924,14 @@ def load_images(image_dir=os.path.join(os.path.curdir, "data", "images")): small_images[c].update({p : pygame.image.load(os.path.join(image_dir, c + "_" + p + "_small.png"))}) # --- images.py --- # graphics_enabled = True + try: import pygame + os.environ["SDL_VIDEO_ALLOW_SCREENSAVER"] = "1" except: graphics_enabled = False +import time @@ -1704,6 +1952,9 @@ class GraphicsThread(StoppableThread): self.error = 0 self.lock = threading.RLock() self.cond = threading.Condition() + self.sleep_timeout = None + self.last_event = time.time() + self.blackout = False #print "Test font" pygame.font.Font(os.path.join(os.path.curdir, "data", "DejaVuSans.ttf"), 32).render("Hello", True,(0,0,0)) @@ -1727,19 +1978,28 @@ class GraphicsThread(StoppableThread): while not self.stopped(): - #print "Display grid" - self.board.display_grid(window = self.window, grid_sz = self.grid_sz) # Draw the board + if self.sleep_timeout == None or (time.time() - self.last_event) < self.sleep_timeout: + + #print "Display grid" + self.board.display_grid(window = self.window, grid_sz = self.grid_sz) # Draw the board - #print "Display overlay" - self.overlay() + #print "Display overlay" + self.overlay() - #print "Display pieces" - self.board.display_pieces(window = self.window, grid_sz = self.grid_sz) # Draw the board + #print "Display pieces" + self.board.display_pieces(window = self.window, grid_sz = self.grid_sz) # Draw the board + self.blackout = False + + elif pygame.mouse.get_focused() and not self.blackout: + os.system("xset dpms force off") + self.blackout = True + self.window.fill((0,0,0)) pygame.display.flip() for event in pygame.event.get(): - if event.type == pygame.QUIT: + self.last_event = time.time() + if event.type == pygame.QUIT or (event.type == pygame.KEYDOWN and event.key == pygame.K_q): if isinstance(game, GameThread): with game.lock: game.final_result = "" @@ -1751,10 +2011,13 @@ class GraphicsThread(StoppableThread): break elif event.type == pygame.MOUSEBUTTONDOWN: self.mouse_down(event) + elif event.type == pygame.MOUSEBUTTONUP: - self.mouse_up(event) + self.mouse_up(event) + + - + @@ -2136,6 +2399,7 @@ import os import time turn_delay = 0.5 +sleep_timeout = None [game, graphics] = [None, None] def make_player(name, colour): @@ -2184,12 +2448,13 @@ def main(argv): global turn_delay global agent_timeout - global log_file + global log_files global src_file global graphics_enabled global always_reveal_states + global sleep_timeout - max_lines = None + max_moves = None src_file = None style = "quantum" @@ -2229,31 +2494,33 @@ def main(argv): elif arg[1] == '-' and arg[2:] == "reveal": always_reveal_states = True elif (arg[1] == '-' and arg[2:] == "graphics"): - graphics_enabled = not graphics_enabled + graphics_enabled = True + elif (arg[1] == '-' and arg[2:] == "no-graphics"): + graphics_enabled = False elif (arg[1] == '-' and arg[2:].split("=")[0] == "file"): # Load game from file if len(arg[2:].split("=")) == 1: src_file = sys.stdin else: f = arg[2:].split("=")[1] - if f[0] == '@': - src_file = HttpReplay("http://" + f.split(":")[0][1:]) + if f[0:7] == "http://": + src_file = HttpReplay(f) else: - src_file = open(f.split(":")[0], "r", 0) + src_file = FileReplay(f.split(":")[0]) - if len(f.split(":")) == 2: - max_lines = int(f.split(":")[1]) + if len(f.split(":")) == 2: + max_moves = int(f.split(":")[1]) elif (arg[1] == '-' and arg[2:].split("=")[0] == "log"): # Log file if len(arg[2:].split("=")) == 1: - log_file = LogFile(sys.stdout) + log_files.append(LogFile(sys.stdout)) else: f = arg[2:].split("=")[1] if f[0] == '@': - log_file = HttpLog(f[1:]) + log_files.append(ShortLog(f[1:])) else: - log_file = LogFile(open(f, "w", 0)) + log_files.append(LogFile(open(f, "w", 0))) elif (arg[1] == '-' and arg[2:].split("=")[0] == "delay"): # Delay if len(arg[2:].split("=")) == 1: @@ -2267,6 +2534,12 @@ def main(argv): agent_timeout = -1 else: agent_timeout = float(arg[2:].split("=")[1]) + elif (arg[1] == '-' and arg[2:].split("=")[0] == "blackout"): + # Screen saver delay + if len(arg[2:].split("=")) == 1: + sleep_timeout = -1 + else: + sleep_timeout = float(arg[2:].split("=")[1]) elif (arg[1] == '-' and arg[2:] == "help"): # Help @@ -2293,17 +2566,21 @@ def main(argv): if graphics_enabled: sys.stderr.write(sys.argv[0] + " : (You won't get a GUI, because --file was used, and the author is lazy)\n") return 44 - game = ReplayThread(players, src_file, end=end, max_lines=max_lines) + game = ReplayThread(players, src_file, end=end, max_moves=max_moves) else: board = Board(style) + board.max_moves = max_moves game = GameThread(board, players) + # Initialise GUI if graphics_enabled == True: try: graphics = GraphicsThread(game.board, grid_sz = [64,64]) # Construct a GraphicsThread! + + graphics.sleep_timeout = sleep_timeout except Exception,e: graphics = None @@ -2342,6 +2619,10 @@ def main(argv): if graphics != None: graphics.board.display_grid(graphics.window, graphics.grid_sz) graphics.message("Connecting to " + p.colour + " player...") + + # Handle race condition by having clients wait longer than servers to connect + if p.address != None: + time.sleep(0.2) p.connect() @@ -2382,12 +2663,14 @@ def main(argv): error = game.error - if log_file != None and log_file != sys.stdout: - log_file.close() + for l in log_files: + l.close() if src_file != None and src_file != sys.stdin: src_file.close() + sys.stdout.write(game.final_result + "\n") + return error # This is how python does a main() function... @@ -2408,4 +2691,4 @@ if __name__ == "__main__": sys.exit(102) # --- main.py --- # -# EOF - created from make on Wed Jan 30 21:00:29 WST 2013 +# EOF - created from make on Tue Apr 2 15:05:07 WST 2013