Fix CMR expansion to not attach remote Rs

Author: danielhers

ucca/normalization.py

@@ -281,17 +281,19 @@ def split_coordinated_main_rel(node, l1):
             else:
                 top = node
             outgoing = list(node.outgoing)
+            external = [e for e in outgoing if KEEP_OUTSIDE_CMR.intersection(e.tags)]
+            internal = [e for e in outgoing if not KEEP_OUTSIDE_CMR.intersection(e.tags) and
+                        e.ID != edge.ID]  # Not the CMR edge itself
+            for scene_edge in external:  # A category that should be kept outside of both scenes
+                copy_edge(scene_edge, parent=top)
             scenes = []
             for center in centers:
                 new_scene = l1.add_fnode(top, ETags.ParallelScene)
                 copy_edge(edge, parent=new_scene, child=center, attrib=attrib)
-                for scene_edge in outgoing:
-                    if scene_edge.ID != edge.ID and not (
-                            scenes and NO_MULTIPLE_INCOMING_CATEGORIES.intersection(scene_edge.tags)):
-                        # Not the CMR edge itself, and not a category that does not allow multiple parents
-                        copy_edge(scene_edge,
-                                  parent=top if KEEP_OUTSIDE_CMR.intersection(scene_edge.tags) else new_scene,
-                                  attrib={"remote": True} if scenes else None)
+                for scene_edge in internal:
+                    if not (scenes and NO_MULTIPLE_INCOMING_CATEGORIES.intersection(scene_edge.tags)):
+                        # Attach inside the 1st scene and potentially also as remote in 2nd scene
+                        copy_edge(scene_edge, parent=new_scene, attrib={"remote": True} if scenes else None)
                 scenes.append(new_scene)
             for main_rel_edge in main_rel_non_centers:
                 tags = main_rel_edge.tags

ucca/tests/test_normalization.py

@@ -350,7 +350,7 @@ def expanded_remote_cmr():
     return p
 
 
-def cmr_with_relator():
+def cmr_with_relator_outside():
     """
     [suitable_S [for_R the_F [breeding_C and_N growing_C]_P|CMR [of_R giants_C]_A]_A]_H
     """
@@ -361,14 +361,14 @@ def cmr_with_relator():
     r1 = l1.add_fnode(a_scene, layer1.EdgeTags.Relator)
     f = l1.add_fnode(a_scene, layer1.EdgeTags.Function)
     p1, c1, n, c2 = insert_cmr(l1, a_scene)
-    a2 = l1.add_fnode(ps, layer1.EdgeTags.Participant)
+    a2 = l1.add_fnode(a_scene, layer1.EdgeTags.Participant)
     r2 = l1.add_fnode(a2, layer1.EdgeTags.Relator)
     c3 = l1.add_fnode(a2, layer1.EdgeTags.Center)
     attach_terminals(terms, s, r1, f, c1, n, c2, r2, c3)
     return p
 
 
-def expanded_cmr_with_relator():
+def expanded_cmr_with_relator_outside():
     """
     [suitable_S [for_R [[the_F breeding_C]_P [of_R giants_C]_A]_H and_L [[growing_P] [*of giants]_A]_H]_H
     """
@@ -381,14 +381,13 @@ def expanded_cmr_with_relator():
     linker = l1.add_fnode(a_superscene, layer1.EdgeTags.Linker)
     ps3 = l1.add_fnode(a_superscene, layer1.EdgeTags.ParallelScene)
     p1 = l1.add_fnode(ps2, layer1.EdgeTags.Process)
-    f = l1.add_fnode(p1, layer1.EdgeTags.Function)
-    c1 = l1.add_fnode(p1, layer1.EdgeTags.Center)
+    f = l1.add_fnode(ps2, layer1.EdgeTags.Function)
     a = l1.add_fnode(ps2, layer1.EdgeTags.Participant)
     r2 = l1.add_fnode(a, layer1.EdgeTags.Relator)
     c2 = l1.add_fnode(a, layer1.EdgeTags.Center)
     p2 = l1.add_fnode(ps3, layer1.EdgeTags.Process)
     l1.add_remote(ps3, layer1.EdgeTags.Participant, a)
-    attach_terminals(terms, s, r1, f, c1, linker, p2, r2, c2)
+    attach_terminals(terms, s, r1, f, p1, linker, p2, r2, c2)
     return p
 
 
@@ -423,7 +422,7 @@ def normalize_and_compare(unnormalized, normalized, extra=False):
         (cmr_no_attrib, cmr_no_attrib),
         (cmr, expanded_cmr),
         (remote_cmr, expanded_remote_cmr),
-        (cmr_with_relator, expanded_cmr_with_relator),
+        (cmr_with_relator_outside, expanded_cmr_with_relator_outside),
 ))
 def test_normalize(unnormalized, normalized):
     normalize_and_compare(unnormalized, normalized)