[DL-Learner SVN] SF.net SVN: dl-learner:[2114] trunk/src/dl-learner/org/dllearner

[<ku...@us...>]

Revision: 2114
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2114&view=rev
Author:   kurzum
Date:     2010-03-11 15:18:34 +0000 (Thu, 11 Mar 2010)

Log Message:
-----------
implemented better subclass resolution in sparql converter

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryDescriptionConvertVisitor.java
    trunk/src/dl-learner/org/dllearner/utilities/experiments/Examples.java

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryDescriptionConvertVisitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryDescriptionConvertVisitor.java	2010-03-11 15:12:28 UTC (rev 2113)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryDescriptionConvertVisitor.java	2010-03-11 15:18:34 UTC (rev 2114)
@@ -20,9 +20,12 @@
 package org.dllearner.kb.sparql;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.SortedSet;
 import java.util.Stack;
 import java.util.TreeSet;
@@ -73,11 +76,7 @@
 	private boolean labels = false;
 	private boolean distinct = false;
 	private SortedSet<String> transitiveProperties =null;
-	public void setTransitiveProperties(SortedSet<String> transitiveProperties) {
-		this.transitiveProperties = transitiveProperties;
-	}
-
-	private Map<String,String> classToSubclassesVirtuoso = null;
+	private Map<String,Set<String>> subclassMap = null;
 	
 	private Stack<String> stack = new Stack<String>();
 	private String query = "";
@@ -110,41 +109,50 @@
 	}
 	
 	private void expandSubclasses(){
-		if(classToSubclassesVirtuoso == null){
+		if(subclassMap == null){
 			return;
 		}
 		int counter = 0;
 		int index = 0;
-		String filter = "";
 		String var = "";
 		String uri = "";
 		StringBuffer tmp ;
+		StringBuffer filter = new StringBuffer() ;
+		Set<String> subClasses;
 		for(String nc: foundNamedClasses){
 			index = query.indexOf("<"+nc+">");
-			filter = classToSubclassesVirtuoso.get(nc);
+			subClasses = subclassMap.get(nc);
 			if(index == -1){
-				logger.warn("named class found before, but not in query?? "+nc);
-			}else if(filter != null){
+				logger.error("named class was found before, but is not in query any more?? "+nc);
+			}else if(subClasses != null){
 				var = "?expanded"+counter;
 				uri = "<"+nc+">";
 				tmp = new StringBuffer();
 				tmp.append(query.substring(0, index));
 				tmp.append(var);
 				tmp.append(query.substring(index+(uri.length())));
-				tmp.append("\nFILTER ( " +var+ " in (" +filter+	") ). ");
 				query = tmp.toString();
-//				= query.substring(0, index)+var+query.substring(index+(uri.length()));
-				
-//				query += "\nFILTER (?expanded" +counter+
-//						" in (" +filter+
-//						") ). ";
+				filter.append(makeFilter(var, subClasses));
 			}else{
 				logger.debug("no mapping found ("+nc+")  "+this.getClass().getSimpleName());
 			}
+			
 			counter++;
 		}
+		query += filter.toString();
 	}
 	
+	private String makeFilter(String var, Set<String> classes){
+		StringBuffer buf = new StringBuffer("\nFILTER ( "+var+" IN ( ");
+		int i = 0;
+		for (String string : classes) {
+			buf.append((i==0)?"<"+string+">":",<"+string+">");
+			i++;
+		}
+		buf.append(" ) ). ");
+		return buf.toString();
+	}
+	
 	private String limit() {
 		return (limit > 0) ? " LIMIT " + limit + " " : "";
 	}
@@ -171,10 +179,15 @@
 		this.distinct = distinct;
 	}
 	
-	public void setClassToSubclassesVirtuoso(Map<String,String> classToSubclassesVirtuoso) {
-		this.classToSubclassesVirtuoso = classToSubclassesVirtuoso;
+	public void setTransitiveProperties(SortedSet<String> transitiveProperties) {
+		this.transitiveProperties = transitiveProperties;
 	}
+	
 
+	public void setSubclassMap(Map<String, Set<String>> subclassMap) {
+		this.subclassMap = subclassMap;
+	}
+
 	public static String getSparqlQuery(String descriptionKBSyntax, int limit, boolean labels, boolean distinct) throws ParseException {
 		Description d = KBParser.parseConcept(descriptionKBSyntax);
 		return getSparqlQuery(d, limit, labels, distinct);
@@ -256,8 +269,11 @@
 			System.out.println(outer.toKBSyntaxString(null,null));
 			System.out.println(test);
 
+			Map<String, Set<String>> testMap = new HashMap<String, Set<String>>();
+			testMap.put(prefix+"Sentence", new HashSet<String>(Arrays.asList(new String[]{"whatever","loser"})));
 //			s.add(outer.toKBSyntaxString(null,null));
 			SparqlQueryDescriptionConvertVisitor testVisitor = new SparqlQueryDescriptionConvertVisitor();
+			testVisitor.setSubclassMap(testMap);
 			String q = testVisitor.getSparqlQuery(outer.toKBSyntaxString());
 			System.out.println(q);
 			if (true) {

Modified: trunk/src/dl-learner/org/dllearner/utilities/experiments/Examples.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/experiments/Examples.java	2010-03-11 15:12:28 UTC (rev 2113)
+++ trunk/src/dl-learner/org/dllearner/utilities/experiments/Examples.java	2010-03-11 15:18:34 UTC (rev 2114)
@@ -213,6 +213,12 @@
 		return posTest.size()+negTest.size();
 	}
 	
+	public SortedSet<String> getAllExamples() {
+		SortedSet<String> total = new TreeSet<String>();
+		total.addAll(getPositiveExamples());
+		total.addAll(getNegativeExamples());
+		return total;
+	}
 	
 	public SortedSet<String> getPositiveExamples() {
 		SortedSet<String> total = new TreeSet<String>();


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