[DL-Learner SVN] SF.net SVN: dl-learner:[3365] trunk/components-ext/src/main/java/org/ dllearner/algorithm/tbsl

[<lor...@us...>]

Revision: 3365
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3365&view=rev
Author:   lorenz_b
Date:     2011-11-03 08:26:17 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
Continued type checking.

Modified Paths:
--------------
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/learning/SPARQLTemplateBasedLearner.java
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/search/SolrQueryResultSet.java

Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/learning/SPARQLTemplateBasedLearner.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/learning/SPARQLTemplateBasedLearner.java	2011-11-02 22:28:33 UTC (rev 3364)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/learning/SPARQLTemplateBasedLearner.java	2011-11-03 08:26:17 UTC (rev 3365)
@@ -667,7 +667,7 @@
 												String typeURI = typeTriple.getValue().getName().substring(1,typeTriple.getValue().getName().length()-1);
 												Set<String> allTypes = getSuperClasses(typeURI);
 												allTypes.add(typeTriple.getValue().getName());
-//												if(typeURI.equals("http://dbpedia.org/ontology/Film") && a.getUri().equals("http://dbpedia.org/ontology/starring")){
+//												if(typeURI.equals("http://dbpedia.org/ontology/Actor") && a.getUri().equals("http://dbpedia.org/ontology/birthPlace")){
 //													System.out.println("RANGES: " + allRanges);
 //													System.out.println("TYPES: " + allTypes);
 //												}
@@ -693,7 +693,7 @@
 												String typeURI = typeTriple.getValue().getName().substring(1,typeTriple.getValue().getName().length()-1);
 												Set<String> allTypes = getSuperClasses(typeURI);
 												allTypes.add(typeTriple.getValue().getName());
-//												if(typeURI.equals("http://dbpedia.org/ontology/Film") && a.getUri().equals("http://dbpedia.org/ontology/starring")){
+//												if(typeURI.equals("http://dbpedia.org/ontology/Actor") && a.getUri().equals("http://dbpedia.org/ontology/birthPlace")){
 //													System.out.println("DOMAINS: " + allDomains);
 //													System.out.println("TYPES: " + allTypes);
 //												}
@@ -769,7 +769,7 @@
 		
 		SolrQueryResultSet rs;
 		for(String word : slot.getWords()){
-			rs = index.getResourcesWithScores(word, 3);
+			rs = index.getResourcesWithScores(word, 10);System.out.println(word + "->" + rs);
 			
 			for(SolrQueryResultItem item : rs.getItems()){
 				int prominence = getProminenceValue(item.getUri(), slot.getSlotType());
@@ -1297,8 +1297,13 @@
 	
 	private Set<String> getSuperClasses(String cls){
 		Set<String> superClasses = new HashSet<String>();
-		for(Description d : reasoner.getClassHierarchy().getSuperClasses(new NamedClass(cls))){
+		
+		for(Description d : reasoner.getClassHierarchy().getSuperClasses((new NamedClass(cls)))){
 			superClasses.add(((NamedClass)d).getName());
+			for(Description sup : reasoner.getClassHierarchy().getSuperClasses(d)){
+				superClasses.add(((NamedClass)sup).getName());
+			}
+			
 		}
 		return superClasses;
 	}
@@ -1319,8 +1324,8 @@
 //		Logger.getLogger(HttpMethodBase.class).setLevel(Level.OFF);
 //		String question = "In which programming language is GIMP written?";
 //		String question = "Who/WP was/VBD the/DT wife/NN of/IN president/NN Lincoln/NNP";
-		String question = "Who/WP produced/VBD the/DT most/JJS films/NNS";
-//		String question = "Give/VB me/PRP all/DT soccer/NN clubs/NNS in/IN the/DT Premier/NNP League/NNP";
+//		String question = "Who/WP produced/VBD the/DT most/JJS films/NNS";
+		String question = "Which/WDT actors/NNS were/VBD born/VBN in/IN Germany/NNP";
 		
 //		String question = "Give me all books written by authors influenced by Ernest Hemingway.";
 		SPARQLTemplateBasedLearner learner = new SPARQLTemplateBasedLearner();learner.setUseIdealTagger(true);

Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/search/SolrQueryResultSet.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/search/SolrQueryResultSet.java	2011-11-02 22:28:33 UTC (rev 3364)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/search/SolrQueryResultSet.java	2011-11-03 08:26:17 UTC (rev 3365)
@@ -27,6 +27,9 @@
 		this.items.addAll(rs.getItems());
 	}
 	
-	
+	@Override
+	public String toString() {
+		return items.toString();
+	}
 
 }

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