Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[3216] trunk
|
From: <jen...@us...> - 2011-09-02 06:14:17
|
Revision: 3216
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3216&view=rev
Author: jenslehmann
Date: 2011-09-02 06:14:11 +0000 (Fri, 02 Sep 2011)
Log Message:
-----------
fixed some problems in enrichment script
Modified Paths:
--------------
trunk/components-core/src/main/java/org/dllearner/algorithms/DisjointClassesLearner.java
trunk/components-core/src/main/java/org/dllearner/algorithms/SimpleSubclassLearner.java
trunk/components-core/src/main/java/org/dllearner/core/AbstractAxiomLearningAlgorithm.java
trunk/components-core/src/main/java/org/dllearner/core/config/ConfigOption.java
trunk/components-core/src/main/java/org/dllearner/learningproblems/ClassLearningProblem.java
trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java
trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java
Removed Paths:
-------------
trunk/components-core/src/main/java/org/dllearner/core/converter/
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/DisjointClassesLearner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/DisjointClassesLearner.java 2011-09-02 00:33:56 UTC (rev 3215)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/DisjointClassesLearner.java 2011-09-02 06:14:11 UTC (rev 3216)
@@ -179,6 +179,11 @@
}
@Override
+ public List<EvaluatedAxiom> getCurrentlyBestEvaluatedAxioms() {
+ return getCurrentlyBestEvaluatedAxioms(currentlyBestEvaluatedDescriptions.size());
+ }
+
+ @Override
public List<EvaluatedAxiom> getCurrentlyBestEvaluatedAxioms(int nrOfAxioms) {
List<EvaluatedAxiom> axioms = new ArrayList<EvaluatedAxiom>();
Set<Description> descriptions;
Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/SimpleSubclassLearner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/SimpleSubclassLearner.java 2011-09-02 00:33:56 UTC (rev 3215)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/SimpleSubclassLearner.java 2011-09-02 06:14:11 UTC (rev 3216)
@@ -77,6 +77,11 @@
}
@Override
+ public List<EvaluatedAxiom> getCurrentlyBestEvaluatedAxioms() {
+ return getCurrentlyBestEvaluatedAxioms(currentlyBestEvaluatedDescriptions.size());
+ }
+
+ @Override
public List<Description> getCurrentlyBestDescriptions(int nrOfDescriptions) {
List<Description> bestDescriptions = new ArrayList<Description>();
for(EvaluatedDescription evDesc : getCurrentlyBestEvaluatedDescriptions(nrOfDescriptions)){
Modified: trunk/components-core/src/main/java/org/dllearner/core/AbstractAxiomLearningAlgorithm.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/AbstractAxiomLearningAlgorithm.java 2011-09-02 00:33:56 UTC (rev 3215)
+++ trunk/components-core/src/main/java/org/dllearner/core/AbstractAxiomLearningAlgorithm.java 2011-09-02 06:14:11 UTC (rev 3216)
@@ -44,7 +44,7 @@
* @author Lorenz Bühmann
* @author Jens Lehmann
*/
-public class AbstractAxiomLearningAlgorithm extends AbstractComponent implements AxiomLearningAlgorithm{
+public abstract class AbstractAxiomLearningAlgorithm extends AbstractComponent implements AxiomLearningAlgorithm{
private static final Logger logger = LoggerFactory.getLogger(AbstractAxiomLearningAlgorithm.class);
@@ -91,11 +91,6 @@
return bestAxioms;
}
- @Override
- public List<EvaluatedAxiom> getCurrentlyBestEvaluatedAxioms() {
- return null;
- }
-
public List<EvaluatedAxiom> getCurrentlyBestEvaluatedAxioms(int nrOfAxioms) {
return getCurrentlyBestEvaluatedAxioms(nrOfAxioms, 0.0);
}
Modified: trunk/components-core/src/main/java/org/dllearner/core/config/ConfigOption.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/config/ConfigOption.java 2011-09-02 00:33:56 UTC (rev 3215)
+++ trunk/components-core/src/main/java/org/dllearner/core/config/ConfigOption.java 2011-09-02 06:14:11 UTC (rev 3216)
@@ -53,6 +53,7 @@
*
* @return
*/
+ @Deprecated
Class<? extends PropertyEditor> propertyEditorClass() default PropertyEditor.class;
/**
Modified: trunk/components-core/src/main/java/org/dllearner/learningproblems/ClassLearningProblem.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/learningproblems/ClassLearningProblem.java 2011-09-02 00:33:56 UTC (rev 3215)
+++ trunk/components-core/src/main/java/org/dllearner/learningproblems/ClassLearningProblem.java 2011-09-02 06:14:11 UTC (rev 3216)
@@ -62,7 +62,7 @@
private static Logger logger = Logger.getLogger(ClassLearningProblem.class);
private long nanoStartTime;
- private static int maxExecutionTimeInSeconds = 10;
+ private int maxExecutionTimeInSeconds = 10;
// TODO: config option
private NamedClass classToDescribe;
@@ -857,12 +857,12 @@
return equivalence ? getReasoner().isEquivalentClass(description, classToDescribe) : getReasoner().isSuperClassOf(description, classToDescribe);
}
- public static int getMaxExecutionTimeInSeconds() {
+ public int getMaxExecutionTimeInSeconds() {
return maxExecutionTimeInSeconds;
}
- public static void setMaxExecutionTimeInSeconds(int maxExecutionTimeInSeconds) {
- ClassLearningProblem.maxExecutionTimeInSeconds = maxExecutionTimeInSeconds;
+ public void setMaxExecutionTimeInSeconds(int maxExecutionTimeInSeconds) {
+ this.maxExecutionTimeInSeconds = maxExecutionTimeInSeconds;
}
public boolean isEquivalence() {
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java 2011-09-02 00:33:56 UTC (rev 3215)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java 2011-09-02 06:14:11 UTC (rev 3216)
@@ -20,9 +20,11 @@
package org.dllearner.reasoning;
import java.io.File;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Arrays;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeMap;
@@ -145,6 +147,10 @@
super(sources);
}
+ public FastInstanceChecker(AbstractKnowledgeSource... sources) {
+ super(new HashSet<AbstractKnowledgeSource>(Arrays.asList(sources)));
+ }
+
/**
* @return The name of this component.
*/
Modified: trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java 2011-09-02 00:33:56 UTC (rev 3215)
+++ trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java 2011-09-02 06:14:11 UTC (rev 3216)
@@ -351,9 +351,7 @@
System.out.println("done (" + negExStr.size()+ ")");
- ComponentManager cm = ComponentManager.getInstance();
-
- SparqlKnowledgeSource ks2 = cm.knowledgeSource(SparqlKnowledgeSource.class);
+ SparqlKnowledgeSource ks2 = new SparqlKnowledgeSource();
ks2.setInstances(Datastructures.individualSetToStringSet(examples.getCompleteSet()));
ks2.setUrl(ks.getEndpoint().getURL());
ks2.setDefaultGraphURIs(new TreeSet<String>(ks.getEndpoint().getDefaultGraphURIs()));
@@ -366,11 +364,11 @@
ks2.init();
System.out.println("done");
- AbstractReasonerComponent rc = cm.reasoner(FastInstanceChecker.class, ks2);
+ AbstractReasonerComponent rc = new FastInstanceChecker(ks2);
rc.init();
// TODO: super class learning
- ClassLearningProblem lp = cm.learningProblem(ClassLearningProblem.class, rc);
+ ClassLearningProblem lp = new ClassLearningProblem(rc);
// lp.setPositiveExamples(posExamples);
// lp.setNegativeExamples(negExamples);
// try {
@@ -386,12 +384,7 @@
lp.setMaxExecutionTimeInSeconds(10);
lp.init();
- CELOE la = null;
- try {
- la = cm.learningAlgorithm(CELOE.class, lp, rc);
- } catch (LearningProblemUnsupportedException e) {
- e.printStackTrace();
- }
+ CELOE la = new CELOE(lp, rc);
// CELOEConfigurator cc = la.getConfigurator();
la.setMaxExecutionTimeInSeconds(10);
la.setNoisePercentage(25);
@@ -414,8 +407,7 @@
evaluatedAxioms.add(new EvaluatedAxiom(axiom, score));
}
- algorithmRuns.add(new AlgorithmRun(CELOE.class, evaluatedAxioms, ConfigHelper.getConfigOptionValuesString(la)));
- cm.freeAllComponents();
+ algorithmRuns.add(new AlgorithmRun(CELOE.class, evaluatedAxioms, ConfigHelper.getConfigOptionValuesString(la)));
return evaluatedAxioms;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
