Thread: [DL-Learner SVN] SF.net SVN: dl-learner: [997] trunk/src/dl-learner/org/dllearner (Page 10)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 997
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=997&view=rev
Author:   sknappe
Date:     2008-07-05 07:20:26 -0700 (Sat, 05 Jul 2008)

Log Message:
-----------
Several changes to make everything working

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java
    trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
    trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java
    trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
    trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java
===================================================================

--- trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java	2008-07-03 12:01:50 UTC (rev 996)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/Cache.java	2008-07-05 14:20:26 UTC (rev 997)
@@ -264,7 +264,7 @@
 				addToCache(query.getQueryString(), json);
 				SparqlQuery.writeToSparqlLog("result added to cache: "+json);
 				result=json;
-				query.setJson(result);
+				//query.setJson(result);
 			}
 			else {
 				json="";

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java	2008-07-03 12:01:50 UTC (rev 996)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java	2008-07-05 14:20:26 UTC (rev 997)
@@ -418,6 +418,15 @@
 		return new SparqlQuery(query, endpoint);
 	}
 	
+	public SPARQLTasks getSparqlTask()
+	{
+		if (this.useCache)
+			return new SPARQLTasks(new Cache(this.cacheDir),new SparqlEndpoint(url, defaultGraphURIs,
+					namedGraphURIs));
+		else
+			return new SPARQLTasks(new SparqlEndpoint(url, defaultGraphURIs,
+					namedGraphURIs));
+	}
 
 	/* (non-Javadoc)
 	 * @see org.dllearner.core.KnowledgeSource#toKB()

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java	2008-07-03 12:01:50 UTC (rev 996)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQuery.java	2008-07-05 14:20:26 UTC (rev 997)
@@ -100,6 +100,11 @@
 		HttpQuery.urlLimit = 3 * 1024;
 		JamonMonitorLogger.getTimeMonitor(SparqlQuery.class, "httpTime")
 				.start();
+		//TODO correct Bug: when there is a & in the result like in the
+		//URL: http://www.discusmedia.com/catalog.php?catID=5.2.2&profile=map
+		//the XML Parser throws an error, because he thinks &profile is an html entitie
+		//but it doesn't end with an ;
+		//the & must be masked to an &amp; but I am not sure at the moment how to do that
 		rs = queryExecution.execSelect();
 		JamonMonitorLogger.getTimeMonitor(SparqlQuery.class, "httpTime").stop();
 

Modified: trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java	2008-07-03 12:01:50 UTC (rev 996)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java	2008-07-05 14:20:26 UTC (rev 997)
@@ -58,6 +58,8 @@
 import org.dllearner.core.owl.ObjectProperty;
 import org.dllearner.kb.OWLFile;
 import org.dllearner.kb.sparql.Cache;
+import org.dllearner.kb.sparql.SPARQLTasks;
+import org.dllearner.kb.sparql.SparqlEndpoint;
 import org.dllearner.kb.sparql.SparqlKnowledgeSource;
 import org.dllearner.kb.sparql.SparqlQuery;
 import org.dllearner.kb.sparql.SparqlQueryDescriptionConvertVisitor;
@@ -72,6 +74,7 @@
 import org.dllearner.reasoning.OWLAPIReasoner;
 import org.dllearner.utilities.Helper;
 import org.dllearner.utilities.datastructures.Datastructures;
+import org.dllearner.utilities.examples.AutomaticNegativeExampleFinderSPARQL;
 
 /**
  * DL-Learner web service interface.
@@ -664,6 +667,22 @@
 	}
 	
 	@WebMethod
+	public String[] getNegativeExamples(int sessionID, int componentID,String[] positives, int results, String namespace) throws ClientNotKnownException
+	{
+		SortedSet<String> set = new TreeSet<String>(Arrays.asList(positives));
+		ClientState state = getState(sessionID);
+		Component component = state.getComponent(componentID);
+		SparqlKnowledgeSource ks=(SparqlKnowledgeSource)component;
+		SPARQLTasks task=ks.getSparqlTask();
+		AutomaticNegativeExampleFinderSPARQL finder=new AutomaticNegativeExampleFinderSPARQL(set,task);
+		finder.makeNegativeExamplesFromRelatedInstances(set, namespace);
+		finder.makeNegativeExamplesFromParallelClasses(set, 2);
+		SortedSet<String> negExamples=finder.getNegativeExamples(results);
+		
+		return negExamples.toArray(new String[negExamples.size()]);
+	}
+	
+	@WebMethod
 	public void debug(String deb)
 	{
 		System.out.println(deb);

Modified: trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java	2008-07-03 12:01:50 UTC (rev 996)
+++ trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java	2008-07-05 14:20:26 UTC (rev 997)
@@ -1,11 +1,14 @@
 package org.dllearner.utilities.examples;
 
+import java.util.Iterator;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
 import org.apache.log4j.Logger;
 import org.dllearner.core.ComponentManager;
+import org.dllearner.kb.sparql.Cache;
 import org.dllearner.kb.sparql.SPARQLTasks;
+import org.dllearner.kb.sparql.SparqlEndpoint;
 import org.dllearner.utilities.datastructures.SetManipulation;
 
 public class AutomaticNegativeExampleFinderSPARQL {
@@ -175,6 +178,4 @@
 		this.fromRange.removeAll(this.fullPositiveSet);
 		logger.debug("|-neg Example size from Range: "+this.fromRange.size());
 	}
-	
-
 }


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




Thread: [DL-Learner SVN] SF.net SVN: dl-learner: [997] trunk/src/dl-learner/org/dllearner (Page 10)

dl-learner-svn