closes #95

stanfordnlp · Oct 21, 2015 · 6a7a3f8 · 6a7a3f8
1 parent 05ac853
commit 6a7a3f8
Show file tree

Hide file tree

Showing 8 changed files with 195 additions and 1,690 deletions.
diff --git a/src/edu/stanford/nlp/ling/CoreAnnotations.java b/src/edu/stanford/nlp/ling/CoreAnnotations.java
@@ -451,9 +451,9 @@ public Class<String> getType() {
   /**
    * CoNLL-U dep parsing - span of multiword tokens
    */
-  public static class CoNLLUTokenSpanAnnotation implements CoreAnnotation<IntPair> {
+  public static class CoNLLUTokenSpanAnnotation implements CoreAnnotation<Pair<Integer,Integer>> {
-    public Class<IntPair> getType() {
+    public Class<Pair<Integer,Integer>> getType() {
-      return ErasureUtils.<Class<IntPair>> uncheckedCast(Pair.class);
+      return ErasureUtils.<Class<Pair<Integer,Integer>>> uncheckedCast(Pair.class);
     }
   }
 

diff --git a/src/edu/stanford/nlp/pipeline/CoreNLP.proto b/src/edu/stanford/nlp/pipeline/CoreNLP.proto
@@ -117,11 +117,6 @@ message Token {
   optional string    sentiment      = 30;   // The final sentiment of the sentence
   optional int32     quotationIndex = 31;   // The index of the quotation this token refers to
   optional MapStringString conllUFeatures = 32;
-  optional string coarseTag         = 33; //  The coarse POS tag (used to store the UPOS tag)
-  optional Span conllUTokenSpan     = 34;
-  optional string conllUMisc        = 35;
-  optional MapIntString conllUSecondaryDeps = 36;
-
 
   // Fields set by other annotators in CoreNLP
   optional string gender          = 51;  // gender annotation (machine reading)
@@ -376,13 +371,3 @@ message MapStringString {
   repeated string key   = 1;
   repeated string value = 2;
 }
-
-//
-// A map from integers to strings.
-// Used, minimally, in the CoNLLU featurizer
-//
-message MapIntString {
-  repeated uint32 key   = 1;
-  repeated string value = 2;
-}
-