X-Git-Url: https://git.ucc.asn.au/?p=progcomp2013.git;a=blobdiff_plain;f=qchess%2Fqchess.py;h=d139462d5b5d2ee5c546bbf0a6534f28f8366871;hp=3554da5528587b2c693948a92e017c63145d9c51;hb=c0c346f95a6d19d8967928aeeeb4937e1a99f2f4;hpb=559edeecb292c9971ddd8226e132e1bf1d2640e1 diff --git a/qchess/qchess.py b/qchess/qchess.py index 3554da5..d139462 100755 --- a/qchess/qchess.py +++ b/qchess/qchess.py @@ -20,7 +20,7 @@ class Piece(): self.move_pattern = None self.coverage = None - + self.possible_moves = None def init_from_copy(self, c): @@ -112,6 +112,7 @@ class Board(): 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"] @@ -282,10 +283,19 @@ class Board(): 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): + 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): + raise Exception("ILLEGAL move " + str(x2)+","+str(y2)) + self.grid[x][y] = None taken = self.grid[x2][y2] if taken != None: @@ -309,6 +319,11 @@ class Board(): piece.deselect() # Uncollapse (?) the wavefunction! 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 @@ -366,7 +381,7 @@ class Board(): if prob > 0: result.update({p : prob}) - self.verify() + #self.verify() return result @@ -407,7 +422,7 @@ class Board(): for point in self.possible_moves(p, reject_allied): result[point[0]][point[1]] += prob - self.verify() + #self.verify() p.current_type = "unknown" return result @@ -433,10 +448,25 @@ 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 + + if p.possible_moves != None: + return p.possible_moves + + + result = [] + if p.current_type == "unknown": @@ -508,7 +538,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 @@ -550,11 +582,39 @@ class Board(): # 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 @@ -606,7 +666,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: @@ -620,7 +680,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 @@ -636,7 +697,9 @@ 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 @@ -856,10 +919,9 @@ class AgentBishop(AgentRandom): # Inherits from AgentRandom (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 @@ -882,9 +944,8 @@ class AgentBishop(AgentRandom): # Inherits from AgentRandom (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 @@ -1816,6 +1877,7 @@ try: except: graphics_enabled = False +import time @@ -1836,12 +1898,14 @@ class GraphicsThread(StoppableThread): self.error = 0 self.lock = threading.RLock() self.cond = threading.Condition() + self.sleep_timeout = None + self.last_event = time.time() #print "Test font" pygame.font.Font(os.path.join(os.path.curdir, "data", "DejaVuSans.ttf"), 32).render("Hello", True,(0,0,0)) - #create_images(grid_sz) - create_images(grid_sz) + #load_images() + load_images() """ for c in images.keys(): @@ -1859,19 +1923,25 @@ 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 + + else: + 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 = "" @@ -1883,8 +1953,11 @@ 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) + + @@ -2268,6 +2341,7 @@ import os import time turn_delay = 0.5 +sleep_timeout = None [game, graphics] = [None, None] def make_player(name, colour): @@ -2320,6 +2394,7 @@ def main(argv): global src_file global graphics_enabled global always_reveal_states + global sleep_timeout max_moves = None src_file = None @@ -2401,6 +2476,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 @@ -2440,6 +2521,8 @@ def main(argv): 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 @@ -2546,4 +2629,4 @@ if __name__ == "__main__": sys.exit(102) # --- main.py --- # -# EOF - created from make on Mon Feb 25 21:46:16 WST 2013 +# EOF - created from make on Tue Mar 19 07:36:32 WST 2013