Merge branch 'master' of jacob:/u/nlp/git/javanlp

Author: Gabor Angeli

scripts/ner/english.conll.4class.caseless.distsim.prop

@@ -11,6 +11,9 @@ useKnownLCWords = false
 
 useDistSim = true
 distSimLexicon = /u/nlp/data/pos_tags_are_useless/egw4-reut.512.clusters
+# right options for egw4-reut.512 (though effect of having or not is small)
+numberEquivalenceDistSim = true
+unknownWordDistSimClass = 0
 
 map = word=0,answer=1
 

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

@@ -14,7 +14,7 @@
 /**
  * This class adds dependency parse information to an Annotation.
  *
- * Parse trees are added to each sentence under the annotation
+ * Dependency parses are added to each sentence under the annotation
  * {@link edu.stanford.nlp.semgraph.SemanticGraphCoreAnnotations.BasicDependenciesAnnotation}.
  *
  * @author Jon Gauthier
@@ -30,10 +30,11 @@ public class DependencyParseAnnotator extends SentenceAnnotator {
    * Maximum parse time (in milliseconds) for a sentence
    */
   private final long maxTime;
+  private static final long DEFAULT_MAXTIME = Long.MAX_VALUE;
+
   /**
-   * If true, include the extra arcs in the dependency representaion.
+   * If true, include the extra arcs in the dependency representation.
    */
-  private static final long DEFAULT_MAXTIME = Long.MAX_VALUE;
   private final GrammaticalStructure.Extras extraDependencies;
 
   public DependencyParseAnnotator() {
@@ -90,10 +91,8 @@ public Set<Requirement> requirementsSatisfied() {
   }
 
   public static String signature(String annotatorName, Properties props) {
-    StringBuilder os = new StringBuilder();
-    os.append(annotatorName).append(".extradependencies:");
-    os.append(props.getProperty(annotatorName + ".extradependencies", "NONE").toLowerCase());
-    return os.toString();
+    return annotatorName +
+            ".extradependencies:" + props.getProperty(annotatorName + ".extradependencies", "NONE").toLowerCase();
   }
 
 }