Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1715] trunk/src/dl-learner/org/dllearner
|
From: <jen...@us...> - 2009-04-19 16:38:25
|
Revision: 1715
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1715&view=rev
Author: jenslehmann
Date: 2009-04-19 16:38:14 +0000 (Sun, 19 Apr 2009)
Log Message:
-----------
- fixed sorting issues in learning algorithm results (now SortedSet is in ascending order as required in Java)
- fixed remaining warnings
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/algorithms/celoe/CELOE.java
trunk/src/dl-learner/org/dllearner/algorithms/el/ELLearningAlgorithm.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/algorithms/refinement2/ROLearner2.java
trunk/src/dl-learner/org/dllearner/core/LearningAlgorithm.java
trunk/src/dl-learner/org/dllearner/core/configurators/ClassLearningProblemConfigurator.java
trunk/src/dl-learner/org/dllearner/core/configurators/ROLComponent2Configurator.java
trunk/src/dl-learner/org/dllearner/tools/ore/explanation/Beta.java
trunk/src/dl-learner/org/dllearner/tools/ore/explanation/BetaGenerator.java
trunk/src/dl-learner/org/dllearner/tools/ore/explanation/Tau.java
trunk/src/dl-learner/org/dllearner/tools/ore/explanation/TauGenerator.java
trunk/src/dl-learner/org/dllearner/utilities/owl/EvaluatedDescriptionPosNegComparator.java
Modified: trunk/src/dl-learner/org/dllearner/algorithms/celoe/CELOE.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/celoe/CELOE.java 2009-04-19 09:27:10 UTC (rev 1714)
+++ trunk/src/dl-learner/org/dllearner/algorithms/celoe/CELOE.java 2009-04-19 16:38:14 UTC (rev 1715)
@@ -227,7 +227,7 @@
}
@Override
- public SortedSet<? extends EvaluatedDescription> getCurrentlyBestEvaluatedDescriptions() {
+ public TreeSet<? extends EvaluatedDescription> getCurrentlyBestEvaluatedDescriptions() {
return bestEvaluatedDescriptions.getSet();
}
Modified: trunk/src/dl-learner/org/dllearner/algorithms/el/ELLearningAlgorithm.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/el/ELLearningAlgorithm.java 2009-04-19 09:27:10 UTC (rev 1714)
+++ trunk/src/dl-learner/org/dllearner/algorithms/el/ELLearningAlgorithm.java 2009-04-19 16:38:14 UTC (rev 1715)
@@ -22,7 +22,6 @@
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
-import java.util.SortedSet;
import java.util.TreeSet;
import org.apache.log4j.Logger;
@@ -217,7 +216,7 @@
}
@Override
- public SortedSet<? extends EvaluatedDescription> getCurrentlyBestEvaluatedDescriptions() {
+ public TreeSet<? extends EvaluatedDescription> getCurrentlyBestEvaluatedDescriptions() {
return bestEvaluatedDescriptions.getSet();
}
Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java 2009-04-19 09:27:10 UTC (rev 1714)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java 2009-04-19 16:38:14 UTC (rev 1715)
@@ -1037,10 +1037,10 @@
}
@Override
- public SortedSet<EvaluatedDescriptionPosNeg> getCurrentlyBestEvaluatedDescriptions() {
+ public TreeSet<EvaluatedDescriptionPosNeg> getCurrentlyBestEvaluatedDescriptions() {
int count = 0;
SortedSet<Node> rev = candidatesStable.descendingSet();
- SortedSet<EvaluatedDescriptionPosNeg> cbd = new TreeSet<EvaluatedDescriptionPosNeg>(edComparator);
+ TreeSet<EvaluatedDescriptionPosNeg> cbd = new TreeSet<EvaluatedDescriptionPosNeg>(edComparator);
for(Node eb : rev) {
cbd.add(new EvaluatedDescriptionPosNeg(eb.getConcept(), getSolutionScore(eb.getConcept())));
// return a maximum of 200 elements (we need a maximum, because the
Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement2/ROLComponent2.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refinement2/ROLComponent2.java 2009-04-19 09:27:10 UTC (rev 1714)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refinement2/ROLComponent2.java 2009-04-19 16:38:14 UTC (rev 1715)
@@ -25,7 +25,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-import java.util.SortedSet;
+import java.util.TreeSet;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
@@ -456,7 +456,7 @@
}
@Override
- public synchronized SortedSet<EvaluatedDescriptionPosNeg> getCurrentlyBestEvaluatedDescriptions() {
+ public synchronized TreeSet<EvaluatedDescriptionPosNeg> getCurrentlyBestEvaluatedDescriptions() {
return algorithm.getCurrentlyBestEvaluatedDescriptions();
}
Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement2/ROLearner2.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refinement2/ROLearner2.java 2009-04-19 09:27:10 UTC (rev 1714)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refinement2/ROLearner2.java 2009-04-19 16:38:14 UTC (rev 1715)
@@ -1198,10 +1198,10 @@
return best;
}
- public SortedSet<EvaluatedDescriptionPosNeg> getCurrentlyBestEvaluatedDescriptions() {
+ public TreeSet<EvaluatedDescriptionPosNeg> getCurrentlyBestEvaluatedDescriptions() {
Iterator<ExampleBasedNode> it = candidatesStable.descendingIterator();
int count = 0;
- SortedSet<EvaluatedDescriptionPosNeg> cbd = new TreeSet<EvaluatedDescriptionPosNeg>(edComparator);
+ TreeSet<EvaluatedDescriptionPosNeg> cbd = new TreeSet<EvaluatedDescriptionPosNeg>(edComparator);
while(it.hasNext()) {
ExampleBasedNode eb = it.next();
cbd.add(new EvaluatedDescriptionPosNeg(eb.getConcept(), getScore(eb.getConcept())));
@@ -1280,7 +1280,7 @@
if(this.stop){
return true;
}
- System.out.println("ssssss");
+// System.out.println("ssssss");
long totalTimeNeeded = System.currentTimeMillis() - this.runtime;
long maxMilliSeconds = maxExecutionTimeInSeconds * 1000;
long minMilliSeconds = minExecutionTimeInSeconds * 1000;
Modified: trunk/src/dl-learner/org/dllearner/core/LearningAlgorithm.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/LearningAlgorithm.java 2009-04-19 09:27:10 UTC (rev 1714)
+++ trunk/src/dl-learner/org/dllearner/core/LearningAlgorithm.java 2009-04-19 16:38:14 UTC (rev 1715)
@@ -22,7 +22,6 @@
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
-import java.util.SortedSet;
import java.util.TreeSet;
import org.dllearner.core.owl.Description;
@@ -204,10 +203,10 @@
/**
* Returns a sorted set of the best descriptions found so far. We
* assume that they are ordered such that the best ones come in
- * first.
+ * last. (In Java, iterators traverse a SortedSet in ascending order.)
* @return Best class descriptions found so far.
*/
- public SortedSet<? extends EvaluatedDescription> getCurrentlyBestEvaluatedDescriptions() {
+ public TreeSet<? extends EvaluatedDescription> getCurrentlyBestEvaluatedDescriptions() {
TreeSet<EvaluatedDescription> ds = new TreeSet<EvaluatedDescription>();
ds.add(getCurrentlyBestEvaluatedDescription());
return ds;
@@ -232,9 +231,9 @@
* @return A list of currently best class descriptions.
*/
public synchronized List<? extends EvaluatedDescription> getCurrentlyBestEvaluatedDescriptions(int nrOfDescriptions, double accuracyThreshold, boolean filterNonMinimalDescriptions) {
- SortedSet<? extends EvaluatedDescription> currentlyBest = getCurrentlyBestEvaluatedDescriptions();
+ TreeSet<? extends EvaluatedDescription> currentlyBest = getCurrentlyBestEvaluatedDescriptions();
List<EvaluatedDescription> returnList = new LinkedList<EvaluatedDescription>();
- for(EvaluatedDescription ed : currentlyBest) {
+ for(EvaluatedDescription ed : currentlyBest.descendingSet()) {
// once we hit a description with a below threshold accuracy, we simply return
// because learning algorithms are advised to order descriptions by accuracy,
// so we won't find any concept with higher accuracy in the remaining list
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/ClassLearningProblemConfigurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/ClassLearningProblemConfigurator.java 2009-04-19 09:27:10 UTC (rev 1714)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/ClassLearningProblemConfigurator.java 2009-04-19 16:38:14 UTC (rev 1715)
@@ -63,7 +63,7 @@
return (String) ComponentManager.getInstance().getConfigOptionValue(classLearningProblem, "classToDescribe") ;
}
/**
-* type Whether to learn an equivalence class or super class axiom..
+* type Whether to learn an equivalence class or super class axiom or domain/range of a property..
* mandatory: false| reinit necessary: true
* default value: equivalence
* @return String
@@ -81,7 +81,7 @@
ComponentManager.getInstance().applyConfigEntry(classLearningProblem, "classToDescribe", classToDescribe);
}
/**
-* @param type Whether to learn an equivalence class or super class axiom..
+* @param type Whether to learn an equivalence class or super class axiom or domain/range of a property..
* mandatory: false| reinit necessary: true
* default value: equivalence
**/
Modified: trunk/src/dl-learner/org/dllearner/core/configurators/ROLComponent2Configurator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/configurators/ROLComponent2Configurator.java 2009-04-19 09:27:10 UTC (rev 1714)
+++ trunk/src/dl-learner/org/dllearner/core/configurators/ROLComponent2Configurator.java 2009-04-19 16:38:14 UTC (rev 1715)
@@ -26,12 +26,14 @@
import org.dllearner.core.LearningProblem;
import org.dllearner.core.LearningProblemUnsupportedException;
import org.dllearner.core.ReasonerComponent;
+import org.dllearner.core.configurators.RefinementOperatorConfigurator;
/**
* automatically generated, do not edit manually.
* run org.dllearner.scripts.ConfigJavaGenerator to update
**/
-public class ROLComponent2Configurator extends RefinementOperatorConfigurator implements Configurator {
+@SuppressWarnings("all")
+public class ROLComponent2Configurator extends RefinementOperatorConfigurator implements Configurator {
private boolean reinitNecessary = false;
@SuppressWarnings("unused")
@@ -331,15 +333,6 @@
return (Boolean) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "usePropernessChecks") ;
}
/**
-* maxPosOnlyExpansion specifies how often a node in the search tree of a posonly learning problem needs to be expanded before it is considered as solution candidate.
-* mandatory: false| reinit necessary: true
-* default value: 4
-* @return int
-**/
-public int getMaxPosOnlyExpansion() {
-return (Integer) ComponentManager.getInstance().getConfigOptionValue(rOLComponent2, "maxPosOnlyExpansion") ;
-}
-/**
* noisePercentage the (approximated) percentage of noise within the examples.
* mandatory: false| reinit necessary: true
* default value: 0.0
@@ -683,15 +676,6 @@
reinitNecessary = true;
}
/**
-* @param maxPosOnlyExpansion specifies how often a node in the search tree of a posonly learning problem needs to be expanded before it is considered as solution candidate.
-* mandatory: false| reinit necessary: true
-* default value: 4
-**/
-public void setMaxPosOnlyExpansion(int maxPosOnlyExpansion) {
-ComponentManager.getInstance().applyConfigEntry(rOLComponent2, "maxPosOnlyExpansion", maxPosOnlyExpansion);
-reinitNecessary = true;
-}
-/**
* @param noisePercentage the (approximated) percentage of noise within the examples.
* mandatory: false| reinit necessary: true
* default value: 0.0
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/explanation/Beta.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/explanation/Beta.java 2009-04-19 09:27:10 UTC (rev 1714)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/explanation/Beta.java 2009-04-19 16:38:14 UTC (rev 1715)
@@ -67,6 +67,7 @@
return result;
}
+ @Override
public Set<OWLDescription> visit(OWLObjectExactCardinalityRestriction desc)
{
Set<OWLDescription> fillers = computeBeta((OWLDescription)desc.getFiller());
@@ -79,6 +80,7 @@
return result;
}
+ @Override
public Set<OWLDescription> visit(OWLObjectUnionOf desc)
{
return super.visit(desc);
@@ -96,16 +98,19 @@
return result;
}
+ @Override
protected OWLClass getLimit()
{
return getDataFactory().getOWLNothing();
}
+ @Override
protected OWLDataRange getDataLimit()
{
return getDataFactory().getOWLDataComplementOf(getDataFactory().getTopDataType());
}
+ @Override
public Set<OWLDescription> visit(OWLDataValueRestriction desc)
{
return Collections.singleton((OWLDescription)desc);
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/explanation/BetaGenerator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/explanation/BetaGenerator.java 2009-04-19 09:27:10 UTC (rev 1714)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/explanation/BetaGenerator.java 2009-04-19 16:38:14 UTC (rev 1715)
@@ -67,6 +67,7 @@
return result;
}
+ @Override
public Set<OWLDescription> visit(OWLObjectExactCardinalityRestriction desc)
{
Set<OWLDescription> fillers = computeBeta((OWLDescription)desc.getFiller());
@@ -79,6 +80,7 @@
return result;
}
+ @Override
public Set<OWLDescription> visit(OWLObjectUnionOf desc)
{
return super.visit(desc);
@@ -96,16 +98,19 @@
return result;
}
+ @Override
protected OWLClass getLimit()
{
return getDataFactory().getOWLNothing();
}
+ @Override
protected OWLDataRange getDataLimit()
{
return getDataFactory().getOWLDataComplementOf(getDataFactory().getTopDataType());
}
+ @Override
public Set<OWLDescription> visit(OWLDataValueRestriction desc)
{
return Collections.singleton((OWLDescription)desc);
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/explanation/Tau.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/explanation/Tau.java 2009-04-19 09:27:10 UTC (rev 1714)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/explanation/Tau.java 2009-04-19 16:38:14 UTC (rev 1715)
@@ -68,11 +68,13 @@
return result;
}
+ @Override
protected OWLClass getLimit()
{
return getDataFactory().getOWLThing();
}
+ @Override
protected OWLDataRange getDataLimit()
{
return getDataFactory().getTopDataType();
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/explanation/TauGenerator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/explanation/TauGenerator.java 2009-04-19 09:27:10 UTC (rev 1714)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/explanation/TauGenerator.java 2009-04-19 16:38:14 UTC (rev 1715)
@@ -68,11 +68,13 @@
return result;
}
+ @Override
protected OWLClass getLimit()
{
return getDataFactory().getOWLThing();
}
+ @Override
protected OWLDataRange getDataLimit()
{
return getDataFactory().getTopDataType();
Modified: trunk/src/dl-learner/org/dllearner/utilities/owl/EvaluatedDescriptionPosNegComparator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/owl/EvaluatedDescriptionPosNegComparator.java 2009-04-19 09:27:10 UTC (rev 1714)
+++ trunk/src/dl-learner/org/dllearner/utilities/owl/EvaluatedDescriptionPosNegComparator.java 2009-04-19 16:38:14 UTC (rev 1715)
@@ -43,16 +43,16 @@
double acc1 = ed1.getAccuracy();
double acc2 = ed2.getAccuracy();
if(acc1 > acc2)
+ return 1;
+ else if(acc1 < acc2)
return -1;
- else if(acc1 < acc2)
- return 1;
else {
int length1 = ed1.getDescriptionLength();
int length2 = ed2.getDescriptionLength();
if(length1 < length2)
+ return 1;
+ else if(length1 > length2)
return -1;
- else if(length1 > length2)
- return 1;
else
return cc.compare(ed1.getDescription(), ed2.getDescription());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
