Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [447] trunk/src/dl-learner/org/dllearner/gui
|
From: <ton...@us...> - 2008-01-29 05:12:34
|
Revision: 447
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=447&view=rev
Author: tonytacker
Date: 2008-01-28 21:12:31 -0800 (Mon, 28 Jan 2008)
Log Message:
-----------
implemented all configOptions in all 4 classes
Modified Paths:
--------------
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/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/WidgetPanelInteger.java
Modified: trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-01-29 03:12:04 UTC (rev 446)
+++ trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-01-29 05:12:31 UTC (rev 447)
@@ -54,6 +54,7 @@
private int choosenClassIndex;
private List<Class<? extends KnowledgeSource>> sources;
private JLabel infoLabel = new JLabel("choose local file or type URL");
+ private OptionPanel optionPanel;
KnowledgeSourcePanel(final Config config) {
super(new BorderLayout());
@@ -122,9 +123,17 @@
gridbag.setConstraints(openButton, constraints);
centerPanel.add(openButton);
+ buildConstraints(constraints, 0, 2, 2, 1, 100, 100);
+ gridbag.setConstraints(initPanel, constraints);
+ centerPanel.add(initPanel);
+
+ optionPanel = new OptionPanel(config, config.getKnowledgeSource(),
+ sources.get(choosenClassIndex));
+ updateOptionPanel();
+
add(choosePanel, BorderLayout.PAGE_START);
add(centerPanel, BorderLayout.CENTER);
- add(initPanel, BorderLayout.PAGE_END);
+ add(optionPanel, BorderLayout.PAGE_END);
choosenClassIndex = cb.getSelectedIndex();
}
@@ -132,6 +141,7 @@
public void actionPerformed(ActionEvent e) {
// read selected KnowledgeSourceClass
choosenClassIndex = cb.getSelectedIndex();
+ updateOptionPanel();
checkIfSparql();
// open File
@@ -157,6 +167,7 @@
System.out.println("init KnowledgeSource with \n"
+ sources.get(choosenClassIndex) + " and \n"
+ config.getURI() + "\n");
+ updateOptionPanel();
}
}
@@ -183,4 +194,9 @@
}
}
+ public void updateOptionPanel() {
+ // update OptionPanel
+ optionPanel.setComponent(config.getKnowledgeSource());
+ optionPanel.setComponentOption(sources.get(choosenClassIndex));
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-01-29 03:12:04 UTC (rev 446)
+++ trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-01-29 05:12:31 UTC (rev 447)
@@ -60,6 +60,7 @@
private List<Individual> individuals;
private JList posList = new JList();
private JList negList = new JList();
+ private OptionPanel optionPanel;
private Config config;
@@ -71,15 +72,12 @@
initButton = new JButton("Init LearningProblem");
initButton.addActionListener(this);
- readListButton = new JButton("Read List");
+ readListButton = new JButton("Get Instances");
readListButton.addActionListener(this);
choosePanel.add(cb);
choosePanel.add(readListButton);
lpPanel.add(initButton);
- add(choosePanel, BorderLayout.PAGE_START);
- add(centerPanel, BorderLayout.CENTER);
- add(lpPanel, BorderLayout.PAGE_END);
problems = config.getComponentManager().getLearningProblems();
@@ -129,6 +127,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);
add(centerPanel, BorderLayout.CENTER);
@@ -159,11 +161,23 @@
config.setNegExampleSet(negExampleSet);
}
});
+
+ 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
@@ -196,6 +210,7 @@
config.getNegExampleSet());
config.getLearningProblem().init();
System.out.println("init LearningProblem");
+ updateOptionPanel();
}
}
@@ -213,4 +228,9 @@
gbc.weighty = wy;
}
+ public void updateOptionPanel() {
+ // update OptionPanel
+ optionPanel.setComponent(config.getLearningProblem());
+ optionPanel.setComponentOption(problems.get(choosenClassIndex));
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/gui/OptionPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/OptionPanel.java 2008-01-29 03:12:04 UTC (rev 446)
+++ trunk/src/dl-learner/org/dllearner/gui/OptionPanel.java 2008-01-29 05:12:31 UTC (rev 447)
@@ -74,9 +74,6 @@
showWidgets();
- System.out.println("AAA: "
- + ComponentManager.getConfigOptions(componentOption));
-
}
public void setComponent(Component component) {
Modified: trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-01-29 03:12:04 UTC (rev 446)
+++ trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-01-29 05:12:31 UTC (rev 447)
@@ -42,6 +42,7 @@
private List<Class<? extends ReasonerComponent>> reasoners;
private JPanel choosePanel = new JPanel();
private JPanel initPanel = new JPanel();
+ private OptionPanel optionPanel;
private JButton initButton;
private Config config;
private String[] cbItems = {};
@@ -59,9 +60,6 @@
choosePanel.add(cb);
- add(choosePanel, BorderLayout.PAGE_START);
- add(initPanel, BorderLayout.PAGE_END);
-
// add into comboBox
reasoners = config.getComponentManager().getReasonerComponents();
for (int i = 0; i < reasoners.size(); i++) {
@@ -70,11 +68,22 @@
reasoners.get(i)));
}
+ optionPanel = new OptionPanel(config, config.getReasoner(), reasoners
+ .get(choosenClassIndex));
+ updateOptionPanel();
+
+ cb.addActionListener(this);
+
+ add(choosePanel, BorderLayout.PAGE_START);
+ add(initPanel, BorderLayout.CENTER);
+ add(optionPanel, BorderLayout.PAGE_END);
+
}
public void actionPerformed(ActionEvent e) {
// read selected Class
choosenClassIndex = cb.getSelectedIndex();
+ updateOptionPanel();
if (e.getSource() == initButton && config.getKnowledgeSource() != null) {
// set reasoner
@@ -86,8 +95,15 @@
// set ReasoningService
config.setReasoningService(config.getComponentManager()
.reasoningService(config.getReasoner()));
-
+
System.out.println("init Reasoner");
+ updateOptionPanel();
}
}
+
+ public void updateOptionPanel() {
+ // update OptionPanel
+ optionPanel.setComponent(config.getReasoner());
+ optionPanel.setComponentOption(reasoners.get(choosenClassIndex));
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java 2008-01-29 03:12:04 UTC (rev 446)
+++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java 2008-01-29 05:12:31 UTC (rev 447)
@@ -30,8 +30,7 @@
import javax.swing.JPanel;
import javax.swing.JButton;
-import org.dllearner.core.Component; // import
-// org.dllearner.core.ComponentManager;
+import org.dllearner.core.Component;
import org.dllearner.core.config.ConfigEntry;
import org.dllearner.core.config.ConfigOption;
import org.dllearner.core.config.BooleanConfigOption;
@@ -117,7 +116,8 @@
widgetPanel.add(notImplementedLabel);
}
} else { // configOption == NULL
- JLabel noConfigOptionLabel = new JLabel("no init at moment (Boolean)");
+ JLabel noConfigOptionLabel = new JLabel(
+ "no init at moment (Boolean)");
noConfigOptionLabel.setForeground(Color.RED);
widgetPanel.add(noConfigOptionLabel);
}
Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java 2008-01-29 03:12:04 UTC (rev 446)
+++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java 2008-01-29 05:12:31 UTC (rev 447)
@@ -30,8 +30,7 @@
import javax.swing.JPanel;
import javax.swing.JButton;
-import org.dllearner.core.Component; // import
-// org.dllearner.core.ComponentManager;
+import org.dllearner.core.Component;
import org.dllearner.core.config.ConfigEntry;
import org.dllearner.core.config.ConfigOption;
import org.dllearner.core.config.IntegerConfigOption;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
