Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1185] trunk/src/dl-learner/org/dllearner
|
From: <ku...@us...> - 2008-09-09 13:40:55
|
Revision: 1185
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1185&view=rev
Author: kurzum
Date: 2008-09-09 13:40:43 +0000 (Tue, 09 Sep 2008)
Log Message:
-----------
included for all components
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/gp/GP.java
trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java
trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java
trunk/src/dl-learner/org/dllearner/core/Component.java
trunk/src/dl-learner/org/dllearner/core/configurators/BruteForceLearnerConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/ComponentFactory.java
trunk/src/dl-learner/org/dllearner/core/configurators/DBpediaNavigationSuggestorConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/DIGReasonerConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/ExampleBasedROLComponentConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/FastInstanceCheckerConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/FastRetrievalReasonerConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/GPConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/KBFileConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIOntologyConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIReasonerConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/OWLFileConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPStrictConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/PosNegInclusionLPConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyDefinitionLPConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyInclusionLPConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/ROLearnerConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/RandomGuesserConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/SimpleSuggestionLearningAlgorithmConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/SparqlKnowledgeSourceConfigurator.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/PosOnlyDefinitionLP.java
trunk/src/dl-learner/org/dllearner/learningproblems/PosOnlyInclusionLP.java
trunk/src/dl-learner/org/dllearner/learningproblems/RoleLearning.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/scripts/ConfigJavaGenerator.java
trunk/src/dl-learner/org/dllearner/scripts/NewSample.java
Added Paths:
-----------
trunk/src/dl-learner/org/dllearner/core/configurators/Configurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/RoleLearningConfigurator.java
Modified: trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -36,6 +36,7 @@
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.owl.Description;
import org.dllearner.core.owl.Intersection;
import org.dllearner.core.owl.NamedClass;
@@ -57,6 +58,13 @@
*
*/
public class BruteForceLearner extends LearningAlgorithm {
+
+ private BruteForceLearnerConfigurator configurator;
+ @Override
+ public BruteForceLearnerConfigurator getConfigurator(){
+ return configurator;
+ }
+
private LearningProblem learningProblem;
private ReasoningService rs;
@@ -77,6 +85,7 @@
public BruteForceLearner(LearningProblem learningProblem, ReasoningService rs) {
this.learningProblem = learningProblem;
this.rs = rs;
+ this.configurator = new BruteForceLearnerConfigurator(this);
}
public static String getName() {
Modified: trunk/src/dl-learner/org/dllearner/algorithms/DBpediaNavigationSuggestor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/DBpediaNavigationSuggestor.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/algorithms/DBpediaNavigationSuggestor.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -36,6 +36,8 @@
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.owl.Description;
import org.dllearner.learningproblems.PosNegDefinitionLP;
import org.dllearner.learningproblems.PosNegLP;
@@ -53,19 +55,34 @@
*/
public class DBpediaNavigationSuggestor extends LearningAlgorithm {
+ private DBpediaNavigationSuggestorConfigurator configurator;
+ @Override
+ public DBpediaNavigationSuggestorConfigurator getConfigurator(){
+ return configurator;
+ }
+
+
// private ReasoningService rs;
private ExampleBasedROLComponent learner;
private static String defaultSearchTreeFile = "log/searchTree.txt";
public DBpediaNavigationSuggestor(LearningProblem learningProblem, ReasoningService rs) {
// this.rs=rs;
+ this.configurator = new DBpediaNavigationSuggestorConfigurator(this);
+ try{
if(learningProblem instanceof PosNegLP) {
PosNegLP lp = (PosNegLP) learningProblem;
- this.learner=new ExampleBasedROLComponent(lp, rs);
+ this.learner = ComponentFactory.getExampleBasedROLComponent(lp, rs);
+ //this.learner=new ExampleBasedROLComponent(lp, rs);
} else if(learningProblem instanceof PosOnlyDefinitionLP) {
PosOnlyDefinitionLP lp = (PosOnlyDefinitionLP) learningProblem;
- this.learner=new ExampleBasedROLComponent(lp, rs);
+ this.learner = ComponentFactory.getExampleBasedROLComponent(lp, rs);
+ //this.learner=new ExampleBasedROLComponent(lp, rs);
}
+ }catch (Exception e) {
+ System.out.println("this error should never occur"+this.getClass().getCanonicalName());
+ e.printStackTrace();
+ }
}
public static Collection<Class<? extends LearningProblem>> supportedLearningProblems() {
Modified: trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -34,10 +34,17 @@
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.owl.Description;
public class RandomGuesser extends LearningAlgorithm {
+ private RandomGuesserConfigurator configurator;
+ @Override
+ public RandomGuesserConfigurator getConfigurator(){
+ return configurator;
+ }
+
private Description bestDefinition = null;
private Score bestScore;
private double bestFitness = Double.NEGATIVE_INFINITY;
@@ -51,6 +58,7 @@
public RandomGuesser(LearningProblem learningProblem, ReasoningService rs) {
this.learningProblem = learningProblem;
this.rs = rs;
+ this.configurator = new RandomGuesserConfigurator(this);
}
public static String getName() {
Modified: trunk/src/dl-learner/org/dllearner/algorithms/SimpleSuggestionLearningAlgorithm.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/SimpleSuggestionLearningAlgorithm.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/algorithms/SimpleSuggestionLearningAlgorithm.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -19,15 +19,21 @@
*/
package org.dllearner.algorithms;
-import java.util.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
import org.dllearner.core.EvaluatedDescription;
import org.dllearner.core.LearningAlgorithm;
import org.dllearner.core.ReasoningService;
+import org.dllearner.core.Score;
+import org.dllearner.core.config.ConfigEntry;
+import org.dllearner.core.configurators.SimpleSuggestionLearningAlgorithmConfigurator;
import org.dllearner.core.owl.Description;
-import org.dllearner.core.config.ConfigEntry;
-import org.dllearner.core.Score;
-import org.dllearner.core.owl.*;
+import org.dllearner.core.owl.Individual;
+import org.dllearner.core.owl.ObjectProperty;
+import org.dllearner.core.owl.ObjectSomeRestriction;
+import org.dllearner.core.owl.Thing;
/**
* TODO: Javadoc
@@ -37,7 +43,13 @@
*
*/
public class SimpleSuggestionLearningAlgorithm extends LearningAlgorithm implements Runnable {
-
+
+ private SimpleSuggestionLearningAlgorithmConfigurator configurator;
+ @Override
+ public SimpleSuggestionLearningAlgorithmConfigurator getConfigurator(){
+ return configurator;
+ }
+
// private boolean stop = false;
private Score solutionScore;
private Description bestSollution;
@@ -45,6 +57,7 @@
public SimpleSuggestionLearningAlgorithm() {
// this.learningProblem = learningProblem;
+ this.configurator = new SimpleSuggestionLearningAlgorithmConfigurator(this);
}
@Override
Modified: trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -42,6 +42,7 @@
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.owl.Description;
import org.dllearner.core.owl.Thing;
import org.dllearner.learningproblems.PosNegLP;
@@ -56,6 +57,13 @@
*/
public class GP extends LearningAlgorithm {
+ private GPConfigurator configurator;
+ @Override
+ public GPConfigurator getConfigurator(){
+ return configurator;
+ }
+
+
// NumberFormat f;
DecimalFormat df = new DecimalFormat("0.00");
@@ -140,6 +148,7 @@
public GP(PosNegLP learningProblem, ReasoningService rs) {
this.learningProblem = learningProblem;
this.rs = rs;
+ this.configurator = new GPConfigurator(this);
}
public static String getName() {
Modified: trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -82,6 +82,12 @@
*/
public class ExampleBasedROLComponent extends LearningAlgorithm {
+ private ExampleBasedROLComponentConfigurator configurator;
+ @Override
+ public ExampleBasedROLComponentConfigurator getConfigurator(){
+ return configurator;
+ }
+
// actual algorithm
private ExampleBasedROLearner algorithm;
private static Logger logger = Logger
@@ -91,14 +97,7 @@
// learning problem to solve and background knowledge
private ReasoningService rs;
private LearningProblem learningProblem;
-
- private ExampleBasedROLComponentConfigurator configurator;
- public ExampleBasedROLComponentConfigurator getConfigurator(){
- return configurator;
- }
-
-
-
+
// configuration options
private boolean writeSearchTree;
private File searchTreeFile;
Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -27,6 +27,7 @@
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.owl.Description;
import org.dllearner.core.owl.Intersection;
import org.dllearner.core.owl.NamedClass;
@@ -44,6 +45,12 @@
public class ROLearner extends LearningAlgorithm {
+ private ROLearnerConfigurator configurator;
+ @Override
+ public ROLearnerConfigurator getConfigurator(){
+ return configurator;
+ }
+
private static Logger logger = Logger
.getLogger(LearningAlgorithm.class);
@@ -194,13 +201,16 @@
public ROLearner(PosNegLP learningProblem, ReasoningService rs) {
this.learningProblem = learningProblem;
this.rs = rs;
+ this.configurator = new ROLearnerConfigurator(this);
posOnly=false;
baseURI = rs.getBaseURI();
+
}
public ROLearner(PosOnlyDefinitionLP learningProblem, ReasoningService rs) {
this.posOnlyLearningProblem = learningProblem;
this.rs = rs;
+ this.configurator = new ROLearnerConfigurator(this);
posOnly=true;
baseURI = rs.getBaseURI();
}
Modified: trunk/src/dl-learner/org/dllearner/core/Component.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/Component.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/Component.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -26,6 +26,7 @@
import org.dllearner.core.config.ConfigOption;
import org.dllearner.core.config.DoubleConfigOption;
import org.dllearner.core.config.InvalidConfigOptionValueException;
+import org.dllearner.core.configurators.Configurator;
/**
* Base class of all components. See also http://dl-learner.org/wiki/Architecture.
@@ -35,12 +36,14 @@
*/
public abstract class Component {
-//protected Configurator configurator;
+protected Configurator configurator;
- //public Configurator<? extends Configurator> getConfigurator(){
+ public abstract Configurator getConfigurator();
//return configurator;
//}
+
+
/**
* Returns the name of this component. By default, "unnamed
* component" is returned, but all implementations of components
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/BruteForceLearnerConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/BruteForceLearnerConfigurator.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/BruteForceLearnerConfigurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -30,7 +30,7 @@
* automatically generated, do not edit manually.
* run org.dllearner.scripts.ConfigJavaGenerator to update
**/
-public class BruteForceLearnerConfigurator {
+public class BruteForceLearnerConfigurator implements Configurator {
private boolean reinitNecessary = false;
@SuppressWarnings("unused")
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/ComponentFactory.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/ComponentFactory.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/ComponentFactory.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -41,6 +41,7 @@
import org.dllearner.learningproblems.PosNegInclusionLP;
import org.dllearner.learningproblems.PosOnlyDefinitionLP;
import org.dllearner.learningproblems.PosOnlyInclusionLP;
+import org.dllearner.learningproblems.RoleLearning;
import org.dllearner.reasoning.DIGReasoner;
import org.dllearner.reasoning.FastInstanceChecker;
import org.dllearner.reasoning.FastRetrievalReasoner;
@@ -167,6 +168,16 @@
}
/**
+* @param positiveExamples positive examples
+* @param negativeExamples negative examples
+* @param reasoningService see ReasoningService
+* @return a component ready for initialization RoleLearning
+**/
+public static RoleLearning getRoleLearning(ReasoningService reasoningService, Set<String> positiveExamples, Set<String> negativeExamples) {
+return RoleLearningConfigurator.getRoleLearning(reasoningService, positiveExamples, negativeExamples);
+}
+
+/**
* @param learningProblem see LearningProblem
* @param reasoningService see ReasoningService
* @throws LearningProblemUnsupportedException see
Added: trunk/src/dl-learner/org/dllearner/core/configurators/Configurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/Configurator.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/Configurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -0,0 +1,28 @@
+/**
+ * Copyright (C) 2007-2008, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ *
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package org.dllearner.core.configurators;
+
+/**
+* automatically generated, do not edit manually.
+* run org.dllearner.scripts.ConfigJavaGenerator to update
+**/
+public interface Configurator{
+}
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/DBpediaNavigationSuggestorConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/DBpediaNavigationSuggestorConfigurator.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/DBpediaNavigationSuggestorConfigurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -31,7 +31,7 @@
* automatically generated, do not edit manually.
* run org.dllearner.scripts.ConfigJavaGenerator to update
**/
-public class DBpediaNavigationSuggestorConfigurator {
+public class DBpediaNavigationSuggestorConfigurator implements Configurator {
private boolean reinitNecessary = false;
@SuppressWarnings("unused")
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/DIGReasonerConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/DIGReasonerConfigurator.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/DIGReasonerConfigurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -29,7 +29,7 @@
* automatically generated, do not edit manually.
* run org.dllearner.scripts.ConfigJavaGenerator to update
**/
-public class DIGReasonerConfigurator {
+public class DIGReasonerConfigurator implements Configurator {
private boolean reinitNecessary = false;
@SuppressWarnings("unused")
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/ExampleBasedROLComponentConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/ExampleBasedROLComponentConfigurator.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/ExampleBasedROLComponentConfigurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -31,7 +31,7 @@
* automatically generated, do not edit manually.
* run org.dllearner.scripts.ConfigJavaGenerator to update
**/
-public class ExampleBasedROLComponentConfigurator {
+public class ExampleBasedROLComponentConfigurator implements Configurator {
private boolean reinitNecessary = false;
@SuppressWarnings("unused")
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/FastInstanceCheckerConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/FastInstanceCheckerConfigurator.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/FastInstanceCheckerConfigurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -29,7 +29,7 @@
* automatically generated, do not edit manually.
* run org.dllearner.scripts.ConfigJavaGenerator to update
**/
-public class FastInstanceCheckerConfigurator {
+public class FastInstanceCheckerConfigurator implements Configurator {
private boolean reinitNecessary = false;
@SuppressWarnings("unused")
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/FastRetrievalReasonerConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/FastRetrievalReasonerConfigurator.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/FastRetrievalReasonerConfigurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -29,7 +29,7 @@
* automatically generated, do not edit manually.
* run org.dllearner.scripts.ConfigJavaGenerator to update
**/
-public class FastRetrievalReasonerConfigurator {
+public class FastRetrievalReasonerConfigurator implements Configurator {
private boolean reinitNecessary = false;
@SuppressWarnings("unused")
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/GPConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/GPConfigurator.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/GPConfigurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -30,7 +30,7 @@
* automatically generated, do not edit manually.
* run org.dllearner.scripts.ConfigJavaGenerator to update
**/
-public class GPConfigurator {
+public class GPConfigurator implements Configurator {
private boolean reinitNecessary = false;
@SuppressWarnings("unused")
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/KBFileConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/KBFileConfigurator.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/KBFileConfigurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -27,7 +27,7 @@
* automatically generated, do not edit manually.
* run org.dllearner.scripts.ConfigJavaGenerator to update
**/
-public class KBFileConfigurator {
+public class KBFileConfigurator implements Configurator {
private boolean reinitNecessary = false;
@SuppressWarnings("unused")
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIOntologyConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIOntologyConfigurator.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIOntologyConfigurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -27,7 +27,7 @@
* automatically generated, do not edit manually.
* run org.dllearner.scripts.ConfigJavaGenerator to update
**/
-public class OWLAPIOntologyConfigurator {
+public class OWLAPIOntologyConfigurator implements Configurator {
private boolean reinitNecessary = false;
@SuppressWarnings("unused")
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIReasonerConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIReasonerConfigurator.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/OWLAPIReasonerConfigurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -29,7 +29,7 @@
* automatically generated, do not edit manually.
* run org.dllearner.scripts.ConfigJavaGenerator to update
**/
-public class OWLAPIReasonerConfigurator {
+public class OWLAPIReasonerConfigurator implements Configurator {
private boolean reinitNecessary = false;
@SuppressWarnings("unused")
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/OWLFileConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/OWLFileConfigurator.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/OWLFileConfigurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -27,7 +27,7 @@
* automatically generated, do not edit manually.
* run org.dllearner.scripts.ConfigJavaGenerator to update
**/
-public class OWLFileConfigurator {
+public class OWLFileConfigurator implements Configurator {
private boolean reinitNecessary = false;
@SuppressWarnings("unused")
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPConfigurator.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPConfigurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -29,7 +29,7 @@
* automatically generated, do not edit manually.
* run org.dllearner.scripts.ConfigJavaGenerator to update
**/
-public class PosNegDefinitionLPConfigurator {
+public class PosNegDefinitionLPConfigurator implements Configurator {
private boolean reinitNecessary = false;
@SuppressWarnings("unused")
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPStrictConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPStrictConfigurator.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/PosNegDefinitionLPStrictConfigurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -29,7 +29,7 @@
* automatically generated, do not edit manually.
* run org.dllearner.scripts.ConfigJavaGenerator to update
**/
-public class PosNegDefinitionLPStrictConfigurator {
+public class PosNegDefinitionLPStrictConfigurator implements Configurator {
private boolean reinitNecessary = false;
@SuppressWarnings("unused")
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/PosNegInclusionLPConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/PosNegInclusionLPConfigurator.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/PosNegInclusionLPConfigurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -29,7 +29,7 @@
* automatically generated, do not edit manually.
* run org.dllearner.scripts.ConfigJavaGenerator to update
**/
-public class PosNegInclusionLPConfigurator {
+public class PosNegInclusionLPConfigurator implements Configurator {
private boolean reinitNecessary = false;
@SuppressWarnings("unused")
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyDefinitionLPConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyDefinitionLPConfigurator.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyDefinitionLPConfigurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -29,7 +29,7 @@
* automatically generated, do not edit manually.
* run org.dllearner.scripts.ConfigJavaGenerator to update
**/
-public class PosOnlyDefinitionLPConfigurator {
+public class PosOnlyDefinitionLPConfigurator implements Configurator {
private boolean reinitNecessary = false;
@SuppressWarnings("unused")
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyInclusionLPConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyInclusionLPConfigurator.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/PosOnlyInclusionLPConfigurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -29,7 +29,7 @@
* automatically generated, do not edit manually.
* run org.dllearner.scripts.ConfigJavaGenerator to update
**/
-public class PosOnlyInclusionLPConfigurator {
+public class PosOnlyInclusionLPConfigurator implements Configurator {
private boolean reinitNecessary = false;
@SuppressWarnings("unused")
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/ROLearnerConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/ROLearnerConfigurator.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/ROLearnerConfigurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -31,7 +31,7 @@
* automatically generated, do not edit manually.
* run org.dllearner.scripts.ConfigJavaGenerator to update
**/
-public class ROLearnerConfigurator {
+public class ROLearnerConfigurator implements Configurator {
private boolean reinitNecessary = false;
@SuppressWarnings("unused")
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/RandomGuesserConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/RandomGuesserConfigurator.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/RandomGuesserConfigurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -30,7 +30,7 @@
* automatically generated, do not edit manually.
* run org.dllearner.scripts.ConfigJavaGenerator to update
**/
-public class RandomGuesserConfigurator {
+public class RandomGuesserConfigurator implements Configurator {
private boolean reinitNecessary = false;
@SuppressWarnings("unused")
Added: trunk/src/dl-learner/org/dllearner/core/configurators/RoleLearningConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/RoleLearningConfigurator.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/RoleLearningConfigurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -0,0 +1,160 @@
+/**
+ * Copyright (C) 2007-2008, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ *
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package org.dllearner.core.configurators;
+
+import java.util.Set;
+import org.dllearner.core.ComponentManager;
+import org.dllearner.core.ReasoningService;
+import org.dllearner.learningproblems.RoleLearning;
+
+/**
+* automatically generated, do not edit manually.
+* run org.dllearner.scripts.ConfigJavaGenerator to update
+**/
+public class RoleLearningConfigurator implements Configurator {
+
+private boolean reinitNecessary = false;
+@SuppressWarnings("unused")
+
+private RoleLearning roleLearning;
+
+/**
+* @param roleLearning see RoleLearning
+**/
+public RoleLearningConfigurator(RoleLearning roleLearning){
+this.roleLearning = roleLearning;
+}
+
+/**
+* @param reasoningService see reasoningService
+* @param positiveExamples positive examples
+* @param negativeExamples negative examples
+* @return RoleLearning
+**/
+public static RoleLearning getRoleLearning(ReasoningService reasoningService, Set<String> positiveExamples, Set<String> negativeExamples) {
+RoleLearning component = ComponentManager.getInstance().learningProblem(RoleLearning.class, reasoningService);
+ComponentManager.getInstance().applyConfigEntry(component, "positiveExamples", positiveExamples);
+ComponentManager.getInstance().applyConfigEntry(component, "negativeExamples", negativeExamples);
+return component;
+}
+
+/**
+* positiveExamples positive examples.
+* mandatory: true| reinit necessary: false
+* default value: null
+* @return Set(String)
+**/
+@SuppressWarnings("unchecked")
+public Set<String> getPositiveExamples() {
+return (Set<String>) ComponentManager.getInstance().getConfigOptionValue(roleLearning, "positiveExamples") ;
+}
+/**
+* negativeExamples negative examples.
+* mandatory: true| reinit necessary: false
+* default value: null
+* @return Set(String)
+**/
+@SuppressWarnings("unchecked")
+public Set<String> getNegativeExamples() {
+return (Set<String>) ComponentManager.getInstance().getConfigOptionValue(roleLearning, "negativeExamples") ;
+}
+/**
+* useRetrievalForClassficiation Specifies whether to use retrieval or instance checks for testing a concept..
+* mandatory: false| reinit necessary: true
+* default value: false
+* @return boolean
+**/
+public boolean getUseRetrievalForClassficiation() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(roleLearning, "useRetrievalForClassficiation") ;
+}
+/**
+* percentPerLenghtUnit describes the reduction in classification accuracy in percent one is willing to accept for reducing the length of the concept by one.
+* mandatory: false| reinit necessary: true
+* default value: 0.05
+* @return double
+**/
+public double getPercentPerLenghtUnit() {
+return (Double) ComponentManager.getInstance().getConfigOptionValue(roleLearning, "percentPerLenghtUnit") ;
+}
+/**
+* useMultiInstanceChecks See UseMultiInstanceChecks enum..
+* mandatory: false| reinit necessary: true
+* default value: twoChecks
+* @return String
+**/
+public String getUseMultiInstanceChecks() {
+return (String) ComponentManager.getInstance().getConfigOptionValue(roleLearning, "useMultiInstanceChecks") ;
+}
+
+/**
+* @param positiveExamples positive examples.
+* mandatory: true| reinit necessary: false
+* default value: null
+**/
+public void setPositiveExamples(Set<String> positiveExamples) {
+ComponentManager.getInstance().applyConfigEntry(roleLearning, "positiveExamples", positiveExamples);
+}
+/**
+* @param negativeExamples negative examples.
+* mandatory: true| reinit necessary: false
+* default value: null
+**/
+public void setNegativeExamples(Set<String> negativeExamples) {
+ComponentManager.getInstance().applyConfigEntry(roleLearning, "negativeExamples", negativeExamples);
+}
+/**
+* @param useRetrievalForClassficiation Specifies whether to use retrieval or instance checks for testing a concept..
+* mandatory: false| reinit necessary: true
+* default value: false
+**/
+public void setUseRetrievalForClassficiation(boolean useRetrievalForClassficiation) {
+ComponentManager.getInstance().applyConfigEntry(roleLearning, "useRetrievalForClassficiation", useRetrievalForClassficiation);
+reinitNecessary = true;
+}
+/**
+* @param percentPerLenghtUnit describes the reduction in classification accuracy in percent one is willing to accept for reducing the length of the concept by one.
+* mandatory: false| reinit necessary: true
+* default value: 0.05
+**/
+public void setPercentPerLenghtUnit(double percentPerLenghtUnit) {
+ComponentManager.getInstance().applyConfigEntry(roleLearning, "percentPerLenghtUnit", percentPerLenghtUnit);
+reinitNecessary = true;
+}
+/**
+* @param useMultiInstanceChecks See UseMultiInstanceChecks enum..
+* mandatory: false| reinit necessary: true
+* default value: twoChecks
+**/
+public void setUseMultiInstanceChecks(String useMultiInstanceChecks) {
+ComponentManager.getInstance().applyConfigEntry(roleLearning, "useMultiInstanceChecks", useMultiInstanceChecks);
+reinitNecessary = true;
+}
+
+/**
+* true, if this component needs reinitializsation.
+* @return boolean
+**/
+public boolean isReinitNecessary(){
+return reinitNecessary;
+}
+
+
+}
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/SimpleSuggestionLearningAlgorithmConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/SimpleSuggestionLearningAlgorithmConfigurator.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/SimpleSuggestionLearningAlgorithmConfigurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -30,7 +30,7 @@
* automatically generated, do not edit manually.
* run org.dllearner.scripts.ConfigJavaGenerator to update
**/
-public class SimpleSuggestionLearningAlgorithmConfigurator {
+public class SimpleSuggestionLearningAlgorithmConfigurator implements Configurator {
private boolean reinitNecessary = false;
@SuppressWarnings("unused")
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/SparqlKnowledgeSourceConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/SparqlKnowledgeSourceConfigurator.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/SparqlKnowledgeSourceConfigurator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -30,7 +30,7 @@
* automatically generated, do not edit manually.
* run org.dllearner.scripts.ConfigJavaGenerator to update
**/
-public class SparqlKnowledgeSourceConfigurator {
+public class SparqlKnowledgeSourceConfigurator implements Configurator {
private boolean reinitNecessary = false;
@SuppressWarnings("unused")
Modified: trunk/src/dl-learner/org/dllearner/kb/KBFile.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/KBFile.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/kb/KBFile.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -66,6 +66,7 @@
private KB kb;
private KBFileConfigurator configurator;
+ @Override
public KBFileConfigurator getConfigurator(){
return configurator;
}
Modified: trunk/src/dl-learner/org/dllearner/kb/OWLAPIOntology.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/OWLAPIOntology.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/kb/OWLAPIOntology.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -7,16 +7,24 @@
import org.dllearner.core.OntologyFormat;
import org.dllearner.core.config.ConfigEntry;
import org.dllearner.core.config.InvalidConfigOptionValueException;
+import org.dllearner.core.configurators.OWLAPIOntologyConfigurator;
import org.dllearner.core.owl.KB;
import org.semanticweb.owl.model.OWLOntology;
public class OWLAPIOntology extends KnowledgeSource {
+ private OWLAPIOntologyConfigurator configurator;
+ @Override
+ public OWLAPIOntologyConfigurator getConfigurator(){
+ return configurator;
+ }
+
private OWLOntology ontology;
public OWLAPIOntology(OWLOntology onto)
{
this.ontology = onto;
+ this.configurator = new OWLAPIOntologyConfigurator(this);
}
@Override
Modified: trunk/src/dl-learner/org/dllearner/kb/OWLFile.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/OWLFile.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/kb/OWLFile.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -49,7 +49,8 @@
private URL url;
private OWLFileConfigurator configurator ;
- public OWLFileConfigurator getOWLFileConfigurator(){
+ @Override
+ public OWLFileConfigurator getConfigurator(){
return configurator;
}
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -87,6 +87,7 @@
/**
* @return the configurator for this Knowledgesource
*/
+ @Override
public SparqlKnowledgeSourceConfigurator getConfigurator() {
return configurator;
}
Modified: trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLP.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLP.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLP.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -48,7 +48,7 @@
public class PosNegDefinitionLP extends PosNegLP implements DefinitionLP {
private PosNegDefinitionLPConfigurator configurator;
-
+ @Override
public PosNegDefinitionLPConfigurator getConfigurator() {
return configurator;
}
Modified: trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLPStrict.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLPStrict.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLPStrict.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -53,7 +53,7 @@
private double errorPenalty = defaultErrorPenalty;
private PosNegDefinitionLPStrictConfigurator configurator;
-
+ @Override
public PosNegDefinitionLPStrictConfigurator getConfigurator(){
return configurator;
}
Modified: trunk/src/dl-learner/org/dllearner/learningproblems/PosNegInclusionLP.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/learningproblems/PosNegInclusionLP.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/learningproblems/PosNegInclusionLP.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -24,7 +24,6 @@
import org.dllearner.core.ReasoningService;
import org.dllearner.core.Score;
-import org.dllearner.core.config.CommonConfigMappings;
import org.dllearner.core.configurators.ComponentFactory;
import org.dllearner.core.configurators.PosNegInclusionLPConfigurator;
import org.dllearner.core.owl.Description;
@@ -57,6 +56,7 @@
private PosNegDefinitionLP definitionLP;
private PosNegInclusionLPConfigurator configurator;
+ @Override
public PosNegInclusionLPConfigurator getConfigurator(){
return configurator;
}
Modified: trunk/src/dl-learner/org/dllearner/learningproblems/PosOnlyDefinitionLP.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/learningproblems/PosOnlyDefinitionLP.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/learningproblems/PosOnlyDefinitionLP.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -38,6 +38,7 @@
private PosNegDefinitionLP definitionLP;
private PosOnlyDefinitionLPConfigurator configurator;
+ @Override
public PosOnlyDefinitionLPConfigurator getConfigurator(){
return configurator;
}
@@ -71,7 +72,7 @@
reasoningService,
SetManipulation.indToString(positiveExamples),
SetManipulation.indToString(pseudoNegatives));
- definitionLP = new PosNegDefinitionLP(reasoningService, positiveExamples, pseudoNegatives);
+ //definitionLP = new PosNegDefinitionLP(reasoningService, positiveExamples, pseudoNegatives);
// TODO: we must make sure that the problem also gets the same
// reasoning options (i.e. options are the same up to reversed example sets)
definitionLP.init();
Modified: trunk/src/dl-learner/org/dllearner/learningproblems/PosOnlyInclusionLP.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/learningproblems/PosOnlyInclusionLP.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/learningproblems/PosOnlyInclusionLP.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -23,6 +23,7 @@
import org.dllearner.core.Score;
import org.dllearner.core.config.ConfigEntry;
import org.dllearner.core.config.InvalidConfigOptionValueException;
+import org.dllearner.core.configurators.PosOnlyInclusionLPConfigurator;
import org.dllearner.core.owl.Description;
/**
@@ -31,8 +32,16 @@
*/
public class PosOnlyInclusionLP extends PosOnlyLP implements InclusionLP {
+ private PosOnlyInclusionLPConfigurator configurator;
+ @Override
+ public PosOnlyInclusionLPConfigurator getConfigurator(){
+ return configurator;
+ }
+
+
public PosOnlyInclusionLP(ReasoningService reasoningService) {
super(reasoningService);
+ this.configurator = new PosOnlyInclusionLPConfigurator(this);
}
/* (non-Javadoc)
Modified: trunk/src/dl-learner/org/dllearner/learningproblems/RoleLearning.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/learningproblems/RoleLearning.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/learningproblems/RoleLearning.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -25,6 +25,7 @@
import org.dllearner.core.ReasoningService;
import org.dllearner.core.Score;
+import org.dllearner.core.configurators.RoleLearningConfigurator;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Individual;
import org.dllearner.utilities.datastructures.StringTuple;
@@ -43,6 +44,13 @@
*/
public class RoleLearning extends PosNegLP implements DefinitionLP {
+ private RoleLearningConfigurator configurator;
+ @Override
+ public RoleLearningConfigurator getConfigurator(){
+ return configurator;
+ }
+
+
public RoleLearning(ReasoningService reasoningService) {
super(reasoningService);
}
@@ -51,6 +59,7 @@
SortedSet<Individual> positiveExamples,
SortedSet<Individual> negativeExamples) {
super(reasoningService);
+ this.configurator = new RoleLearningConfigurator(this);
// TODO sets have to be queried
this.positiveExamples = positiveExamples;
this.negativeExamples = negativeExamples;
Modified: trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -46,10 +46,11 @@
import org.dllearner.core.config.ConfigOption;
import org.dllearner.core.config.InvalidConfigOptionValueException;
import org.dllearner.core.config.StringConfigOption;
+import org.dllearner.core.configurators.DIGReasonerConfigurator;
+import org.dllearner.core.owl.Description;
+import org.dllearner.core.owl.Individual;
import org.dllearner.core.owl.NamedClass;
import org.dllearner.core.owl.Nothing;
-import org.dllearner.core.owl.Description;
-import org.dllearner.core.owl.Individual;
import org.dllearner.core.owl.ObjectProperty;
import org.dllearner.core.owl.ObjectPropertyHierarchy;
import org.dllearner.core.owl.SubsumptionHierarchy;
@@ -75,6 +76,13 @@
*
*/
public class DIGReasoner extends ReasonerComponent {
+
+ private DIGReasonerConfigurator configurator;
+ @Override
+ public DIGReasonerConfigurator getConfigurator(){
+ return configurator;
+ }
+
URL reasonerURL;
Set<KnowledgeSource> sources;
@@ -105,7 +113,10 @@
private File digProtocolFile;
private static String defaultDIGProtocolFile = "log/digProtocol.txt";
+
+
public DIGReasoner(Set<KnowledgeSource> sources) {
+ this.configurator = new DIGReasonerConfigurator(this);
this.sources = sources;
try {
reasonerURL = new URL("http://localhost:8081");
Modified: trunk/src/dl-learner/org/dllearner/reasoning/FastInstanceChecker.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/FastInstanceChecker.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/reasoning/FastInstanceChecker.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -92,6 +92,7 @@
private boolean defaultNegation = true;
private FastInstanceCheckerConfigurator configurator;
+ @Override
public FastInstanceCheckerConfigurator getConfigurator (){
return configurator;
}
Modified: trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -1,8 +1,8 @@
package org.dllearner.reasoning;
+import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.HashSet;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -13,10 +13,12 @@
import org.dllearner.core.ReasoningService;
import org.dllearner.core.config.ConfigEntry;
import org.dllearner.core.config.InvalidConfigOptionValueException;
-import org.dllearner.core.owl.NamedClass;
+import org.dllearner.core.configurators.ComponentFactory;
+import org.dllearner.core.configurators.FastRetrievalReasonerConfigurator;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.FlatABox;
import org.dllearner.core.owl.Individual;
+import org.dllearner.core.owl.NamedClass;
import org.dllearner.core.owl.ObjectProperty;
import org.dllearner.core.owl.ObjectPropertyHierarchy;
import org.dllearner.core.owl.SubsumptionHierarchy;
@@ -25,6 +27,12 @@
public class FastRetrievalReasoner extends ReasonerComponent {
+ private FastRetrievalReasonerConfigurator configurator;
+ @Override
+ public FastRetrievalReasonerConfigurator getConfigurator(){
+ return configurator;
+ }
+
FlatABox abox;
FastRetrieval fastRetrieval;
Set<NamedClass> atomicConcepts;
@@ -34,8 +42,12 @@
ReasoningService rs;
ReasonerComponent rc;
+
+
public FastRetrievalReasoner(Set<KnowledgeSource> sources) {
- rc = new DIGReasoner(sources);
+ this.configurator = new FastRetrievalReasonerConfigurator(this);
+
+ rc = ComponentFactory.getDIGReasoner(sources);
try {
rc.init();
} catch (ComponentInitException e1) {
@@ -56,6 +68,7 @@
}
public FastRetrievalReasoner(FlatABox abox) {
+ this.configurator = new FastRetrievalReasonerConfigurator(this);
this.abox = abox;
fastRetrieval = new FastRetrieval(abox);
Modified: trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -105,6 +105,7 @@
//private String reasonerType = "pellet";
private OWLAPIReasonerConfigurator configurator;
+ @Override
public OWLAPIReasonerConfigurator getConfigurator(){
return configurator;
}
Modified: trunk/src/dl-learner/org/dllearner/scripts/ConfigJavaGenerator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/ConfigJavaGenerator.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/scripts/ConfigJavaGenerator.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -78,6 +78,8 @@
private static final String CONFIGURATOR = "Configurator";
private static final String COMPONENT_FACTORY = "ComponentFactory";
+ private static final String CLASS_COMMENT = "* automatically generated, do not edit manually.\n"
+ + "* run " + ConfigJavaGenerator.class.getCanonicalName()+ " to update\n";
private static final SortedSet<String> COMPONENT_FACTORY_IMPORTS = new TreeSet<String>();
@@ -194,6 +196,7 @@
}
makeComponentFactory();
+ makeInterface();
System.out.println("Done");
}
@@ -252,13 +255,20 @@
.add(makeGetInstanceForConfigurators(getAllCommentsForOptionList(mandatoryOptions)));
// body.add(makeApplyConfigEntryForOptionList(ComponentManager.getConfigOptions(component)));
-
+
body.add(expandCollection(getters, "", "", 0));
body.add(expandCollection(setters, "", "", 0));
body.add(REINITGETTER);
- String ret = fillClassTemplate(TARGET_PACKAGE, expandCollection(
- imports, "import ", ";\n", 0), className + CONFIGURATOR, "",
- expandCollection(body, "", "\n", 0));
+ String bodytmp = expandCollection(body, "", "\n",0);
+ String importtmp = expandCollection(imports, "import ", ";\n", 0);
+ String ret = fillClassTemplate(
+ TARGET_PACKAGE,
+ importtmp,
+ className + CONFIGURATOR,
+ "",
+ bodytmp ,
+ "",
+ CONFIGURATOR);
// configuratorMethods.add((className, componentType,
// mandatoryOptions));
@@ -270,6 +280,15 @@
.add(makeComponentFactoryMethods(getAllCommentsForOptionList(mandatoryOptions)));
}
+ private static void makeInterface(){
+ String ret ="";
+ ret+= HEADER+"\n";
+ ret+= "package "+TARGET_PACKAGE+";\n\n";
+ ret+= fillJavaDocComment(CLASS_COMMENT);
+ ret+="public interface Configurator{\n}\n";
+ Files.createFile(new File(TARGET_DIR+File.separator+CONFIGURATOR+".java"), ret);
+ }
+
@SuppressWarnings("unused")
private static String makeApplyConfigEntryForOptionList(
List<ConfigOption<?>> options) {
@@ -392,7 +411,7 @@
String ret = fillClassTemplate(TARGET_PACKAGE, expandCollection(
COMPONENT_FACTORY_IMPORTS, "import ", ";\n", 0),
COMPONENT_FACTORY, "", expandCollection(
- COMPONENT_FACTORY_METHODS, "", "\n", 0), "final");
+ COMPONENT_FACTORY_METHODS, "", "\n", 0), "final","");
Files.createFile(new File(TARGET_DIR + "/" + COMPONENT_FACTORY
+ ".java"), ret);
@@ -463,30 +482,28 @@
}
- private static String fillClassTemplate(String packagE, String imports,
- String className, String extendS, String body) {
- return fillClassTemplate(packagE, imports, className, extendS, body, "");
- }
+
private static String fillClassTemplate(String packagE, String imports,
- String className, String extendS, String body, String classModifier) {
- String comment = "* automatically generated, do not edit manually.\n";
- comment += "* run " + ConfigJavaGenerator.class.getCanonicalName()
- + " to update\n";
+ String className, String extendS, String body, String classModifier, String implementS) {
+
String ret = HEADER + "\n";
ret += "package " + packagE + ";\n\n";
ret += imports + "\n";
- ret += fillJavaDocComment(comment);
+ ret += fillJavaDocComment(CLASS_COMMENT);
ret += (INCLUDE_UNUSED) ? UNUSED : "";
ret += "public "+classModifier+" class " + className + " "
+ ((extendS.length() > 0) ? "extends " + extendS : "")
+ + ((implementS.length() > 0) ? "implements " + implementS : "")
+ " {\n\n";
ret += body + "\n";
ret += "}\n";
return ret;
}
+
+
private static String expandCollection(Collection<String> col,
String before, String after, int removeChars) {
Modified: trunk/src/dl-learner/org/dllearner/scripts/NewSample.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/NewSample.java 2008-09-09 11:38:48 UTC (rev 1184)
+++ trunk/src/dl-learner/org/dllearner/scripts/NewSample.java 2008-09-09 13:40:43 UTC (rev 1185)
@@ -121,7 +121,7 @@
String fileURL = new File(owlFile).toURI().toString();
OWLFile ks = ComponentFactory.getOWLFile( fileURL);
-
+
Set<KnowledgeSource> tmp = new HashSet<KnowledgeSource>();
tmp.add(ks);
// reasoner
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
