Upgrade Ssurgeon RemoveNamedEdge to remove edges based on their name (it was currently unused everyone, including RTE, so changing the interface should be no harm done)

Author: AngledLuffa

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

@@ -4,7 +4,6 @@
 
 import edu.stanford.nlp.ling.IndexedWord;
 import edu.stanford.nlp.semgraph.semgrex.SemgrexMatcher;
-import edu.stanford.nlp.trees.GrammaticalRelation;
 import edu.stanford.nlp.semgraph.SemanticGraph;
 import edu.stanford.nlp.semgraph.SemanticGraphEdge;
 
@@ -23,14 +22,10 @@
 public class RemoveNamedEdge extends SsurgeonEdit {  
   public static final String LABEL = "removeNamedEdge";
 
-  protected String edgeName; // Name of the matched edge in the SemgrexPattern
-  protected String govName; // Name of governor of this reln, in match
-  protected String depName; // Name of the dependent in this reln, in match
+  protected final String edgeName; // Name of the matched edge in the SemgrexPattern
 
-  public RemoveNamedEdge(String edgeName, String govName, String depName) {
+  public RemoveNamedEdge(String edgeName) {
     this.edgeName = edgeName;
-    this.govName = govName;
-    this.depName = depName;
   }
 
   @Override
@@ -39,10 +34,6 @@ public String toEditString() {
     buf.write(LABEL); buf.write("\t");
     buf.write(Ssurgeon.EDGE_NAME_ARG);buf.write(" ");    
     buf.write(edgeName); buf.write("\t");
-    buf.write(Ssurgeon.GOV_NODENAME_ARG);buf.write(" ");    
-    buf.write(govName); buf.write("\t");
-    buf.write(Ssurgeon.DEP_NODENAME_ARG);buf.write(" ");    
-    buf.write(depName);
     return buf.toString();
   }
 
@@ -56,10 +47,7 @@ public String toEditString() {
    */
   @Override
   public boolean evaluate(SemanticGraph sg, SemgrexMatcher sm) {
-    String relation = sm.getRelnString(edgeName);
-    IndexedWord govNode = getNamedNode(govName, sm);
-    IndexedWord depNode = getNamedNode(depName, sm);
-    SemanticGraphEdge edge = sg.getEdge(govNode, depNode, GrammaticalRelation.valueOf(relation));
+    SemanticGraphEdge edge = sm.getEdge(edgeName);
 
     if (edge != null) {
       sg.removeEdge(edge);
@@ -68,16 +56,7 @@ public boolean evaluate(SemanticGraph sg, SemgrexMatcher sm) {
     return false;
   }
 
-  public String getDepName() {
-    return depName;
-  }
-
   public String getEdgeName() {
     return edgeName;
   }
-
-  public String getGovName() {
-    return govName;
-  }
-
 }

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

@@ -362,7 +362,7 @@ public static SsurgeonEdit parseEditLine(String editLine) {
     } else if (command.equalsIgnoreCase(RemoveEdge.LABEL)) {
       retEdit = new RemoveEdge(GrammaticalRelation.valueOf(argsBox.reln), argsBox.govNodeName, argsBox.dep);
     } else if (command.equalsIgnoreCase(RemoveNamedEdge.LABEL)) {
-      retEdit = new RemoveNamedEdge(argsBox.edge, argsBox.govNodeName, argsBox.dep);
+      retEdit = new RemoveNamedEdge(argsBox.edge);
     } else if (command.equalsIgnoreCase(SetRoots.LABEL)) {
       String[] names = tuples1[1].split("\\s+");
       List<String> newRoots = Arrays.asList(names);

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

@@ -117,6 +117,40 @@ public void readXMLRemoveEdgeIterate() {
     assertEquals(newSg, expected);
   }
 
+
+  /**
+   * Test that removing a named edge will remove all matching edges
+   */
+  @Test
+  public void readXMLRemoveNamedEdgeIterate() {
+    String doc = String.join(newline,
+                             "<ssurgeon-pattern-list>",
+                             "  <ssurgeon-pattern>",
+                             "    <uid>38</uid>",
+                             "    <notes>This is a simple test of RemoveNamedEdge</notes>",
+                             "    <semgrex>" + XMLUtils.escapeXML("{}=a1 >dep~foo {}=a2") + "</semgrex>",
+                             "    <edit-list>removeNamedEdge -edge foo</edit-list>",
+                             "  </ssurgeon-pattern>",
+                             "</ssurgeon-pattern-list>");
+    Ssurgeon inst = Ssurgeon.inst();
+    List<SsurgeonPattern> patterns = inst.readFromString(doc);
+    assertEquals(patterns.size(), 1);
+    SsurgeonPattern pattern = patterns.get(0);
+
+    SemanticGraph sg = SemanticGraph.valueOf("[A-0 obj> B-1 obj> C-2 nsubj> [D-3 obj> E-4]]");
+    SemanticGraph newSg = pattern.iterate(sg);
+    SemanticGraph expected = SemanticGraph.valueOf("[A-0 obj> B-1 obj> C-2 nsubj> [D-3 obj> E-4]]");
+    assertEquals(newSg, sg);
+
+    sg = SemanticGraph.valueOf("[A-0 obj> B-1 dep> B-1 obj> C-2 nsubj> [D-3 obj> E-4]]");
+    newSg = pattern.iterate(sg);
+    assertEquals(newSg, expected);
+
+    sg = SemanticGraph.valueOf("[A-0 obj> B-1 dep> B-1 obj> C-2 dep> C-2 nsubj> [D-3 obj> E-4 dep> E-4]]");
+    newSg = pattern.iterate(sg);
+    assertEquals(newSg, expected);
+  }
+
   /**
    * Check that cutting a graph with two nodes into two pieces, then
    * pruning any disjoint pieces, results in a graph with just the root
@@ -241,16 +275,16 @@ public void readXMLPruneNodesResetRoots() {
   @Test
   public void simpleTest() {
     SemanticGraph sg = SemanticGraph.valueOf("[mixed/VBN nsubj>[Joe/NNP appos>[bartender/NN det>the/DT]]  obj>[drink/NN det>a/DT]]");
-    SemgrexPattern semgrexPattern = SemgrexPattern.compile("{}=a1 >appos=e1 {}=a2 <nsubj=e2 {}=a3");
+    SemgrexPattern semgrexPattern = SemgrexPattern.compile("{}=a1 >appos~e1 {}=a2 <nsubj~e2 {}=a3");
     SsurgeonPattern pattern = new SsurgeonPattern(semgrexPattern);
 
     System.out.println("Start = "+sg.toCompactString());
 
     // Find and snip the appos and root to nsubj links
-    SsurgeonEdit apposSnip = new RemoveNamedEdge("e1", "a1", "a2");
+    SsurgeonEdit apposSnip = new RemoveNamedEdge("e1");
     pattern.addEdit(apposSnip);
 
-    SsurgeonEdit nsubjSnip = new RemoveNamedEdge("e2", "a3", "a1");
+    SsurgeonEdit nsubjSnip = new RemoveNamedEdge("e2");
     pattern.addEdit(nsubjSnip);
 
     // Attach Joe to be the nsubj of bartender