Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1932] trunk/src/dl-learner/org/dllearner
|
From: <jen...@us...> - 2009-12-17 15:18:25
|
Revision: 1932
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1932&view=rev
Author: jenslehmann
Date: 2009-12-17 15:18:17 +0000 (Thu, 17 Dec 2009)
Log Message:
-----------
option instanceBasedDisjoints in CELOE and OCEL
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/algorithms/celoe/CELOE.java
trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java
trunk/src/dl-learner/org/dllearner/algorithms/refinement2/ROLComponent2.java
trunk/src/dl-learner/org/dllearner/core/configurators/CELOEConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/ROLComponent2Configurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/ROLearnerConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/RefinementOperatorConfigurator.java
trunk/src/dl-learner/org/dllearner/refinementoperators/RhoDRDown.java
Modified: trunk/src/dl-learner/org/dllearner/algorithms/celoe/CELOE.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/celoe/CELOE.java 2009-12-15 22:17:07 UTC (rev 1931)
+++ trunk/src/dl-learner/org/dllearner/algorithms/celoe/CELOE.java 2009-12-17 15:18:17 UTC (rev 1932)
@@ -164,6 +164,7 @@
options.add(CommonConfigOptions.getMaxDepth(7));
options.add(CommonConfigOptions.maxNrOfResults(10));
options.add(new BooleanConfigOption("singleSuggestionMode", "Use this if you are interested in only one suggestion and your learning problem has many (more than 1000) examples.", false));
+ options.add(CommonConfigOptions.getInstanceBasedDisjoints());
return options;
}
Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java 2009-12-15 22:17:07 UTC (rev 1931)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java 2009-12-17 15:18:17 UTC (rev 1932)
@@ -239,6 +239,7 @@
options.add(CommonConfigOptions.minExecutionTimeInSeconds());
options.add(CommonConfigOptions.guaranteeXgoodDescriptions());
options.add(CommonConfigOptions.getLogLevel());
+ options.add(CommonConfigOptions.getInstanceBasedDisjoints());
return options;
}
Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement2/ROLComponent2.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refinement2/ROLComponent2.java 2009-12-15 22:17:07 UTC (rev 1931)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refinement2/ROLComponent2.java 2009-12-17 15:18:17 UTC (rev 1932)
@@ -214,6 +214,7 @@
options.add(new DoubleConfigOption("startNodeBonus", "You can use this to give a heuristic bonus on the start node (= initially broader exploration of search space).",0.0));
options.add(new IntegerConfigOption("negationPenalty", "Penalty on negations (TODO: better explanation).", 0));
options.add(CommonConfigOptions.getExpansionPenaltyFactor(0.02));
+ options.add(CommonConfigOptions.getInstanceBasedDisjoints());
return options;
}
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/CELOEConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/CELOEConfigurator.java 2009-12-15 22:17:07 UTC (rev 1931)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/CELOEConfigurator.java 2009-12-17 15:18:17 UTC (rev 1932)
@@ -183,6 +183,15 @@
public boolean getSingleSuggestionMode() {
return (Boolean) ComponentManager.getInstance().getConfigOptionValue(cELOE, "singleSuggestionMode") ;
}
+/**
+* instanceBasedDisjoints Specifies whether to use real disjointness checks or instance based ones (no common instances) in the refinement operator..
+* mandatory: false| reinit necessary: true
+* default value: true
+* @return boolean
+**/
+public boolean getInstanceBasedDisjoints() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(cELOE, "instanceBasedDisjoints") ;
+}
/**
* @param useAllConstructor specifies whether the universal concept constructor is used in the learning algorithm.
@@ -310,6 +319,15 @@
ComponentManager.getInstance().applyConfigEntry(cELOE, "singleSuggestionMode", singleSuggestionMode);
reinitNecessary = true;
}
+/**
+* @param instanceBasedDisjoints Specifies whether to use real disjointness checks or instance based ones (no common instances) in the refinement operator..
+* mandatory: false| reinit necessary: true
+* default value: true
+**/
+public void setInstanceBasedDisjoints(boolean instanceBasedDisjoints) {
+ComponentManager.getInstance().applyConfigEntry(cELOE, "instanceBasedDisjoints", instanceBasedDisjoints);
+reinitNecessary = true;
+}
/**
* true, if this component needs reinitializsation.
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/ROLComponent2Configurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/ROLComponent2Configurator.java 2009-12-15 22:17:07 UTC (rev 1931)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/ROLComponent2Configurator.java 2009-12-17 15:18:17 UTC (rev 1932)
@@ -413,6 +413,15 @@
public double getExpansionPenaltyFactor() {
return (Double) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "expansionPenaltyFactor") ;
}
+/**
+* instanceBasedDisjoints Specifies whether to use real disjointness checks or instance based ones (no common instances) in the refinement operator..
+* mandatory: false| reinit necessary: true
+* default value: true
+* @return boolean
+**/
+public boolean getInstanceBasedDisjoints() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "instanceBasedDisjoints") ;
+}
/**
* @param writeSearchTree specifies whether to write a search tree.
@@ -765,6 +774,15 @@
ComponentManager.getInstance().applyConfigEntry(rOLComponent2, "expansionPenaltyFactor", expansionPenaltyFactor);
reinitNecessary = true;
}
+/**
+* @param instanceBasedDisjoints Specifies whether to use real disjointness checks or instance based ones (no common instances) in the refinement operator..
+* mandatory: false| reinit necessary: true
+* default value: true
+**/
+public void setInstanceBasedDisjoints(boolean instanceBasedDisjoints) {
+ComponentManager.getInstance().applyConfigEntry(rOLComponent2, "instanceBasedDisjoints", instanceBasedDisjoints);
+reinitNecessary = true;
+}
/**
* true, if this component needs reinitializsation.
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/ROLearnerConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/ROLearnerConfigurator.java 2009-12-15 22:17:07 UTC (rev 1931)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/ROLearnerConfigurator.java 2009-12-17 15:18:17 UTC (rev 1932)
@@ -287,6 +287,15 @@
public String getLogLevel() {
return (String) ComponentManager.getInstance().getConfigOptionValue(rOLearner, "logLevel") ;
}
+/**
+* instanceBasedDisjoints Specifies whether to use real disjointness checks or instance based ones (no common instances) in the refinement operator..
+* mandatory: false| reinit necessary: true
+* default value: true
+* @return boolean
+**/
+public boolean getInstanceBasedDisjoints() {
+return (Boolean) ComponentManager.getInstance().getConfigOptionValue(rOLearner, "instanceBasedDisjoints") ;
+}
/**
* @param writeSearchTree specifies whether to write a search tree.
@@ -513,6 +522,15 @@
ComponentManager.getInstance().applyConfigEntry(rOLearner, "logLevel", logLevel);
reinitNecessary = true;
}
+/**
+* @param instanceBasedDisjoints Specifies whether to use real disjointness checks or instance based ones (no common instances) in the refinement operator..
+* mandatory: false| reinit necessary: true
+* default value: true
+**/
+public void setInstanceBasedDisjoints(boolean instanceBasedDisjoints) {
+ComponentManager.getInstance().applyConfigEntry(rOLearner, "instanceBasedDisjoints", instanceBasedDisjoints);
+reinitNecessary = true;
+}
/**
* true, if this component needs reinitializsation.
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/RefinementOperatorConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/RefinementOperatorConfigurator.java 2009-12-15 22:17:07 UTC (rev 1931)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/RefinementOperatorConfigurator.java 2009-12-17 15:18:17 UTC (rev 1932)
@@ -39,6 +39,8 @@
// below are optional parameters (neutral return values choosen)
+ public abstract boolean getInstanceBasedDisjoints();
+
public boolean getUseHasValueConstructor() {
return false;
}
Modified: trunk/src/dl-learner/org/dllearner/refinementoperators/RhoDRDown.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/refinementoperators/RhoDRDown.java 2009-12-15 22:17:07 UTC (rev 1931)
+++ trunk/src/dl-learner/org/dllearner/refinementoperators/RhoDRDown.java 2009-12-17 15:18:17 UTC (rev 1932)
@@ -228,6 +228,7 @@
this.useBooleanDatatypes = useBooleanDatatypes;
this.useDoubleDatatypes = useDoubleDatatypes;
useStringDatatypes = configurator.getUseStringDatatypes();
+ instanceBasedDisjoints = configurator.getInstanceBasedDisjoints();
if(startClass != null) {
this.startClass = startClass;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
