Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [480] trunk/src/dl-learner/org/dllearner/gui
|
From: <ton...@us...> - 2008-02-01 05:29:01
|
Revision: 480
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=480&view=rev
Author: tonytacker
Date: 2008-01-31 21:28:50 -0800 (Thu, 31 Jan 2008)
Log Message:
-----------
implement an if on all widgets to read config before setting default value,
fixed some bugs to do this
Modified Paths:
--------------
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/OptionPanel.java
trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java
trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java
trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDouble.java
trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java
trunk/src/dl-learner/org/dllearner/gui/WidgetPanelString.java
Modified: trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-02-01 02:50:44 UTC (rev 479)
+++ trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-02-01 05:28:50 UTC (rev 480)
@@ -129,7 +129,6 @@
optionPanel = new OptionPanel(config, config.getKnowledgeSource(),
sources.get(choosenClassIndex));
- updateOptionPanel();
add(choosePanel, BorderLayout.PAGE_START);
add(centerPanel, BorderLayout.CENTER);
@@ -141,7 +140,6 @@
public void actionPerformed(ActionEvent e) {
// read selected KnowledgeSourceClass
choosenClassIndex = cb.getSelectedIndex();
- updateOptionPanel();
checkIfSparql();
// open File
@@ -196,7 +194,7 @@
public void updateOptionPanel() {
// update OptionPanel
- optionPanel.setComponent(config.getKnowledgeSource());
- optionPanel.setComponentOption(sources.get(choosenClassIndex));
+ optionPanel.update(config.getKnowledgeSource(), sources
+ .get(choosenClassIndex));
}
}
Modified: trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java 2008-02-01 02:50:44 UTC (rev 479)
+++ trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java 2008-02-01 05:28:50 UTC (rev 480)
@@ -70,7 +70,6 @@
optionPanel = new OptionPanel(config, config.getLearningAlgorithm(),
learners.get(choosenClassIndex));
- updateOptionPanel();
add(choosePanel, BorderLayout.PAGE_START);
add(initPanel, BorderLayout.CENTER);
@@ -81,22 +80,21 @@
public void actionPerformed(ActionEvent e) {
// read selected Class
choosenClassIndex = cb.getSelectedIndex();
- updateOptionPanel();
+
// init
if (e.getSource() == initButton && config.getLearningProblem() != null) {
config.setLearningAlgorithm(config.getComponentManager()
.learningAlgorithm(learners.get(choosenClassIndex),
config.getLearningProblem(),
config.getReasoningService()));
- updateOptionPanel();
System.out.println("init LearningAlgorithm");
config.getLearningAlgorithm().init();
+ updateOptionPanel();
}
}
public void updateOptionPanel() {
// update OptionPanel
- optionPanel.setComponent(config.getLearningAlgorithm());
- optionPanel.setComponentOption(learners.get(choosenClassIndex));
+ optionPanel.update(config.getLearningAlgorithm(), learners.get(choosenClassIndex));
}
}
Modified: trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-02-01 02:50:44 UTC (rev 479)
+++ trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-02-01 05:28:50 UTC (rev 480)
@@ -55,7 +55,7 @@
private JPanel lpPanel = new JPanel();
private JLabel posLabel = new JLabel("positive Examples");
private JLabel negLabel = new JLabel("negative Examples");
- private JButton initButton, readListButton;
+ private JButton initButton;
private int choosenClassIndex;
private List<Individual> individuals;
private JList posList = new JList();
@@ -72,18 +72,13 @@
initButton = new JButton("Init LearningProblem");
initButton.addActionListener(this);
- readListButton = new JButton("Get Instances");
- readListButton.addActionListener(this);
-
choosePanel.add(cb);
- choosePanel.add(readListButton);
- lpPanel.add(initButton);
+ choosePanel.add(initButton);
problems = config.getComponentManager().getLearningProblems();
// add into comboBox
for (int i = 0; i < problems.size(); i++) {
- // cb.addItem(problems.get(i).getSimpleName());
cb.addItem(config.getComponentManager().getComponentName(
problems.get(i)));
}
@@ -127,10 +122,10 @@
buildConstraints(constraints, 1, 1, 1, 1, 100, 100);
gridbag.setConstraints(negListScroller, constraints);
centerPanel.add(negListScroller);
-
+
buildConstraints(constraints, 0, 2, 2, 1, 100, 100);
gridbag.setConstraints(lpPanel, constraints);
- centerPanel.add(lpPanel);
+ centerPanel.add(lpPanel);
add(centerPanel, BorderLayout.CENTER);
@@ -164,41 +159,21 @@
optionPanel = new OptionPanel(config, config.getLearningProblem(),
problems.get(choosenClassIndex));
- updateOptionPanel();
cb.addActionListener(this);
-
+
add(choosePanel, BorderLayout.PAGE_START);
add(centerPanel, BorderLayout.CENTER);
add(optionPanel, BorderLayout.PAGE_END);
-
+
}
public void actionPerformed(ActionEvent e) {
// read selected LearningProblemClass
choosenClassIndex = cb.getSelectedIndex();
- updateOptionPanel();
- // get list after reasoner init
- if (e.getSource() == readListButton
- && config.getReasoningService() != null) {
- // fill lists
- Set<Individual> individualsSet = config.getReasoningService()
- .getIndividuals();
- individuals = new LinkedList<Individual>(individualsSet);
- DefaultListModel listModel = new DefaultListModel();
- for (Individual ind : individuals) {
- listModel.addElement(ind);
- }
- posList.setModel(listModel);
- negList.setModel(listModel);
- }
-
// init
- if (e.getSource() == initButton
- && config.getReasoningService() != null
- && (config.getPosExampleSet().size() > 0 || config
- .getNegExampleSet().size() > 0)) {
+ if (e.getSource() == initButton && config.getReasoningService() != null) {
config.setLearningProblem(config.getComponentManager()
.learningProblem(problems.get(choosenClassIndex),
config.getReasoningService()));
@@ -211,6 +186,20 @@
config.getLearningProblem().init();
System.out.println("init LearningProblem");
updateOptionPanel();
+
+ // lists
+ if (config.getReasoningService() != null) {
+ // fill lists
+ Set<Individual> individualsSet = config.getReasoningService()
+ .getIndividuals();
+ individuals = new LinkedList<Individual>(individualsSet);
+ DefaultListModel listModel = new DefaultListModel();
+ for (Individual ind : individuals) {
+ listModel.addElement(ind);
+ }
+ posList.setModel(listModel);
+ negList.setModel(listModel);
+ }
}
}
@@ -230,7 +219,7 @@
public void updateOptionPanel() {
// update OptionPanel
- optionPanel.setComponent(config.getLearningProblem());
- optionPanel.setComponentOption(problems.get(choosenClassIndex));
+ optionPanel.update(config.getLearningProblem(), problems
+ .get(choosenClassIndex));
}
}
Modified: trunk/src/dl-learner/org/dllearner/gui/OptionPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/OptionPanel.java 2008-02-01 02:50:44 UTC (rev 479)
+++ trunk/src/dl-learner/org/dllearner/gui/OptionPanel.java 2008-02-01 05:28:50 UTC (rev 480)
@@ -76,16 +76,12 @@
}
- public void setComponent(Component component) {
+ public void update(Component component, Class<? extends Component> componentOption) {
+ this.componentOption = componentOption;
this.component = component;
showWidgets();
}
- public void setComponentOption(Class<? extends Component> componentOption) {
- this.componentOption = componentOption;
- showWidgets();
- }
-
/*
* define here what core.config.class is what type of widget
* WidgetPanelDefault is for none defined classes
Modified: trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-02-01 02:50:44 UTC (rev 479)
+++ trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-02-01 05:28:50 UTC (rev 480)
@@ -63,14 +63,12 @@
// add into comboBox
reasoners = config.getComponentManager().getReasonerComponents();
for (int i = 0; i < reasoners.size(); i++) {
- // cb.addItem(reasoners.get(i).getSimpleName());
cb.addItem(config.getComponentManager().getComponentName(
reasoners.get(i)));
}
optionPanel = new OptionPanel(config, config.getReasoner(), reasoners
.get(choosenClassIndex));
- updateOptionPanel();
cb.addActionListener(this);
@@ -83,7 +81,6 @@
public void actionPerformed(ActionEvent e) {
// read selected Class
choosenClassIndex = cb.getSelectedIndex();
- updateOptionPanel();
if (e.getSource() == initButton && config.getKnowledgeSource() != null) {
// set reasoner
@@ -103,7 +100,6 @@
public void updateOptionPanel() {
// update OptionPanel
- optionPanel.setComponent(config.getReasoner());
- optionPanel.setComponentOption(reasoners.get(choosenClassIndex));
+ optionPanel.update(config.getReasoner(), reasoners.get(choosenClassIndex));
}
}
Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java 2008-02-01 02:50:44 UTC (rev 479)
+++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java 2008-02-01 05:28:50 UTC (rev 480)
@@ -87,25 +87,30 @@
@Override
protected void showThingToChange() {
if (component != null) {
- // IntegerConfigOption
+ // BooleanConfigOption
if (configOption.getClass().toString().contains(
"BooleanConfigOption")) {
+ // previous set value
+ if (configOption != null) {
+ value = (Boolean) config.getComponentManager()
+ .getConfigOptionValue(component,
+ configOption.getName());
+ }
// default value
- if (configOption.getDefaultValue() != null) {
+ else if (configOption.getDefaultValue() != null) {
value = (Boolean) configOption.getDefaultValue();
- System.out.println ("TEST Boolean default: " + configOption.getDefaultValue());
}
- // then false
- else {
+ // value == null
+ if (value == null) {
value = false;
}
- // cb.setText(value.toString());
+ // set cb-index
if (value == false)
cb.setSelectedIndex(0);
else
cb.setSelectedIndex(1);
cb.addActionListener(this);
-
+
widgetPanel.add(cb);
}
// UNKNOWN
@@ -115,8 +120,7 @@
widgetPanel.add(notImplementedLabel);
}
} else { // configOption == NULL
- JLabel noConfigOptionLabel = new JLabel(
- "no init (Boolean)");
+ JLabel noConfigOptionLabel = new JLabel("no init (Boolean)");
noConfigOptionLabel.setForeground(Color.MAGENTA);
widgetPanel.add(noConfigOptionLabel);
}
Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDouble.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDouble.java 2008-02-01 02:50:44 UTC (rev 479)
+++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDouble.java 2008-02-01 05:28:50 UTC (rev 480)
@@ -30,7 +30,7 @@
import javax.swing.JPanel;
import javax.swing.JButton;
-import org.dllearner.core.Component;
+import org.dllearner.core.Component;
import org.dllearner.core.config.ConfigEntry;
import org.dllearner.core.config.ConfigOption;
import org.dllearner.core.config.DoubleConfigOption;
@@ -93,16 +93,23 @@
// DoubleConfigOption
if (configOption.getClass().toString().contains(
"DoubleConfigOption")) {
+ // previous set value
+ if (configOption != null) {
+ value = (Double) config.getComponentManager()
+ .getConfigOptionValue(component,
+ configOption.getName());
+ }
// default value
- if (configOption.getDefaultValue() != null) {
+ else if (configOption.getDefaultValue() != null) {
value = (Double) configOption.getDefaultValue();
}
- // then 0
- else {
+ // value == null
+ if (value == null) {
value = 0.0;
}
doubleField.setText(value.toString());
- doubleField.setToolTipText(configOption.getAllowedValuesDescription());
+ doubleField.setToolTipText(configOption
+ .getAllowedValuesDescription());
setButton.addActionListener(this);
widgetPanel.add(doubleField);
widgetPanel.add(setButton);
Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java 2008-02-01 02:50:44 UTC (rev 479)
+++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java 2008-02-01 05:28:50 UTC (rev 480)
@@ -30,7 +30,7 @@
import javax.swing.JPanel;
import javax.swing.JButton;
-import org.dllearner.core.Component;
+import org.dllearner.core.Component;
import org.dllearner.core.config.ConfigEntry;
import org.dllearner.core.config.ConfigOption;
import org.dllearner.core.config.IntegerConfigOption;
@@ -94,16 +94,23 @@
// IntegerConfigOption
if (configOption.getClass().toString().contains(
"IntegerConfigOption")) {
+ // previous set value
+ if (configOption != null) {
+ value = (Integer) config.getComponentManager()
+ .getConfigOptionValue(component,
+ configOption.getName());
+ }
// default value
- if (configOption.getDefaultValue() != null) {
+ else if (configOption.getDefaultValue() != null) {
value = (Integer) configOption.getDefaultValue();
}
- // then 0
- else {
+ // value == null
+ if (value == null) {
value = 0;
}
integerField.setText(value.toString());
- integerField.setToolTipText(configOption.getAllowedValuesDescription());
+ integerField.setToolTipText(configOption
+ .getAllowedValuesDescription());
setButton.addActionListener(this);
widgetPanel.add(integerField);
widgetPanel.add(setButton);
Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelString.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelString.java 2008-02-01 02:50:44 UTC (rev 479)
+++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelString.java 2008-02-01 05:28:50 UTC (rev 480)
@@ -30,7 +30,7 @@
import javax.swing.JPanel;
import javax.swing.JButton;
-import org.dllearner.core.Component;
+import org.dllearner.core.Component;
import org.dllearner.core.config.ConfigEntry;
import org.dllearner.core.config.ConfigOption;
import org.dllearner.core.config.StringConfigOption;
@@ -93,16 +93,23 @@
// StringConfigOption
if (configOption.getClass().toString().contains(
"StringConfigOption")) {
+ // previous set value
+ if (configOption != null) {
+ value = (String) config.getComponentManager()
+ .getConfigOptionValue(component,
+ configOption.getName());
+ }
// default value
- if (configOption.getDefaultValue() != null) {
+ else if (configOption.getDefaultValue() != null) {
value = (String) configOption.getDefaultValue();
}
- // then ""
- else {
+ // value == null
+ if (value == null) {
value = "";
}
stringField.setText(value.toString());
- stringField.setToolTipText(configOption.getAllowedValuesDescription());
+ stringField.setToolTipText(configOption
+ .getAllowedValuesDescription());
setButton.addActionListener(this);
widgetPanel.add(stringField);
widgetPanel.add(setButton);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
