Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert SemanticGraph and SemgrexPattern to used LinkedHashMap when p… #1228

Merged
merged 2 commits into from
Dec 7, 2021
Merged

Convert SemanticGraph and SemgrexPattern to used LinkedHashMap when p… #1228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db84999
Convert SemanticGraph and SemgrexPattern to used LinkedHashMap when p…
Auzel Dec 3, 2021
597ce94
Update some tests based on a different ordering of SemanticGraph item…
AngledLuffa Dec 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions itest/src/edu/stanford/nlp/coref/NeuralChineseCorefBenchmarkSlowITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

}
}
4 changes: 2 additions & 2 deletions itest/src/edu/stanford/nlp/coref/NeuralEnglishCorefBenchmarkSlowITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

}
}
2 changes: 1 addition & 1 deletion itest/src/edu/stanford/nlp/coref/NeuralEnglishCorefCoNLLBenchmarkSlowITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)";
Expand Down
2 changes: 1 addition & 1 deletion itest/src/edu/stanford/nlp/coref/StatisticalCorefCoNLLBenchmarkSlowITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)";
Expand Down
2 changes: 1 addition & 1 deletion itest/src/edu/stanford/nlp/pipeline/CoreWrapperITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions itest/src/edu/stanford/nlp/pipeline/StanfordCoreNLPServerITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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();
Expand Down
2 changes: 0 additions & 2 deletions itest/src/edu/stanford/nlp/simple/SentenceAlgorithmsITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-");
Expand Down
6 changes: 3 additions & 3 deletions src/edu/stanford/nlp/semgraph/SemanticGraph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ public class SemanticGraph implements Serializable {

private final DirectedMultiGraph<IndexedWord, SemanticGraphEdge> graph;

private static final MapFactory<IndexedWord, Map<IndexedWord, List<SemanticGraphEdge>>> outerMapFactory = MapFactory.hashMapFactory();
private static final MapFactory<IndexedWord, List<SemanticGraphEdge>> innerMapFactory = MapFactory.hashMapFactory();
private static final MapFactory<IndexedWord, IndexedWord> wordMapFactory = MapFactory.hashMapFactory();
private static final MapFactory<IndexedWord, Map<IndexedWord, List<SemanticGraphEdge>>> outerMapFactory = MapFactory.linkedHashMapFactory();
private static final MapFactory<IndexedWord, List<SemanticGraphEdge>> innerMapFactory = MapFactory.linkedHashMapFactory();
private static final MapFactory<IndexedWord, IndexedWord> wordMapFactory = MapFactory.linkedHashMapFactory();

private LinkedList<String> comments = new LinkedList<>();

Expand Down
17 changes: 6 additions & 11 deletions src/edu/stanford/nlp/semgraph/semgrex/SemgrexPattern.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,7 @@ abstract SemgrexMatcher matcher(SemanticGraph sg, Alignment alignment, SemanticG
* @return a SemgrexMatcher
*/
public SemgrexMatcher matcher(SemanticGraph sg) {
return matcher(sg, sg.getFirstRoot(), Generics.newHashMap(), Generics.newHashMap(),
new VariableStrings(), false);
return matcher(sg, sg.getFirstRoot(), new LinkedHashMap<>(), new LinkedHashMap<>(), new VariableStrings(), false);
}

/**
Expand All @@ -261,16 +260,15 @@ public SemgrexMatcher matcher(SemanticGraph sg) {
* @return a SemgrexMatcher
*/
public SemgrexMatcher matcher(SemanticGraph sg, IndexedWord root) {
return matcher(sg, root, Generics.<String, IndexedWord>newHashMap(), Generics.<String, String>newHashMap(),
new VariableStrings(), false);
return matcher(sg, root, new LinkedHashMap<>(), new LinkedHashMap<>(), new VariableStrings(), false);
}

/**
* Get a {@link SemgrexMatcher} for this pattern in this graph, with some
* initial conditions on the variable assignments
*/
public SemgrexMatcher matcher(SemanticGraph sg, Map<String, IndexedWord> variables) {
return matcher(sg, sg.getFirstRoot(), variables, Generics.newHashMap(), new VariableStrings(), false);
return matcher(sg, sg.getFirstRoot(), variables, new LinkedHashMap<>(), new VariableStrings(), false);
}

/**
Expand All @@ -282,18 +280,15 @@ public SemgrexMatcher matcher(SemanticGraph sg, Map<String, IndexedWord> variabl
* @return a SemgrexMatcher
*/
public SemgrexMatcher matcher(SemanticGraph sg, boolean ignoreCase) {
return matcher(sg, sg.getFirstRoot(), Generics.newHashMap(), Generics.newHashMap(),
new VariableStrings(), ignoreCase);
return matcher(sg, sg.getFirstRoot(), new LinkedHashMap<>(), new LinkedHashMap<>(), new VariableStrings(), ignoreCase);
}

public SemgrexMatcher matcher(SemanticGraph hypGraph, Alignment alignment, SemanticGraph txtGraph) {
return matcher(hypGraph, alignment, txtGraph, true, hypGraph.getFirstRoot(), Generics.newHashMap(),
Generics.newHashMap(), new VariableStrings(), false);
return matcher(hypGraph, alignment, txtGraph, true, hypGraph.getFirstRoot(), new LinkedHashMap<>(), new LinkedHashMap<>(), new VariableStrings(), false);
}

public SemgrexMatcher matcher(SemanticGraph hypGraph, Alignment alignment, SemanticGraph txtGraph, boolean ignoreCase) {
return matcher(hypGraph, alignment, txtGraph, true, hypGraph.getFirstRoot(), Generics.newHashMap(),
Generics.newHashMap(), new VariableStrings(), ignoreCase);
return matcher(hypGraph, alignment, txtGraph, true, hypGraph.getFirstRoot(), new LinkedHashMap<>(), new LinkedHashMap<>(), new VariableStrings(), ignoreCase);
}

// compile method
Expand Down
16 changes: 8 additions & 8 deletions test/src/edu/stanford/nlp/trees/UniversalEnglishGrammaticalStructureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2285,12 +2285,12 @@ public static Collection<Object[]> testCases() {
"nmod:in(failures-7, politics-9)\n" +
"case(economy-13, in-11)\n" +
"det(economy-13, the-12)\n" +
"nmod:in(failures-7'', economy-13)\n" +
"cc(failures-7', or-14)\n" +
"nmod:in(failures-7', economy-13)\n" +
"cc(failures-7'', or-14)\n" +
"case(front-18, on-15)\n" +
"det(front-18, the-16)\n" +
"amod(front-18, military-17)\n" +
"nmod:on(failures-7', front-18)\n" +
"nmod:on(failures-7'', front-18)\n" +
"cc(chalked-22, and-20)\n" +
"aux(chalked-22, has-21)\n" +
"conj:and(produced-4, chalked-22)\n" +
Expand Down Expand Up @@ -2382,18 +2382,18 @@ public static Collection<Object[]> testCases() {
"obl:out(walked-2, door-5)\n" +
"case(road-9, over-7)\n" +
"det(road-9, the-8)\n" +
"obl:over(walked-2''', road-9)\n" +
"obl:over(walked-2', road-9)\n" +
"case(block-14, across-11)\n" +
"det(block-14, the-12)\n" +
"amod(block-14, deserted-13)\n" +
"obl:across(walked-2'''', block-14)\n" +
"obl:across(walked-2'', block-14)\n" +
"case(corner-18, around-16)\n" +
"det(corner-18, the-17)\n" +
"obl:around(walked-2', corner-18)\n" +
"cc(walked-2'', and-20)\n" +
"obl:around(walked-2''', corner-18)\n" +
"cc(walked-2'''', and-20)\n" +
"case(park-23, through-21)\n" +
"det(park-23, the-22)\n" +
"obl:through(walked-2'', park-23)\n"},
"obl:through(walked-2'''', park-23)\n"},
{TestType.CC_PROCESSED,
"(ROOT (S (NP (NNP John)) (VP (VP (VBD noticed) (NP (DT a) (NN cockroach))) (CC and) (VP (VBD departed))) (. .)))",
"nsubj(noticed-2, John-1)\n" +
Expand Down