Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [736] trunk/src/dl-learner/org/dllearner/tools/ore
|
From: <lor...@us...> - 2008-03-29 20:37:57
|
Revision: 736
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=736&view=rev
Author: lorenz_b
Date: 2008-03-29 13:37:54 -0700 (Sat, 29 Mar 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/ore/ConceptPanel.java
trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanel.java
trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanelDescriptor.java
trunk/src/dl-learner/org/dllearner/tools/ore/ORE.java
trunk/src/dl-learner/org/dllearner/tools/ore/WizardController.java
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ConceptPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ConceptPanel.java 2008-03-29 17:13:15 UTC (rev 735)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ConceptPanel.java 2008-03-29 20:37:54 UTC (rev 736)
@@ -65,9 +65,8 @@
conceptList = new JList(model);
- scroll.setSize(100,100);
+ scroll.setPreferredSize(new Dimension(200,200));
scroll.setViewportView(conceptList);
-
contentPanel1.add(scroll);
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanel.java 2008-03-29 17:13:15 UTC (rev 735)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanel.java 2008-03-29 20:37:54 UTC (rev 736)
@@ -20,17 +20,26 @@
private DefaultListModel model;
private JLabel result;
- private JButton run;
+ private JButton startButton;
+ private JButton stopButton;
public LearningPanel() {
super();
model = new DefaultListModel();
result = new JLabel();
- run = new JButton("Run");
+ JPanel buttonPanel = new JPanel();
+ startButton = new JButton("Start");
+
+ stopButton = new JButton("Stop");
+ stopButton.setEnabled(false);
+
+ buttonPanel.add(startButton);
+ buttonPanel.add(stopButton);
contentPanel = getContentPanel();
setLayout(new java.awt.BorderLayout());
- add(run,BorderLayout.EAST);
+
+ add(buttonPanel, BorderLayout.EAST);
add(contentPanel,BorderLayout.CENTER);
add(result, BorderLayout.SOUTH);
}
@@ -52,13 +61,25 @@
return contentPanel1;
}
- public void addButtonListener(ActionListener a){
- run.addActionListener(a);
+ public void addStartButtonListener(ActionListener a){
+ startButton.addActionListener(a);
}
+ public void addStopButtonListener(ActionListener a){
+ stopButton.addActionListener(a);
+ }
+
public void setResult(String resultStr){
result.setText(resultStr);
}
+
+ public JButton getStartButton() {
+ return startButton;
+ }
+
+ public JButton getStopButton() {
+ return stopButton;
+ }
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanelDescriptor.java 2008-03-29 17:13:15 UTC (rev 735)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanelDescriptor.java 2008-03-29 20:37:54 UTC (rev 736)
@@ -2,6 +2,8 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.util.Timer;
+import java.util.TimerTask;
import java.util.concurrent.ExecutionException;
import javax.swing.SwingWorker;
@@ -16,12 +18,15 @@
public static final String IDENTIFIER = "LEARNING_PANEL";
LearningPanel panel4;
+ ResultSwingWorker worker;
+ Timer timer;
public LearningPanelDescriptor() {
panel4 = new LearningPanel();
- panel4.addButtonListener(this);
-
+ panel4.addStartButtonListener(this);
+ panel4.addStopButtonListener(this);
+
setPanelDescriptorIdentifier(IDENTIFIER);
setPanelComponent(panel4);
@@ -40,43 +45,64 @@
}
- class Result extends SwingWorker<Description, Void>
+ class ResultSwingWorker extends SwingWorker<Description, Description>
{
@Override
- public Description doInBackground()
- {
- getWizardModel().getOre().start();
- Description result = getWizardModel().getOre().getLearningResult();
-
-
- return result;
- }
+ public Description doInBackground() {
+
+ getWizardModel().getOre().start();
+ timer = new Timer();
+ timer.schedule(new TimerTask(){
+
+ public void run() {
+ System.err.println(getWizardModel().getOre()
+ .getLearningResults(3));
+ }
+
+ }, 0, 1000);
- public void done(){
- Description result=null;
- try {
- result = get();
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ExecutionException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+
+ Description result = getWizardModel().getOre().getLearningResult();
+
+ return result;
}
- panel4.setResult(result.toString());
- }
+ public void done() {
+ timer.cancel();
+ Description result = null;
+ try {
+ result = get();
+ } catch (InterruptedException e) {
+
+ e.printStackTrace();
+ } catch (ExecutionException e) {
+
+ e.printStackTrace();
+ }
+ panel4.getStartButton().setEnabled(true);
+ panel4.getStopButton().setEnabled(false);
+
+ panel4.setResult(result.toString());
+ }
+
}
-
-
-
-
- @Override
- public void actionPerformed(ActionEvent arg0) {
- new Result().execute();
+ public void actionPerformed(ActionEvent event) {
+ if(event.getActionCommand().equals("Start")){
+ panel4.getStartButton().setEnabled(false);
+ panel4.getStopButton().setEnabled(true);
+ worker = new ResultSwingWorker();
+ worker.execute();
+ }
+ else{
+ panel4.getStopButton().setEnabled(false);
+ worker.cancel(true);
+ panel4.getStartButton().setEnabled(true);
+ }
+
+
}}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ORE.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ORE.java 2008-03-29 17:13:15 UTC (rev 735)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ORE.java 2008-03-29 20:37:54 UTC (rev 736)
@@ -20,6 +20,8 @@
import org.dllearner.learningproblems.PosNegDefinitionLP;
import org.dllearner.reasoning.OWLAPIReasoner;
+import java.util.List;
+
public class ORE {
private LearningAlgorithm la;
@@ -125,15 +127,11 @@
public void startLearningThread(){
- Thread laThread = new Thread()
- {
- @Override
- public void run(){
+
+
la.start();
- }
- };
- laThread.start();
+
}
public void start(){
@@ -147,6 +145,10 @@
public Description getLearningResult(){
return la.getBestSolution();
}
+
+ public List<Description> getLearningResults(int anzahl){
+ return la.getBestSolutions(anzahl);
+ }
public static void main(String[] args){
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/WizardController.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/WizardController.java 2008-03-29 17:13:15 UTC (rev 735)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/WizardController.java 2008-03-29 20:37:54 UTC (rev 736)
@@ -66,7 +66,7 @@
//TODO nochmal \xFCberdenken
if(nextPanelDescriptor.equals("CONCEPT_CHOOSE_PANEL")){
- //((ConceptPanelDescriptor)wizard.getModel().getPanelHashMap().get(nextPanelDescriptor)).panel3.getModel().clear();
+ ((ConceptPanelDescriptor)wizard.getModel().getPanelHashMap().get(nextPanelDescriptor)).panel3.getModel().clear();
new ConceptRetriever(nextPanelDescriptor).execute();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
