Refactor a method which processes a list of sentences all at once for a given Semgrex expression. Will make it easier to extend, such as with postprocessing steps

Author: AngledLuffa

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

@@ -444,6 +444,29 @@ public enum OutputFormat {
     CONLLU
   }
 
+  /**
+   * Returns a list of matching sentences and each of the matches from those sentences.
+   *<br>
+   * Non-matching sentences are currently not returned (may change in the future to return an empty list).
+   */
+  public List<Pair<CoreMap, List<SemgrexMatch>>> matchSentences(List<CoreMap> sentences) {
+    List<Pair<CoreMap, List<SemgrexMatch>>> matches = new ArrayList<>();
+    for (CoreMap sentence : sentences) {
+      SemanticGraph graph = sentence.get(SemanticGraphCoreAnnotations.BasicDependenciesAnnotation.class);
+      SemanticGraph enhanced = sentence.get(SemanticGraphCoreAnnotations.EnhancedDependenciesAnnotation.class);
+      SemgrexMatcher matcher = matcher(graph);
+      if ( ! matcher.find()) {
+        continue;
+      }
+      matches.add(new Pair<>(sentence, new ArrayList<>()));
+      boolean found = true;
+      while (found) {
+        matches.get(matches.size() - 1).second().add(new SemgrexMatch(this, matcher));
+        found = matcher.find();
+      }
+    }
+    return matches;
+  }
 
   private static final String PATTERN = "-pattern";
   private static final String TREE_FILE = "-treeFile";
@@ -548,21 +571,7 @@ public static void main(String[] args) throws IOException {
       }
     }
 
-    List<Pair<CoreMap, List<SemgrexMatch>>> matches = new ArrayList<>();
-    for (CoreMap sentence : sentences) {
-      SemanticGraph graph = sentence.get(SemanticGraphCoreAnnotations.BasicDependenciesAnnotation.class);
-      SemanticGraph enhanced = sentence.get(SemanticGraphCoreAnnotations.EnhancedDependenciesAnnotation.class);
-      SemgrexMatcher matcher = semgrex.matcher(graph);
-      if ( ! matcher.find()) {
-        continue;
-      }
-      matches.add(new Pair<>(sentence, new ArrayList<>()));
-      boolean found = true;
-      while (found) {
-        matches.get(matches.size() - 1).second().add(new SemgrexMatch(semgrex, matcher));
-        found = matcher.find();
-      }
-    }
+    List<Pair<CoreMap, List<SemgrexMatch>>> matches = semgrex.matchSentences(sentences);
 
     for (Pair<CoreMap, List<SemgrexMatch>> sentenceMatches : matches) {
       CoreMap sentence = sentenceMatches.first();