Commit 2b01299

committed

add invert_then_tiebreak argument to process_line Argument Queries

This addition was neededSo the queries of the form "inside nth argument" would work properly. In particular, for these type of queries tiebreaking Needs to happen after inversion because we need to pick the closest call that satisfies the nth description with respect to its (local) parent. Otherwise, the result produced would not be even deterministic,as helpful will not be ordered!!!

1 parent e4a6b57 commit 2b01299Copy full SHA for 2b01299

File tree

1 file changed

-4

lines changed

queries
- argument.py

1 file changed

-4

lines changed

`‎queries/argument.py‎`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ def get_statement(self,origin,atok):`
`62`	`62`
`63`	`63`	`def process_line(self,q, root ,atok, origin = None, select_node = None,tiebreaker = lambda x: x,`
`64`	`64`	`line = None, transformation = None,inverse_transformation = None, priority = {},`
`65`		`- constrained_space = (), second_tiebreaker = None`
	`65`	`+ constrained_space = (), second_tiebreaker = None,invert_then_tiebreak=True`
`66`	`66`	`):`
`67`	`67`	`result = None`
`68`	`68`	`alternatives = None`
`@@ -131,7 +131,10 @@ def process_line(self,q, root ,atok, origin = None, select_node = None,tiebreak`
`131`	`131`	`helpful = [result] if result else []`
`132`	`132`	`if alternatives:`
`133`	`133`	`helpful.extend(alternatives)`
`134`		`- temporary = make_flat([tiebreaker(inverse_transformation(x)) for x in helpful])`
	`134`	`+ if invert_then_tiebreak:`
	`135`	`+ temporary = make_flat([tiebreaker(inverse_transformation(x)) for x in helpful])`
	`136`	`+ else:`
	`137`	`+ temporary = tiebreaker(make_flat([inverse_transformation(x) for x in helpful]))`
`135`	`138`	`result, alternatives = obtain_result(None,temporary)`
`136`	`139`
`137`	`140`	`################################################################`
`@@ -144,7 +147,7 @@ def process_line(self,q, root ,atok, origin = None, select_node = None,tiebreak`
`144`	`147`	`temporary = [x[1] for x in temporary]`
`145`	`148`	`result,alternatives = obtain_result(None,temporary)`
`146`	`149`
`147`		`- if second_tiebreaker:`
	`150`	`+ if resultandsecond_tiebreaker:`
`148`	`151`	`alternatives = second_tiebreaker(result,alternatives)`
`149`	`152`
`150`	`153`	`if self.global_constrained_space:`
`@@ -359,7 +362,7 @@ def inverse_transformation(node):`
`359`	`362`	`tiebreaker = lambda x: tiebreak_on_lca(statement_node,origin,x,lca),`
`360`	`363`	`transformation = transformation,`
`361`	`364`	`inverse_transformation = inverse_transformation,`
`362`		`-`
	`365`	`+invert_then_tiebreak=False`
`363`	`366`	`)`
`364`	`367`	`return self._backward_result(result, alternatives,build)`
`365`	`368`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 2b01299

File tree

1 file changed

1 file changed

`‎queries/argument.py‎`

0 commit comments