Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1104] trunk/src/dl-learner/org/dllearner
|
From: <ku...@us...> - 2008-08-19 17:35:54
|
Revision: 1104
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1104&view=rev
Author: kurzum
Date: 2008-08-19 17:35:48 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
small improvements
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupelAquisitorImproved.java
trunk/src/dl-learner/org/dllearner/kb/aquisitors/TupelAquisitor.java
trunk/src/dl-learner/org/dllearner/kb/extraction/Manager.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/scripts/WikipediaCategoryCleaner.java
trunk/src/dl-learner/org/dllearner/test/SparqlExtractionTest.java
trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java
Modified: trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupelAquisitorImproved.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupelAquisitorImproved.java 2008-08-19 15:41:45 UTC (rev 1103)
+++ trunk/src/dl-learner/org/dllearner/kb/aquisitors/SparqlTupelAquisitorImproved.java 2008-08-19 17:35:48 UTC (rev 1104)
@@ -66,8 +66,13 @@
//SortedSet<RDFNodeTuple> tmp = new TreeSet<RDFNodeTuple>();
String sparqlQueryString = sparqlQueryMaker.makeSubjectQueryLevel(uri, recursionDepth);
//System.out.println(sparqlQueryString);
- ResultSetRewindable rsw= sparqlTasks.queryAsResultSet(sparqlQueryString);
- @SuppressWarnings("unchecked")
+ ResultSetRewindable rsw=null;
+ try{
+ rsw = sparqlTasks.queryAsResultSet(sparqlQueryString);
+ }catch (Exception e) {
+ return super.retrieveTupel(uri);
+ }
+ @SuppressWarnings("unchecked")
List<ResultBinding> l = ResultSetFormatter.toList(rsw);
rsw.reset();
Modified: trunk/src/dl-learner/org/dllearner/kb/aquisitors/TupelAquisitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/aquisitors/TupelAquisitor.java 2008-08-19 15:41:45 UTC (rev 1103)
+++ trunk/src/dl-learner/org/dllearner/kb/aquisitors/TupelAquisitor.java 2008-08-19 17:35:48 UTC (rev 1104)
@@ -21,6 +21,7 @@
import java.net.URI;
import java.util.SortedSet;
+import java.util.TreeSet;
import org.apache.log4j.Logger;
import org.dllearner.utilities.datastructures.RDFNodeTuple;
@@ -47,14 +48,20 @@
public final SortedSet<RDFNodeTuple> getTupelForResource(String uri){
checkURIforValidity(uri);
- if (mode == NORMAL) {
- return retrieveTupel(uri);
- } else if(mode == CLASSES_FOR_INSTANCES){
- return retrieveClassesForInstances(uri);
- }else if(mode == CLASS_INFORMATION){
- return retrieveTuplesForClassesOnly(uri);
- }else{
- throw new RuntimeException("undefined mode in aquisitor");
+ try{
+ if (mode == NORMAL) {
+ return retrieveTupel(uri);
+ } else if(mode == CLASSES_FOR_INSTANCES){
+ return retrieveClassesForInstances(uri);
+ }else if(mode == CLASS_INFORMATION){
+ return retrieveTuplesForClassesOnly(uri);
+ }else{
+ throw new RuntimeException("undefined mode in aquisitor");
+ }
+ }catch(Exception e){
+ logger.warn("caught exception in tupleaquisitor, ignoring it"+e.toString());
+ return new TreeSet<RDFNodeTuple>();
+
}
}
public abstract SortedSet<RDFNodeTuple> retrieveTupel(String uri);
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/Manager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/Manager.java 2008-08-19 15:41:45 UTC (rev 1103)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/Manager.java 2008-08-19 17:35:48 UTC (rev 1104)
@@ -55,6 +55,7 @@
Node n = extractionAlgorithm.expandNode(uri, configuration.getTupelAquisitor());
SortedSet<String> s = n.toNTriple();
+ logger.info("number of triples: "+s.size());
StringBuffer nt = new StringBuffer(33000);
for (String str : s) {
nt.append(str + "\n");
Modified: trunk/src/dl-learner/org/dllearner/kb/manipulator/SimpleObjectFilterRule.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/manipulator/SimpleObjectFilterRule.java 2008-08-19 15:41:45 UTC (rev 1103)
+++ trunk/src/dl-learner/org/dllearner/kb/manipulator/SimpleObjectFilterRule.java 2008-08-19 17:35:48 UTC (rev 1104)
@@ -23,6 +23,7 @@
import java.util.TreeSet;
import org.dllearner.kb.extraction.Node;
+import org.dllearner.utilities.JamonMonitorLogger;
import org.dllearner.utilities.datastructures.RDFNodeTuple;
public class SimpleObjectFilterRule extends Rule{
@@ -41,6 +42,8 @@
for (RDFNodeTuple tuple : tuples) {
if(!tuple.bPartContains(objectFilter)){
keep.add(tuple);
+ }else{
+ JamonMonitorLogger.increaseCount(SimpleObjectFilterRule.class, "filteredTriples");
}
}
return keep;
Modified: trunk/src/dl-learner/org/dllearner/kb/manipulator/SimplePredicateFilterRule.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/manipulator/SimplePredicateFilterRule.java 2008-08-19 15:41:45 UTC (rev 1103)
+++ trunk/src/dl-learner/org/dllearner/kb/manipulator/SimplePredicateFilterRule.java 2008-08-19 17:35:48 UTC (rev 1104)
@@ -23,6 +23,7 @@
import java.util.TreeSet;
import org.dllearner.kb.extraction.Node;
+import org.dllearner.utilities.JamonMonitorLogger;
import org.dllearner.utilities.datastructures.RDFNodeTuple;
public class SimplePredicateFilterRule extends Rule{
@@ -42,6 +43,8 @@
for (RDFNodeTuple tuple : tuples) {
if(!tuple.aPartContains(predicateFilter)){
keep.add(tuple);
+ }else{
+ JamonMonitorLogger.increaseCount(SimplePredicateFilterRule.class, "filteredTriples");
}
}
return keep;
Modified: trunk/src/dl-learner/org/dllearner/kb/manipulator/TypeFilterRule.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/manipulator/TypeFilterRule.java 2008-08-19 15:41:45 UTC (rev 1103)
+++ trunk/src/dl-learner/org/dllearner/kb/manipulator/TypeFilterRule.java 2008-08-19 17:35:48 UTC (rev 1104)
@@ -24,6 +24,7 @@
import org.apache.log4j.Logger;
import org.dllearner.kb.extraction.Node;
+import org.dllearner.utilities.JamonMonitorLogger;
import org.dllearner.utilities.datastructures.RDFNodeTuple;
public class TypeFilterRule extends Rule{
@@ -59,7 +60,7 @@
if(!remove){
keep.add(tuple);
}else{
- logger.warn("Removed: "+subject+"::"+tuple);
+ JamonMonitorLogger.increaseCount(TypeFilterRule.class, "filteredTriples");
}
}
Modified: trunk/src/dl-learner/org/dllearner/scripts/WikipediaCategoryCleaner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/WikipediaCategoryCleaner.java 2008-08-19 15:41:45 UTC (rev 1103)
+++ trunk/src/dl-learner/org/dllearner/scripts/WikipediaCategoryCleaner.java 2008-08-19 17:35:48 UTC (rev 1104)
@@ -222,10 +222,11 @@
LearnSPARQLConfiguration lsc = new LearnSPARQLConfiguration();
lsc.sparqlEndpoint = sparqlTasks.getSparqlEndpoint();
+ lsc.recursiondepth = 1;
lsc.noisePercentage = 15;
lsc.guaranteeXgoodDescriptions = 200;
lsc.maxExecutionTimeInSeconds = 50;
- lsc.logLevel = "INFO";
+ lsc.logLevel = "TRACE";
// lsc.searchTreeFile = "log/WikipediaCleaner.txt";
return lsc;
Modified: trunk/src/dl-learner/org/dllearner/test/SparqlExtractionTest.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/test/SparqlExtractionTest.java 2008-08-19 15:41:45 UTC (rev 1103)
+++ trunk/src/dl-learner/org/dllearner/test/SparqlExtractionTest.java 2008-08-19 17:35:48 UTC (rev 1104)
@@ -31,6 +31,7 @@
import org.dllearner.kb.extraction.Manager;
import org.dllearner.kb.manipulator.Manipulator;
import org.dllearner.kb.sparql.SPARQLTasks;
+import org.dllearner.kb.sparql.SparqlQuery;
import org.dllearner.kb.sparql.SparqlQueryMaker;
import org.dllearner.scripts.NT2RDF;
import org.dllearner.utilities.JamonMonitorLogger;
@@ -57,12 +58,13 @@
logger.removeAllAppenders();
logger.addAppender(consoleAppender);
logger.setLevel(Level.INFO);
+ Logger.getLogger(SparqlQuery.class).setLevel(Level.DEBUG);
// String test2 = "http://www.extraction.org/config#dbpediatest";
// String test = "http://www.extraction.org/config#localjoseki";
try {
// URI u = new URI(test);
- int recursionDepth=3;
+ int recursionDepth=2;
Manager m = new Manager();
Configuration conf = new Configuration (
new SparqlTupelAquisitorImproved(SparqlQueryMaker.getAllowYAGOFilter(),
Modified: trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java 2008-08-19 15:41:45 UTC (rev 1103)
+++ trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java 2008-08-19 17:35:48 UTC (rev 1104)
@@ -149,16 +149,23 @@
// superclasses");
for (String instance : positiveSet) {
+ try{
classes.addAll(sparqltasks.getClassesForInstance(instance, sparqlResultLimit));
+ }catch (Exception e) {
+ logger.warn("ignoring SPARQLQuery failure, see log/sparql.txt");
+ }
}
logger.debug("getting negExamples from " + classes.size() + " parallel classes");
for (String oneClass : classes) {
logger.debug(oneClass);
// rsc = new
// JenaResultSetConvenience(queryConcept("\""+oneClass+"\"",limit));
+ try{
this.fromParallelClasses.addAll(sparqltasks.retrieveInstancesForClassDescription("\"" + oneClass
+ "\"", sparqlResultLimit));
-
+ }catch (Exception e) {
+ logger.warn("ignoring SPARQLQuery failure, see log/sparql.txt");
+ }
}
fromParallelClasses.removeAll(fullPositiveSet);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
