Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1197] trunk/src/dl-learner/org/dllearner
|
From: <ku...@us...> - 2008-09-11 17:13:56
|
Revision: 1197
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1197&view=rev
Author: kurzum
Date: 2008-09-11 17:13:52 +0000 (Thu, 11 Sep 2008)
Log Message:
-----------
fxed bug, integrated url option inti sparqlknowledgesource
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/core/configurators/ComponentFactory.java
trunk/src/dl-learner/org/dllearner/core/configurators/SparqlKnowledgeSourceConfigurator.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
trunk/src/dl-learner/org/dllearner/test/TestGetExampleBug.java
trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/ComponentFactory.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/ComponentFactory.java 2008-09-11 09:32:28 UTC (rev 1196)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/ComponentFactory.java 2008-09-11 17:13:52 UTC (rev 1197)
@@ -84,7 +84,7 @@
* @param instances relevant instances e.g. positive and negative examples in a learning problem
* @return a component ready for initialization SparqlKnowledgeSource
**/
-public static SparqlKnowledgeSource getSparqlKnowledgeSource(String url, Set<String> instances) {
+public static SparqlKnowledgeSource getSparqlKnowledgeSource(URL url, Set<String> instances) {
return SparqlKnowledgeSourceConfigurator.getSparqlKnowledgeSource(url, instances);
}
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/SparqlKnowledgeSourceConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/SparqlKnowledgeSourceConfigurator.java 2008-09-11 09:32:28 UTC (rev 1196)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/SparqlKnowledgeSourceConfigurator.java 2008-09-11 17:13:52 UTC (rev 1197)
@@ -20,6 +20,7 @@
package org.dllearner.core.configurators;
+import java.net.URL;
import java.util.List;
import java.util.Set;
import org.dllearner.core.ComponentManager;
@@ -49,7 +50,7 @@
* @param instances relevant instances e.g. positive and negative examples in a learning problem
* @return SparqlKnowledgeSource
**/
-public static SparqlKnowledgeSource getSparqlKnowledgeSource(String url, Set<String> instances) {
+public static SparqlKnowledgeSource getSparqlKnowledgeSource(URL url, Set<String> instances) {
SparqlKnowledgeSource component = ComponentManager.getInstance().knowledgeSource(SparqlKnowledgeSource.class);
ComponentManager.getInstance().applyConfigEntry(component, "url", url);
ComponentManager.getInstance().applyConfigEntry(component, "instances", instances);
@@ -60,10 +61,10 @@
* url URL of SPARQL Endpoint.
* mandatory: true| reinit necessary: true
* default value: null
-* @return String
+* @return URL
**/
-public String getUrl() {
-return (String) ComponentManager.getInstance().getConfigOptionValue(sparqlKnowledgeSource, "url") ;
+public URL getUrl() {
+return (URL) ComponentManager.getInstance().getConfigOptionValue(sparqlKnowledgeSource, "url") ;
}
/**
* cacheDir dir of cache.
@@ -276,7 +277,7 @@
* mandatory: true| reinit necessary: true
* default value: null
**/
-public void setUrl(String url) {
+public void setUrl(URL url) {
ComponentManager.getInstance().applyConfigEntry(sparqlKnowledgeSource, "url", url);
reinitNecessary = true;
}
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2008-09-11 09:32:28 UTC (rev 1196)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2008-09-11 17:13:52 UTC (rev 1197)
@@ -21,7 +21,6 @@
import java.io.File;
import java.io.FileWriter;
-import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
@@ -42,6 +41,7 @@
import org.dllearner.core.config.StringConfigOption;
import org.dllearner.core.config.StringSetConfigOption;
import org.dllearner.core.config.StringTupleListConfigOption;
+import org.dllearner.core.config.URLConfigOption;
import org.dllearner.core.configurators.SparqlKnowledgeSourceConfigurator;
import org.dllearner.core.owl.KB;
import org.dllearner.kb.aquisitors.SparqlTupleAquisitor;
@@ -132,7 +132,7 @@
*/
public static Collection<ConfigOption<?>> createConfigOptions() {
Collection<ConfigOption<?>> options = new LinkedList<ConfigOption<?>>();
- options.add(new StringConfigOption("url", "URL of SPARQL Endpoint",
+ options.add(new URLConfigOption("url", "URL of SPARQL Endpoint",
null, true, true));
options.add(new StringConfigOption("cacheDir", "dir of cache", "cache",
false, true));
@@ -226,14 +226,9 @@
SimpleClock totalTime = new SimpleClock();
SimpleClock extractionTime = new SimpleClock();
- try {
- url = new URL(configurator.getUrl());
- } catch (MalformedURLException e) {
- logger.error(e.getMessage());
- //throw new InvalidConfigOptionValueException(entry.getOption(),
- // entry.getValue(), "malformed URL " + s);
- }
-
+ logger.trace(getURL());
+ logger.trace(getSparqlEndpoint());
+ logger.trace(configurator.getInstances());
Manager m = new Manager();
// get Options for Manipulator
@@ -342,12 +337,22 @@
* @return the URL of the used sparql endpoint
*/
public URL getURL() {
- if(url == null && endpoint!=null){
+ if(endpoint == null){
+ if(url==null){
+ if(configurator.getPredefinedEndpoint() == null){
+ url = configurator.getUrl();
+ return url;
+ }else{
+ return getSparqlEndpoint().getURL();
+ }
+
+ }else{
+ return url;
+ }
+ }else {
return endpoint.getURL();
}
- else{
- return url;
- }
+
}
public String[] getOntArray() {
@@ -362,7 +367,7 @@
public SparqlEndpoint getSparqlEndpoint(){
if(endpoint==null) {
if (configurator.getPredefinedEndpoint() == null) {
- endpoint = new SparqlEndpoint(url, new LinkedList<String>(
+ endpoint = new SparqlEndpoint(getURL(), new LinkedList<String>(
configurator.getDefaultGraphURIs()),
new LinkedList<String>(configurator.getNamedGraphURIs()));
} else {
Modified: trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-09-11 09:32:28 UTC (rev 1196)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java 2008-09-11 17:13:52 UTC (rev 1197)
@@ -37,6 +37,7 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
+import org.apache.log4j.Logger;
import org.dllearner.Info;
import org.dllearner.algorithms.BruteForceLearner;
import org.dllearner.algorithms.DBpediaNavigationSuggestor;
@@ -86,6 +87,10 @@
@SOAPBinding(style = SOAPBinding.Style.RPC)
public class DLLearnerWS {
+ @SuppressWarnings("unused")
+ private static Logger logger = Logger
+ .getLogger(DLLearnerWS.class);
+
private Map<Integer, ClientState> clients = new TreeMap<Integer,ClientState>();
private Random rand=new Random();
private static ComponentManager cm = ComponentManager.getInstance();
@@ -330,7 +335,11 @@
String json = "{";
int count = 1;
for(EvaluatedDescription description : descriptions) {
+ //FIXME this is not a general method, but specific to dbpedia
+ // the mehtod name schould mention, that the return String is in JSON
+ // also it throws errors
json += "\"solution" + count + "\" : " + description.asJSON();
+
count++;
}
return json;
Modified: trunk/src/dl-learner/org/dllearner/test/TestGetExampleBug.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/test/TestGetExampleBug.java 2008-09-11 09:32:28 UTC (rev 1196)
+++ trunk/src/dl-learner/org/dllearner/test/TestGetExampleBug.java 2008-09-11 17:13:52 UTC (rev 1197)
@@ -27,12 +27,18 @@
//Logger.getLogger(SparqlQuery.class).setLevel(Level.DEBUG);
try {
- String OntowikiUrl="http://localhost/ontowiki-0.8.5/service/sparql";
+ String OntowikiUrl="http://localhost/ontowiki/service/sparql";
- String posExamples = "http://3ba.se/conferences/FMILeipzig";
+
+
SortedSet<String> positiveSet = new TreeSet<String>();
- positiveSet.add(posExamples);
- SPARQLTasks st = new SPARQLTasks(new SparqlEndpoint(new URL(OntowikiUrl)));
+ positiveSet.add("http://3ba.se/conferences/JensLehmann");
+ positiveSet.add("http://3ba.se/conferences/MuhammadAhtishamAslam");
+ positiveSet.add("http://3ba.se/conferences/SebastianDietzold");
+ positiveSet.add("http://3ba.se/conferences/ThomasRiechert");
+ //positiveSet.add("http://3ba.se/conferences/FMILeipzig");
+
+ SPARQLTasks st = new SPARQLTasks(new SparqlEndpoint(new URL(OntowikiUrl)));
AutomaticNegativeExampleFinderSPARQL ane =
new AutomaticNegativeExampleFinderSPARQL(positiveSet,st);
SortedSet<String> negExamples = new TreeSet<String>();
Modified: trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java 2008-09-11 09:32:28 UTC (rev 1196)
+++ trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderSPARQL.java 2008-09-11 17:13:52 UTC (rev 1197)
@@ -185,6 +185,7 @@
try{
classes.addAll(sparqltasks.getClassesForInstance(instance, sparqlResultLimit));
}catch (Exception e) {
+ e.printStackTrace();
logger.warn("ignoring SPARQLQuery failure, see log/sparql.txt");
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
