Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1121] trunk/src/dl-learner/org/dllearner
|
From: <ku...@us...> - 2008-08-21 14:54:38
|
Revision: 1121
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1121&view=rev
Author: kurzum
Date: 2008-08-21 14:54:31 +0000 (Thu, 21 Aug 2008)
Log Message:
-----------
empty log message
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/cli/Start.java
trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupleAquisitorImproved.java
trunk/src/dl-learner/org/dllearner/kb/extraction/ExtractionAlgorithm.java
trunk/src/dl-learner/org/dllearner/kb/manipulator/DBPediaNavigatorCityLocatorRule.java
trunk/src/dl-learner/org/dllearner/kb/manipulator/DBpediaNavigatorOtherRule.java
trunk/src/dl-learner/org/dllearner/kb/manipulator/ObjectReplacementRule.java
trunk/src/dl-learner/org/dllearner/kb/manipulator/PredicateReplacementRule.java
trunk/src/dl-learner/org/dllearner/kb/manipulator/Rule.java
trunk/src/dl-learner/org/dllearner/kb/manipulator/SimpleObjectFilterRule.java
trunk/src/dl-learner/org/dllearner/kb/manipulator/SimplePredicateFilterRule.java
trunk/src/dl-learner/org/dllearner/kb/manipulator/TypeFilterRule.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlEndpoint.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryMaker.java
trunk/src/dl-learner/org/dllearner/scripts/NT2RDF.java
trunk/src/dl-learner/org/dllearner/utilities/JamonMonitorLogger.java
trunk/src/dl-learner/org/dllearner/utilities/owl/OWLVocabulary.java
Modified: trunk/src/dl-learner/org/dllearner/cli/Start.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/cli/Start.java 2008-08-21 14:23:00 UTC (rev 1120)
+++ trunk/src/dl-learner/org/dllearner/cli/Start.java 2008-08-21 14:54:31 UTC (rev 1121)
@@ -86,6 +86,7 @@
import org.dllearner.reasoning.OWLAPIReasoner;
import org.dllearner.utilities.Files;
import org.dllearner.utilities.Helper;
+import org.dllearner.utilities.JamonMonitorLogger;
import org.dllearner.utilities.datastructures.Datastructures;
import org.dllearner.utilities.datastructures.StringTuple;
import org.dllearner.utilities.owl.ConceptComparator;
@@ -155,7 +156,9 @@
Start start = new Start(file);
start.start(inQueryMode);
// write JaMON report in HTML file
- Files.createFile(new File("log/jamon.html"), MonitorFactory.getReport());
+ File jamonlog = new File("log/jamon.html");
+ Files.createFile(jamonlog, MonitorFactory.getReport());
+ Files.appendFile(jamonlog, "<xmp>\n"+JamonMonitorLogger.getStringForAllSortedByLabel());
}
/**
Modified: trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupleAquisitorImproved.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupleAquisitorImproved.java 2008-08-21 14:23:00 UTC (rev 1120)
+++ trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupleAquisitorImproved.java 2008-08-21 14:54:31 UTC (rev 1121)
@@ -85,23 +85,23 @@
RDFNode nextOBJ = binding.get(OBJECT+i);
RDFNode nextPRED = binding.get(PREDICATE+i);
RDFNodeTuple tmptuple = new RDFNodeTuple(nextPRED, nextOBJ );
- add(uri,tmptuple);
+ addToLocalCache(uri,tmptuple);
boolean cont = !nextOBJ.isLiteral();
- for (i=0; (i < recursionDepth) && cont; i++) {
+ for (i=1; (i < recursionDepth) && cont; i++) {
RDFNode tmpPREDURI = binding.get(PREDICATE+i);
RDFNode tmpOBJURI = binding.get(OBJECT+i);
if(tmpOBJURI==null) {
cont=false;
}else if (tmpOBJURI.isLiteral()) {
tmptuple = new RDFNodeTuple(tmpPREDURI, tmpOBJURI );
- add(nextOBJ.toString(), tmptuple);
+ addToLocalCache(nextOBJ.toString(), tmptuple);
//logger.trace(tmptuple);
//logger.trace("For: "+nextOBJ.toString()+ " added :"+resources.get(nextOBJ.toString()));
cont=false;
}else {
tmptuple = new RDFNodeTuple(tmpPREDURI, tmpOBJURI );
- add(nextOBJ.toString(), tmptuple);
+ addToLocalCache(nextOBJ.toString(), tmptuple);
//logger.trace(tmptuple);
//logger.trace("For: "+nextOBJ.toString()+ " added :"+resources.get(nextOBJ.toString()));
nextOBJ = tmpOBJURI;
@@ -124,6 +124,7 @@
public SortedSet<RDFNodeTuple> retrieveTuplesForClassesOnly(String uri){
int tmp = recursionDepth;
recursionDepth=4;
+
SortedSet<RDFNodeTuple> tmpSet = retrieveTupel(uri);
recursionDepth = tmp;
return tmpSet;
@@ -133,12 +134,15 @@
}
- private void add(String uri, RDFNodeTuple tuple){
+ private void addToLocalCache(String uri, RDFNodeTuple tuple){
SortedSet<RDFNodeTuple> set = resources.get(uri);
+
+
if(set==null){
set = new TreeSet<RDFNodeTuple>();
set.add(tuple);
resources.put(uri, set );
+
}else {
set.add(tuple);
}
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/ExtractionAlgorithm.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/ExtractionAlgorithm.java 2008-08-21 14:23:00 UTC (rev 1120)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/ExtractionAlgorithm.java 2008-08-21 14:54:31 UTC (rev 1121)
@@ -24,6 +24,7 @@
import java.util.SortedSet;
import java.util.TreeSet;
+import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.dllearner.kb.aquisitors.TupleAquisitor;
import org.dllearner.utilities.statistics.SimpleClock;
@@ -108,14 +109,15 @@
if(configuration.isCloseAfterRecursion()){
List<InstanceNode> l = getInstanceNodes(newNodes);
+ logger.info("Getting classes for remaining instances: "+l.size() + " instances");
tupelAquisitor.setNextTaskToClassesForInstances();
collectNodes.addAll(expandCloseAfterRecursion(l, tupelAquisitor));
-
}
// gets All Class Nodes and expands them further
if (configuration.isGetAllSuperClasses()) {
List<ClassNode> allClassNodes = getClassNodes(collectNodes);
tupelAquisitor.setNextTaskToClassInformation();
+ logger.info("Get all superclasses for "+allClassNodes.size() + " classes");
expandAllSuperClassesOfANode(allClassNodes, tupelAquisitor);
}
@@ -124,6 +126,7 @@
}
private List<Node> expandCloseAfterRecursion(List<InstanceNode> instanceNodes, TupleAquisitor tupelAquisitor) {
+
List<Node> newNodes = new ArrayList<Node>();
tupelAquisitor.setNextTaskToClassesForInstances();
if (configuration.isCloseAfterRecursion()) {
@@ -142,19 +145,23 @@
}
private void expandAllSuperClassesOfANode(List<ClassNode> allClassNodes, TupleAquisitor tupelAquisitor) {
- logger.info("Get all superclasses");
+
List<Node> newClasses = new ArrayList<Node>();
newClasses.addAll(allClassNodes);
//TODO LinkedData incompatibility
- tupelAquisitor.setNextTaskToClassInformation();
+
int i = 0;
- while (!newClasses.isEmpty() && false) {
+
+ while (!newClasses.isEmpty() ) {
logger.trace("Remaining classes: " + newClasses.size());
Node next = newClasses.remove(0);
+ logger.trace("Getting Superclasses for: " + next);
+
if (!alreadyQueriedSuperClasses.contains(next.getURI().toString())) {
- logger.trace("Getting Superclasses for: " + next);
+ logger.trace("" + next+" not in cache retrieving");
alreadyQueriedSuperClasses.add(next.getURI().toString());
+ tupelAquisitor.setNextTaskToClassInformation();
newClasses.addAll(next.expand(tupelAquisitor, configuration.getManipulator()));
if (i > configuration.getBreakSuperClassesAfter()) {
@@ -162,6 +169,9 @@
}//endinnerif
i++;
}//endouterif
+ else {
+ logger.trace("" + next+" in cache skipping");
+ }
}//endwhile
if(!configuration.isOptimizeForDLLearner()){
Modified: trunk/src/dl-learner/org/dllearner/kb/manipulator/DBPediaNavigatorCityLocatorRule.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/manipulator/DBPediaNavigatorCityLocatorRule.java 2008-08-21 14:23:00 UTC (rev 1120)
+++ trunk/src/dl-learner/org/dllearner/kb/manipulator/DBPediaNavigatorCityLocatorRule.java 2008-08-21 14:54:31 UTC (rev 1121)
@@ -63,8 +63,13 @@
}
+ @Override
+ public void logJamon(){
+
+ }
+
}
Modified: trunk/src/dl-learner/org/dllearner/kb/manipulator/DBpediaNavigatorOtherRule.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/manipulator/DBpediaNavigatorOtherRule.java 2008-08-21 14:23:00 UTC (rev 1120)
+++ trunk/src/dl-learner/org/dllearner/kb/manipulator/DBpediaNavigatorOtherRule.java 2008-08-21 14:54:31 UTC (rev 1121)
@@ -99,5 +99,10 @@
}
else return "http://dbpedia.org/class/custom/City_in_World";
}
+
+ @Override
+ public void logJamon(){
+
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/kb/manipulator/ObjectReplacementRule.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/manipulator/ObjectReplacementRule.java 2008-08-21 14:23:00 UTC (rev 1120)
+++ trunk/src/dl-learner/org/dllearner/kb/manipulator/ObjectReplacementRule.java 2008-08-21 14:54:31 UTC (rev 1121)
@@ -54,6 +54,10 @@
return keep;
}
+ @Override
+ public void logJamon(){
+ JamonMonitorLogger.increaseCount(ObjectReplacementRule.class, "replacedObjects");
+ }
Modified: trunk/src/dl-learner/org/dllearner/kb/manipulator/PredicateReplacementRule.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/manipulator/PredicateReplacementRule.java 2008-08-21 14:23:00 UTC (rev 1120)
+++ trunk/src/dl-learner/org/dllearner/kb/manipulator/PredicateReplacementRule.java 2008-08-21 14:54:31 UTC (rev 1121)
@@ -47,14 +47,18 @@
for (RDFNodeTuple tuple : tuples) {
if(tuple.aPartContains(oldPredicate)){
tuple.a = new ResourceImpl(newPredicate);
- JamonMonitorLogger.increaseCount(PredicateReplacementRule.class, "replacedPredicates");
+ logJamon();
}
keep.add(tuple);
}
return keep;
}
+ @Override
+ public void logJamon(){
+ JamonMonitorLogger.increaseCount(PredicateReplacementRule.class, "replacedPredicates");
+ }
+
-
}
Modified: trunk/src/dl-learner/org/dllearner/kb/manipulator/Rule.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/manipulator/Rule.java 2008-08-21 14:23:00 UTC (rev 1120)
+++ trunk/src/dl-learner/org/dllearner/kb/manipulator/Rule.java 2008-08-21 14:54:31 UTC (rev 1121)
@@ -59,4 +59,6 @@
}
System.out.println(Months.values());
}
+
+ public abstract void logJamon();
}
Modified: trunk/src/dl-learner/org/dllearner/kb/manipulator/SimpleObjectFilterRule.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/manipulator/SimpleObjectFilterRule.java 2008-08-21 14:23:00 UTC (rev 1120)
+++ trunk/src/dl-learner/org/dllearner/kb/manipulator/SimpleObjectFilterRule.java 2008-08-21 14:54:31 UTC (rev 1121)
@@ -43,11 +43,16 @@
if(!tuple.bPartContains(objectFilter)){
keep.add(tuple);
}else{
- JamonMonitorLogger.increaseCount(SimpleObjectFilterRule.class, "filteredTriples");
+ logJamon();
}
}
return keep;
}
+
+ @Override
+ public void logJamon(){
+ JamonMonitorLogger.increaseCount(SimpleObjectFilterRule.class, "filteredTriples");
+ }
/*
private boolean keepTuple(Node subject, RDFNodeTuple tuple) {
Modified: trunk/src/dl-learner/org/dllearner/kb/manipulator/SimplePredicateFilterRule.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/manipulator/SimplePredicateFilterRule.java 2008-08-21 14:23:00 UTC (rev 1120)
+++ trunk/src/dl-learner/org/dllearner/kb/manipulator/SimplePredicateFilterRule.java 2008-08-21 14:54:31 UTC (rev 1121)
@@ -44,11 +44,16 @@
if(!tuple.aPartContains(predicateFilter)){
keep.add(tuple);
}else{
- JamonMonitorLogger.increaseCount(SimplePredicateFilterRule.class, "filteredTriples");
+ logJamon();
}
}
return keep;
}
+
+ @Override
+ public void logJamon(){
+ JamonMonitorLogger.increaseCount(SimplePredicateFilterRule.class, "filteredTriples");
+ }
Modified: trunk/src/dl-learner/org/dllearner/kb/manipulator/TypeFilterRule.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/manipulator/TypeFilterRule.java 2008-08-21 14:23:00 UTC (rev 1120)
+++ trunk/src/dl-learner/org/dllearner/kb/manipulator/TypeFilterRule.java 2008-08-21 14:54:31 UTC (rev 1121)
@@ -60,14 +60,21 @@
if(!remove){
keep.add(tuple);
}else{
- JamonMonitorLogger.increaseCount(TypeFilterRule.class, "filteredTriples");
+ logJamon();
}
}
return keep;
}
+ @Override
+ public void logJamon(){
+ JamonMonitorLogger.increaseCount(TypeFilterRule.class, "filteredTriples");
+ }
+
+
+
/*
if (t.a.equals(type) && t.b.equals(classns)
&& node instanceof ClassNode) {
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlEndpoint.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlEndpoint.java 2008-08-21 14:23:00 UTC (rev 1120)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlEndpoint.java 2008-08-21 14:54:31 UTC (rev 1121)
@@ -54,8 +54,8 @@
}
public String getHTTPRequest() {
- String ret = this.url.toString()+"/sparql?";
- ret += (defaultGraphURIs.isEmpty())?"":"default-graph-uri="+defaultGraphURIs.remove(0)+"&";
+ String ret = this.url.toString()+"?";
+ ret += (defaultGraphURIs.isEmpty())?"":"default-graph-uri="+defaultGraphURIs.get(0)+"&";
ret += "query=";
return ret;
}
@@ -68,6 +68,10 @@
return namedGraphURIs;
}
+ @Override
+ public String toString(){
+ return getHTTPRequest();
+ }
/*public static SparqlEndpoint getEndpointByNumber(int i) {
switch (i) {
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2008-08-21 14:23:00 UTC (rev 1120)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2008-08-21 14:54:31 UTC (rev 1121)
@@ -58,6 +58,7 @@
import org.dllearner.parser.KBParser;
import org.dllearner.reasoning.DIGConverter;
import org.dllearner.reasoning.JenaOWLDIGConverter;
+import org.dllearner.scripts.NT2RDF;
import org.dllearner.utilities.datastructures.StringTuple;
import org.dllearner.utilities.statistics.SimpleClock;
@@ -290,7 +291,7 @@
Configuration configuration = new Configuration(
- getTupleAquisitor(),
+ tupleAquisitor,
manipulator,
recursionDepth,
getAllSuperClasses,
@@ -325,6 +326,10 @@
fw.close();
dumpFile = (new File(basedir + filename)).toURI().toURL();
+ if(debug){
+ NT2RDF.convertNT2RDF(basedir + filename);
+ //System.exit(0);
+ }
} catch (Exception e) {
e.printStackTrace();
}
@@ -388,11 +393,14 @@
public SPARQLTasks getSPARQLTasks() {
+
// get Options for endpoints
if (predefinedEndpoint == null) {
endpoint = new SparqlEndpoint(url, defaultGraphURIs, namedGraphURIs);
} else {
endpoint = SparqlEndpoint.getEndpointByName(predefinedEndpoint);
+ //System.out.println(endpoint);
+
}
if (this.useCache)
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java 2008-08-21 14:23:00 UTC (rev 1120)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java 2008-08-21 14:54:31 UTC (rev 1121)
@@ -98,6 +98,7 @@
queryExecution = new QueryEngineHTTP(service, sparqlQueryString);
//System.out.println(sparqlEndpoint.getDefaultGraphURIs());
+
for (String dgu : sparqlEndpoint.getDefaultGraphURIs()) {
queryExecution.addDefaultGraph(dgu);
}
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryMaker.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryMaker.java 2008-08-21 14:23:00 UTC (rev 1120)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryMaker.java 2008-08-21 14:54:31 UTC (rev 1121)
@@ -107,14 +107,14 @@
tmpFilter = (tmpFilter.length() > 0) ? "FILTER( " + lineend + tmpFilter
+ "). " : " ";
- /*String returnString = "SELECT * WHERE {" +lineend +
+ String returnString = "SELECT * WHERE {" +lineend +
"<" + subject + "> ?predicate ?object;" +
"a ?object . "+lineend+
tmpFilter + "}";
- */
- String returnString = "SELECT * WHERE {" +lineend +
- "<" + subject + "> <"+OWLVocabulary.RDF_TYPE+"> ?object. " +lineend+
- tmpFilter + "}";
+
+ //String returnString = "SELECT * WHERE {" +lineend +
+ // "<" + subject + "> <"+OWLVocabulary.RDF_TYPE+"> ?object. " +lineend+
+ // tmpFilter + "}";
return returnString;
}
Modified: trunk/src/dl-learner/org/dllearner/scripts/NT2RDF.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/NT2RDF.java 2008-08-21 14:23:00 UTC (rev 1120)
+++ trunk/src/dl-learner/org/dllearner/scripts/NT2RDF.java 2008-08-21 14:54:31 UTC (rev 1121)
@@ -35,6 +35,10 @@
}
+ /**
+ * converts .nt file to rdf, same file name, different ending
+ * @param ontopath path to nt file
+ */
public static void convertNT2RDF(String ontopath){
try {
Modified: trunk/src/dl-learner/org/dllearner/utilities/JamonMonitorLogger.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/JamonMonitorLogger.java 2008-08-21 14:23:00 UTC (rev 1120)
+++ trunk/src/dl-learner/org/dllearner/utilities/JamonMonitorLogger.java 2008-08-21 14:54:31 UTC (rev 1121)
@@ -65,16 +65,23 @@
public static void printAllSortedByLabel() {
+
+ System.out.println(getStringForAllSortedByLabel());
+
+ }
+
+ public static String getStringForAllSortedByLabel() {
List<Monitor> l= getMonitors();
SortedSet<String> sset = new TreeSet<String>();
-
+ StringBuffer sbuf = new StringBuffer();
for (int i = 0; i < l.size(); i++) {
Monitor monitor = l.get(i);
sset.add(monitor.toString());
}
for (String onemon : sset) {
- System.out.println(onemon);
+ sbuf.append(onemon+"\n");
}
+ return sbuf.toString();
}
Modified: trunk/src/dl-learner/org/dllearner/utilities/owl/OWLVocabulary.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/owl/OWLVocabulary.java 2008-08-21 14:23:00 UTC (rev 1120)
+++ trunk/src/dl-learner/org/dllearner/utilities/owl/OWLVocabulary.java 2008-08-21 14:54:31 UTC (rev 1121)
@@ -24,6 +24,7 @@
public static final String RDF_TYPE = "http://www.w3.org/1999/02/22-rdf-syntax-ns#type";
public static final String RDFS_SUBCLASS_OF = "http://www.w3.org/2000/01/rdf-schema#subClassOf";
+
public static final String RDFS_CLASS = "http://www.w3.org/2000/01/rdf-schema#Class";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
