Revision: 18959
http://sourceforge.net/p/gate/code/18959
Author: johann_p
Date: 2015-10-25 15:10:35 +0000 (Sun, 25 Oct 2015)
Log Message:
-----------
Undo the changes of revision 18958. We cannot upgrade to
version 3.5.2 because the Stanford jars are compiled using
Java 8 and we still need to stick with Java 7.
Revision Links:
--------------
http://sourceforge.net/p/gate/code/18958
Modified Paths:
--------------
gate/trunk/plugins/Stanford_CoreNLP/creole.xml
gate/trunk/plugins/Stanford_CoreNLP/resources/english.all.3class.distsim.crf.ser.gz
gate/trunk/plugins/Stanford_CoreNLP/src/gate/stanford/DependencyMode.java
gate/trunk/plugins/Stanford_CoreNLP/src/gate/stanford/Parser.java
Added Paths:
-----------
gate/trunk/plugins/Stanford_CoreNLP/lib/stanford-ner-3.4.jar
gate/trunk/plugins/Stanford_CoreNLP/lib/stanford-parser-3.4.jar
gate/trunk/plugins/Stanford_CoreNLP/lib/stanford-postagger-3.4.jar
Removed Paths:
-------------
gate/trunk/plugins/Stanford_CoreNLP/lib/stanford-ner-3.5.2.jar
gate/trunk/plugins/Stanford_CoreNLP/lib/stanford-parser-3.5.2.jar
gate/trunk/plugins/Stanford_CoreNLP/lib/stanford-postagger-3.5.2.jar
Modified: gate/trunk/plugins/Stanford_CoreNLP/creole.xml
===================================================================
--- gate/trunk/plugins/Stanford_CoreNLP/creole.xml 2015-10-25 14:45:28 UTC
(rev 18958)
+++ gate/trunk/plugins/Stanford_CoreNLP/creole.xml 2015-10-25 15:10:35 UTC
(rev 18959)
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<CREOLE-DIRECTORY ID="Stanford CoreNLP tools" VERSION="2015.1025"
DESCRIPTION="Stanford CoreNLP" GATE-MIN="8.0">
+<CREOLE-DIRECTORY ID="Stanford CoreNLP tools" VERSION="2014.0613"
DESCRIPTION="Stanford CoreNLP" GATE-MIN="8.0">
<JAR SCAN="true">gate-stanford.jar</JAR>
- <JAR>lib/stanford-ner-3.5.2.jar</JAR>
- <JAR>lib/stanford-parser-3.5.2.jar</JAR>
+ <JAR>lib/stanford-ner-3.4.jar</JAR>
+ <JAR>lib/stanford-parser-3.4.jar</JAR>
<JAR>lib/ejml-0.23.jar</JAR>
- <JAR>lib/stanford-postagger-3.5.2.jar</JAR>
+ <JAR>lib/stanford-postagger-3.4.jar</JAR>
</CREOLE-DIRECTORY>
Copied: gate/trunk/plugins/Stanford_CoreNLP/lib/stanford-ner-3.4.jar (from rev
18957, gate/trunk/plugins/Stanford_CoreNLP/lib/stanford-ner-3.4.jar)
===================================================================
(Binary files differ)
Deleted: gate/trunk/plugins/Stanford_CoreNLP/lib/stanford-ner-3.5.2.jar
===================================================================
(Binary files differ)
Copied: gate/trunk/plugins/Stanford_CoreNLP/lib/stanford-parser-3.4.jar (from
rev 18957, gate/trunk/plugins/Stanford_CoreNLP/lib/stanford-parser-3.4.jar)
===================================================================
(Binary files differ)
Deleted: gate/trunk/plugins/Stanford_CoreNLP/lib/stanford-parser-3.5.2.jar
===================================================================
(Binary files differ)
Copied: gate/trunk/plugins/Stanford_CoreNLP/lib/stanford-postagger-3.4.jar
(from rev 18957,
gate/trunk/plugins/Stanford_CoreNLP/lib/stanford-postagger-3.4.jar)
===================================================================
(Binary files differ)
Deleted: gate/trunk/plugins/Stanford_CoreNLP/lib/stanford-postagger-3.5.2.jar
===================================================================
(Binary files differ)
Modified:
gate/trunk/plugins/Stanford_CoreNLP/resources/english.all.3class.distsim.crf.ser.gz
===================================================================
(Binary files differ)
Modified:
gate/trunk/plugins/Stanford_CoreNLP/src/gate/stanford/DependencyMode.java
===================================================================
--- gate/trunk/plugins/Stanford_CoreNLP/src/gate/stanford/DependencyMode.java
2015-10-25 14:45:28 UTC (rev 18958)
+++ gate/trunk/plugins/Stanford_CoreNLP/src/gate/stanford/DependencyMode.java
2015-10-25 15:10:35 UTC (rev 18959)
@@ -14,7 +14,6 @@
import java.util.Collection;
import edu.stanford.nlp.trees.GrammaticalStructure;
-import edu.stanford.nlp.trees.GrammaticalStructure.Extras;
import edu.stanford.nlp.trees.TypedDependency;
public enum DependencyMode {
@@ -28,22 +27,17 @@
DependencyMode mode, boolean includeExtras) {
Collection<TypedDependency> result = null;
- Extras incl = Extras.NONE;
- if(includeExtras) {
- incl = Extras.MAXIMAL;
- }
-
if (mode.equals(Typed)) {
- result = gs.typedDependencies(incl);
+ result = gs.typedDependencies(includeExtras);
}
else if (mode.equals(AllTyped)) {
result = gs.allTypedDependencies();
}
else if (mode.equals(TypedCollapsed)) {
- result = gs.typedDependenciesCollapsed(incl);
+ result = gs.typedDependenciesCollapsed(includeExtras);
}
else if (mode.equals(TypedCCprocessed)) {
- result = gs.typedDependenciesCCprocessed(incl);
+ result = gs.typedDependenciesCCprocessed(includeExtras);
}
return result;
Modified: gate/trunk/plugins/Stanford_CoreNLP/src/gate/stanford/Parser.java
===================================================================
--- gate/trunk/plugins/Stanford_CoreNLP/src/gate/stanford/Parser.java
2015-10-25 14:45:28 UTC (rev 18958)
+++ gate/trunk/plugins/Stanford_CoreNLP/src/gate/stanford/Parser.java
2015-10-25 15:10:35 UTC (rev 18959)
@@ -23,6 +23,7 @@
import gate.AnnotationSet;
import gate.Factory;
import gate.FeatureMap;
+import gate.Gate;
import gate.ProcessingResource;
import gate.Resource;
import gate.creole.ANNIEConstants;
@@ -447,14 +448,11 @@
if(debugMode) {
System.out.println(dependency);
}
-
- // Does not work in version 3.5.2 any more
- //int governorIndex = dependency.gov().label().index() - 1;
- int governorIndex = dependency.gov().index()-1;
+
+ int governorIndex = dependency.gov().label().index() - 1;
governor = stanfordSentence.startPos2token(governorIndex);
- //int dependentIndex = dependency.dep().label().index() - 1;
- int dependentIndex = dependency.dep().index()-1;
+ int dependentIndex = dependency.dep().label().index() - 1;
dependent = stanfordSentence.startPos2token(dependentIndex);
dependencyKind = dependency.reln().toString();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
