Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1178] trunk/src/dl-learner/org/dllearner
|
From: <ku...@us...> - 2008-09-08 17:26:35
|
Revision: 1178
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1178&view=rev
Author: kurzum
Date: 2008-09-08 17:26:27 +0000 (Mon, 08 Sep 2008)
Log Message:
-----------
some fixes
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/core/configurators/ComponentFactory.java
trunk/src/dl-learner/org/dllearner/core/configurators/DIGReasonerConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/FastInstanceCheckerConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/FastRetrievalReasonerConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIReasonerConfigurator.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLP.java
trunk/src/dl-learner/org/dllearner/reasoning/FastInstanceChecker.java
trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java
trunk/src/dl-learner/org/dllearner/scripts/ConfigJavaGenerator.java
trunk/src/dl-learner/org/dllearner/scripts/NewSample.java
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/ComponentFactory.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/ComponentFactory.java 2008-09-08 15:43:39 UTC (rev 1177)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/ComponentFactory.java 2008-09-08 17:26:27 UTC (rev 1178)
@@ -77,7 +77,7 @@
* @param knowledgeSource see KnowledgeSource
* @return a component ready for initialization DIGReasoner
**/
-public static DIGReasoner getDIGReasoner(KnowledgeSource knowledgeSource) {
+public static DIGReasoner getDIGReasoner(Set<KnowledgeSource> knowledgeSource) {
return DIGReasonerConfigurator.getDIGReasoner(knowledgeSource);
}
@@ -85,7 +85,7 @@
* @param knowledgeSource see KnowledgeSource
* @return a component ready for initialization FastInstanceChecker
**/
-public static FastInstanceChecker getFastInstanceChecker(KnowledgeSource knowledgeSource) {
+public static FastInstanceChecker getFastInstanceChecker(Set<KnowledgeSource> knowledgeSource) {
return FastInstanceCheckerConfigurator.getFastInstanceChecker(knowledgeSource);
}
@@ -93,7 +93,7 @@
* @param knowledgeSource see KnowledgeSource
* @return a component ready for initialization FastRetrievalReasoner
**/
-public static FastRetrievalReasoner getFastRetrievalReasoner(KnowledgeSource knowledgeSource) {
+public static FastRetrievalReasoner getFastRetrievalReasoner(Set<KnowledgeSource> knowledgeSource) {
return FastRetrievalReasonerConfigurator.getFastRetrievalReasoner(knowledgeSource);
}
@@ -101,7 +101,7 @@
* @param knowledgeSource see KnowledgeSource
* @return a component ready for initialization OWLAPIReasoner
**/
-public static OWLAPIReasoner getOWLAPIReasoner(KnowledgeSource knowledgeSource) {
+public static OWLAPIReasoner getOWLAPIReasoner(Set<KnowledgeSource> knowledgeSource) {
return OWLAPIReasonerConfigurator.getOWLAPIReasoner(knowledgeSource);
}
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/DIGReasonerConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/DIGReasonerConfigurator.java 2008-09-08 15:43:39 UTC (rev 1177)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/DIGReasonerConfigurator.java 2008-09-08 17:26:27 UTC (rev 1178)
@@ -20,6 +20,7 @@
package org.dllearner.core.configurators;
+import java.util.Set;
import org.dllearner.core.ComponentManager;
import org.dllearner.core.KnowledgeSource;
import org.dllearner.reasoning.DIGReasoner;
@@ -45,7 +46,7 @@
/**
* @return DIGReasoner
**/
-public static DIGReasoner getDIGReasoner(KnowledgeSource knowledgeSource) {
+public static DIGReasoner getDIGReasoner(Set<KnowledgeSource> knowledgeSource) {
DIGReasoner component = ComponentManager.getInstance().reasoner(DIGReasoner.class, knowledgeSource);
return component;
}
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/FastInstanceCheckerConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/FastInstanceCheckerConfigurator.java 2008-09-08 15:43:39 UTC (rev 1177)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/FastInstanceCheckerConfigurator.java 2008-09-08 17:26:27 UTC (rev 1178)
@@ -20,6 +20,7 @@
package org.dllearner.core.configurators;
+import java.util.Set;
import org.dllearner.core.ComponentManager;
import org.dllearner.core.KnowledgeSource;
import org.dllearner.reasoning.FastInstanceChecker;
@@ -45,7 +46,7 @@
/**
* @return FastInstanceChecker
**/
-public static FastInstanceChecker getFastInstanceChecker(KnowledgeSource knowledgeSource) {
+public static FastInstanceChecker getFastInstanceChecker(Set<KnowledgeSource> knowledgeSource) {
FastInstanceChecker component = ComponentManager.getInstance().reasoner(FastInstanceChecker.class, knowledgeSource);
return component;
}
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/FastRetrievalReasonerConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/FastRetrievalReasonerConfigurator.java 2008-09-08 15:43:39 UTC (rev 1177)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/FastRetrievalReasonerConfigurator.java 2008-09-08 17:26:27 UTC (rev 1178)
@@ -20,6 +20,7 @@
package org.dllearner.core.configurators;
+import java.util.Set;
import org.dllearner.core.ComponentManager;
import org.dllearner.core.KnowledgeSource;
import org.dllearner.reasoning.FastRetrievalReasoner;
@@ -45,7 +46,7 @@
/**
* @return FastRetrievalReasoner
**/
-public static FastRetrievalReasoner getFastRetrievalReasoner(KnowledgeSource knowledgeSource) {
+public static FastRetrievalReasoner getFastRetrievalReasoner(Set<KnowledgeSource> knowledgeSource) {
FastRetrievalReasoner component = ComponentManager.getInstance().reasoner(FastRetrievalReasoner.class, knowledgeSource);
return component;
}
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIReasonerConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIReasonerConfigurator.java 2008-09-08 15:43:39 UTC (rev 1177)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIReasonerConfigurator.java 2008-09-08 17:26:27 UTC (rev 1178)
@@ -20,6 +20,7 @@
package org.dllearner.core.configurators;
+import java.util.Set;
import org.dllearner.core.ComponentManager;
import org.dllearner.core.KnowledgeSource;
import org.dllearner.reasoning.OWLAPIReasoner;
@@ -45,7 +46,7 @@
/**
* @return OWLAPIReasoner
**/
-public static OWLAPIReasoner getOWLAPIReasoner(KnowledgeSource knowledgeSource) {
+public static OWLAPIReasoner getOWLAPIReasoner(Set<KnowledgeSource> knowledgeSource) {
OWLAPIReasoner component = ComponentManager.getInstance().reasoner(OWLAPIReasoner.class, knowledgeSource);
return component;
}
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2008-09-08 15:43:39 UTC (rev 1177)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2008-09-08 17:26:27 UTC (rev 1178)
@@ -74,16 +74,19 @@
public class SparqlKnowledgeSource extends KnowledgeSource {
// RBC
- static final boolean debug = false;
+ private static final boolean debug = false;
// tupleaquisitor
- static final boolean debugUseImprovedTupleAquisitor = debug && false; // switches
+ private static final boolean debugUseImprovedTupleAquisitor = debug && false; // switches
// sysex
- static final boolean debugExitAfterExtraction = debug && false; // switches
+ private static final boolean debugExitAfterExtraction = debug && false; // switches
private SparqlKnowledgeSourceConfigurator configurator;
+ /**
+ * @return the configurator for this Knowledgesource
+ */
public SparqlKnowledgeSourceConfigurator getConfigurator() {
return configurator;
}
@@ -93,7 +96,7 @@
}
// ConfigOptions
- public URL url;
+ private URL url;
private String format = "N-TRIPLES";
@@ -101,7 +104,7 @@
private URL dumpFile;
- SparqlEndpoint endpoint = null;
+ private SparqlEndpoint endpoint = null;
// received ontology as array, used if format=Array(an element of the
// array consists of the subject, predicate and object separated by '<'
@@ -113,6 +116,7 @@
// mainly used for statistic
private int nrOfExtractedTriples = 0;
+
public static String getName() {
return "SPARQL Endpoint";
}
@@ -193,9 +197,9 @@
options.add(CommonConfigOptions.getVerbosityOption());
options.add(new StringSetConfigOption("defaultGraphURIs",
- "a list of all default Graph URIs", new TreeSet<String> (), false, true));
+ "a list of all default Graph URIs", new TreeSet<String>(), false, true));
options.add(new StringSetConfigOption("namedGraphURIs",
- "a list of all named Graph URIs", new TreeSet<String> (), false, true));
+ "a list of all named Graph URIs", new TreeSet<String>(), false, true));
return options;
}
@@ -203,7 +207,7 @@
* @see org.dllearner.core.Component#applyConfigEntry(org.dllearner.core.ConfigEntry)
*/
@Override
- @SuppressWarnings( { "unchecked" })
+ @SuppressWarnings({ "unchecked" })
public <T> void applyConfigEntry(ConfigEntry<T> entry)
throws InvalidConfigOptionValueException {
//TODO remove this function
@@ -311,11 +315,12 @@
*/
@Override
public String toDIG(URI kbURI) {
- if (format.equals("N-TRIPLES"))
+ if (format.equals("N-TRIPLES")){
return JenaOWLDIGConverter.getTellsString(dumpFile,
OntologyFormat.N_TRIPLES, kbURI);
- else
+ }else {
return DIGConverter.getDIGString(kb, kbURI).toString();
+ }
}
/*
@@ -332,8 +337,16 @@
throw new OntologyFormatUnsupportedException("export", format);
}
+ /**
+ * @return the URL of the used sparql endpoint
+ */
public URL getURL() {
- return url;
+ if(url == null && endpoint!=null){
+ return endpoint.getURL();
+ }
+ else{
+ return url;
+ }
}
public String[] getOntArray() {
@@ -366,11 +379,12 @@
// get Options for endpoints
- if (configurator.getUseCache())
+ if (configurator.getUseCache()){
return new SPARQLTasks(new Cache(configurator.getCacheDir()),
getSparqlEndpoint());
- else
+ }else {
return new SPARQLTasks(getSparqlEndpoint());
+ }
}
public SparqlQueryMaker getSparqlQueryMaker() {
Modified: trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLP.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLP.java 2008-09-08 15:43:39 UTC (rev 1177)
+++ trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLP.java 2008-09-08 17:26:27 UTC (rev 1178)
@@ -46,8 +46,7 @@
*/
public class PosNegDefinitionLP extends PosNegLP implements DefinitionLP {
-
-
+
public PosNegDefinitionLP(ReasoningService reasoningService) {
super(reasoningService);
}
Modified: trunk/src/dl-learner/org/dllearner/reasoning/FastInstanceChecker.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/FastInstanceChecker.java 2008-09-08 15:43:39 UTC (rev 1177)
+++ trunk/src/dl-learner/org/dllearner/reasoning/FastInstanceChecker.java 2008-09-08 17:26:27 UTC (rev 1178)
@@ -39,6 +39,7 @@
import org.dllearner.core.config.ConfigOption;
import org.dllearner.core.config.InvalidConfigOptionValueException;
import org.dllearner.core.config.StringConfigOption;
+import org.dllearner.core.configurators.ComponentFactory;
import org.dllearner.core.configurators.FastInstanceCheckerConfigurator;
import org.dllearner.core.owl.BooleanValueRestriction;
import org.dllearner.core.owl.DataRange;
@@ -90,8 +91,6 @@
private boolean defaultNegation = true;
- private String reasonerType = "pellet";
-
private FastInstanceCheckerConfigurator configurator;
public FastInstanceCheckerConfigurator getConfigurator (){
return configurator;
@@ -128,12 +127,13 @@
public FastInstanceChecker(Set<KnowledgeSource> sources) {
this.sources = sources;
+ this.configurator = new FastInstanceCheckerConfigurator(this);
}
public static Collection<ConfigOption<?>> createConfigOptions() {
Collection<ConfigOption<?>> options = new LinkedList<ConfigOption<?>>();
- StringConfigOption type = new StringConfigOption("reasonerType", "FaCT++ or Pellet to dematerialize", "pellet");
+ StringConfigOption type = new StringConfigOption("reasonerType", "FaCT++ or Pellet to dematerialize", "pellet", false, true);
type.setAllowedValues(new String[] {"fact", "pellet"});
// closure option? see:
// http://owlapi.svn.sourceforge.net/viewvc/owlapi/owl1_1/trunk/tutorial/src/main/java/uk/ac/manchester/owl/tutorial/examples/ClosureAxiomsExample.java?view=markup
@@ -148,9 +148,6 @@
*/
@Override
public <T> void applyConfigEntry(ConfigEntry<T> entry) throws InvalidConfigOptionValueException {
- String name = entry.getOptionName();
- if(name.equals("reasonerType"))
- reasonerType = (String) entry.getValue();
}
public static String getName() {
@@ -165,8 +162,9 @@
*/
@Override
public void init() throws ComponentInitException {
- rc = new OWLAPIReasoner(sources);
- rc.setReasonerType(reasonerType);
+ //rc = new OWLAPIReasoner(sources);
+ rc = ComponentFactory.getOWLAPIReasoner(sources);
+ rc.getConfigurator().setReasonerType(configurator.getReasonerType());
rc.init();
try {
@@ -629,7 +627,7 @@
}
public void setReasonerType(String type){
- reasonerType=type;
+ configurator.setReasonerType(type);
}
Modified: trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java 2008-09-08 15:43:39 UTC (rev 1177)
+++ trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java 2008-09-08 17:26:27 UTC (rev 1178)
@@ -103,7 +103,7 @@
// private static Logger logger = Logger
// .getLogger(OWLAPIReasoner.class);
- private String reasonerType = "pellet";
+ //private String reasonerType = "pellet";
private OWLAPIReasonerConfigurator configurator;
public OWLAPIReasonerConfigurator getConfigurator(){
return configurator;
@@ -151,7 +151,7 @@
public static Collection<ConfigOption<?>> createConfigOptions() {
Collection<ConfigOption<?>> options = new LinkedList<ConfigOption<?>>();
- StringConfigOption type = new StringConfigOption("reasonerType", "FaCT++ or Pellet, which means \"pellet\" or \"fact\"", "pellet");
+ StringConfigOption type = new StringConfigOption("reasonerType", "FaCT++ or Pellet, which means \"pellet\" or \"fact\"", "pellet", false, true);
type.setAllowedValues(new String[] {"fact", "pellet"});
// closure option? see:
// http://owlapi.svn.sourceforge.net/viewvc/owlapi/owl1_1/trunk/tutorial/src/main/java/uk/ac/manchester/owl/tutorial/examples/ClosureAxiomsExample.java?view=markup
@@ -164,9 +164,7 @@
*/
@Override
public <T> void applyConfigEntry(ConfigEntry<T> entry) throws InvalidConfigOptionValueException {
- String name = entry.getOptionName();
- if(name.equals("reasonerType"))
- reasonerType = (String) entry.getValue();
+
}
@Override
@@ -269,7 +267,7 @@
}
// create actual reasoner
- if(reasonerType.equals("fact")) {
+ if(configurator.getReasonerType().equals("fact")) {
try {
reasoner = new uk.ac.manchester.cs.factplusplus.owlapi.Reasoner(manager);
} catch (Exception e) {
@@ -388,7 +386,7 @@
* @see org.dllearner.core.Reasoner#getReasonerType()
*/
public ReasonerType getReasonerType() {
- if(reasonerType.equals("FaCT++"))
+ if(configurator.getReasonerType().equals("fact"))
return ReasonerType.FACT;
else
return ReasonerType.PELLET;
@@ -948,7 +946,7 @@
}
public void setReasonerType(String type){
- reasonerType=type;
+ configurator.setReasonerType(type);
}
@Override
Modified: trunk/src/dl-learner/org/dllearner/scripts/ConfigJavaGenerator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/ConfigJavaGenerator.java 2008-09-08 15:43:39 UTC (rev 1177)
+++ trunk/src/dl-learner/org/dllearner/scripts/ConfigJavaGenerator.java 2008-09-08 17:26:27 UTC (rev 1178)
@@ -26,6 +26,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -148,7 +149,8 @@
ConfigJavaGenerator c = new ConfigJavaGenerator(component,
"reasoner");
c.imports.add("org.dllearner.core.KnowledgeSource");
- c.additionalMandatoryVars.put("KnowledgeSource knowledgeSource",
+ c.imports.add(Set.class.getCanonicalName());
+ c.additionalMandatoryVars.put("Set<KnowledgeSource> knowledgeSource",
"knowledgeSource");
c.makeConfigurator();
@@ -338,9 +340,13 @@
ret += applyConf;
ret += "return component;\n}\n";
+
return ret;
}
+
+
+
private String makeComponentFactoryMethods(String comments) {
Map<String, String> parametersWithType = new LinkedHashMap<String, String>();
Modified: trunk/src/dl-learner/org/dllearner/scripts/NewSample.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/NewSample.java 2008-09-08 15:43:39 UTC (rev 1177)
+++ trunk/src/dl-learner/org/dllearner/scripts/NewSample.java 2008-09-08 17:26:27 UTC (rev 1178)
@@ -20,7 +20,9 @@
import java.io.File;
import java.io.IOException;
import java.text.DecimalFormat;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -33,6 +35,7 @@
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.ComponentManager;
import org.dllearner.core.EvaluatedDescription;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.LearningProblemUnsupportedException;
import org.dllearner.core.ReasoningService;
import org.dllearner.core.configurators.ComponentFactory;
@@ -119,9 +122,10 @@
String fileURL = new File(owlFile).toURI().toString();
OWLFile ks = ComponentFactory.getOWLFile( fileURL);
-
+ Set<KnowledgeSource> tmp = new HashSet<KnowledgeSource>();
+ tmp.add(ks);
// reasoner
- FastInstanceChecker f = ComponentFactory.getFastInstanceChecker( ks);
+ FastInstanceChecker f = ComponentFactory.getFastInstanceChecker(tmp);
ReasoningService rs = cm.reasoningService(f);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
