New method eparents() instead of eparent(). Improved debugging messages.

Vincent Kriz · Vincent Kriz · commit 48e1bc9743d4 · 2017-01-09T19:13:52.000+01:00
diff --git a/udapi/block/zellig_harris/common.py b/udapi/block/zellig_harris/common.py
@@ -30,4 +30,4 @@ def print_triple(node_a, relation_name, node_b, print_lemma=False):
     node_b = get_node_representation(node_b, print_lemma=print_lemma)
 
     context = u"%s %s_%s" % (node_a, relation_name, node_b)
-    print(context)
+    return context
diff --git a/udapi/block/zellig_harris/configurations.py b/udapi/block/zellig_harris/configurations.py
@@ -71,8 +71,12 @@ def apply_query(self, query_id, node):
                 logging.info(' - no configurations, but all conditions passed.')
 
         for (node_a, relation_name, node_b) in triples:
-            print_triple(node_a, relation_name, node_b,
-                         print_lemma=self.print_lemmas)
+            triple = print_triple(node_a, relation_name, node_b, print_lemma=self.print_lemmas)
+
+            if self.verbose:
+                logging.info(' - %s', triple)
+
+            print(triple)
 
     def process_tree(self, tree):
         """
diff --git a/udapi/block/zellig_harris/enhancedeps.py b/udapi/block/zellig_harris/enhancedeps.py
@@ -5,22 +5,26 @@
 from udapi.core.block import Block
 
 
-def eparent(node):
+def eparents(node):
     """
-    Return an effective parent for the given node.
-
-    The rule for the effective parent - when the current node A has a deprel 'conj' to its parent B,
-    return  B.parent, otherwise return A.parent.
+    Return a list of effective parents for the given node.
 
     :param node: An input node.
-    :return: An effective parent.
-    :rtype: udapi.core.node.Node
+    :return: A list of effective parents.
+    :rtype: list
 
     """
+    # Rule (1): When node.deprel == conj, its effective parents are equal to its parent.
     if node.deprel == 'conj':
-        return node.parent.parent
+        return eparents(node.parent)
+
+    # Rule (2): Append the real parent and look for its coordinated nodes.
+    final_eparents = [node.parent]
+    for candidate_eparent in node.parent.children:
+        if candidate_eparent.deprel == 'conj':
+            final_eparents.append(candidate_eparent)
 
-    return node.parent
+    return final_eparents
 
 
 def echildren(node):
@@ -32,35 +36,36 @@ def echildren(node):
     :rtype: list
 
     """
-    node_parent = eparent(node)
+    node_parents = eparents(node)
     echildren_list = [child for child in node.children]
 
     # Rule (A)
     target_deprels = ['subj', 'subjpass', 'dobj', 'iobj', 'compl']
-    for candidate_child in node_parent.children:
-        # Check if a candidate node C has the target deprel.
-        if candidate_child.deprel not in target_deprels:
-            continue
-
-        # Check if such deprel is not in the current node children already.
-        no_such_deprel = True
-        for current_child in node.children:
-            if current_child.deprel == candidate_child.deprel:
-                no_such_deprel = False
-                break
-
-        # If there is no such deprel, we can add a new secondary dependence.
-        if no_such_deprel:
-            echildren_list.append(candidate_child)
-
-    # Rule (B)
-    if node.upostag == 'VERB' and (node_parent.upostag == 'AUX' or
-        node_parent.lemma in ['chtít', 'moci', 'smět', 'mít', 'muset', 'umět']):
+    for node_parent in node_parents:
         for candidate_child in node_parent.children:
-            # Check if the candidate child is not in the current node children already.
-            if candidate_child not in echildren_list:
+            # Check if a candidate node C has the target deprel.
+            if candidate_child.deprel not in target_deprels:
+                continue
+
+            # Check if such deprel is not in the current node children already.
+            no_such_deprel = True
+            for current_child in node.children:
+                if current_child.deprel == candidate_child.deprel:
+                    no_such_deprel = False
+                    break
+
+            # If there is no such deprel, we can add a new secondary dependence.
+            if no_such_deprel:
                 echildren_list.append(candidate_child)
 
+    # Rule (B)
+    for node_parent in node_parents:
+        if node.upostag == 'VERB' and (node_parent.upostag == 'AUX' or node_parent.lemma in ['chtít', 'moci', 'smět', 'mít', 'muset', 'umět']):
+            for candidate_child in node_parent.children:
+                # Check if the candidate child is not in the current node children already.
+                if candidate_child not in echildren_list:
+                    echildren_list.append(candidate_child)
+
     return echildren_list
 
 
