Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [530] trunk/src/dl-learner/org/dllearner/gui
|
From: <ton...@us...> - 2008-02-09 09:27:05
|
Revision: 530
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=530&view=rev
Author: tonytacker
Date: 2008-02-09 01:26:59 -0800 (Sat, 09 Feb 2008)
Log Message:
-----------
removed autoinit(),
add colored tabs
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/gui/Config.java
trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java
trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java
trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java
trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java
trunk/src/dl-learner/org/dllearner/gui/RunPanel.java
trunk/src/dl-learner/org/dllearner/gui/StartGUI.java
trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java
Modified: trunk/src/dl-learner/org/dllearner/gui/Config.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-02-08 10:25:23 UTC (rev 529)
+++ trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-02-09 09:26:59 UTC (rev 530)
@@ -185,6 +185,7 @@
isInit[3] = is;
}
+ @Deprecated
protected void autoInit() {
// Knowledge Source
if (!this.isInitKnowledgeSource() && this.getKnowledgeSource() != null
Modified: trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-02-08 10:25:23 UTC (rev 529)
+++ trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-02-09 09:26:59 UTC (rev 530)
@@ -37,25 +37,27 @@
private static final long serialVersionUID = -7678275020058043937L;
+ private Config config;
+ private StartGUI startGUI;
private JButton initButton;
private String[] kbBoxItems = {};
private JComboBox cb = new JComboBox(kbBoxItems);
private JPanel choosePanel = new JPanel();
private JPanel initPanel = new JPanel();
- private Config config;
private int choosenClassIndex;
private List<Class<? extends KnowledgeSource>> sources;
private OptionPanel optionPanel;
- KnowledgeSourcePanel(final Config config) {
+ KnowledgeSourcePanel(final Config config, StartGUI startGUI) {
super(new BorderLayout());
this.config = config;
+ this.startGUI = startGUI;
sources = config.getComponentManager().getKnowledgeSources();
initButton = new JButton("Init KnowledgeSource");
initButton.addActionListener(this);
- initButton.setEnabled(false);
+ initButton.setEnabled(true);
// add to comboBox
for (int i = 0; i < sources.size(); i++) {
@@ -104,12 +106,15 @@
* after this, next tab can be used
*/
public void init() {
-/* if (config.getKnowledgeSource() != null && config.getURI() != null) {
+ if (/*
+ * !config.isInitKnowledgeSource() &&
+ */config.getKnowledgeSource() != null && config.getURI() != null) {
config.getKnowledgeSource().init();
config.setInitKnowledgeSource(true);
System.out.println("init KnowledgeSource");
+ startGUI.updateTabColors();
}
-*/ config.autoInit();
+ // config.autoInit();
}
/**
Modified: trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java 2008-02-08 10:25:23 UTC (rev 529)
+++ trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java 2008-02-09 09:26:59 UTC (rev 530)
@@ -37,7 +37,9 @@
public class LearningAlgorithmPanel extends JPanel implements ActionListener {
private static final long serialVersionUID = 8721490771860452959L;
+
private Config config;
+ private StartGUI startGUI;
private List<Class<? extends LearningAlgorithm>> learners;
private JPanel choosePanel = new JPanel();
private OptionPanel optionPanel;
@@ -47,17 +49,18 @@
private JComboBox cb = new JComboBox(cbItems);
private int choosenClassIndex;
- LearningAlgorithmPanel(Config config) {
+ LearningAlgorithmPanel(Config config, StartGUI startGUI) {
super(new BorderLayout());
this.config = config;
+ this.startGUI = startGUI;
learners = config.getComponentManager().getLearningAlgorithms();
initButton = new JButton("Init LearingAlgorithm");
initButton.addActionListener(this);
initPanel.add(initButton);
- initButton.setEnabled(false);
- autoInitButton = new JButton("AutoInit");
+ initButton.setEnabled(true);
+ autoInitButton = new JButton("Set");
autoInitButton.addActionListener(this);
// add into comboBox
@@ -91,7 +94,7 @@
if (e.getSource() == autoInitButton)
setLearningAlgorithm();
- if (e.getSource() == initButton && config.isInitLearningProblem())
+ if (e.getSource() == initButton)
init();
}
@@ -99,9 +102,10 @@
* after this, you can change widgets
*/
public void setLearningAlgorithm() {
- config.autoInit();
- if (config.isInitLearningProblem()
- && config.getLearningProblem() != null
+ // config.autoInit();
+ if (/*
+ * config.isInitLearningProblem() &&
+ */config.getLearningProblem() != null
&& config.getReasoningService() != null) {
config.setLearningAlgorithm(config.getComponentManager()
.learningAlgorithm(learners.get(choosenClassIndex),
@@ -115,11 +119,13 @@
* after this, next tab can be used
*/
public void init() {
- /*
- * if (config.isInitLearningProblem()) {
- * config.getLearningAlgorithm().init(); System.out.println("init
- * LearningAlgorithm"); }
- */config.autoInit();
+ if (config.getLearningProblem() != null) {
+ config.getLearningAlgorithm().init();
+ config.setLearningAlgorithm(true);
+ System.out.println("init LearningAlgorithm");
+ startGUI.updateTabColors();
+ }
+ // config.autoInit();
}
/**
Modified: trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-02-08 10:25:23 UTC (rev 529)
+++ trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-02-09 09:26:59 UTC (rev 530)
@@ -47,6 +47,8 @@
private static final long serialVersionUID = -3819627680918930203L;
+ private Config config;
+ private StartGUI startGUI;
private List<Class<? extends LearningProblem>> problems;
private String[] lpBoxItems = {};
private JComboBox cb = new JComboBox(lpBoxItems);
@@ -62,19 +64,18 @@
private JList negList = new JList();
private OptionPanel optionPanel;
- private Config config;
-
- LearningProblemPanel(final Config config) {
+ LearningProblemPanel(final Config config, StartGUI startGUI) {
super(new BorderLayout());
this.config = config;
+ this.startGUI = startGUI;
problems = config.getComponentManager().getLearningProblems();
initButton = new JButton("Init LearningProblem");
initButton.addActionListener(this);
initPanel.add(initButton);
- initButton.setEnabled(false);
- autoInitButton = new JButton("AutoInit");
+ initButton.setEnabled(true);
+ autoInitButton = new JButton("Set");
autoInitButton.addActionListener(this);
choosePanel.add(cb);
choosePanel.add(autoInitButton);
@@ -143,6 +144,7 @@
config.getLearningProblem(), "positiveExamples",
config.getPosExampleSet());
updateOptionPanel();
+ System.out.println("POSSSSS");
}
});
@@ -161,6 +163,7 @@
config.getLearningProblem(), "negativeExamples",
config.getNegExampleSet());
updateOptionPanel();
+ System.out.println("POSSSSS");
}
});
@@ -176,19 +179,22 @@
add(initPanel, BorderLayout.PAGE_END);
choosenClassIndex = cb.getSelectedIndex();
- setLearningProblem();
+ //setLearningProblem();
}
public void actionPerformed(ActionEvent e) {
+ System.out.println("index: " + cb.getSelectedIndex());
+
// read selected LearningProblemClass
// choosenClassIndex = cb.getSelectedIndex();
if (choosenClassIndex != cb.getSelectedIndex()) {
- choosenClassIndex = cb.getSelectedIndex();
+ this.choosenClassIndex = cb.getSelectedIndex();
config.setInitLearningProblem(false);
setLearningProblem();
+ System.out.println("new_index: " + cb.getSelectedIndex());
+
}
-
if (e.getSource() == autoInitButton)
setLearningProblem();
@@ -213,7 +219,7 @@
* after this, you can change widgets
*/
public void setLearningProblem() {
- config.autoInit();
+ // config.autoInit();
if (config.isInitReasoner()) {
config.setLearningProblem(config.getComponentManager()
.learningProblem(problems.get(choosenClassIndex),
@@ -232,6 +238,7 @@
negList.setModel(listModel);
}
updateOptionPanel();
+ startGUI.updateTabColors();
}
}
@@ -239,15 +246,22 @@
* after this, next tab can be used
*/
public void init() {
-/* if (config.isInitReasoner()) {
+ if (/* !config.isInitLearningProblem() && */config.getReasoner() != null
+ && config.getLearningProblem() != null) {
config.getComponentManager().applyConfigEntry(
+ config.getLearningProblem(), "positiveExamples",
+ config.getPosExampleSet());
+ config.getComponentManager().applyConfigEntry(
config.getLearningProblem(), "negativeExamples",
config.getNegExampleSet());
+
config.getLearningProblem().init();
config.setInitLearningProblem(true);
System.out.println("init LearningProblem");
+ startGUI.updateTabColors();
+
}
-*/ config.autoInit();
+ // config.autoInit();
}
/**
Modified: trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-02-08 10:25:23 UTC (rev 529)
+++ trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-02-09 09:26:59 UTC (rev 530)
@@ -39,27 +39,29 @@
private static final long serialVersionUID = -7678275020058043937L;
+ private Config config;
+ private StartGUI startGUI;
private List<Class<? extends ReasonerComponent>> reasoners;
private JPanel choosePanel = new JPanel();
private JPanel initPanel = new JPanel();
private OptionPanel optionPanel;
private JButton initButton, autoInitButton;
- private Config config;
private String[] cbItems = {};
private JComboBox cb = new JComboBox(cbItems);
private int choosenClassIndex;
- ReasonerPanel(final Config config) {
+ ReasonerPanel(final Config config, StartGUI startGUI) {
super(new BorderLayout());
this.config = config;
+ this.startGUI = startGUI;
reasoners = config.getComponentManager().getReasonerComponents();
initButton = new JButton("Init Reasoner");
initButton.addActionListener(this);
initPanel.add(initButton);
- initButton.setEnabled(false);
- autoInitButton = new JButton("AutoInit");
+ initButton.setEnabled(true);
+ autoInitButton = new JButton("Set");
autoInitButton.addActionListener(this);
choosePanel.add(cb);
@@ -90,6 +92,7 @@
if (choosenClassIndex != cb.getSelectedIndex()) {
choosenClassIndex = cb.getSelectedIndex();
config.setInitReasoner(false);
+
setReasoner();
}
@@ -104,12 +107,13 @@
* after this, you can change widgets
*/
public void setReasoner() {
- config.autoInit();
+ // config.autoInit();
if (config.isInitKnowledgeSource()) {
config.setReasoner(config.getComponentManager().reasoner(
reasoners.get(choosenClassIndex),
config.getKnowledgeSource()));
updateOptionPanel();
+ startGUI.updateTabColors();
}
}
@@ -117,7 +121,19 @@
* after this, next tab can be used
*/
public void init() {
- config.autoInit();
+ if (/* !config.isInitReasoner() && */config.getKnowledgeSource() != null
+ && config.getReasoner() != null) {
+ config.getReasoner().init();
+ System.out.println("init Reasoner");
+ // set ReasoningService
+ config.setReasoningService(config.getComponentManager()
+ .reasoningService(config.getReasoner()));
+ System.out.println("init ReasoningService");
+ config.setInitReasoner(true);
+ startGUI.updateTabColors();
+
+ }
+ // config.autoInit();
}
/**
Modified: trunk/src/dl-learner/org/dllearner/gui/RunPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/RunPanel.java 2008-02-08 10:25:23 UTC (rev 529)
+++ trunk/src/dl-learner/org/dllearner/gui/RunPanel.java 2008-02-09 09:26:59 UTC (rev 530)
@@ -73,7 +73,7 @@
public void actionPerformed(ActionEvent e) {
if (e.getSource() == runButton && config.getLearningAlgorithm() != null) {
- config.autoInit();
+ //config.autoInit();
thread = new ThreadRun(config);
thread.start();
// Concept solution =
Modified: trunk/src/dl-learner/org/dllearner/gui/StartGUI.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/StartGUI.java 2008-02-08 10:25:23 UTC (rev 529)
+++ trunk/src/dl-learner/org/dllearner/gui/StartGUI.java 2008-02-09 09:26:59 UTC (rev 530)
@@ -21,7 +21,9 @@
*/
import javax.swing.*;
+import javax.swing.event.*;
+import java.awt.Color;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -44,11 +46,11 @@
private Config config = new Config();
- private JPanel tab1;
- private JPanel tab2;
- private JPanel tab3;
- private JPanel tab4;
- private JPanel tab5;
+ private KnowledgeSourcePanel tab0;
+ private ReasonerPanel tab1;
+ private LearningProblemPanel tab2;
+ private LearningAlgorithmPanel tab3;
+ private RunPanel tab4;
private JMenuBar menuBar = new JMenuBar();
private JMenu menuFile = new JMenu("File");
@@ -61,16 +63,16 @@
this.setLocationByPlatform(true);
this.setSize(800, 600);
- tab1 = new KnowledgeSourcePanel(config);
- tab2 = new ReasonerPanel(config);
- tab3 = new LearningProblemPanel(config);
- tab4 = new LearningAlgorithmPanel(config);
- tab5 = new RunPanel(config);
- tabPane.addTab("Knowledge Source", tab1);
- tabPane.addTab("Reasoner", tab2);
- tabPane.addTab("Learning Problem", tab3);
- tabPane.addTab("Learning Algorithm", tab4);
- tabPane.addTab("Run", tab5);
+ tab0 = new KnowledgeSourcePanel(config, this);
+ tab1 = new ReasonerPanel(config, this);
+ tab2 = new LearningProblemPanel(config, this);
+ tab3 = new LearningAlgorithmPanel(config, this);
+ tab4 = new RunPanel(config);
+ tabPane.addTab("Knowledge Source", tab0);
+ tabPane.addTab("Reasoner", tab1);
+ tabPane.addTab("Learning Problem", tab2);
+ tabPane.addTab("Learning Algorithm", tab3);
+ tabPane.addTab("Run", tab4);
this.setJMenuBar(menuBar);
menuBar.add(menuFile);
@@ -81,6 +83,16 @@
this.add(tabPane);
this.setVisible(true);
+ updateTabColors();
+
+ // Register a change listener
+ tabPane.addChangeListener(new ChangeListener() {
+ // This method is called whenever the selected tab changes
+ public void stateChanged(ChangeEvent evt) {
+
+ updateTabColors();
+ }
+ });
}
public static void main(String[] args) {
@@ -104,4 +116,25 @@
}
}
+ public void updateTabColors() {
+ if (config.isInitKnowledgeSource())
+ tabPane.setForegroundAt(0, Color.BLACK);
+ else
+ tabPane.setForegroundAt(0, Color.RED);
+ if (config.isInitReasoner())
+ tabPane.setForegroundAt(1, Color.BLACK);
+ else
+ tabPane.setForegroundAt(1, Color.RED);
+ if (config.isInitLearningProblem())
+ tabPane.setForegroundAt(2, Color.BLACK);
+ else
+ tabPane.setForegroundAt(2, Color.RED);
+ if (config.isInitLearningAlgorithm()) {
+ tabPane.setForegroundAt(3, Color.BLACK);
+ tabPane.setForegroundAt(4, Color.BLACK);
+ } else {
+ tabPane.setForegroundAt(3, Color.RED);
+ tabPane.setForegroundAt(4, Color.RED);
+ }
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java 2008-02-08 10:25:23 UTC (rev 529)
+++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java 2008-02-09 09:26:59 UTC (rev 530)
@@ -120,7 +120,7 @@
widgetPanel.add(notImplementedLabel);
}
} else { // configOption == NULL
- JLabel noConfigOptionLabel = new JLabel("no instance (Boolean)");
+ JLabel noConfigOptionLabel = new JLabel("no init (Boolean)");
noConfigOptionLabel.setForeground(Color.MAGENTA);
widgetPanel.add(noConfigOptionLabel);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
