Diana Changeset - 2ed7f0dab5ef

Changeset - 2ed7f0dab5ef

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Laman - 8 years ago 2017-01-22 22:40:14

expanding compressed game trees

4 files changed with 85 insertions and 58 deletions:

src/sgfParser/collection.py

src/sgfParser/node.py

src/sgfParser/property.py

src/tests/testSgfParser.py

0 comments (0 inline, 0 general)

src/sgfParser/collection.py

➞

Show inline comments

@@ @@ -21,25 +21,25 @@ class Collection: @@
 class GameTree:
 	def __init__(self):
 		self.nodes=[]
 		self.branches=[]
 	@staticmethod
 	def create(s,start):
 		res=GameTree()
 		i=skipWhitespace(s,start)
 		if i>=len(s) or s[i]!="(":
 			# print("error when parsing GameTree")
 			return (start,None)
-		i,x=Node.create(s,start+1)
+		i,x=Node.create(s,i+1)
 		if x is None:
 			# print("error when parsing GameTree")
 			return (i,None)
 		y=None
 		while x is not None:
 			res.nodes.append(x)
 			if y: y.addChild(x)
 			x.setParent(y)
 			y=x
 			i=skipWhitespace(s,i)
 			i,x= Node.create(s, i)
 		i=skipWhitespace(s,i)
@@ @@ -58,29 +58,34 @@ class GameTree: @@
 		return (i+1,res)
 	## Expand multiple games into distinct GameTrees and yield each.
 	def listGames(self):
 		for node in self._listGINodes():
 			yield self._buildSubtree(node)
 	def getNode(self,i):
 		if 0<=i<len(self.nodes):
 			return self.nodes[i]
 		return None
-	## Create and return a new GameTree containing the provided Node.
+	## Create and return a new game tree containing the provided Node.
+	#
 	# The Node objects are shared between the trees, not copied.
 	def _buildSubtree(self,node):
 		res=GameTree()
 	# Ancestor nodes are copied, descendants are taken directly.
 	def _buildSubtree(self,seedNode):
 		node=seedNode.copy()
 		return res
 		# chci celou cestu ke kořeni a všechny podstromy nodu
 		while node.parent:
 			newNode=node.parent.copy()
 			node.parent=newNode
 			newNode.setChildren([node])
 			node=newNode
 		return node
 	## Find and yield Game Info nodes.
 	def _listGINodes(self):
 		for node in self.nodes:
 			if node.isGINode():
 				yield node
 		for tree in self.branches:
 			for node in tree._listGINodes():
 				yield node

src/sgfParser/node.py

➞

Show inline comments

 from . import skipWhitespace, ParserError
 from .property import Property, GAME_INFO
 class Node:
 	def __init__(self):
 		self.properties=dict()
 		self._parent=None
 		self._children=[]
 		self.parent=None
 		self.children=[]
 	@staticmethod
 	def create(s,start):
 		res=Node()
 		if s[start]!=";":
 			# print("error when parsing Node")
 			return (start,None)
 		i=skipWhitespace(s,start+1)
 		i,x=Property.create(s,start+1)
 		while x is not None:
 			if x.name in res.properties:
 				print(res.properties)
@@ @@ -25,35 +25,46 @@ class Node: @@
 			i=skipWhitespace(s,i)
 			i,x=Property.create(s,i)
 		return (i,res)
 	def isGINode(self):
 		return any(prop.type==GAME_INFO for prop in self.properties.values())
 	def setProperty(self,name,value):
 		self.properties[name]=value
 		# zkontrolovat typ value
 	def setParent(self,node):
 		self._parent=node
 		self.parent=node
 	def setChildren(self,children):
 		self.children=children
 	def addChild(self,node):
 		if node in self._children: return node
 		self._children.append(node)
 		if node in self.children: return node
 		self.children.append(node)
 		return node
 	def removeChild(self,node):
-		if node not in self._children:
+		if node not in self.children:
 			return None
-		del self._children[self._children.index(node)]
+		del self.children[self.children.index(node)]
 		return node
 	def removeChildAt(self,i):
 		if -len(self._children)<i<len(self._children):
 			res=self._children[i]
 			del self._children[i]
 		if -len(self.children)<i<len(self.children):
 			res=self.children[i]
 			del self.children[i]
 			return res
 		return None
 	## Create a copy of the Node, with deep copied propeties and shallow copied parent and children.
 	def copy(self):
 		res=Node()
 		res.properties={k: v.copy() for (k,v) in self.properties.items()}
 		res.parent=self.parent
 		res.setChildren(self.children[:])
 		return res
 	def getProperty(self,name):
 		if name in self.properties: return self.properties[name]
 		else: return None

src/sgfParser/property.py

➞

Show inline comments

 import re
 GAME_INFO=1
 UNKNOWN=99
 class Property:
 	def __init__(self):
 		self.name=""
 		self.value=""
 	@staticmethod
 	def create(s,start):
 		res=Property()
 		i,x=Property.ident(s,start)
 		if x is None:
 			return (start,None)
 		res.name=x
 		i,x=PropValue.create(s,i,res.name)
 		if x is None:
 			print('error when parsing property "{0}" at position {1}'.format(res.name,i))
 			return (start,None)
 		res.value=x
 		return (i,res)
 	@staticmethod
 	def ident(s,start):
 		r=re.compile(r"[A-Z]+")
 		m=r.match(s,start)
 		if m is None: return (start,None)
 		return (m.end(),m.group())
 	@property
 	def type(self):
 		gameInfo={"AN","BR","BT","CP","DT","EV","GN","GC","ON","OT","PB","PC","PW","RE","RO","RU","SO","TM","US","WR","WT"}
 		if self.name in gameInfo: return GAME_INFO
 		else: return UNKNOWN
 def choose(*vTypes):
 	def f(s,start):
 		for vType in vTypes:
 			i,x=vType(s,start)
 			if x is not None: return (i,x)
 		return (start,None)
 	return f
 def singleton(vType):
 	def f(s,start):
 		if s[start]!="[":
@@ @@ -140,54 +107,89 @@ def text(simple=True,composed=False): @@
 def empty(s,start): return (start,"")
 def anything(s,start):
 	esc=False
 	for i,c in enumerate(s[start:],start):
 		if esc: esc=False
 		elif c=="\\": esc=True
 		elif c=="]": break
 	return (i,s[start:i])
 # go specific
 def point(s,start):
 	r=re.compile(r"[a-zA-Z]{2}|") # !! limit to board size
 	m=r.match(s,start)
 	if m is None: return (start,None)
 	if m.group(0)=="": # pass, !! tt
 		return (m.end(),tuple())
 	col=m.group(0)[0]
 	row=m.group(0)[1]
 	col=ord(col) - (ord("a") if "a"<=col<="z" else ord("A")-26)
 	row=ord(row) - (ord("a") if "a"<=row<="z" else ord("A")-26)
 	return (m.end(),(col,row))
 move=point
 stone=point
-class PropValue:
+class Property:
 	def __init__(self):
 		self.type=""
 		self.value=None
 		self.name=""
 		self.value=""
 	@staticmethod
 	def create(s,start,name):
 		if name in PropValue.patterns:
 			return PropValue.patterns[name](s,start)
 	def create(s,start):
 		res=Property()
 		i,x=Property.ident(s,start)
 		if x is None:
 			return (start,None)
 		res.name=x
 		i,x=Property.createValue(s,i,res.name)
 		if x is None:
 			print('error when parsing property "{0}" at position {1}'.format(res.name,i))
 			return (start,None)
 		res.value=x
 		return (i,res)
 	@staticmethod
 	def ident(s,start):
 		r=re.compile(r"[A-Z]+")
 		m=r.match(s,start)
 		if m is None: return (start,None)
 		return (m.end(),m.group())
 	@staticmethod
 	def createValue(s,start,name):
 		if name in Property.patterns:
 			return Property.patterns[name](s,start)
 		else:
 			print('warning, unknown property "{0}" at position {1}'.format(name,start))
 			return singleton(anything)(s,start)
 	@property
 	def type(self):
 		gameInfo={"AN","BR","BT","CP","DT","EV","GN","GC","ON","OT","PB","PC","PW","RE","RO","RU","SO","TM","US","WR","WT"}
 		if self.name in gameInfo: return GAME_INFO
 		else: return UNKNOWN
 	def copy(self):
 		res=Property()
 		res.name=self.name
 		# !! wouldn't work for listOf(listOf())
 		res.value=self.value if not isinstance(self.value,list) else self.value[:]
 		return res
 	patterns={
 		"B":singleton(move),
 		"KO":singleton(empty),
 		"MN":singleton(number),
 		"W":singleton(move),
 		"AB":listOf(stone), #
 		"AE":listOf(point), #
 		"AW":listOf(stone), #
 		"PL":singleton(color),
 		"C":singleton(text(simple=False)),
 		"DM":singleton(double),
 		"GB":singleton(double),
@@ @@ -243,14 +245,13 @@ class PropValue: @@
 		"FG":choose(singleton(empty),singleton(compose(number,text()))), #
 		"PM":singleton(number),
 		"VW":listOf(point,allowEmpty=True), #
 		# go specific
 		"HA":singleton(number),
 		"KM":singleton(real),
 		"TB":listOf(point,allowEmpty=True),
 		"TW":listOf(point,allowEmpty=True)
+	}
 # TODO:
 # date
 # !! TODO: date

src/tests/testSgfParser.py

➞

Show inline comments

@@ @@ -11,24 +11,34 @@ dataDir=os.path.join(os.path.dirname(__f @@
 class TestProperty(TestCase):
 	def testName(self):
 		self.assertEqual(Property.create("[99]",0), (0,None))
 		self.assertEqual(Property.create("99[99]",0), (0,None))
 		i,prop=Property.create("MN[99]",0)
 		self.assertNotEqual((i,prop), (0,None))
 		self.assertEqual((i,prop.name), (6,"MN"))
 class TestCollection(TestCase):
 	def testSubtrees(self):
 		c=Collection("""
 (;B[aa]
 	(;W[ab]PB[Some Black]PW[Some White];B[ac])
 	(;W[bb]PB[Other Black]PW[Other White])
 )""")
 		games=list(c.listGames())
 		self.assertEqual(len(games),2)
 	def testEmptySgf(self):
 		Collection("(;)")
 	def testSimpleSgf(self):
 		with open(os.path.join(dataDir, "simple.sgf")) as f:
 			Collection(f.read())
 	def testComplexSgf(self):
 		with open(os.path.join(dataDir, "kogos.sgf")) as f:
 			Collection(f.read())
 if __name__ == '__main__':

0 comments (0 inline, 0 general)