Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[3993] trunk
|
From: <lor...@us...> - 2013-06-13 07:46:21
|
Revision: 3993
http://sourceforge.net/p/dl-learner/code/3993
Author: lorenz_b
Date: 2013-06-13 07:46:18 +0000 (Thu, 13 Jun 2013)
Log Message:
-----------
Updated SPARQL API.
Modified Paths:
--------------
trunk/components-core/pom.xml
trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/operations/NBR.java
trunk/components-core/src/main/java/org/dllearner/reasoning/SPARQLReasoner.java
trunk/pom.xml
trunk/scripts/src/main/java/org/dllearner/scripts/pattern/OWLAxiomPatternUsageEvaluation.java
Modified: trunk/components-core/pom.xml
===================================================================
--- trunk/components-core/pom.xml 2013-06-12 09:13:43 UTC (rev 3992)
+++ trunk/components-core/pom.xml 2013-06-13 07:46:18 UTC (rev 3993)
@@ -91,28 +91,6 @@
<dependencies>
<dependency>
- <groupId>org.aksw.commons</groupId>
- <artifactId>sparql</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-api</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>arq</artifactId>
- <groupId>com.hp.hpl.jena</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xercesImpl</artifactId>
- <groupId>xerces</groupId>
- </exclusion>
- <exclusion>
- <artifactId>any23-core</artifactId>
- <groupId>org.deri.any23</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.ini4j</groupId>
<artifactId>ini4j</artifactId>
</dependency>
@@ -323,7 +301,7 @@
<dependency>
<groupId>org.aksw.jena-sparql-api</groupId>
<artifactId>jena-sparql-api-core</artifactId>
- <version>2.10.0-3</version>
+ <version>2.10.0-4-SNAPSHOT</version>
</dependency>
</dependencies>
<dependencyManagement>
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/operations/NBR.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/operations/NBR.java 2013-06-12 09:13:43 UTC (rev 3992)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/qtl/operations/NBR.java 2013-06-13 07:46:18 UTC (rev 3993)
@@ -18,7 +18,6 @@
import javax.xml.ws.http.HTTPException;
-import org.aksw.commons.jena.ExtendedQueryEngineHTTP;
import org.apache.log4j.Logger;
import org.dllearner.algorithms.qtl.datastructures.QueryTree;
import org.dllearner.algorithms.qtl.datastructures.impl.GeneralisedQueryTree;
@@ -41,6 +40,7 @@
import com.hp.hpl.jena.query.ResultSet;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.sparql.engine.http.QueryEngineHTTP;
import com.hp.hpl.jena.sparql.expr.E_Equals;
import com.hp.hpl.jena.sparql.expr.E_LogicalNot;
import com.hp.hpl.jena.sparql.expr.ExprVar;
@@ -1401,8 +1401,8 @@
private ResultSet executeSelectQuery(String query){
ResultSet rs;
if(model == null){
- ExtendedQueryEngineHTTP queryExecution = new ExtendedQueryEngineHTTP(endpoint.getURL().toString(), query);
- queryExecution.setTimeOut(maxExecutionTimeInSeconds * 1000);
+ QueryEngineHTTP queryExecution = new QueryEngineHTTP(endpoint.getURL().toString(), query);
+ queryExecution.setTimeout(maxExecutionTimeInSeconds * 1000);
for (String dgu : endpoint.getDefaultGraphURIs()) {
queryExecution.addDefaultGraph(dgu);
}
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/SPARQLReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/SPARQLReasoner.java 2013-06-12 09:13:43 UTC (rev 3992)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/SPARQLReasoner.java 2013-06-13 07:46:18 UTC (rev 3993)
@@ -21,8 +21,8 @@
import java.net.SocketTimeoutException;
import java.net.URL;
+import java.sql.SQLException;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -31,11 +31,17 @@
import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
+import java.util.concurrent.TimeUnit;
-import org.aksw.commons.sparql.api.core.QueryExecutionFactory;
-import org.aksw.commons.sparql.api.http.QueryExecutionFactoryHttp;
-import org.aksw.commons.sparql.api.pagination.core.QueryExecutionFactoryPaginated;
import org.aksw.commons.util.strings.StringUtils;
+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.aksw.jena_sparql_api.core.QueryExecutionFactory;
+import org.aksw.jena_sparql_api.http.QueryExecutionFactoryHttp;
+import org.aksw.jena_sparql_api.pagination.core.QueryExecutionFactoryPaginated;
import org.dllearner.core.ComponentAnn;
import org.dllearner.core.IndividualReasoner;
import org.dllearner.core.SchemaReasoner;
@@ -61,7 +67,6 @@
import org.dllearner.kb.sparql.ExtractionDBCache;
import org.dllearner.kb.sparql.SPARQLTasks;
import org.dllearner.kb.sparql.SparqlEndpoint;
-import org.dllearner.kb.sparql.SparqlQuery;
import org.dllearner.utilities.datastructures.SortedSetTuple;
import org.dllearner.utilities.owl.ConceptComparator;
import org.slf4j.Logger;
@@ -73,7 +78,6 @@
import com.hp.hpl.jena.query.QueryExecution;
import com.hp.hpl.jena.query.QuerySolution;
import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.query.ResultSetFormatter;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.Resource;
@@ -1360,22 +1364,26 @@
logger.debug("Sending query \n {}", query);
ResultSet rs = null;
if(ks.isRemote()){
- if(useCache && cache != null){
- rs = SparqlQuery.convertJSONtoResultSet(cache.executeSelectQuery(ks.getEndpoint(), query));
- } else {
- QueryEngineHTTP queryExecution = new QueryEngineHTTP(ks.getEndpoint().getURL().toString(), query);
- for (String dgu : ks.getEndpoint().getDefaultGraphURIs()) {
- queryExecution.addDefaultGraph(dgu);
+ SparqlEndpoint endpoint = ks.getEndpoint();
+ QueryExecutionFactory qef = new QueryExecutionFactoryHttp(endpoint.getURL().toString(), endpoint.getDefaultGraphURIs());
+ if(cache != null){
+ try {
+ long timeToLive = TimeUnit.DAYS.toMillis(30);
+ CacheCoreEx cacheBackend = CacheCoreH2.create(cache.getCacheDirectory(), timeToLive, true);
+ CacheEx cacheFrontend = new CacheExImpl(cacheBackend);
+ qef = new QueryExecutionFactoryCacheEx(qef, cacheFrontend);
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ } catch (SQLException e) {
+ e.printStackTrace();
}
- for (String ngu : ks.getEndpoint().getNamedGraphURIs()) {
- queryExecution.addNamedGraph(ngu);
- }
- rs = queryExecution.execSelect();
}
+ qef = new QueryExecutionFactoryPaginated(qef, 10000);
+ QueryExecution qe = qef.createQueryExecution(query);
+ rs = qe.execSelect();
} else {
QueryExecution qExec = com.hp.hpl.jena.query.QueryExecutionFactory.create(query, ((LocalModelBasedSparqlEndpointKS)ks).getModel());
rs = qExec.execSelect();
-
}
return rs;
}
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2013-06-12 09:13:43 UTC (rev 3992)
+++ trunk/pom.xml 2013-06-13 07:46:18 UTC (rev 3993)
@@ -123,7 +123,7 @@
<dependency>
<groupId>net.sourceforge.owlapi</groupId>
<artifactId>owlapi-distribution</artifactId>
- <version>3.4.3</version>
+ <version>3.4.4</version>
<type>pom</type>
</dependency>
<dependency>
@@ -133,6 +133,11 @@
</dependency>
<dependency>
<groupId>net.sourceforge.owlapi</groupId>
+ <artifactId>owlapi-debugging</artifactId>
+ <version>3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.owlapi</groupId>
<artifactId>owlapi-util</artifactId>
<version>3.3</version>
</dependency>
@@ -524,6 +529,12 @@
<url>http://elk-reasoner.googlecode.com/svn/m2/releases</url>
<releases/>
</repository>
+ <repository>
+ <id>central</id>
+ <url>http://oss.sonatype.org</url>
+ <releases><enabled>true</enabled></releases>
+ <snapshots><enabled>true</enabled></snapshots>
+ </repository>
</repositories>
<distributionManagement>
Modified: trunk/scripts/src/main/java/org/dllearner/scripts/pattern/OWLAxiomPatternUsageEvaluation.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/scripts/pattern/OWLAxiomPatternUsageEvaluation.java 2013-06-12 09:13:43 UTC (rev 3992)
+++ trunk/scripts/src/main/java/org/dllearner/scripts/pattern/OWLAxiomPatternUsageEvaluation.java 2013-06-13 07:46:18 UTC (rev 3993)
@@ -225,7 +225,7 @@
Collections.shuffle(classesList, new Random(123));
classesList = classesList.subList(0, maxNrOfTestedClasses);
classes = classesList;
- //classes = Collections.singleton(new NamedClass("http://dbpedia.org/ontology/ChristianBishop"));
+ classes = Collections.singleton(new NamedClass("http://dbpedia.org/ontology/BaseballPlayer"));
//get the maximum modal depth in the pattern axioms
int maxModalDepth = maxModalDepth(patterns);
@@ -1147,7 +1147,7 @@
//compute recall
double recall = wald(subClassCnt, overlap);
//if recall is too low we can skip the computation of the precision
- if(recall < 0.2){
+ if(recall < 0.3){
logger.warn("Recall(" + recall + ") too low. Skipping precision computation.");
continue;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
