Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [766] trunk/src/dl-learner/org/dllearner/gui
|
From: <ton...@us...> - 2008-04-07 02:15:19
|
Revision: 766
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=766&view=rev
Author: tonytacker
Date: 2008-04-06 19:15:16 -0700 (Sun, 06 Apr 2008)
Log Message:
-----------
automatic init and reset while loading other config
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/gui/Config.java
trunk/src/dl-learner/org/dllearner/gui/ConfigLoad.java
trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java
trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java
trunk/src/dl-learner/org/dllearner/gui/RunPanel.java
trunk/src/dl-learner/org/dllearner/gui/StartGUI.java
Modified: trunk/src/dl-learner/org/dllearner/gui/Config.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-04-07 00:18:05 UTC (rev 765)
+++ trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-04-07 02:15:16 UTC (rev 766)
@@ -315,4 +315,39 @@
return System.nanoTime() - algorithmRunStartTime;
return null;
}
+
+ /**
+ * It is necessary for init LearningProblem.
+ *
+ * @return true, if necessary example was set otherwise false
+ */
+ public Boolean isSetExample() {
+ if (lp.getClass().getSimpleName().equals("PosOnlyDefinitionLP")) {
+ if (cm.getConfigOptionValue(lp, "positiveExamples") != null)
+ return true;
+ } else if (cm.getConfigOptionValue(lp, "positiveExamples") != null
+ && cm.getConfigOptionValue(lp, "negativeExamples") != null)
+ return true;
+ return false;
+ }
+
+ /**
+ * reInit ComponentManager.
+ */
+ public void reInit() {
+ cm = ComponentManager.getInstance();
+ source = null;
+ oldSource = null;
+ reasoner = null;
+ oldReasoner = null;
+ rs = null;
+ lp = null;
+ oldLearningProblem = null;
+ la = null;
+ oldLearningAlgorithm = null;
+ isInit = new boolean[4];
+ threadIsRunning = false;
+ algorithmRunStartTime = null;
+ algorithmRunStopTime = null;
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/gui/ConfigLoad.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/ConfigLoad.java 2008-04-07 00:18:05 UTC (rev 765)
+++ trunk/src/dl-learner/org/dllearner/gui/ConfigLoad.java 2008-04-07 02:15:16 UTC (rev 766)
@@ -74,6 +74,7 @@
* parse file
*/
public void startParser() {
+ config.reInit(); // new ComponentManager
if (this.file.exists()) {
ConfParser parser = ConfParser.parseFile(file);
// create a mapping between components and prefixes in the conf file
Modified: trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-04-07 00:18:05 UTC (rev 765)
+++ trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-04-07 02:15:16 UTC (rev 766)
@@ -46,6 +46,7 @@
private StartGUI startGUI;
private JButton initButton;
private JButton setButton;
+ private JButton clearButton;
private String[] kbBoxItems = {};
private JComboBox cb = new JComboBox(kbBoxItems);
private JPanel choosePanel = new JPanel();
@@ -63,6 +64,8 @@
setButton = new JButton("Set");
setButton.addActionListener(this);
+ setButton = new JButton("Clear All");
+ setButton.addActionListener(this);
initButton = new JButton("Init KnowledgeSource");
initButton.addActionListener(this);
initButton.setEnabled(true);
@@ -102,8 +105,13 @@
setSource();
}
- if (e.getSource() == initButton)
+ if (e.getSource() == initButton) {
init();
+ }
+
+ if (e.getSource() == clearButton) {
+ config.reInit();
+ }
}
/**
Modified: trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-04-07 00:18:05 UTC (rev 765)
+++ trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-04-07 02:15:16 UTC (rev 766)
@@ -118,9 +118,10 @@
/**
* after this, next tab can be used
*/
- private void init() {
+ public void init() {
setLearningProblem();
- if (config.getReasoner() != null && config.getLearningProblem() != null) {
+ if (config.getReasoner() != null && config.getLearningProblem() != null
+ && config.isSetExample()) {
try {
config.getLearningProblem().init();
config.setInitLearningProblem(true);
Modified: trunk/src/dl-learner/org/dllearner/gui/RunPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/RunPanel.java 2008-04-07 00:18:05 UTC (rev 765)
+++ trunk/src/dl-learner/org/dllearner/gui/RunPanel.java 2008-04-07 02:15:16 UTC (rev 766)
@@ -39,6 +39,7 @@
private JButton runButton, stopButton, treeButton;
private JTextArea infoArea;
private Config config;
+ private StartGUI startGUI;
private ThreadRun thread;
@@ -60,10 +61,11 @@
private JLabel[] time = new JLabel[5];
private JLabel[] percent = new JLabel[5];
- RunPanel(Config config) {
+ RunPanel(Config config, StartGUI startGUI) {
super(new BorderLayout());
this.config = config;
+ this.startGUI = startGUI;
runButton = new JButton("Run");
runButton.addActionListener(this);
@@ -141,6 +143,7 @@
// start
if (e.getSource() == runButton && config.getLearningAlgorithm() != null
&& !config.getThreadIsRunning()) {
+ startGUI.init();
thread = new ThreadRun(config);
config.getReasoningService().resetStatistics();
thread.start();
Modified: trunk/src/dl-learner/org/dllearner/gui/StartGUI.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/StartGUI.java 2008-04-07 00:18:05 UTC (rev 765)
+++ trunk/src/dl-learner/org/dllearner/gui/StartGUI.java 2008-04-07 02:15:16 UTC (rev 766)
@@ -78,7 +78,7 @@
tab1 = new ReasonerPanel(config, this);
tab2 = new LearningProblemPanel(config, this);
tab3 = new LearningAlgorithmPanel(config, this);
- tab4 = new RunPanel(config);
+ tab4 = new RunPanel(config, this);
tabPane.addTab("Knowledge Source", tab0);
tabPane.addTab("Reasoner", tab1);
tabPane.addTab("Learning Problem", tab2);
@@ -100,12 +100,19 @@
tabPane.addChangeListener(new ChangeListener() {
// This method is called whenever the selected tab changes
public void stateChanged(ChangeEvent evt) {
-
- updateTabColors();
+ init();
}
});
}
+ public void init() {
+ tab0.init();
+ tab1.init();
+ tab2.init();
+ tab3.init();
+ updateTabColors();
+ }
+
public static void main(String[] args) {
// create GUI logger
SimpleLayout layout = new SimpleLayout();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
