Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1505] trunk/src/dl-learner/org/dllearner
|
From: <jen...@us...> - 2008-11-11 10:59:35
|
Revision: 1505
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1505&view=rev
Author: jenslehmann
Date: 2008-11-11 10:59:23 +0000 (Tue, 11 Nov 2008)
Log Message:
-----------
- reasoner component redesign continued
- SVN partially broken
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java
trunk/src/dl-learner/org/dllearner/algorithms/DBpediaNavigationSuggestor.java
trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java
trunk/src/dl-learner/org/dllearner/algorithms/SimpleSuggestionLearningAlgorithm.java
trunk/src/dl-learner/org/dllearner/algorithms/el/ELDescriptionTree.java
trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java
trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java
trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java
trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java
trunk/src/dl-learner/org/dllearner/cli/Start.java
trunk/src/dl-learner/org/dllearner/core/BaseReasoner.java
trunk/src/dl-learner/org/dllearner/core/Component.java
trunk/src/dl-learner/org/dllearner/core/ComponentManager.java
trunk/src/dl-learner/org/dllearner/core/ComponentPool.java
trunk/src/dl-learner/org/dllearner/core/IndividualReasoner.java
trunk/src/dl-learner/org/dllearner/core/ReasonerComponent.java
trunk/src/dl-learner/org/dllearner/core/SchemaReasoner.java
trunk/src/dl-learner/org/dllearner/core/options/BooleanConfigOption.java
trunk/src/dl-learner/org/dllearner/core/options/CommonConfigMappings.java
trunk/src/dl-learner/org/dllearner/core/options/CommonConfigOptions.java
trunk/src/dl-learner/org/dllearner/core/options/ConfigEntry.java
trunk/src/dl-learner/org/dllearner/core/options/ConfigOption.java
trunk/src/dl-learner/org/dllearner/core/options/DoubleConfigOption.java
trunk/src/dl-learner/org/dllearner/core/options/IntegerConfigOption.java
trunk/src/dl-learner/org/dllearner/core/options/InvalidConfigOptionValueException.java
trunk/src/dl-learner/org/dllearner/core/options/StringConfigOption.java
trunk/src/dl-learner/org/dllearner/core/options/StringSetConfigOption.java
trunk/src/dl-learner/org/dllearner/core/options/StringTupleListConfigOption.java
trunk/src/dl-learner/org/dllearner/core/options/URLConfigOption.java
trunk/src/dl-learner/org/dllearner/core/options/UnknownConfigOptionException.java
trunk/src/dl-learner/org/dllearner/gui/Config.java
trunk/src/dl-learner/org/dllearner/gui/ConfigSave.java
trunk/src/dl-learner/org/dllearner/gui/OptionPanel.java
trunk/src/dl-learner/org/dllearner/gui/widgets/AbstractWidgetPanel.java
trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelBoolean.java
trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelDefault.java
trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelDouble.java
trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelInteger.java
trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelString.java
trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelStringSet.java
trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelStringTupleList.java
trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelURL.java
trunk/src/dl-learner/org/dllearner/kb/KBFile.java
trunk/src/dl-learner/org/dllearner/kb/OWLAPIOntology.java
trunk/src/dl-learner/org/dllearner/kb/OWLFile.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/learningproblems/PosNegDefinitionLPStrict.java
trunk/src/dl-learner/org/dllearner/learningproblems/PosNegInclusionLP.java
trunk/src/dl-learner/org/dllearner/learningproblems/PosNegLP.java
trunk/src/dl-learner/org/dllearner/learningproblems/PosOnlyInclusionLP.java
trunk/src/dl-learner/org/dllearner/learningproblems/PosOnlyLP.java
trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java
trunk/src/dl-learner/org/dllearner/reasoning/FastInstanceChecker.java
trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java
trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java
trunk/src/dl-learner/org/dllearner/refinementoperators/ELDown.java
trunk/src/dl-learner/org/dllearner/refinementoperators/PsiDown.java
trunk/src/dl-learner/org/dllearner/refinementoperators/PsiUp.java
trunk/src/dl-learner/org/dllearner/refinementoperators/RhoDRDown.java
trunk/src/dl-learner/org/dllearner/refinementoperators/RhoDown.java
trunk/src/dl-learner/org/dllearner/refinementoperators/Utility.java
trunk/src/dl-learner/org/dllearner/scripts/ConfigJavaGenerator.java
trunk/src/dl-learner/org/dllearner/scripts/CrossValidation.java
trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
trunk/src/dl-learner/org/dllearner/tools/ore/OntologyModifier.java
trunk/src/dl-learner/org/dllearner/utilities/components/ComponentCombo.java
trunk/src/dl-learner/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderOWL.java
Added Paths:
-----------
trunk/src/dl-learner/org/dllearner/core/options/
Removed Paths:
-------------
trunk/src/dl-learner/org/dllearner/core/config/
Modified: trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -31,12 +31,12 @@
import org.dllearner.core.LearningProblem;
import org.dllearner.core.ReasonerComponent;
import org.dllearner.core.Score;
-import org.dllearner.core.config.CommonConfigOptions;
-import org.dllearner.core.config.ConfigEntry;
-import org.dllearner.core.config.ConfigOption;
-import org.dllearner.core.config.IntegerConfigOption;
-import org.dllearner.core.config.InvalidConfigOptionValueException;
import org.dllearner.core.configurators.BruteForceLearnerConfigurator;
+import org.dllearner.core.options.CommonConfigOptions;
+import org.dllearner.core.options.ConfigEntry;
+import org.dllearner.core.options.ConfigOption;
+import org.dllearner.core.options.IntegerConfigOption;
+import org.dllearner.core.options.InvalidConfigOptionValueException;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Intersection;
import org.dllearner.core.owl.NamedClass;
Modified: trunk/src/dl-learner/org/dllearner/algorithms/DBpediaNavigationSuggestor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/DBpediaNavigationSuggestor.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/algorithms/DBpediaNavigationSuggestor.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -30,15 +30,15 @@
import org.dllearner.core.LearningProblem;
import org.dllearner.core.ReasonerComponent;
import org.dllearner.core.Score;
-import org.dllearner.core.config.BooleanConfigOption;
-import org.dllearner.core.config.CommonConfigOptions;
-import org.dllearner.core.config.ConfigEntry;
-import org.dllearner.core.config.ConfigOption;
-import org.dllearner.core.config.DoubleConfigOption;
-import org.dllearner.core.config.InvalidConfigOptionValueException;
-import org.dllearner.core.config.StringConfigOption;
import org.dllearner.core.configurators.ComponentFactory;
import org.dllearner.core.configurators.DBpediaNavigationSuggestorConfigurator;
+import org.dllearner.core.options.BooleanConfigOption;
+import org.dllearner.core.options.CommonConfigOptions;
+import org.dllearner.core.options.ConfigEntry;
+import org.dllearner.core.options.ConfigOption;
+import org.dllearner.core.options.DoubleConfigOption;
+import org.dllearner.core.options.InvalidConfigOptionValueException;
+import org.dllearner.core.options.StringConfigOption;
import org.dllearner.core.owl.Description;
import org.dllearner.learningproblems.PosNegDefinitionLP;
import org.dllearner.learningproblems.PosNegLP;
Modified: trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -30,11 +30,11 @@
import org.dllearner.core.LearningProblem;
import org.dllearner.core.ReasonerComponent;
import org.dllearner.core.Score;
-import org.dllearner.core.config.ConfigEntry;
-import org.dllearner.core.config.ConfigOption;
-import org.dllearner.core.config.IntegerConfigOption;
-import org.dllearner.core.config.InvalidConfigOptionValueException;
import org.dllearner.core.configurators.RandomGuesserConfigurator;
+import org.dllearner.core.options.ConfigEntry;
+import org.dllearner.core.options.ConfigOption;
+import org.dllearner.core.options.IntegerConfigOption;
+import org.dllearner.core.options.InvalidConfigOptionValueException;
import org.dllearner.core.owl.Description;
public class RandomGuesser extends LearningAlgorithm {
Modified: trunk/src/dl-learner/org/dllearner/algorithms/SimpleSuggestionLearningAlgorithm.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/SimpleSuggestionLearningAlgorithm.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/algorithms/SimpleSuggestionLearningAlgorithm.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -27,8 +27,8 @@
import org.dllearner.core.LearningAlgorithm;
import org.dllearner.core.ReasonerComponent;
import org.dllearner.core.Score;
-import org.dllearner.core.config.ConfigEntry;
import org.dllearner.core.configurators.SimpleSuggestionLearningAlgorithmConfigurator;
+import org.dllearner.core.options.ConfigEntry;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Individual;
import org.dllearner.core.owl.ObjectProperty;
Modified: trunk/src/dl-learner/org/dllearner/algorithms/el/ELDescriptionTree.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/el/ELDescriptionTree.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/algorithms/el/ELDescriptionTree.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -72,7 +72,7 @@
public ELDescriptionTree(ReasonerComponent rs) {
this.rs = rs;
subsumptionHierarchy = rs.getClassHierarchy();
- roleHierarchy = rs.getRoleHierarchy();
+ roleHierarchy = rs.getObjectPropertyHierarchy();
}
/**
@@ -153,7 +153,7 @@
// we first check inclusion property on edges
ObjectProperty op1 = edges.get(j).getLabel();
ObjectProperty op2 = edges.get(k).getLabel();
- if(rs.getRoleHierarchy().isSubpropertyOf(op1, op2)) {
+ if(rs.getObjectPropertyHierarchy().isSubpropertyOf(op1, op2)) {
ELDescriptionNode node1 = edges.get(j).getTree();
ELDescriptionNode node2 = edges.get(k).getTree();
// check simulation condition
Modified: trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -35,14 +35,14 @@
import org.dllearner.core.LearningProblem;
import org.dllearner.core.ReasonerComponent;
import org.dllearner.core.Score;
-import org.dllearner.core.config.BooleanConfigOption;
-import org.dllearner.core.config.ConfigEntry;
-import org.dllearner.core.config.ConfigOption;
-import org.dllearner.core.config.DoubleConfigOption;
-import org.dllearner.core.config.IntegerConfigOption;
-import org.dllearner.core.config.InvalidConfigOptionValueException;
-import org.dllearner.core.config.StringConfigOption;
import org.dllearner.core.configurators.GPConfigurator;
+import org.dllearner.core.options.BooleanConfigOption;
+import org.dllearner.core.options.ConfigEntry;
+import org.dllearner.core.options.ConfigOption;
+import org.dllearner.core.options.DoubleConfigOption;
+import org.dllearner.core.options.IntegerConfigOption;
+import org.dllearner.core.options.InvalidConfigOptionValueException;
+import org.dllearner.core.options.StringConfigOption;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Thing;
import org.dllearner.learningproblems.PosNegLP;
Modified: trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -35,16 +35,16 @@
import org.dllearner.core.LearningProblem;
import org.dllearner.core.ReasonerComponent;
import org.dllearner.core.Score;
-import org.dllearner.core.config.BooleanConfigOption;
-import org.dllearner.core.config.CommonConfigMappings;
-import org.dllearner.core.config.CommonConfigOptions;
-import org.dllearner.core.config.ConfigEntry;
-import org.dllearner.core.config.ConfigOption;
-import org.dllearner.core.config.DoubleConfigOption;
-import org.dllearner.core.config.IntegerConfigOption;
-import org.dllearner.core.config.InvalidConfigOptionValueException;
-import org.dllearner.core.config.StringConfigOption;
import org.dllearner.core.configurators.ExampleBasedROLComponentConfigurator;
+import org.dllearner.core.options.BooleanConfigOption;
+import org.dllearner.core.options.CommonConfigMappings;
+import org.dllearner.core.options.CommonConfigOptions;
+import org.dllearner.core.options.ConfigEntry;
+import org.dllearner.core.options.ConfigOption;
+import org.dllearner.core.options.DoubleConfigOption;
+import org.dllearner.core.options.IntegerConfigOption;
+import org.dllearner.core.options.InvalidConfigOptionValueException;
+import org.dllearner.core.options.StringConfigOption;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.NamedClass;
import org.dllearner.core.owl.ObjectProperty;
Modified: trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -388,8 +388,8 @@
startNode.setCoveredExamples(positiveExamples, negativeExamples);
} else {
startNode = new ExampleBasedNode(startDescription);
- Set<Individual> coveredNegatives = rs.instanceCheck(startDescription, negativeExamples);
- Set<Individual> coveredPositives = rs.instanceCheck(startDescription, positiveExamples);
+ Set<Individual> coveredNegatives = rs.hasType(startDescription, negativeExamples);
+ Set<Individual> coveredPositives = rs.hasType(startDescription, positiveExamples);
startNode.setCoveredExamples(coveredPositives, coveredNegatives);
}
Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -19,15 +19,15 @@
import org.dllearner.core.LearningProblem;
import org.dllearner.core.ReasonerComponent;
import org.dllearner.core.Score;
-import org.dllearner.core.config.BooleanConfigOption;
-import org.dllearner.core.config.CommonConfigMappings;
-import org.dllearner.core.config.CommonConfigOptions;
-import org.dllearner.core.config.ConfigEntry;
-import org.dllearner.core.config.ConfigOption;
-import org.dllearner.core.config.DoubleConfigOption;
-import org.dllearner.core.config.InvalidConfigOptionValueException;
-import org.dllearner.core.config.StringConfigOption;
import org.dllearner.core.configurators.ROLearnerConfigurator;
+import org.dllearner.core.options.BooleanConfigOption;
+import org.dllearner.core.options.CommonConfigMappings;
+import org.dllearner.core.options.CommonConfigOptions;
+import org.dllearner.core.options.ConfigEntry;
+import org.dllearner.core.options.ConfigOption;
+import org.dllearner.core.options.DoubleConfigOption;
+import org.dllearner.core.options.InvalidConfigOptionValueException;
+import org.dllearner.core.options.StringConfigOption;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Intersection;
import org.dllearner.core.owl.NamedClass;
Modified: trunk/src/dl-learner/org/dllearner/cli/Start.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/cli/Start.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/cli/Start.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -58,15 +58,15 @@
import org.dllearner.core.OntologyFormat;
import org.dllearner.core.ReasonerComponent;
import org.dllearner.core.Score;
-import org.dllearner.core.config.BooleanConfigOption;
-import org.dllearner.core.config.ConfigEntry;
-import org.dllearner.core.config.ConfigOption;
-import org.dllearner.core.config.DoubleConfigOption;
-import org.dllearner.core.config.IntegerConfigOption;
-import org.dllearner.core.config.InvalidConfigOptionValueException;
-import org.dllearner.core.config.StringConfigOption;
-import org.dllearner.core.config.StringSetConfigOption;
-import org.dllearner.core.config.StringTupleListConfigOption;
+import org.dllearner.core.options.BooleanConfigOption;
+import org.dllearner.core.options.ConfigEntry;
+import org.dllearner.core.options.ConfigOption;
+import org.dllearner.core.options.DoubleConfigOption;
+import org.dllearner.core.options.IntegerConfigOption;
+import org.dllearner.core.options.InvalidConfigOptionValueException;
+import org.dllearner.core.options.StringConfigOption;
+import org.dllearner.core.options.StringSetConfigOption;
+import org.dllearner.core.options.StringTupleListConfigOption;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Individual;
import org.dllearner.core.owl.NamedClass;
Modified: trunk/src/dl-learner/org/dllearner/core/BaseReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/BaseReasoner.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/core/BaseReasoner.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -42,6 +42,12 @@
public interface BaseReasoner {
/**
+ * Checks consistency of the knowledge.
+ * @return True if the knowledge base is consistent and false otherwise.
+ */
+ public boolean isSatisfiable();
+
+ /**
* Gets all named classes in the knowledge base, e.g. Person, City, Car.
* @return All named classes in KB.
*/
Modified: trunk/src/dl-learner/org/dllearner/core/Component.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/Component.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/core/Component.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -22,11 +22,11 @@
import java.util.Collection;
import java.util.LinkedList;
-import org.dllearner.core.config.ConfigEntry;
-import org.dllearner.core.config.ConfigOption;
-import org.dllearner.core.config.DoubleConfigOption;
-import org.dllearner.core.config.InvalidConfigOptionValueException;
import org.dllearner.core.configurators.Configurator;
+import org.dllearner.core.options.ConfigEntry;
+import org.dllearner.core.options.ConfigOption;
+import org.dllearner.core.options.DoubleConfigOption;
+import org.dllearner.core.options.InvalidConfigOptionValueException;
/**
* Base class of all components. See also http://dl-learner.org/wiki/Architecture.
Modified: trunk/src/dl-learner/org/dllearner/core/ComponentManager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/ComponentManager.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/core/ComponentManager.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -43,9 +43,9 @@
import org.apache.log4j.Logger;
import org.dllearner.cli.ConfMapper;
-import org.dllearner.core.config.ConfigEntry;
-import org.dllearner.core.config.ConfigOption;
-import org.dllearner.core.config.InvalidConfigOptionValueException;
+import org.dllearner.core.options.ConfigEntry;
+import org.dllearner.core.options.ConfigOption;
+import org.dllearner.core.options.InvalidConfigOptionValueException;
import org.dllearner.utilities.Files;
/**
Modified: trunk/src/dl-learner/org/dllearner/core/ComponentPool.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/ComponentPool.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/core/ComponentPool.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -25,8 +25,8 @@
import java.util.Map;
import org.apache.log4j.Logger;
-import org.dllearner.core.config.ConfigEntry;
-import org.dllearner.core.config.ConfigOption;
+import org.dllearner.core.options.ConfigEntry;
+import org.dllearner.core.options.ConfigOption;
/**
* Stores all live components and the configuration options, which were applied
Modified: trunk/src/dl-learner/org/dllearner/core/IndividualReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/IndividualReasoner.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/core/IndividualReasoner.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -55,6 +55,15 @@
public boolean hasType(Description description, Individual individual);
/**
+ * Performs instance checks on a set of instances (reasoners might be more
+ * efficient than handling each check separately).
+ * @param description An OWL class description.
+ * @param individuals An individual.
+ * @return The subset of those instances, which have the given type.
+ */
+ public SortedSet<Individual> hasType(Description description, Set<Individual> individuals);
+
+ /**
* Gets all instances of a given class description in the knowledge base.
* @param description An OWL class description.
* @return All instances of the class description.
Modified: trunk/src/dl-learner/org/dllearner/core/ReasonerComponent.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/ReasonerComponent.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/core/ReasonerComponent.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -328,15 +328,14 @@
throws ReasoningMethodUnsupportedException {
throw new ReasoningMethodUnsupportedException();
}
-
- // ////// STOPPED HERE //////////
-
- public SortedSet<Individual> instanceCheck(Description concept, Set<Individual> s) {
+
+ @Override
+ public final SortedSet<Individual> hasType(Description concept, Set<Individual> s) {
// logger.debug("instanceCheck "+concept.toKBSyntaxString());
reasoningStartTimeTmp = System.nanoTime();
SortedSet<Individual> result = null;
try {
- result = instanceCheckImpl(concept, s);
+ result = hasTypeImpl(concept, s);
} catch (ReasoningMethodUnsupportedException e) {
handleExceptions(e);
}
@@ -349,164 +348,18 @@
return result;
}
- /**
- * Returns more general concepts in the subsumption hierarchy.
- *
- * @param concept
- * Atomic concept, top, or bottom.
- * @return A set of more general concepts.
- */
- public SortedSet<Description> getMoreGeneralConcepts(Description concept) {
- return getClassHierarchy().getMoreGeneralConcepts(concept);
- }
-
- /**
- * Returns more special concepts in the subsumption hierarchy.
- *
- * @param concept
- * Atomic concept, top, or bottom.
- * @return A set of more special concepts.
- */
- public SortedSet<Description> getMoreSpecialConcepts(Description concept) {
- return getClassHierarchy().getMoreSpecialConcepts(concept);
- }
-
- /**
- * Returns more general concepts in the subsumption hierarchy.
- *
- * @see ObjectPropertyHierarchy#getMoreGeneralRoles(ObjectProperty)
- * @param role
- * Atomic concept, top, or bottom.
- * @return A set of more general concepts.
- */
- public SortedSet<ObjectProperty> getMoreGeneralRoles(ObjectProperty role) {
- return getRoleHierarchy().getMoreGeneralRoles(role);
- }
-
- /**
- * Returns more special concepts in the subsumption hierarchy.
- *
- * @see ObjectPropertyHierarchy#getMoreSpecialRoles(ObjectProperty)
- * @param role
- * Atomic concept, top, or bottom.
- * @return A set of more special concepts.
- */
- public SortedSet<ObjectProperty> getMoreSpecialRoles(ObjectProperty role) {
- return getRoleHierarchy().getMoreSpecialRoles(role);
- }
-
- /**
- * @see ObjectPropertyHierarchy#getMostGeneralRoles()
- * @return The most general roles.
- */
- public TreeSet<ObjectProperty> getMostGeneralRoles() {
- return getRoleHierarchy().getMostGeneralRoles();
- }
-
- /**
- * @see ObjectPropertyHierarchy#getMostSpecialRoles()
- * @return The most special roles.
- */
- public TreeSet<ObjectProperty> getMostSpecialRoles() {
- return getRoleHierarchy().getMostSpecialRoles();
- }
-
- /**
- * Returns more general concepts in the subsumption hierarchy.
- *
- * @see ObjectPropertyHierarchy#getMoreGeneralRoles(ObjectProperty)
- * @param role
- * Atomic concept, top, or bottom.
- * @return A set of more general concepts.
- */
- public SortedSet<DatatypeProperty> getMoreGeneralDatatypeProperties(DatatypeProperty role) {
- return getDatatypePropertyHierarchy().getMoreGeneralRoles(role);
- }
-
- /**
- * Returns more special concepts in the subsumption hierarchy.
- *
- * @see ObjectPropertyHierarchy#getMoreSpecialRoles(ObjectProperty)
- * @param role
- * Atomic concept, top, or bottom.
- * @return A set of more special concepts.
- */
- public SortedSet<DatatypeProperty> getMoreSpecialDatatypeProperties(DatatypeProperty role) {
- return getDatatypePropertyHierarchy().getMoreSpecialRoles(role);
- }
-
- /**
- * @see ObjectPropertyHierarchy#getMostGeneralRoles()
- * @return The most general roles.
- */
- public TreeSet<DatatypeProperty> getMostGeneralDatatypeProperties() {
- return getDatatypePropertyHierarchy().getMostGeneralRoles();
- }
-
- /**
- * @see ObjectPropertyHierarchy#getMostSpecialRoles()
- * @return The most special roles.
- */
- public TreeSet<DatatypeProperty> getMostSpecialDatatypeProperties() {
- return getDatatypePropertyHierarchy().getMostSpecialRoles();
- }
-
- protected ClassHierarchy prepareSubsumptionHierarchy() throws ReasoningMethodUnsupportedException {
- throw new ReasoningMethodUnsupportedException(
- "Subsumption hierarchy creation not supported by this reasoner.");
- }
-
- @Override
- public final ClassHierarchy getClassHierarchy() {
- try {
- if (subsumptionHierarchy == null) {
- subsumptionHierarchy = prepareSubsumptionHierarchy();
- }
-// subsumptionHierarchy = getSubsumptionHierarchyImpl();
- } catch (ReasoningMethodUnsupportedException e) {
- handleExceptions(e);
+ protected SortedSet<Individual> hasTypeImpl(Description concept, Set<Individual> individuals)
+ throws ReasoningMethodUnsupportedException {
+ SortedSet<Individual> returnSet = new TreeSet<Individual>();
+ for (Individual individual : individuals) {
+ if (hasType(concept, individual))
+ returnSet.add(individual);
}
-
- return subsumptionHierarchy;
- }
-
- public ClassHierarchy getSubsumptionHierarchyImpl() throws ReasoningMethodUnsupportedException {
- throw new ReasoningMethodUnsupportedException();
+ return returnSet;
}
-
- protected void prepareRoleHierarchy() throws ReasoningMethodUnsupportedException {
- throw new ReasoningMethodUnsupportedException(
- "Object property hierarchy creation not supported by this reasoner.");
- }
- public ObjectPropertyHierarchy getRoleHierarchy() {
- if (roleHierarchy == null) {
- try {
- prepareRoleHierarchy();
- } catch (ReasoningMethodUnsupportedException e) {
- handleExceptions(e);
- }
- }
- return roleHierarchy;
- }
-
- protected void prepareDatatypePropertyHierarchy() throws ReasoningMethodUnsupportedException {
- throw new ReasoningMethodUnsupportedException(
- "Datatype property hierarchy creation not supported by this reasoner.");
- }
-
- public DatatypePropertyHierarchy getDatatypePropertyHierarchy() {
- if (datatypePropertyHierarchy == null) {
- try {
- prepareDatatypePropertyHierarchy();
- } catch (ReasoningMethodUnsupportedException e) {
- handleExceptions(e);
- }
- }
- return datatypePropertyHierarchy;
- }
-
- public boolean isSatisfiable() {
+ @Override
+ public final boolean isSatisfiable() {
reasoningStartTimeTmp = System.nanoTime();
boolean result;
try {
@@ -521,6 +374,10 @@
return result;
}
+ protected boolean isSatisfiableImpl() throws ReasoningMethodUnsupportedException {
+ throw new ReasoningMethodUnsupportedException();
+ }
+
public Set<Individual> getRelatedIndividuals(Individual individual,
ObjectProperty objectProperty) throws ReasoningMethodUnsupportedException {
try {
@@ -677,92 +534,6 @@
}
}
- public List<NamedClass> getAtomicConceptsList() {
- if (atomicConceptsList == null)
- atomicConceptsList = new LinkedList<NamedClass>(getNamedClasses());
- return atomicConceptsList;
- }
-
- public List<NamedClass> getAtomicConceptsList(boolean removeOWLThing) {
- if (!removeOWLThing) {
- return getAtomicConceptsList();
- } else {
- List<NamedClass> l = new LinkedList<NamedClass>();
- for (NamedClass class1 : getAtomicConceptsList()) {
- if (class1.compareTo(new NamedClass(OWLVocabulary.OWL_NOTHING)) == 0
- || class1.compareTo(new NamedClass(OWLVocabulary.OWL_THING)) == 0) {
- ;// do nothing
- } else {
- l.add(class1);
- }
- }
- return l;
- }
-
- }
-
- public List<ObjectProperty> getAtomicRolesList() {
- if (atomicRolesList == null)
- atomicRolesList = new LinkedList<ObjectProperty>(getObjectProperties());
- return atomicRolesList;
- }
-
- public long getInstanceCheckReasoningTimeNs() {
- return instanceCheckReasoningTimeNs;
- }
-
- public long getRetrievalReasoningTimeNs() {
- return retrievalReasoningTimeNs;
- }
-
- public int getNrOfInstanceChecks() {
- return nrOfInstanceChecks;
- }
-
- public int getNrOfRetrievals() {
- return nrOfRetrievals;
- }
-
- public int getNrOfSubsumptionChecks() {
- return nrOfSubsumptionChecks;
- }
-
- public long getSubsumptionReasoningTimeNs() {
- return subsumptionReasoningTimeNs;
- }
-
- /*
- * public long getSubsumptionHierarchyTimeNs() { return
- * subsumptionHierarchyTimeNs; }
- */
- public int getNrOfSubsumptionHierarchyQueries() {
- return nrOfSubsumptionHierarchyQueries;
- }
-
- public long getOverallReasoningTimeNs() {
- return overallReasoningTimeNs;
- }
-
- public long getTimePerRetrievalNs() {
- return retrievalReasoningTimeNs / nrOfRetrievals;
- }
-
- public long getTimePerInstanceCheckNs() {
- return instanceCheckReasoningTimeNs / nrOfInstanceChecks;
- }
-
- public long getTimePerSubsumptionCheckNs() {
- return subsumptionReasoningTimeNs / nrOfSubsumptionChecks;
- }
-
- public int getNrOfMultiSubsumptionChecks() {
- return nrOfMultiSubsumptionChecks;
- }
-
- public int getNrOfMultiInstanceChecks() {
- return nrOfMultiInstanceChecks;
- }
-
public Set<Individual> getRelatedIndividualsImpl(Individual individual,
ObjectProperty objectProperty) throws ReasoningMethodUnsupportedException {
throw new ReasoningMethodUnsupportedException();
@@ -874,27 +645,16 @@
return ret;
}
- public SortedSet<Individual> instanceCheckImpl(Description concept, Set<Individual> individuals)
- throws ReasoningMethodUnsupportedException {
- SortedSet<Individual> returnSet = new TreeSet<Individual>();
- for (Individual individual : individuals) {
- if (hasType(concept, individual))
- returnSet.add(individual);
- }
- return returnSet;
- }
public SortedSetTuple<Individual> doubleRetrievalImpl(Description concept, Description adc)
throws ReasoningMethodUnsupportedException {
throw new ReasoningMethodUnsupportedException();
}
- public boolean isSatisfiableImpl() throws ReasoningMethodUnsupportedException {
- throw new ReasoningMethodUnsupportedException();
- }
+
public void prepareRoleHierarchyImpl(Set<ObjectProperty> allowedRoles)
throws ReasoningMethodUnsupportedException {
throw new ReasoningMethodUnsupportedException();
@@ -957,6 +717,199 @@
public Set<NamedClass> getInconsistentClassesImpl() throws ReasoningMethodUnsupportedException {
throw new ReasoningMethodUnsupportedException();
+ }
+
+ @Override
+ public final SortedSet<Description> getSuperClasses(Description concept) {
+ return getClassHierarchy().getMoreGeneralConcepts(concept);
}
+ @Override
+ public final SortedSet<Description> getSubClasses(Description concept) {
+ return getClassHierarchy().getMoreSpecialConcepts(concept);
+ }
+
+ @Override
+ public final SortedSet<ObjectProperty> getSuperProperties(ObjectProperty role) {
+ return getObjectPropertyHierarchy().getMoreGeneralRoles(role);
+ }
+
+ @Override
+ public final SortedSet<ObjectProperty> getSubProperties(ObjectProperty role) {
+ return getObjectPropertyHierarchy().getMoreSpecialRoles(role);
+ }
+
+ @Override
+ public final TreeSet<ObjectProperty> getMostGeneralProperties() {
+ return getObjectPropertyHierarchy().getMostGeneralRoles();
+ }
+
+ @Override
+ public final TreeSet<ObjectProperty> getMostSpecialProperties() {
+ return getObjectPropertyHierarchy().getMostSpecialRoles();
+ }
+
+ @Override
+ public final SortedSet<DatatypeProperty> getSuperProperties(DatatypeProperty role) {
+ return getDatatypePropertyHierarchy().getMoreGeneralRoles(role);
+ }
+
+ @Override
+ public final SortedSet<DatatypeProperty> getSubProperties(DatatypeProperty role) {
+ return getDatatypePropertyHierarchy().getMoreSpecialRoles(role);
+ }
+
+ @Override
+ public final TreeSet<DatatypeProperty> getMostGeneralDatatypeProperties() {
+ return getDatatypePropertyHierarchy().getMostGeneralRoles();
+ }
+
+ @Override
+ public final TreeSet<DatatypeProperty> getMostSpecialDatatypeProperties() {
+ return getDatatypePropertyHierarchy().getMostSpecialRoles();
+ }
+
+ protected ClassHierarchy prepareSubsumptionHierarchy() throws ReasoningMethodUnsupportedException {
+ throw new ReasoningMethodUnsupportedException(
+ "Subsumption hierarchy creation not supported by this reasoner.");
+ }
+
+ @Override
+ public final ClassHierarchy getClassHierarchy() {
+ try {
+ if (subsumptionHierarchy == null) {
+ subsumptionHierarchy = prepareSubsumptionHierarchy();
+ }
+// subsumptionHierarchy = getSubsumptionHierarchyImpl();
+ } catch (ReasoningMethodUnsupportedException e) {
+ handleExceptions(e);
+ }
+
+ return subsumptionHierarchy;
+ }
+
+// public ClassHierarchy getSubsumptionHierarchyImpl() throws ReasoningMethodUnsupportedException {
+// throw new ReasoningMethodUnsupportedException();
+// }
+
+ protected ObjectPropertyHierarchy prepareRoleHierarchy() throws ReasoningMethodUnsupportedException {
+ throw new ReasoningMethodUnsupportedException(
+ "Object property hierarchy creation not supported by this reasoner.");
+ }
+
+ @Override
+ public final ObjectPropertyHierarchy getObjectPropertyHierarchy() {
+ if (roleHierarchy == null) {
+ try {
+ prepareRoleHierarchy();
+ } catch (ReasoningMethodUnsupportedException e) {
+ handleExceptions(e);
+ }
+ }
+ return roleHierarchy;
+ }
+
+ protected DatatypePropertyHierarchy prepareDatatypePropertyHierarchy() throws ReasoningMethodUnsupportedException {
+ throw new ReasoningMethodUnsupportedException(
+ "Datatype property hierarchy creation not supported by this reasoner.");
+ }
+
+ @Override
+ public final DatatypePropertyHierarchy getDatatypePropertyHierarchy() {
+ if (datatypePropertyHierarchy == null) {
+ try {
+ prepareDatatypePropertyHierarchy();
+ } catch (ReasoningMethodUnsupportedException e) {
+ handleExceptions(e);
+ }
+ }
+ return datatypePropertyHierarchy;
+ }
+
+ public List<NamedClass> getAtomicConceptsList() {
+ if (atomicConceptsList == null)
+ atomicConceptsList = new LinkedList<NamedClass>(getNamedClasses());
+ return atomicConceptsList;
+ }
+
+ public List<NamedClass> getAtomicConceptsList(boolean removeOWLThing) {
+ if (!removeOWLThing) {
+ return getAtomicConceptsList();
+ } else {
+ List<NamedClass> l = new LinkedList<NamedClass>();
+ for (NamedClass class1 : getAtomicConceptsList()) {
+ if (class1.compareTo(new NamedClass(OWLVocabulary.OWL_NOTHING)) == 0
+ || class1.compareTo(new NamedClass(OWLVocabulary.OWL_THING)) == 0) {
+ ;// do nothing
+ } else {
+ l.add(class1);
+ }
+ }
+ return l;
+ }
+
+ }
+
+ public List<ObjectProperty> getAtomicRolesList() {
+ if (atomicRolesList == null)
+ atomicRolesList = new LinkedList<ObjectProperty>(getObjectProperties());
+ return atomicRolesList;
+ }
+
+ public long getInstanceCheckReasoningTimeNs() {
+ return instanceCheckReasoningTimeNs;
+ }
+
+ public long getRetrievalReasoningTimeNs() {
+ return retrievalReasoningTimeNs;
+ }
+
+ public int getNrOfInstanceChecks() {
+ return nrOfInstanceChecks;
+ }
+
+ public int getNrOfRetrievals() {
+ return nrOfRetrievals;
+ }
+
+ public int getNrOfSubsumptionChecks() {
+ return nrOfSubsumptionChecks;
+ }
+
+ public long getSubsumptionReasoningTimeNs() {
+ return subsumptionReasoningTimeNs;
+ }
+
+ /*
+ * public long getSubsumptionHierarchyTimeNs() { return
+ * subsumptionHierarchyTimeNs; }
+ */
+ public int getNrOfSubsumptionHierarchyQueries() {
+ return nrOfSubsumptionHierarchyQueries;
+ }
+
+ public long getOverallReasoningTimeNs() {
+ return overallReasoningTimeNs;
+ }
+
+ public long getTimePerRetrievalNs() {
+ return retrievalReasoningTimeNs / nrOfRetrievals;
+ }
+
+ public long getTimePerInstanceCheckNs() {
+ return instanceCheckReasoningTimeNs / nrOfInstanceChecks;
+ }
+
+ public long getTimePerSubsumptionCheckNs() {
+ return subsumptionReasoningTimeNs / nrOfSubsumptionChecks;
+ }
+
+ public int getNrOfMultiSubsumptionChecks() {
+ return nrOfMultiSubsumptionChecks;
+ }
+
+ public int getNrOfMultiInstanceChecks() {
+ return nrOfMultiInstanceChecks;
+ }
+
}
Modified: trunk/src/dl-learner/org/dllearner/core/SchemaReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/SchemaReasoner.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/core/SchemaReasoner.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -20,9 +20,15 @@
package org.dllearner.core;
import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import org.dllearner.core.owl.DatatypeProperty;
+import org.dllearner.core.owl.DatatypePropertyHierarchy;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.ClassHierarchy;
+import org.dllearner.core.owl.ObjectProperty;
+import org.dllearner.core.owl.ObjectPropertyHierarchy;
/**
* Reasoning requests related to the schema of the knowledge base.
@@ -31,13 +37,6 @@
*
*/
public interface SchemaReasoner {
-
- /**
- * Computes and returns the class hierarchy of the knowledge base.
- *
- * @return The subsumption hierarchy of this knowledge base.
- */
- public ClassHierarchy getClassHierarchy();
/**
* Checks whether <code>superClass</code> is a super class of <code>subClass</code>.
@@ -55,4 +54,107 @@
*/
public Set<Description> isSuperClassOf(Set<Description> superClasses, Description subClasses);
+ /**
+ * Computes and returns the class hierarchy of the knowledge base.
+ *
+ * @return The subsumption hierarchy of this knowledge base.
+ */
+ public ClassHierarchy getClassHierarchy();
+
+ /**
+ * Returns more general concepts in the subsumption hierarchy.
+ *
+ * @param description
+ * Atomic concept, top, or bottom.
+ * @return A set of more general concepts.
+ */
+ public SortedSet<Description> getSuperClasses(Description description);
+
+ /**
+ * Returns more special concepts in the subsumption hierarchy.
+ *
+ * @param description
+ * Atomic concept, top, or bottom.
+ * @return A set of more special concepts.
+ */
+ public SortedSet<Description> getSubClasses(Description description);
+
+ /**
+ * Computes and returns the object property hierarchy of the knowledge base.
+ * @return The object property hierarchy of the knowlege base.
+ */
+ public ObjectPropertyHierarchy getObjectPropertyHierarchy();
+
+ /**
+ * Returns more general concepts in the subsumption hierarchy.
+ *
+ * @see ObjectPropertyHierarchy#getMoreGeneralRoles(ObjectProperty)
+ * @param objectProperty
+ * Atomic concept, top, or bottom.
+ * @return A set of more general concepts.
+ */
+ public SortedSet<ObjectProperty> getSuperProperties(ObjectProperty objectProperty);
+
+ /**
+ * Returns more special concepts in the subsumption hierarchy.
+ *
+ * @see ObjectPropertyHierarchy#getMoreSpecialRoles(ObjectProperty)
+ * @param objectProperty
+ * Atomic concept, top, or bottom.
+ * @return A set of more special concepts.
+ */
+ public SortedSet<ObjectProperty> getSubProperties(ObjectProperty objectProperty);
+
+ /**
+ * TODO Outdated in OWL 2, because the universal role is the most general.
+ * @see ObjectPropertyHierarchy#getMostGeneralRoles()
+ * @return The most general roles.
+ */
+ public TreeSet<ObjectProperty> getMostGeneralProperties();
+
+ /**
+ * TODO Outdated in OWL, because the bottom role is the most specific.
+ * @see ObjectPropertyHierarchy#getMostSpecialRoles()
+ * @return The most special roles.
+ */
+ public TreeSet<ObjectProperty> getMostSpecialProperties();
+
+ /**
+ * Computes and returns the data property hierarchy of the knowledge base.
+ * @return The data property hierarchy of the knowlege base.
+ */
+ public DatatypePropertyHierarchy getDatatypePropertyHierarchy();
+
+ /**
+ * Returns more general concepts in the subsumption hierarchy.
+ *
+ * @see ObjectPropertyHierarchy#getMoreGeneralRoles(ObjectProperty)
+ * @param dataProperty
+ * Atomic concept, top, or bottom.
+ * @return A set of more general concepts.
+ */
+ public SortedSet<DatatypeProperty> getSuperProperties(DatatypeProperty dataProperty);
+
+ /**
+ * Returns more special concepts in the subsumption hierarchy.
+ *
+ * @see ObjectPropertyHierarchy#getMoreSpecialRoles(ObjectProperty)
+ * @param dataProperty
+ * Atomic concept, top, or bottom.
+ * @return A set of more special concepts.
+ */
+ public SortedSet<DatatypeProperty> getSubProperties(DatatypeProperty dataProperty);
+
+ /**
+ * @see ObjectPropertyHierarchy#getMostGeneralRoles()
+ * @return The most general roles.
+ */
+ public TreeSet<DatatypeProperty> getMostGeneralDatatypeProperties();
+
+ /**
+ * @see ObjectPropertyHierarchy#getMostSpecialRoles()
+ * @return The most special roles.
+ */
+ public TreeSet<DatatypeProperty> getMostSpecialDatatypeProperties();
+
}
Modified: trunk/src/dl-learner/org/dllearner/core/options/BooleanConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/BooleanConfigOption.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/core/options/BooleanConfigOption.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.dllearner.core.config;
+package org.dllearner.core.options;
/**
Modified: trunk/src/dl-learner/org/dllearner/core/options/CommonConfigMappings.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/CommonConfigMappings.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/core/options/CommonConfigMappings.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.dllearner.core.config;
+package org.dllearner.core.options;
import java.util.Set;
import java.util.SortedSet;
Modified: trunk/src/dl-learner/org/dllearner/core/options/CommonConfigOptions.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/CommonConfigOptions.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/core/options/CommonConfigOptions.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.dllearner.core.config;
+package org.dllearner.core.options;
Modified: trunk/src/dl-learner/org/dllearner/core/options/ConfigEntry.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/ConfigEntry.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/core/options/ConfigEntry.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.dllearner.core.config;
+package org.dllearner.core.options;
/**
* A config entry is a configuration option and a value for the option.
Modified: trunk/src/dl-learner/org/dllearner/core/options/ConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/ConfigOption.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/core/options/ConfigOption.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.dllearner.core.config;
+package org.dllearner.core.options;
import java.util.SortedSet;
import java.util.TreeSet;
Modified: trunk/src/dl-learner/org/dllearner/core/options/DoubleConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/DoubleConfigOption.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/core/options/DoubleConfigOption.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.dllearner.core.config;
+package org.dllearner.core.options;
/**
Modified: trunk/src/dl-learner/org/dllearner/core/options/IntegerConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/IntegerConfigOption.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/core/options/IntegerConfigOption.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.dllearner.core.config;
+package org.dllearner.core.options;
/**
Modified: trunk/src/dl-learner/org/dllearner/core/options/InvalidConfigOptionValueException.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/InvalidConfigOptionValueException.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/core/options/InvalidConfigOptionValueException.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.dllearner.core.config;
+package org.dllearner.core.options;
/**
Modified: trunk/src/dl-learner/org/dllearner/core/options/StringConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/StringConfigOption.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/core/options/StringConfigOption.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.dllearner.core.config;
+package org.dllearner.core.options;
import java.util.Arrays;
import java.util.Set;
Modified: trunk/src/dl-learner/org/dllearner/core/options/StringSetConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/StringSetConfigOption.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/core/options/StringSetConfigOption.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.dllearner.core.config;
+package org.dllearner.core.options;
import java.util.Set;
import java.util.SortedSet;
Modified: trunk/src/dl-learner/org/dllearner/core/options/StringTupleListConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/StringTupleListConfigOption.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/core/options/StringTupleListConfigOption.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.dllearner.core.config;
+package org.dllearner.core.options;
import java.util.List;
import java.util.SortedSet;
Modified: trunk/src/dl-learner/org/dllearner/core/options/URLConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/URLConfigOption.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/core/options/URLConfigOption.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.dllearner.core.config;
+package org.dllearner.core.options;
import java.net.URL;
import java.util.SortedSet;
Modified: trunk/src/dl-learner/org/dllearner/core/options/UnknownConfigOptionException.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/UnknownConfigOptionException.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/core/options/UnknownConfigOptionException.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
-package org.dllearner.core.config;
+package org.dllearner.core.options;
import org.dllearner.core.Component;
import org.dllearner.core.ComponentManager;
Modified: trunk/src/dl-learner/org/dllearner/gui/Config.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -36,8 +36,8 @@
import org.dllearner.core.LearningProblem;
import org.dllearner.core.LearningProblemUnsupportedException;
import org.dllearner.core.ReasonerComponent;
-import org.dllearner.core.config.ConfigEntry;
-import org.dllearner.core.config.ConfigOption;
+import org.dllearner.core.options.ConfigEntry;
+import org.dllearner.core.options.ConfigOption;
import org.dllearner.kb.KBFile;
import org.dllearner.kb.OWLFile;
import org.dllearner.kb.sparql.SparqlKnowledgeSource;
Modified: trunk/src/dl-learner/org/dllearner/gui/ConfigSave.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/ConfigSave.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/gui/ConfigSave.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -33,9 +33,9 @@
import org.dllearner.core.LearningAlgorithm;
import org.dllearner.core.LearningProblem;
import org.dllearner.core.ReasonerComponent;
-import org.dllearner.core.config.ConfigEntry;
-import org.dllearner.core.config.ConfigOption;
-import org.dllearner.core.config.InvalidConfigOptionValueException;
+import org.dllearner.core.options.ConfigEntry;
+import org.dllearner.core.options.ConfigOption;
+import org.dllearner.core.options.InvalidConfigOptionValueException;
import org.dllearner.kb.KBFile;
import org.dllearner.kb.OWLFile;
import org.dllearner.kb.sparql.SparqlKnowledgeSource;
Modified: trunk/src/dl-learner/org/dllearner/gui/OptionPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/OptionPanel.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/gui/OptionPanel.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -31,7 +31,7 @@
import org.dllearner.core.Component;
import org.dllearner.core.ComponentManager;
-import org.dllearner.core.config.*;
+import org.dllearner.core.options.*;
import org.dllearner.gui.widgets.WidgetPanelBoolean;
import org.dllearner.gui.widgets.WidgetPanelDefault;
import org.dllearner.gui.widgets.WidgetPanelDouble;
Modified: trunk/src/dl-learner/org/dllearner/gui/widgets/AbstractWidgetPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/widgets/AbstractWidgetPanel.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/gui/widgets/AbstractWidgetPanel.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -23,9 +23,9 @@
import javax.swing.JPanel;
import org.dllearner.core.Component;
-import org.dllearner.core.config.ConfigEntry;
-import org.dllearner.core.config.ConfigOption;
-import org.dllearner.core.config.InvalidConfigOptionValueException;
+import org.dllearner.core.options.ConfigEntry;
+import org.dllearner.core.options.ConfigOption;
+import org.dllearner.core.options.InvalidConfigOptionValueException;
import org.dllearner.gui.Config;
/**
Modified: trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelBoolean.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelBoolean.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelBoolean.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -25,12 +25,12 @@
import javax.swing.JComboBox;
import org.dllearner.core.Component;
-import org.dllearner.core.config.BooleanConfigOption;
+import org.dllearner.core.options.BooleanConfigOption;
import org.dllearner.gui.Config;
/**
* Panel for option Boolean, defined in
- * {@link org.dllearner.core.config.BooleanConfigOption}.
+ * {@link org.dllearner.core.options.BooleanConfigOption}.
*
* @author Jens Lehmann
* @author Tilo Hielscher
Modified: trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelDefault.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelDefault.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelDefault.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -24,7 +24,7 @@
import javax.swing.JLabel;
import org.dllearner.core.Component;
-import org.dllearner.core.config.ConfigOption;
+import org.dllearner.core.options.ConfigOption;
import org.dllearner.gui.Config;
/**
Modified: trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelDouble.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelDouble.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelDouble.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -28,12 +28,12 @@
import javax.swing.JTextField;
import org.dllearner.core.Component;
-import org.dllearner.core.config.DoubleConfigOption;
+import org.dllearner.core.options.DoubleConfigOption;
import org.dllearner.gui.Config;
/**
* Panel for option Double, defined in
- * {@link org.dllearner.core.config.DoubleConfigOption}.
+ * {@link org.dllearner.core.options.DoubleConfigOption}.
*
* @author Tilo Hielscher
*
Modified: trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelInteger.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelInteger.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelInteger.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -28,7 +28,7 @@
import javax.swing.JTextField;
import org.dllearner.core.Component;
-import org.dllearner.core.config.IntegerConfigOption;
+import org.dllearner.core.options.IntegerConfigOption;
import org.dllearner.gui.Config;
/**
Modified: trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelString.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelString.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelString.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -27,12 +27,12 @@
import javax.swing.JTextField;
import org.dllearner.core.Component;
-import org.dllearner.core.config.StringConfigOption;
+import org.dllearner.core.options.StringConfigOption;
import org.dllearner.gui.Config;
/**
* Panel for option String, defined in
- * {@link org.dllearner.core.config.StringConfigOption}.
+ * {@link org.dllearner.core.options.StringConfigOption}.
*
* @author Jens Lehmann
* @author Tilo Hielscher
Modified: trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelStringSet.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelStringSet.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelStringSet.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -38,7 +38,7 @@
import javax.swing.JTextField;
import org.dllearner.core.Component;
-import org.dllearner.core.config.StringSetConfigOption;
+import org.dllearner.core.options.StringSetConfigOption;
import org.dllearner.core.owl.Individual;
import org.dllearner.core.owl.NamedClass;
import org.dllearner.core.owl.ObjectProperty;
Modified: trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelStringTupleList.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelStringTupleList.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelStringTupleList.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -38,7 +38,7 @@
import javax.swing.JTextField;
import org.dllearner.core.Component;
-import org.dllearner.core.config.StringTupleListConfigOption;
+import org.dllearner.core.options.StringTupleListConfigOption;
import org.dllearner.gui.Config;
import org.dllearner.utilities.datastructures.StringTuple;
Modified: trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelURL.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelURL.java 2008-11-10 18:09:19 UTC (rev 1504)
+++ trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelURL.java 2008-11-11 10:59:23 UTC (rev 1505)
@@ -30,7 +30,7 @@
import javax.swing.JTextField;
import org.dllearner.core.Component;
-import org.dllearner.core.config.URLConfigOption;
+import org.dllearner.core.options.URLConfigOption;
import org.dllearner.gui.Config;
import org.dllearner.gui.ExampleFileChooser;
import org.dllearner.kb.OWLFile;
Modified: trunk/src/dl-learner/org/dllearner/kb/KBFile.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/KBFile....
[truncated message content] |
