diff --git a/de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.wikipedia/pom.xml b/de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.wikipedia/pom.xml index 62042003..4e3c28f7 100644 --- a/de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.wikipedia/pom.xml +++ b/de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.wikipedia/pom.xml @@ -53,11 +53,11 @@ - dkpro.similarity + org.dkpro.similarity - dkpro.similarity.algorithms.wikipedia-asl + dkpro-similarity-algorithms-wikipedia-asl - 2.2.0-SNAPSHOT + 2.3.0 de.tudarmstadt.ukp.dkpro.wsd diff --git a/de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.wikipedia/src/main/java/de/tudarmstadt/ukp/dkpro/wsd/graphconnectivity/iterative/algorithm/SequentialGraphDisambiguation.java b/de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.wikipedia/src/main/java/de/tudarmstadt/ukp/dkpro/wsd/graphconnectivity/iterative/algorithm/SequentialGraphDisambiguation.java index 46e9e7e2..e00b8d88 100644 --- a/de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.wikipedia/src/main/java/de/tudarmstadt/ukp/dkpro/wsd/graphconnectivity/iterative/algorithm/SequentialGraphDisambiguation.java +++ b/de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.wikipedia/src/main/java/de/tudarmstadt/ukp/dkpro/wsd/graphconnectivity/iterative/algorithm/SequentialGraphDisambiguation.java @@ -26,6 +26,7 @@ import java.util.Map; import org.apache.log4j.Logger; +import org.dkpro.similarity.algorithms.api.SimilarityException; import de.tudarmstadt.ukp.dkpro.wsd.algorithm.AbstractWSDAlgorithm; import de.tudarmstadt.ukp.dkpro.wsd.algorithm.WSDAlgorithmCollectiveSequentialBasic; @@ -38,7 +39,6 @@ import de.tudarmstadt.ukp.dkpro.wsd.si.SenseInventory; import de.tudarmstadt.ukp.dkpro.wsd.si.SenseInventoryException; import de.tudarmstadt.ukp.dkpro.wsd.si.SenseWeightedInventory; -import dkpro.similarity.algorithms.api.SimilarityException; import edu.uci.ics.jung.algorithms.scoring.PageRankWithPriors; import edu.uci.ics.jung.graph.DirectedSparseGraph; import edu.uci.ics.jung.graph.Graph; diff --git a/de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.wikipedia/src/main/java/de/tudarmstadt/ukp/dkpro/wsd/graphconnectivity/iterative/wikipedia/algorithm/LinkInformationSequentialDisambiguation.java b/de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.wikipedia/src/main/java/de/tudarmstadt/ukp/dkpro/wsd/graphconnectivity/iterative/wikipedia/algorithm/LinkInformationSequentialDisambiguation.java index d9e85003..7d99be94 100644 --- a/de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.wikipedia/src/main/java/de/tudarmstadt/ukp/dkpro/wsd/graphconnectivity/iterative/wikipedia/algorithm/LinkInformationSequentialDisambiguation.java +++ b/de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.wikipedia/src/main/java/de/tudarmstadt/ukp/dkpro/wsd/graphconnectivity/iterative/wikipedia/algorithm/LinkInformationSequentialDisambiguation.java @@ -21,6 +21,7 @@ import java.util.List; import org.apache.commons.collections15.ListUtils; +import org.dkpro.similarity.algorithms.api.SimilarityException; import org.junit.Before; import de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.iterative.algorithm.SequentialGraphDisambiguation; @@ -28,7 +29,6 @@ import de.tudarmstadt.ukp.dkpro.wsd.si.SenseInventory; import de.tudarmstadt.ukp.dkpro.wsd.si.linkdatabase.PerformanceLinkInformationReader; import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException; -import dkpro.similarity.algorithms.api.SimilarityException; /** * A class for sequential disambiguation using Wikipedia links from a special database as weights between senses diff --git a/de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.wikipedia/src/main/java/de/tudarmstadt/ukp/dkpro/wsd/graphconnectivity/iterative/wikipedia/algorithm/LinkMeasureSequentialDisambiguation.java b/de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.wikipedia/src/main/java/de/tudarmstadt/ukp/dkpro/wsd/graphconnectivity/iterative/wikipedia/algorithm/LinkMeasureSequentialDisambiguation.java index 8f7e7751..05318351 100644 --- a/de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.wikipedia/src/main/java/de/tudarmstadt/ukp/dkpro/wsd/graphconnectivity/iterative/wikipedia/algorithm/LinkMeasureSequentialDisambiguation.java +++ b/de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.wikipedia/src/main/java/de/tudarmstadt/ukp/dkpro/wsd/graphconnectivity/iterative/wikipedia/algorithm/LinkMeasureSequentialDisambiguation.java @@ -18,6 +18,9 @@ package de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.iterative.wikipedia.algorithm; +import org.dkpro.similarity.algorithms.api.SimilarityException; +import org.dkpro.similarity.algorithms.wikipedia.measures.WikiLinkComparator; + import de.tudarmstadt.ukp.dkpro.wsd.graphconnectivity.iterative.algorithm.SequentialGraphDisambiguation; import de.tudarmstadt.ukp.dkpro.wsd.si.SenseInventory; import de.tudarmstadt.ukp.wikipedia.api.DatabaseConfiguration; @@ -25,8 +28,6 @@ import de.tudarmstadt.ukp.wikipedia.api.Wikipedia; import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException; import de.tudarmstadt.ukp.wikipedia.api.exception.WikiInitializationException; -import dkpro.similarity.algorithms.api.SimilarityException; -import dkpro.similarity.algorithms.wikipedia.measures.WikiLinkComparator; /** * A class for sequential disambiguation using Wikipedia links as weights between senses diff --git a/de.tudarmstadt.ukp.dkpro.wsd.wsi/pom.xml b/de.tudarmstadt.ukp.dkpro.wsd.wsi/pom.xml index 41e47ac7..88824bf1 100644 --- a/de.tudarmstadt.ukp.dkpro.wsd.wsi/pom.xml +++ b/de.tudarmstadt.ukp.dkpro.wsd.wsi/pom.xml @@ -89,11 +89,11 @@ 0.8.1 - dkpro.similarity + org.dkpro.similarity - dkpro.similarity.algorithms.core-asl + dkpro-similarity-algorithms-core-asl - 2.2.0-SNAPSHOT + 2.3.0 de.tudarmstadt.ukp.dkpro.core diff --git a/de.tudarmstadt.ukp.dkpro.wsd.wsi/src/main/java/de/tudarmstadt/ukp/dkpro/wsd/wsi/algorithm/SimpleGraphClusteringInductionAlgorithm.java b/de.tudarmstadt.ukp.dkpro.wsd.wsi/src/main/java/de/tudarmstadt/ukp/dkpro/wsd/wsi/algorithm/SimpleGraphClusteringInductionAlgorithm.java index f356f71b..77ddb12a 100644 --- a/de.tudarmstadt.ukp.dkpro.wsd.wsi/src/main/java/de/tudarmstadt/ukp/dkpro/wsd/wsi/algorithm/SimpleGraphClusteringInductionAlgorithm.java +++ b/de.tudarmstadt.ukp.dkpro.wsd.wsi/src/main/java/de/tudarmstadt/ukp/dkpro/wsd/wsi/algorithm/SimpleGraphClusteringInductionAlgorithm.java @@ -25,14 +25,14 @@ import java.util.Set; import org.apache.commons.collections15.Transformer; +import org.dkpro.similarity.algorithms.api.SimilarityException; +import org.dkpro.similarity.algorithms.api.TermSimilarityMeasure; import de.tudarmstadt.ukp.dkpro.lexsemresource.Entity; import de.tudarmstadt.ukp.dkpro.lexsemresource.LexicalSemanticResource; import de.tudarmstadt.ukp.dkpro.lexsemresource.exception.LexicalSemanticResourceException; import de.tudarmstadt.ukp.dkpro.wsd.WSDException; import de.tudarmstadt.ukp.dkpro.wsd.si.SenseInventory; -import dkpro.similarity.algorithms.api.SimilarityException; -import dkpro.similarity.algorithms.api.TermSimilarityMeasure; import edu.uci.ics.jung.algorithms.cluster.EdgeBetweennessClusterer; import edu.uci.ics.jung.algorithms.cluster.WeakComponentClusterer; import edu.uci.ics.jung.algorithms.filters.FilterUtils; diff --git a/de.tudarmstadt.ukp.dkpro.wsd.wsi/src/main/java/de/tudarmstadt/ukp/dkpro/wsd/wsi/annotator/SimpleGraphBasedSenseInductionResource.java b/de.tudarmstadt.ukp.dkpro.wsd.wsi/src/main/java/de/tudarmstadt/ukp/dkpro/wsd/wsi/annotator/SimpleGraphBasedSenseInductionResource.java index 7288f0ae..972dad11 100644 --- a/de.tudarmstadt.ukp.dkpro.wsd.wsi/src/main/java/de/tudarmstadt/ukp/dkpro/wsd/wsi/annotator/SimpleGraphBasedSenseInductionResource.java +++ b/de.tudarmstadt.ukp.dkpro.wsd.wsi/src/main/java/de/tudarmstadt/ukp/dkpro/wsd/wsi/annotator/SimpleGraphBasedSenseInductionResource.java @@ -25,11 +25,11 @@ 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.SimilarityException; +import org.dkpro.similarity.algorithms.api.TermSimilarityMeasure; import de.tudarmstadt.ukp.dkpro.lexsemresource.LexicalSemanticResource; import de.tudarmstadt.ukp.dkpro.wsd.wsi.algorithm.SimpleGraphClusteringInductionAlgorithm; -import dkpro.similarity.algorithms.api.SimilarityException; -import dkpro.similarity.algorithms.api.TermSimilarityMeasure; /** * @author zorn