Skip to content

Commit 6587bea

Browse files
authored
Merge pull request #1110 from stanfordnlp/dev
Update to 4.2.0
2 parents f362675 + f6f3257 commit 6587bea

File tree

142 files changed

+171418
-189795
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+171418
-189795
lines changed

.classpath

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" path="itest/src"/>
4+
<classpathentry kind="src" path="src"/>
5+
<classpathentry kind="src" path="test/src"/>
6+
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
7+
<classpathentry exported="true" kind="lib" path="lib/ant-contrib-1.0b3.jar" sourcepath="libsrc/ant-contrib-1.0b3-src.zip"/>
8+
<classpathentry exported="true" kind="lib" path="lib/tomcat/el-api.jar" sourcepath="libsrc/tomcat/apache-tomcat-7.0.12-src.zip"/>
9+
<classpathentry exported="true" kind="lib" path="lib/tomcat/jasper.jar" sourcepath="libsrc/tomcat/apache-tomcat-7.0.12-src.zip"/>
10+
<classpathentry exported="true" kind="lib" path="lib/tomcat/tomcat-juli.jar" sourcepath="libsrc/tomcat/apache-tomcat-7.0.12-src.zip"/>
11+
<classpathentry exported="true" kind="lib" path="lib/tomcat/jasper-el.jar" sourcepath="libsrc/tomcat/apache-tomcat-7.0.12-src.zip"/>
12+
<classpathentry exported="true" kind="lib" path="lib/tomcat/jsp-api.jar" sourcepath="libsrc/tomcat/apache-tomcat-7.0.12-src.zip"/>
13+
<classpathentry exported="true" kind="lib" path="lib/tomcat/tomcat-api.jar" sourcepath="libsrc/tomcat/apache-tomcat-7.0.12-src.zip"/>
14+
<classpathentry exported="true" kind="lib" path="lib/commons-logging.jar" sourcepath="libsrc/commons-logging-1.1.1-sources.jar"/>
15+
<classpathentry exported="true" kind="lib" path="lib/junit-4.13.1.jar" sourcepath="libsrc/junit-4.13.1-sources.jar"/>
16+
<classpathentry exported="true" kind="lib" path="lib/javax.servlet.jar" sourcepath="libsrc/tomcat/apache-tomcat-7.0.12-src.zip"/>
17+
<classpathentry exported="true" kind="lib" path="lib/AppleJavaExtensions.jar"/>
18+
<classpathentry exported="true" kind="lib" path="lib/jflex-1.8.2.jar" sourcepath="libsrc/jflex-1.8.2-src.zip"/>
19+
<classpathentry exported="true" kind="lib" path="lib/xom-1.3.2.jar" sourcepath="libsrc/xom-1.3.2-sources.jar"/>
20+
<classpathentry exported="true" kind="lib" path="lib/joda-time.jar" sourcepath="libsrc/joda-time-2.10.5-sources.jar"/>
21+
<classpathentry exported="true" kind="lib" path="lib/jollyday-0.4.9.jar" sourcepath="libsrc/jollyday-0.4.9-sources.jar"/>
22+
<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.16.jar" sourcepath="libsrc/log4j-1.2.16-src.zip"/>
23+
<classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.1.jar" sourcepath="libsrc/commons-lang3-3.1-sources.jar"/>
24+
<classpathentry exported="true" kind="lib" path="lib/protobuf.jar" sourcepath="libsrc/protobuf-java-3.9.2-sources.jar"/>
25+
<classpathentry exported="true" kind="lib" path="lib/javacc.jar"/>
26+
<classpathentry exported="true" kind="lib" path="lib/javax.json.jar" sourcepath="libsrc/javax.json-api-1.0-sources.jar"/>
27+
<classpathentry exported="true" kind="lib" path="lib/lucene-core-7.5.0.jar" sourcepath="libsrc/lucene-core-7.5.0-sources.jar"/>
28+
<classpathentry exported="true" kind="lib" path="lib/lucene-demo-7.5.0.jar" sourcepath="libsrc/lucene-demo-7.5.0-sources.jar"/>
29+
<classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-common-7.5.0.jar" sourcepath="lucene-analyzers-common-7.5.0-sources.jar"/>
30+
<classpathentry exported="true" kind="lib" path="lib/lucene-queryparser-7.5.0.jar" sourcepath="lucene-queryparser-7.5.0-sources.jar"/>
31+
<classpathentry exported="true" kind="lib" path="lib/slf4j-api.jar" sourcepath="libsrc/slf4j-api-1.7.12-sources.jar"/>
32+
<classpathentry exported="true" kind="lib" path="lib/slf4j-simple.jar" sourcepath="libsrc/slf4j-simple-1.7.12-sources.jar"/>
33+
<classpathentry exported="true" kind="lib" path="lib/javax.activation-api-1.2.0.jar" sourcepath="libsrc/javax.activation-api-1.2.0-sources.jar"/>
34+
<classpathentry exported="true" kind="lib" path="lib/jaxb-api-2.4.0-b180830.0359.jar" sourcepath="libsrc/jaxb-api-2.4.0-b180830.0359-sources.jar"/>
35+
<classpathentry exported="true" kind="lib" path="lib/jaxb-core-2.3.0.1.jar" sourcepath="libsrc/jaxb-core-2.3.0.1-sources.jar"/>
36+
<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.4.0-b180830.0438.jar" sourcepath="libsrc/jaxb-impl-2.4.0-b180830.0438-sources.jar"/>
37+
<classpathentry exported="true" kind="lib" path="lib/ejml-core-0.39.jar" sourcepath="libsrc/projects/core/libsrc/ejml-core-0.39-sources.jar"/>
38+
<classpathentry exported="true" kind="lib" path="lib/ejml-ddense-0.39.jar" sourcepath="libsrc/projects/core/libsrc/ejml-ddense-0.39-sources.jar"/>
39+
<classpathentry exported="true" kind="lib" path="lib/ejml-simple-0.39.jar" sourcepath="libsrc/projects/core/libsrc/ejml-simple-0.39-sources.jar"/>
40+
<classpathentry kind="lib" path="liblocal/antlr-runtime.jar"/>
41+
<classpathentry kind="lib" path="liblocal/hamcrest-2.2.jar " sourcepath="libsrc/hamcrest-2.2-sources.jar"/>
42+
<classpathentry kind="lib" path="liblocal/javaruntype.jar"/>
43+
- <classpathentry kind="lib" path="liblocal/junit-quickcheck-core-0.4.jar" sourcepath="libsrc/junit-quickcheck-core-0.4-sources.jar"/>
44+
- <classpathentry kind="lib" path="liblocal/junit-quickcheck-generators-0.4.jar" sourcepath="libsrc/junit-quickcheck-generators-0.4-sources.jar"/>
45+
<classpathentry kind="lib" path="liblocal/junit-theories.jar"/>
46+
<classpathentry kind="lib" path="liblocal/ognl.jar"/>
47+
<classpathentry kind="output" path="classes"/>
48+
</classpath>

.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,11 @@
88

99
# stuff gets built here
1010
classes/**
11+
12+
# IntelliJ IDEA
13+
*.eml
14+
*.iml
15+
.idea/**
16+
17+
# emacs
18+
*~

.project

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>CoreNLP</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.jdt.core.javanature</nature>
16+
</natures>
17+
</projectDescription>

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ models jar.
5252

5353
| Language | Model Jar | Last Updated |
5454
| --- | --- | --- |
55-
| Arabic | [download](http://nlp.stanford.edu/software/stanford-arabic-corenlp-models-current.jar) | 4.1.0 |
56-
| English (default) | [download](http://nlp.stanford.edu/software/stanford-corenlp-models-current.jar) | 4.1.0 |
57-
| English (extra) | [download](http://nlp.stanford.edu/software/stanford-english-corenlp-models-current.jar) | 4.1.0 |
58-
| English (kbp) | [download](http://nlp.stanford.edu/software/stanford-english-kbp-corenlp-models-current.jar) | 4.1.0 |
59-
| Chinese | [download](http://nlp.stanford.edu/software/stanford-chinese-corenlp-models-current.jar) | 4.1.0 |
60-
| French | [download](http://nlp.stanford.edu/software/stanford-french-corenlp-models-current.jar) | 4.1.0 |
61-
| German | [download](http://nlp.stanford.edu/software/stanford-german-corenlp-models-current.jar) | 4.1.0 |
62-
| Spanish | [download](http://nlp.stanford.edu/software/stanford-spanish-corenlp-models-current.jar) | 4.1.0 |
55+
| Arabic | [download](http://nlp.stanford.edu/software/stanford-corenlp-4.2.0-models-arabic.jar) | 4.2.0 |
56+
| Chinese | [download](http://nlp.stanford.edu/software/stanford-corenlp-4.2.0-models-chinese.jar) | 4.2.0 |
57+
| English (default) | [download](http://nlp.stanford.edu/software/stanford-corenlp-4.2.0-models.jar) | 4.2.0 |
58+
| English (extra) | [download](http://nlp.stanford.edu/software/stanford-corenlp-4.2.0-models-english.jar) | 4.2.0 |
59+
| English (kbp) | [download](http://nlp.stanford.edu/software/stanford-corenlp-4.2.0-models-english-kbp.jar) | 4.2.0 |
60+
| French | [download](http://nlp.stanford.edu/software/stanford-corenlp-4.2.0-models-french.jar) | 4.2.0 |
61+
| German | [download](http://nlp.stanford.edu/software/stanford-corenlp-4.2.0-models-german.jar) | 4.2.0 |
62+
| Spanish | [download](http://nlp.stanford.edu/software/stanford-corenlp-4.2.0-models-spanish.jar) | 4.2.0 |
6363

6464
### Useful resources
6565

build.xml

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,14 @@
3333
</path>
3434
</target>
3535

36+
<target name="models.classpath" description="Sets the models classpath, for itests and such">
37+
<path id="models.classpath">
38+
<fileset dir="${env.CORENLP_MODELS_HOME}">
39+
<include name="*.jar"/>
40+
</fileset>
41+
</path>
42+
</target>
43+
3644
<target name="clean" description="Delete old classes">
3745
<echo message="${ant.project.name}" />
3846
<delete dir="${build.path}"/>
@@ -69,7 +77,7 @@
6977

7078
<taskdef classname="jflex.anttask.JFlexTask" name="jflex">
7179
<classpath>
72-
<pathelement location="${project.core}/lib/jflex-1.6.1.jar"/>
80+
<pathelement location="${project.core}/lib/jflex-full-1.8.2.jar"/>
7381
</classpath>
7482
</taskdef>
7583

@@ -159,12 +167,13 @@
159167
<fail message="Test error or failure detected, check test results." if="test.failed" />
160168
</target>
161169

162-
<target name="itest" depends="classpath,compile"
170+
<target name="itest" depends="classpath,compile,models.classpath"
163171
description="Run core integration tests">
164172
<echo message="${ant.project.name}" />
165173
<junit fork="yes" maxmemory="12g" printsummary="off" outputtoformatters="false" forkmode="perTest" haltonfailure="no"
166174
haltonerror="no" failureproperty="test.failed" errorproperty="test.failed">
167175
<classpath refid="classpath"/>
176+
<classpath refid="models.classpath"/>
168177
<classpath path="${build.path}"/>
169178
<classpath path="${data.path}"/>
170179
<classpath path="${source.path}"/>
@@ -179,12 +188,13 @@
179188
<fail message="Test error or failure detected, check test results." if="test.failed" />
180189
</target>
181190

182-
<target name="itest-many-docs" depends="classpath"
191+
<target name="itest-many-docs" depends="classpath,compile,models.classpath"
183192
description="Run StanfordCoreNLP on a large volume of documents.">
184193
<echo message="${ant.project.name}" />
185194
<junit fork="yes" maxmemory="14g" printsummary="off" outputtoformatters="false" forkmode="perTest" haltonfailure="no"
186195
haltonerror="no" failureproperty="test.failed" errorproperty="test.failed">
187196
<classpath refid="classpath"/>
197+
<classpath refid="models.classpath"/>
188198
<classpath path="${build.path}"/>
189199
<classpath path="${data.path}"/>
190200
<classpath path="${source.path}"/>
@@ -198,12 +208,13 @@
198208
<fail message="Test error or failure detected, check test results." if="test.failed" />
199209
</target>
200210

201-
<target name="itest-coreference" depends="classpath"
211+
<target name="itest-coreference" depends="classpath,compile,models.classpath"
202212
description="Coreference related slow itests.">
203213
<echo message="${ant.project.name}" />
204214
<junit fork="yes" maxmemory="7g" printsummary="off" outputtoformatters="false" forkmode="perTest" haltonfailure="no"
205215
haltonerror="no" failureproperty="test.failed" errorproperty="test.failed">
206216
<classpath refid="classpath"/>
217+
<classpath refid="models.classpath"/>
207218
<classpath path="${build.path}"/>
208219
<classpath path="${data.path}"/>
209220
<classpath path="${source.path}"/>
@@ -220,12 +231,13 @@
220231
<fail message="Test error or failure detected, check test results." if="test.failed" />
221232
</target>
222233

223-
<target name="itest-protobuf" depends="classpath"
234+
<target name="itest-protobuf" depends="classpath,compile,models.classpath"
224235
description="Protocol buffer related slow itests.">
225236
<echo message="${ant.project.name}" />
226237
<junit fork="yes" maxmemory="14g" printsummary="off" outputtoformatters="false" forkmode="perTest" haltonfailure="no"
227238
haltonerror="no" failureproperty="test.failed" errorproperty="test.failed">
228239
<classpath refid="classpath"/>
240+
<classpath refid="models.classpath"/>
229241
<classpath path="${build.path}"/>
230242
<classpath path="${data.path}"/>
231243
<classpath path="${source.path}"/>
@@ -239,12 +251,13 @@
239251
<fail message="Test error or failure detected, check test results." if="test.failed" />
240252
</target>
241253

242-
<target name="itest-kbp" depends="classpath"
254+
<target name="itest-kbp" depends="classpath,compile,models.classpath"
243255
description="KBP related slow itests.">
244256
<echo message="${ant.project.name}" />
245257
<junit fork="yes" maxmemory="14g" printsummary="off" outputtoformatters="false" forkmode="perTest" haltonfailure="no"
246258
haltonerror="no" failureproperty="test.failed" errorproperty="test.failed">
247259
<classpath refid="classpath"/>
260+
<classpath refid="models.classpath"/>
248261
<classpath path="${build.path}"/>
249262
<classpath path="${data.path}"/>
250263
<classpath path="${source.path}"/>
@@ -258,34 +271,36 @@
258271
<fail message="Test error or failure detected, check test results." if="test.failed" />
259272
</target>
260273

261-
<target name="itest-ner" depends="classpath"
274+
<target name="itest-ner" depends="classpath,compile,models.classpath"
262275
description="NER related slow itests">
263276
<echo message="${ant.project.name}" />
264-
<junit fork="yes" maxmemory="14g" printsummary="off" outputtoformatters="false" forkmode="perTest" haltonfailure="no"
277+
<junit fork="yes" maxmemory="8g" printsummary="off" outputtoformatters="false" forkmode="perTest" haltonfailure="no"
265278
haltonerror="no" failureproperty="test.failed" errorproperty="test.failed">
266279
<classpath refid="classpath"/>
280+
<classpath refid="models.classpath"/>
267281
<classpath path="${build.path}"/>
268282
<classpath path="${data.path}"/>
269283
<classpath path="${source.path}"/>
270284
<formatter type="brief" usefile="false"/>
271285
<batchtest fork="yes">
272286
<fileset dir="${itests.path}">
273287
<include name="**/NERBenchmark*SlowITest.java"/>
274-
<include name="**/TrainCRFClassifierSlowITest.java"/>
275288
<include name="**/NERPipelineEndToEndSlowITest.java"/>
276289
<include name="**/NERTokenizationSlowITest.java"/>
290+
<include name="**/TrainCRFClassifierSlowITest.java"/>
277291
</fileset>
278292
</batchtest>
279293
</junit>
280294
<fail message="Test error or failure detected, check test results." if="test.failed" />
281295
</target>
282296

283-
<target name="itest-misc" depends="classpath"
297+
<target name="itest-misc" depends="classpath,compile,models.classpath"
284298
description="Other assorted slow itests">
285299
<echo message="${ant.project.name}" />
286300
<junit fork="yes" maxmemory="14g" printsummary="off" outputtoformatters="false" forkmode="perTest" haltonfailure="no"
287301
haltonerror="no" failureproperty="test.failed" errorproperty="test.failed">
288302
<classpath refid="classpath"/>
303+
<classpath refid="models.classpath"/>
289304
<classpath path="${build.path}"/>
290305
<classpath path="${data.path}"/>
291306
<classpath path="${source.path}"/>
@@ -300,7 +315,7 @@
300315
<fail message="Test error or failure detected, check test results." if="test.failed" />
301316
</target>
302317

303-
<target name="itest-debug" depends="classpath"
318+
<target name="itest-debug" depends="classpath,compile,models.classpath"
304319
description="target for debug purposes">
305320
<echo message="${ant.project.name}" />
306321
<junit fork="yes" maxmemory="14g" printsummary="off" outputtoformatters="false" forkmode="perTest" haltonfailure="no"

data/edu/stanford/nlp/classify/iris.prop

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ tolerance=1e-4
3131
#
3232
#trainFile=./examples/iris.train
3333
#testFile=./examples/iris.test
34-
trainFile=./projects/core/data/edu/stanford/nlp/classify/iris.train
35-
testFile=./projects/core/data/edu/stanford/nlp/classify/iris.test
34+
trainFile=data/edu/stanford/nlp/classify/iris.train
35+
testFile=data/edu/stanford/nlp/classify/iris.test

0 commit comments

Comments
 (0)