Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[3633] trunk
|
From: <ku...@us...> - 2012-04-11 13:48:38
|
Revision: 3633
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3633&view=rev
Author: kurzum
Date: 2012-04-11 13:48:27 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
added more speed logging
Modified Paths:
--------------
trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/ABoxQueryGenerator.java
trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/QueryExecutor.java
trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SchemaIndexer.java
trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SparqlSimpleExtractor.java
trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/TBoxQueryGenerator.java
trunk/components-core/src/main/java/org/nlp2rdf/ontology/ClassIndexer.java
trunk/examples/sparql/difference/DifferenceDBpediaYAGO_angela_vs_hillary.conf
trunk/test/newcomponent/AristotlePosNeg.conf
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/ABoxQueryGenerator.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/ABoxQueryGenerator.java 2012-04-11 12:51:42 UTC (rev 3632)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/ABoxQueryGenerator.java 2012-04-11 13:48:27 UTC (rev 3633)
@@ -1,5 +1,5 @@
/**
- *
+ *
*/
package org.dllearner.kb.sparql.simple;
@@ -10,13 +10,15 @@
import com.hp.hpl.jena.ontology.Individual;
import com.hp.hpl.jena.ontology.OntModel;
import com.hp.hpl.jena.util.iterator.ExtendedIterator;
+import com.jamonapi.Monitor;
+import com.jamonapi.MonitorFactory;
/**
* @author didierc
- *
*/
public class ABoxQueryGenerator {
public String createQuery(List<String> individuals, OntModel model, List<String> filters) {
+ Monitor monABoxQueryGeneration = MonitorFactory.getTimeMonitor("ABox query generator").start();
StringBuilder builder = new StringBuilder();
builder.append("CONSTRUCT {?s ?p ?o} ");
builder.append("{ ?s ?p ?o .");
@@ -41,14 +43,23 @@
}
}
builder.append("}");
+ monABoxQueryGeneration.stop();
return builder.toString();
}
-
+
public String createLastQuery(List<String> individuals, OntModel model, List<String> filters) {
+ Monitor monABoxQueryGeneration = MonitorFactory.getTimeMonitor("ABox query generator")
+ .start();
StringBuilder builder = new StringBuilder();
- builder.append("CONSTRUCT {?s ?p ?o . ?o a ?class} ");
- builder.append("{ ?s ?p ?o .");
- builder.append("?o a ?class");
+ if (false) {
+ builder.append("CONSTRUCT {?s ?p ?o . ?o a ?class} ");
+ builder.append("{ ?s ?p ?o .");
+ builder.append("?o a ?class");
+ } else {
+ builder.append("CONSTRUCT {?s ?p ?o } ");
+ builder.append("{ ?s ?p ?o ");
+ }
+
List<String> curIndividuals;
if (model.isEmpty()) {
curIndividuals = individuals;
@@ -71,10 +82,13 @@
}
}
builder.append("}");
+ monABoxQueryGeneration.stop();
return builder.toString();
}
-
- private List<String> getIndividualsFromModel(OntModel model) {
+
+ private List<String> getIndividualsFromModel
+ (OntModel
+ model) {
ExtendedIterator<Individual> iterator = model.listIndividuals();
LinkedList<String> result = new LinkedList<String>();
while (iterator.hasNext()) {
@@ -82,8 +96,9 @@
}
return result;
}
-
- public List<String> difference(List<String> a, List<String> b) {
+
+ public List<String> difference
+ (List<String> a, List<String> b) {
ArrayList<String> result = new ArrayList<String>(b);
result.removeAll(a);
return result;
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/QueryExecutor.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/QueryExecutor.java 2012-04-11 12:51:42 UTC (rev 3632)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/QueryExecutor.java 2012-04-11 13:48:27 UTC (rev 3633)
@@ -1,8 +1,10 @@
/**
- *
+ *
*/
package org.dllearner.kb.sparql.simple;
+import com.jamonapi.Monitor;
+import com.jamonapi.MonitorFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -14,26 +16,29 @@
/**
* @author didierc
- *
*/
public class QueryExecutor {
-
- private static Logger log=LoggerFactory.getLogger(QueryExecutor.class);
-
+
+ private static Logger log = LoggerFactory.getLogger(QueryExecutor.class);
+
public OntModel executeQuery(String queryString, String endpoint, OntModel model) {
+ Monitor monQueryingTotal = MonitorFactory.start("Query time total").start();
Query query = QueryFactory.create(queryString);
log.debug("Jena Query: ", query);
QueryExecution qExec = QueryExecutionFactory.sparqlService(endpoint, query);
qExec.execConstruct(model);
+ monQueryingTotal.stop();
return model;
}
-
+
public OntModel executeQuery(String queryString, String endpoint, OntModel model, String defaultGraphURI) {
+ Monitor monQueryingTotal = MonitorFactory.start("Query time total").start();
Query query = QueryFactory.create(queryString);
log.debug("Jena Query: ", query);
QueryExecution qExec = QueryExecutionFactory.sparqlService(endpoint, query, defaultGraphURI);
- log.debug("Qexec: {}",qExec);
+ log.debug("Qexec: {}", qExec);
qExec.execConstruct(model);
+ monQueryingTotal.stop();
return model;
}
}
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SchemaIndexer.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SchemaIndexer.java 2012-04-11 12:51:42 UTC (rev 3632)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SchemaIndexer.java 2012-04-11 13:48:27 UTC (rev 3633)
@@ -4,6 +4,8 @@
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import com.jamonapi.Monitor;
+import com.jamonapi.MonitorFactory;
import org.nlp2rdf.ontology.ClassIndexer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -13,42 +15,45 @@
public class SchemaIndexer {
private static Logger log = LoggerFactory.getLogger(SchemaIndexer.class);
- private ClassIndexer classIndexer=null;
- private OntModel model;
- private File ontologySchema;
-
- public SchemaIndexer(){}
-
- public void init(){
- classIndexer=new ClassIndexer();
+ private ClassIndexer classIndexer = null;
+ private OntModel model;
+ private File ontologySchema;
+
+ public SchemaIndexer() {
+ }
+
+ public void init() {
+ classIndexer = new ClassIndexer();
model = ModelFactory.createOntologyModel();
try {
- model.read(new FileInputStream(ontologySchema), null);
- } catch (FileNotFoundException e) {
- log.error(e.getMessage(),e);
- }
+ Monitor m0 = MonitorFactory.start("Indexer parsing ontology");
+ model.read(new FileInputStream(ontologySchema), null);
+ m0.stop();
+ } catch (FileNotFoundException e) {
+ log.error(e.getMessage(), e);
+ }
classIndexer.index(model);
}
-
- public OntModel getHierarchyForURI(String classUri){
- if(classIndexer==null){
+
+ public OntModel getHierarchyForURI(String classUri) {
+ if (classIndexer == null) {
this.init();
}
return classIndexer.getHierarchyForClassURI(classUri);
}
-
- public static void main(String...args){
- SchemaIndexer i= new SchemaIndexer();
- System.out.println(i.getHierarchyForURI("http://dbpedia.org/ontology/Software"));
+
+ public static void main(String... args) {
+ SchemaIndexer i = new SchemaIndexer();
+ System.out.println(i.getHierarchyForURI("http://dbpedia.org/ontology/Software"));
}
- public File getOntologySchema() {
- return ontologySchema;
- }
+ public File getOntologySchema() {
+ return ontologySchema;
+ }
- public void setOntologySchema(File ontologySchema) {
- this.ontologySchema = ontologySchema;
- }
-
-
+ public void setOntologySchema(File ontologySchema) {
+ this.ontologySchema = ontologySchema;
+ }
+
+
}
\ No newline at end of file
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SparqlSimpleExtractor.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SparqlSimpleExtractor.java 2012-04-11 12:51:42 UTC (rev 3632)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SparqlSimpleExtractor.java 2012-04-11 13:48:27 UTC (rev 3633)
@@ -24,224 +24,224 @@
@ComponentAnn(name = "efficient SPARQL fragment extractor", shortName = "sparqls", version = 0.1)
public class SparqlSimpleExtractor implements KnowledgeSource {
- @ConfigOption(name = "endpointURL", description = "URL of the SPARQL endpoint", required = true)
- private String endpointURL = null;
- private OntModel model = null;
- @ConfigOption(name = "instances", description = "List of the instances to use", required = true)
- private List<String> instances = null;
- @ConfigOption(name = "filters", description = "List of the filters to use", required = true)
- private List<String> filters = null;
- @ConfigOption(name = "recursionDepth", description = "recursion depth", required = true)
- private int recursionDepth = 0;
+ @ConfigOption(name = "endpointURL", description = "URL of the SPARQL endpoint", required = true)
+ private String endpointURL = null;
+ private OntModel model = null;
+ @ConfigOption(name = "instances", description = "List of the instances to use", required = true)
+ private List<String> instances = null;
+ @ConfigOption(name = "filters", description = "List of the filters to use", required = true)
+ private List<String> filters = null;
+ @ConfigOption(name = "recursionDepth", description = "recursion depth", required = true)
+ private int recursionDepth = 0;
- @ConfigOption(name = "defaultGraphURI", description = "default graph URI", required = true)
- private String defaultGraphURI = null;
- @ConfigOption(name = "sparqlQuery", description = "Sparql Query", required = false)
- private String sparqlQuery = null;
- @ConfigOption(name = "ontologyFile", description = "Ontology Schema File", required = true)
- private File ontologyFile = null;
- private OWLOntology owlOntology;
- private SchemaIndexer indexer;
+ @ConfigOption(name = "defaultGraphURI", description = "default graph URI", required = true)
+ private String defaultGraphURI = null;
+ @ConfigOption(name = "sparqlQuery", description = "Sparql Query", required = false)
+ private String sparqlQuery = null;
+ @ConfigOption(name = "ontologyFile", description = "Ontology Schema File", required = true)
+ private File ontologyFile = null;
+ private OWLOntology owlOntology;
+ private SchemaIndexer indexer;
- private static Logger log = LoggerFactory
- .getLogger(SparqlSimpleExtractor.class);
+ private static Logger log = LoggerFactory.getLogger(SparqlSimpleExtractor.class);
- public SparqlSimpleExtractor() {
- model = ModelFactory.createOntologyModel();
- }
+ public SparqlSimpleExtractor() {
+ model = ModelFactory.createOntologyModel();
+ }
- /**
- * @param args
- * @throws ComponentInitException
- */
- public static void main(String[] args) throws ComponentInitException {
- SparqlSimpleExtractor extractor = new SparqlSimpleExtractor();
- extractor.setEndpointURL("http://live.dbpedia.org/sparql");
- extractor.setRecursionDepth(1);
- extractor.setDefaultGraphURI("http://dbpedia.org");
- List<String> instances = new ArrayList<String>(7);
- instances.add("http://dbpedia.org/resource/Democritus");
- instances.add("http://dbpedia.org/resource/Zeno_of_Elea");
- instances.add("http://dbpedia.org/resource/Plato");
- instances.add("http://dbpedia.org/resource/Socrates");
- instances.add("http://dbpedia.org/resource/Archytas");
- instances.add("http://dbpedia.org/resource/Pythagoras");
- instances.add("http://dbpedia.org/resource/Philolaus");
+ /**
+ * @param args
+ * @throws ComponentInitException
+ */
+ public static void main(String[] args) throws ComponentInitException {
+ SparqlSimpleExtractor extractor = new SparqlSimpleExtractor();
+ extractor.setEndpointURL("http://live.dbpedia.org/sparql");
+ extractor.setRecursionDepth(1);
+ extractor.setDefaultGraphURI("http://dbpedia.org");
+ List<String> instances = new ArrayList<String>(7);
+ instances.add("http://dbpedia.org/resource/Democritus");
+ instances.add("http://dbpedia.org/resource/Zeno_of_Elea");
+ instances.add("http://dbpedia.org/resource/Plato");
+ instances.add("http://dbpedia.org/resource/Socrates");
+ instances.add("http://dbpedia.org/resource/Archytas");
+ instances.add("http://dbpedia.org/resource/Pythagoras");
+ instances.add("http://dbpedia.org/resource/Philolaus");
- extractor.setInstances(instances);
- extractor.init();
- List<String> individuals = new LinkedList<String>();
- individuals.add("People");
- individuals.add("Animals");
- extractor.setInstances(individuals);
- // System.out.println(extractor.createQuery());
- }
+ extractor.setInstances(instances);
+ extractor.init();
+ List<String> individuals = new LinkedList<String>();
+ individuals.add("People");
+ individuals.add("Animals");
+ extractor.setInstances(individuals);
+ // System.out.println(extractor.createQuery());
+ }
- @Override
- public void init() throws ComponentInitException {
- if (endpointURL == null) {
- throw new ComponentInitException(
- "Parameter endpoint URL is required");
- }
- if (instances == null) {
- throw new ComponentInitException("Parameter instances is required");
- }
- if (recursionDepth == 0) {
- throw new ComponentInitException(
- "A value bigger than 0 is required for parameter recursionDepth");
- }
- if (ontologyFile == null) {
- throw new ComponentInitException(
- "An ontology schema description file (ontologyFile) in RDF ist required");
- }
- Monitor monComp = MonitorFactory.start("Simple SPARQL Component")
- .start();
- Monitor monIndexer = MonitorFactory.start("Schema Indexer").start();
- indexer = new SchemaIndexer();
- indexer.setOntologySchema(ontologyFile);
- indexer.init();
- monIndexer.stop();
+ @Override
+ public void init() throws ComponentInitException {
+ if (endpointURL == null) {
+ throw new ComponentInitException(
+ "Parameter endpoint URL is required");
+ }
+ if (instances == null) {
+ throw new ComponentInitException("Parameter instances is required");
+ }
+ if (recursionDepth == 0) {
+ throw new ComponentInitException(
+ "A value bigger than 0 is required for parameter recursionDepth");
+ }
+ if (ontologyFile == null) {
+ throw new ComponentInitException(
+ "An ontology schema description file (ontologyFile) in RDF ist required");
+ }
+ Monitor monComp = MonitorFactory.start("Simple SPARQL Component")
+ .start();
+ Monitor monIndexer = MonitorFactory.start("Schema Indexer").start();
+ indexer = new SchemaIndexer();
+ indexer.setOntologySchema(ontologyFile);
+ indexer.init();
+ monIndexer.stop();
- Monitor monAquery;
- Monitor monQuerying;
- QueryExecutor executor = new QueryExecutor();
- String queryString;
- if (sparqlQuery == null) {
- ABoxQueryGenerator aGenerator = new ABoxQueryGenerator();
- for (int i = 0; i < recursionDepth - 1; i++) {
- monAquery = MonitorFactory.getTimeMonitor("A query generator")
- .start();
- queryString = aGenerator.createQuery(instances, model, filters);
- monAquery.stop();
- log.debug("SPARQL: {}", queryString);
- monQuerying = MonitorFactory.start("Querying");
- executor.executeQuery(queryString, endpointURL, model,
- defaultGraphURI);
- monQuerying.stop();
- }
- monAquery = MonitorFactory.getTimeMonitor("A query generator")
- .start();
- queryString = aGenerator.createLastQuery(instances, model, filters);
- monAquery.stop();
- log.debug("SPARQL: {}", queryString);
- monQuerying = MonitorFactory.start("Querying");
- executor.executeQuery(queryString, endpointURL, model, defaultGraphURI);
- monQuerying.stop();
- } else {
- monQuerying=MonitorFactory.getTimeMonitor("Querying").start();
- executor.executeQuery(sparqlQuery, endpointURL, model);
- monQuerying.stop();
- }
-
+ Monitor monQueryingABox;
+ QueryExecutor executor = new QueryExecutor();
+ String queryString;
+ if (sparqlQuery == null) {
+ ABoxQueryGenerator aGenerator = new ABoxQueryGenerator();
+ for (int i = 0; i < recursionDepth - 1; i++) {
- TBoxQueryGenerator tGenerator = new TBoxQueryGenerator();
- Monitor monTquery = MonitorFactory.getTimeMonitor("T query generator")
- .start();
- queryString = tGenerator.createQuery(model, filters, instances);
- monTquery.stop();
- monQuerying = MonitorFactory.start("Querying");
- executor.executeQuery(queryString, endpointURL, model, defaultGraphURI);
- monQuerying.stop();
- Set<OntClass> classes = model.listClasses().toSet();
- for (OntClass ontClass : classes) {
- OntModel hierarchy = indexer.getHierarchyForURI(ontClass.getURI());
- if (hierarchy != null) {
- model.add(hierarchy);
- log.debug("{}", model);
- }
- }
- JenaToOwlapiConverter converter = new JenaToOwlapiConverter();
- owlOntology = converter.convert(this.model);
- monComp.stop();
- log.info("*******Simple SPARQL Extractor********");
- for (Monitor monitor : MonitorFactory.getRootMonitor().getMonitors()) {
- log.info("* {} *", monitor);
- }
- log.info("**************************************");
- }
+ queryString = aGenerator.createQuery(instances, model, filters);
+ log.debug("SPARQL: {}", queryString);
+ monQueryingABox = MonitorFactory.start("ABox query time");
+ executor.executeQuery(queryString, endpointURL, model,
+ defaultGraphURI);
+ monQueryingABox.stop();
+ }
- public String getEndpointURL() {
- return endpointURL;
- }
- public void setEndpointURL(String endpointURL) {
- this.endpointURL = endpointURL;
- }
+ queryString = aGenerator.createLastQuery(instances, model, filters);
- public String getDefaultGraphURI() {
- return defaultGraphURI;
- }
+ log.debug("SPARQL: {}", queryString);
- public void setDefaultGraphURI(String defaultGraphURI) {
- this.defaultGraphURI = defaultGraphURI;
- }
+ monQueryingABox = MonitorFactory.start("ABox query time");
+ Monitor monQueryingABox2 = MonitorFactory.start("ABox query time last query");
+ executor.executeQuery(queryString, endpointURL, model, defaultGraphURI);
+ monQueryingABox.stop();
+ monQueryingABox2.stop();
- public Model getModel() {
- return model;
- }
+ } else {
+ monQueryingABox = MonitorFactory.getTimeMonitor("ABox query time").start();
+ executor.executeQuery(sparqlQuery, endpointURL, model);
+ monQueryingABox.stop();
+ }
- public void setModel(OntModel model) {
- this.model = model;
- }
- /**
- * @return the filters
- */
- public List<String> getFilters() {
- return filters;
- }
+ TBoxQueryGenerator tGenerator = new TBoxQueryGenerator();
- /**
- * @param filters
- * the filters to set
- */
- public void setFilters(List<String> filters) {
- this.filters = filters;
- }
+ //TODO check if all instances are queried. model.listIndividuals().toSet()
+ queryString = tGenerator.createQuery(model, filters, instances);
- /**
- * @return the instances
- */
- public List<String> getInstances() {
- return instances;
- }
+ Monitor monQueryingTBox = MonitorFactory.start("TBox query time");
+ executor.executeQuery(queryString, endpointURL, model, defaultGraphURI);
+ monQueryingTBox.stop();
- /**
- * @param instances
- * the instances to set
- */
- public void setInstances(List<String> instances) {
- this.instances = instances;
- }
+ Monitor monIndexing = MonitorFactory.start("Querying index and conversion");
+ Set<OntClass> classes = model.listClasses().toSet();
+ for (OntClass ontClass : classes) {
+ OntModel hierarchy = indexer.getHierarchyForURI(ontClass.getURI());
+ if (hierarchy != null) {
+ model.add(hierarchy);
+ log.debug("{}", model);
+ }
+ }
+ JenaToOwlapiConverter converter = new JenaToOwlapiConverter();
+ owlOntology = converter.convert(this.model);
+ monIndexing.stop();
+ monComp.stop();
+ log.info("*******Simple SPARQL Extractor********");
+ for (Monitor monitor : MonitorFactory.getRootMonitor().getMonitors()) {
+ log.info("* {} *", monitor);
+ }
+ log.info("**************************************");
+ }
- /**
- * @return the recursionDepth
- */
- public int getRecursionDepth() {
- return recursionDepth;
- }
+ public String getEndpointURL() {
+ return endpointURL;
+ }
- /**
- * @param recursionDepth
- * the recursionDepth to set
- */
- public void setRecursionDepth(int recursionDepth) {
- this.recursionDepth = recursionDepth;
- }
+ public void setEndpointURL(String endpointURL) {
+ this.endpointURL = endpointURL;
+ }
- /**
- * @return
- */
- public OWLOntology getOWLOntology() {
- return owlOntology;
- }
+ public String getDefaultGraphURI() {
+ return defaultGraphURI;
+ }
- public File getOntologyFile() {
- return ontologyFile;
- }
+ public void setDefaultGraphURI(String defaultGraphURI) {
+ this.defaultGraphURI = defaultGraphURI;
+ }
- public void setOntologyFile(File ontologyFile) {
- this.ontologyFile = ontologyFile;
- }
+ public Model getModel() {
+ return model;
+ }
+ public void setModel(OntModel model) {
+ this.model = model;
+ }
+
+ /**
+ * @return the filters
+ */
+ public List<String> getFilters() {
+ return filters;
+ }
+
+ /**
+ * @param filters the filters to set
+ */
+ public void setFilters(List<String> filters) {
+ this.filters = filters;
+ }
+
+ /**
+ * @return the instances
+ */
+ public List<String> getInstances() {
+ return instances;
+ }
+
+ /**
+ * @param instances the instances to set
+ */
+ public void setInstances(List<String> instances) {
+ this.instances = instances;
+ }
+
+ /**
+ * @return the recursionDepth
+ */
+ public int getRecursionDepth() {
+ return recursionDepth;
+ }
+
+ /**
+ * @param recursionDepth the recursionDepth to set
+ */
+ public void setRecursionDepth(int recursionDepth) {
+ this.recursionDepth = recursionDepth;
+ }
+
+ /**
+ * @return
+ */
+ public OWLOntology getOWLOntology() {
+ return owlOntology;
+ }
+
+ public File getOntologyFile() {
+ return ontologyFile;
+ }
+
+ public void setOntologyFile(File ontologyFile) {
+ this.ontologyFile = ontologyFile;
+ }
+
}
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/TBoxQueryGenerator.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/TBoxQueryGenerator.java 2012-04-11 12:51:42 UTC (rev 3632)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/TBoxQueryGenerator.java 2012-04-11 13:48:27 UTC (rev 3633)
@@ -8,6 +8,8 @@
import com.hp.hpl.jena.ontology.OntModel;
import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.jamonapi.Monitor;
+import com.jamonapi.MonitorFactory;
/**
* @author didierc
@@ -16,6 +18,8 @@
public class TBoxQueryGenerator {
public String createQuery(OntModel model, List<String> filters,
List<String> individuals) {
+ Monitor monTquery = MonitorFactory.getTimeMonitor("TBox query generator")
+ .start();
StringBuilder builder = new StringBuilder(
"CONSTRUCT { ?example a ?class . } ");
builder.append("{ ?example a ?class . ");
@@ -34,6 +38,7 @@
}
}
builder.append("}");
+ monTquery.stop();
return builder.toString();
}
Modified: trunk/components-core/src/main/java/org/nlp2rdf/ontology/ClassIndexer.java
===================================================================
--- trunk/components-core/src/main/java/org/nlp2rdf/ontology/ClassIndexer.java 2012-04-11 12:51:42 UTC (rev 3632)
+++ trunk/components-core/src/main/java/org/nlp2rdf/ontology/ClassIndexer.java 2012-04-11 13:48:27 UTC (rev 3633)
@@ -25,9 +25,13 @@
import com.hp.hpl.jena.ontology.OntModel;
import com.hp.hpl.jena.ontology.OntModelSpec;
import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator;
+import com.jamonapi.Monitor;
+import com.jamonapi.MonitorFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.naming.ldap.ExtendedRequest;
import java.util.*;
@@ -55,11 +59,24 @@
}
public void index(OntModel from) {
- Set<OntClass> classes = from.listClasses().toSet();
+
+ // Set<OntClass> classes = from.listClasses();
int i = 0;
- for (OntClass cl : classes) {
+ OntClass cl;
+ for (ExtendedIterator<OntClass> it = from.listClasses(); it.hasNext(); ) {
+ Monitor m0 = MonitorFactory.start("Indexer listClasses");
+ cl = it.next();
+ m0.stop();
+ //for (OntClass cl : classes) {
+ Monitor m1 = MonitorFactory.start("Indexer generating tree");
Tree t = new Tree(cl);
- classUriToClassHierarchy.put(cl.getURI(), t.toModel());
+ m1.stop();
+ Monitor m2 = MonitorFactory.start("Indexer generating model");
+ OntModel m = t.toModel();
+ m2.stop();
+ Monitor m3 = MonitorFactory.start("Indexer generating hashmap");
+ classUriToClassHierarchy.put(cl.getURI(), m);
+ m3.stop();
}
}
Modified: trunk/examples/sparql/difference/DifferenceDBpediaYAGO_angela_vs_hillary.conf
===================================================================
--- trunk/examples/sparql/difference/DifferenceDBpediaYAGO_angela_vs_hillary.conf 2012-04-11 12:51:42 UTC (rev 3632)
+++ trunk/examples/sparql/difference/DifferenceDBpediaYAGO_angela_vs_hillary.conf 2012-04-11 13:48:27 UTC (rev 3633)
@@ -20,7 +20,7 @@
// SPARQL options
sparql.type = "SPARQL endpoint fragment"
-sparql.url = "http://dbpedia.openlinksw.com:8890/sparql"
+sparql.url = "http://live.dbpedia.org/sparql"
sparql.defaultGraphURIs = {"http://dbpedia.org"}
sparql.recursionDepth = 1
//TODOREFACTOR check if predefinedFilter works at all
Modified: trunk/test/newcomponent/AristotlePosNeg.conf
===================================================================
--- trunk/test/newcomponent/AristotlePosNeg.conf 2012-04-11 12:51:42 UTC (rev 3632)
+++ trunk/test/newcomponent/AristotlePosNeg.conf 2012-04-11 13:48:27 UTC (rev 3633)
@@ -14,6 +14,7 @@
sparql.endpointURL = "http://live.dbpedia.org/sparql"
sparql.defaultGraphURI = "http://dbpedia.org"
sparql.recursionDepth = 1
+sparql.ontologyFile= "http://downloads.dbpedia.org/3.6/dbpedia_3.6.owl"
sparql.instances = {
"http://dbpedia.org/resource/Democritus",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
