Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1718] trunk/src/dl-learner/org/dllearner/tools/ protege
|
From: <hee...@us...> - 2009-04-20 12:15:00
|
Revision: 1718
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1718&view=rev
Author: heeroyuy
Date: 2009-04-20 12:14:59 +0000 (Mon, 20 Apr 2009)
Log Message:
-----------
-fixed some bugs
-added additional information on graphical panel
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.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/IndividualPoint.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 2009-04-20 11:02:19 UTC (rev 1717)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-04-20 12:14:59 UTC (rev 1718)
@@ -102,7 +102,7 @@
if (z.getActionCommand().equals("suggest equivalent class expression") || z.getActionCommand().equals("suggest super class expression")) {
model.setKnowledgeSource();
- model.setReasoner();
+ //model.setReasoner();
model.setLearningProblem();
model.setLearningAlgorithm();
view.getRunButton().setEnabled(false);
@@ -383,6 +383,7 @@
ontology, null),
((EvaluatedDescriptionClass) eval)
.getAccuracy() * 100));
+ i++;
break;
} else {
dm.add(i, new SuggestListItem(colorRed,
@@ -392,6 +393,7 @@
((EvaluatedDescriptionClass) eval)
.getAccuracy() * 100));
view.setIsInconsistent(true);
+ i++;
break;
}
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-04-20 11:02:19 UTC (rev 1717)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-04-20 12:14:59 UTC (rev 1718)
@@ -160,8 +160,9 @@
advanced.setSize(20, 20);
learner.setLayout(new GridBagLayout());
accept.setPreferredSize(new Dimension(70, 40));
- run.setPreferredSize(new Dimension(220, 50));
+ 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,7 +193,6 @@
*/
public void makeView(String label) {
run.setText("suggest " + label + " expression");
- run.setPreferredSize(new Dimension(200, 40));
GridBagConstraints c = new GridBagConstraints();
learner.remove(detail);
model.setID(label);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-04-20 11:02:19 UTC (rev 1717)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-04-20 12:14:59 UTC (rev 1718)
@@ -85,6 +85,7 @@
private final Random random;
private final Color darkGreen;
private final Color darkRed;
+ private int notCoveredInd;
private final MoreDetailForSuggestedConceptsPanel panel;
/**
@@ -104,7 +105,7 @@
String concept, MoreDetailForSuggestedConceptsPanel p) {
this.setVisible(false);
this.setForeground(Color.GREEN);
- this.setPreferredSize(new Dimension(500, 230));
+ this.setPreferredSize(new Dimension(540, 230));
eval = desc;
model = m;
panel = p;
@@ -162,48 +163,63 @@
p = p + 20;
}
g2D.setColor(darkGreen);
- Ellipse2D circlePoint = new Ellipse2D.Double(315 - 1, p - 6, 3, 3);
+ Ellipse2D circlePoint = new Ellipse2D.Double(315 - 1, p - 6, 4, 4);
g2D.fill(circlePoint);
g2D.setColor(Color.BLACK);
g2D.drawString("individuals covered by", 320, p);
g2D.setColor(Color.ORANGE);
- g2D.fillOval(445, p - 9, 9, 9);
+ g2D.fillOval(455, p - 9, 9, 9);
g2D.setColor(Color.BLACK);
- g2D.drawString("and", 460, p);
+ g2D.drawString("and", 485, p);
g2D.setColor(Color.YELLOW);
- g2D.fillOval(490, p - 9, 9, 9);
+ g2D.fillOval(525, p - 9, 9, 9);
+ g2D.setColor(Color.BLACK);
p = p + 20;
+ g2D.drawString("(OK)", 320, p);
+ p = p + 20;
if(id.equals(EQUI_STRING)) {
g2D.setColor(darkRed);
- Ellipse2D circlePoint2 = new Ellipse2D.Double(315 - 1, p - 6, 3, 3);
+ Ellipse2D circlePoint2 = new Ellipse2D.Double(315 - 1, p - 6, 4, 4);
g2D.fill(circlePoint2);
g2D.setColor(Color.BLACK);
g2D.drawString("individuals covered by", 320, p);
g2D.setColor(Color.ORANGE);
- g2D.fillOval(445, p - 9, 9, 9);
+ g2D.fillOval(455, p - 9, 9, 9);
+ g2D.setColor(Color.BLACK);
p = p + 20;
+ g2D.drawString("(potential problem)", 320, p);
+ p = p + 20;
g2D.setColor(darkRed);
- Ellipse2D circlePoint3 = new Ellipse2D.Double(315 - 1, p - 6, 3, 3);
+ Ellipse2D circlePoint3 = new Ellipse2D.Double(315 - 1, p - 6, 4, 4);
g2D.fill(circlePoint3);
g2D.setColor(Color.BLACK);
g2D.drawString("individuals covered by", 320, p);
g2D.setColor(Color.YELLOW);
- g2D.fillOval(445, p - 9, 9, 9);
+ g2D.fillOval(455, p - 9, 9, 9);
+ g2D.setColor(Color.BLACK);
+ p = p + 20;
+ g2D.drawString("(potential problem)", 320, p);
} else {
g2D.setColor(Color.BLACK);
- Ellipse2D circlePoint2 = new Ellipse2D.Double(315 - 1, p - 6, 3, 3);
+ Ellipse2D circlePoint2 = new Ellipse2D.Double(315 - 1, p - 6, 4, 4);
g2D.fill(circlePoint2);
g2D.drawString("individuals covered by", 320, p);
g2D.setColor(Color.ORANGE);
- g2D.fillOval(445, p - 9, 9, 9);
+ g2D.fillOval(455, p - 9, 9, 9);
+ g2D.setColor(Color.BLACK);
p = p + 20;
+ g2D.drawString("(no problem)", 320, p);
+ p = p + 20;
g2D.setColor(darkRed);
- Ellipse2D circlePoint3 = new Ellipse2D.Double(315 - 1, p - 6, 3, 3);
+ Ellipse2D circlePoint3 = new Ellipse2D.Double(315 - 1, p - 6, 4, 4);
g2D.fill(circlePoint3);
g2D.setColor(Color.BLACK);
g2D.drawString("individuals covered by", 320, p);
g2D.setColor(Color.YELLOW);
- g2D.fillOval(445, p - 9, 9, 9);
+ g2D.fillOval(455, p - 9, 9, 9);
+ g2D.setColor(Color.BLACK);
+ p = p + 20;
+ g2D.drawString("(potential problem)", 320, p);
}
g2D.setColor(Color.YELLOW);
@@ -217,7 +233,7 @@
// Plus 1
if (coveredIndividualSize != model.getReasoner().getIndividuals(
model.getCurrentConcept()).size()
- && coveredIndividualSize != 0) {
+ && notCoveredInd != 0) {
g2D.drawLine(x1 - 1 - shiftOldConcept, y1 - 1, x2 + 1
- shiftOldConcept, y1 - 1);
g2D.drawLine(x1 - shiftOldConcept, centerY - 1, x2
@@ -268,7 +284,7 @@
// Plus 3
if (coveredIndividualSize != model.getReasoner().getIndividuals(
- model.getCurrentConcept()).size()) {
+ model.getCurrentConcept()).size() && ((EvaluatedDescriptionClass) eval).getAdditionalInstances().size() != 0) {
g2D.drawLine(x1 - 1 + shiftNewConcept, y1 - 1, x2 + 1
+ shiftNewConcept, y1 - 1);
g2D.drawLine(x1 + shiftNewConcept, centerY - 1, x2
@@ -291,7 +307,7 @@
g2D.drawLine(x2 + 1 + shiftNewConcept, y1 - 1, x2 + 1
+ shiftNewConcept, y2 + 1);
}
-
+ //Plus 4
if (((EvaluatedDescriptionClass) eval).getAddition() != 1.0
&& ((EvaluatedDescriptionClass) eval).getCoverage() == 1.0) {
g2D.drawLine(x1 - 1 + shiftNewConceptX, y1 - 1
@@ -344,6 +360,17 @@
g2D.setColor(darkRed);
g2D.drawString("Adding this class expression may lead to an inconsistent ontology.", 0, 220);
}
+ if(eval.getAccuracy() == 1.0) {
+ g2D.setComposite(original);
+ g2D.setColor(Color.ORANGE);
+ g2D.fillOval(0, 211, 9, 9);
+ g2D.setColor(darkRed);
+ g2D.drawString("and", 25, 220);
+ g2D.setColor(Color.YELLOW);
+ g2D.fillOval(65, 211, 9, 9);
+ g2D.setColor(darkRed);
+ g2D.drawString("covers the same instances.", 95, 220);
+ }
this.setVisible(true);
panel.repaint();
}
@@ -409,10 +436,17 @@
int i = conceptNew.length();
while (i > 0) {
- int sub = conceptNew.indexOf(" ");
- String subString = conceptNew.substring(0, sub) + " ";
+ int sub = 0;
+ String subString = "";
+ if(conceptNew.contains(" ")) {
+ sub = conceptNew.indexOf(" ");
+ subString = conceptNew.substring(0, sub) + " ";
conceptNew = conceptNew.replace(conceptNew.substring(0, sub + 1),
"");
+ } else {
+ subString = conceptNew;
+ conceptNew = "";
+ }
while (sub < SUBSTRING_SIZE) {
if (conceptNew.length() > 0 && conceptNew.contains(" ")) {
sub = conceptNew.indexOf(" ");
@@ -544,6 +578,7 @@
Set<Individual> notCovInd = model.getReasoner().getIndividuals(
model.getCurrentConcept());
notCovInd.removeAll(posInd);
+ notCoveredInd = notCovInd.size();
int k = 0;
x = random.nextInt(n);
y = random.nextInt(n);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java 2009-04-20 11:02:19 UTC (rev 1717)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java 2009-04-20 12:14:59 UTC (rev 1718)
@@ -46,7 +46,7 @@
this.point = p;
this.xAxis = x;
this.yAxis = y;
- this.circlePoint = new Ellipse2D.Double(x - 1, y - 1, 3, 3);
+ this.circlePoint = new Ellipse2D.Double(x - 1, y - 1, 4, 4);
this.individual = ind;
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-04-20 11:02:19 UTC (rev 1717)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-04-20 12:14:59 UTC (rev 1718)
@@ -60,7 +60,7 @@
private Set<String> ontologiesStrings;
private final JTextArea conceptText;
private static final int HEIGHT = 230;
- private static final int WIDTH = 510;
+ private static final int WIDTH = 540;
private GraphicalCoveragePanel p;
private final MoreDetailForSuggestedConceptsPanelHandler handler;
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-04-20 11:02:19 UTC (rev 1717)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-04-20 12:14:59 UTC (rev 1718)
@@ -161,7 +161,7 @@
@Override
public void run() {
model.getSuggestModel().removeAllElements();
- model.initReasoner();
+ //model.initReasoner();
reasoner = model.getReasoner();
isInconsistent = false;
if(!isInconsistent) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
