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

[<sk...@us...>]

Revision: 955
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=955&view=rev
Author:   sknappe
Date:     2008-06-10 09:51:06 -0700 (Tue, 10 Jun 2008)

Log Message:
-----------
I don't use SparqlQueryThreaded anymore

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
    trunk/src/dl-learner/org/dllearner/server/ClientState.java
    trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java	2008-06-10 15:51:54 UTC (rev 954)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java	2008-06-10 16:51:06 UTC (rev 955)
@@ -66,7 +66,7 @@
 	
 	//DEFAULTS
 	static int recursionDepthDefault = 1;
-	
+	private boolean useCache=true;
 	// ConfigOptions
 	public URL url;
 	// String host;
@@ -164,6 +164,8 @@
 
 		options.add(new BooleanConfigOption("learnDomain",
 				"learns the Domain for a Role"));
+		options.add(new BooleanConfigOption("useCache",
+				"If true a Cache is used"));
 		options.add(new BooleanConfigOption("learnRange",
 				"learns the Range for a Role"));
 		options.add(new StringConfigOption("role",
@@ -232,7 +234,9 @@
 			dumpToFile = (Boolean) entry.getValue();
 		} else if (option.equals("useLits")) {
 			useLits = (Boolean) entry.getValue();
-		} else if (option.equals("getAllSuperClasses")) {
+		} else if (option.equals("useCache")) {
+			useCache = (Boolean) entry.getValue();
+		}else if (option.equals("getAllSuperClasses")) {
 			getAllSuperClasses = (Boolean) entry.getValue();
 			/*
 			 * TODO remaove } else if (option.equals("learnDomain")) {
@@ -415,9 +419,6 @@
 		return new SparqlQuery(query, endpoint);
 	}
 	
-	public SparqlQueryThreaded sparqlQueryThreaded(String query){
-		return new SparqlQueryThreaded(new Cache("cache"),this.sparqlQuery(query));
-	}
 
 	/* (non-Javadoc)
 	 * @see org.dllearner.core.KnowledgeSource#toKB()
@@ -431,6 +432,14 @@
 	public URL getNTripleURL(){
 		return dumpFile;
 	}
+	
+	public boolean getUseCache(){
+		return useCache;
+	}
+	
+	public String getCacheDir(){
+		return cacheDir;
+	}
 
 	/*public static void main(String[] args) throws MalformedURLException {
 		String query = "SELECT ?pred ?obj\n"

Modified: trunk/src/dl-learner/org/dllearner/server/ClientState.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/ClientState.java	2008-06-10 15:51:54 UTC (rev 954)
+++ trunk/src/dl-learner/org/dllearner/server/ClientState.java	2008-06-10 16:51:06 UTC (rev 955)
@@ -34,6 +34,7 @@
 import org.dllearner.core.ReasoningService;
 import org.dllearner.kb.OWLFile;
 import org.dllearner.kb.sparql.SparqlKnowledgeSource;
+import org.dllearner.kb.sparql.SparqlQuery;
 import org.dllearner.kb.sparql.SparqlQueryThreaded;
 
 /**
@@ -51,7 +52,7 @@
 	
 	private Set<KnowledgeSource> knowledgeSources = new HashSet<KnowledgeSource>();
 	
-	private Map<Integer, SparqlQueryThreaded> queryIDs = new HashMap<Integer, SparqlQueryThreaded>();
+	private Map<Integer, SparqlQuery> queryIDs = new HashMap<Integer, SparqlQuery>();
 	
 	private LearningProblem learningProblem;
 	
@@ -73,7 +74,7 @@
 		return id;		
 	}
 	
-	private int generateQueryID(SparqlQueryThreaded query) {
+	private int generateQueryID(SparqlQuery query) {
 		int id;
 		Random rand = new Random();
 		do {
@@ -83,11 +84,11 @@
 		return id;
 	}
 	
-	public int addQuery(SparqlQueryThreaded query){
+	public int addQuery(SparqlQuery query){
 		return this.generateQueryID(query);
 	}
 	
-	public SparqlQueryThreaded getQuery(int id){
+	public SparqlQuery getQuery(int id){
 		return queryIDs.get(id);
 	}
 	

Modified: trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java	2008-06-10 15:51:54 UTC (rev 954)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java	2008-06-10 16:51:06 UTC (rev 955)
@@ -61,6 +61,7 @@
 import org.dllearner.kb.sparql.SparqlQueryDescriptionConvertVisitor;
 import org.dllearner.kb.sparql.SparqlQueryException;
 import org.dllearner.kb.sparql.SparqlQueryThreaded;
+import org.dllearner.kb.sparql.Cache;
 import org.dllearner.learningproblems.PosNegDefinitionLP;
 import org.dllearner.learningproblems.PosNegInclusionLP;
 import org.dllearner.learningproblems.PosOnlyDefinitionLP;
@@ -536,11 +537,16 @@
 	{
 		final ClientState state = getState(sessionID);
 		Component component = state.getComponent(componentID);
-		final int id=state.addQuery(((SparqlKnowledgeSource)component).sparqlQueryThreaded(query));
+		final SparqlKnowledgeSource ks=(SparqlKnowledgeSource)component;
+		final int id=state.addQuery(ks.sparqlQuery(query));
 		Thread sparqlThread = new Thread() {
 			@Override
 			public void run() {
-				state.getQuery(id).send();
+				if (ks.getUseCache()){
+					Cache cache=new Cache(ks.getCacheDir());
+					cache.executeSparqlQuery(state.getQuery(id));
+				}
+				else state.getQuery(id).send();
 			}
 		};
 		sparqlThread.start();
@@ -552,8 +558,13 @@
 	{
 		ClientState state = getState(sessionID);
 		Component component = state.getComponent(componentID);
-		SparqlQueryThreaded sparql=((SparqlKnowledgeSource)component).sparqlQueryThreaded(query);
-		sparql.send();
+		SparqlKnowledgeSource ks=(SparqlKnowledgeSource)component;
+		SparqlQuery sparql=ks.sparqlQuery(query);
+		if (ks.getUseCache()){
+			Cache cache=new Cache(ks.getCacheDir());
+			cache.executeSparqlQuery(sparql);
+		}
+		else sparql.send();
 		return sparql.getResult();
 	}
 	


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