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

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

Revision: 1725
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1725&view=rev
Author:   heeroyuy
Date:     2009-04-23 10:19:45 +0000 (Thu, 23 Apr 2009)

Log Message:
-----------
-fixed error in ReadingOntologyThread

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

Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java	2009-04-21 18:31:13 UTC (rev 1724)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java	2009-04-23 10:19:45 UTC (rev 1725)
@@ -155,6 +155,7 @@
 	// This is a List of evaluated descriptions to get more information of the
 	// suggested concept
 	private List<? extends EvaluatedDescription> evalDescriptions;
+	private boolean isReasonerSet;
 
 	/**
 	 * This is the constructor for DL-Learner model.
@@ -168,7 +169,7 @@
 	 */
 	public DLLearnerModel(OWLEditorKit editorKit, DLLearnerView view) {
 		editor = editorKit;
-		
+		isReasonerSet = false;
 		this.view = view;
 		ontologyConsistent = true;
 		owlDescription = new HashSet<OWLDescription>();
@@ -191,7 +192,6 @@
 		alreadyLearned = false;
 		setKnowledgeSource();
 		setReasoner();
-
 	}
 
 	/**
@@ -225,6 +225,7 @@
 			reasoner.init();
 			reasoner.isSatisfiable();
 			view.setIsInconsistent(false);
+			isReasonerSet = true;
 		} catch (ComponentInitException e) {
 			// TODO Auto-generated catch block
 			System.out.println("fehler!!!!!!!!!");	
@@ -494,6 +495,10 @@
 	public String getID() {
 		return id;
 	}
+	
+	public boolean isReasonerSet() {
+		return isReasonerSet;
+	}
 }
 
 

Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java	2009-04-21 18:31:13 UTC (rev 1724)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java	2009-04-23 10:19:45 UTC (rev 1725)
@@ -120,6 +120,7 @@
 	private static final int SCROLL_WIDTH = 600;
 	private static final int SCROLL_HEIGHT = 400;
 	private boolean toogled = false;
+	private String labels;
 
 	/**
 	 * The constructor for the DL-Learner tab in the class description
@@ -130,6 +131,7 @@
 	 */
 	public DLLearnerView(OWLEditorKit editor) {
 		editorKit = editor;
+		labels = "";
 		model = new DLLearnerModel(editorKit, this);
 		sugPanel = new SuggestClassPanel();
 		learnerPanel = new JPanel();
@@ -162,7 +164,6 @@
 		accept.setPreferredSize(new Dimension(70, 40));
 		run.setPreferredSize(new Dimension(260, 30));
 		advanced.setName("Advanced");
-		model.initReasoner();
 		learnerScroll.setPreferredSize(new Dimension(SCROLL_WIDTH, SCROLL_HEIGHT));
 		learnerScroll.getVerticalScrollBar().setUnitIncrement(SCROLL_SPEED);
 		posPanel = new PosAndNegSelectPanel(model, action);
@@ -192,14 +193,26 @@
 	 * This Method renders the view of the plugin.
 	 */
 	public void makeView(String label) {
+		run.setEnabled(false);
+		String currentConcept = editorKit.getOWLWorkspace().getOWLSelectionModel().getLastSelectedClass().toString();
+		if(!labels.equals(currentConcept)) {
+			readThread = new ReadingOntologyThread(editorKit, this, model);
+		}
+		if(!readThread.isAlive() && !labels.equals(currentConcept)) {
+			readThread.start();
+		}
+		if(readThread.hasIndividuals()) {
+			run.setEnabled(true);
+		}
+		labels = currentConcept;
 		run.setText("suggest " + label + " expression");
 		GridBagConstraints c = new GridBagConstraints();
 		learner.remove(detail);
 		model.setID(label);
 		runPanel.add(BorderLayout.WEST, run);
 		runPanel.add(BorderLayout.EAST, wikiPane);
-		run.setEnabled(false);
 		
+		
 		c.anchor = GridBagConstraints.FIRST_LINE_START;
 		c.gridx = 0;
 		c.weightx = 0.0;
@@ -261,10 +274,8 @@
 		detail.unsetPanel();
 		learnerPanel.setPreferredSize(new Dimension(WIDTH, HEIGHT));
 		detail.setVisible(false);
-		hint.setText("");
 		isInconsistent = false;
-		readThread = new ReadingOntologyThread(editorKit, this, model);
-		readThread.start();
+
 		hint.setVisible(true);
 		action.resetToggled();
 		detail.setVisible(true);

Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java	2009-04-21 18:31:13 UTC (rev 1724)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java	2009-04-23 10:19:45 UTC (rev 1725)
@@ -70,11 +70,6 @@
 	@Override
 	public void initialise() throws Exception {
 		view = new DLLearnerView(super.getOWLEditorKit());
-		if(this.getAxiomType().toString().equals(EQUIVALENT_CLASS_STRING)) {
-			view.makeView("equivalent class");
-		} else if(this.getAxiomType().toString().equals(SUPERCLASS_STRING)) {
-			view.makeView("super class");
-		}
 	}
 
 	@Override

Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java	2009-04-21 18:31:13 UTC (rev 1724)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java	2009-04-23 10:19:45 UTC (rev 1725)
@@ -96,6 +96,7 @@
 									// individuals of
 									// the concept
 									currentConcept = concept;
+
 									if (reasoner.getIndividuals(concept) != null) {
 										if (reasoner.getIndividuals(concept).size() > 0) {
 											hasIndividuals = true;
@@ -160,12 +161,16 @@
 	
 	@Override
 	public void run() {
-		model.getSuggestModel().removeAllElements();
-		//model.initReasoner();
+		String loading ="loading instances...";
+		view.getHintPanel().setForeground(Color.RED);
+		view.setHintMessage(loading);
+		if(!model.isReasonerSet()) {
+			model.setKnowledgeSource();
+			model.setReasoner();
+		}
 		reasoner = model.getReasoner();
 		isInconsistent = false;
 		if(!isInconsistent) {
-			
 			this.checkURI();
 			this.setPositiveConcept();
 			if (this.hasIndividuals()) {


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