[DL-Learner SVN] SF.net SVN: dl-learner:[3859] trunk/components-core/src/main/java/org/ dllearner/kb/sparql/simple

[<dc...@us...>]

Revision: 3859
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3859&view=rev
Author:   dcherix
Date:     2012-10-30 12:41:05 +0000 (Tue, 30 Oct 2012)
Log Message:
-----------
bux fixes

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/SparqlSimpleExtractor.java

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-10-18 08:19:13 UTC (rev 3858)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/ABoxQueryGenerator.java	2012-10-30 12:41:05 UTC (rev 3859)
@@ -19,12 +19,14 @@
     public String createQuery(Set<String> individuals, String aboxfilter) {
         Monitor monABoxQueryGeneration = MonitorFactory.getTimeMonitor("ABox query generator").start();
         StringBuilder builder = new StringBuilder();
+        builder.append("PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n");
         builder.append("CONSTRUCT {?s ?p ?o  } ");
-        builder.append("{ ?s ?p ?o . ");
+        builder.append("{ ?s ?p ?o . " );
         builder.append(makeInFilter("?s", individuals));
         if (aboxfilter != null) {
             builder.append(aboxfilter);
         }
+        builder.append("FILTER (! (?p=rdf:type))");
         builder.append("}");
         monABoxQueryGeneration.stop();
         return builder.toString();

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-10-18 08:19:13 UTC (rev 3858)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SparqlSimpleExtractor.java	2012-10-30 12:41:05 UTC (rev 3859)
@@ -158,11 +158,11 @@
             ABoxQueryGenerator aGenerator = new ABoxQueryGenerator();
             for (int i = 0; i < recursionDepth; i++) {
                 if (instancesSet.isEmpty()) {
-                    log.warn("no new instances found more recursions (recursion " + i + ")  " + instancesSet.size() + " new instances");
+                    log.warn("no new instances found more recursions (recursion {} )  {} new instances", i,instancesSet.size());
 
                 }
 
-                log.info("processing (recursion " + i + ")  " + instancesSet.size() + " new instances");
+                log.info("processing (recursion  {} ) {} new instances",i,instancesSet.size());
                 queryString = aGenerator.createQuery(instancesSet, aboxfilter);
 //                System.out.println(queryString);
                 log.debug("SPARQL: {}", queryString);
@@ -185,7 +185,8 @@
 
             }
 
-
+            log.info("recursion depth: {} reached, {} new instances",recursionDepth,instancesSet.size());
+            
             //queryString = aGenerator.createLastQuery(instances, model, filters);
             //log.debug("SPARQL: {}", queryString);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.