Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[3988] trunk/components-core/src/main/java/org/ dllearner
|
From: <lor...@us...> - 2013-06-11 13:07:45
|
Revision: 3988
http://sourceforge.net/p/dl-learner/code/3988
Author: lorenz_b
Date: 2013-06-11 13:07:42 +0000 (Tue, 11 Jun 2013)
Log Message:
-----------
Added QueryExecutionFactory using TURTLE for CONSTRUCT queries.
Modified Paths:
--------------
trunk/components-core/src/main/java/org/dllearner/kb/sparql/ConciseBoundedDescriptionGeneratorImpl.java
trunk/components-core/src/main/java/org/dllearner/reasoning/SPARQLReasoner.java
trunk/components-core/src/main/java/org/dllearner/utilities/datastructures/SetManipulation.java
trunk/components-core/src/main/java/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL2.java
trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLEntityTypeAdder.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 2013-06-11 13:06:13 UTC (rev 3987)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/ConciseBoundedDescriptionGeneratorImpl.java 2013-06-11 13:07:42 UTC (rev 3988)
@@ -11,7 +11,7 @@
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.http.QueryExecutionFactoryHttp;
import org.aksw.jena_sparql_api.model.QueryExecutionFactoryModel;
import org.aksw.jena_sparql_api.pagination.core.QueryExecutionFactoryPaginated;
import org.apache.log4j.Level;
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-11 13:06:13 UTC (rev 3987)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/SPARQLReasoner.java 2013-06-11 13:07:42 UTC (rev 3988)
@@ -492,7 +492,7 @@
* @return
*/
public Set<NamedClass> getSiblingClasses(NamedClass cls) {
- Set<NamedClass> siblings = new HashSet<NamedClass>();
+ Set<NamedClass> siblings = new TreeSet<NamedClass>();
String query = "SELECT ?sub WHERE { <" + cls.getName() + "> <http://www.w3.org/2000/01/rdf-schema#subClassOf> ?super .";
query += "?sub <http://www.w3.org/2000/01/rdf-schema#subClassOf> ?super .";
query += "FILTER( !SAMETERM(?sub, <" + cls.getName() + ">)) . }";System.out.println(query);
Modified: trunk/components-core/src/main/java/org/dllearner/utilities/datastructures/SetManipulation.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/datastructures/SetManipulation.java 2013-06-11 13:06:13 UTC (rev 3987)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/datastructures/SetManipulation.java 2013-06-11 13:07:42 UTC (rev 3988)
@@ -90,27 +90,25 @@
}
return ret;
}
-
+
/**
* shrinks a set to the limit takes the first elements up to limit
*
* @param set
* @param limit
*/
- public static SortedSet<String> stableShrink(SortedSet<String> set,
+ public static <T> SortedSet<T> stableShrink(SortedSet<T> set,
int limit) {
if (set.size() <= limit) {
return set;
}
- SortedSet<String> ret = new TreeSet<String>();
+ SortedSet<T> ret = new TreeSet<T>();
- for (String oneInd : set) {
+ for (T oneInd : set) {
ret.add(oneInd);
if (ret.size() >= limit)
break;
-
}
-
return ret;
}
Modified: trunk/components-core/src/main/java/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL2.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL2.java 2013-06-11 13:06:13 UTC (rev 3987)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL2.java 2013-06-11 13:07:42 UTC (rev 3988)
@@ -196,7 +196,7 @@
siblingNegativeExamples.addAll(sr.getIndividualsExcluding(siblingClass, nc, limit));
}
}
- siblingNegativeExamples = SetManipulation.fuzzyShrink(siblingNegativeExamples, strategyLimit);
+ siblingNegativeExamples = SetManipulation.stableShrink(siblingNegativeExamples, strategyLimit);
negativeExamples.addAll(siblingNegativeExamples);
} else if(strategy == SUPERCLASS){//get super class based examples
SortedSet<Individual> superClassNegativeExamples = new TreeSet<Individual>();
@@ -214,7 +214,7 @@
superClassNegativeExamples.addAll(sr.getIndividualsExcluding(superClass, nc, limit));
}
}
- superClassNegativeExamples = SetManipulation.fuzzyShrink(superClassNegativeExamples, strategyLimit);
+ superClassNegativeExamples = SetManipulation.stableShrink(superClassNegativeExamples, strategyLimit);
negativeExamples.addAll(superClassNegativeExamples);
} else if(strategy == RANDOM){//get some random examples
Modified: trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLEntityTypeAdder.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLEntityTypeAdder.java 2013-06-11 13:06:13 UTC (rev 3987)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLEntityTypeAdder.java 2013-06-11 13:07:42 UTC (rev 3988)
@@ -38,6 +38,16 @@
}
}
iterator.close();
+ for (Property property : dataPropertyPredicates) {
+ if(!objectPropertyPredicates.contains(property)){
+ model.add(property, RDF.type, OWL.DatatypeProperty);
+ }
+ }
+ for (Property property : objectPropertyPredicates) {
+ if(!dataPropertyPredicates.contains(property)){
+ model.add(property, RDF.type, OWL.ObjectProperty);
+ }
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
