Tie-breaking on visual distance added

Author: mpourmpoulis

queries/argument.py

@@ -9,7 +9,7 @@
 from PythonVoiceCodingPlugin.library.traverse import search_upwards,search_upwards_log, find_matching,match_node, find_all_nodes,search_upwards_for_parent
 
 from PythonVoiceCodingPlugin.queries.abstract import SelectionQuery
-from PythonVoiceCodingPlugin.queries.tiebreak import tiebreak_on_lca
+from PythonVoiceCodingPlugin.queries.tiebreak import tiebreak_on_lca,tiebreak_on_visual
 from PythonVoiceCodingPlugin.queries.strategies import adjective_strategy,decode_abstract_vertical,translate_adjective,obtain_result
 
 # 
@@ -111,7 +111,7 @@ def process_line(self,q, root ,atok, origin  = None, select_node = None,tiebreak
 			result,alternatives = obtain_result(None,temporary)
 
 		if second_tiebreaker:
-			alternatives = second_tiebreaker(origin,result,alternatives)
+			alternatives = second_tiebreaker(result,alternatives)
 
 
 
@@ -195,7 +195,8 @@ def case_two(self,view_information,query_description, extra = {}):
 			tiebreaker = lambda x: tiebreak_on_lca(statement_node,origin,x),
 			line = nr+1,
 			priority = priority,
-			constrained_space = (view_information["text_point"](nr,0),view_information["text_point"](nr + 1,0))
+			constrained_space = (view_information["text_point"](nr,0),view_information["text_point"](nr + 1,0)),
+			second_tiebreaker = lambda x,y : tiebreak_on_visual(row + 1,x,y)
 		)
 		return self._backward_result(result, alternatives,build)
 

queries/tiebreak.py

@@ -26,6 +26,24 @@ def tiebreak_on_lca(root,origin,candidates):
 
 
 
+def tiebreak_on_visual(original_line,result,alternatives):
+	if result:
+		if original_line:
+			k = lambda x: (
+				abs(x.first_token.start[0] - result.first_token.start[0]) + 
+				( 
+					10 if (					 
+					x.first_token.start[0]<=original_line<=result.first_token.start[0] or
+					x.first_token.start[0]>=original_line>=result.first_token.start[0]
+					) else 0
+				)
+			)
+		else:
+			k = lambda x: abs(x.first_token.start[0] - result.first_token.start[0])
+		if alternatives:
+			return sorted(alternatives, key = k)
+	return alternatives
+