Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[2221] trunk/src/dl-learner/org/dllearner/tools/ protege
|
From: <lor...@us...> - 2010-08-02 08:55:33
|
Revision: 2221
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2221&view=rev
Author: lorenz_b
Date: 2010-08-02 08:55:24 +0000 (Mon, 02 Aug 2010)
Log Message:
-----------
Some changes to show errors in editor.
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoverageTextField.java
trunk/src/dl-learner/org/dllearner/tools/protege/Manager.java
trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2010-07-27 11:46:45 UTC (rev 2220)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2010-08-02 08:55:24 UTC (rev 2221)
@@ -32,6 +32,7 @@
import org.dllearner.core.EvaluatedDescription;
import org.protege.editor.core.ProtegeApplication;
+import org.protege.editor.core.ui.error.ErrorLogPanel;
import org.protege.editor.core.ui.progress.BackgroundTask;
/**
@@ -174,35 +175,42 @@
}
});
- Manager manager = Manager.getInstance();
- manager.initLearningProblem();
- manager.initLearningAlgorithm();
- view.setBusyTaskEnded();
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- view.setLearningStarted();
- view.showHorizontalExpansionMessage(Manager.getInstance().getMinimumHorizontalExpansion(),
- Manager.getInstance().getMaximumHorizontalExpansion());
- }
- });
-
- timer = new Timer();
- timer.schedule(new TimerTask(){
- int progress = 0;
- List<? extends EvaluatedDescription> result;
- @Override
- public void run() {
- progress++;
- setProgress(progress);
- if(!isCancelled() && Manager.getInstance().isLearning()){
- result = Manager.getInstance().getCurrentlyLearnedDescriptions();
- publish(result);
+ try {
+ Manager manager = Manager.getInstance();
+ manager.initLearningProblem();
+ manager.initLearningAlgorithm();
+
+ view.setBusyTaskEnded();
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ view.setLearningStarted();
+ view.showHorizontalExpansionMessage(Manager.getInstance().getMinimumHorizontalExpansion(),
+ Manager.getInstance().getMaximumHorizontalExpansion());
}
- }
+ });
- }, 1000, 500);
- Manager.getInstance().startLearning();
+ timer = new Timer();
+ timer.schedule(new TimerTask(){
+ int progress = 0;
+ List<? extends EvaluatedDescription> result;
+ @Override
+ public void run() {
+ progress++;
+ setProgress(progress);
+ if(!isCancelled() && Manager.getInstance().isLearning()){
+ result = Manager.getInstance().getCurrentlyLearnedDescriptions();
+ publish(result);
+ }
+ }
+
+ }, 1000, 500);
+ Manager.getInstance().startLearning();
+ } catch (Exception e) {
+ ErrorLogPanel.showErrorDialog(e);
+ cancel(true);
+ view.setBusyTaskEnded();
+ }
return null;
@@ -210,11 +218,13 @@
@Override
public void done() {
- timer.cancel();
- List<? extends EvaluatedDescription> result = Manager.getInstance().getCurrentlyLearnedDescriptions();
- updateList(result);
- setProgress(0);
- view.setLearningFinished();
+ if(!isCancelled()){
+ timer.cancel();
+ List<? extends EvaluatedDescription> result = Manager.getInstance().getCurrentlyLearnedDescriptions();
+ updateList(result);
+ setProgress(0);
+ view.setLearningFinished();
+ }
ProtegeApplication.getBackgroundTaskManager().endTask(learningTask);
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoverageTextField.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoverageTextField.java 2010-07-27 11:46:45 UTC (rev 2220)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoverageTextField.java 2010-08-02 08:55:24 UTC (rev 2221)
@@ -76,7 +76,7 @@
sb.append("<p><font size=\"1\" color=\"red\">\u25aa </font><font size=\"3\" color=\"black\">individuals covered by </font><font size=\"3\" color=\"yellow\">\u25cf</font></font><font size=\"3\" color=\"black\"> (potential problem)</font></p>");
}
sb.append("<p><font size=\"3\" color=\"black\">Covers ").append(coveredInstancesCount).append(" of ").append(allInstancesCount).append("(").append(coverage).append(" %) of class instances</font></p>");
- sb.append("<p><font size=\"3\" color=\"black\">Covers ").append(additionalInstancesCount).append(" additional instances</font></p>");
+ sb.append("<p><font size=\"3\" color=\"black\">Covers ").append(additionalInstancesCount).append(additionalInstancesCount == 1 ? " additional instance" : " additional instances").append("</font></p>");
if(!((EvaluatedDescriptionClass) description).isConsistent()) {
sb.append("<p style=\"max-width:100px;\"><font size=\"3\" color=\"red\">Adding this class expression may lead to an inconsistent ontology.</font></p>");
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/Manager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/Manager.java 2010-07-27 11:46:45 UTC (rev 2220)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/Manager.java 2010-08-02 08:55:24 UTC (rev 2221)
@@ -1,6 +1,5 @@
package org.dllearner.tools.protege;
-import java.net.MalformedURLException;
import java.util.Collections;
import java.util.List;
import java.util.SortedSet;
@@ -12,7 +11,6 @@
import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.LearningAlgorithm;
import org.dllearner.core.LearningProblem;
-import org.dllearner.core.LearningProblemUnsupportedException;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Individual;
import org.dllearner.kb.OWLAPIOntology;
@@ -44,10 +42,7 @@
"org.dllearner.reasoning.FastInstanceChecker",
"org.dllearner.reasoning.ProtegeReasoner",
"org.dllearner.reasoning.FastRetrievalReasoner",
- "org.dllearner.algorithms.RandomGuesser",
- "org.dllearner.algorithms.refinement.ROLearner",
"org.dllearner.algorithms.celoe.CELOE",
- "org.dllearner.algorithms.gp.GP", "org.dllearner.learningproblems.PosOnlyLP",
"org.dllearner.learningproblems.PosNegLPStandard", "org.dllearner.learningproblems.ClassLearningProblem"};
private static Manager instance;
@@ -102,7 +97,7 @@
return reinitNecessary;
}
- public void init(){
+ public void init() throws Exception{
initKnowledgeSource();
if(reinitNecessary){
initReasoner();
@@ -112,66 +107,51 @@
reinitNecessary = false;
}
- public void initLearningAlgorithm(){
- try {
- la = cm.learningAlgorithm(CELOE.class, lp, reasoner);
- cm.applyConfigEntry(la, "useAllConstructor", useAllConstructor);
- cm.applyConfigEntry(la, "useExistsConstructor", useExistsConstructor);
- cm.applyConfigEntry(la, "useHasValueConstructor", useHasValueConstructor);
- cm.applyConfigEntry(la, "useNegation", useNegation);
- cm.applyConfigEntry(la, "useCardinalityRestrictions", useCardinalityRestrictions);
- if(useCardinalityRestrictions) {
- cm.applyConfigEntry(la, "cardinalityLimit", cardinalityLimit);
- }
- cm.applyConfigEntry(la, "noisePercentage", noisePercentage);
- cm.applyConfigEntry(la, "maxExecutionTimeInSeconds", maxExecutionTimeInSeconds);
-
- la.init();
- } catch (LearningProblemUnsupportedException e) {
- e.printStackTrace();
- } catch (ComponentInitException e) {
- e.printStackTrace();
+ public void initLearningAlgorithm() throws Exception {
+ la = cm.learningAlgorithm(CELOE.class, lp, reasoner);
+ cm.applyConfigEntry(la, "useAllConstructor", useAllConstructor);
+ cm.applyConfigEntry(la, "useExistsConstructor", useExistsConstructor);
+ cm.applyConfigEntry(la, "useHasValueConstructor",
+ useHasValueConstructor);
+ cm.applyConfigEntry(la, "useNegation", useNegation);
+ cm.applyConfigEntry(la, "useCardinalityRestrictions",
+ useCardinalityRestrictions);
+ if (useCardinalityRestrictions) {
+ cm.applyConfigEntry(la, "cardinalityLimit", cardinalityLimit);
}
-
+ cm.applyConfigEntry(la, "noisePercentage", noisePercentage);
+ cm.applyConfigEntry(la, "maxExecutionTimeInSeconds",
+ maxExecutionTimeInSeconds);
+
+ la.init();
+
}
- public void initLearningProblem(){
+ public void initLearningProblem() throws Exception {
lp = cm.learningProblem(ClassLearningProblem.class, reasoner);
- try {
- cm.applyConfigEntry(lp, "classToDescribe", editorKit.getOWLWorkspace().getOWLSelectionModel().getLastSelectedClass().getIRI().toURI().toURL());
- } catch (MalformedURLException e1) {
- e1.printStackTrace();
- }
+ cm.applyConfigEntry(lp, "classToDescribe", editorKit.getOWLWorkspace()
+ .getOWLSelectionModel().getLastSelectedClass().getIRI().toURI()
+ .toURL());
if (learningType == LearningType.EQUIVALENT) {
cm.applyConfigEntry(lp, "type", "equivalence");
- } else if(learningType == LearningType.SUPER){
+ } else if (learningType == LearningType.SUPER) {
cm.applyConfigEntry(lp, "type", "superClass");
}
- try {
- lp.init();
- } catch (ComponentInitException e) {
- e.printStackTrace();
- }
+
+ lp.init();
+
}
- public void initKnowledgeSource(){
+ public void initKnowledgeSource() throws Exception{
ks = new OWLAPIOntology(editorKit.getOWLModelManager().getActiveOntology());
- try {
- ks.init();
- } catch (ComponentInitException e) {
- e.printStackTrace();
- }
+ ks.init();
}
- public void initReasoner(){
+ public void initReasoner() throws Exception{
reasoner = cm.reasoner(ProtegeReasoner.class, ks);
reasoner.setOWLReasoner(editorKit.getOWLModelManager().getReasoner());
reasoner.setProgressMonitor(progressMonitor);
- try {
- reasoner.init();
- } catch (ComponentInitException e) {
- e.printStackTrace();
- }
+ reasoner.init();
}
public void initReasonerAsynchronously(){
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2010-07-27 11:46:45 UTC (rev 2220)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2010-08-02 08:55:24 UTC (rev 2221)
@@ -44,7 +44,7 @@
// Model of the dllearner
private EvaluatedDescription eval;
- private static final int HEIGHT = 230;
+ private static final int HEIGHT = 300;
private static final int WIDTH = 540;
private GraphicalCoveragePanel graphicalPanel;
private GraphicalCoverageTextField graphicalText;
@@ -59,7 +59,7 @@
setPreferredSize(new Dimension(WIDTH, HEIGHT));
graphicalPanel = new GraphicalCoveragePanel(eval);
graphicalText = new GraphicalCoverageTextField(eval, editorKit);
- graphicalPanel.setBounds(5, 0, 300, 350);
+ graphicalPanel.setBounds(5, 0, 300, 370);
add(graphicalPanel, BorderLayout.CENTER);
add(graphicalText.getTextScroll(), BorderLayout.EAST);
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2010-07-27 11:46:45 UTC (rev 2220)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2010-08-02 08:55:24 UTC (rev 2221)
@@ -19,7 +19,9 @@
*/
package org.dllearner.tools.protege;
+import org.protege.editor.core.ui.error.ErrorLogPanel;
+
/**
* This class reads the ontology in a separate thread.
*
@@ -48,15 +50,19 @@
Manager.getInstance().setIsPreparing(true);
view.showStatusBar(true);
view.setBusy(true);
- Manager.getInstance().initKnowledgeSource();
- Manager.getInstance().initReasoner();
+ try {
+ Manager.getInstance().initKnowledgeSource();
+ Manager.getInstance().initReasoner();
+ if(Manager.getInstance().canLearn()){
+ view.setLearningEnabled();
+ } else {
+ view.showNoInstancesMessage();
+ }
+ } catch (Exception e) {
+ ErrorLogPanel.showErrorDialog(e);
+ }
view.showStatusBar(false);
view.setBusy(false);
- if(Manager.getInstance().canLearn()){
- view.setLearningEnabled();
- } else {
- view.showNoInstancesMessage();
- }
Manager.getInstance().setIsPreparing(false);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
