Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[3102] trunk/components-core/src
|
From: <jen...@us...> - 2011-08-23 16:05:53
|
Revision: 3102
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3102&view=rev
Author: jenslehmann
Date: 2011-08-23 16:05:46 +0000 (Tue, 23 Aug 2011)
Log Message:
-----------
weakened dependance on configurators in many components
Modified Paths:
--------------
trunk/components-core/src/main/java/org/dllearner/algorithms/BruteForceLearner.java
trunk/components-core/src/main/java/org/dllearner/algorithms/RandomGuesser.java
trunk/components-core/src/main/java/org/dllearner/algorithms/celoe/CELOE.java
trunk/components-core/src/main/java/org/dllearner/algorithms/el/ELLearningAlgorithm.java
trunk/components-core/src/main/java/org/dllearner/algorithms/el/ELLearningAlgorithmDisjunctive.java
trunk/components-core/src/main/java/org/dllearner/algorithms/fuzzydll/FuzzyCELOE.java
trunk/components-core/src/main/java/org/dllearner/algorithms/gp/GP.java
trunk/components-core/src/main/java/org/dllearner/algorithms/isle/ISLE.java
trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/OCEL.java
trunk/components-core/src/main/java/org/dllearner/algorithms/refinement/ROLearner.java
trunk/components-core/src/main/java/org/dllearner/core/AbstractAxiomLearningAlgorithm.java
trunk/components-core/src/main/java/org/dllearner/core/AbstractComponent.java
trunk/components-core/src/main/java/org/dllearner/core/AnnComponentManager.java
trunk/components-core/src/main/java/org/dllearner/kb/KBFile.java
trunk/components-core/src/main/java/org/dllearner/kb/OWLAPIOntology.java
trunk/components-core/src/main/java/org/dllearner/kb/OWLFile.java
trunk/components-core/src/main/java/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
trunk/components-core/src/main/java/org/dllearner/learningproblems/ClassLearningProblem.java
trunk/components-core/src/main/java/org/dllearner/learningproblems/PosNegLPStandard.java
trunk/components-core/src/main/java/org/dllearner/learningproblems/PosNegLPStrict.java
trunk/components-core/src/main/java/org/dllearner/learningproblems/PosOnlyLP.java
trunk/components-core/src/main/java/org/dllearner/learningproblems/fuzzydll/FuzzyPosNegLPStandard.java
trunk/components-core/src/main/java/org/dllearner/reasoning/DIGReasoner.java
trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java
trunk/components-core/src/main/java/org/dllearner/reasoning/FastRetrievalReasoner.java
trunk/components-core/src/main/java/org/dllearner/reasoning/OWLAPIReasoner.java
trunk/components-core/src/main/java/org/dllearner/reasoning/PelletReasoner.java
trunk/components-core/src/main/java/org/dllearner/reasoning/ProtegeReasoner.java
trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyOWLAPIReasoner.java
trunk/components-core/src/main/java/org/dllearner/utilities/components/ReasonerComponentFactory.java
trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest.java
trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest_Trains.java
trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest_Trains_noFuzzyIndividuals.java
trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest_noFuzzyTrains.java
Added Paths:
-----------
trunk/components-core/src/main/java/org/dllearner/core/config/BooleanEditor.java
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/BruteForceLearner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/BruteForceLearner.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/BruteForceLearner.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -28,7 +28,6 @@
import org.dllearner.core.AbstractCELA;
import org.dllearner.core.AbstractLearningProblem;
import org.dllearner.core.AbstractReasonerComponent;
-import org.dllearner.core.configurators.BruteForceLearnerConfigurator;
import org.dllearner.core.options.CommonConfigOptions;
import org.dllearner.core.options.ConfigEntry;
import org.dllearner.core.options.ConfigOption;
@@ -58,11 +57,11 @@
*/
public class BruteForceLearner extends AbstractCELA {
- private BruteForceLearnerConfigurator configurator;
- @Override
- public BruteForceLearnerConfigurator getConfigurator(){
- return configurator;
- }
+// private BruteForceLearnerConfigurator configurator;
+// @Override
+// public BruteForceLearnerConfigurator getConfigurator(){
+// return configurator;
+// }
private AbstractLearningProblem learningProblem;
@@ -85,7 +84,7 @@
super(learningProblem, rs);
this.learningProblem = learningProblem;
this.rs = rs;
- this.configurator = new BruteForceLearnerConfigurator(this);
+// this.configurator = new BruteForceLearnerConfigurator(this);
}
public static String getName() {
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/RandomGuesser.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/RandomGuesser.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/RandomGuesser.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -50,11 +50,11 @@
*/
public class RandomGuesser extends AbstractCELA {
- private RandomGuesserConfigurator configurator;
- @Override
- public RandomGuesserConfigurator getConfigurator(){
- return configurator;
- }
+// private RandomGuesserConfigurator configurator;
+// @Override
+// public RandomGuesserConfigurator getConfigurator(){
+// return configurator;
+// }
private Description bestDefinition = null;
private Score bestScore;
@@ -69,7 +69,7 @@
public RandomGuesser(AbstractLearningProblem learningProblem, AbstractReasonerComponent rs) {
super(learningProblem, rs);
- this.configurator = new RandomGuesserConfigurator(this);
+// this.configurator = new RandomGuesserConfigurator(this);
}
public static String getName() {
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/celoe/CELOE.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/celoe/CELOE.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/celoe/CELOE.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -144,7 +144,6 @@
private int minHorizExp = 0;
private int maxHorizExp = 0;
- @Override
public CELOEConfigurator getConfigurator() {
return configurator;
}
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/el/ELLearningAlgorithm.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/el/ELLearningAlgorithm.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/el/ELLearningAlgorithm.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -30,10 +30,11 @@
import org.dllearner.core.AbstractCELA;
import org.dllearner.core.AbstractLearningProblem;
import org.dllearner.core.AbstractReasonerComponent;
+import org.dllearner.core.config.BooleanEditor;
+import org.dllearner.core.config.ConfigOption;
import org.dllearner.core.configurators.Configurator;
import org.dllearner.core.configurators.ELLearningAlgorithmConfigurator;
import org.dllearner.core.options.CommonConfigOptions;
-import org.dllearner.core.options.ConfigOption;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Thing;
import org.dllearner.learningproblems.EvaluatedDescriptionPosNeg;
@@ -54,7 +55,7 @@
public class ELLearningAlgorithm extends AbstractCELA {
private static Logger logger = Logger.getLogger(ELLearningAlgorithm.class);
- private ELLearningAlgorithmConfigurator configurator;
+// private ELLearningAlgorithmConfigurator configurator;
private ELDown2 operator;
@@ -63,7 +64,11 @@
private double treeSearchTimeSeconds = 1.0;
private long treeStartTime;
+ // "instanceBasedDisjoints", "Specifies whether to use real disjointness checks or instance based ones (no common instances) in the refinement operator."
+ @ConfigOption(name="instanceBasedDisjoints", required=false, defaultValue="true", description="Specifies whether to use real disjointness checks or instance based ones (no common instances) in the refinement operator.", propertyEditorClass=BooleanEditor.class)
+ private boolean instanceBasedDisjoints = true;
+
// a set with limited size (currently the ordering is defined in the class itself)
private EvaluatedDescriptionSet bestEvaluatedDescriptions = new EvaluatedDescriptionSet(AbstractCELA.MAX_NR_OF_RESULTS);
@@ -73,7 +78,7 @@
public ELLearningAlgorithm(PosNegLP problem, AbstractReasonerComponent reasoner) {
super(problem, reasoner);
- configurator = new ELLearningAlgorithmConfigurator(this);
+// configurator = new ELLearningAlgorithmConfigurator(this);
}
public static String getName() {
@@ -91,18 +96,18 @@
return (PosNegLP) learningProblem;
}
- @Override
- public ELLearningAlgorithmConfigurator getConfigurator() {
- return configurator;
- }
+// @Override
+// public ELLearningAlgorithmConfigurator getConfigurator() {
+// return configurator;
+// }
- public static Collection<ConfigOption<?>> createConfigOptions() {
- Collection<ConfigOption<?>> options = new LinkedList<ConfigOption<?>>();
-// options.add(CommonConfigOptions.getNoisePercentage());
-// options.add(new StringConfigOption("startClass", "the named class which should be used to start the algorithm (GUI: needs a widget for selecting a class)"));
- options.add(CommonConfigOptions.getInstanceBasedDisjoints());
- return options;
- }
+// public static Collection<ConfigOption<?>> createConfigOptions() {
+// Collection<ConfigOption<?>> options = new LinkedList<ConfigOption<?>>();
+//// options.add(CommonConfigOptions.getNoisePercentage());
+//// options.add(new StringConfigOption("startClass", "the named class which should be used to start the algorithm (GUI: needs a widget for selecting a class)"));
+// options.add(CommonConfigOptions.getInstanceBasedDisjoints());
+// return options;
+// }
@Override
public void init() throws ComponentInitException {
@@ -110,7 +115,7 @@
heuristic = new StableHeuristic();
candidates = new TreeSet<SearchTreeNode>(heuristic);
- operator = new ELDown2(reasoner, configurator.getInstanceBasedDisjoints());
+ operator = new ELDown2(reasoner, instanceBasedDisjoints);
}
@Override
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/el/ELLearningAlgorithmDisjunctive.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/el/ELLearningAlgorithmDisjunctive.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/el/ELLearningAlgorithmDisjunctive.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -150,7 +150,6 @@
return (PosNegLP) learningProblem;
}
- @Override
public Configurator getConfigurator() {
return configurator;
}
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/fuzzydll/FuzzyCELOE.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/fuzzydll/FuzzyCELOE.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/fuzzydll/FuzzyCELOE.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -154,7 +154,6 @@
// private PrintWriter out;
// private long start = 0;
- @Override
public FuzzyCELOEConfigurator getConfigurator() {
return configurator;
}
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/gp/GP.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/gp/GP.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/gp/GP.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -56,11 +56,11 @@
*/
public class GP extends AbstractCELA {
- private GPConfigurator configurator;
- @Override
- public GPConfigurator getConfigurator(){
- return configurator;
- }
+// private GPConfigurator configurator;
+// @Override
+// public GPConfigurator getConfigurator(){
+// return configurator;
+// }
// NumberFormat f;
@@ -141,7 +141,7 @@
*/
public GP(PosNegLP learningProblem, AbstractReasonerComponent rs) {
super(learningProblem, rs);
- this.configurator = new GPConfigurator(this);
+// this.configurator = new GPConfigurator(this);
}
public static String getName() {
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/isle/ISLE.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/isle/ISLE.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/ISLE.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -132,7 +132,6 @@
private int minHorizExp = 0;
private int maxHorizExp = 0;
- @Override
public ISLEConfigurator getConfigurator() {
return configurator;
}
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/OCEL.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/OCEL.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/OCEL.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -83,7 +83,7 @@
public class OCEL extends AbstractCELA {
private OCELConfigurator configurator;
- @Override
+
public OCELConfigurator getConfigurator(){
return configurator;
}
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/refinement/ROLearner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/refinement/ROLearner.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/refinement/ROLearner.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -64,7 +64,7 @@
public class ROLearner extends AbstractCELA {
private ROLearnerConfigurator configurator;
- @Override
+
public ROLearnerConfigurator getConfigurator(){
return configurator;
}
Modified: trunk/components-core/src/main/java/org/dllearner/core/AbstractAxiomLearningAlgorithm.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/AbstractAxiomLearningAlgorithm.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/core/AbstractAxiomLearningAlgorithm.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -82,7 +82,6 @@
return returnList;
}
- @Override
public Configurator getConfigurator() {
// TODO Auto-generated method stub
return null;
Modified: trunk/components-core/src/main/java/org/dllearner/core/AbstractComponent.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/AbstractComponent.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/core/AbstractComponent.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -36,7 +36,7 @@
*/
public abstract class AbstractComponent implements Component {
- protected Configurator configurator;
+// protected Configurator configurator;
/**
* For each component, a configurator class is generated in package
@@ -46,7 +46,7 @@
* a component.
* @return An object allowing to configure this component.
*/
- public abstract Configurator getConfigurator();
+// public abstract Configurator getConfigurator();
/**
* Returns the name of this component. By default, "unnamed
Modified: trunk/components-core/src/main/java/org/dllearner/core/AnnComponentManager.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/AnnComponentManager.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/core/AnnComponentManager.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -53,7 +53,9 @@
// components must be listed here if they should be supported in interfaces
// (CLI, GUI, Web Service) and scripts (HTML documentation generator)
private static List<String> componentClassNames = new ArrayList<String> ( Arrays.asList(new String[]{
- "org.dllearner.algorithms.celoe.CELOE",
+ "org.dllearner.algorithms.celoe.CELOE",
+ "org.dllearner.algorithms.BruteForceLearner",
+ "org.dllearner.algorithms.RandomGuesser",
"org.dllearner.algorithms.properties.DisjointObjectPropertyAxiomLearner",
"org.dllearner.algorithms.properties.EquivalentObjectPropertyAxiomLearner",
"org.dllearner.algorithms.properties.FunctionalObjectPropertyAxiomLearner",
Added: trunk/components-core/src/main/java/org/dllearner/core/config/BooleanEditor.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/config/BooleanEditor.java (rev 0)
+++ trunk/components-core/src/main/java/org/dllearner/core/config/BooleanEditor.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -0,0 +1,83 @@
+package org.dllearner.core.config;
+
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyEditor;
+
+public class BooleanEditor implements PropertyEditor {
+
+ @Override
+ public void addPropertyChangeListener(PropertyChangeListener listener) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public String getAsText() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Component getCustomEditor() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String getJavaInitializationString() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String[] getTags() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Object getValue() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public boolean isPaintable() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public void paintValue(Graphics gfx, Rectangle box) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void removePropertyChangeListener(PropertyChangeListener listener) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setAsText(String text) throws IllegalArgumentException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setValue(Object value) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public boolean supportsCustomEditor() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+}
Modified: trunk/components-core/src/main/java/org/dllearner/kb/KBFile.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/KBFile.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/kb/KBFile.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -20,13 +20,12 @@
package org.dllearner.kb;
import java.io.File;
-import java.io.IOException;
import java.net.URI;
-import java.net.URL;
import java.util.Collection;
import java.util.LinkedList;
import org.apache.log4j.Logger;
+import org.dllearner.core.ComponentAnn;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.AbstractKnowledgeSource;
import org.dllearner.core.configurators.KBFileConfigurator;
@@ -38,7 +37,9 @@
import org.dllearner.parser.KBParser;
import org.dllearner.parser.ParseException;
import org.dllearner.reasoning.DIGConverter;
+import org.springframework.beans.propertyeditors.StringTrimmerEditor;
+
/**
* KB files are an internal convenience format used in DL-Learner. Their
* syntax is close to Description Logics and easy to use. KB files can be
@@ -47,19 +48,20 @@
* @author Jens Lehmann
*
*/
+@ComponentAnn(name = "KB file", shortName = "kbfile", version = 0.8)
public class KBFile extends AbstractKnowledgeSource {
private static Logger logger = Logger.getLogger(KBFile.class);
private KB kb;
-
- private KBFileConfigurator configurator;
+ @org.dllearner.core.config.ConfigOption(name = "url", description = "URL pointer to the KB file", defaultValue = "", required = false, propertyEditorClass = StringTrimmerEditor.class)
+ private String url;
+
/**
* Default constructor (needed for reflection in ComponentManager).
*/
public KBFile() {
- configurator = new KBFileConfigurator(this);
}
/**
@@ -71,65 +73,29 @@
* @param kb A KB object.
*/
public KBFile(KB kb) {
- configurator = new KBFileConfigurator(this);
this.kb = kb;
}
- @Override
- public KBFileConfigurator getConfigurator(){
- return configurator;
- }
-
public static String getName() {
return "KB file";
}
+ @Override
+ public void init() throws ComponentInitException {
+ try {
+ if (getUrl() != null) {
+ kb = KBParser.parseKBFile(getUrl());
+ logger.trace("KB File " + getUrl() + " parsed successfully.");
+ } else {
+ throw new ComponentInitException("No URL option or kb object given. Cannot initialise KBFile component.");
+ }
- public static Collection<ConfigOption<?>> createConfigOptions() {
- Collection<ConfigOption<?>> options = new LinkedList<ConfigOption<?>>();
-// options.add(new StringConfigOption("filename", "pointer to the KB file on local file system",null, true, true));
- URLConfigOption urlOption = new URLConfigOption("url", "URL pointer to the KB file",null, false, true);
- urlOption.setRefersToFile(true);
- options.add(urlOption);
- return options;
- }
+ } catch (ParseException e) {
+ throw new ComponentInitException("KB file " + getUrl() + " could not be parsed correctly.", e);
+ }
+ }
/*
- * @see org.dllearner.core.Component#applyConfigEntry(org.dllearner.core.ConfigEntry)
- */
- @Override
- public <T> void applyConfigEntry(ConfigEntry<T> entry) throws InvalidConfigOptionValueException {
-
- }
-
- /* (non-Javadoc)
- * @see org.dllearner.core.Component#init()
- */
- @Override
- public void init() throws ComponentInitException {
- try {
-
- // we either need a specified URL (if object is created
- // via component manager) or the kb object has been
- // passed directly (via constructor)
- if(kb == null) {
- if(configurator.getUrl() != null) {
- kb = KBParser.parseKBFile(configurator.getUrl());
- logger.trace("KB File " + configurator.getUrl() + " parsed successfully.");
- } else {
- throw new ComponentInitException("No URL option or kb object given. Cannot initialise KBFile component.");
- }
- }
-
- } catch (IOException e) {
- throw new ComponentInitException("KB file " + configurator.getUrl() + " could not be read.", e);
- } catch (ParseException e) {
- throw new ComponentInitException("KB file " + configurator.getUrl() + " could not be parsed correctly.", e);
- }
-
- }
-
- /*
* (non-Javadoc)
*
* @see org.dllearner.core.KnowledgeSource#toDIG()
@@ -150,33 +116,19 @@
@Override
public void export(File file, org.dllearner.core.OntologyFormat format){
kb.export(file, format);
-// OWLOntologyManager manager = OWLManager.createOWLOntologyManager();
-// URI ontologyURI = URI.create("http://example.com");
-// URI physicalURI = file.toURI();
-// SimpleURIMapper mapper = new SimpleURIMapper(ontologyURI, physicalURI);
-// manager.addURIMapper(mapper);
-// OWLOntology ontology;
-// try {
-// ontology = manager.createOntology(ontologyURI);
-// // OWLAPIReasoner.fillOWLAPIOntology(manager,ontology,kb);
-// OWLAPIAxiomConvertVisitor.fillOWLOntology(manager, ontology, kb);
-// manager.saveOntology(ontology);
-// } catch (OWLOntologyCreationException e) {
-// e.printStackTrace();
-// } catch (UnknownOWLOntologyException e) {
-// e.printStackTrace();
-// } catch (OWLOntologyStorageException e) {
-// e.printStackTrace();
-// }
}
- public URL getURL() {
- return configurator.getUrl();
+ public String getUrl() {
+ return url;
}
@Override
public KB toKB() {
return kb;
}
-
+
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
}
Modified: trunk/components-core/src/main/java/org/dllearner/kb/OWLAPIOntology.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/OWLAPIOntology.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/kb/OWLAPIOntology.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -39,7 +39,7 @@
public class OWLAPIOntology extends AbstractKnowledgeSource {
private OWLAPIOntologyConfigurator configurator;
- @Override
+
public OWLAPIOntologyConfigurator getConfigurator(){
return configurator;
}
Modified: trunk/components-core/src/main/java/org/dllearner/kb/OWLFile.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/OWLFile.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/kb/OWLFile.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -47,20 +47,23 @@
private static Logger logger = Logger
.getLogger(OWLFile.class);
+ // TODO: turn this into a config option
+ private URL url;
+
// private URL url;
- private OWLFileConfigurator configurator ;
- @Override
- public OWLFileConfigurator getConfigurator(){
- return configurator;
- }
+// private OWLFileConfigurator configurator ;
+// @Override
+// public OWLFileConfigurator getConfigurator(){
+// return configurator;
+// }
public static String getName() {
return "OWL file";
}
- public OWLFile(){
- configurator = new OWLFileConfigurator(this);
- }
+// public OWLFile(){
+// configurator = new OWLFileConfigurator(this);
+// }
public static Collection<ConfigOption<?>> createConfigOptions() {
@@ -84,7 +87,7 @@
*/
@Override
public void init() throws ComponentInitException {
- if(configurator.getUrl() == null) {
+ if(url == null) {
logger.error("Cannot initialise OWL file with empty URL");
}
@@ -107,15 +110,16 @@
@Override
public String toDIG(URI kbURI) {
// TODO: need some handling for cases where the URL was not set
- return OWLAPIDIGConverter.getTellsString(configurator.getUrl(), OntologyFormat.RDF_XML, kbURI);
+ return OWLAPIDIGConverter.getTellsString(url, OntologyFormat.RDF_XML, kbURI);
}
public URL getURL() {
- return configurator.getUrl();
+// return configurator.getUrl();
+ return url;
}
public void setURL(URL url) {
-// this.url = url;
- configurator.setUrl(url);
+ this.url = url;
+// configurator.setUrl(url);
}
/* (non-Javadoc)
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -84,7 +84,6 @@
/**
* @return the configurator for this Knowledgesource
*/
- @Override
public SparqlKnowledgeSourceConfigurator getConfigurator() {
return configurator;
}
Modified: trunk/components-core/src/main/java/org/dllearner/learningproblems/ClassLearningProblem.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/learningproblems/ClassLearningProblem.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/learningproblems/ClassLearningProblem.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -85,7 +85,6 @@
private HeuristicType heuristic = HeuristicType.AMEASURE;
- @Override
public ClassLearningProblemConfigurator getConfigurator(){
return configurator;
}
Modified: trunk/components-core/src/main/java/org/dllearner/learningproblems/PosNegLPStandard.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/learningproblems/PosNegLPStandard.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/learningproblems/PosNegLPStandard.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -65,7 +65,6 @@
private HeuristicType heuristic = HeuristicType.PRED_ACC;
- @Override
public PosNegLPStandardConfigurator getConfigurator() {
return configurator;
}
Modified: trunk/components-core/src/main/java/org/dllearner/learningproblems/PosNegLPStrict.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/learningproblems/PosNegLPStrict.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/learningproblems/PosNegLPStrict.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -53,7 +53,7 @@
private double errorPenalty = defaultErrorPenalty;
private PosNegLPStrictConfigurator configurator;
- @Override
+
public PosNegLPStrictConfigurator getConfigurator(){
return configurator;
}
Modified: trunk/components-core/src/main/java/org/dllearner/learningproblems/PosOnlyLP.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/learningproblems/PosOnlyLP.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/learningproblems/PosOnlyLP.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -58,7 +58,6 @@
// private PosNegLPStandard definitionLP;
private PosOnlyLPConfigurator configurator;
- @Override
public PosOnlyLPConfigurator getConfigurator(){
return configurator;
}
Modified: trunk/components-core/src/main/java/org/dllearner/learningproblems/fuzzydll/FuzzyPosNegLPStandard.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/learningproblems/fuzzydll/FuzzyPosNegLPStandard.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/learningproblems/fuzzydll/FuzzyPosNegLPStandard.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -76,7 +76,6 @@
private int errorIndex = 0;
- @Override
public FuzzyPosNegLPStandardConfigurator getConfigurator() {
return configurator;
}
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/DIGReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/DIGReasoner.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/DIGReasoner.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -78,7 +78,7 @@
public class DIGReasoner extends AbstractReasonerComponent {
private DIGReasonerConfigurator configurator;
- @Override
+
public DIGReasonerConfigurator getConfigurator(){
return configurator;
}
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -104,7 +104,6 @@
private FastInstanceCheckerConfigurator configurator;
- @Override
public FastInstanceCheckerConfigurator getConfigurator() {
return configurator;
}
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/FastRetrievalReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/FastRetrievalReasoner.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/FastRetrievalReasoner.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -51,7 +51,7 @@
public class FastRetrievalReasoner extends AbstractReasonerComponent {
private FastRetrievalReasonerConfigurator configurator;
- @Override
+
public FastRetrievalReasonerConfigurator getConfigurator(){
return configurator;
}
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/OWLAPIReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/OWLAPIReasoner.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/OWLAPIReasoner.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -66,7 +66,6 @@
//private String reasonerType = "pellet";
private OWLAPIReasonerConfigurator configurator;
- @Override
public OWLAPIReasonerConfigurator getConfigurator() {
return configurator;
}
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/PelletReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/PelletReasoner.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/PelletReasoner.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -423,7 +423,6 @@
classifier.dispose();
}
- @Override
public PelletReasonerConfigurator getConfigurator() {
return configurator;
}
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/ProtegeReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/ProtegeReasoner.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/ProtegeReasoner.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -195,7 +195,6 @@
reasoner.dispose();
}
- @Override
public ProtegeReasonerConfigurator getConfigurator() {
return configurator;
}
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyOWLAPIReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyOWLAPIReasoner.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyOWLAPIReasoner.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -139,7 +139,7 @@
// private String reasonerType = "pellet";
private FuzzyOWLAPIReasonerConfigurator configurator;
- @Override
+
public FuzzyOWLAPIReasonerConfigurator getConfigurator(){
return configurator;
}
Modified: trunk/components-core/src/main/java/org/dllearner/utilities/components/ReasonerComponentFactory.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/components/ReasonerComponentFactory.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/components/ReasonerComponentFactory.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -54,7 +54,7 @@
// knowledge source
OWLFile ks = cm.knowledgeSource(OWLFile.class);
URL fileURL = new File(ontologyFile).toURI().toURL();
- ks.getConfigurator().setUrl(fileURL);
+ ks.setURL(fileURL);
ks.init();
// reasoner component
Modified: trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest.java
===================================================================
--- trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -101,7 +101,7 @@
ComponentManager cm = ComponentManager.getInstance();
OWLFile ks = cm.knowledgeSource(OWLFile.class);
- ks.getConfigurator().setUrl(new URL("file:///Users/josue/Documents/PhD/AKSW/ontologies/foodItems_v1.owl"));
+ ks.setURL(new URL("file:///Users/josue/Documents/PhD/AKSW/ontologies/foodItems_v1.owl"));
ks.init();
//ReasonerComponent rc = cm.reasoner(OWLAPIReasoner.class, ks);
Modified: trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest_Trains.java
===================================================================
--- trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest_Trains.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest_Trains.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -126,7 +126,7 @@
ComponentManager cm = ComponentManager.getInstance();
OWLFile ks = cm.knowledgeSource(OWLFile.class);
- ks.getConfigurator().setUrl(new URL("file", null, "../examples/fuzzydll/fuzzyTrains_v5.0.owl"));
+ ks.setURL(new URL("file", null, "../examples/fuzzydll/fuzzyTrains_v5.0.owl"));
ks.init();
// ReasonerComponent rc = cm.reasoner(OWLAPIReasoner.class, ks);
Modified: trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest_Trains_noFuzzyIndividuals.java
===================================================================
--- trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest_Trains_noFuzzyIndividuals.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest_Trains_noFuzzyIndividuals.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -99,7 +99,7 @@
ComponentManager cm = ComponentManager.getInstance();
OWLFile ks = cm.knowledgeSource(OWLFile.class);
- ks.getConfigurator().setUrl(new URL("file", null, "../examples/fuzzydll/fuzzyTrains_v2.1a.owl"));
+ ks.setURL(new URL("file", null, "../examples/fuzzydll/fuzzyTrains_v2.1a.owl"));
ks.init();
// ReasonerComponent rc = cm.reasoner(OWLAPIReasoner.class, ks);
Modified: trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest_noFuzzyTrains.java
===================================================================
--- trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest_noFuzzyTrains.java 2011-08-23 14:48:02 UTC (rev 3101)
+++ trunk/components-core/src/test/java/org/dllearner/test/FuzzyDLLTest_noFuzzyTrains.java 2011-08-23 16:05:46 UTC (rev 3102)
@@ -110,7 +110,7 @@
OWLFile ks = cm.knowledgeSource(OWLFile.class);
// ks.getConfigurator().setUrl(new URL("file:///Users/josue/Documents/PhD/AKSW/ontologies/fuzzyTrains/fuzzyTrains_v1.0.owl"));
- ks.getConfigurator().setUrl(new URL("file", null, "../examples/fuzzydll/noFuzzyTrains_v1.5.owl"));
+ ks.setURL(new URL("file", null, "../examples/fuzzydll/noFuzzyTrains_v1.5.owl"));
ks.init();
AbstractReasonerComponent rc = cm.reasoner(OWLAPIReasoner.class, ks);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
