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

[<hee...@us...>]

Revision: 1886
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1886&view=rev
Author:   heeroyuy
Date:     2009-10-08 13:11:27 +0000 (Thu, 08 Oct 2009)

Log Message:
-----------
-added information from getMinimumHorizontalExpansion() and getMaximumHorizontalExpansion() on main panel

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
    trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java

Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java	2009-10-08 11:51:27 UTC (rev 1885)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java	2009-10-08 13:11:27 UTC (rev 1886)
@@ -40,6 +40,7 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
+import org.dllearner.algorithms.celoe.CELOE;
 import org.dllearner.core.EvaluatedDescription;
 import org.dllearner.core.LearningAlgorithm;
 import org.dllearner.core.owl.Description;
@@ -103,7 +104,10 @@
 			model.setLearningAlgorithm();
 			view.getRunButton().setEnabled(false);
 			view.getHintPanel().setForeground(Color.RED);
-			view.setHintMessage("learning started");
+			CELOE celoe = (CELOE) model.getLearningAlgorithm();
+			
+			String moreInformationsMessage = "Learning started. Currently searching class expressions with length between " + celoe.getMinimumHorizontalExpansion() +  " and" + celoe.getMaximumHorizontalExpansion() + ". ";
+			view.setHintMessage(moreInformationsMessage);
 			retriever = new SuggestionRetriever();
 			retriever.execute();
 			// model.setCurrentConcept(null);
@@ -294,6 +298,10 @@
 						publish(la.getCurrentlyBestEvaluatedDescriptions(view
 								.getPosAndNegSelectPanel().getOptionPanel()
 								.getNrOfConcepts()));
+						CELOE celoe = (CELOE) model.getLearningAlgorithm();
+						view.getHintPanel().setForeground(Color.RED);
+						String moreInformationsMessage = "Learning started. Currently searching class expressions with length between " + celoe.getMinimumHorizontalExpansion() +  " and " + celoe.getMaximumHorizontalExpansion() + ".";
+						view.setHintMessage(moreInformationsMessage);
 					}
 				}
 
@@ -339,9 +347,9 @@
 			} catch (ExecutionException e) {
 				e.printStackTrace();
 			}
-
 			view.algorithmTerminated();
 			updateList(result);
+			view.algorithmTerminated();
 		}
 
 		@Override
@@ -396,6 +404,7 @@
 							}
 						}
 					}
+					
 					view.getSuggestClassPanel().setSuggestList(dm);
 					view.getLearnerView().repaint();
 				}

Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java	2009-10-08 11:51:27 UTC (rev 1885)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java	2009-10-08 13:11:27 UTC (rev 1886)
@@ -39,6 +39,7 @@
 import javax.swing.JTextArea;
 import javax.swing.JToggleButton;
 
+import org.dllearner.algorithms.celoe.CELOE;
 import org.protege.editor.owl.OWLEditorKit;
 import org.semanticweb.owl.model.OWLDescription;
 /**
@@ -487,21 +488,23 @@
 	 * This method sets the run button enable after learning.
 	 */
 	public void algorithmTerminated() {
-		String error = "learning successful\n";
+		CELOE celoe = (CELOE) model.getLearningAlgorithm();
+		String error = "Learning successful. Currently searching class expressions with length between " + celoe.getMinimumHorizontalExpansion() +  " and " + celoe.getMaximumHorizontalExpansion() + ".";
 		hint.setForeground(Color.RED);
-		setHintMessage(error);
+		this.setHintMessage(error);
 		String message = "";
 		if(isInconsistent) {
-			message ="Class expressions marked red will lead to an inconsistent ontology. \nPlease double click on them to view detail information.";
+			message ="\nClass expressions marked red will lead to an inconsistent ontology. \nPlease double click on them to view detail information.";
 		} else {
-			message ="To view details about why a class expression was suggested, please click on it.";
+			message ="\nTo view details about why a class expression was suggested, please click on it.";
 		}
 		run.setEnabled(true);
 		// start the algorithm and print the best concept found
 		//renderErrorMessage(error);
-		hint.setForeground(Color.BLACK);
+		//hint.setForeground(Color.BLACK);
 		hint.append(message);
-		setHintMessage(message);
+		hint.repaint();
+		//setHintMessage(message);
 	}
 	
 	/**


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