Commit f337a3d

committed

Make LCA tie-breaking Aware of keyvalue pairs

Implements #31

1 parent 0cf7518 commit f337a3dCopy full SHA for f337a3d

File tree

+19

-6

lines changed

+19

-6

lines changed

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ def visit(self, node):`
`37`	`37`	`def get_depth(self, node):`
`38`	`38`	`return self.sequence[self.visits[node][0]][0]`
`39`	`39`
`40`		`- def __call__(self,first_node,second_node,include_depth = False):`
	`40`	`+ def __call__(self,first_node,second_node,only_depth = False,node_and_depth=True):`
`41`	`41`	`try :`
`42`	`42`	`x,y = self.visits[first_node]`
`43`	`43`	`w,v = self.visits[second_node]`
`@@ -52,9 +52,12 @@ def __call__(self,first_node,second_node,include_depth = False):`
`52`	`52`	`r = max(y,v)`
`53`	`53`
`54`	`54`	`ancestor = self.tree.query(l,r,"min")`
`55`		`- if include_depth:`
	`55`	`+ if node_and_depth:`
	`56`	`+ return ancestor`
	`57`	`+ elif only_depth:`
`56`	`58`	`return ancestor[0]`
`57`		`- return ancestor[1]`
	`59`	`+ else:`
	`60`	`+ return ancestor[1]`
`58`	`61`
`59`	`62`	`def get_field_with_respect_to(self,node,parent_node):`
`60`	`63`	`index = bisect.bisect_left(self.field_history[parent_node],(self.visits[node][0],))`

Lines changed: 13 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`from PythonVoiceCodingPlugin.library.LCA import LCA`
`4`	`4`	`from PythonVoiceCodingPlugin.library.level_info import LevelVisitor`
`5`		`-`
	`5`	`+fromPythonVoiceCodingPlugin.library.traverseimportmatch_node`
`6`	`6`
`7`	`7`
`8`	`8`
`@@ -21,8 +21,18 @@ def tiebreak_on_lca(root,origin,candidates):`
`21`	`21`	`TYPE: Description`
`22`	`22`	`"""`
`23`	`23`	`lca = LCA(root)`
`24`		`- k = lambda x: (-1 * lca(x, origin,True),lca.get_depth(x),abs(x.first_token.start[0] - origin.first_token.start[0]))`
`25`		`- return sorted(candidates, key = k)`
	`24`	`+ def tiebreaker(x):`
	`25`	`+ depth,node = lca(x, origin,node_and_depth = True)`
	`26`	`+ v = 3`
	`27`	`+ if match_node(node,ast.Dict):`
	`28`	`+ if node is not x and node is not origin:`
	`29`	`+ field,field_index = lca.get_field_with_respect_to(x,node)`
	`30`	`+ ofield,ofield_index = lca.get_field_with_respect_to(origin,node)`
	`31`	`+ v = abs(field_index - ofield_index)`
	`32`	`+ v = v if v<3 else 3`
	`33`	`+ return (-1 * depth,v,lca.get_depth(x),abs(x.first_token.start[0] - origin.first_token.start[0]))`
	`34`	`+`
	`35`	`+ return sorted(candidates, key = tiebreaker)`
`26`	`36`
`27`	`37`
`28`	`38`

Comments

(0)