Update the SemgrexMatcher's nodes. Still should do edges

Author: AngledLuffa

src/edu/stanford/nlp/semgraph/semgrex/SemgrexMatcher.java

@@ -199,7 +199,11 @@ public boolean findNextMatchingNode() {
   public IndexedWord getNode(String name) {
     return namesToNodes.get(name);
   }
-  
+
+  public IndexedWord putNode(String name, IndexedWord node) {
+    return namesToNodes.put(name, node);
+  }
+
   public String getRelnString(String name) {
     return namesToRelations.get(name);
   }

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

@@ -99,10 +99,8 @@ public String toEditString() {
     return buf.toString();
   }
 
-  // TODO: update the SemgrexMatcher
-  // currently the Ssurgeon will not be able to proceed after this edit
-  // since all of the node and edge pointers will be rewritten
-  public static void moveNode(SemanticGraph sg, IndexedWord word, int newIndex) {
+  // TODO: update the SemgrexMatcher's edges as well
+  public static void moveNode(SemanticGraph sg, SemgrexMatcher sm, IndexedWord word, int newIndex) {
     List<SemanticGraphEdge> outgoing = sg.outgoingEdgeList(word);
     List<SemanticGraphEdge> incoming = sg.incomingEdgeList(word);
     boolean isRoot = sg.isRoot(word);
@@ -120,6 +118,12 @@ public static void moveNode(SemanticGraph sg, IndexedWord word, int newIndex) {
       sg.setRoots(newRoots);
     }
 
+    for (String name : sm.getNodeNames()) {
+      if (sm.getNode(name) == word) {
+        sm.putNode(name, newWord);
+      }
+    }
+
     for (SemanticGraphEdge oldEdge : outgoing) {
       SemanticGraphEdge newEdge = new SemanticGraphEdge(newWord, oldEdge.getTarget(), oldEdge.getRelation(), oldEdge.getWeight(), oldEdge.isExtra());
       sg.addEdge(newEdge);
@@ -131,13 +135,13 @@ public static void moveNode(SemanticGraph sg, IndexedWord word, int newIndex) {
     }
   }
 
-  public static void moveNodes(SemanticGraph sg, Function<Integer, Boolean> shouldMove, Function<Integer, Integer> destination) {
+  public static void moveNodes(SemanticGraph sg, SemgrexMatcher sm, Function<Integer, Boolean> shouldMove, Function<Integer, Integer> destination) {
     // iterate first, then move, so that we don't screw up the graph while iterating
     List<IndexedWord> toMove = sg.vertexSet().stream().filter(x -> shouldMove.apply(x.index())).collect(Collectors.toList());
     Collections.sort(toMove);
     Collections.reverse(toMove);
     for (IndexedWord word : toMove) {
-      moveNode(sg, word, destination.apply(word.index()));
+      moveNode(sg, sm, word, destination.apply(word.index()));
     }
   }
 
@@ -195,8 +199,8 @@ public boolean evaluate(SemanticGraph sg, SemgrexMatcher sm) {
     if (position != null && !position.equals("+")) {
       // the payoff for tempIndex == maxIndex + 2:
       // everything will be moved one higher, unless it's the new node
-      moveNodes(sg, x -> (x >= newIndex && x != tempIndex), x -> x+1);
-      moveNode(sg, newNode, newIndex);
+      moveNodes(sg, sm, x -> (x >= newIndex && x != tempIndex), x -> x+1);
+      moveNode(sg, sm, newNode, newIndex);
     }
 
     return true;

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

@@ -775,6 +775,46 @@ public void readXMLAddDepBrokenAnnotation() {
     }
   }
 
+  /**
+   * The AddDep should update the matches in the SemgrexMatcher.
+   * If that isn't done correctly, then moving the words first
+   * and then trying to update the word that was moved
+   * would not work
+   */
+  @Test
+  public void readXMLCheckSMNodes() {
+    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:antenna}=antennae !> {word:blue}") + "</semgrex>",
+                             "    <edit-list>addDep -gov antennae -reln dep -word blue -position -antennae</edit-list>",
+                             "    <edit-list>editNode -node antennae -word antennae</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> antenna-3]");
+    IndexedWord blueVertex = sg.getNodeByIndexSafe(4);
+    assertNull(blueVertex);
+    SemanticGraph newSG = addSsurgeon.iterate(sg);
+    SemanticGraph expected = SemanticGraph.valueOf("[has-2 nsubj> Jennifer-1 obj> [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