From: <lor...@us...> - 2013-10-11 21:29:38
|
Revision: 4121 http://sourceforge.net/p/dl-learner/code/4121 Author: lorenz_b Date: 2013-10-11 21:29:34 +0000 (Fri, 11 Oct 2013) Log Message: ----------- Updated OWLAPI deps. Modified Paths: -------------- trunk/components-core/pom.xml trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/TrieEntityCandidateGenerator.java trunk/components-core/src/main/java/org/dllearner/algorithms/isle/wsd/StructureBasedWordSenseDisambiguation.java trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/operations/lgg/NoiseSensitiveLGG.java trunk/components-core/src/main/java/org/dllearner/kb/SparqlEndpointKS.java trunk/pom.xml trunk/scripts/pom.xml Added Paths: ----------- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/wsd/ContextExtractor.java Modified: trunk/components-core/pom.xml =================================================================== --- trunk/components-core/pom.xml 2013-10-07 09:15:20 UTC (rev 4120) +++ trunk/components-core/pom.xml 2013-10-11 21:29:34 UTC (rev 4121) @@ -102,7 +102,6 @@ <dependency> <groupId>net.sourceforge.owlapi</groupId> <artifactId>owlapi-distribution</artifactId> - <version>3.4.4</version> </dependency> <dependency> @@ -291,11 +290,6 @@ <groupId>edu.stanford.nlp</groupId> <artifactId>stanford-corenlp</artifactId> <version>1.3.4</version> - </dependency> - <dependency> - <groupId>edu.stanford.nlp</groupId> - <artifactId>stanford-corenlp</artifactId> - <version>1.3.4</version> <classifier>models</classifier> </dependency> <dependency> Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/TrieEntityCandidateGenerator.java =================================================================== --- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/TrieEntityCandidateGenerator.java 2013-10-07 09:15:20 UTC (rev 4120) +++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/index/TrieEntityCandidateGenerator.java 2013-10-11 21:29:34 UTC (rev 4121) @@ -14,7 +14,7 @@ import org.dllearner.core.owl.Entity; import org.semanticweb.owlapi.model.OWLOntology; -import edu.stanford.nlp.util.Sets; +import com.google.common.collect.Sets; /** * Generates candidates using a entity candidates prefix trie Added: trunk/components-core/src/main/java/org/dllearner/algorithms/isle/wsd/ContextExtractor.java =================================================================== --- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/wsd/ContextExtractor.java (rev 0) +++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/wsd/ContextExtractor.java 2013-10-11 21:29:34 UTC (rev 4121) @@ -0,0 +1,15 @@ +/** + * + */ +package org.dllearner.algorithms.isle.wsd; + +import java.util.Set; + +/** + * @author Lorenz Buehmann + * + */ +public interface ContextExtractor { + + Set<String> extractContext(String token, String document); +} Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/isle/wsd/StructureBasedWordSenseDisambiguation.java =================================================================== --- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/wsd/StructureBasedWordSenseDisambiguation.java 2013-10-07 09:15:20 UTC (rev 4120) +++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/wsd/StructureBasedWordSenseDisambiguation.java 2013-10-11 21:29:34 UTC (rev 4121) @@ -18,11 +18,14 @@ */ public class StructureBasedWordSenseDisambiguation extends WordSenseDisambiguation{ + private ContextExtractor contextExtractor; + /** * @param ontology */ - public StructureBasedWordSenseDisambiguation(OWLOntology ontology) { + public StructureBasedWordSenseDisambiguation(ContextExtractor contextExtractor, OWLOntology ontology) { super(ontology); + this.contextExtractor = contextExtractor; } /* (non-Javadoc) @@ -30,12 +33,13 @@ */ @Override public SemanticAnnotation disambiguate(Annotation annotation, Set<Entity> candidateEntities) { - //TODO we should find the sentence in which the annotated token is contained in - String content = annotation.getReferencedDocument().getContent(); + //get the context of the annotated token + Set<String> tokenContext = contextExtractor.extractContext(annotation.getToken(), annotation.getReferencedDocument().getContent()); + //compare this context with the context of each entity candidate for (Entity entity : candidateEntities) { Set<String> entityContext = StructuralEntityContext.getContextInNaturalLanguage(ontology, entity); + } return null; } - } Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/operations/lgg/NoiseSensitiveLGG.java =================================================================== --- trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/operations/lgg/NoiseSensitiveLGG.java 2013-10-07 09:15:20 UTC (rev 4120) +++ trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/operations/lgg/NoiseSensitiveLGG.java 2013-10-11 21:29:34 UTC (rev 4121) @@ -16,8 +16,6 @@ import com.jamonapi.Monitor; import com.jamonapi.MonitorFactory; -import edu.stanford.nlp.util.Sets; - public class NoiseSensitiveLGG<N> { Modified: trunk/components-core/src/main/java/org/dllearner/kb/SparqlEndpointKS.java =================================================================== --- trunk/components-core/src/main/java/org/dllearner/kb/SparqlEndpointKS.java 2013-10-07 09:15:20 UTC (rev 4120) +++ trunk/components-core/src/main/java/org/dllearner/kb/SparqlEndpointKS.java 2013-10-11 21:29:34 UTC (rev 4121) @@ -20,10 +20,16 @@ package org.dllearner.kb; import java.net.URL; +import java.sql.SQLException; import java.util.LinkedList; import java.util.List; +import java.util.concurrent.TimeUnit; +import org.aksw.jena_sparql_api.cache.core.QueryExecutionFactoryCacheEx; +import org.aksw.jena_sparql_api.cache.extra.CacheCoreEx; +import org.aksw.jena_sparql_api.cache.extra.CacheCoreH2; import org.aksw.jena_sparql_api.cache.extra.CacheEx; +import org.aksw.jena_sparql_api.cache.extra.CacheExImpl; import org.dllearner.core.ComponentAnn; import org.dllearner.core.ComponentInitException; import org.dllearner.core.KnowledgeSource; @@ -66,7 +72,7 @@ } public SparqlEndpointKS(SparqlEndpoint endpoint) { - this(endpoint, null); + this(endpoint, (String)null); } public SparqlEndpointKS(SparqlEndpoint endpoint, CacheEx cache) { @@ -74,6 +80,21 @@ this.cache = cache; } + public SparqlEndpointKS(SparqlEndpoint endpoint, String cacheDirectory) { + this.endpoint = endpoint; + if(cacheDirectory != null){ + try { + long timeToLive = TimeUnit.DAYS.toMillis(30); + CacheCoreEx cacheBackend = CacheCoreH2.create(cacheDirectory, timeToLive, true); + cache = new CacheExImpl(cacheBackend); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } catch (SQLException e) { + e.printStackTrace(); + } + } + } + public CacheEx getCache() { return cache; } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-10-07 09:15:20 UTC (rev 4120) +++ trunk/pom.xml 2013-10-11 21:29:34 UTC (rev 4121) @@ -123,8 +123,7 @@ <dependency> <groupId>net.sourceforge.owlapi</groupId> <artifactId>owlapi-distribution</artifactId> - <version>3.4.4</version> - <type>pom</type> + <version>3.4.5</version> </dependency> <dependency> <groupId>net.sourceforge.owlapi</groupId> Modified: trunk/scripts/pom.xml =================================================================== --- trunk/scripts/pom.xml 2013-10-07 09:15:20 UTC (rev 4120) +++ trunk/scripts/pom.xml 2013-10-11 21:29:34 UTC (rev 4121) @@ -116,7 +116,6 @@ <dependency> <groupId>net.sourceforge.owlapi</groupId> <artifactId>owlapi-distribution</artifactId> - <type>pom</type> </dependency> <dependency> <groupId>net.sourceforge.owlapi</groupId> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |