Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1896] trunk/src/dl-learner/org/dllearner/tools/ protege
|
From: <hee...@us...> - 2009-10-28 10:07:17
|
Revision: 1896
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1896&view=rev
Author: heeroyuy
Date: 2009-10-28 10:07:09 +0000 (Wed, 28 Oct 2009)
Log Message:
-----------
-added more Information for individuals when mouse goes over an individual point
-deprecated constructor in IndividualPoint and write a new one because showing more details on the graphical panel needs it
-fixed a bug that after learning the graphical panel isn't showning
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/GraphicalCoveragePanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java
trunk/src/dl-learner/org/dllearner/tools/protege/IndividualObject.java
trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.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-10-27 23:02:54 UTC (rev 1895)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-10-28 10:07:09 UTC (rev 1896)
@@ -553,10 +553,9 @@
return knowledgeSourceIsUpdated;
}
- /*
- * TODO Add methods to get additional informations about a individual.
- * Informations needed are the ones in the Individuals tab in protege.
- */
+ public OWLEditorKit getOWLEditorKit() {
+ return editor;
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-10-27 23:02:54 UTC (rev 1895)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-10-28 10:07:09 UTC (rev 1896)
@@ -357,7 +357,7 @@
c.gridwidth = GridBagConstraints.REMAINDER;
c.anchor = GridBagConstraints.LINE_START;
c.gridx = 0;
- c.gridy = 3;
+ c.gridy = 4;
c.weightx = 0.0;
c.weighty = 0.0;
learner.add(detail, c);
@@ -367,13 +367,13 @@
c.anchor = GridBagConstraints.LINE_START;
c.gridwidth = GridBagConstraints.REMAINDER;
c.gridx = 0;
- c.gridy = 4;
+ c.gridy = 5;
learner.add(advancedPanel, c);
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.LINE_START;
c.gridx = 0;
- c.gridy = 5;
+ c.gridy = 6;
c.gridwidth = GridBagConstraints.REMAINDER;
learner.add(posPanel, c);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-10-27 23:02:54 UTC (rev 1895)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-10-28 10:07:09 UTC (rev 1896)
@@ -499,7 +499,7 @@
for(String uri : uriString) {
if(ind.toString().contains(uri)) {
posCovIndVector.add(new IndividualPoint("*",
- (int) x, (int) y, ind.toManchesterSyntaxString(uri, null)));
+ (int) x, (int) y, ind.toManchesterSyntaxString(uri, null), ind, uri));
}
}
i++;
@@ -547,7 +547,7 @@
for(String uri : uriString) {
if(ind.toString().contains(uri)) {
posNotCovIndVector.add(new IndividualPoint("*",
- (int) x, (int) y, ind.toManchesterSyntaxString(uri, null)));
+ (int) x, (int) y, ind.toManchesterSyntaxString(uri, null), ind, uri));
}
}
} else {
@@ -555,7 +555,7 @@
for(String uri : uriString) {
if(ind.toString().contains(uri)) {
additionalIndividuals.add(new IndividualPoint("*",
- (int) x, (int) y, ind.toManchesterSyntaxString(uri, null)));
+ (int) x, (int) y, ind.toManchesterSyntaxString(uri, null), ind, uri));
}
}
}
@@ -596,7 +596,7 @@
for(String uri : uriString) {
if(ind.toString().contains(uri)) {
posNotCovIndVector.add(new IndividualPoint("*",
- (int) x, (int) y, ind.toManchesterSyntaxString(uri, null)));
+ (int) x, (int) y, ind.toManchesterSyntaxString(uri, null), ind, uri));
}
}
k++;
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java 2009-10-27 23:02:54 UTC (rev 1895)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java 2009-10-28 10:07:09 UTC (rev 1896)
@@ -24,6 +24,7 @@
import java.awt.event.MouseMotionListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import java.util.Map;
import java.util.Set;
import java.util.Vector;
@@ -32,7 +33,10 @@
import org.dllearner.core.EvaluatedDescription;
import org.dllearner.core.owl.Individual;
+import org.dllearner.core.owl.NamedClass;
+import org.dllearner.core.owl.ObjectProperty;
import org.dllearner.learningproblems.EvaluatedDescriptionClass;
+import org.dllearner.reasoning.FastInstanceChecker;
/**
* This class takes care of all events happening in the GraphicalCoveragePanel.
@@ -93,15 +97,36 @@
panel.getGraphicalCoveragePanel().setToolTipText(
"To view all Individuals please click on the plus");
}
-
+
Vector<IndividualPoint> v = panel.getIndividualVector();
+ FastInstanceChecker reasoner = model.getReasoner();
for (int i = 0; i < v.size(); i++) {
if (v.get(i).getXAxis() >= m.getX() - 5
&& v.get(i).getXAxis() <= m.getX() + 5
&& v.get(i).getYAxis() >= m.getY() - 5
&& v.get(i).getYAxis() <= m.getY() + 5) {
- panel.getGraphicalCoveragePanel().setToolTipText(
- v.get(i).getIndividualName());
+ String individualInformation = "<html><body>" + v.get(i).getIndividualName().toString();
+ Set<NamedClass> types = reasoner.getTypes(v.get(i).getDLLearnerIndividual());
+ individualInformation += "<br><b>Types:</b><br>";
+ for(NamedClass dlLearnerClass : types) {
+ individualInformation += dlLearnerClass.toManchesterSyntaxString(v.get(i).getBaseUri(), null) + "<br>";
+ }
+ Map<ObjectProperty,Set<Individual>> objectProperties = reasoner.getObjectPropertyRelationships(v.get(i).getDLLearnerIndividual());
+ Set<ObjectProperty> key = objectProperties.keySet();
+ individualInformation += "<br><b>Objectproperties:</b><br>";
+ for(ObjectProperty objectProperty: key) {
+ Set<Individual> indiSet = objectProperties.get(objectProperty);
+ individualInformation = individualInformation + objectProperty.toManchesterSyntaxString(v.get(i).getBaseUri(), null) + " ";
+ for(Individual indi: indiSet) {
+ individualInformation += indi.toManchesterSyntaxString(v.get(i).getBaseUri(), null);
+ if(indiSet.size() > 1) {
+ individualInformation += ", ";
+ }
+ }
+ individualInformation += "<br>";
+ }
+ individualInformation += "</body></htlm>";
+ panel.getGraphicalCoveragePanel().setToolTipText(individualInformation);
}
}
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/IndividualObject.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/IndividualObject.java 2009-10-27 23:02:54 UTC (rev 1895)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/IndividualObject.java 2009-10-28 10:07:09 UTC (rev 1896)
@@ -18,6 +18,8 @@
*
*/
package org.dllearner.tools.protege;
+
+
/**
* This Class handles the manchester String, the normal string and if the Individual is a positive Individual.
* @author Christian Koetteritzsch
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java 2009-10-27 23:02:54 UTC (rev 1895)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java 2009-10-28 10:07:09 UTC (rev 1896)
@@ -21,6 +21,8 @@
import java.awt.geom.Ellipse2D;
+import org.dllearner.core.owl.Individual;
+
/**
* This class is a datastructure for one individual shown in
* the GraphicalCoveragePanel.
@@ -34,6 +36,8 @@
private int yAxis;
private final String individual;
private final Ellipse2D circlePoint;
+ private Individual individualDLLearner;
+ private String baseUri;
/**
* Constructor of the class.
@@ -42,6 +46,7 @@
* @param y coordinate on the y axis
* @param ind Name of the Individual
*/
+ @Deprecated
public IndividualPoint(String p, int x, int y, String ind) {
this.point = p;
this.xAxis = x;
@@ -49,6 +54,26 @@
this.circlePoint = new Ellipse2D.Double(x - 1, y - 1, 4, 4);
this.individual = ind;
}
+
+ /**
+ * This is the second Construktor of the class. This should be used if more
+ * details for the shown Individuals should be displayed.
+ * @param p display String
+ * @param x coordinate on the x axis
+ * @param y coordinate on the y axis
+ * @param ind Name of the Individual
+ * @param indi DLLearner Indivudal
+ * @param base base uri of the individual.
+ */
+ public IndividualPoint(String p, int x, int y, String ind, Individual indi, String base) {
+ this.point = p;
+ this.xAxis = x;
+ this.yAxis = y;
+ this.circlePoint = new Ellipse2D.Double(x - 1, y - 1, 4, 4);
+ this.individual = ind;
+ this.individualDLLearner = indi;
+ this.baseUri = base;
+ }
/**
* This method sets the display string of the individual.
@@ -113,4 +138,12 @@
public Ellipse2D getIndividualPoint() {
return circlePoint;
}
+
+ public Individual getDLLearnerIndividual() {
+ return individualDLLearner;
+ }
+
+ public String getBaseUri() {
+ return baseUri;
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-10-27 23:02:54 UTC (rev 1895)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-10-28 10:07:09 UTC (rev 1896)
@@ -29,6 +29,7 @@
import org.dllearner.core.owl.NamedClass;
import org.dllearner.reasoning.FastInstanceChecker;
import org.protege.editor.owl.OWLEditorKit;
+import org.semanticweb.owl.model.OWLAxiom;
import org.semanticweb.owl.model.OWLClass;
import org.semanticweb.owl.model.OWLOntology;
@@ -61,8 +62,18 @@
this.editor = editorKit;
this.view = v;
this.model = m;
+
//TODO: mehr informationen fuer grafische anzeige herraussuchen.
- //editor.getOWLModelManager().getActiveOntology().getIndividualAxioms();
+ //editor.getOWLModelManager().getActiveOntology().getDataPropertyAssertionAxioms(null);
+ //editor.getOWLModelManager().getActiveOntology().getObjectPropertyAssertionAxioms(null);
+ //editor.getOWLModelManager().getActiveOntology().getSameIndividualAxioms(null);
+ //editor.getOWLModelManager().getActiveOntology().getDifferentIndividualAxioms(null);
+ /*Set<OWLAxiom> test = editor.getOWLModelManager().getActiveOntology().getAxioms();
+ for(OWLAxiom t : test) {
+ System.out.println("hier: " + t);
+ //System.out.println("da: " + t);
+ }*/
+ //System.out.println();
}
/**
@@ -86,9 +97,11 @@
*/
private void setPositiveConcept() {
current = editor.getOWLWorkspace().getOWLSelectionModel().getLastSelectedClass();
+ //editor.getOWLWorkspace().getOWLIndividualSelectorPanel().getSelectedObjects();
if(current != null) {
SortedSet<Individual> individuals = null;
hasIndividuals = false;
+ System.out.println("hier: " + editor.getOWLModelManager().getActiveOntology().getAxioms(current));
// checks if selected concept is thing when yes then it selects all
// individuals
if (!(current.toString().equals("Thing"))) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
