Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [702] trunk/src/dl-learner/org/dllearner
|
From: <ton...@us...> - 2008-03-12 01:48:15
|
Revision: 702
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=702&view=rev
Author: tonytacker
Date: 2008-03-11 18:48:07 -0700 (Tue, 11 Mar 2008)
Log Message:
-----------
We can now start to show a search tree. It was not possible, without some changes.
- add abstract class getStartNode() to LearningAlgorithm.java
- implement this method in all classes which are using it
ATTENTION: I had to change getStartNode() in ROLearner.java, hope it will not produce errors.
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java
trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.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/LearningAlgorithm.java
trunk/src/dl-learner/org/dllearner/gui/TreeWindow.java
Modified: trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java 2008-03-11 17:55:22 UTC (rev 701)
+++ trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java 2008-03-12 01:48:07 UTC (rev 702)
@@ -26,6 +26,7 @@
import java.util.List;
import java.util.Map;
+import org.dllearner.algorithms.refexamples.ExampleBasedNode;
import org.dllearner.core.LearningAlgorithm;
import org.dllearner.core.LearningProblem;
import org.dllearner.core.ReasoningService;
@@ -286,4 +287,8 @@
stop = true;
}
+ @Override
+ public ExampleBasedNode getStartNode() {
+ return null;
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java 2008-03-11 17:55:22 UTC (rev 701)
+++ trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java 2008-03-12 01:48:07 UTC (rev 702)
@@ -25,6 +25,7 @@
import org.apache.log4j.Logger;
import org.dllearner.algorithms.gp.Program;
import org.dllearner.algorithms.gp.GPUtilities;
+import org.dllearner.algorithms.refexamples.ExampleBasedNode;
import org.dllearner.core.LearningAlgorithm;
import org.dllearner.core.LearningProblem;
import org.dllearner.core.ReasoningService;
@@ -127,5 +128,9 @@
}
+ @Override
+ public ExampleBasedNode getStartNode() {
+ return null;
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java 2008-03-11 17:55:22 UTC (rev 701)
+++ trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java 2008-03-12 01:48:07 UTC (rev 702)
@@ -30,6 +30,7 @@
import java.util.Map.Entry;
import org.dllearner.algorithms.hybridgp.Psi;
+import org.dllearner.algorithms.refexamples.ExampleBasedNode;
import org.dllearner.core.LearningAlgorithm;
import org.dllearner.core.LearningProblem;
import org.dllearner.core.ReasoningService;
@@ -1003,4 +1004,9 @@
//public void setAlgorithmType(AlgorithmType algorithmType) {
// this.algorithmType = algorithmType;
//}
+
+ @Override
+ public ExampleBasedNode getStartNode() {
+ return null;
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java 2008-03-11 17:55:22 UTC (rev 701)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java 2008-03-12 01:48:07 UTC (rev 702)
@@ -349,6 +349,7 @@
algorithm.stop();
}
+ @Override
public ExampleBasedNode getStartNode() {
return algorithm.getStartNode();
}
Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java 2008-03-11 17:55:22 UTC (rev 701)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java 2008-03-12 01:48:07 UTC (rev 702)
@@ -12,6 +12,7 @@
import java.util.TreeSet;
import org.apache.log4j.Logger;
+import org.dllearner.algorithms.refexamples.ExampleBasedNode;
import org.dllearner.core.LearningAlgorithm;
import org.dllearner.core.LearningProblem;
import org.dllearner.core.ReasoningService;
@@ -1003,8 +1004,12 @@
/**
* @return the startNode
*/
- public Node getStartNode() {
+ public Node getStartNode_original() {
return startNode;
}
+ @Override
+ public ExampleBasedNode getStartNode() {
+ return null;
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/LearningAlgorithm.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/LearningAlgorithm.java 2008-03-11 17:55:22 UTC (rev 701)
+++ trunk/src/dl-learner/org/dllearner/core/LearningAlgorithm.java 2008-03-12 01:48:07 UTC (rev 702)
@@ -23,6 +23,7 @@
import java.util.LinkedList;
import java.util.List;
+import org.dllearner.algorithms.refexamples.ExampleBasedNode;
import org.dllearner.core.owl.Description;
/**
@@ -70,4 +71,9 @@
return new LinkedList<Class<? extends LearningProblem>>();
}
+ /**
+ * Root for search tree.
+ * @return
+ */
+ public abstract ExampleBasedNode getStartNode();
}
Modified: trunk/src/dl-learner/org/dllearner/gui/TreeWindow.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/TreeWindow.java 2008-03-11 17:55:22 UTC (rev 701)
+++ trunk/src/dl-learner/org/dllearner/gui/TreeWindow.java 2008-03-12 01:48:07 UTC (rev 702)
@@ -22,6 +22,7 @@
import javax.swing.*;
import javax.swing.tree.*;
+import org.dllearner.algorithms.refexamples.*;
/**
* TreeWindow
@@ -45,21 +46,29 @@
// set icon
setIconImage(java.awt.Toolkit.getDefaultToolkit().getImage(
this.getClass().getResource("icon.gif")));
-
+
// tree
- DefaultMutableTreeNode root = new DefaultMutableTreeNode( "root" );
- for ( int knot = 0; knot < 4; knot++ )
- {
- DefaultMutableTreeNode node = new DefaultMutableTreeNode( "knot " + knot );
- root.add( node );
- for ( int leaf = 1; leaf < 4; leaf++ )
- node.add( new DefaultMutableTreeNode("leaf " + (knot*3+leaf )) );
- }
- JTree tree = new JTree( root );
- this.add( new JScrollPane( tree ) );
+ DefaultMutableTreeNode exampleRoot = new DefaultMutableTreeNode("root");
+ for (int knot = 0; knot < 4; knot++) {
+ DefaultMutableTreeNode node = new DefaultMutableTreeNode("knot " + knot);
+ exampleRoot.add(node);
+ for (int leaf = 1; leaf < 4; leaf++)
+ node.add(new DefaultMutableTreeNode("leaf " + (knot * 3 + leaf)));
+ }
+ ExampleBasedNode rootNode = config.getLearningAlgorithm().getStartNode();
+ EBNodeTreeModel root = new EBNodeTreeModel(rootNode);
+
+ // show tree
+ if (root != null) {
+ JTree tree = new JTree(root);
+ this.add(new JScrollPane(tree));
+ }
+ else {
+ JTree tree = new JTree(exampleRoot);
+ this.add(new JScrollPane(tree));
+ }
this.setVisible(true);
}
-
-
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
