Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[2017] trunk/src/dl-learner/org/dllearner
|
From: <ku...@us...> - 2010-02-11 13:53:54
|
Revision: 2017
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2017&view=rev
Author: kurzum
Date: 2010-02-11 13:53:47 +0000 (Thu, 11 Feb 2010)
Log Message:
-----------
saw that option dissolveBlankNodes did not work in SPARQL component, fixed it
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/kb/aquisitors/TupleAquisitor.java
trunk/src/dl-learner/org/dllearner/kb/extraction/BlankNode.java
trunk/src/dl-learner/org/dllearner/kb/extraction/ClassNode.java
trunk/src/dl-learner/org/dllearner/kb/extraction/Configuration.java
trunk/src/dl-learner/org/dllearner/kb/extraction/DatatypePropertyNode.java
trunk/src/dl-learner/org/dllearner/kb/extraction/ExtractionAlgorithm.java
trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java
trunk/src/dl-learner/org/dllearner/kb/extraction/LiteralNode.java
trunk/src/dl-learner/org/dllearner/kb/extraction/Node.java
trunk/src/dl-learner/org/dllearner/kb/extraction/ObjectPropertyNode.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
trunk/src/dl-learner/org/dllearner/tools/ore/SPARQLTest.java
Modified: trunk/src/dl-learner/org/dllearner/kb/aquisitors/TupleAquisitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/aquisitors/TupleAquisitor.java 2010-02-11 13:53:20 UTC (rev 2016)
+++ trunk/src/dl-learner/org/dllearner/kb/aquisitors/TupleAquisitor.java 2010-02-11 13:53:47 UTC (rev 2017)
@@ -45,8 +45,19 @@
protected int mode = 0;
protected boolean uriDebugCheck = true;
- protected boolean dissolveBlankNodes = false;
+
+ public boolean dissolveBlankNodes = false;
+
+ /**
+ * this function is still used somewhere, but should be replaced
+ * @return
+ */
+ @Deprecated
+ public boolean isDissolveBlankNodes(){
+ return dissolveBlankNodes;
+ }
+
public final SortedSet<RDFNodeTuple> getTupelForResource(String uri){
checkURIforValidity(uri);
@@ -94,12 +105,6 @@
}
return true;
}
- public boolean isDissolveBlankNodes() {
- return dissolveBlankNodes;
- }
- public void setDissolveBlankNodes(boolean dissolveBlankNodes) {
- this.dissolveBlankNodes = dissolveBlankNodes;
- }
}
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/BlankNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/BlankNode.java 2010-02-11 13:53:20 UTC (rev 2016)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/BlankNode.java 2010-02-11 13:53:47 UTC (rev 2017)
@@ -80,7 +80,7 @@
@Override
public List<BlankNode> expandProperties(TupleAquisitor TupelAquisitor,
- Manipulator manipulator) {
+ Manipulator manipulator, boolean dissolveBlankNodes) {
return new ArrayList<BlankNode>();
}
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/ClassNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/ClassNode.java 2010-02-11 13:53:20 UTC (rev 2016)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/ClassNode.java 2010-02-11 13:53:47 UTC (rev 2017)
@@ -114,7 +114,7 @@
// gets the types for properties recursively
@Override
- public List<BlankNode> expandProperties(TupleAquisitor tupelAquisitor, Manipulator manipulator) {
+ public List<BlankNode> expandProperties(TupleAquisitor tupelAquisitor, Manipulator manipulator, boolean dissolveBlankNodes) {
return new ArrayList<BlankNode>();
}
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/Configuration.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/Configuration.java 2010-02-11 13:53:20 UTC (rev 2016)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/Configuration.java 2010-02-11 13:53:47 UTC (rev 2017)
@@ -66,6 +66,8 @@
this.breakSuperClassesAfter = breakSuperClassesAfter;
this.dissolveBlankNodes = dissolveBlankNodes;
+ this.tupelAquisitor.dissolveBlankNodes = dissolveBlankNodes;
+
this.owlAPIOntologyCollector = new OWLAPIOntologyCollector();
}
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/DatatypePropertyNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/DatatypePropertyNode.java 2010-02-11 13:53:20 UTC (rev 2016)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/DatatypePropertyNode.java 2010-02-11 13:53:47 UTC (rev 2017)
@@ -64,7 +64,7 @@
// gets the types for properties recursively
@Override
- public List<BlankNode> expandProperties(TupleAquisitor tupelAquisitor, Manipulator manipulator) {
+ public List<BlankNode> expandProperties(TupleAquisitor tupelAquisitor, Manipulator manipulator, boolean dissolveBlankNodes) {
List<BlankNode> ret = new ArrayList<BlankNode>();
//ret.addAll(b.expandProperties(tupelAquisitor, manipulator));
SortedSet<RDFNodeTuple> newTypes = tupelAquisitor.getTupelForResource(uri);
@@ -77,7 +77,7 @@
}
}else if(tuple.b.isAnon()){
- if(tupelAquisitor.isDissolveBlankNodes()){
+ if(dissolveBlankNodes){
RDFBlankNode n = (RDFBlankNode) tuple.b;
BlankNode tmp = new BlankNode( n, tuple.a.toString());
//add it to the graph
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/ExtractionAlgorithm.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/ExtractionAlgorithm.java 2010-02-11 13:53:20 UTC (rev 2016)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/ExtractionAlgorithm.java 2010-02-11 13:53:47 UTC (rev 2017)
@@ -85,8 +85,6 @@
*
*/
public Node expandNode(String uri, TupleAquisitor tupleAquisitor) {
- tupleAquisitor.setDissolveBlankNodes(configuration.isDissolveBlankNodes());
-
SimpleClock sc = new SimpleClock();
if(tupleAquisitor instanceof SparqlTupleAquisitorImproved){
((SparqlTupleAquisitorImproved)tupleAquisitor).removeFromCache(uri);
@@ -155,7 +153,7 @@
if(stopCondition()){
break;
}
- collectNodes.addAll(node.expandProperties(tupleAquisitor, configuration.getManipulator()));
+ collectNodes.addAll(node.expandProperties(tupleAquisitor, configuration.getManipulator(), configuration.isDissolveBlankNodes()));
}
List<DatatypePropertyNode> datatypeProperties = getDatatypeProperties(collectNodes);
logger.info("Get info for "+datatypeProperties.size() + " datatypeProperties");
@@ -163,13 +161,13 @@
if(stopCondition()){
break;
}
- collectNodes.addAll(node.expandProperties(tupleAquisitor, configuration.getManipulator()));
+ collectNodes.addAll(node.expandProperties(tupleAquisitor, configuration.getManipulator(), configuration.isDissolveBlankNodes()));
}
m.stop();
}
Monitor m = JamonMonitorLogger.getTimeMonitor(ExtractionAlgorithm.class, "TimeBlankNode").start();
- if( configuration.isDissolveBlankNodes()&& !stopCondition()){
+ if( configuration.isDissolveBlankNodes() && !stopCondition()){
expandBlankNodes(getBlankNodes(collectNodes),tupleAquisitor);
}
m.stop();
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java 2010-02-11 13:53:20 UTC (rev 2016)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java 2010-02-11 13:53:47 UTC (rev 2017)
@@ -144,14 +144,14 @@
// gets the types for properties recursively
@Override
- public List<BlankNode> expandProperties(TupleAquisitor tupelAquisitor, Manipulator manipulator) {
+ public List<BlankNode> expandProperties(TupleAquisitor tupelAquisitor, Manipulator manipulator, boolean dissolveBlankNodes) {
List<BlankNode> ret = new ArrayList<BlankNode>();
for (ObjectPropertyNode one : objectProperties) {
- ret.addAll(one.expandProperties(tupelAquisitor, manipulator));
+ ret.addAll(one.expandProperties(tupelAquisitor, manipulator, dissolveBlankNodes));
}
for (DatatypePropertyNode one : datatypeProperties) {
- ret.addAll(one.expandProperties(tupelAquisitor, manipulator));
+ ret.addAll(one.expandProperties(tupelAquisitor, manipulator, dissolveBlankNodes));
}
return ret;
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/LiteralNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/LiteralNode.java 2010-02-11 13:53:20 UTC (rev 2016)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/LiteralNode.java 2010-02-11 13:53:47 UTC (rev 2017)
@@ -70,7 +70,7 @@
// gets the types for properties recursively
@Override
- public List<BlankNode> expandProperties(TupleAquisitor tupelAquisitor, Manipulator manipulator) {
+ public List<BlankNode> expandProperties(TupleAquisitor tupelAquisitor, Manipulator manipulator, boolean dissolveBlankNodes) {
return new ArrayList<BlankNode>();
}
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/Node.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/Node.java 2010-02-11 13:53:20 UTC (rev 2016)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/Node.java 2010-02-11 13:53:47 UTC (rev 2017)
@@ -66,7 +66,7 @@
* @param manipulator
*/
public abstract List<BlankNode> expandProperties(
- TupleAquisitor TupelAquisitor, Manipulator manipulator);
+ TupleAquisitor TupelAquisitor, Manipulator manipulator, boolean dissolveBlankNodes);
/**
* output
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/ObjectPropertyNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/ObjectPropertyNode.java 2010-02-11 13:53:20 UTC (rev 2016)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/ObjectPropertyNode.java 2010-02-11 13:53:47 UTC (rev 2017)
@@ -68,9 +68,9 @@
// gets the types for properties recursively
@Override
- public List<BlankNode> expandProperties(TupleAquisitor tupelAquisitor, Manipulator manipulator) {
+ public List<BlankNode> expandProperties(TupleAquisitor tupelAquisitor, Manipulator manipulator, boolean dissolveBlankNodes) {
List<BlankNode> ret = new ArrayList<BlankNode>();
- ret.addAll(b.expandProperties(tupelAquisitor, manipulator));
+ ret.addAll(b.expandProperties(tupelAquisitor, manipulator, dissolveBlankNodes));
SortedSet<RDFNodeTuple> newTypes = tupelAquisitor.getTupelForResource(uri);
for (RDFNodeTuple tuple : newTypes) {
try {
@@ -81,7 +81,7 @@
}
}else if(tuple.b.isAnon()){
- if(tupelAquisitor.isDissolveBlankNodes()){
+ if(dissolveBlankNodes){
RDFBlankNode n = (RDFBlankNode) tuple.b;
BlankNode tmp = new BlankNode( n, tuple.a.toString());
//add it to the graph
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2010-02-11 13:53:20 UTC (rev 2016)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2010-02-11 13:53:47 UTC (rev 2017)
@@ -77,14 +77,9 @@
private ProgressMonitor mon;
- private static final boolean debug = false;
-
- //private static final boolean threaded = debug && true ;
+ private static final boolean debugExitAfterExtraction = false; // switches
- // sysex
- private static final boolean debugExitAfterExtraction = debug && false; // switches
-
private SparqlKnowledgeSourceConfigurator configurator;
/**
@@ -478,7 +473,6 @@
ret = new SparqlTupleAquisitor(getSparqlQueryMaker(),
getSPARQLTasks());
}
- ret.setDissolveBlankNodes(configurator.getDissolveBlankNodes());
return ret;
}
@@ -518,27 +512,6 @@
this.mon = mon;
}
- /*
- * public static void main(String[] args) throws MalformedURLException {
- * String query = "SELECT ?pred ?obj\n" + "WHERE {<http://dbpedia.org/resource/Leipzig>
- * ?pred ?obj}"; URL url = new
- * URL("http://dbpedia.openlinksw.com:8890/sparql"); SparqlEndpoint sse =
- * new SparqlEndpoint(url); SparqlQuery q = new SparqlQuery(query, sse);
- * String[][] array = q.getAsStringArray(); for (int i = 0; i <
- * array.length; i++) { for (int j = 0; j < array[0].length; j++)
- * System.out.print(array[i][j] + " "); System.out.println(); } }
- */
+
- /*
- * SparqlOntologyCollector oc= // new
- * SparqlOntologyCollector(Datastructures.setToArray(instances), //
- * numberOfRecursions, filterMode, //
- * Datastructures.setToArray(predList),Datastructures.setToArray(
- * objList),Datastructures.setToArray(classList),format,url,useLits);
- * //HashMap<String, String> parameters = new HashMap<String, String>();
- * //parameters.put("default-graph-uri", "http://dbpedia.org");
- * //parameters.put("format", "application/sparql-results.xml");
- *
- */
-
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/SPARQLTest.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/SPARQLTest.java 2010-02-11 13:53:20 UTC (rev 2016)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/SPARQLTest.java 2010-02-11 13:53:47 UTC (rev 2017)
@@ -27,11 +27,8 @@
import org.dllearner.kb.sparql.SPARQLTasks;
import org.dllearner.kb.sparql.SparqlEndpoint;
import org.dllearner.kb.sparql.SparqlKnowledgeSource;
-import org.dllearner.kb.sparql.SparqlQuery;
import org.dllearner.utilities.datastructures.SetManipulation;
-import com.hp.hpl.jena.query.ResultSetRewindable;
-
/**
* Test class for SPARQL mode.
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
