From: <ton...@us...> - 2008-03-12 23:15:37
|
Revision: 706 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=706&view=rev Author: tonytacker Date: 2008-03-12 16:15:31 -0700 (Wed, 12 Mar 2008) Log Message: ----------- I reduced thread priorities to ensure main-thread (GUI) is fastest inside. All others have some lower levels. Tree-Window works now, but only 1st level of it. Means you cann't look at 2nd level of tree. It will be later integrated. Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/gui/ThreadRun.java trunk/src/dl-learner/org/dllearner/gui/ThreadStatistics.java trunk/src/dl-learner/org/dllearner/gui/TreeWindow.java Modified: trunk/src/dl-learner/org/dllearner/gui/ThreadRun.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/ThreadRun.java 2008-03-12 19:25:45 UTC (rev 705) +++ trunk/src/dl-learner/org/dllearner/gui/ThreadRun.java 2008-03-12 23:15:31 UTC (rev 706) @@ -40,6 +40,7 @@ public void run() { if (config.getLearningAlgorithm() != null) { config.setThreadIsRunning(true); + this.setPriority(Thread.MIN_PRIORITY); config.getLearningAlgorithm().start(); config.setThreadIsRunning(false); } Modified: trunk/src/dl-learner/org/dllearner/gui/ThreadStatistics.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/ThreadStatistics.java 2008-03-12 19:25:45 UTC (rev 705) +++ trunk/src/dl-learner/org/dllearner/gui/ThreadStatistics.java 2008-03-12 23:15:31 UTC (rev 706) @@ -40,6 +40,7 @@ */ @Override public void run() { + this.setPriority(4); if (config.getThreadIsRunning()) { try { sleep(1000); // sleep 1 second Modified: trunk/src/dl-learner/org/dllearner/gui/TreeWindow.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/TreeWindow.java 2008-03-12 19:25:45 UTC (rev 705) +++ trunk/src/dl-learner/org/dllearner/gui/TreeWindow.java 2008-03-12 23:15:31 UTC (rev 706) @@ -22,6 +22,7 @@ import javax.swing.*; import javax.swing.tree.*; +import org.dllearner.algorithms.refexamples.*; /** * TreeWindow @@ -46,7 +47,7 @@ setIconImage(java.awt.Toolkit.getDefaultToolkit().getImage( this.getClass().getResource("icon.gif"))); - // tree + // test example tree DefaultMutableTreeNode exampleRoot = new DefaultMutableTreeNode("root"); for (int knot = 0; knot < 4; knot++) { DefaultMutableTreeNode node = new DefaultMutableTreeNode("knot " + knot); @@ -54,23 +55,35 @@ for (int leaf = 1; leaf < 4; leaf++) node.add(new DefaultMutableTreeNode("leaf " + (knot * 3 + leaf))); } - + // tree model EBNodeTreeModel root = null; - if (config.getLearningAlgorithm() != null) { - //ExampleBasedNode rootNode = config.getLearningAlgorithm().getStartNode(); - //root = new EBNodeTreeModel(rootNode); - } - - // show tree - if (root != null) { - //JTree tree = new JTree(root); - //this.add(new JScrollPane(tree)); - } - else { + // if (config.getLearningAlgorithm() != null) { + if (config.getLearningAlgorithm() instanceof ExampleBasedROLComponent) { + ExampleBasedROLComponent ebrol = (ExampleBasedROLComponent) config + .getLearningAlgorithm(); + ExampleBasedNode rootNode = ebrol.getStartNode(); + root = new EBNodeTreeModel(rootNode); + + // show tree + if (root != null) { + //System.out.println("TEST: " + root.getChildCount(rootNode)); + for (int i = 0; i < root.getChildCount(rootNode); i++) { + // Object node = root.getChild(rootNode, i); + + root.getChild(rootNode, i); + //System.out.println("TEST: " + root.getChild(rootNode, i)); + } + JTree tree = new JTree(root); + this.add(new JScrollPane(tree)); + } + } else { JTree tree = new JTree(exampleRoot); this.add(new JScrollPane(tree)); } + + // } + this.repaint(); this.setVisible(true); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |