Merge pull request #583 from cowchipkid/master

Single Precision DVector
CogComp · Nov 10, 2017 · 7bd7f2f · 7bd7f2f
2 parents a48a4f1 + 6c07e59
commit 7bd7f2f
Show file tree

Hide file tree

Showing 48 changed files with 938 additions and 364 deletions.
diff --git a/big-data-utils/pom.xml b/big-data-utils/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>illinois-cogcomp-nlp</artifactId>
         <groupId>edu.illinois.cs.cogcomp</groupId>
-        <version>3.1.36</version>
+        <version>4.0.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>edu.illinois.cs.cogcomp</groupId>
             <artifactId>illinois-core-utilities</artifactId>
-            <version>3.1.36</version>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.xeustechnologies.google-api</groupId>

diff --git a/chunker/pom.xml b/chunker/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <artifactId>illinois-cogcomp-nlp</artifactId>
         <groupId>edu.illinois.cs.cogcomp</groupId>
-        <version>3.1.36</version>
+        <version>4.0.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -13,7 +13,7 @@
         <dependency>
             <groupId>edu.illinois.cs.cogcomp</groupId>
             <artifactId>illinois-core-utilities</artifactId>
-            <version>3.1.36</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>edu.illinois.cs.cogcomp</groupId>
             <artifactId>LBJava-NLP-tools</artifactId>
-            <version>3.1.36</version>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>edu.illinois.cs.cogcomp</groupId>
             <artifactId>illinois-pos</artifactId>
-            <version>3.1.36</version>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>edu.illinois.cs.cogcomp</groupId>

diff --git a/commasrl/pom.xml b/commasrl/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>illinois-cogcomp-nlp</artifactId>
         <groupId>edu.illinois.cs.cogcomp</groupId>
-        <version>3.1.36</version>
+        <version>4.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -35,48 +35,48 @@
         <dependency>
             <groupId>edu.illinois.cs.cogcomp</groupId>
             <artifactId>illinois-core-utilities</artifactId>
-            <version>3.1.36</version>
+            <version>4.0.0</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>edu.illinois.cs.cogcomp</groupId>
             <artifactId>illinois-curator</artifactId>
-            <version>3.1.36</version>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>edu.illinois.cs.cogcomp</groupId>
             <artifactId>illinois-tokenizer</artifactId>
-            <version>3.1.36</version>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>edu.illinois.cs.cogcomp</groupId>
             <artifactId>illinois-corpusreaders</artifactId>
-            <version>3.1.36</version>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>edu.illinois.cs.cogcomp</groupId>
             <artifactId>illinois-inference</artifactId>
-            <version>3.1.36</version>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>edu.illinois.cs.cogcomp</groupId>
             <artifactId>stanford_3.3.1</artifactId>
-            <version>3.1.36</version>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>edu.illinois.cs.cogcomp</groupId>
             <artifactId>illinois-pos</artifactId>
-            <version>3.1.36</version>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>edu.illinois.cs.cogcomp</groupId>
             <artifactId>illinois-ner</artifactId>
-            <version>3.1.36</version>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>edu.illinois.cs.cogcomp</groupId>
             <artifactId>illinois-chunker</artifactId>
-            <version>3.1.36</version>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>edu.illinois.cs.cogcomp</groupId>

diff --git a/core-utilities/pom.xml b/core-utilities/pom.xml
@@ -2,12 +2,12 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>illinois-cogcomp-nlp</artifactId>
         <groupId>edu.illinois.cs.cogcomp</groupId>
-        <version>3.1.36</version>
+        <version>4.0.0</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>illinois-core-utilities</artifactId>
 

diff --git a/...c/main/java/edu/illinois/cs/cogcomp/core/datastructures/textannotation/SpanLabelView.java b/...c/main/java/edu/illinois/cs/cogcomp/core/datastructures/textannotation/SpanLabelView.java
@@ -62,7 +62,17 @@ public SpanLabelView(String viewName, String viewGenerator, TextAnnotation text,
     public void addConstituent(Constituent constituent) {
         super.addConstituent(constituent);
 
-        Collections.sort(this.constituents, TextAnnotationUtilities.constituentStartComparator);
+        // this sort is grossly inefficient when appending contiguous tokens one at a time. 
+        // we add a check so we only do the sort if the constituents are added out of order.
+        // Better yet use an ordered tree map representation, do an insertion sort.
+        int size = this.constituents.size();
+        if (size > 1) {
+            Constituent before = this.constituents.get(size-2);
+            Constituent after = this.constituents.get(size-1);
+            if (before.getStartSpan() > after.getStartSpan()) {
+                Collections.sort(this.constituents, TextAnnotationUtilities.constituentStartComparator);
+            }
+        }
     }
 
     /**