[DL-Learner SVN] SF.net SVN: dl-learner: [737] trunk/src/dl-learner/org/dllearner/tools/ore

[<lor...@us...>]

Revision: 737
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=737&view=rev
Author:   lorenz_b
Date:     2008-03-29 14:05:25 -0700 (Sat, 29 Mar 2008)

Log Message:
-----------


Modified Paths:
--------------
    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

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanel.java	2008-03-29 20:37:54 UTC (rev 736)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanel.java	2008-03-29 21:05:25 UTC (rev 737)
@@ -1,6 +1,7 @@
 package org.dllearner.tools.ore;
 
 import java.awt.BorderLayout;
+import java.awt.Dimension;
 import java.awt.event.ActionListener;
 
 import javax.swing.DefaultListModel;
@@ -51,7 +52,7 @@
 		
 			
 		conceptList = new JList(model);
-		scroll.setSize(100,100);
+		scroll.setPreferredSize(new Dimension(300, 300));
 		scroll.setViewportView(conceptList);
 				
 		contentPanel1.add(scroll);
@@ -80,6 +81,10 @@
 	public JButton getStopButton() {
 		return stopButton;
 	}
+
+	public DefaultListModel getModel() {
+		return model;
+	}
 	
 	
 	

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanelDescriptor.java	2008-03-29 20:37:54 UTC (rev 736)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanelDescriptor.java	2008-03-29 21:05:25 UTC (rev 737)
@@ -2,12 +2,14 @@
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.ExecutionException;
 
 import javax.swing.SwingWorker;
 
+import org.dllearner.core.LearningAlgorithm;
 import org.dllearner.core.owl.Description;
 
 
@@ -45,50 +47,64 @@
     	
     }
     
-    class ResultSwingWorker extends SwingWorker<Description, Description>
-    {
-      @Override 
-      public Description doInBackground() {
-			
-			getWizardModel().getOre().start();
+    class ResultSwingWorker extends
+			SwingWorker<List<Description>, List<Description>> {
+		LearningAlgorithm la;
+
+		@Override
+		public List<Description> doInBackground() {
+
+			la = getWizardModel().getOre().start();
 			timer = new Timer();
-			timer.schedule(new TimerTask(){
+			timer.schedule(new TimerTask() {
 
 				public void run() {
-					System.err.println(getWizardModel().getOre()
-							.getLearningResults(3));
+					publish(getWizardModel().getOre().getLearningResults(5));
 				}
-				
+
 			}, 0, 1000);
-      
-			
-			Description result = getWizardModel().getOre().getLearningResult();
 
+			List<Description> result = getWizardModel().getOre()
+					.getLearningResults(5);
+
 			return result;
 		}
-      
-      public void done() {
-    	  timer.cancel();
-    	  Description result = null;
+
+		public void done() {
+			timer.cancel();
+			List<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());
+			for (Description d : result)
+				panel4.getModel().addElement(d);
+
 		}
-      
-      
-      
-    }
 
+		@Override
+		protected void process(List<List<Description>> resultLists) {
+			panel4.getModel().clear();
+			for (List<Description> list : resultLists) {
+				for (Description d : list)
+					panel4.getModel().addElement(d);
+			}
+		}
+
+		public LearningAlgorithm getLa() {
+			return la;
+		}
+
+	}
+
 	
 	public void actionPerformed(ActionEvent event) {
 		if(event.getActionCommand().equals("Start")){
@@ -99,7 +115,7 @@
 		}
 		else{
 			panel4.getStopButton().setEnabled(false);
-            worker.cancel(true);
+            worker.getLa().stop();
         	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 20:37:54 UTC (rev 736)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ORE.java	2008-03-29 21:05:25 UTC (rev 737)
@@ -126,20 +126,14 @@
 	}
 
 	
-	public void startLearningThread(){
-		
-		
-				la.start();
-				
-	
-	}
-
-	public void start(){
+	public LearningAlgorithm start(){
 		this.setPosNegExamples();
 		this.setLearningProblem();
 		this.setLearningAlgorithm();
 		la.start();
-		this.startLearningThread();
+		
+		return la;
+		
 	}
 	
 	public Description getLearningResult(){
@@ -171,7 +165,7 @@
 		System.out.println(test.negExamples);
 		test.setLearningProblem();
 		test.setLearningAlgorithm();
-		test.startLearningThread();
+		test.start();
 	}
 	
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.