Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [509] trunk/src/dl-learner/org/dllearner/gui
|
From: <ton...@us...> - 2008-02-07 09:55:17
|
Revision: 509
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=509&view=rev
Author: tonytacker
Date: 2008-02-07 01:55:12 -0800 (Thu, 07 Feb 2008)
Log Message:
-----------
add autoInit() for init all 4 tabs in one method (in config.java)
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/OptionPanel.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/ThreadRun.java
trunk/src/dl-learner/org/dllearner/gui/WidgetPanelString.java
Modified: trunk/src/dl-learner/org/dllearner/gui/Config.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-02-07 09:40:38 UTC (rev 508)
+++ trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-02-07 09:55:12 UTC (rev 509)
@@ -50,8 +50,7 @@
private LearningProblem lp;
private LearningAlgorithm la;
private boolean[] isInit = new boolean[4];
-
-
+
protected ComponentManager getComponentManager() {
return cm;
}
@@ -125,64 +124,60 @@
}
/**
- * KnowledgeSource.init has run?
- * return true, if it was
+ * KnowledgeSource.init has run? return true, if it was
*/
protected boolean isInitKnowledgeSource() {
return isInit[0];
}
-
+
/**
* set true if you run KnowwledgeSource.init
*/
protected void setInitKnowledgeSource(Boolean is) {
isInit[0] = is;
- for (int i=1; i<4; i++)
+ for (int i = 1; i < 4; i++)
isInit[i] = false;
}
/**
- * Reasoner.init has run?
- * return true, if it was
+ * Reasoner.init has run? return true, if it was
*/
protected boolean isInitReasoner() {
return isInit[1];
}
-
+
/**
* set true if you run Reasoner.init
*/
protected void setInitReasoner(Boolean is) {
isInit[1] = is;
- for (int i=2; i<4; i++)
+ for (int i = 2; i < 4; i++)
isInit[i] = false;
}
/**
- * LearningProblem.init has run?
- * return true, if it was
+ * LearningProblem.init has run? return true, if it was
*/
protected boolean isInitLearningProblem() {
return isInit[2];
}
-
+
/**
* set true if you run LearningProblem.init
*/
protected void setInitLearningProblem(Boolean is) {
isInit[2] = is;
- for (int i=3; i<4; i++)
+ for (int i = 3; i < 4; i++)
isInit[i] = false;
}
/**
- * LearningAlgorithm.init() has run?
- * return true, if it was
+ * LearningAlgorithm.init() has run? return true, if it was
*/
- protected boolean isLearningAlgorithm() {
+ protected boolean isInitLearningAlgorithm() {
return isInit[3];
}
-
+
/**
* set true if you run LearningAlgorithm.init
*/
@@ -190,4 +185,43 @@
isInit[3] = is;
}
+ protected void autoInit() {
+ // Knowledge Source
+ if (!this.isInitKnowledgeSource() && this.getKnowledgeSource() != null
+ && this.getURI() != null) {
+ this.getKnowledgeSource().init();
+ this.setInitKnowledgeSource(true);
+ System.out.println("init KnowledgeSource");
+ }
+ // Reasoner
+ if (!this.isInitReasoner() && this.getKnowledgeSource() != null
+ && this.getReasoner() != null) {
+ this.getReasoner().init();
+ System.out.println("init Reasoner");
+ // set ReasoningService
+ this.setReasoningService(this.getComponentManager()
+ .reasoningService(this.getReasoner()));
+ System.out.println("init ReasoningService");
+ this.setInitReasoner(true);
+ }
+ // Learning Problem
+ if (!this.isInitLearningProblem() && this.getReasoner() != null
+ && this.getLearningProblem() != null) {
+ this.getComponentManager().applyConfigEntry(
+ this.getLearningProblem(), "negativeExamples",
+ this.getNegExampleSet());
+ this.getLearningProblem().init();
+ this.setInitLearningProblem(true);
+ System.out.println("init LearningProblem");
+ }
+ // Learning Algorithm
+ if (!this.isInitLearningAlgorithm()
+ && this.getLearningProblem() != null
+ && this.getLearningAlgorithm() != null) {
+ this.getLearningAlgorithm().init();
+ System.out.println("init LearningAlgorithm");
+ }
+
+ }
+
}
Modified: trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-02-07 09:40:38 UTC (rev 508)
+++ trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-02-07 09:55:12 UTC (rev 509)
@@ -37,7 +37,7 @@
private static final long serialVersionUID = -7678275020058043937L;
- private JButton initButton, getInstancesButton;
+ private JButton initButton;
private String[] kbBoxItems = {};
private JComboBox cb = new JComboBox(kbBoxItems);
private JPanel choosePanel = new JPanel();
@@ -53,10 +53,9 @@
this.config = config;
sources = config.getComponentManager().getKnowledgeSources();
- getInstancesButton = new JButton("Get Instances");
- getInstancesButton.addActionListener(this);
initButton = new JButton("Init KnowledgeSource");
initButton.addActionListener(this);
+ initButton.setEnabled(false);
// add to comboBox
for (int i = 0; i < sources.size(); i++) {
@@ -66,7 +65,6 @@
cb.addActionListener(this);
choosePanel.add(cb);
- choosePanel.add(getInstancesButton);
optionPanel = new OptionPanel(config, config.getKnowledgeSource(),
sources.get(choosenClassIndex));
initPanel.add(initButton);
@@ -76,23 +74,27 @@
add(initPanel, BorderLayout.PAGE_END);
choosenClassIndex = cb.getSelectedIndex();
+ setSource();
}
public void actionPerformed(ActionEvent e) {
// read selected KnowledgeSourceClass
- choosenClassIndex = cb.getSelectedIndex();
+ // choosenClassIndex = cb.getSelectedIndex();
+ if (choosenClassIndex != cb.getSelectedIndex()) {
+ choosenClassIndex = cb.getSelectedIndex();
+ config.setURI(null); // default null
+ config.setInitKnowledgeSource(false);
+ setSource();
+ }
- if (e.getSource() == getInstancesButton)
- getInstances();
-
- if (e.getSource() == initButton && config.getURI() != null)
+ if (e.getSource() == initButton)
init();
}
/**
* after this, you can change widgets
*/
- public void getInstances() {
+ public void setSource() {
config.setKnowledgeSource(config.getComponentManager().knowledgeSource(
sources.get(choosenClassIndex)));
updateOptionPanel();
@@ -102,11 +104,12 @@
* after this, next tab can be used
*/
public void init() {
- config.getKnowledgeSource().init();
- config.setInitKnowledgeSource(true);
- System.out.println("init KnowledgeSource with \n"
- + sources.get(choosenClassIndex) + " and \n" + config.getURI()
- + "\n");
+/* if (config.getKnowledgeSource() != null && config.getURI() != null) {
+ config.getKnowledgeSource().init();
+ config.setInitKnowledgeSource(true);
+ System.out.println("init KnowledgeSource");
+ }
+*/ config.autoInit();
}
/**
Modified: trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java 2008-02-07 09:40:38 UTC (rev 508)
+++ trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java 2008-02-07 09:55:12 UTC (rev 509)
@@ -42,7 +42,7 @@
private JPanel choosePanel = new JPanel();
private OptionPanel optionPanel;
private JPanel initPanel = new JPanel();
- private JButton initButton, getInstancesButton;
+ private JButton initButton, autoInitButton;
private String[] cbItems = {};
private JComboBox cb = new JComboBox(cbItems);
private int choosenClassIndex;
@@ -56,8 +56,9 @@
initButton = new JButton("Init LearingAlgorithm");
initButton.addActionListener(this);
initPanel.add(initButton);
- getInstancesButton = new JButton("Get Instances");
- getInstancesButton.addActionListener(this);
+ initButton.setEnabled(false);
+ autoInitButton = new JButton("AutoInit");
+ autoInitButton.addActionListener(this);
// add into comboBox
for (int i = 0; i < learners.size(); i++) {
@@ -66,7 +67,7 @@
}
choosePanel.add(cb);
- choosePanel.add(getInstancesButton);
+ choosePanel.add(autoInitButton);
cb.addActionListener(this);
optionPanel = new OptionPanel(config, config.getLearningAlgorithm(),
@@ -80,10 +81,15 @@
public void actionPerformed(ActionEvent e) {
// read selected Class
- choosenClassIndex = cb.getSelectedIndex();
+ // choosenClassIndex = cb.getSelectedIndex();
+ if (choosenClassIndex != cb.getSelectedIndex()) {
+ choosenClassIndex = cb.getSelectedIndex();
+ config.setInitLearningProblem(false);
+ setLearningAlgorithm();
+ }
- if (e.getSource() == getInstancesButton && config.isInitLearningProblem())
- getInstances();
+ if (e.getSource() == autoInitButton)
+ setLearningAlgorithm();
if (e.getSource() == initButton && config.isInitLearningProblem())
init();
@@ -92,8 +98,10 @@
/**
* after this, you can change widgets
*/
- public void getInstances() {
- if (config.getLearningProblem() != null
+ public void setLearningAlgorithm() {
+ config.autoInit();
+ if (config.isInitLearningProblem()
+ && config.getLearningProblem() != null
&& config.getReasoningService() != null) {
config.setLearningAlgorithm(config.getComponentManager()
.learningAlgorithm(learners.get(choosenClassIndex),
@@ -107,9 +115,11 @@
* after this, next tab can be used
*/
public void init() {
- config.getLearningAlgorithm().init();
- System.out.println("init LearningAlgorithm");
-
+ /*
+ * if (config.isInitLearningProblem()) {
+ * config.getLearningAlgorithm().init(); System.out.println("init
+ * LearningAlgorithm"); }
+ */config.autoInit();
}
/**
Modified: trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-02-07 09:40:38 UTC (rev 508)
+++ trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-02-07 09:55:12 UTC (rev 509)
@@ -55,7 +55,7 @@
private JPanel initPanel = new JPanel();
private JLabel posLabel = new JLabel("positive Examples");
private JLabel negLabel = new JLabel("negative Examples");
- private JButton initButton, getInstancesButton;
+ private JButton initButton, autoInitButton;
private int choosenClassIndex;
private List<Individual> individuals;
private JList posList = new JList();
@@ -73,10 +73,11 @@
initButton = new JButton("Init LearningProblem");
initButton.addActionListener(this);
initPanel.add(initButton);
- getInstancesButton = new JButton("Get Instances");
- getInstancesButton.addActionListener(this);
+ initButton.setEnabled(false);
+ autoInitButton = new JButton("AutoInit");
+ autoInitButton.addActionListener(this);
choosePanel.add(cb);
- choosePanel.add(getInstancesButton);
+ choosePanel.add(autoInitButton);
cb.addActionListener(this);
// add into comboBox
@@ -174,16 +175,24 @@
add(listPanel, BorderLayout.CENTER);
add(initPanel, BorderLayout.PAGE_END);
+ choosenClassIndex = cb.getSelectedIndex();
+ setLearningProblem();
}
public void actionPerformed(ActionEvent e) {
// read selected LearningProblemClass
- choosenClassIndex = cb.getSelectedIndex();
+ // choosenClassIndex = cb.getSelectedIndex();
+ if (choosenClassIndex != cb.getSelectedIndex()) {
+ choosenClassIndex = cb.getSelectedIndex();
+ config.setInitLearningProblem(false);
+ setLearningProblem();
+ }
- if (e.getSource() == getInstancesButton && config.isInitReasoner())
- getInstances();
- if (e.getSource() == initButton && config.isInitReasoner())
+ if (e.getSource() == autoInitButton)
+ setLearningProblem();
+
+ if (e.getSource() == initButton)
init();
}
@@ -203,37 +212,42 @@
/**
* after this, you can change widgets
*/
- public void getInstances() {
- config.setLearningProblem(config.getComponentManager().learningProblem(
- problems.get(choosenClassIndex), config.getReasoningService()));
- // 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);
+ public void setLearningProblem() {
+ config.autoInit();
+ if (config.isInitReasoner()) {
+ config.setLearningProblem(config.getComponentManager()
+ .learningProblem(problems.get(choosenClassIndex),
+ config.getReasoningService()));
+ // 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);
}
- posList.setModel(listModel);
- negList.setModel(listModel);
+ updateOptionPanel();
}
- updateOptionPanel();
}
/**
* after this, next tab can be used
*/
public void init() {
-
- config.getComponentManager().applyConfigEntry(
- config.getLearningProblem(), "negativeExamples",
- config.getNegExampleSet());
- config.getLearningProblem().init();
- config.setInitLearningProblem(true);
- System.out.println("init LearningProblem");
-
+/* if (config.isInitReasoner()) {
+ config.getComponentManager().applyConfigEntry(
+ config.getLearningProblem(), "negativeExamples",
+ config.getNegExampleSet());
+ config.getLearningProblem().init();
+ config.setInitLearningProblem(true);
+ System.out.println("init LearningProblem");
+ }
+*/ config.autoInit();
}
/**
Modified: trunk/src/dl-learner/org/dllearner/gui/OptionPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/OptionPanel.java 2008-02-07 09:40:38 UTC (rev 508)
+++ trunk/src/dl-learner/org/dllearner/gui/OptionPanel.java 2008-02-07 09:55:12 UTC (rev 509)
@@ -75,6 +75,7 @@
}
+ /** update this OptionPanel */
public void update(Component component,
Class<? extends Component> componentOption) {
this.componentOption = componentOption;
@@ -82,7 +83,7 @@
showWidgets();
}
- /*
+ /**
* Define here what core.config.class is what type of widget.
* WidgetPanelDefault is for none defined classes.
*/
@@ -122,7 +123,7 @@
centerPanel.updateUI(); // update graphic
}
- /*
+ /**
* Define GridBagConstraints
*/
private void buildConstraints(GridBagConstraints gbc, int gx, int gy,
Modified: trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-02-07 09:40:38 UTC (rev 508)
+++ trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-02-07 09:55:12 UTC (rev 509)
@@ -43,7 +43,7 @@
private JPanel choosePanel = new JPanel();
private JPanel initPanel = new JPanel();
private OptionPanel optionPanel;
- private JButton initButton, getInstancesButton;
+ private JButton initButton, autoInitButton;
private Config config;
private String[] cbItems = {};
private JComboBox cb = new JComboBox(cbItems);
@@ -58,8 +58,9 @@
initButton = new JButton("Init Reasoner");
initButton.addActionListener(this);
initPanel.add(initButton);
- getInstancesButton = new JButton("Get Instances");
- getInstancesButton.addActionListener(this);
+ initButton.setEnabled(false);
+ autoInitButton = new JButton("AutoInit");
+ autoInitButton.addActionListener(this);
choosePanel.add(cb);
@@ -72,31 +73,38 @@
optionPanel = new OptionPanel(config, config.getReasoner(), reasoners
.get(choosenClassIndex));
- choosePanel.add(getInstancesButton);
-
+ choosePanel.add(autoInitButton);
cb.addActionListener(this);
add(choosePanel, BorderLayout.PAGE_START);
add(optionPanel, BorderLayout.CENTER);
add(initPanel, BorderLayout.PAGE_END);
+ choosenClassIndex = cb.getSelectedIndex();
+ setReasoner();
}
public void actionPerformed(ActionEvent e) {
// read selected Class
- choosenClassIndex = cb.getSelectedIndex();
+ // choosenClassIndex = cb.getSelectedIndex();
+ if (choosenClassIndex != cb.getSelectedIndex()) {
+ choosenClassIndex = cb.getSelectedIndex();
+ config.setInitReasoner(false);
+ setReasoner();
+ }
- if (e.getSource() == getInstancesButton)
- getInstances();
+ if (e.getSource() == autoInitButton)
+ setReasoner();
- if (e.getSource() == initButton && config.getKnowledgeSource() != null)
+ if (e.getSource() == initButton)
init();
}
/**
* after this, you can change widgets
*/
- public void getInstances() {
+ public void setReasoner() {
+ config.autoInit();
if (config.isInitKnowledgeSource()) {
config.setReasoner(config.getComponentManager().reasoner(
reasoners.get(choosenClassIndex),
@@ -109,13 +117,7 @@
* after this, next tab can be used
*/
public void init() {
- 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);
+ config.autoInit();
}
/**
Modified: trunk/src/dl-learner/org/dllearner/gui/RunPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/RunPanel.java 2008-02-07 09:40:38 UTC (rev 508)
+++ trunk/src/dl-learner/org/dllearner/gui/RunPanel.java 2008-02-07 09:55:12 UTC (rev 509)
@@ -26,7 +26,7 @@
import javax.swing.*;
-//import org.dllearner.core.dl.Concept;
+// import org.dllearner.core.dl.Concept;
/**
* OutputPanel
@@ -38,13 +38,12 @@
private static final long serialVersionUID = 1643304576470046636L;
- private JButton runButton, stopButton;
+ private JButton runButton, stopButton, testButton;
private JTextArea infoArea;
private Config config;
-
+
private ThreadRun thread;
-
RunPanel(Config config) {
super(new BorderLayout());
@@ -54,13 +53,17 @@
runButton.addActionListener(this);
stopButton = new JButton("Stop");
stopButton.addActionListener(this);
-
+ testButton = new JButton("TEST");
+ testButton.addActionListener(this);
+
infoArea = new JTextArea(20, 50);
JScrollPane infoScroll = new JScrollPane(infoArea);
JPanel showPanel = new JPanel();
showPanel.add(runButton);
showPanel.add(stopButton);
+ showPanel.add(testButton);
+
JPanel infoPanel = new JPanel();
infoPanel.add(infoScroll);
@@ -70,15 +73,24 @@
public void actionPerformed(ActionEvent e) {
if (e.getSource() == runButton && config.getLearningAlgorithm() != null) {
+ config.autoInit();
thread = new ThreadRun(config);
thread.start();
- //Concept solution = config.getLearningAlgorithm().getBestSolution();
- //infoArea.setText(solution.toString());
+ // Concept solution =
+ // config.getLearningAlgorithm().getBestSolution();
+ // infoArea.setText(solution.toString());
}
- if (e.getSource() == stopButton && config.getLearningAlgorithm() != null) {
- //config.getLearningAlgorithm().stop();
+ if (e.getSource() == stopButton
+ && config.getLearningAlgorithm() != null) {
+ // config.getLearningAlgorithm().stop();
thread.exit();
+ }
+ if (e.getSource() == testButton
+ && config.getLearningAlgorithm() != null) {
+ config.getLearningAlgorithm().stop();
+
}
+
}
-
+
}
Modified: trunk/src/dl-learner/org/dllearner/gui/ThreadRun.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/ThreadRun.java 2008-02-07 09:40:38 UTC (rev 508)
+++ trunk/src/dl-learner/org/dllearner/gui/ThreadRun.java 2008-02-07 09:55:12 UTC (rev 509)
@@ -43,5 +43,6 @@
public void exit() {
if (config.getLearningAlgorithm() != null)
config.getLearningAlgorithm().stop();
+ System.out.println("stop");
}
}
Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelString.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelString.java 2008-02-07 09:40:38 UTC (rev 508)
+++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelString.java 2008-02-07 09:55:12 UTC (rev 509)
@@ -57,7 +57,7 @@
private Class<? extends Component> componentOption;
private String value;
- private JTextField stringField = new JTextField(15);
+ private JTextField stringField = new JTextField(35);
public WidgetPanelString(Config config, Component component,
Class<? extends Component> componentOption,
@@ -86,9 +86,16 @@
value = fc.getSelectedFile().toString();
stringField.setText(value);
config.setURI(value); // save variable
+ System.out.println("value: " + config.getURI());
}
}
setEntry();
+ // if url and value not ""
+ // necessary for init knowledge source
+ if (configOption.getName().equalsIgnoreCase("url")
+ && !value.equalsIgnoreCase("")) {
+ config.setURI(value);
+ }
}
}
@@ -164,10 +171,7 @@
* ActionPerformed
*/
private Boolean checkForFilename() {
- if (configOption.getName().equalsIgnoreCase("filename"))
- return true;
- else
- return false;
+ return configOption.getName().equalsIgnoreCase("filename");
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
