Get 'isChanged' directly from the SsurgeonPattern, rather than trying to compare the graphs, which is problematic in the case of EditNode or something else that changes information which isn't compared by SemanticGraph.equals()

Author: AngledLuffa

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

@@ -18,6 +18,7 @@
 import edu.stanford.nlp.pipeline.ProtobufAnnotationSerializer;
 import edu.stanford.nlp.pipeline.CoreNLPProtos;
 import edu.stanford.nlp.semgraph.SemanticGraph;
+import edu.stanford.nlp.util.Pair;
 import edu.stanford.nlp.util.ProcessProtobufRequest;
 import edu.stanford.nlp.util.XMLUtils;
 
@@ -61,10 +62,12 @@ public static CoreNLPProtos.SsurgeonResponse processRequest(CoreNLPProtos.Ssurge
     CoreNLPProtos.SsurgeonResponse.Builder responseBuilder = CoreNLPProtos.SsurgeonResponse.newBuilder();
     for (SemanticGraph graph : graphs) {
       SemanticGraph newGraph = graph;
+      boolean isChanged = false;
       for (SsurgeonPattern pattern : patterns) {
-        newGraph = pattern.iterate(newGraph);
+        Pair<SemanticGraph, Boolean> result = pattern.iterate(newGraph);
+        newGraph = result.first;
+        isChanged = isChanged || result.second;
       }
-      boolean isChanged = !graph.equals(newGraph);
       CoreNLPProtos.SsurgeonResponse.SsurgeonResult.Builder graphBuilder = CoreNLPProtos.SsurgeonResponse.SsurgeonResult.newBuilder();
       graphBuilder.setGraph(serializer.toProto(newGraph, true));
       graphBuilder.setChanged(isChanged);

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

@@ -10,6 +10,7 @@
 import edu.stanford.nlp.semgraph.semgrex.ssurgeon.pred.SsurgPred;
 import edu.stanford.nlp.semgraph.semgrex.*;
 import edu.stanford.nlp.util.Generics;
+import edu.stanford.nlp.util.Pair;
 
 /**
  * This represents a source pattern and a subsequent edit script, or a sequence
@@ -181,10 +182,11 @@ public Collection<SemanticGraph> execute(SemanticGraph sg) {
    *   and update the SemgrexMatcher when inserting new nodes.
    * </ul>
    */
-  public SemanticGraph iterate(SemanticGraph sg) {
+  public Pair<SemanticGraph, Boolean> iterate(SemanticGraph sg) {
     SemanticGraph copied = new SemanticGraph(sg);
 
     SemgrexMatcher matcher = semgrexPattern.matcher(copied);
+    boolean anyChanges = false;
     while (matcher.find()) {
       // We reset the named node map with each edit set, since these edits
       // should exist in a separate graph for each unique Semgrex match.
@@ -193,13 +195,14 @@ public SemanticGraph iterate(SemanticGraph sg) {
       for (SsurgeonEdit edit : editScript) {
         if (edit.evaluate(copied, matcher)) {
           edited = true;
+          anyChanges = true;
         }
       }
       if (edited) {
         matcher = semgrexPattern.matcher(copied);
       }
     }
-    return copied;
+    return new Pair<>(copied, anyChanges);
   }
 
   /**