It works!
[progcomp2013.git] / qchess / qchess.py
index 8347a75..d2ec1bb 100755 (executable)
@@ -39,7 +39,7 @@ class Piece():
 
        # Make a string for the piece (used for debug)
        def __str__(self):
-               return str(self.current_type) + " " + str(self.types) + " at " + str(self.x) + ","+str(self.y)  
+               return str(self.colour) + " " + str(self.current_type) + " " + str(self.types) + " at " + str(self.x) + ","+str(self.y)  
 
        # Draw the piece in a pygame surface
        def draw(self, window, grid_sz = [80,80], style="quantum"):
@@ -59,7 +59,7 @@ class Piece():
 
                # Draw the two possible types underneath the current_type image
                for i in range(len(self.types)):
-                       if self.types_revealed[i] == True:
+                       if always_reveal_states == True or self.types_revealed[i] == True:
                                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
@@ -97,6 +97,8 @@ class Piece():
 # --- piece.py --- #
 [w,h] = [8,8] # Width and height of board(s)
 
+always_reveal_states = False
+
 # Class to represent a quantum chess board
 class Board():
        # Initialise; if master=True then the secondary piece types are assigned
@@ -111,6 +113,9 @@ class Board():
                for c in ["black", "white"]:
                        del self.unrevealed_types[c]["unknown"]
 
+               if style == "empty":
+                       return
+
                # Add all the pieces with known primary types
                for i in range(0, 2):
                        
@@ -516,13 +521,16 @@ class Player():
                self.name = name
                self.colour = colour
 
+       def update(self, result):
+               pass
+
 # Player that runs from another process
-class AgentPlayer(Player):
+class ExternalAgent(Player):
 
 
        def __init__(self, name, colour):
                Player.__init__(self, name, colour)
-               self.p = subprocess.Popen(name, stdin=subprocess.PIPE, stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+               self.p = subprocess.Popen(name,bufsize=0,stdin=subprocess.PIPE, stdout=subprocess.PIPE, shell=True,universal_newlines=True)
                
                self.send_message(colour)
 
@@ -532,13 +540,13 @@ class AgentPlayer(Player):
                else:
                        ready = [self.p.stdin]
                if self.p.stdin in ready:
-                       #print "Writing to p.stdin"
+                       #sys.stderr.write("Writing \'" + s + "\' to " + str(self.p) + "\n")
                        try:
                                self.p.stdin.write(s + "\n")
                        except:
                                raise Exception("UNRESPONSIVE")
                else:
-                       raise Exception("UNRESPONSIVE")
+                       raise Exception("TIMEOUT")
 
        def get_response(self):
                if agent_timeout > 0.0:
@@ -546,13 +554,15 @@ class AgentPlayer(Player):
                else:
                        ready = [self.p.stdout]
                if self.p.stdout in ready:
-                       #print "Reading from p.stdout"
+                       #sys.stderr.write("Reading from " + str(self.p) + " 's stdout...\n")
                        try:
-                               return self.p.stdout.readline().strip("\r\n")
+                               result = self.p.stdout.readline().strip("\r\n")
+                               #sys.stderr.write("Read \'" + result + "\' from " + str(self.p) + "\n")
+                               return result
                        except: # Exception, e:
                                raise Exception("UNRESPONSIVE")
                else:
-                       raise Exception("UNRESPONSIVE")
+                       raise Exception("TIMEOUT")
 
        def select(self):
 
@@ -648,14 +658,28 @@ class HumanPlayer(Player):
                        sys.stdout.write(result + "\n") 
 
 
-# Player that makes random moves
-class AgentRandom(Player):
+# Default internal player (makes random moves)
+class InternalAgent(Player):
        def __init__(self, name, colour):
                Player.__init__(self, name, colour)
                self.choice = None
 
                self.board = Board(style = "agent")
 
+
+
+       def update(self, result):
+               
+               self.board.update(result)
+               self.board.verify()
+
+       def quit(self, final_result):
+               pass
+
+class AgentRandom(InternalAgent):
+       def __init__(self, name, colour):
+               InternalAgent.__init__(self, name, colour)
+
        def select(self):
                while True:
                        self.choice = self.board.pieces[self.colour][random.randint(0, len(self.board.pieces[self.colour])-1)]
@@ -680,21 +704,227 @@ class AgentRandom(Player):
                move = moves[random.randint(0, len(moves)-1)]
                return move
 
-       def update(self, result):
-               #sys.stderr.write(sys.argv[0] + " : Update board for AgentRandom\n")
-               self.board.update(result)
-               self.board.verify()
 
-       def quit(self, final_result):
-               pass
+# Terrible, terrible hacks
+
+def run_agent(agent):
+       #sys.stderr.write(sys.argv[0] + " : Running agent " + str(agent) + "\n")
+       while True:
+               line = sys.stdin.readline().strip(" \r\n")
+               if line == "SELECTION?":
+                       #sys.stderr.write(sys.argv[0] + " : Make selection\n")
+                       [x,y] = agent.select() # Gets your agent's selection
+                       #sys.stderr.write(sys.argv[0] + " : Selection was " + str(agent.choice) + "\n")
+                       sys.stdout.write(str(x) + " " + str(y) + "\n")                          
+               elif line == "MOVE?":
+                       #sys.stderr.write(sys.argv[0] + " : Make move\n")
+                       [x,y] = agent.get_move() # Gets your agent's move
+                       sys.stdout.write(str(x) + " " + str(y) + "\n")
+               elif line.split(" ")[0] == "QUIT":
+                       #sys.stderr.write(sys.argv[0] + " : Quitting\n")
+                       agent.quit(" ".join(line.split(" ")[1:])) # Quits the game
+                       break
+               else:
+                       agent.update(line) # Updates agent.board
+       return 0
+
+
+# Sort of works?
+
+class ExternalWrapper(ExternalAgent):
+       def __init__(self, agent):
+               run = "python -u -c \"import sys;import os;from qchess import *;agent = " + agent.__class__.__name__ + "('" + agent.name + "','"+agent.colour+"');sys.stdin.readline();sys.exit(run_agent(agent))\""
+               # str(run)
+               ExternalAgent.__init__(self, run, agent.colour)
 
+       
 
 # --- player.py --- #
+# A sample agent
+
+
+class AgentBishop(InternalAgent): # Inherits from InternalAgent (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}
+
+               self.aggression = 2.0 # Multiplier for scoring due to aggressive actions
+               self.defence = 1.0 # Multiplier for scoring due to defensive actions
+               
+               self.depth = 0 # Current depth
+               self.max_depth = 2 # Recurse this many times (for some reason, makes more mistakes when this is increased???)
+               self.recurse_for = -1 # Recurse for the best few moves each times (less than 0 = all moves)
+
+               for p in self.board.pieces["white"] + self.board.pieces["black"]:
+                       p.last_moves = None
+                       p.selected_moves = None
+
+               
+
+       def get_value(self, piece):
+               if piece == None:
+                       return 0.0
+               return float(self.value[piece.types[0]] + self.value[piece.types[1]]) / 2.0
+               
+       # Score possible moves for the piece
+       
+       def prioritise_moves(self, piece):
+
+               #sys.stderr.write(sys.argv[0] + " : " + str(self) + " prioritise called for " + str(piece) + "\n")
+
+               
+               
+               grid = self.board.probability_grid(piece)
+               #sys.stderr.write("\t Probability grid " + str(grid) + "\n")
+               moves = []
+               for x in range(w):
+                       for y in range(h):
+                               if grid[x][y] < 0.3: # Throw out moves with < 30% probability
+                                       #sys.stderr.write("\tReject " + str(x) + "," + str(y) + " (" + str(grid[x][y]) + ")\n")
+                                       continue
+
+                               target = self.board.grid[x][y]
+                       
+                               
+                               
+                               
+                               # 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
+                               
+                               defenders = self.board.coverage(x, y, piece.colour, reject_allied = False)
+                               d_prob = 0.0
+                               for d in defenders.keys():
+                                       d_prob += defenders[d]
+                               if len(defenders.keys()) > 0:
+                                       d_prob /= float(len(defenders.keys()))
+
+                               if (d_prob > 1.0):
+                                       d_prob = 1.0
+
+                               # Get total probability that the move is threatened
+                               attackers = self.board.coverage(x, y, opponent(piece.colour), reject_allied = False)
+                               a_prob = 0.0
+                               for a in attackers.keys():
+                                       a_prob += attackers[a]
+                               if len(attackers.keys()) > 0:
+                                       a_prob /= float(len(attackers.keys()))
+
+                               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]
+
+                               
+                               # Score of the move
+                               value = self.aggression * (1.0 + d_prob) * self.get_value(target) - self.defence * (1.0 - d_prob) * a_prob * self.get_value(piece)
+
+                               # Adjust score based on movement of piece out of danger
+                               attackers = self.board.coverage(piece.x, piece.y, opponent(piece.colour))
+                               s_prob = 0.0
+                               for a in attackers.keys():
+                                       s_prob += attackers[a]
+                               if len(attackers.keys()) > 0:
+                                       s_prob /= float(len(attackers.keys()))
+
+                               if (s_prob > 1.0):
+                                       s_prob = 1.0
+                               value += self.defence * s_prob * self.get_value(piece)
+                               
+                               # Adjust score based on probability that the move is actually possible
+                               moves.append([[x, y], grid[x][y] * value])
+
+               moves.sort(key = lambda e : e[1], reverse = True)
+               #sys.stderr.write(sys.argv[0] + ": Moves for " + str(piece) + " are " + str(moves) + "\n")
+
+               piece.last_moves = moves
+               piece.selected_moves = None
+
+               
+
+               
+               return moves
+
+       def select_best(self, colour):
+
+               self.depth += 1
+               all_moves = {}
+               for p in self.board.pieces[colour]:
+                       self.choice = p # Temporarily pick that piece
+                       m = self.prioritise_moves(p)
+                       if len(m) > 0:
+                               all_moves.update({p : m[0]})
+
+               if len(all_moves.items()) <= 0:
+                       return None
+               
+               
+               opts = all_moves.items()
+               opts.sort(key = lambda e : e[1][1], reverse = True)
+
+               if self.depth >= self.max_depth:
+                       self.depth -= 1
+                       return list(opts[0])
+
+               if self.recurse_for >= 0:
+                       opts = opts[0:self.recurse_for]
+               #sys.stderr.write(sys.argv[0] + " : Before recurse, options are " + str(opts) + "\n")
+
+               # Take the best few moves, and recurse
+               for choice in opts[0:self.recurse_for]:
+                       [xx,yy] = [choice[0].x, choice[0].y] # Remember position
+                       [nx,ny] = choice[1][0] # Target
+                       [choice[0].x, choice[0].y] = [nx, ny] # Set position
+                       target = self.board.grid[nx][ny] # Remember piece in spot
+                       self.board.grid[xx][yy] = None # Remove piece
+                       self.board.grid[nx][ny] = choice[0] # Replace with moving piece
+                       
+                       # Recurse
+                       best_enemy_move = self.select_best(opponent(choice[0].colour))
+                       choice[1][1] -= best_enemy_move[1][1] / float(self.depth + 1.0)
+                       
+                       [choice[0].x, choice[0].y] = [xx, yy] # Restore position
+                       self.board.grid[nx][ny] = target # Restore taken piece
+                       self.board.grid[xx][yy] = choice[0] # Restore moved piece
+                       
+               
+
+               opts.sort(key = lambda e : e[1][1], reverse = True)
+               #sys.stderr.write(sys.argv[0] + " : After recurse, options are " + str(opts) + "\n")
+
+               self.depth -= 1
+               return list(opts[0])
+
+               
+
+       # Returns [x,y] of selected piece
+       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]
+       
+       # Returns [x,y] of square to move selected piece into
+       def get_move(self):
+               #sys.stderr.write("Choice is " + str(self.choice) + "\n")
+               self.choice.selected_moves = self.choice.last_moves
+               moves = self.prioritise_moves(self.choice)
+               if len(moves) > 0:
+                       return moves[0][0]
+               else:
+                       return InternalAgent.get_move(self)
+
+# --- agent_bishop.py --- #
 import multiprocessing
 
 # Hacky alternative to using select for timing out players
 
 # WARNING: Do not wrap around HumanPlayer or things breakify
+# WARNING: Do not use in general or things breakify
 
 class Sleeper(multiprocessing.Process):
        def __init__(self, timeout):
@@ -734,7 +964,7 @@ def TimeoutFunction(function, args, timeout):
                elif not s.is_alive():
                        w.terminate()
                        s.join()
-                       raise Exception("UNRESPONSIVE")
+                       raise Exception("TIMEOUT")
 
        
                
@@ -969,6 +1199,144 @@ class StoppableThread(threading.Thread):
        def stopped(self):
                return self._stop.isSet()
 # --- thread_util.py --- #
+log_file = None
+import datetime
+import urllib2
+
+class LogFile():
+       def __init__(self, log):        
+               
+               self.log = log
+               self.logged = []
+               self.log.write("# Log starts " + str(datetime.datetime.now()) + "\n")
+
+       def write(self, s):
+               now = datetime.datetime.now()
+               self.log.write(str(now) + " : " + s + "\n")
+               self.logged.append((now, s))
+
+       def setup(self, board, players):
+               
+               for p in players:
+                       self.log.write("# " + p.colour + " : " + p.name + "\n")
+               
+               self.log.write("# Initial board\n")
+               for x in range(0, w):
+                       for y in range(0, h):
+                               if board.grid[x][y] != None:
+                                       self.log.write(str(board.grid[x][y]) + "\n")
+
+               self.log.write("# Start game\n")
+
+       def close(self):
+               self.log.write("# EOF\n")
+               self.log.close()
+
+class HttpLog(LogFile):
+       def __init__(self, file_name):
+               LogFile.__init__(self, open(file_name, "w", 0))
+               self.file_name = file_name
+               self.phase = 0
+
+       def write(self, s):
+               now = datetime.datetime.now()
+               self.logged.append((now, s))
+               
+               if self.phase == 0:
+                       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)
+
+               elif self.phase == 1:
+                       for message in self.logged[len(self.logged)-2:]:
+                               self.log.write(str(message[0]) + " : " + message[1] + "\n")
+
+               self.phase = (self.phase + 1) % 2               
+               
+       def close(self):
+               self.log.write("# EOF\n")
+               self.log.close()
+               
+
+class HeadRequest(urllib2.Request):
+       def get_method(self):
+               return "HEAD"
+
+class HttpGetter(StoppableThread):
+       def __init__(self, address):
+               StoppableThread.__init__(self)
+               self.address = address
+               self.log = urllib2.urlopen(address)
+               self.lines = []
+               self.lock = threading.RLock() #lock for access of self.state
+               self.cond = threading.Condition() # conditional
+
+       def run(self):
+               while not self.stopped():
+                       line = self.log.readline()
+                       if line == "":
+                               date_mod = datetime.datetime.strptime(self.log.headers['last-modified'], "%a, %d %b %Y %H:%M:%S GMT")
+                               self.log.close()
+       
+                               next_log = urllib2.urlopen(HeadRequest(self.address))
+                               date_new = datetime.datetime.strptime(next_log.headers['last-modified'], "%a, %d %b %Y %H:%M:%S GMT")
+                               while date_new <= date_mod and not self.stopped():
+                                       next_log = urllib2.urlopen(HeadRequest(self.address))
+                                       date_new = datetime.datetime.strptime(next_log.headers['last-modified'], "%a, %d %b %Y %H:%M:%S GMT")
+                               if self.stopped():
+                                       break
+
+                               self.log = urllib2.urlopen(self.address)
+                               line = self.log.readline()
+
+                       self.cond.acquire()
+                       self.lines.append(line)
+                       self.cond.notifyAll()
+                       self.cond.release()
+
+                       #sys.stderr.write(" HttpGetter got \'" + str(line) + "\'\n")
+
+               self.log.close()
+                               
+                               
+       
+               
+               
+class HttpReplay():
+       def __init__(self, address):
+               self.getter = HttpGetter(address)
+               self.getter.start()
+               
+       def readline(self):
+               self.getter.cond.acquire()
+               while len(self.getter.lines) == 0:
+                       self.getter.cond.wait()
+                       
+               result = self.getter.lines[0]
+               self.getter.lines = self.getter.lines[1:]
+               self.getter.cond.release()
+
+               return result
+                       
+                       
+       def close(self):
+               self.getter.stop()
+                                               
+def log(s):
+       if log_file != None:
+               log_file.write(s)
+               
+
+def log_init(board, players):
+       if log_file != None:
+               log_file.setup(board, players)
+
+# --- log.py --- #
+
+
+
+       
 
 # A thread that runs the game
 class GameThread(StoppableThread):
@@ -981,6 +1349,8 @@ class GameThread(StoppableThread):
                self.lock = threading.RLock() #lock for access of self.state
                self.cond = threading.Condition() # conditional for some reason, I forgot
                self.final_result = ""
+               
+               
 
        # Run the game (run in new thread with start(), run in current thread with run())
        def run(self):
@@ -1007,6 +1377,7 @@ class GameThread(StoppableThread):
                                                p2.update(result) # Inform players of what happened
 
 
+                                       log(result)
 
                                        target = self.board.grid[x][y]
                                        if isinstance(graphics, GraphicsThread):
@@ -1035,9 +1406,15 @@ class GameThread(StoppableThread):
                                        if self.stopped():
                                                break
 
-                                       result = self.board.update_move(x, y, x2, y2)
+                                       result = str(x) + " " + str(y) + " -> " + str(x2) + " " + str(y2)
+                                       log(result)
+
+                                       self.board.update_move(x, y, x2, y2)
+                                       
                                        for p2 in self.players:
-                                               p2.update(str(x) + " " + str(y) + " -> " + str(x2) + " " + str(y2)) # Inform players of what happened
+                                               p2.update(result) # Inform players of what happened
+
+                                                                               
 
                                        if isinstance(graphics, GraphicsThread):
                                                with graphics.lock:
@@ -1081,10 +1458,164 @@ class GameThread(StoppableThread):
                for p2 in self.players:
                        p2.quit(self.final_result)
 
-               graphics.stop()
+               log(self.final_result)
+
+               if isinstance(graphics, GraphicsThread):
+                       graphics.stop()
 
        
+# A thread that replays a log file
+class ReplayThread(GameThread):
+       def __init__(self, players, src, end=False,max_lines=None):
+               self.board = Board(style="empty")
+               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] == "#":
+                               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
+                       
+                       try:
+                               target.choice = types.index(current_type)
+                       except:
+                               target.choice = -1
+
+                       pieces[tokens[0]].append(target)
+                       if target.current_type == "king":
+                               king[tokens[0]] = target
+                       grid[x][y] = target
+               
+                       line = self.src.readline().strip(" \r\n")
 
+               self.board.pieces = pieces
+               self.board.king = king
+               self.board.grid = grid
+
+               # Update the player's boards
+       
+       def run(self):
+               move_count = 0
+               line = self.src.readline().strip(" \r\n")
+               while line != "# EOF":
+                       if self.stopped():
+                               break
+
+                                       
+
+                       if line[0] == '#':
+                               line = self.src.readline().strip(" \r\n")
+                               continue
+
+                       tokens = line.split(" ")
+                       if tokens[0] == "white" or tokens[0] == "black":
+                               self.reset_board(line)
+                               line = self.src.readline().strip(" \r\n")
+                               continue
+
+                       move = line.split(":")
+                       move = move[len(move)-1].strip(" \r\n")
+                       tokens = move.split(" ")
+                       
+                       
+                       try:
+                               [x,y] = map(int, tokens[0:2])
+                       except:
+                               self.stop()
+                               break
+
+                       log(move)
+
+                       target = self.board.grid[x][y]
+                       with self.lock:
+                               if target.colour == "white":
+                                       self.state["turn"] = self.players[0]
+                               else:
+                                       self.state["turn"] = self.players[1]
+                       
+                       move_piece = (tokens[2] == "->")
+                       if move_piece:
+                               [x2,y2] = map(int, tokens[len(tokens)-2:])
+
+                       if isinstance(graphics, GraphicsThread):
+                               with graphics.lock:
+                                       graphics.state["select"] = target
+                                       
+                       if not move_piece:
+                               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)
+                                       time.sleep(turn_delay)
+                       else:
+                               self.board.update_move(x, y, x2, y2)
+                               if isinstance(graphics, GraphicsThread):
+                                       with graphics.lock:
+                                               graphics.state["moves"] = [[x2,y2]]
+                                       time.sleep(turn_delay)
+                                       with graphics.lock:
+                                               graphics.state["select"] = None
+                                               graphics.state["moves"] = None
+                                               graphics.state["dest"] = None
+                       
+
+                       
+                       
+                       
+                       for p in self.players:
+                               p.update(move)
+
+                       line = self.src.readline().strip(" \r\n")
+                       
+                       
+                                       
+                                       
+                                               
+                                               
+
+                       
+                                       
+
+
+                       
+
+                               
+                       
+
+               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:
+                       global game
+                       game = GameThread(self.board, self.players)
+                       game.run()
+               
+
+               
 
 def opponent(colour):
        if colour == "white":
@@ -1092,7 +1623,10 @@ def opponent(colour):
        else:
                return "white"
 # --- game.py --- #
-import pygame
+try:
+       import pygame
+except:
+       pass
 import os
 
 # Dictionary that stores the unicode character representations of the different pieces
@@ -1144,13 +1678,12 @@ def load_images(image_dir=os.path.join(os.path.curdir, "data", "images")):
                        images[c].update({p : pygame.image.load(os.path.join(image_dir, c + "_" + p + ".png"))})
                        small_images[c].update({p : pygame.image.load(os.path.join(image_dir, c + "_" + p + "_small.png"))})
 # --- images.py --- #
-import pygame
-
-
-
-
-
-
+graphics_enabled = True
+try:
+       import pygame
+except:
+       graphics_enabled = False
+       
 
 
 
@@ -1175,7 +1708,7 @@ class GraphicsThread(StoppableThread):
                #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)
+               #load_images()
                create_images(grid_sz)
 
                """
@@ -1513,38 +2046,51 @@ class GraphicsThread(StoppableThread):
                        if choice == 0:
                                players.append(HumanPlayer("human", colour))
                        elif choice == 1:
-                               if True:
-                                       import Tkinter
-                                       from tkFileDialog import askopenfilename
-                                       root = Tkinter.Tk() # Need a root to make Tkinter behave
-                                       root.withdraw() # Some sort of magic incantation
-                                       path = askopenfilename(parent=root, initialdir="../agents",title=
-'Choose an agent.')
-                                       if path == "":
-                                               return self.SelectPlayers()
-                                       players.append(make_player(path, colour))       
+                               import inspect
+                               internal_agents = inspect.getmembers(sys.modules[__name__], inspect.isclass)
+                               internal_agents = [x for x in internal_agents if issubclass(x[1], InternalAgent)]
+                               internal_agents.remove(('InternalAgent', InternalAgent)) 
+                               if len(internal_agents) > 0:
+                                       choice2 = self.SelectButton(["internal", "external"], prompt="Type of agent")
                                else:
-                                       print "Exception was " + str(e.message)
-                                       p = None
-                                       while p == None:
-                                               self.board.display_grid(self.window, self.grid_sz)
-                                               pygame.display.flip()
-                                               path = self.getstr(prompt = "Enter path:")
-                                               if path == None:
-                                                       return None
+                                       choice2 = 1
 
+                               if choice2 == 0:
+                                       agent = internal_agents[self.SelectButton(map(lambda e : e[0], internal_agents), prompt="Choose internal agent")]
+                                       players.append(agent[1](agent[0], colour))                                      
+                               elif choice2 == 1:
+                                       try:
+                                               import Tkinter
+                                               from tkFileDialog import askopenfilename
+                                               root = Tkinter.Tk() # Need a root to make Tkinter behave
+                                               root.withdraw() # Some sort of magic incantation
+                                               path = askopenfilename(parent=root, initialdir="../agents",title=
+'Choose an agent.')
                                                if path == "":
                                                        return self.SelectPlayers()
-
-                                               try:
-                                                       p = make_player(path, colour)
-                                               except:
+                                               players.append(make_player(path, colour))       
+                                       except:
+                                               
+                                               p = None
+                                               while p == None:
                                                        self.board.display_grid(self.window, self.grid_sz)
                                                        pygame.display.flip()
-                                                       self.message("Invalid path!")
-                                                       time.sleep(1)
-                                                       p = None
-                                       players.append(p)
+                                                       path = self.getstr(prompt = "Enter path:")
+                                                       if path == None:
+                                                               return None
+       
+                                                       if path == "":
+                                                               return self.SelectPlayers()
+       
+                                                       try:
+                                                               p = make_player(path, colour)
+                                                       except:
+                                                               self.board.display_grid(self.window, self.grid_sz)
+                                                               pygame.display.flip()
+                                                               self.message("Invalid path!")
+                                                               time.sleep(1)
+                                                               p = None
+                                               players.append(p)
                        elif choice == 2:
                                address = ""
                                while address == "":
@@ -1602,9 +2148,29 @@ def make_player(name, colour):
                        if len(s) > 1:
                                address = s[1]
                        return NetworkReceiver(colour, address)
+               if s[0] == "internal":
+
+                       import inspect
+                       internal_agents = inspect.getmembers(sys.modules[__name__], inspect.isclass)
+                       internal_agents = [x for x in internal_agents if issubclass(x[1], InternalAgent)]
+                       internal_agents.remove(('InternalAgent', InternalAgent)) 
+                       
+                       if len(s) != 2:
+                               sys.stderr.write(sys.argv[0] + " : '@internal' should be followed by ':' and an agent name\n")
+                               sys.stderr.write(sys.argv[0] + " : Choices are: " + str(map(lambda e : e[0], internal_agents)) + "\n")
+                               return None
+
+                       for a in internal_agents:
+                               if s[1] == a[0]:
+                                       return a[1](name, colour)
+                       
+                       sys.stderr.write(sys.argv[0] + " : Can't find an internal agent matching \"" + s[1] + "\"\n")
+                       sys.stderr.write(sys.argv[0] + " : Choices are: " + str(map(lambda e : e[0], internal_agents)) + "\n")
+                       return None
+                       
 
        else:
-               return AgentPlayer(name, colour)
+               return ExternalAgent(name, colour)
                        
 
 
@@ -1620,13 +2186,21 @@ def main(argv):
        global agent_timeout
        global log_file
        global src_file
+       global graphics_enabled
+       global always_reveal_states
 
-
-
+       max_lines = None
+       src_file = None
        
        style = "quantum"
        colour = "white"
-       graphics_enabled = True
+
+       # Get the important warnings out of the way
+       if platform.system() == "Windows":
+               sys.stderr.write(sys.argv[0] + " : Warning - You are using " + platform.system() + "\n")
+               if platform.release() == "Vista":
+                       sys.stderr.write(sys.argv[0] + " : God help you.\n")
+       
 
        players = []
        i = 0
@@ -1634,7 +2208,11 @@ def main(argv):
                i += 1
                arg = argv[i]
                if arg[0] != '-':
-                       players.append(make_player(arg, colour))
+                       p = make_player(arg, colour)
+                       if not isinstance(p, Player):
+                               sys.stderr.write(sys.argv[0] + " : Fatal error creating " + colour + " player\n")
+                               return 100
+                       players.append(p)
                        if colour == "white":
                                colour = "black"
                        elif colour == "black":
@@ -1648,20 +2226,34 @@ def main(argv):
                        style = "classical"
                elif arg[1] == '-' and arg[2:] == "quantum":
                        style = "quantum"
+               elif arg[1] == '-' and arg[2:] == "reveal":
+                       always_reveal_states = True
                elif (arg[1] == '-' and arg[2:] == "graphics"):
                        graphics_enabled = not graphics_enabled
                elif (arg[1] == '-' and arg[2:].split("=")[0] == "file"):
                        # Load game from file
                        if len(arg[2:].split("=")) == 1:
-                               src_file = sys.stdout
+                               src_file = sys.stdin
                        else:
-                               src_file = arg[2:].split("=")[1]
+                               f = arg[2:].split("=")[1]
+                               if f[0] == '@':
+                                       src_file = HttpReplay("http://" + f.split(":")[0][1:])
+                               else:
+                                       src_file = open(f.split(":")[0], "r", 0)
+
+                               if len(f.split(":")) == 2:
+                                       max_lines = int(f.split(":")[1])
+
                elif (arg[1] == '-' and arg[2:].split("=")[0] == "log"):
                        # Log file
                        if len(arg[2:].split("=")) == 1:
-                               log_file = sys.stdout
+                               log_file = LogFile(sys.stdout)
                        else:
-                               log_file = arg[2:].split("=")[1]
+                               f = arg[2:].split("=")[1]
+                               if f[0] == '@':
+                                       log_file = HttpLog(f[1:])
+                               else:
+                                       log_file = LogFile(open(f, "w", 0))
                elif (arg[1] == '-' and arg[2:].split("=")[0] == "delay"):
                        # Delay
                        if len(arg[2:].split("=")) == 1:
@@ -1683,13 +2275,35 @@ def main(argv):
 
 
        # Create the board
-       board = Board(style)
+       
+       # Construct a GameThread! Make it global! Damn the consequences!
+                       
+       if src_file != None:
+               # Hack to stop ReplayThread from exiting
+               #if len(players) == 0:
+               #       players = [HumanPlayer("dummy", "white"), HumanPlayer("dummy", "black")]
+
+               # Normally the ReplayThread exits if there are no players
+               # TODO: Decide which behaviour to use, and fix it
+               end = (len(players) == 0)
+               if end:
+                       players = [Player("dummy", "white"), Player("dummy", "black")]
+               elif len(players) != 2:
+                       sys.stderr.write(sys.argv[0] + " : Usage " + sys.argv[0] + " white black\n")
+                       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)
+       else:
+               board = Board(style)
+               game = GameThread(board, players) 
+
 
 
        # Initialise GUI
        if graphics_enabled == True:
                try:
-                       graphics = GraphicsThread(board, grid_sz = [64,64]) # Construct a GraphicsThread!
+                       graphics = GraphicsThread(game.board, grid_sz = [64,64]) # Construct a GraphicsThread!
 
                except Exception,e:
                        graphics = None
@@ -1732,37 +2346,66 @@ def main(argv):
 
        
        # If using windows, select won't work; use horrible TimeoutPlayer hack
-       if agent_timeout > 0 and platform.system() == "Windows":
-               sys.stderr.write(sys.argv[0] + " : Warning - You are using Windows\n")
-               sys.stderr.write(sys.argv[0] + " :         - Timeouts will be implemented with a terrible hack.\n")
+       if agent_timeout > 0:
+               if platform.system() == "Windows":
+                       for i in range(len(players)):
+                               if isinstance(players[i], ExternalAgent) or isinstance(players[i], InternalAgent):
+                                       players[i] = TimeoutPlayer(players[i], agent_timeout)
 
-               for i in range(len(players)):
-                       if isinstance(players[i], AgentPlayer):
-                               players[i] = TimeoutPlayer(players[i], agent_timeout)
+               else:
+                       warned = False
+                       # InternalAgents get wrapped to an ExternalAgent when there is a timeout
+                       # This is not confusing at all.
+                       for i in range(len(players)):
+                               if isinstance(players[i], InternalAgent):
+                                               players[i] = ExternalWrapper(players[i])
 
-       # Could potentially wrap TimeoutPlayer around internal classes...
-       # But that would suck
 
                
-                       
 
 
-       # Construct a GameThread! Make it global! Damn the consequences!
-       game = GameThread(board, players) 
 
 
+       log_init(game.board, players)
+       
        
        if graphics != None:
                game.start() # This runs in a new thread
                graphics.run()
-               game.join()
-               return game.error + graphics.error
+               if game.is_alive():
+                       game.join()
+       
+
+               error = game.error + graphics.error
        else:
                game.run()
-               return game.error
+               error = game.error
+       
+
+       if log_file != None and log_file != sys.stdout:
+               log_file.close()
+
+       if src_file != None and src_file != sys.stdin:
+               src_file.close()
+
+       return error
 
 # This is how python does a main() function...
 if __name__ == "__main__":
-       sys.exit(main(sys.argv))
+       try:
+               sys.exit(main(sys.argv))
+       except KeyboardInterrupt:
+               sys.stderr.write(sys.argv[0] + " : Got KeyboardInterrupt. Stopping everything\n")
+               if isinstance(graphics, StoppableThread):
+                       graphics.stop()
+                       graphics.run() # Will clean up graphics because it is stopped, not run it (a bit dodgy)
+
+               if isinstance(game, StoppableThread):
+                       game.stop()
+                       if game.is_alive():
+                               game.join()
+
+               sys.exit(102)
+
 # --- main.py --- #
-# EOF - created from make on Mon Jan 28 22:52:28 WST 2013
+# EOF - created from make on Wed Jan 30 21:00:29 WST 2013

UCC git Repository :: git.ucc.asn.au