Changeset - 32221aadca28
[Not reviewed]
default
0 3 1
Laman - 7 years ago 2017-12-15 20:10:12

optimized board hashing: computing only hash diff
4 files changed with 35 insertions and 13 deletions:
0 comments (0 inline, 0 general)
src/benchmark.py
Show inline comments
 
new file 100644
 
import cProfile
 

	
 
from tests.testEngine import TestTransitions
 

	
 

	
 
t=TestTransitions()
 

	
 
cProfile.run(r"""
 
t.testReal()
 
""")
src/go/core.py
Show inline comments
 
import logging as log
 

	
 
from util import EMPTY,BLACK,WHITE, colorNames,hashBoard
 
from util import EMPTY,BLACK,WHITE, colorNames,hashBoard,diffHash
 
from .helperboard import HelperBoard
 
from .gamerecord import GameRecord
 

	
 

	
 
class Go:
 
	## Initializes self.board to a list[r][c]=EMPTY.
 
	def __init__(self,boardSize=19):
 
		self.boardSize=boardSize
 
		self.board=[[EMPTY]*boardSize for x in range(boardSize)]
 
		self.toMove=BLACK
 
		self._helper=HelperBoard(self.board)
 
		self._hashes=[]
 
		self._freshHash=hashBoard(self.board) # always reflecting current state of the board
 
		self._hashes=[self._freshHash]
 
		self._record=GameRecord()
 

	
 
	## Executes a move.
 
	#
 
	#  Doesn't check for kos. Suicide not allowed.
 
	#
 
	#  @param color BLACK or WHITE
 
	#  @return True on success, False on failure (illegal move)
 
	def doMove(self,color,row,col):
 
	def doMove(self,color,r,c):
 
		if color!=self.toMove: log.warning("move by %s out of order",colorNames[color])
 
		if self.board[row][col]!=EMPTY: return False
 
		if self.board[r][c]!=EMPTY: return False
 

	
 
		self.board[row][col]=color
 
		self.board[r][c]=color
 
		self._freshHash^=diffHash(r,c,EMPTY,color)
 

	
 
		# capture neighbors
 
		for r,c in ((-1,0),(1,0),(0,-1),(0,1)):
 
		for dr,dc in ((-1,0),(1,0),(0,-1),(0,1)):
 
			self._helper.clear()
 
			if not self._helper.floodFill(-color,row+r,col+c,EMPTY): self._remove()
 
			if not self._helper.floodFill(-color,r+dr,c+dc,EMPTY): self._remove()
 

	
 
		# check for suicide and prevent it
 
		self._helper.clear()
 
		if not self._helper.floodFill(color,row,col,EMPTY):
 
			self.board[row][col]=EMPTY
 
		if not self._helper.floodFill(color,r,c,EMPTY):
 
			self.board[r][c]=EMPTY
 
			self._freshHash=self._hashes[-1]
 
			return False
 
		self._record.move(color,row,col)
 
		self._record.move(color,r,c)
 
		self.toMove=-1*color
 
		self._hashes.append(self.hash())
 
		self._hashes.append(self._freshHash)
 
		return True
 

	
 
	def undoMove(self,r,c,captures):
 
		assert self.board[r][c]==-1*self.toMove, "{0}!={1}".format(self.board[r][c],-1*self.toMove)
 

	
 
		if len(captures)>0:
 
			self._helper.clear()
 
			for (ri,ci) in captures:
 
				self._helper.floodFill(EMPTY,ri,ci)
 
			self._fill(self.toMove)
 

	
 
		self.board[r][c]=EMPTY
 
		self.toMove*=-1
 
		self._hashes.pop()
 
		self._freshHash=self._hashes[-1]
 

	
 
	def transitionMove(self,board):
 
		res=transitionMove(self.board,board)
 
		if not res: return res
 
		(r,c,color)=res
 
		return self.doMove(color,r,c)
 

	
 
	def load(self,board):
 
		for (r,row) in enumerate(board):
 
			for (c,x) in enumerate(row):
 
				self.board[r][c]=x
 
		self._freshHash=hashBoard(self.board)
 
		self._hashes=[self._freshHash]
 

	
 
	def hash(self):
 
		return hashBoard(self.board)
 
		return self._hashes[-1]
 

	
 
	## Removes stones at coordinates marked with True in self.helper.
 
	def _remove(self):
 
		self._fill(EMPTY)
 

	
 
	def _fill(self,filling):
 
		for (r,c) in self._helper.getContinuousArea():
 
			self._freshHash^=diffHash(r,c,self.board[r][c],filling)
 
			self.board[r][c]=filling
 

	
 

	
 
def isLegalPosition(board):
 
	boardSize=len(board)
 
	temp=[[None]*boardSize for x in range(boardSize)]
 

	
 
	for r in range(boardSize):
 
		for c in range(boardSize):
 
			if board[r][c]==EMPTY: continue
 
			if temp[r][c]: continue
 
			if not dfs([(r,c)],board,temp): return False
 
	return True
 

	
 

	
 
def transitionMove(state1,state2):
 
	moves=[]
 
	for (r,(row1,row2)) in enumerate(zip(state1,state2)):
 
		for (c,(item1,item2)) in enumerate(zip(row1,row2)):
 
			if item1==EMPTY and item2!=EMPTY:
 
				moves.append((r,c,item2))
 

	
 
	if len(moves)==0:
 
		log.info("no new stone")
 
		return None
 
	elif len(moves)==1:
 
		log.info("new stone: %s",moves[0])
 
		return moves[0]
 
	else:
 
		log.warning("too many new stones: %s",moves)
 
		return False
 

	
 

	
 
def dfs(stack,board,mask):
 
	boardSize=len(board)
 
	(r,c)=stack[0]
 
	color=board[r][c]
 

	
 
	while len(stack)>0:
 
		(r,c)=stack.pop()
 
		if board[r][c]==EMPTY: return True
 
		elif board[r][c]!=color: continue
 
		elif mask[r][c]: return True
 
		mask[r][c]=True
 
		for (x,y) in ((0,-1),(-1,0),(0,1),(1,0)):
 
			if 0<=r+y<boardSize and 0<=c+x<boardSize:
 
				stack.append((r+y,c+x))
 
	return False
src/statebag.py
Show inline comments
 
"""Theory:
 
We have a sequence S of valid board states s_1, ..., s_n.
 
We search for a picked subsequence S_p of length k and m additional moves M such that:
 
- S_p augmented by M forms a valid sequence of moves
 
- k-m is maximal for S_p picked from S
 
It is relatively cheap to add new items to S.
 

	
 
User can change detector parameters, presumably in case the previous don't fit the (current) situation.
 
In such a case we assume the new parameters are correct from the current position onwards.
 
But the change might have been appropriate even earlier (before the user detected and fixed an error).
 
So we try to find the correct crossover point like this:
 
- construct a sequence S' = s'_i, ..., s'_n by reanalyzing the positions with a new set of parameters, where s_i is the point of previous user intervention or s_0
 
- for each s'_j:
 
	- try to append it to S[:j]
 
	- try to append it to S'[:j]
 
	- remember the better variant
 
- linearize the fork back by discarding s'_j-s preceding the crossover and s_j-s following the crossover
 
"""
 
from util import EMPTY, hashBoard,exportBoard
 
from go.engine import transitionSequence
 

	
 

	
 
## Crude lower bound on edit distance between states.
 
def estimateDistance(diff):
 
	# lot of room for improvements
 
	additions=sum(1 for d in diff if d[2]=="+")
 
	deletions=sum(1 for d in diff if d[2]=="-")
 
	replacements=len(diff)-additions-deletions
 
	if additions>0: return additions+replacements
 
	elif replacements==0 and deletions>0: return 2 # take n, return 1
 
	return replacements+1 # ???
 

	
 

	
 
class BoardState:
 
	def __init__(self,board):
 
		self._board=tuple(tuple(x for x in row) for row in board)
 
		self.prev=None
 
		self._next=None
 
		self.moves=[]
 
		self.weight=0
 
		self.diff2Prev=None
 
		self._hash=None
 

	
 
	def hash(self):
 
		return hashBoard(self._board)
 
		if self._hash is None: self._hash=hashBoard(self._board)
 
		return self._hash
 

	
 
	def export(self):
 
		return exportBoard(self._board)
 

	
 
	def exportDiff(self,s2):
 
		return "vvv\n{0}\n=== {1} ===\n{2}\n^^^".format(self.export(), s2-self, s2.export())
 

	
 
	def __iter__(self): return iter(self._board)
 

	
 
	def __getitem__(self,key): return self._board[key]
 

	
 
	def __sub__(self,x):
 
		res=[]
 

	
 
		for (r,(row1,row2)) in enumerate(zip(self._board,x)):
 
			for (c,(item1,item2)) in enumerate(zip(row1,row2)):
 
				if item1==item2: continue
 
				elif item2==EMPTY: res.append((r,c,"+",item1))
 
				elif item1==EMPTY: res.append((r,c,"-",item2))
 
				else: res.append((r,c,"*",item1)) # ->to
 
		return res
 

	
 
	def __eq__(self,x):
 
		return self.hash()==x.hash()
 

	
 

	
 
class StateBag:
 
	def __init__(self):
 
		self._states=[]
 

	
 
	def pushState(self,board):
 
		sn=BoardState(board)
 
		if self._states and sn==self._states[-1]: return # no change
 

	
 
		for s in reversed(self._states):
 
			diff=sn-s
 
			distEst=estimateDistance(diff)
 
			if distEst>3: continue # we couldn't find every such move sequence anyway without a clever algorithm
 
			weightEst=s.weight-distEst
 
			if weightEst<=sn.weight: continue
 
			moves=transitionSequence(s,sn,diff)
 
			weight=s.weight-len(moves)
 
			if weight<=sn.weight: continue
 
			sn.prev=s
 
			sn.diff2Prev=diff
 
			sn.moves=moves
 
			sn.weight=weight
 
		self._states.append(sn)
 

	
 
	def merge(self,branch):
 
		pass
src/util.py
Show inline comments
 
import random
 
import multiprocessing
 
import logging as log
 

	
 

	
 
EMPTY=0
 
BLACK=1
 
WHITE=-1
 

	
 
colorNames={BLACK:"B",WHITE:"W"}
 

	
 

	
 
class MsgQueue:
 
	def __init__(self,handler=None):
 
		self._queue=multiprocessing.Queue()
 
		self._event=multiprocessing.Event()
 
		self._handleEvent=handler
 

	
 
	def send(self,actionName,args=tuple(),kwargs=None):
 
		if kwargs is None: kwargs=dict()
 
		self._queue.put((actionName,args,kwargs))
 
		self._event.set()
 

	
 
	def listen(self,handleEvent=None):
 
		if handleEvent is not None: self._handleEvent=handleEvent
 

	
 
		while True:
 
			self._event.wait()
 
			msg=self._queue.get()
 
			if self._queue.empty():
 
				self._event.clear()
 
			log.info(msg)
 
			if msg[0]=="!kill": break
 
			self._handleEvent(msg)
 

	
 
	def setHandler(self,handler):
 
		self._handleEvent=handler
 

	
 

	
 
rand=random.Random()
 
rand.seed(361)
 
zobristNums=tuple(
 
	tuple(
 
		tuple(rand.getrandbits(32) for i in range(3)) for c in range(19)
 
	) for r in range(19)
 
)
 

	
 
def hashBoard(board):
 
	res=0
 
	for (r,row) in enumerate(board):
 
		for (c,item) in enumerate(row):
 
			res^=zobristNums[r][c][item+1]
 
	return res
 

	
 
def diffHash(r,c,oldItem,newItem):
 
	h=zobristNums[r][c]
 
	return h[oldItem+1] ^ h[newItem+1]
 

	
 
def exportBoard(board):
 
	substitutions={EMPTY:".", BLACK:"X", WHITE:"O"}
 
	return "\n".join("".join(substitutions.get(x,"?") for x in row) for row in board)
0 comments (0 inline, 0 general)