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

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

Revision: 2875
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2875&view=rev
Author:   lorenz_b
Date:     2011-06-14 20:10:31 +0000 (Tue, 14 Jun 2011)

Log Message:
-----------
Updated methods to select appropriate cache/index for new SLOT types.

Modified Paths:
--------------
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/learning/SPARQLTemplateBasedLearner.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-06-14 19:26:51 UTC (rev 2874)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/learning/SPARQLTemplateBasedLearner.java	2011-06-14 20:10:31 UTC (rev 2875)
@@ -529,11 +529,12 @@
 	
 	private SolrSearch getIndexBySlotType(Slot slot){
 		SolrSearch index = null;
-		if(slot.getSlotType() == SlotType.CLASS){
+		SlotType type = slot.getSlotType();
+		if(type == SlotType.CLASS){
 			index = class_index;
-		} else if(slot.getSlotType() == SlotType.PROPERTY){
+		} else if(type == SlotType.PROPERTY || type == SlotType.SYMPROPERTY){
 			index = property_index;
-		} else if(slot.getSlotType() == SlotType.RESOURCE){
+		} else if(type == SlotType.RESOURCE || type == SlotType.UNSPEC){
 			index = resource_index;
 		}
 		return index;
@@ -541,11 +542,12 @@
 	
 	private Map<String, List<String>> getCacheBySlotType(Slot slot){
 		Map<String, List<String>> cache = null;
-		if(slot.getSlotType() == SlotType.CLASS){
+		SlotType type = slot.getSlotType();
+		if(type == SlotType.CLASS){
 			cache = classesURICache;
-		} else if(slot.getSlotType() == SlotType.PROPERTY){
+		} else if(type == SlotType.PROPERTY || type == SlotType.SYMPROPERTY){
 			cache = propertiesURICache;
-		} else if(slot.getSlotType() == SlotType.RESOURCE){
+		} else if(type == SlotType.RESOURCE || type == SlotType.UNSPEC){
 			cache = resourcesURICache;
 		}
 		return cache;
@@ -641,7 +643,6 @@
 	}
 	
 	private List<String> getResultFromRemoteEndpoint(String query){
-		System.out.println(query);
 		List<String> resources = new ArrayList<String>();
 		try {
 			ResultSet rs = SparqlQuery.convertJSONtoResultSet(cache.executeSelectQuery(endpoint, query + " LIMIT 10"));
@@ -680,7 +681,7 @@
 //		Logger.getLogger(DefaultHttpParams.class).setLevel(Level.OFF);
 //		Logger.getLogger(HttpClient.class).setLevel(Level.OFF);
 //		Logger.getLogger(HttpMethodBase.class).setLevel(Level.OFF);
-		String question = "Who are the presidents of the United States?";
+		String question = "Give me all actors starring in Batman Begins.";
 //		String question = "Give me all films starring Brad Pitt";
 		SPARQLTemplateBasedLearner learner = new SPARQLTemplateBasedLearner();
 		SparqlEndpoint endpoint = new SparqlEndpoint(new URL("http://live.dbpedia.org/sparql"), 


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