Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1667] trunk/src/dl-learner/org/dllearner/tools/ protege
|
From: <hee...@us...> - 2009-03-26 14:26:56
|
Revision: 1667
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1667&view=rev
Author: heeroyuy
Date: 2009-03-26 14:26:46 +0000 (Thu, 26 Mar 2009)
Log Message:
-----------
-fixed plus misplacing
-set more space between slider in the option panel
Modified Paths:
--------------
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/OptionPanel.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-03-26 11:26:36 UTC (rev 1666)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-03-26 14:26:46 UTC (rev 1667)
@@ -229,9 +229,11 @@
public void setIconToggled(boolean toggled) {
if (toggled) {
advanced.setIcon(toggledIcon);
+ learnerPanel.setPreferredSize(new Dimension(575, 400));
}
if (!toggled) {
advanced.setIcon(icon);
+ learnerPanel.setPreferredSize(new Dimension(575, 350));
}
}
@@ -249,7 +251,7 @@
learner.add(advanced);
learner.add(posPanel);
learner.add(detail);
- learnerPanel.setPreferredSize(new Dimension(575, 560));
+ learnerPanel.setPreferredSize(new Dimension(575, 620));
learnerPanel.removeAll();
learnerPanel.add(learner);
learnerScroll.setViewportView(learnerPanel);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-03-26 11:26:36 UTC (rev 1666)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-03-26 14:26:46 UTC (rev 1667)
@@ -151,12 +151,14 @@
g2D.setColor(darkGreen);
g2D.drawString("*", 310, p+3);
g2D.setColor(Color.BLACK);
- g2D.drawString("positive Example", 320, p);
+ g2D.drawString("individuals covered by the new", 320, p);
p = p + 20;
+ g2D.drawString("class expression", 320, p);
+ p = p + 20;
g2D.setColor(darkRed);
g2D.drawString("*", 310, p+3);
g2D.setColor(Color.BLACK);
- g2D.drawString("negative Example", 320, p);
+ g2D.drawString("additional or not covered individuals", 320, p);
g2D.setColor(Color.YELLOW);
g2D.fill(oldConcept);
g2D.fillOval(310, 0, 9, 9);
@@ -278,23 +280,17 @@
for (int i = 0; i < posCovIndVector.size(); i++) {
g2D.setColor(darkGreen);
- g2D.drawString(posCovIndVector.get(i).getPoint(),
- posCovIndVector.get(i).getXAxis(), posCovIndVector.get(
- i).getYAxis());
+ g2D.draw(posCovIndVector.get(i).getIndividualPoint());
}
for (int i = 0; i < posNotCovIndVector.size(); i++) {
g2D.setColor(darkRed);
- g2D.drawString(posNotCovIndVector.get(i).getPoint(),
- posNotCovIndVector.get(i).getXAxis(),
- posNotCovIndVector.get(i).getYAxis());
+ g2D.draw(posNotCovIndVector.get(i).getIndividualPoint());
}
for (int i = 0; i < additionalIndividuals.size(); i++) {
g2D.setColor(Color.BLACK);
- g2D.drawString(additionalIndividuals.get(i).getPoint(),
- additionalIndividuals.get(i).getXAxis(),
- additionalIndividuals.get(i).getYAxis());
+ g2D.draw(additionalIndividuals.get(i).getIndividualPoint());
}
this.setVisible(true);
panel.repaint();
@@ -319,7 +315,8 @@
centerY = (int) old.getCenterY();
double coverage = ((EvaluatedDescriptionClass) eval).getCoverage();
shiftXAxis = (int) Math.round(WIDTH * (1 - coverage));
- if (additionalIndividualSize != 0) {
+
+ if (additionalIndividualSize != 0 && ((EvaluatedDescriptionClass) eval).getCoverage() == 1.0 && ((EvaluatedDescriptionClass) eval).getAddition() < 1.0) {
distortionOld = (int) Math.round(WIDTH * 0.3);
Ellipse2D newer = new Ellipse2D.Double(ELLIPSE_X_AXIS + shiftXAxis,
ELLIPSE_Y_AXIS, WIDTH, HEIGHT);
@@ -345,12 +342,13 @@
shiftNewConcept = (int) Math.round((WIDTH / 2.0) * newConcepts);
} else if (additionalIndividualSize != coveredIndividualSize) {
shiftNewConcept = (int) Math.round((WIDTH / 2.0)
- * (newConcepts + (1 - oldConcepts)));
+ * (1.0 + (1.0 - oldConcepts)));
shiftOldConcept = (int) Math.round((WIDTH / 2.0) * oldConcepts);
shiftCovered = (int) Math.round((WIDTH / 2.0)
* (1 - oldConcepts));
}
- if (((EvaluatedDescriptionClass) eval).getAddition() != 1.0) {
+ if (((EvaluatedDescriptionClass) eval).getAddition() != 1.0 && ((EvaluatedDescriptionClass) eval)
+ .getCoverage() == 1.0) {
shiftCovered = (int) Math.round((WIDTH / 2.0) * 0.625);
shiftNewConceptX = shiftCovered;
shiftNewConcept = 2 * shiftNewConceptX;
@@ -647,15 +645,4 @@
public EvaluatedDescription getEvaluateddescription() {
return eval;
}
-
- public boolean isInCircle(double x, double y, Ellipse2D ell) {
- int r = (WIDTH / 2) * (WIDTH / 2);
- int n = (int) ((x - ell.getCenterX()) * (x - ell.getCenterX()))
- + (int) ((y - ell.getCenterY()-5) * (y - ell.getCenterY()-5));
- if (n <= r) {
- return true;
- } else {
- return false;
- }
- }
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java 2009-03-26 11:26:36 UTC (rev 1666)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java 2009-03-26 14:26:46 UTC (rev 1667)
@@ -19,6 +19,8 @@
*/
package org.dllearner.tools.protege;
+import java.awt.geom.Ellipse2D;
+
/**
* This class is a datastructure for one individual shown in
* the GraphicalCoveragePanel.
@@ -31,6 +33,7 @@
private int xAxis;
private int yAxis;
private final String individual;
+ private final Ellipse2D circlePoint;
/**
* Constructor of the class.
@@ -43,6 +46,7 @@
this.point = p;
this.xAxis = x;
this.yAxis = y;
+ this.circlePoint = new Ellipse2D.Double(x - 1, y - 1, 3, 3);
this.individual = ind;
}
@@ -101,5 +105,8 @@
public String getIndividualName() {
return individual;
}
-
+
+ public Ellipse2D getIndividualPoint() {
+ return circlePoint;
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-03-26 11:26:36 UTC (rev 1666)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-03-26 14:26:46 UTC (rev 1667)
@@ -44,14 +44,14 @@
* Constructor for the Option Panel.
*/
public OptionPanel() {
- setPreferredSize(new Dimension(490, 100));
+ setPreferredSize(new Dimension(490, 150));
setLayout(null);
minAccuracyLabel = new JLabel("noise in %");
minAccuracyLabel.setBounds(5, 0, 150, 40);
maxExecutionTimeLabel = new JLabel("maximum execution time");
- maxExecutionTimeLabel.setBounds(5, 40, 150, 40);
+ maxExecutionTimeLabel.setBounds(5, 60, 150, 40);
nrOfConceptsLabel = new JLabel("max. number of results");
- nrOfConceptsLabel.setBounds(5, 80, 150, 40);
+ nrOfConceptsLabel.setBounds(5, 120, 150, 40);
minAccuracy = new JSlider(0, 50, 5);
minAccuracy.setPaintTicks(true);
@@ -66,7 +66,7 @@
maxExecutionTime.setMajorTickSpacing(10);
maxExecutionTime.setMinorTickSpacing(1);
maxExecutionTime.setPaintLabels(true);
- maxExecutionTime.setBounds(200, 40, 200, 40);
+ maxExecutionTime.setBounds(200, 60, 200, 40);
nrOfConcepts = new JSlider(2, 20, 10);
@@ -74,7 +74,7 @@
nrOfConcepts.setMajorTickSpacing(2);
nrOfConcepts.setMinorTickSpacing(1);
nrOfConcepts.setPaintLabels(true);
- nrOfConcepts.setBounds(200, 80, 200, 40);
+ nrOfConcepts.setBounds(200, 120, 200, 40);
add(minAccuracyLabel);
add(minAccuracy);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
