Merge pull request #72 from dkpro/feature/71-Upgrade-to-DKPro-Core-1.…

…11.0 #71 - Upgrade to dk pro core 1.11.0
dkpro · Jul 14, 2019 · 40a261e · 40a261e
2 parents 45c5055 + 0506c8c
commit 40a261e
Show file tree

Hide file tree

Showing 125 changed files with 612 additions and 663 deletions.
diff --git a/dkpro-similarity-algorithms-lexical-asl/pom.xml b/dkpro-similarity-algorithms-lexical-asl/pom.xml
@@ -34,12 +34,12 @@
       <artifactId>dkpro-similarity-algorithms-vsm-asl</artifactId>
     </dependency>
     <dependency>
-      <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
-      <artifactId>de.tudarmstadt.ukp.dkpro.core.api.resources-asl</artifactId>
+      <groupId>org.dkpro.core</groupId>
+      <artifactId>dkpro-core-api-resources-asl</artifactId>
     </dependency>
     <dependency>
-      <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
-      <artifactId>de.tudarmstadt.ukp.dkpro.core.api.frequency-asl
+      <groupId>org.dkpro.core</groupId>
+      <artifactId>dkpro-core-api-frequency-asl
   		</artifactId>
     </dependency>
     <dependency>

diff --git a/...l/src/main/java/org/dkpro/similarity/algorithms/lexical/ngrams/CharacterNGramMeasure.java b/...l/src/main/java/org/dkpro/similarity/algorithms/lexical/ngrams/CharacterNGramMeasure.java
@@ -29,11 +29,10 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.dkpro.core.api.resources.ResourceUtils;
 import org.dkpro.similarity.algorithms.api.SimilarityException;
 import org.dkpro.similarity.algorithms.api.TextSimilarityMeasureBase;
 
-import de.tudarmstadt.ukp.dkpro.core.api.resources.ResourceUtils;
-
 /**
  * Character n-gram measure as described in
  * 

diff --git a/...al-asl/src/main/java/org/dkpro/similarity/algorithms/lexical/string/CosineSimilarity.java b/...al-asl/src/main/java/org/dkpro/similarity/algorithms/lexical/string/CosineSimilarity.java
@@ -29,16 +29,15 @@
 import java.util.Map;
 import java.util.Set;
 
-import no.uib.cipr.matrix.DenseVector;
-import no.uib.cipr.matrix.Vector;
-
 import org.apache.commons.io.FileUtils;
+import org.dkpro.core.api.frequency.util.FrequencyDistribution;
 import org.dkpro.similarity.algorithms.api.SimilarityException;
 import org.dkpro.similarity.algorithms.api.TextSimilarityMeasureBase;
 import org.dkpro.similarity.algorithms.vsm.InnerVectorProduct;
 import org.dkpro.similarity.algorithms.vsm.VectorNorm;
 
-import de.tudarmstadt.ukp.dkpro.core.api.frequency.util.FrequencyDistribution;
+import no.uib.cipr.matrix.DenseVector;
+import no.uib.cipr.matrix.Vector;
 
 public class CosineSimilarity
 	extends TextSimilarityMeasureBase

diff --git a/...n/java/org/dkpro/similarity/algorithms/lexical/string/util/gst/GeneralizedSuffixTree.java b/...n/java/org/dkpro/similarity/algorithms/lexical/string/util/gst/GeneralizedSuffixTree.java
@@ -21,7 +21,12 @@
  */
 package org.dkpro.similarity.algorithms.lexical.string.util.gst;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public class GeneralizedSuffixTree {
     // SOH - START OF HEADING

diff --git a/...xical-asl/src/main/java/org/dkpro/similarity/algorithms/lexical/string/util/gst/Node.java b/...xical-asl/src/main/java/org/dkpro/similarity/algorithms/lexical/string/util/gst/Node.java
@@ -21,8 +21,8 @@
  */
 package org.dkpro.similarity.algorithms.lexical.string.util.gst;
 
-import java.util.Collection;
-import java.util.HashMap;
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
 
 public class Node {

diff --git a/...c/test/java/org/dkpro/similarity/algorithms/lexical/ngrams/CharacterNGramMeasureTest.java b/...c/test/java/org/dkpro/similarity/algorithms/lexical/ngrams/CharacterNGramMeasureTest.java
@@ -23,7 +23,6 @@
 import java.util.Map;
 
 import org.dkpro.similarity.algorithms.api.TermSimilarityMeasure;
-import org.dkpro.similarity.algorithms.lexical.ngrams.CharacterNGramMeasure;
 import org.junit.Test;
 
 

diff --git a/...sl/src/test/java/org/dkpro/similarity/algorithms/lexical/ngrams/WordNGramMeasureTest.java b/...sl/src/test/java/org/dkpro/similarity/algorithms/lexical/ngrams/WordNGramMeasureTest.java
@@ -21,9 +21,8 @@
 import static org.junit.Assert.assertEquals;
 
 import java.util.List;
+
 import org.dkpro.similarity.algorithms.api.TextSimilarityMeasure;
-import org.dkpro.similarity.algorithms.lexical.ngrams.WordNGramContainmentMeasure;
-import org.dkpro.similarity.algorithms.lexical.ngrams.WordNGramJaccardMeasure;
 import org.junit.Test;
 
 public class WordNGramMeasureTest

diff --git a/...sl/src/test/java/org/dkpro/similarity/algorithms/lexical/string/CosineSimilarityTest.java b/...sl/src/test/java/org/dkpro/similarity/algorithms/lexical/string/CosineSimilarityTest.java
@@ -27,7 +27,6 @@
 
 import org.dkpro.similarity.algorithms.api.TermSimilarityMeasure;
 import org.dkpro.similarity.algorithms.api.TextSimilarityMeasure;
-import org.dkpro.similarity.algorithms.lexical.string.CosineSimilarity;
 import org.junit.Test;
 
 public class CosineSimilarityTest {

diff --git a/.../src/test/java/org/dkpro/similarity/algorithms/lexical/string/GreedyStringTilingTest.java b/.../src/test/java/org/dkpro/similarity/algorithms/lexical/string/GreedyStringTilingTest.java
@@ -20,7 +20,6 @@
 import static org.junit.Assert.assertEquals;
 
 import org.dkpro.similarity.algorithms.api.TermSimilarityMeasure;
-import org.dkpro.similarity.algorithms.lexical.string.GreedyStringTiling;
 import org.junit.Test;
 
 

diff --git a/...c/test/java/org/dkpro/similarity/algorithms/lexical/string/LevenshteinComparatorTest.java b/...c/test/java/org/dkpro/similarity/algorithms/lexical/string/LevenshteinComparatorTest.java
@@ -21,7 +21,6 @@
 
 import org.dkpro.similarity.algorithms.api.TermSimilarityMeasure;
 import org.dkpro.similarity.algorithms.api.TextSimilarityMeasure;
-import org.dkpro.similarity.algorithms.lexical.string.LevenshteinComparator;
 import org.junit.Test;
 
 public class LevenshteinComparatorTest

diff --git a/...rg/dkpro/similarity/algorithms/lexical/string/LongestCommonSubsequenceComparatorTest.java b/...rg/dkpro/similarity/algorithms/lexical/string/LongestCommonSubsequenceComparatorTest.java
@@ -19,8 +19,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-import org.dkpro.similarity.algorithms.lexical.string.LongestCommonSubsequenceComparator;
-import org.dkpro.similarity.algorithms.lexical.string.LongestCommonSubsequenceNormComparator;
 import org.junit.Test;
 
 public class LongestCommonSubsequenceComparatorTest

diff --git a/.../org/dkpro/similarity/algorithms/lexical/string/LongestCommonSubstringComparatorTest.java b/.../org/dkpro/similarity/algorithms/lexical/string/LongestCommonSubstringComparatorTest.java
@@ -20,7 +20,6 @@
 import static org.junit.Assert.assertEquals;
 
 import org.dkpro.similarity.algorithms.api.TermSimilarityMeasure;
-import org.dkpro.similarity.algorithms.lexical.string.LongestCommonSubstringComparator;
 import org.junit.Test;
 
 

diff --git a/.../java/org/dkpro/similarity/algorithms/lexical/string/SimpleStringMatchComparatorTest.java b/.../java/org/dkpro/similarity/algorithms/lexical/string/SimpleStringMatchComparatorTest.java
@@ -24,9 +24,6 @@
 
 import org.dkpro.similarity.algorithms.api.SimilarityException;
 import org.dkpro.similarity.algorithms.api.TextSimilarityMeasure;
-import org.dkpro.similarity.algorithms.lexical.string.BoundedSubstringMatchComparator;
-import org.dkpro.similarity.algorithms.lexical.string.ExactStringMatchComparator;
-import org.dkpro.similarity.algorithms.lexical.string.SubstringMatchComparator;
 import org.junit.Test;
 
 public class SimpleStringMatchComparatorTest {

diff --git a/dkpro-similarity-algorithms-lexsub-gpl/pom.xml b/dkpro-similarity-algorithms-lexsub-gpl/pom.xml
@@ -42,32 +42,32 @@
       <version>1.0.2</version>
     </dependency>
     <dependency>
-      <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
-      <artifactId>de.tudarmstadt.ukp.dkpro.core.api.segmentation-asl</artifactId>
+      <groupId>org.dkpro.core</groupId>
+      <artifactId>dkpro-core-api-segmentation-asl</artifactId>
     </dependency>
     <dependency>
-      <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
-      <artifactId>de.tudarmstadt.ukp.dkpro.core.api.resources-asl</artifactId>
+      <groupId>org.dkpro.core</groupId>
+      <artifactId>dkpro-core-api-resources-asl</artifactId>
     </dependency>
     <dependency>
-      <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
-      <artifactId>de.tudarmstadt.ukp.dkpro.core.opennlp-asl</artifactId>
+      <groupId>org.dkpro.core</groupId>
+      <artifactId>dkpro-core-opennlp-asl</artifactId>
     </dependency>
     <dependency>
       <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
       <artifactId>de.tudarmstadt.ukp.dkpro.core.opennlp-model-tagger-en-maxent</artifactId>
     </dependency>
     <dependency>
-      <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
-      <artifactId>de.tudarmstadt.ukp.dkpro.core.tokit-asl</artifactId>
+      <groupId>org.dkpro.core</groupId>
+      <artifactId>dkpro-core-tokit-asl</artifactId>
     </dependency>
     <dependency>
       <groupId>org.dkpro.similarity</groupId>
       <artifactId>dkpro-similarity-uima-core-asl</artifactId>
     </dependency>
     <dependency>
-      <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
-      <artifactId>de.tudarmstadt.ukp.dkpro.core.api.lexmorph-asl</artifactId>
+      <groupId>org.dkpro.core</groupId>
+      <artifactId>dkpro-core-api-lexmorph-asl</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.uima</groupId>
@@ -78,15 +78,15 @@
       <artifactId>uimafit-core</artifactId>
     </dependency>
     <dependency>
-    	<groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
-    	<artifactId>de.tudarmstadt.ukp.dkpro.core.gate-asl</artifactId>
+    	<groupId>org.dkpro.core</groupId>
+    	<artifactId>dkpro-core-gate-asl</artifactId>
     </dependency>
   </dependencies>
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>de.tudarmstadt.ukp.dkpro.core</groupId>
-        <artifactId>de.tudarmstadt.ukp.dkpro.core.opennlp-asl</artifactId>
+        <groupId>org.dkpro.core</groupId>
+        <artifactId>dkpro-core-opennlp-asl</artifactId>
         <version>${dkpro.core.version}</version>
         <type>pom</type>
         <scope>import</scope>

diff --git a/...ithms-lexsub-gpl/src/main/java/org/dkpro/similarity/algorithms/lexsub/BingSMTWrapper.java b/...ithms-lexsub-gpl/src/main/java/org/dkpro/similarity/algorithms/lexsub/BingSMTWrapper.java
@@ -33,15 +33,15 @@
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.tcas.Annotation;
 import org.apache.uima.resource.ResourceInitializationException;
+import org.dkpro.core.gate.GateLemmatizer;
+import org.dkpro.core.opennlp.OpenNlpPosTagger;
+import org.dkpro.core.tokit.BreakIteratorSegmenter;
 import org.dkpro.similarity.algorithms.api.JCasTextSimilarityMeasureBase;
 import org.dkpro.similarity.algorithms.api.SimilarityException;
 import org.dkpro.similarity.algorithms.api.TextSimilarityMeasure;
 import org.dkpro.similarity.algorithms.lexsub.util.BingTranslator;
 
 import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Lemma;
-import de.tudarmstadt.ukp.dkpro.core.gate.GateLemmatizer;
-import de.tudarmstadt.ukp.dkpro.core.opennlp.OpenNlpPosTagger;
-import de.tudarmstadt.ukp.dkpro.core.tokit.BreakIteratorSegmenter;
 
 /**
  * Similarity measure which uses the Microsoft Bing translator to translate

diff --git a/...exsub-gpl/src/main/java/org/dkpro/similarity/algorithms/lexsub/TWSISubstituteWrapper.java b/...exsub-gpl/src/main/java/org/dkpro/similarity/algorithms/lexsub/TWSISubstituteWrapper.java
@@ -27,14 +27,14 @@
 import org.apache.uima.fit.util.JCasUtil;
 import org.apache.uima.jcas.JCas;
 import org.apache.uima.jcas.tcas.Annotation;
+import org.dkpro.core.api.resources.DkproContext;
 import org.dkpro.similarity.algorithms.api.JCasTextSimilarityMeasureBase;
 import org.dkpro.similarity.algorithms.api.SimilarityException;
 import org.dkpro.similarity.algorithms.api.TextSimilarityMeasure;
 
 import de.tudarmstadt.langtech.substituter.MLSenseSubstituter;
 import de.tudarmstadt.langtech.substituter.SenseSubstituter;
 import de.tudarmstadt.langtech.substituter.Substitution;
-import de.tudarmstadt.ukp.dkpro.core.api.resources.DkproContext;
 import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token;
 
 

diff --git a/...gpl/src/main/java/org/dkpro/similarity/algorithms/lexsub/uima/BingSMTWrapperResource.java b/...gpl/src/main/java/org/dkpro/similarity/algorithms/lexsub/uima/BingSMTWrapperResource.java
@@ -20,10 +20,10 @@
 
 import java.util.Map;
 
-import org.apache.uima.resource.ResourceInitializationException;
-import org.apache.uima.resource.ResourceSpecifier;
 import org.apache.uima.fit.descriptor.ConfigurationParameter;
 import org.apache.uima.fit.descriptor.ExternalResource;
+import org.apache.uima.resource.ResourceInitializationException;
+import org.apache.uima.resource.ResourceSpecifier;
 import org.dkpro.similarity.algorithms.api.TextSimilarityMeasure;
 import org.dkpro.similarity.algorithms.lexsub.BingSMTWrapper;
 import org.dkpro.similarity.algorithms.lexsub.BingSMTWrapper.Language;

diff --git a/.../main/java/org/dkpro/similarity/algorithms/lexsub/uima/TWSISubstituteWrapperResource.java b/.../main/java/org/dkpro/similarity/algorithms/lexsub/uima/TWSISubstituteWrapperResource.java
@@ -21,9 +21,9 @@
 import java.io.IOException;
 import java.util.Map;
 
+import org.apache.uima.fit.descriptor.ExternalResource;
 import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.resource.ResourceSpecifier;
-import org.apache.uima.fit.descriptor.ExternalResource;
 import org.dkpro.similarity.algorithms.api.TextSimilarityMeasure;
 import org.dkpro.similarity.algorithms.lexsub.TWSISubstituteWrapper;
 import org.dkpro.similarity.uima.resource.JCasTextSimilarityResourceBase;

diff --git a/dkpro-similarity-algorithms-lsr-asl/pom.xml b/dkpro-similarity-algorithms-lsr-asl/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>dkpro-similarity-asl</artifactId>
     <groupId>org.dkpro.similarity</groupId>
-    <version>2.3.0-SNAPSHOT</version>
+    <version>2.4.0-SNAPSHOT</version>
     <relativePath>../dkpro-similarity-asl</relativePath>
   </parent>
   <artifactId>dkpro-similarity-algorithms-lsr-asl</artifactId>  <dependencies>

diff --git a/...n/java/org/dkpro/similarity/algorithms/lsr/uima/path/JiangConrathRelatednessResource.java b/...n/java/org/dkpro/similarity/algorithms/lsr/uima/path/JiangConrathRelatednessResource.java
@@ -26,25 +26,24 @@
 import de.tudarmstadt.ukp.dkpro.lexsemresource.exception.LexicalSemanticResourceException;
 
 public final class JiangConrathRelatednessResource
-	extends LSRRelatednessResourceBase
+    extends LSRRelatednessResourceBase
 {
-
     @SuppressWarnings({ "rawtypes" })
     @Override
-	public boolean initialize(ResourceSpecifier aSpecifier, Map aAdditionalParams)
-		throws ResourceInitializationException
-	{
-		if (!super.initialize(aSpecifier, aAdditionalParams)) {
-			return false;
-		}
+    public boolean initialize(ResourceSpecifier aSpecifier, Map aAdditionalParams)
+        throws ResourceInitializationException
+    {
+        if (!super.initialize(aSpecifier, aAdditionalParams)) {
+            return false;
+        }
 
-  		try {
+        try {
             measure = new JiangConrathComparator(lsr);
         }
         catch (LexicalSemanticResourceException e) {
             throw new ResourceInitializationException(e);
         }
 
-		return true;
-	}
+        return true;
+    }
 }
diff --git a/...c/main/java/org/dkpro/similarity/algorithms/lsr/uima/path/LSRRelatednessResourceBase.java b/...c/main/java/org/dkpro/similarity/algorithms/lsr/uima/path/LSRRelatednessResourceBase.java
@@ -34,37 +34,36 @@
  *
  */
 public abstract class LSRRelatednessResourceBase
-	extends TextSimilarityResourceBase
+    extends TextSimilarityResourceBase
 {
-
     // Attention! Can only have String parameters in external resources.
-    
+
     public static final String PARAM_RESOURCE_NAME = "LsrResourceName";
     @ConfigurationParameter(name = PARAM_RESOURCE_NAME, mandatory = true)
     protected String lsrResourceName;
-    
+
     public static final String PARAM_RESOURCE_LANGUAGE = "LSRResourceLanguage";
     @ConfigurationParameter(name = PARAM_RESOURCE_LANGUAGE, mandatory = true)
     protected String lsrResourceLanguage;
 
     protected LexicalSemanticResource lsr;
-    
+
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @Override
-	public boolean initialize(ResourceSpecifier aSpecifier, Map aAdditionalParams)
-		throws ResourceInitializationException
-	{
-		if (!super.initialize(aSpecifier, aAdditionalParams)) {
-			return false;
-		}
+    public boolean initialize(ResourceSpecifier aSpecifier, Map aAdditionalParams)
+        throws ResourceInitializationException
+    {
+        if (!super.initialize(aSpecifier, aAdditionalParams)) {
+            return false;
+        }
 
-		try {
+        try {
             lsr = ResourceFactory.getInstance().get(lsrResourceName, lsrResourceLanguage);
         }
         catch (ResourceLoaderException e) {
             throw new ResourceInitializationException(e);
         }
 
-		return true;
-	}
+        return true;
+    }
 }