Update named edges in the SemgrexMatcher when rearranging nodes in the SemanticGraph. Includes a test of that functionality

Author: AngledLuffa

src/edu/stanford/nlp/semgraph/semgrex/ssurgeon/AddDep.java

@@ -97,7 +97,8 @@ public String toEditString() {
     return buf.toString();
   }
 
-  // TODO: update the SemgrexMatcher's edges as well
+  // TODO: make the updating of named nodes & edges faster,
+  // possibly by building a cache from node/edge to name?
   public static void moveNode(SemanticGraph sg, SemgrexMatcher sm, IndexedWord word, int newIndex) {
     List<SemanticGraphEdge> outgoing = sg.outgoingEdgeList(word);
     List<SemanticGraphEdge> incoming = sg.incomingEdgeList(word);
@@ -124,11 +125,25 @@ public static void moveNode(SemanticGraph sg, SemgrexMatcher sm, IndexedWord wor
 
     for (SemanticGraphEdge oldEdge : outgoing) {
       SemanticGraphEdge newEdge = new SemanticGraphEdge(newWord, oldEdge.getTarget(), oldEdge.getRelation(), oldEdge.getWeight(), oldEdge.isExtra());
+
+      for (String name : sm.getEdgeNames()) {
+        if (sm.getEdge(name) == oldEdge) {
+          sm.putNamedEdge(name, newEdge);
+        }
+      }
+
       sg.addEdge(newEdge);
     }
 
     for (SemanticGraphEdge oldEdge : incoming) {
       SemanticGraphEdge newEdge = new SemanticGraphEdge(oldEdge.getSource(), newWord, oldEdge.getRelation(), oldEdge.getWeight(), oldEdge.isExtra());
+
+      for (String name : sm.getEdgeNames()) {
+        if (sm.getEdge(name) == oldEdge) {
+          sm.putNamedEdge(name, newEdge);
+        }
+      }
+
       sg.addEdge(newEdge);
     }
   }

test/src/edu/stanford/nlp/semgraph/semgrex/ssurgeon/SsurgeonTest.java

@@ -815,6 +815,47 @@ public void readXMLCheckSMNodes() {
     assertEquals("blue", blueVertex.value());
   }
 
+
+  /**
+   * The AddDep should update the edge matches in the SemgrexMatcher.
+   * If that isn't done correctly, then moving the words first
+   * and then trying to update an edge that matched would not work
+   */
+  @Test
+  public void readXMLCheckSMEdges() {
+    Ssurgeon inst = Ssurgeon.inst();
+
+    // use "dep" as the dependency so as to be language-agnostic in this test
+    String add = String.join(newline,
+                             "<ssurgeon-pattern-list>",
+                             "  <ssurgeon-pattern>",
+                             "    <uid>38</uid>",
+                             "    <notes>Add a word before antennae using the position</notes>",
+                             // have to bomb-proof the pattern
+                             "    <semgrex>" + XMLUtils.escapeXML("{word:antennae}=antennae <obj=obj {} !> {word:blue}") + "</semgrex>",
+                             "    <edit-list>addDep -gov antennae -reln dep -word blue -position -antennae</edit-list>",
+                             "    <edit-list>relabelNamedEdge -edge obj -reln dep</edit-list>",
+                             "  </ssurgeon-pattern>",
+                             "</ssurgeon-pattern-list>");
+    List<SsurgeonPattern> patterns = inst.readFromString(add);
+    assertEquals(patterns.size(), 1);
+    SsurgeonPattern addSsurgeon = patterns.get(0);
+
+    SemanticGraph sg = SemanticGraph.valueOf("[has-2 nsubj> Jennifer-1 obj> antennae-3]");
+    IndexedWord blueVertex = sg.getNodeByIndexSafe(4);
+    assertNull(blueVertex);
+    SemanticGraph newSG = addSsurgeon.iterate(sg);
+    // the edge update to change the name of the edge to "dep" should fire
+    SemanticGraph expected = SemanticGraph.valueOf("[has-2 nsubj> Jennifer-1 dep> [antennae-4 dep> blue-3]]");
+    assertEquals(expected, newSG);
+    // the Ssurgeon we just created should not put a tag on the word
+    // but it SHOULD put blue immediately before antennae
+    blueVertex = newSG.getNodeByIndexSafe(3);
+    assertNotNull(blueVertex);
+    assertNull(blueVertex.tag());
+    assertEquals("blue", blueVertex.value());
+  }
+
   /**
    * Test that types which can't be converted from String
    * are detected when making an AddDep