Revision: 3705
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3705&view=rev
Author: lorenz_b
Date: 2012-05-11 07:50:26 +0000 (Fri, 11 May 2012)
Log Message:
-----------
Added option to compute CBD against local JENA model.
Modified Paths:
--------------
trunk/components-core/src/main/java/org/dllearner/kb/sparql/ConciseBoundedDescriptionGeneratorImpl.java
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/ConciseBoundedDescriptionGeneratorImpl.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/ConciseBoundedDescriptionGeneratorImpl.java 2012-05-11 07:40:34 UTC (rev 3704)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/ConciseBoundedDescriptionGeneratorImpl.java 2012-05-11 07:50:26 UTC (rev 3705)
@@ -8,6 +8,7 @@
import org.apache.log4j.Logger;
import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.QueryFactory;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
@@ -18,10 +19,11 @@
private static final Logger logger = Logger.getLogger(ConciseBoundedDescriptionGeneratorImpl.class);
private static final int CHUNK_SIZE = 1000;
- private static final int DEFAULT_DEPTH = 1;
+ private static final int DEFAULT_DEPTH = 2;
private ExtractionDBCache cache;
private SparqlEndpoint endpoint;
+ private Model baseModel;
public ConciseBoundedDescriptionGeneratorImpl(SparqlEndpoint endpoint, ExtractionDBCache cache) {
this.endpoint = endpoint;
@@ -32,6 +34,10 @@
this(endpoint, null);
}
+ public ConciseBoundedDescriptionGeneratorImpl(Model model) {
+ this.baseModel = model;
+ }
+
public Model getConciseBoundedDescription(String resourceURI){
return getConciseBoundedDescription(resourceURI, DEFAULT_DEPTH);
}
@@ -68,6 +74,7 @@
} catch (SQLException e) {
logger.error(e);
}
+
return all;
}
@@ -80,19 +87,19 @@
StringBuilder sb = new StringBuilder();
sb.append("CONSTRUCT {\n");
sb.append("<").append(resource).append("> ").append("?p0 ").append("?o0").append(".\n");
- sb.append("?p0 a ?type0.\n");
+// sb.append("?p0 a ?type0.\n");
for(int i = 1; i < depth; i++){
sb.append("?o").append(i-1).append(" ").append("?p").append(i).append(" ").append("?o").append(i).append(".\n");
- sb.append("?p").append(i).append(" ").append("a").append(" ").append("?type").append(i).append(".\n");
+// sb.append("?p").append(i).append(" ").append("a").append(" ").append("?type").append(i).append(".\n");
}
sb.append("}\n");
sb.append("WHERE {\n");
sb.append("<").append(resource).append("> ").append("?p0 ").append("?o0").append(".\n");
- sb.append("?p0 a ?type0.\n");
+// sb.append("?p0 a ?type0.\n");
for(int i = 1; i < depth; i++){
sb.append("OPTIONAL{\n");
sb.append("?o").append(i-1).append(" ").append("?p").append(i).append(" ").append("?o").append(i).append(".\n");
- sb.append("?p").append(i).append(" ").append("a").append(" ").append("?type").append(i).append(".\n");
+// sb.append("?p").append(i).append(" ").append("a").append(" ").append("?type").append(i).append(".\n");
}
for(int i = 1; i < depth; i++){
sb.append("}");
@@ -110,18 +117,23 @@
}
Model model;
- if(cache == null){
- QueryEngineHTTP queryExecution = new QueryEngineHTTP(endpoint.getURL().toString(), query);
- for (String dgu : endpoint.getDefaultGraphURIs()) {
- queryExecution.addDefaultGraph(dgu);
+ if(baseModel == null){
+ if(cache == null){
+ QueryEngineHTTP queryExecution = new QueryEngineHTTP(endpoint.getURL().toString(), query);
+ for (String dgu : endpoint.getDefaultGraphURIs()) {
+ queryExecution.addDefaultGraph(dgu);
+ }
+ for (String ngu : endpoint.getNamedGraphURIs()) {
+ queryExecution.addNamedGraph(ngu);
+ }
+ model = queryExecution.execConstruct();
+ } else {
+ model = cache.executeConstructQuery(endpoint, query);
}
- for (String ngu : endpoint.getNamedGraphURIs()) {
- queryExecution.addNamedGraph(ngu);
- }
- model = queryExecution.execConstruct();
} else {
- model = cache.executeConstructQuery(endpoint, query);
+ model = QueryExecutionFactory.create(query, baseModel).execConstruct();
}
+
if(logger.isDebugEnabled()){
logger.debug("Got " + model.size() + " new triples in.");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
