Update some tests based on a different ordering of SemanticGraph items when switched to LinkedHashMap

Apparently there's a shorter path in some search algorithms

Items in the semgrex are now ordered by creation time

Cluster ids changed?

Update some coref scores to reflect recent changes

Author: AngledLuffa

itest/src/edu/stanford/nlp/coref/NeuralChineseCorefBenchmarkSlowITest.java

@@ -9,12 +9,12 @@ public class NeuralChineseCorefBenchmarkSlowITest extends CorefBenchmark {
 
   @Override
   public void setUp() throws Exception, IOException {
-    logger = Redwood.channels(NeuralEnglishCorefCoNLLBenchmarkSlowITest.class);
-    EXPECTED_F1_SCORE = 53.80;
+    logger = Redwood.channels(NeuralChineseCorefBenchmarkSlowITest.class);
+    EXPECTED_F1_SCORE = 54.3;
     PROPERTIES_PATH =  "edu/stanford/nlp/coref/properties/neural-chinese.properties";
     WORK_DIR_NAME = "NeuralChineseCorefBenchmarkTest";
     testName = "Neural Chinese Coref";
     super.setUp();
   }
 
-}
+}

itest/src/edu/stanford/nlp/coref/NeuralEnglishCorefBenchmarkSlowITest.java

@@ -10,11 +10,11 @@ public class NeuralEnglishCorefBenchmarkSlowITest extends CorefBenchmark {
   @Override
   public void setUp() throws Exception, IOException {
     logger = Redwood.channels(NeuralEnglishCorefCoNLLBenchmarkSlowITest.class);
-    EXPECTED_F1_SCORE = 59.90;
+    EXPECTED_F1_SCORE = 62.15;
     PROPERTIES_PATH =  "edu/stanford/nlp/coref/properties/neural-english.properties";
     WORK_DIR_NAME = "NeuralEnglishCorefBenchmarkTest";
     testName = "Neural English Coref";
     super.setUp();
   }
 
-}
+}

itest/src/edu/stanford/nlp/coref/NeuralEnglishCorefCoNLLBenchmarkSlowITest.java

@@ -9,7 +9,7 @@ public class NeuralEnglishCorefCoNLLBenchmarkSlowITest extends CorefBenchmark {
   @Override
   public void setUp() throws Exception, IOException {
     logger = Redwood.channels(NeuralEnglishCorefCoNLLBenchmarkSlowITest.class);
-    EXPECTED_F1_SCORE = 65.56;
+    EXPECTED_F1_SCORE = 65.51;
     PROPERTIES_PATH =  "edu/stanford/nlp/coref/properties/neural-english-conll.properties";
     WORK_DIR_NAME = "NeuralEnglishCorefCoNLLBenchmarkTest";
     testName = "Neural English Coref (CoNLL)";

itest/src/edu/stanford/nlp/coref/StatisticalCorefCoNLLBenchmarkSlowITest.java

@@ -10,7 +10,7 @@ public class StatisticalCorefCoNLLBenchmarkSlowITest extends CorefBenchmark {
   @Override
   public void setUp() throws Exception, IOException {
     logger = Redwood.channels(StatisticalCorefCoNLLBenchmarkSlowITest.class);
-    EXPECTED_F1_SCORE = 63.29;
+    EXPECTED_F1_SCORE = 63.27;
     PROPERTIES_PATH =  "edu/stanford/nlp/coref/properties/statistical-english-conll.properties";
     WORK_DIR_NAME = "StatisticalCorefBenchmarkTest";
     testName = "Statistical English Coref (CoNLL)";

itest/src/edu/stanford/nlp/pipeline/CoreWrapperITest.java

@@ -96,7 +96,7 @@ public void testPipeline() throws Exception {
     assertEquals(expectedDependencyParse, firstSentence.dependencyParse().toString());
     // coref info
     String expectedCoref =
-            "{17=CHAIN17-[\"us\" in sentence 3, \"our\" in sentence 3], 19=CHAIN19-[\"Barack Obama\" in sentence 1, " +
+            "{19=CHAIN19-[\"us\" in sentence 3, \"our\" in sentence 3], 21=CHAIN21-[\"Barack Obama\" in sentence 1, " +
                     "\"He\" in sentence 2, \"Obama\" in sentence 3, \"My\" in sentence 3, \"I\" in sentence 3, \"his\" " +
                     "in sentence 3]}";
     assertEquals(expectedCoref, exampleDocument.corefChains().toString());

itest/src/edu/stanford/nlp/pipeline/StanfordCoreNLPServerITest.java

@@ -125,7 +125,7 @@ public void testTregexJson() throws IOException {
 
   @Test
   public void testSemgrexJson() throws IOException {
-    String expected="{ \"sentences\": [ { \"0\": { \"text\": \"ate\", \"begin\": 2, \"end\": 3, \"$obj\": { \"text\": \"fish\", \"begin\": 4, \"end\": 5 }, \"$verb\": { \"text\": \"ate\", \"begin\": 2, \"end\": 3 } }, \"length\": 1 }  ]}".replaceAll(" ", "");
+    String expected="{ \"sentences\": [ { \"0\": { \"text\": \"ate\", \"begin\": 2, \"end\": 3, \"$verb\": { \"text\": \"ate\", \"begin\": 2, \"end\": 3 }, \"$obj\": { \"text\": \"fish\", \"begin\": 4, \"end\": 5 } }, \"length\": 1 }  ]}".replaceAll(" ", "");
 
     String query = "The dog ate a fish";
     byte[] message = query.getBytes("utf-8");
@@ -143,7 +143,7 @@ public void testSemgrexJson() throws IOException {
 
   @Test
   public void testSemgrexAnnotation() throws IOException {
-    String expected = "result { result { match { matchIndex: 3 node { name: \"obj\" matchIndex: 5 } node { name: \"verb\" matchIndex: 3 } } }}".replaceAll(" ", "");
+    String expected = "result { result { match { matchIndex: 3 node { name: \"verb\" matchIndex: 3 } node { name: \"obj\" matchIndex: 5 } } }}".replaceAll(" ", "");
     String query = "The dog ate a fish";
     byte[] message = query.getBytes("utf-8");
     Properties props = new Properties();

itest/src/edu/stanford/nlp/simple/SentenceAlgorithmsITest.java

@@ -204,8 +204,6 @@ public void testDependencyPathBetweenRegressions() throws IOException {
       add("Geledi");
       add("<-nmod:of-");
       add("Sultanate");
-      add("<-conj:and-");
-      add("commander");
       add("<-acl:relcl-");
       add("Sultanate");
       add("<-appos-");