Start to make changes for avoiding conjunction loop, but don't yet ac…

…tivate them.

itest/src/edu/stanford/nlp/parser/DependencyIndexITest.java

@@ -85,7 +85,7 @@ private static void checkTree(Tree tree) {
  GrammaticalStructureFactory gsf = tlp.grammaticalStructureFactory();
 
  GrammaticalStructure gs = gsf.newGrammaticalStructure(tree);
- Collection<TypedDependency> deps = gs.typedDependenciesCCprocessed(GrammaticalStructure.Extras.MAXIMAL);
+ Collection<TypedDependency> deps = gs.typedDependenciesCCprocessed(true);
  // System.out.println(deps);
 
  // collect all nodes in deps

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

@@ -224,20 +224,11 @@ private void testAnnotators(String annotators) {
  } catch (Exception e) { throw new RuntimeException(e); }
  }
 
- /*
- @Test
- public void testMentions() {
- testAnnotators("tokenize,ssplit,pos,lemma,ner,mentions");
- }
- */
-
-
  @Test
  public void testSentiment() {
  testAnnotators("tokenize,ssplit,pos,parse,sentiment");
  }
 
- /*
  @Test
  public void testGetPossibleAnnotators() {
  assertNotNull(possibleAnnotators());
@@ -382,13 +373,11 @@ public void testSerializeSSplitTokensRegression() {
  public void testSerializeNatLog() {
  testAnnotators("tokenize,ssplit,pos,lemma,parse,natlog");
  }
- */
 
  /**
  * Is the protobuf annotator "CoreNLP complete?"
  * That is, does it effectively save every combination of annotators possible?
  */
- /*
  @Test
  public void testAllAnnotatorCombinations() {
  String[] possibleAnnotators = possibleAnnotators();
@@ -431,6 +420,5 @@ public void testAllAnnotatorCombinations() {
  testAnnotators(StringUtils.join(annotators, ","));
  }
  }
- */
 
 }

src/edu/stanford/nlp/dcoref/CoNLLMentionExtractor.java

@@ -37,7 +37,6 @@
 import edu.stanford.nlp.ling.CoreAnnotations;
 import edu.stanford.nlp.ling.CoreLabel;
 import edu.stanford.nlp.pipeline.Annotation;
-import edu.stanford.nlp.trees.GrammaticalStructure;
 import edu.stanford.nlp.trees.Tree;
 import edu.stanford.nlp.trees.TreeCoreAnnotations;
 import edu.stanford.nlp.trees.TreeLemmatizer;
@@ -119,9 +118,9 @@ public Document nextDoc() throws Exception {
  // generate the dependency graph
  try {
  SemanticGraph deps = SemanticGraphFactory.makeFromTree(tree,
- SemanticGraphFactory.Mode.COLLAPSED, includeExtras ? GrammaticalStructure.Extras.MAXIMAL : GrammaticalStructure.Extras.NONE, threadSafe);
+ SemanticGraphFactory.Mode.COLLAPSED, includeExtras, threadSafe);
  SemanticGraph basicDeps = SemanticGraphFactory.makeFromTree(tree,
- SemanticGraphFactory.Mode.BASIC, includeExtras ? GrammaticalStructure.Extras.MAXIMAL : GrammaticalStructure.Extras.NONE, threadSafe);
+ SemanticGraphFactory.Mode.BASIC, includeExtras, threadSafe);
  sentence.set(SemanticGraphCoreAnnotations.BasicDependenciesAnnotation.class, basicDeps);
  sentence.set(SemanticGraphCoreAnnotations.CollapsedDependenciesAnnotation.class, deps);
  } catch(Exception e) {

src/edu/stanford/nlp/pipeline/AnnotatorFactories.java

@@ -558,7 +558,7 @@ public Annotator create() {
 
  @Override
  protected String additionalSignature() {
- return DependencyParseAnnotator.signature(StanfordCoreNLP.STANFORD_DEPENDENCIES, properties);
+ return "";
  }
  };
  }

src/edu/stanford/nlp/pipeline/CharniakParserAnnotator.java

@@ -8,7 +8,6 @@
 import edu.stanford.nlp.parser.common.ParserUtils;
 import edu.stanford.nlp.parser.charniak.CharniakParser;
 import edu.stanford.nlp.trees.EnglishGrammaticalStructureFactory;
-import edu.stanford.nlp.trees.GrammaticalStructure;
 import edu.stanford.nlp.trees.GrammaticalStructureFactory;
 import edu.stanford.nlp.trees.Tree;
 import edu.stanford.nlp.util.CoreMap;
@@ -65,7 +64,7 @@ public void annotate(Annotation annotation) {
  tree = ParserUtils.xTree(words);
  }
 
- ParserAnnotatorUtils.fillInParseAnnotations(VERBOSE, BUILD_GRAPHS, gsf, sentence, tree, GrammaticalStructure.Extras.NONE);
+ ParserAnnotatorUtils.fillInParseAnnotations(VERBOSE, BUILD_GRAPHS, gsf, sentence, tree);
  }
  } else {
  throw new RuntimeException("unable to find sentences in: " + annotation);

src/edu/stanford/nlp/pipeline/CoreNLP.proto

@@ -61,7 +61,6 @@ message Sentence {
  repeated Entity entity = 52;
  repeated Relation relation = 53;
  optional bool hasNumerizedTokensAnnotation = 54;
- repeated NERMention mentions = 55;
 
  extensions 100 to 255;
 }
@@ -81,8 +80,8 @@ message Token {
  optional string ner = 8; // The word's NER tag
  optional string normalizedNER = 9; // The word's normalized NER tag
  optional string lemma = 10; // The word's lemma
- optional uint32 beginChar = 11; // The character offset begin, in the document
- optional uint32 endChar = 12; // The character offset end, in the document
+ optional uint32 beginChar = 11; // The character offset begin
+ optional uint32 endChar = 12; // The character offset end
  optional uint32 utterance = 13; // The utterance tag used in dcoref
  optional string speaker = 14; // The speaker speaking this word
  optional uint32 beginIndex = 15; // The begin index of, e.g., a span
@@ -276,16 +275,3 @@ message Polarity {
  required NaturalLogicRelation projectCover = 6;
  required NaturalLogicRelation projectIndependence = 7;
 }
-
-//
-// An NER mention in the text
-//
-message NERMention {
- optional uint32 sentenceIndex = 1;
- required uint32 tokenStartInSentenceInclusive = 2;
- required uint32 tokenEndInSentenceExclusive = 3;
- required string ner = 4;
- optional string normalizedNER = 5;
- optional string entityType = 6;
- optional Timex timex = 7;
-}