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

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

Revision: 1754
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1754&view=rev
Author:   heeroyuy
Date:     2009-05-18 14:15:08 +0000 (Mon, 18 May 2009)

Log Message:
-----------
-fixed bug

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/ReadingOntologyThread.java

Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java	2009-05-17 19:43:45 UTC (rev 1753)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java	2009-05-18 14:15:08 UTC (rev 1754)
@@ -156,6 +156,7 @@
 	// suggested concept
 	private List<? extends EvaluatedDescription> evalDescriptions;
 	private boolean isReasonerSet;
+	private boolean knowledgeSourceIsUpdated;
 
 	/**
 	 * This is the constructor for DL-Learner model.
@@ -170,6 +171,7 @@
 		isReasonerSet = false;
 		this.view = view;
 		ontologyConsistent = true;
+		knowledgeSourceIsUpdated = false;
 		owlDescription = new HashSet<OWLDescription>();
 		ComponentManager.setComponentClasses(componenten);
 		cm = ComponentManager.getInstance();
@@ -522,6 +524,14 @@
 	public EvaluatedDescription getCurrentlySelectedClassDescription(int index) {
 		return evalDescriptions.get(index);
 	}
+	
+	public void setKnowledgeSourceIsUpdated(boolean isUpdated) {
+		knowledgeSourceIsUpdated = isUpdated;
+	}
+	
+	public boolean getIsKnowledgeSourceIsUpdated() {
+		return knowledgeSourceIsUpdated;
+	}
 }
 
 

Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java	2009-05-17 19:43:45 UTC (rev 1753)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java	2009-05-18 14:15:08 UTC (rev 1754)
@@ -121,6 +121,7 @@
 	private static final int SCROLL_HEIGHT = 400;
 	private boolean toogled = false;
 	private String labels;
+	private int individualSize;
 
 	/**
 	 * The constructor for the DL-Learner tab in the class description
@@ -131,6 +132,7 @@
 	public DLLearnerView(OWLEditorKit editor) {
 		editorKit = editor;
 		labels = "";
+		individualSize = 0;
 		model = new DLLearnerModel(editorKit, this);
 		sugPanel = new SuggestClassPanel(model, this);
 		learnerPanel = new JPanel();
@@ -195,18 +197,21 @@
 	public void makeView(String label) {
 		run.setEnabled(false);
 		String currentConcept = editorKit.getOWLWorkspace().getOWLSelectionModel().getLastSelectedClass().toString();
-		if(!labels.equals(currentConcept)) {
+		if(!labels.equals(currentConcept) || individualSize != editorKit.getModelManager().getActiveOntology().getIndividualAxioms().size()) {
+			if(individualSize != editorKit.getModelManager().getActiveOntology().getIndividualAxioms().size()) {
+				model.setKnowledgeSourceIsUpdated(true);
+			} else {
+				model.setKnowledgeSourceIsUpdated(false);
+			}
 			readThread = new ReadingOntologyThread(editorKit, this, model);
 		}
-		if(!readThread.isAlive() && !labels.equals(currentConcept)) {
+		if(!readThread.isAlive() && !labels.equals(currentConcept)|| individualSize != editorKit.getModelManager().getActiveOntology().getIndividualAxioms().size()) {
 			readThread.start();
 		}
 		if(readThread.hasIndividuals()) {
 			run.setEnabled(true);
 		}
-		//if(labels.equals(currentConcept)) {
-		//model.getReasoner().setUpdated();
-		//}
+		individualSize = editorKit.getModelManager().getActiveOntology().getIndividualAxioms().size();
 		labels = currentConcept;
 		run.setText("suggest " + label + " expression");
 		GridBagConstraints c = new GridBagConstraints();

Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java	2009-05-17 19:43:45 UTC (rev 1753)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java	2009-05-18 14:15:08 UTC (rev 1754)
@@ -103,7 +103,6 @@
 									// individuals of
 									// the concept
 									currentConcept = concept;
-
 									if (reasoner.getIndividuals(concept) != null) {
 										if (reasoner.getIndividuals(concept).size() > 0) {
 											hasIndividuals = true;
@@ -170,7 +169,7 @@
 		String loading ="loading instances...";
 		view.getHintPanel().setForeground(Color.RED);
 		view.setHintMessage(loading);
-		if(!model.isReasonerSet()) {
+		if(!model.isReasonerSet() || model.getIsKnowledgeSourceIsUpdated() == true) {
 			model.setKnowledgeSource();
 			model.setReasoner();
 		}


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