Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[2987] trunk
|
From: <jen...@us...> - 2011-08-04 10:05:07
|
Revision: 2987
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2987&view=rev
Author: jenslehmann
Date: 2011-08-04 10:04:56 +0000 (Thu, 04 Aug 2011)
Log Message:
-----------
created interfaces for the four base components and refactored their current implementations
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/ELDescriptionTree.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/gp/GPUtilities.java
trunk/components-core/src/main/java/org/dllearner/algorithms/hybridgp/Psi.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/ocel/ROLearner2.java
trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/SubsumptionComparator.java
trunk/components-core/src/main/java/org/dllearner/algorithms/properties/DisjointPropertyAxiomLearner.java
trunk/components-core/src/main/java/org/dllearner/algorithms/properties/EquivalentPropertyAxiomLearner.java
trunk/components-core/src/main/java/org/dllearner/algorithms/properties/FunctionalPropertyAxiomLearner.java
trunk/components-core/src/main/java/org/dllearner/algorithms/properties/PropertyDomainAxiomLearner.java
trunk/components-core/src/main/java/org/dllearner/algorithms/properties/PropertyRangeAxiomLearner.java
trunk/components-core/src/main/java/org/dllearner/algorithms/properties/ReflexivePropertyAxiomLearner.java
trunk/components-core/src/main/java/org/dllearner/algorithms/properties/SubPropertyOfAxiomLearner.java
trunk/components-core/src/main/java/org/dllearner/algorithms/properties/SymmetricPropertyAxiomLearner.java
trunk/components-core/src/main/java/org/dllearner/algorithms/properties/TransitivePropertyAxiomLearner.java
trunk/components-core/src/main/java/org/dllearner/algorithms/refinement/ROLearner.java
trunk/components-core/src/main/java/org/dllearner/core/AbstractCELA.java
trunk/components-core/src/main/java/org/dllearner/core/Component.java
trunk/components-core/src/main/java/org/dllearner/core/ComponentManager.java
trunk/components-core/src/main/java/org/dllearner/core/ComponentPool.java
trunk/components-core/src/main/java/org/dllearner/core/KnowledgeSource.java
trunk/components-core/src/main/java/org/dllearner/core/LearningAlgorithm.java
trunk/components-core/src/main/java/org/dllearner/core/LearningProblem.java
trunk/components-core/src/main/java/org/dllearner/core/LearningProblemUnsupportedException.java
trunk/components-core/src/main/java/org/dllearner/core/ReasonerComponent.java
trunk/components-core/src/main/java/org/dllearner/core/Score.java
trunk/components-core/src/main/java/org/dllearner/core/config/ConfigHelper.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/BruteForceLearnerConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/CELOEConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/ClassLearningProblemConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/ComponentFactory.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/DIGReasonerConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/ELLearningAlgorithmConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/ELLearningAlgorithmDisjunctiveConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/FastInstanceCheckerConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/FastRetrievalReasonerConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/FuzzyCELOEConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/FuzzyOWLAPIReasonerConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/FuzzyPosNegLPStandardConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/GPConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/ISLEConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/OCELConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/OWLAPIReasonerConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/PelletReasonerConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/PosNegLPStandardConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/PosNegLPStrictConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/PosOnlyLPConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/ProtegeReasonerConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/ROLearnerConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/configurators/RandomGuesserConfigurator.java
trunk/components-core/src/main/java/org/dllearner/core/options/UnknownConfigOptionException.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/SparqlEndpointKS.java
trunk/components-core/src/main/java/org/dllearner/kb/sparql/NaturalLanguageDescriptionConvertVisitor.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/PosNegLP.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/FuzzyPosNegLP.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/refinementoperators/ELDown.java
trunk/components-core/src/main/java/org/dllearner/refinementoperators/ELDown2.java
trunk/components-core/src/main/java/org/dllearner/refinementoperators/PsiDown.java
trunk/components-core/src/main/java/org/dllearner/refinementoperators/PsiUp.java
trunk/components-core/src/main/java/org/dllearner/refinementoperators/RhoDRDown.java
trunk/components-core/src/main/java/org/dllearner/refinementoperators/RhoDown.java
trunk/components-core/src/main/java/org/dllearner/refinementoperators/Utility.java
trunk/components-core/src/main/java/org/dllearner/refinementoperators/fuzzydll/FuzzyRhoDRDown.java
trunk/components-core/src/main/java/org/dllearner/utilities/Helper.java
trunk/components-core/src/main/java/org/dllearner/utilities/components/ComponentCombo.java
trunk/components-core/src/main/java/org/dllearner/utilities/components/ReasonerComponentFactory.java
trunk/components-core/src/main/java/org/dllearner/utilities/datastructures/DescriptionSubsumptionTree.java
trunk/components-core/src/main/java/org/dllearner/utilities/examples/AutomaticNegativeExampleFinderOWL.java
trunk/components-core/src/main/java/org/dllearner/utilities/examples/AutomaticPositiveExampleFinderOWL.java
trunk/components-core/src/main/java/org/dllearner/utilities/examples/ExampleDataCollector.java
trunk/components-core/src/main/java/org/dllearner/utilities/learn/LearnConfiguration.java
trunk/components-core/src/main/java/org/dllearner/utilities/learn/LearnOWLFileConfiguration.java
trunk/components-core/src/main/java/org/dllearner/utilities/learn/LearnSPARQLConfiguration.java
trunk/components-core/src/main/java/org/dllearner/utilities/learn/UsedEntitiesDetection.java
trunk/components-core/src/main/java/org/dllearner/utilities/owl/ConceptTransformation.java
trunk/components-core/src/main/java/org/dllearner/utilities/owl/DescriptionMinimizer.java
trunk/components-core/src/main/java/org/dllearner/utilities/owl/EvaluatedDescriptionSet.java
trunk/components-core/src/main/java/org/dllearner/utilities/owl/OntologyCloser.java
trunk/components-core/src/test/java/org/dllearner/test/ClassCastExceptionTest.java
trunk/components-core/src/test/java/org/dllearner/test/ComponentTest.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
trunk/components-core/src/test/java/org/dllearner/test/SworeTest.java
trunk/components-core/src/test/java/org/dllearner/test/junit/ClassExpressionTests.java
trunk/components-core/src/test/java/org/dllearner/test/junit/ComponentTests.java
trunk/components-core/src/test/java/org/dllearner/test/junit/ELDescriptionTreeTests.java
trunk/components-core/src/test/java/org/dllearner/test/junit/ELDownTests.java
trunk/components-core/src/test/java/org/dllearner/test/junit/HeuristicTests.java
trunk/components-core/src/test/java/org/dllearner/test/junit/RefinementOperatorTests.java
trunk/components-core/src/test/java/org/dllearner/test/junit/SimulationTests.java
trunk/components-core/src/test/java/org/dllearner/test/junit/TestOntologies.java
trunk/components-core/src/test/java/org/dllearner/test/junit/UtilitiesTests.java
trunk/components-ext/src/main/java/org/dllearner/algorithm/qtl/QTL.java
trunk/interfaces/src/main/java/org/dllearner/cli/ConfMapper.java
trunk/interfaces/src/main/java/org/dllearner/cli/DocumentationGenerator.java
trunk/interfaces/src/main/java/org/dllearner/cli/Start.java
trunk/interfaces/src/main/java/org/dllearner/gui/ComponentPanel.java
trunk/interfaces/src/main/java/org/dllearner/gui/Config.java
trunk/interfaces/src/main/java/org/dllearner/gui/ConfigSave.java
trunk/interfaces/src/main/java/org/dllearner/gui/InitWorker.java
trunk/interfaces/src/main/java/org/dllearner/gui/MiniGUI.java
trunk/interfaces/src/main/java/org/dllearner/gui/OptionPanel.java
trunk/interfaces/src/main/java/org/dllearner/gui/StartGUI.java
trunk/interfaces/src/main/java/org/dllearner/gui/widgets/AbstractWidgetPanel.java
trunk/interfaces/src/main/java/org/dllearner/gui/widgets/WidgetPanelBoolean.java
trunk/interfaces/src/main/java/org/dllearner/gui/widgets/WidgetPanelDefault.java
trunk/interfaces/src/main/java/org/dllearner/gui/widgets/WidgetPanelDouble.java
trunk/interfaces/src/main/java/org/dllearner/gui/widgets/WidgetPanelInteger.java
trunk/interfaces/src/main/java/org/dllearner/gui/widgets/WidgetPanelString.java
trunk/interfaces/src/main/java/org/dllearner/gui/widgets/WidgetPanelStringSet.java
trunk/interfaces/src/main/java/org/dllearner/gui/widgets/WidgetPanelStringTupleList.java
trunk/interfaces/src/main/java/org/dllearner/gui/widgets/WidgetPanelURL.java
trunk/interfaces/src/main/java/org/dllearner/server/ClientState.java
trunk/interfaces/src/main/java/org/dllearner/server/DLLearnerWS.java
trunk/interfaces/src/main/java/org/dllearner/server/nke/Learner.java
trunk/interfaces/src/test/java/org/dllearner/test/junit/OWLlinkTest.java
trunk/interfaces/src/test/java/org/dllearner/test/junit/ReasonerTests.java
trunk/protege/src/main/java/org/dllearner/tools/protege/Manager.java
trunk/protege/src/test/java/Test.java
trunk/scripts/src/main/java/org/dllearner/examples/KRKModular.java
trunk/scripts/src/main/java/org/dllearner/examples/pdb/HelixRDFCreator.java
trunk/scripts/src/main/java/org/dllearner/scripts/CloseOntology.java
trunk/scripts/src/main/java/org/dllearner/scripts/ConfigJavaGenerator.java
trunk/scripts/src/main/java/org/dllearner/scripts/CrossValidation.java
trunk/scripts/src/main/java/org/dllearner/scripts/DumbLPFinder.java
trunk/scripts/src/main/java/org/dllearner/scripts/NestedCrossValidation.java
trunk/scripts/src/main/java/org/dllearner/scripts/NewSample.java
trunk/scripts/src/main/java/org/dllearner/scripts/OWLAPIReasonerIncremental.java
trunk/scripts/src/main/java/org/dllearner/scripts/PaperStatistics.java
trunk/scripts/src/main/java/org/dllearner/scripts/RoleLearning.java
trunk/scripts/src/main/java/org/dllearner/scripts/Sample.java
trunk/scripts/src/main/java/org/dllearner/scripts/SemanticBible.java
trunk/scripts/src/main/java/org/dllearner/scripts/SemanticBibleComparison.java
trunk/scripts/src/main/java/org/dllearner/scripts/TestValidation.java
trunk/scripts/src/main/java/org/dllearner/scripts/WikipediaCategoryCleaner.java
trunk/scripts/src/main/java/org/dllearner/scripts/evaluation/ELOperatorBenchmark.java
trunk/scripts/src/main/java/org/dllearner/scripts/evaluation/EnrichmentEvaluation.java
trunk/scripts/src/main/java/org/dllearner/scripts/evaluation/EvaluationComputingScript.java
trunk/scripts/src/main/java/org/dllearner/scripts/evaluation/OntologyEngineering.java
trunk/scripts/src/main/java/org/dllearner/scripts/improveWikipedia/DBpediaClassLearnerCELOE.java
trunk/scripts/src/main/java/org/dllearner/scripts/matching/LearnOSMClasses.java
trunk/scripts/src/main/java/org/dllearner/scripts/matching/Stanley.java
trunk/scripts/src/main/java/org/dllearner/scripts/tiger/TestIterativeLearning.java
Added Paths:
-----------
trunk/components-core/src/main/java/org/dllearner/core/AbstractComponent.java
trunk/components-core/src/main/java/org/dllearner/core/AbstractKnowledgeSource.java
trunk/components-core/src/main/java/org/dllearner/core/AbstractLearningProblem.java
trunk/components-core/src/main/java/org/dllearner/core/AbstractReasonerComponent.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-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/BruteForceLearner.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -27,8 +27,8 @@
import java.util.Map;
import org.dllearner.core.AbstractCELA;
-import org.dllearner.core.LearningProblem;
-import org.dllearner.core.ReasonerComponent;
+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;
@@ -66,8 +66,8 @@
}
- private LearningProblem learningProblem;
- private ReasonerComponent rs;
+ private AbstractLearningProblem learningProblem;
+ private AbstractReasonerComponent rs;
private Description bestDefinition;
private ScorePosNeg bestScore;
@@ -82,7 +82,7 @@
// list of all generated concepts sorted by length
private Map<Integer,List<Description>> generatedDefinitions = new HashMap<Integer,List<Description>>();
- public BruteForceLearner(LearningProblem learningProblem, ReasonerComponent rs) {
+ public BruteForceLearner(AbstractLearningProblem learningProblem, AbstractReasonerComponent rs) {
super(learningProblem, rs);
this.learningProblem = learningProblem;
this.rs = rs;
@@ -93,9 +93,9 @@
return "brute force learning algorithm";
}
- public static Collection<Class<? extends LearningProblem>> supportedLearningProblems() {
- Collection<Class<? extends LearningProblem>> problems = new LinkedList<Class<? extends LearningProblem>>();
- problems.add(LearningProblem.class);
+ public static Collection<Class<? extends AbstractLearningProblem>> supportedLearningProblems() {
+ Collection<Class<? extends AbstractLearningProblem>> problems = new LinkedList<Class<? extends AbstractLearningProblem>>();
+ problems.add(AbstractLearningProblem.class);
return problems;
}
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-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/RandomGuesser.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -26,8 +26,8 @@
import org.dllearner.algorithms.gp.GPUtilities;
import org.dllearner.core.EvaluatedDescription;
import org.dllearner.core.AbstractCELA;
-import org.dllearner.core.LearningProblem;
-import org.dllearner.core.ReasonerComponent;
+import org.dllearner.core.AbstractLearningProblem;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.Score;
import org.dllearner.core.configurators.RandomGuesserConfigurator;
import org.dllearner.core.options.ConfigEntry;
@@ -67,7 +67,7 @@
private static Logger logger = Logger.getLogger(RandomGuesser.class);
- public RandomGuesser(LearningProblem learningProblem, ReasonerComponent rs) {
+ public RandomGuesser(AbstractLearningProblem learningProblem, AbstractReasonerComponent rs) {
super(learningProblem, rs);
this.configurator = new RandomGuesserConfigurator(this);
}
@@ -76,9 +76,9 @@
return "random guesser learning algorithm";
}
- public static Collection<Class<? extends LearningProblem>> supportedLearningProblems() {
- Collection<Class<? extends LearningProblem>> problems = new LinkedList<Class<? extends LearningProblem>>();
- problems.add(LearningProblem.class);
+ public static Collection<Class<? extends AbstractLearningProblem>> supportedLearningProblems() {
+ Collection<Class<? extends AbstractLearningProblem>> problems = new LinkedList<Class<? extends AbstractLearningProblem>>();
+ problems.add(AbstractLearningProblem.class);
return problems;
}
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-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/celoe/CELOE.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -34,8 +34,8 @@
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.EvaluatedDescription;
import org.dllearner.core.AbstractCELA;
-import org.dllearner.core.LearningProblem;
-import org.dllearner.core.ReasonerComponent;
+import org.dllearner.core.AbstractLearningProblem;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.configurators.CELOEConfigurator;
import org.dllearner.core.options.BooleanConfigOption;
import org.dllearner.core.options.CommonConfigMappings;
@@ -147,14 +147,14 @@
return configurator;
}
- public CELOE(LearningProblem problem, ReasonerComponent reasoner) {
+ public CELOE(AbstractLearningProblem problem, AbstractReasonerComponent reasoner) {
super(problem, reasoner);
configurator = new CELOEConfigurator(this);
}
- public static Collection<Class<? extends LearningProblem>> supportedLearningProblems() {
- Collection<Class<? extends LearningProblem>> problems = new LinkedList<Class<? extends LearningProblem>>();
- problems.add(LearningProblem.class);
+ public static Collection<Class<? extends AbstractLearningProblem>> supportedLearningProblems() {
+ Collection<Class<? extends AbstractLearningProblem>> problems = new LinkedList<Class<? extends AbstractLearningProblem>>();
+ problems.add(AbstractLearningProblem.class);
return problems;
}
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/el/ELDescriptionTree.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/el/ELDescriptionTree.java 2011-08-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/el/ELDescriptionTree.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -31,7 +31,7 @@
import java.util.Map.Entry;
import org.apache.log4j.Logger;
-import org.dllearner.core.ReasonerComponent;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.owl.ClassHierarchy;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Intersection;
@@ -76,11 +76,11 @@
// the background knowledge (we need to have it explicitly here,
// since we store simulation information in the tree and simulation
// updates depend on background knowledge)
- protected ReasonerComponent rs;
+ protected AbstractReasonerComponent rs;
protected ClassHierarchy subsumptionHierarchy;
protected ObjectPropertyHierarchy roleHierarchy;
- public ELDescriptionTree(ReasonerComponent rs) {
+ public ELDescriptionTree(AbstractReasonerComponent rs) {
this.rs = rs;
subsumptionHierarchy = rs.getClassHierarchy();
roleHierarchy = rs.getObjectPropertyHierarchy();
@@ -92,7 +92,7 @@
* @param description
* A description
*/
- public ELDescriptionTree(ReasonerComponent rs, Description description) {
+ public ELDescriptionTree(AbstractReasonerComponent rs, Description description) {
this(rs);
// construct root node and recursively build the tree
rootNode = new ELDescriptionNode(this);
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-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/el/ELLearningAlgorithm.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -28,8 +28,8 @@
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.EvaluatedDescription;
import org.dllearner.core.AbstractCELA;
-import org.dllearner.core.LearningProblem;
-import org.dllearner.core.ReasonerComponent;
+import org.dllearner.core.AbstractLearningProblem;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.configurators.Configurator;
import org.dllearner.core.configurators.ELLearningAlgorithmConfigurator;
import org.dllearner.core.options.CommonConfigOptions;
@@ -71,7 +71,7 @@
private ELHeuristic heuristic;
private TreeSet<SearchTreeNode> candidates;
- public ELLearningAlgorithm(PosNegLP problem, ReasonerComponent reasoner) {
+ public ELLearningAlgorithm(PosNegLP problem, AbstractReasonerComponent reasoner) {
super(problem, reasoner);
configurator = new ELLearningAlgorithmConfigurator(this);
}
@@ -80,8 +80,8 @@
return "standard EL learning algorithm";
}
- public static Collection<Class<? extends LearningProblem>> supportedLearningProblems() {
- Collection<Class<? extends LearningProblem>> problems = new LinkedList<Class<? extends LearningProblem>>();
+ public static Collection<Class<? extends AbstractLearningProblem>> supportedLearningProblems() {
+ Collection<Class<? extends AbstractLearningProblem>> problems = new LinkedList<Class<? extends AbstractLearningProblem>>();
problems.add(PosNegLP.class);
return problems;
}
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-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/el/ELLearningAlgorithmDisjunctive.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -31,8 +31,8 @@
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.EvaluatedDescription;
import org.dllearner.core.AbstractCELA;
-import org.dllearner.core.LearningProblem;
-import org.dllearner.core.ReasonerComponent;
+import org.dllearner.core.AbstractLearningProblem;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.configurators.Configurator;
import org.dllearner.core.configurators.ELLearningAlgorithmDisjunctiveConfigurator;
import org.dllearner.core.options.CommonConfigOptions;
@@ -121,7 +121,7 @@
// minimum score a tree must have to be part of the solution
private double minimumTreeScore = -1;
- public ELLearningAlgorithmDisjunctive(PosNegLP problem, ReasonerComponent reasoner) {
+ public ELLearningAlgorithmDisjunctive(PosNegLP problem, AbstractReasonerComponent reasoner) {
super(problem, reasoner);
configurator = new ELLearningAlgorithmDisjunctiveConfigurator(this);
}
@@ -130,8 +130,8 @@
return "disjunctive EL learning algorithm";
}
- public static Collection<Class<? extends LearningProblem>> supportedLearningProblems() {
- Collection<Class<? extends LearningProblem>> problems = new LinkedList<Class<? extends LearningProblem>>();
+ public static Collection<Class<? extends AbstractLearningProblem>> supportedLearningProblems() {
+ Collection<Class<? extends AbstractLearningProblem>> problems = new LinkedList<Class<? extends AbstractLearningProblem>>();
problems.add(PosNegLP.class);
return problems;
}
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-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/fuzzydll/FuzzyCELOE.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -39,8 +39,8 @@
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.EvaluatedDescription;
import org.dllearner.core.FuzzyClassExpressionLearningAlgorithm;
-import org.dllearner.core.LearningProblem;
-import org.dllearner.core.ReasonerComponent;
+import org.dllearner.core.AbstractLearningProblem;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.configurators.FuzzyCELOEConfigurator;
import org.dllearner.core.options.BooleanConfigOption;
import org.dllearner.core.options.CommonConfigOptions;
@@ -159,14 +159,14 @@
return configurator;
}
- public FuzzyCELOE(LearningProblem problem, ReasonerComponent reasoner) {
+ public FuzzyCELOE(AbstractLearningProblem problem, AbstractReasonerComponent reasoner) {
super(problem, reasoner);
configurator = new FuzzyCELOEConfigurator(this);
}
- public static Collection<Class<? extends LearningProblem>> supportedLearningProblems() {
- Collection<Class<? extends LearningProblem>> problems = new LinkedList<Class<? extends LearningProblem>>();
- problems.add(LearningProblem.class);
+ public static Collection<Class<? extends AbstractLearningProblem>> supportedLearningProblems() {
+ Collection<Class<? extends AbstractLearningProblem>> problems = new LinkedList<Class<? extends AbstractLearningProblem>>();
+ problems.add(AbstractLearningProblem.class);
return problems;
}
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-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/gp/GP.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -31,8 +31,8 @@
import org.dllearner.algorithms.hybridgp.Psi;
import org.dllearner.core.AbstractCELA;
-import org.dllearner.core.LearningProblem;
-import org.dllearner.core.ReasonerComponent;
+import org.dllearner.core.AbstractLearningProblem;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.configurators.GPConfigurator;
import org.dllearner.core.options.BooleanConfigOption;
import org.dllearner.core.options.ConfigEntry;
@@ -140,7 +140,7 @@
* 1.0 and a probability of mutation of 0.01.
*
*/
- public GP(PosNegLP learningProblem, ReasonerComponent rs) {
+ public GP(PosNegLP learningProblem, AbstractReasonerComponent rs) {
super(learningProblem, rs);
this.configurator = new GPConfigurator(this);
}
@@ -149,8 +149,8 @@
return "genetic programming learning algorithm";
}
- public static Collection<Class<? extends LearningProblem>> supportedLearningProblems() {
- Collection<Class<? extends LearningProblem>> problems = new LinkedList<Class<? extends LearningProblem>>();
+ public static Collection<Class<? extends AbstractLearningProblem>> supportedLearningProblems() {
+ Collection<Class<? extends AbstractLearningProblem>> problems = new LinkedList<Class<? extends AbstractLearningProblem>>();
problems.add(PosNegLP.class);
return problems;
}
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/gp/GPUtilities.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/gp/GPUtilities.java 2011-08-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/gp/GPUtilities.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -7,8 +7,8 @@
import java.util.SortedSet;
import java.util.TreeMap;
-import org.dllearner.core.LearningProblem;
-import org.dllearner.core.ReasonerComponent;
+import org.dllearner.core.AbstractLearningProblem;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ReasoningMethodUnsupportedException;
import org.dllearner.core.owl.ObjectAllRestriction;
import org.dllearner.core.owl.NamedClass;
@@ -54,7 +54,7 @@
private static Random rand = new Random();
- private static ScorePosNeg calculateFitness(LearningProblem learningProblem, Description hypothesis) {
+ private static ScorePosNeg calculateFitness(AbstractLearningProblem learningProblem, Description hypothesis) {
return calculateFitness(learningProblem, hypothesis, null);
}
@@ -63,7 +63,7 @@
// (macht aber nicht so viel Sinn, da man das bei richtigen Reasoning-Algorithmen
// ohnehin mit einer Erweiterung der Wissensbasis um die Inklusion Target SUBSETOF ReturnType
// erschlagen kann)
- private static ScorePosNeg calculateFitness(LearningProblem learningProblem, Description hypothesis, Description adc) {
+ private static ScorePosNeg calculateFitness(AbstractLearningProblem learningProblem, Description hypothesis, Description adc) {
Description extendedHypothesis;
// return type temporarily disabled
@@ -123,11 +123,11 @@
return score;
}
- public static Program createProgram(LearningProblem learningProblem, Description mainTree) {
+ public static Program createProgram(AbstractLearningProblem learningProblem, Description mainTree) {
return new Program(calculateFitness(learningProblem, mainTree), mainTree);
}
- private static Program createProgram(LearningProblem learningProblem, Description mainTree, Description adc) {
+ private static Program createProgram(AbstractLearningProblem learningProblem, Description mainTree, Description adc) {
return new Program(calculateFitness(learningProblem, mainTree,adc), mainTree, adc);
}
@@ -135,7 +135,7 @@
* Perform a point mutation on the given program.
* @param p The program to be mutated.
*/
- public static Program mutation(LearningProblem learningProblem, ReasonerComponent rs, Program p) {
+ public static Program mutation(AbstractLearningProblem learningProblem, AbstractReasonerComponent rs, Program p) {
mutation++;
if(p.getAdc() != null) {
// TODO: hier kann man noch mehr Feinabstimmung machen, d.h.
@@ -159,7 +159,7 @@
}
}
- private static Description mutation(LearningProblem learningProblem, ReasonerComponent rs, Description tree, boolean useADC) {
+ private static Description mutation(AbstractLearningProblem learningProblem, AbstractReasonerComponent rs, Description tree, boolean useADC) {
// auch bei Mutation muss darauf geachtet werden, dass
// Baum nicht modifiziert wird (sonst w�rde man automatisch auch
// andere "selected individuals" modifizieren)
@@ -228,7 +228,7 @@
* @param p2 Second parent.
* @return A two-element array containing the offpsring.
*/
- public static Program[] crossover(LearningProblem learningProblem, Program p1, Program p2) {
+ public static Program[] crossover(AbstractLearningProblem learningProblem, Program p1, Program p2) {
crossover++;
if(p1.getAdc() != null) {
Description[] pt;
@@ -304,7 +304,7 @@
// m�sste auch mit ADC funktionieren, da nur am Hauptbaum etwas
// ver�ndert wird
- public static Program hillClimbing(LearningProblem learningProblem, ReasonerComponent rs, Program p) {
+ public static Program hillClimbing(AbstractLearningProblem learningProblem, AbstractReasonerComponent rs, Program p) {
hillClimbing++;
// checken, ob Bedingungen f�r hill-climbing erf�llt sind
if(!rs.getReasonerType().equals(ReasonerType.FAST_RETRIEVAL)
@@ -327,7 +327,7 @@
// Alternativen zu speichern und dann ein Element zuf�llig auszuw�hlen,
// aber w�rde man das nicht machen, dann w�re das ein starker Bias
// zu z.B. Disjunktion (weil die als erstes getestet wird)
- private static Description hillClimbing(LearningProblem learningProblem, ReasonerComponent rs, Description node, ScoreThreeValued score) {
+ private static Description hillClimbing(AbstractLearningProblem learningProblem, AbstractReasonerComponent rs, Description node, ScoreThreeValued score) {
SortedSetTuple<Individual> tuple = new SortedSetTuple<Individual>(score.getPosClassified(),score.getNegClassified());
SortedSetTuple<String> stringTuple = Helper.getStringTuple(tuple);
// FlatABox abox = FlatABox.getInstance();
@@ -452,7 +452,7 @@
}
}
- private static ScoreThreeValued getScore(int conceptLength, LearningProblem learningProblem, ReasonerComponent rs, SortedSet<Individual> posClassified, SortedSet<Individual> negClassified) {
+ private static ScoreThreeValued getScore(int conceptLength, AbstractLearningProblem learningProblem, AbstractReasonerComponent rs, SortedSet<Individual> posClassified, SortedSet<Individual> negClassified) {
// es muss hier die Helper-Methode verwendet werden, sonst werden
// Individuals gel�scht !!
SortedSet<Individual> neutClassified = Helper.intersection(rs.getIndividuals(),posClassified);
@@ -489,7 +489,7 @@
return returnMap;
}
- private static Description pickTerminalSymbol(LearningProblem learningProblem, ReasonerComponent rs, boolean useADC) {
+ private static Description pickTerminalSymbol(AbstractLearningProblem learningProblem, AbstractReasonerComponent rs, boolean useADC) {
// FlatABox abox = FlatABox.getInstance();
int nr;
int nrOfConcepts = rs.getNamedClasses().size();
@@ -619,7 +619,7 @@
* @param depth Depth of the tree.
* @return The created program.
*/
- public static Program createFullRandomProgram(LearningProblem learningProblem, ReasonerComponent rs, int depth, boolean adc) {
+ public static Program createFullRandomProgram(AbstractLearningProblem learningProblem, AbstractReasonerComponent rs, int depth, boolean adc) {
if(adc) {
// erster Baum Hauptbaum, zweiter Baum ADC
return createProgram(learningProblem, createFullRandomTree(learningProblem, rs, depth, true),
@@ -629,7 +629,7 @@
return createProgram(learningProblem, createFullRandomTree(learningProblem, rs, depth, false));
}
- private static Description createFullRandomTree(LearningProblem learningProblem, ReasonerComponent rs, int depth, boolean useADC) {
+ private static Description createFullRandomTree(AbstractLearningProblem learningProblem, AbstractReasonerComponent rs, int depth, boolean useADC) {
// FlatABox abox = FlatABox.getInstance();
int numberOfRoles = rs.getObjectProperties().size(); // abox.roles.size();
@@ -680,7 +680,7 @@
* @param depth The maximum depth of the program tree.
* @return The created program.
*/
- public static Program createGrowRandomProgram(LearningProblem learningProblem, ReasonerComponent rs, int depth, boolean adc) {
+ public static Program createGrowRandomProgram(AbstractLearningProblem learningProblem, AbstractReasonerComponent rs, int depth, boolean adc) {
if(adc) {
// erster Baum Hauptbaum, zweiter Baum ADC
return createProgram(learningProblem, createGrowRandomTree(learningProblem,rs,depth,true),
@@ -690,7 +690,7 @@
return createProgram(learningProblem, createGrowRandomTree(learningProblem, rs, depth,false));
}
- public static Description createGrowRandomTree(LearningProblem learningProblem, ReasonerComponent rs, int depth, boolean useADC) {
+ public static Description createGrowRandomTree(AbstractLearningProblem learningProblem, AbstractReasonerComponent rs, int depth, boolean useADC) {
/*
private static Concept pickAlphabetSymbol(boolean useADC) {
FlatABox abox = FlatABox.getInstance();
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/hybridgp/Psi.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/hybridgp/Psi.java 2011-08-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/hybridgp/Psi.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -6,7 +6,7 @@
import java.util.TreeMap;
import org.dllearner.algorithms.gp.Program;
-import org.dllearner.core.ReasonerComponent;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.owl.Description;
import org.dllearner.learningproblems.PosNegLP;
import org.dllearner.learningproblems.ScorePosNeg;
@@ -49,7 +49,7 @@
private long someTimeStart = 0;
public long someTime = 0;
- public Psi(PosNegLP learningProblem, ReasonerComponent reasoningService) { //, PsiUp pu, PsiDown pd) {
+ public Psi(PosNegLP learningProblem, AbstractReasonerComponent reasoningService) { //, PsiUp pu, PsiDown pd) {
// this.pu = pu;
// this.pd = pd;
this.learningProblem = learningProblem;
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-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/isle/ISLE.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -35,8 +35,8 @@
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.EvaluatedDescription;
import org.dllearner.core.AbstractCELA;
-import org.dllearner.core.LearningProblem;
-import org.dllearner.core.ReasonerComponent;
+import org.dllearner.core.AbstractLearningProblem;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.configurators.ISLEConfigurator;
import org.dllearner.core.options.BooleanConfigOption;
import org.dllearner.core.options.CommonConfigOptions;
@@ -137,14 +137,14 @@
return configurator;
}
- public ISLE(LearningProblem problem, ReasonerComponent reasoner) {
+ public ISLE(AbstractLearningProblem problem, AbstractReasonerComponent reasoner) {
super(problem, reasoner);
configurator = new ISLEConfigurator(this);
}
- public static Collection<Class<? extends LearningProblem>> supportedLearningProblems() {
- Collection<Class<? extends LearningProblem>> problems = new LinkedList<Class<? extends LearningProblem>>();
- problems.add(LearningProblem.class);
+ public static Collection<Class<? extends AbstractLearningProblem>> supportedLearningProblems() {
+ Collection<Class<? extends AbstractLearningProblem>> problems = new LinkedList<Class<? extends AbstractLearningProblem>>();
+ problems.add(AbstractLearningProblem.class);
return problems;
}
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-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/OCEL.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -31,8 +31,8 @@
import org.apache.log4j.Logger;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.AbstractCELA;
-import org.dllearner.core.LearningProblem;
-import org.dllearner.core.ReasonerComponent;
+import org.dllearner.core.AbstractLearningProblem;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.configurators.OCELConfigurator;
import org.dllearner.core.options.BooleanConfigOption;
import org.dllearner.core.options.CommonConfigMappings;
@@ -152,18 +152,18 @@
// soll später einen Operator und eine Heuristik entgegennehmen
// public ROLearner(LearningProblem learningProblem, LearningProblem learningProblem2) {
- public OCEL(PosNegLP learningProblem, ReasonerComponent reasoningService) {
+ public OCEL(PosNegLP learningProblem, AbstractReasonerComponent reasoningService) {
super(learningProblem, reasoningService);
this.configurator = new OCELConfigurator(this);
}
- public OCEL(PosOnlyLP learningProblem, ReasonerComponent reasoningService) {
+ public OCEL(PosOnlyLP learningProblem, AbstractReasonerComponent reasoningService) {
super(learningProblem, reasoningService);
this.configurator = new OCELConfigurator(this);
}
- public static Collection<Class<? extends LearningProblem>> supportedLearningProblems() {
- Collection<Class<? extends LearningProblem>> problems = new LinkedList<Class<? extends LearningProblem>>();
+ public static Collection<Class<? extends AbstractLearningProblem>> supportedLearningProblems() {
+ Collection<Class<? extends AbstractLearningProblem>> problems = new LinkedList<Class<? extends AbstractLearningProblem>>();
problems.add(PosNegLP.class);
problems.add(PosOnlyLP.class);
return problems;
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/ROLearner2.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/ROLearner2.java 2011-08-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/ROLearner2.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -33,8 +33,8 @@
import java.util.concurrent.ConcurrentSkipListSet;
import org.apache.log4j.Logger;
-import org.dllearner.core.LearningProblem;
-import org.dllearner.core.ReasonerComponent;
+import org.dllearner.core.AbstractLearningProblem;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.configurators.OCELConfigurator;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Individual;
@@ -67,7 +67,7 @@
private OCELConfigurator configurator;
// basic setup: learning problem and reasoning service
- private ReasonerComponent rs;
+ private AbstractReasonerComponent rs;
// often the learning problems needn't be accessed directly; instead
// use the example sets below and the posonly variable
private PosNegLP learningProblem;
@@ -213,8 +213,8 @@
public ROLearner2(
OCELConfigurator configurator,
- LearningProblem learningProblem,
- ReasonerComponent rs,
+ AbstractLearningProblem learningProblem,
+ AbstractReasonerComponent rs,
RefinementOperator operator,
ExampleBasedHeuristic heuristic,
Description startDescription,
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/SubsumptionComparator.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/SubsumptionComparator.java 2011-08-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/ocel/SubsumptionComparator.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -2,16 +2,16 @@
import java.util.Comparator;
-import org.dllearner.core.ReasonerComponent;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.owl.Description;
import org.dllearner.utilities.owl.ConceptComparator;
public class SubsumptionComparator implements Comparator<Description> {
- private ReasonerComponent rs;
+ private AbstractReasonerComponent rs;
private ConceptComparator cc = new ConceptComparator();
- public SubsumptionComparator(ReasonerComponent rs) {
+ public SubsumptionComparator(AbstractReasonerComponent rs) {
this.rs = rs;
}
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/properties/DisjointPropertyAxiomLearner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/properties/DisjointPropertyAxiomLearner.java 2011-08-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/properties/DisjointPropertyAxiomLearner.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -3,14 +3,14 @@
import java.util.List;
import org.dllearner.core.AxiomLearningAlgorithm;
-import org.dllearner.core.Component;
+import org.dllearner.core.AbstractComponent;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.EvaluatedAxiom;
import org.dllearner.core.configurators.Configurator;
import org.dllearner.core.owl.Axiom;
import org.dllearner.kb.SparqlEndpointKS;
-public class DisjointPropertyAxiomLearner extends Component implements AxiomLearningAlgorithm {
+public class DisjointPropertyAxiomLearner extends AbstractComponent implements AxiomLearningAlgorithm {
private String propertyToDescribe;
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/properties/EquivalentPropertyAxiomLearner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/properties/EquivalentPropertyAxiomLearner.java 2011-08-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/properties/EquivalentPropertyAxiomLearner.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -3,14 +3,14 @@
import java.util.List;
import org.dllearner.core.AxiomLearningAlgorithm;
-import org.dllearner.core.Component;
+import org.dllearner.core.AbstractComponent;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.EvaluatedAxiom;
import org.dllearner.core.configurators.Configurator;
import org.dllearner.core.owl.Axiom;
import org.dllearner.kb.SparqlEndpointKS;
-public class EquivalentPropertyAxiomLearner extends Component implements AxiomLearningAlgorithm {
+public class EquivalentPropertyAxiomLearner extends AbstractComponent implements AxiomLearningAlgorithm {
private String propertyToDescribe;
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/properties/FunctionalPropertyAxiomLearner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/properties/FunctionalPropertyAxiomLearner.java 2011-08-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/properties/FunctionalPropertyAxiomLearner.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -5,7 +5,7 @@
import java.util.List;
import org.dllearner.core.AxiomLearningAlgorithm;
-import org.dllearner.core.Component;
+import org.dllearner.core.AbstractComponent;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.EvaluatedAxiom;
import org.dllearner.core.config.ConfigOption;
@@ -26,7 +26,7 @@
import com.hp.hpl.jena.sparql.engine.http.QueryEngineHTTP;
import com.hp.hpl.jena.vocabulary.OWL;
-public class FunctionalPropertyAxiomLearner extends Component implements AxiomLearningAlgorithm {
+public class FunctionalPropertyAxiomLearner extends AbstractComponent implements AxiomLearningAlgorithm {
private static final Logger logger = LoggerFactory.getLogger(FunctionalPropertyAxiomLearner.class);
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/properties/PropertyDomainAxiomLearner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/properties/PropertyDomainAxiomLearner.java 2011-08-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/properties/PropertyDomainAxiomLearner.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -15,7 +15,7 @@
import java.util.TreeSet;
import org.dllearner.core.AxiomLearningAlgorithm;
-import org.dllearner.core.Component;
+import org.dllearner.core.AbstractComponent;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.EvaluatedAxiom;
import org.dllearner.core.config.ConfigOption;
@@ -39,7 +39,7 @@
import com.hp.hpl.jena.query.ResultSet;
import com.hp.hpl.jena.sparql.engine.http.QueryEngineHTTP;
-public class PropertyDomainAxiomLearner extends Component implements AxiomLearningAlgorithm {
+public class PropertyDomainAxiomLearner extends AbstractComponent implements AxiomLearningAlgorithm {
private static final Logger logger = LoggerFactory.getLogger(PropertyDomainAxiomLearner.class);
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/properties/PropertyRangeAxiomLearner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/properties/PropertyRangeAxiomLearner.java 2011-08-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/properties/PropertyRangeAxiomLearner.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -13,7 +13,7 @@
import java.util.TreeSet;
import org.dllearner.core.AxiomLearningAlgorithm;
-import org.dllearner.core.Component;
+import org.dllearner.core.AbstractComponent;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.EvaluatedAxiom;
import org.dllearner.core.config.ConfigOption;
@@ -36,7 +36,7 @@
import com.hp.hpl.jena.query.ResultSet;
import com.hp.hpl.jena.sparql.engine.http.QueryEngineHTTP;
-public class PropertyRangeAxiomLearner extends Component implements AxiomLearningAlgorithm {
+public class PropertyRangeAxiomLearner extends AbstractComponent implements AxiomLearningAlgorithm {
private static final Logger logger = LoggerFactory.getLogger(PropertyRangeAxiomLearner.class);
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/properties/ReflexivePropertyAxiomLearner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/properties/ReflexivePropertyAxiomLearner.java 2011-08-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/properties/ReflexivePropertyAxiomLearner.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -5,7 +5,7 @@
import java.util.List;
import org.dllearner.core.AxiomLearningAlgorithm;
-import org.dllearner.core.Component;
+import org.dllearner.core.AbstractComponent;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.EvaluatedAxiom;
import org.dllearner.core.config.ConfigOption;
@@ -26,7 +26,7 @@
import com.hp.hpl.jena.sparql.engine.http.QueryEngineHTTP;
import com.hp.hpl.jena.vocabulary.OWL2;
-public class ReflexivePropertyAxiomLearner extends Component implements AxiomLearningAlgorithm {
+public class ReflexivePropertyAxiomLearner extends AbstractComponent implements AxiomLearningAlgorithm {
private static final Logger logger = LoggerFactory.getLogger(ReflexivePropertyAxiomLearner.class);
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/properties/SubPropertyOfAxiomLearner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/properties/SubPropertyOfAxiomLearner.java 2011-08-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/properties/SubPropertyOfAxiomLearner.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -9,7 +9,7 @@
import java.util.Set;
import org.dllearner.core.AxiomLearningAlgorithm;
-import org.dllearner.core.Component;
+import org.dllearner.core.AbstractComponent;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.ComponentAnn;
import org.dllearner.core.EvaluatedAxiom;
@@ -28,7 +28,7 @@
import com.hp.hpl.jena.sparql.engine.http.QueryEngineHTTP;
@ComponentAnn(name="subPropertyOf learner")
-public class SubPropertyOfAxiomLearner extends Component implements AxiomLearningAlgorithm {
+public class SubPropertyOfAxiomLearner extends AbstractComponent implements AxiomLearningAlgorithm {
@ConfigOption(name="propertyToDescribe", description="", propertyEditorClass=ObjectPropertyEditor.class)
private ObjectProperty propertyToDescribe;
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/properties/SymmetricPropertyAxiomLearner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/properties/SymmetricPropertyAxiomLearner.java 2011-08-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/properties/SymmetricPropertyAxiomLearner.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -5,7 +5,7 @@
import java.util.List;
import org.dllearner.core.AxiomLearningAlgorithm;
-import org.dllearner.core.Component;
+import org.dllearner.core.AbstractComponent;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.EvaluatedAxiom;
import org.dllearner.core.config.ConfigOption;
@@ -26,7 +26,7 @@
import com.hp.hpl.jena.sparql.engine.http.QueryEngineHTTP;
import com.hp.hpl.jena.vocabulary.OWL2;
-public class SymmetricPropertyAxiomLearner extends Component implements AxiomLearningAlgorithm {
+public class SymmetricPropertyAxiomLearner extends AbstractComponent implements AxiomLearningAlgorithm {
private static final Logger logger = LoggerFactory.getLogger(SymmetricPropertyAxiomLearner.class);
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/properties/TransitivePropertyAxiomLearner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/properties/TransitivePropertyAxiomLearner.java 2011-08-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/properties/TransitivePropertyAxiomLearner.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -5,7 +5,7 @@
import java.util.List;
import org.dllearner.core.AxiomLearningAlgorithm;
-import org.dllearner.core.Component;
+import org.dllearner.core.AbstractComponent;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.EvaluatedAxiom;
import org.dllearner.core.config.ConfigOption;
@@ -27,7 +27,7 @@
import com.hp.hpl.jena.sparql.engine.http.QueryEngineHTTP;
import com.hp.hpl.jena.vocabulary.OWL;
-public class TransitivePropertyAxiomLearner extends Component implements AxiomLearningAlgorithm {
+public class TransitivePropertyAxiomLearner extends AbstractComponent implements AxiomLearningAlgorithm {
private static final Logger logger = LoggerFactory.getLogger(TransitivePropertyAxiomLearner.class);
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-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/refinement/ROLearner.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -15,8 +15,8 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.dllearner.core.AbstractCELA;
-import org.dllearner.core.LearningProblem;
-import org.dllearner.core.ReasonerComponent;
+import org.dllearner.core.AbstractLearningProblem;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.configurators.ROLearnerConfigurator;
import org.dllearner.core.options.BooleanConfigOption;
import org.dllearner.core.options.CommonConfigMappings;
@@ -191,7 +191,7 @@
// prefixes
private String baseURI;
- public ROLearner(PosNegLP learningProblem, ReasonerComponent reasoningService) {
+ public ROLearner(PosNegLP learningProblem, AbstractReasonerComponent reasoningService) {
super(learningProblem, reasoningService);
this.learningProblem = learningProblem;
this.configurator = new ROLearnerConfigurator(this);
@@ -199,8 +199,8 @@
}
- public static Collection<Class<? extends LearningProblem>> supportedLearningProblems() {
- Collection<Class<? extends LearningProblem>> problems = new LinkedList<Class<? extends LearningProblem>>();
+ public static Collection<Class<? extends AbstractLearningProblem>> supportedLearningProblems() {
+ Collection<Class<? extends AbstractLearningProblem>> problems = new LinkedList<Class<? extends AbstractLearningProblem>>();
problems.add(PosNegLP.class);
return problems;
}
Modified: trunk/components-core/src/main/java/org/dllearner/core/AbstractCELA.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/AbstractCELA.java 2011-08-04 08:40:05 UTC (rev 2986)
+++ trunk/components-core/src/main/java/org/dllearner/core/AbstractCELA.java 2011-08-04 10:04:56 UTC (rev 2987)
@@ -46,19 +46,19 @@
* @author Jens Lehmann
*
*/
-public abstract class AbstractCELA extends Component implements ClassExpressionLearningAlgorithm, StoppableLearningAlgorithm {
+public abstract class AbstractCELA extends AbstractComponent implements ClassExpressionLearningAlgorithm, StoppableLearningAlgorithm {
/**
* The learning problem variable, which must be used by
* all learning algorithm implementations.
*/
- protected LearningProblem learningProblem;
+ protected AbstractLearningProblem learningProblem;
/**
* The reasoning service variable, which must be used by
* all learning algorithm implementations.
*/
- protected ReasonerComponent reasoner;
+ protected AbstractReasonerComponent reasoner;
/**
* Each learning algorithm gets a learning problem and
@@ -67,7 +67,7 @@
* @param reasoningService The reasoner connecting to the
* underlying knowledge base.
*/
- public AbstractCELA(LearningProblem learningProblem, ReasonerCompon...
[truncated message content] |
