Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [742] trunk
|
From: <jen...@us...> - 2008-03-31 14:26:16
|
Revision: 742
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=742&view=rev
Author: jenslehmann
Date: 2008-03-31 07:26:03 -0700 (Mon, 31 Mar 2008)
Log Message:
-----------
- fixed errors in ORE
- component classes in component manager can be specified directly
Modified Paths:
--------------
trunk/examples/carcinogenesis/train.conf
trunk/examples/krk/test_ZERO_against_1to5.conf
trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java
trunk/src/dl-learner/org/dllearner/algorithms/refexamples/MultiHeuristic.java
trunk/src/dl-learner/org/dllearner/core/ComponentManager.java
trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java
trunk/src/dl-learner/org/dllearner/tools/ore/ConceptPanelDescriptor.java
trunk/src/dl-learner/org/dllearner/tools/ore/KnowledgeSourcePanelDescriptor.java
trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanelDescriptor.java
Modified: trunk/examples/carcinogenesis/train.conf
===================================================================
--- trunk/examples/carcinogenesis/train.conf 2008-03-31 14:07:52 UTC (rev 741)
+++ trunk/examples/carcinogenesis/train.conf 2008-03-31 14:26:03 UTC (rev 742)
@@ -2,7 +2,7 @@
reasoner = fastInstanceChecker;
algorithm = refexamples;
-refexamples.noisePercentage = 29;
+refexamples.noisePercentage = 28;
refexamples.startClass = "http://dl-learner.org/carcinogenesis#Compound";
refexamples.writeSearchTree = false;
refexamples.searchTreeFile = "log/carcinogenesis/searchTree.log";
Modified: trunk/examples/krk/test_ZERO_against_1to5.conf
===================================================================
--- trunk/examples/krk/test_ZERO_against_1to5.conf 2008-03-31 14:07:52 UTC (rev 741)
+++ trunk/examples/krk/test_ZERO_against_1to5.conf 2008-03-31 14:26:03 UTC (rev 742)
@@ -33,8 +33,9 @@
//algorithm = refinement;
//refinement.heuristic=flexible;
reasoner=fastInstanceChecker;
+refexamples.startClass = "http://www.test.de/test#Game";
+refexamples.useAllConstructor = false;
-
/**ZERO**/
+"http://www.test.de/test#game1"
+"http://www.test.de/test#game10"
Modified: trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java 2008-03-31 14:07:52 UTC (rev 741)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java 2008-03-31 14:26:03 UTC (rev 742)
@@ -312,8 +312,8 @@
long lastTreeTraversalTime = System.nanoTime();
long lastReductionTime = System.nanoTime();
// try a traversal after 100 seconds
- long traversalInterval = 1000l * 1000000000l;
- long reductionInterval = 300l * 1000000000l;
+ long traversalInterval = 300l * 1000000000l;
+ long reductionInterval = 500l * 1000000000l;
long currentTime;
while(!solutionFound && !stop) {
Modified: trunk/src/dl-learner/org/dllearner/algorithms/refexamples/MultiHeuristic.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refexamples/MultiHeuristic.java 2008-03-31 14:07:52 UTC (rev 741)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refexamples/MultiHeuristic.java 2008-03-31 14:26:03 UTC (rev 742)
@@ -78,7 +78,7 @@
private double expansionPenaltyFactor;
private double gainBonusFactor;
private double nodeChildPenalty = 0.0001;
- private double startNodeBonus = 1.0;
+ private double startNodeBonus = 2.0;
// penalise errors on positive examples harder than on negative examples
// (positive weight = 1)
private double negativeWeight = 0.8;
@@ -146,7 +146,7 @@
// do not count TOP symbols (in particular in ALL r.TOP and EXISTS r.TOP)
// as they provide no extra information
if(description instanceof Thing)
- bonus = 1;
+ bonus = 2;
// if(description instanceof BooleanValueRestriction)
// bonus = -1;
@@ -154,7 +154,7 @@
// some bonus for doubles because they are already penalised by length 3
if(description instanceof DatatypeSomeRestriction) {
// System.out.println(description);
- bonus = 3;
+ bonus = 2;
}
List<Description> children = description.getChildren();
Modified: trunk/src/dl-learner/org/dllearner/core/ComponentManager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/ComponentManager.java 2008-03-31 14:07:52 UTC (rev 741)
+++ trunk/src/dl-learner/org/dllearner/core/ComponentManager.java 2008-03-31 14:26:03 UTC (rev 742)
@@ -28,6 +28,7 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
@@ -61,14 +62,16 @@
private ComponentPool pool = new ComponentPool();
- // these variables are valid for the complete lifetime of DL-Learner
- private static String componentsFile = "lib/components.ini";
- private static ComponentManager cm = new ComponentManager();
+ // these variables are valid for the complete lifetime of a DL-Learner session
private static Collection<Class<? extends Component>> components;
private static Collection<Class<? extends KnowledgeSource>> knowledgeSources;
private static Collection<Class<? extends ReasonerComponent>> reasonerComponents;
private static Collection<Class<? extends LearningProblem>> learningProblems;
private static Collection<Class<? extends LearningAlgorithm>> learningAlgorithms;
+ // you can either use the components.ini file or directly specify the classes to use
+ private static String componentsFile = "lib/components.ini";
+ private static String[] componentClasses = new String[]{};
+ private static ComponentManager cm = new ComponentManager();
// list of all configuration options of all components
private static Map<Class<? extends Component>, String> componentNames;
@@ -90,7 +93,11 @@
@SuppressWarnings( { "unchecked" })
private ComponentManager() {
// read in components file
- List<String> componentsString = readComponentsFile();
+ List<String> componentsString;
+ if(componentClasses.length > 0)
+ componentsString = Arrays.asList(componentClasses);
+ else
+ componentsString = readComponentsFile();
// component list
components = new TreeSet<Class<? extends Component>>(classComparator);
@@ -164,6 +171,10 @@
return cm;
}
+ public static void setComponentClasses(String[] componentClasses) {
+ ComponentManager.componentClasses = componentClasses;
+ }
+
private static List<String> readComponentsFile() {
List<String> componentStrings = new LinkedList<String>();
Modified: trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java 2008-03-31 14:07:52 UTC (rev 741)
+++ trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java 2008-03-31 14:26:03 UTC (rev 742)
@@ -260,14 +260,13 @@
// generating conf files
File confTrainFile = new File("examples/carcinogenesis/train.conf");
Files.clearFile(confTrainFile);
- String confHeader = "import(\"pte.owl\");\n\n";
+ String confHeader = "import(\"carcinogenesis.owl\");\n\n";
confHeader += "reasoner = fastInstanceChecker;\n";
confHeader += "algorithm = refexamples;\n";
- confHeader += "refexamples.noisePercentage = 35;\n";
+ confHeader += "refexamples.noisePercentage = 31;\n";
confHeader += "refexamples.startClass = " + getURI2("Compound") + ";\n";
confHeader += "refexamples.writeSearchTree = false;\n";
confHeader += "refexamples.searchTreeFile = \"log/carcinogenesis/searchTree.log\";\n";
- confHeader += "posNegDefinition.percentPerLengthUnit = 0.10;\n";
confHeader += "\n";
Files.appendFile(confTrainFile, confHeader);
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ConceptPanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ConceptPanelDescriptor.java 2008-03-31 14:07:52 UTC (rev 741)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ConceptPanelDescriptor.java 2008-03-31 14:26:03 UTC (rev 742)
@@ -37,7 +37,6 @@
}
- @Override
public void valueChanged(ListSelectionEvent e) {
setNextButtonAccordingToConceptSelected();
if (!e.getValueIsAdjusting())
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/KnowledgeSourcePanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/KnowledgeSourcePanelDescriptor.java 2008-03-31 14:07:52 UTC (rev 741)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/KnowledgeSourcePanelDescriptor.java 2008-03-31 14:26:03 UTC (rev 742)
@@ -72,19 +72,16 @@
}
- @Override
public void changedUpdate(DocumentEvent e) {
setNextButtonAccordingToExistingOWLFile();
}
- @Override
public void insertUpdate(DocumentEvent e) {
setNextButtonAccordingToExistingOWLFile();
}
- @Override
public void removeUpdate(DocumentEvent e) {
setNextButtonAccordingToExistingOWLFile();
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanelDescriptor.java 2008-03-31 14:07:52 UTC (rev 741)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanelDescriptor.java 2008-03-31 14:26:03 UTC (rev 742)
@@ -97,7 +97,6 @@
void updateList(final List<Description> result) {
Runnable doUpdateList = new Runnable() {
- @Override
public void run() {
panel4.getModel().clear();
for (Description d : result) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
