Consolidate VariableStrings into one location - the two were almost exact copies of each other

Author: AngledLuffa

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

@@ -6,6 +6,7 @@
 import edu.stanford.nlp.ling.IndexedWord;
 import edu.stanford.nlp.semgraph.SemanticGraph;
 import edu.stanford.nlp.semgraph.SemanticGraphEdge;
+import edu.stanford.nlp.trees.tregex.VariableStrings;
 
 /** @author Chloe Kiddon */
 public class CoordinationPattern extends SemgrexPattern  {

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

@@ -12,6 +12,7 @@
 import edu.stanford.nlp.ling.IndexedWord;
 import edu.stanford.nlp.semgraph.SemanticGraph;
 import edu.stanford.nlp.semgraph.SemanticGraphEdge;
+import edu.stanford.nlp.trees.tregex.VariableStrings;
 import edu.stanford.nlp.util.Pair;
 import edu.stanford.nlp.util.Quadruple;
 import edu.stanford.nlp.util.Triple;

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

@@ -3,6 +3,7 @@
 import edu.stanford.nlp.graph.CyclicGraphException;
 import edu.stanford.nlp.semgraph.SemanticGraph;
 import edu.stanford.nlp.semgraph.SemanticGraphEdge;
+import edu.stanford.nlp.trees.tregex.VariableStrings;
 import edu.stanford.nlp.ling.*;
 import edu.stanford.nlp.util.logging.Redwood;
 

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

@@ -16,6 +16,7 @@
 import edu.stanford.nlp.trees.MemoryTreebank;
 import edu.stanford.nlp.trees.Tree;
 import edu.stanford.nlp.trees.TreeNormalizer;
+import edu.stanford.nlp.trees.tregex.VariableStrings;
 import edu.stanford.nlp.trees.ud.CoNLLUDocumentWriter;
 import edu.stanford.nlp.util.ArrayCoreMap;
 import edu.stanford.nlp.util.CoreMap;

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

@@ -73,7 +73,7 @@ public IntCounter(MapFactory<E,MutableInteger> mapFactory) {
    * Constructs a new Counter with the contents of the given Counter.
    */
   public IntCounter(IntCounter<E> c) {
-    this();
+    this(c.mapFactory);
     addAll(c);
   }
 

src/edu/stanford/nlp/stats/IntCounter.java

@@ -8,11 +8,13 @@
 import java.util.Map;
 
 /** A class that takes care of the stuff necessary for variable strings.
+ *
+ *<br>
+ * TODO: move this to util?
  *
  *  @author Roger Levy ([email protected])
  */
-class VariableStrings {
-
+public class VariableStrings {
   private final Map<String, String> varsToStrings;
   private final IntCounter<String> numVarsSet;
 
@@ -21,6 +23,11 @@ public VariableStrings() {
     numVarsSet = new IntCounter<>(MapFactory.<String, MutableInteger>arrayMapFactory());
   }
 
+  public VariableStrings(VariableStrings other) {
+    varsToStrings = new ArrayMap<>(other.varsToStrings);
+    numVarsSet = new IntCounter<>(other.numVarsSet);
+  }
+
   public void reset() {
     numVarsSet.clear();
     varsToStrings.clear();