Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1684] trunk/src/dl-learner/org/dllearner/tools/ protege
|
From: <hee...@us...> - 2009-04-07 09:46:51
|
Revision: 1684
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1684&view=rev
Author: heeroyuy
Date: 2009-04-07 09:45:11 +0000 (Tue, 07 Apr 2009)
Log Message:
-----------
-fixed some bugs
-started gridbaglayout for dllearnerview
-added axiom types when plugin should displayed to plugin.xml (plugin now incompatible to protege beta build 109)
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
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/EllipseTest.java
trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/META-INF/plugin.xml
trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java
trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java
trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-04-06 12:23:42 UTC (rev 1683)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-04-07 09:45:11 UTC (rev 1684)
@@ -60,7 +60,6 @@
// This is the id that checks if the equivalent class or subclass button is
// pressed in protege
- private final String id;
// this is a boolean that checked if the advanced button was pressed or not.
private boolean toggled;
// This is the Tread of the DL-Learner
@@ -86,9 +85,8 @@
* id if it is a subclass or an equivalent class
*
*/
- public ActionHandler(DLLearnerModel m, DLLearnerView view, String i) {
+ public ActionHandler(DLLearnerModel m, DLLearnerView view) {
this.view = view;
- this.id = i;
this.model = m;
toggled = false;
@@ -142,13 +140,6 @@
}
}
- /**
- *
- * @return id StringID if it is a Subclass or an equivalent class.
- */
- public String getID() {
- return id;
- }
/**
* select/deselect the Check boxes.
@@ -385,7 +376,7 @@
// (ontology, null),
// ((EvaluatedDescriptionClass)
// eval).getAccuracy()*100));
- if (model.isConsistent(eval)) {
+ if (((EvaluatedDescriptionClass) eval).isConsistent()) {
dm.add(i, new SuggestListItem(colorGreen,
eval.getDescription()
.toManchesterSyntaxString(
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-04-06 12:23:42 UTC (rev 1683)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-04-07 09:45:11 UTC (rev 1684)
@@ -39,7 +39,6 @@
import org.dllearner.core.owl.NamedClass;
import org.dllearner.kb.OWLAPIOntology;
import org.dllearner.learningproblems.ClassLearningProblem;
-import org.dllearner.learningproblems.EvaluatedDescriptionClass;
import org.dllearner.reasoning.FastInstanceChecker;
import org.dllearner.utilities.owl.OWLAPIDescriptionConvertVisitor;
import org.mindswap.pellet.exceptions.InconsistentOntologyException;
@@ -79,7 +78,7 @@
private final ComponentManager cm;
private static final String EQUIVALENT_CLASS_AXIOM_STRING = "equivalent class";
- private static final String SUPER_CLASS_AXIOM_STRING = "Suggest super class";
+ private static final String SUPER_CLASS_AXIOM_STRING = "super class";
private static final String EQUIVALENT_CLASS_LEARNING = "equivalence";
private static final String SUPER_CLASS_LEARNING = "superClass";
@@ -137,8 +136,6 @@
// The Individuals of the Ontology
private Set<Individual> individual;
- private int instancesCount;
-
// The error message which is rendered when an error occured
@@ -174,7 +171,6 @@
this.view = view;
ontologyConsistent = true;
- instancesCount = 0;
owlDescription = new HashSet<OWLDescription>();
ComponentManager.setComponentClasses(componenten);
cm = ComponentManager.getInstance();
@@ -454,24 +450,6 @@
}
/**
- * This Method checks if after inserting of this concept the ontology is
- * still consistent.
- *
- * @param eDescription
- * EvauatedDescription
- * @return isConsistent boolean
- */
- public boolean isConsistent(EvaluatedDescription eDescription) {
- boolean isConsistent = false;
- if (((EvaluatedDescriptionClass) eDescription).getCoveredInstances().size() < instancesCount) {
- isConsistent = false;
- } else {
- isConsistent = true;
- }
- return isConsistent;
- }
-
- /**
* This method sets the suggestion list.
*
* @param list
@@ -513,14 +491,6 @@
return individual;
}
- /**
- * This method sets the number of instances.
- * @param i number of instances
- */
- public void setInstancesCount(int i) {
- instancesCount = i;
- }
-
public String getID() {
return id;
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-04-06 12:23:42 UTC (rev 1683)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-04-07 09:45:11 UTC (rev 1684)
@@ -22,6 +22,8 @@
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
import java.awt.event.ActionListener;
import java.net.URL;
import java.util.Set;
@@ -108,7 +110,13 @@
private final OWLEditorKit editorKit;
private final JPanel learnerPanel;
private final JScrollPane learnerScroll;
- private static final int SCROLL_SPPED = 10;
+ private static final int SCROLL_SPEED = 10;
+ private static final int WIDTH = 575;
+ private static final int HEIGHT = 350;
+ private static final int OPTION_HEIGHT = 400;
+ private static final int SCROLL_WIDTH = 600;
+ private static final int SCROLL_HEIGHT = 400;
+ private boolean toogled = false;
/**
* The constructor for the DL-Learner tab in the class description
@@ -117,15 +125,14 @@
* @param editor OWLEditorKit
* @param label String
*/
- public DLLearnerView(String label, OWLEditorKit editor) {
+ public DLLearnerView(OWLEditorKit editor) {
editorKit = editor;
model = new DLLearnerModel(editorKit, this);
- model.setID(label);
sugPanel = new SuggestClassPanel();
learnerPanel = new JPanel();
learnerPanel.setLayout(new BorderLayout());
learnerScroll = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
- action = new ActionHandler(model, this, label);
+ action = new ActionHandler(model, this);
wikiPane = new JLabel("<html>See <a href=\"http://dl-learner.org/wiki/ProtegePlugin\">http://dl-learner.org/wiki/ProtegePlugin</a> for an introduction.</html>");
URL iconUrl = this.getClass().getResource("arrow.gif");
icon = new ImageIcon(iconUrl);
@@ -134,7 +141,9 @@
adv = new JLabel("Advanced Settings");
advanced = new JToggleButton(icon);
advanced.setVisible(true);
+
run = new JButton("suggest class expression");
+
accept = new JButton("ADD");
addButtonPanel = new JPanel(new BorderLayout());
sugPanel.addSuggestPanelMouseListener(action);
@@ -145,19 +154,20 @@
hint.setText("To get suggestions for class expression, please click the button above.");
learner = new JPanel();
advanced.setSize(20, 20);
- learner.setLayout(null);
- accept.setPreferredSize(new Dimension(260, 50));
+ learner.setLayout(new GridBagLayout());
+ accept.setPreferredSize(new Dimension(90, 50));
+ run.setPreferredSize(new Dimension(130, 30));
advanced.setName("Advanced");
- learnerScroll.setPreferredSize(new Dimension(600, 400));
- learnerScroll.getVerticalScrollBar().setUnitIncrement(SCROLL_SPPED);
+ learnerScroll.setPreferredSize(new Dimension(SCROLL_WIDTH, SCROLL_HEIGHT));
+ learnerScroll.getVerticalScrollBar().setUnitIncrement(SCROLL_SPEED);
posPanel = new PosAndNegSelectPanel(model, action);
detail = new MoreDetailForSuggestedConceptsPanel(model);
this.addAcceptButtonListener(this.action);
this.addRunButtonListener(this.action);
- this.addAdvancedButtonListener(this.action);
-
+ this.addAdvancedButtonListener(this.action);
}
+
/**
* This method returns the SuggestClassPanel.
* @return SuggestClassPanel
@@ -176,88 +186,132 @@
/**
* This Method renders the view of the plugin.
*/
- public void makeView() {
+ public void makeView(String label) {
+ GridBagConstraints c = new GridBagConstraints();
learner.remove(detail);
+ model.setID(label);
+
run.setEnabled(false);
+ c.fill = GridBagConstraints.NONE;
+ c.gridwidth = GridBagConstraints.RELATIVE;
+ c.anchor = GridBagConstraints.FIRST_LINE_START;
+ learner.add(run, c);
+
+ c.fill = GridBagConstraints.HORIZONTAL;
+ c.gridwidth = GridBagConstraints.REMAINDER;
+ learner.add(wikiPane, c);
+
+ sugPanel.setSuggestList(new DefaultListModel());
+ sugPanel = sugPanel.updateSuggestClassList();
+ c.gridwidth = GridBagConstraints.RELATIVE;
+ c.fill = GridBagConstraints.NONE;
+ learner.add(sugPanel, c);
+
+ accept.setEnabled(false);
+ addButtonPanel.add("North", accept);
+ c.gridwidth = GridBagConstraints.REMAINDER;
+ learner.add(addButtonPanel, c);
+
+ c.fill = GridBagConstraints.HORIZONTAL;
+ c.gridwidth = GridBagConstraints.REMAINDER;
+ c.ipady = 20;
+ learner.add(hint, c);
+
+
+ advanced.setIcon(icon);
+ advanced.setSelected(false);
+ c.ipady = 0;
+ c.fill = GridBagConstraints.NONE;
+ c.gridwidth = GridBagConstraints.RELATIVE;
+ learner.add(advanced, c);
+
+ c.fill = GridBagConstraints.NONE;
+ c.gridwidth = GridBagConstraints.REMAINDER;
+ c.ipady = 20;
+ learner.add(adv, c);
+
+ posPanel.setVisible(false);
+ c.fill = GridBagConstraints.NONE;
+ c.gridwidth = GridBagConstraints.RELATIVE;
+ c.gridx = 0;
+ c.gridy = 4;
+ c.gridwidth = 3;
+ c.ipady = 80;
+ learner.add(posPanel, c);
+
+
detail.unsetPanel();
- learnerPanel.setPreferredSize(new Dimension(575, 350));
+ learnerPanel.setPreferredSize(new Dimension(WIDTH, HEIGHT));
detail.setVisible(false);
hint.setText("");
isInconsistent = false;
readThread = new ReadingOntologyThread(editorKit, this, model);
readThread.start();
hint.setVisible(true);
- advanced.setIcon(icon);
- accept.setEnabled(false);
action.resetToggled();
- addButtonPanel.add("North", accept);
- sugPanel.setSuggestList(new DefaultListModel());
- sugPanel = sugPanel.updateSuggestClassList();
- advanced.setSelected(false);
- sugPanel.setBounds(10, 35, 470, 110);
- adv.setBounds(40, 195, 200, 20);
- wikiPane.setBounds(220, 0, 350, 30);
addButtonPanel.setBounds(485, 40, 80, 70);
- run.setBounds(10, 0, 200, 30);
- advanced.setBounds(10, 195, 20, 20);
detail.setBounds(10, 195, 600, 300);
detail.setVisible(true);
sugPanel.setVisible(true);
- posPanel.setVisible(false);
- posPanel.setBounds(10, 225, 490, 250);
- accept.setBounds(510, 40, 80, 80);
- hint.setBounds(10, 150, 490, 35);
- errorMessage.setBounds(485, 110, 80, 80);
- learner.add(run);
- learner.add(wikiPane);
- learner.add(adv);
- learner.add(advanced);
- learner.add(sugPanel);
- learner.add(addButtonPanel);
- learner.add(hint);
- learner.add(errorMessage);
- learner.add(posPanel);
- learnerPanel.add(learner);
- learnerScroll.setViewportView(learnerPanel);
+ learnerScroll.setViewportView(learner);
this.renderErrorMessage("");
}
+
/**
* This method sets the right icon for the advanced Panel.
* @param toggled boolean
*/
public void setIconToggled(boolean toggled) {
- if (toggled) {
+ this.toogled = toggled;
+ if (this.toogled) {
advanced.setIcon(toggledIcon);
- learnerPanel.setPreferredSize(new Dimension(575, 400));
+ learnerPanel.setPreferredSize(new Dimension(WIDTH, OPTION_HEIGHT));
+ learnerScroll.setPreferredSize(new Dimension(SCROLL_WIDTH, SCROLL_HEIGHT));
}
- if (!toggled) {
+ if (!this.toogled) {
advanced.setIcon(icon);
- learnerPanel.setPreferredSize(new Dimension(575, 350));
+ learnerPanel.setPreferredSize(new Dimension(WIDTH, HEIGHT));
+ learnerScroll.setPreferredSize(new Dimension(SCROLL_WIDTH, SCROLL_HEIGHT));
}
}
public void setGraphicalPanel() {
+ GridBagConstraints c = new GridBagConstraints();
learner.remove(posPanel);
learner.remove(advanced);
learner.remove(adv);
learner.repaint();
- posPanel.setBounds(10, 435, 490, 250);
- adv.setBounds(40, 405, 200, 20);
- advanced.setBounds(10, 405, 20, 20);
- detail.setBounds(10, 195, 590, 200);
detail.setVisible(true);
- learner.add(adv);
- learner.add(advanced);
- learner.add(posPanel);
- learner.add(detail);
- learnerPanel.setPreferredSize(new Dimension(575, 620));
- learnerPanel.removeAll();
- learnerPanel.add(learner);
- learnerScroll.setViewportView(learnerPanel);
- learnerScroll.repaint();
+ c.fill = GridBagConstraints.NONE;
+ c.gridx = 0;
+ c.gridy = 3;
+ c.gridwidth = 3;
+ c.ipady = 80;
+ learner.add(detail, c);
+ c.fill = GridBagConstraints.HORIZONTAL;
+ c.gridx = 0;
+ c.gridy = 4;
+ c.gridwidth = 1;
+ learner.add(advanced, c);
+
+ c.fill = GridBagConstraints.HORIZONTAL;
+ c.gridx = 1;
+ c.gridy = 4;
+ c.gridwidth = GridBagConstraints.REMAINDER;
+ learner.add(adv, c);
+
+ c.fill = GridBagConstraints.NONE;
+ c.gridx = 0;
+ c.gridy = 5;
+ c.gridwidth = 3;
+ c.ipady = 80;
+ learner.add(posPanel, c);
+ learnerScroll.setPreferredSize(new Dimension(SCROLL_WIDTH, SCROLL_HEIGHT));
+ learnerScroll.setViewportView(learner);
+ learnerScroll.repaint();
}
/**
* This Method changes the hint message.
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/EllipseTest.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/EllipseTest.java 2009-04-06 12:23:42 UTC (rev 1683)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/EllipseTest.java 2009-04-07 09:45:11 UTC (rev 1684)
@@ -13,8 +13,8 @@
public class EllipseTest extends JPanel {
private static final long serialVersionUID = -5676466024192284648L;
- private Ellipse2D te;
- private Random random;
+ private final Ellipse2D te;
+ private final Random random;
public EllipseTest() {
te = new Ellipse2D.Double(0, 0, 150, 150);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-04-06 12:23:42 UTC (rev 1683)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-04-07 09:45:11 UTC (rev 1684)
@@ -56,8 +56,8 @@
private final String id;
private int shiftXAxis;
private int distortionOld;
- private final Ellipse2D oldConcept;
- private final Ellipse2D newConcept;
+ private Ellipse2D oldConcept;
+ private Ellipse2D newConcept;
private EvaluatedDescription eval;
private final DLLearnerModel model;
@@ -118,14 +118,14 @@
posNotCovIndVector = new Vector<IndividualPoint>();
additionalIndividuals = new Vector<IndividualPoint>();
points = new Vector<IndividualPoint>();
- this.computeGraphics();
+ this.computeGraphics(0, 0);
handler = new GraphicalCoveragePanelHandler(this, desc, model);
oldConcept = new Ellipse2D.Double(ELLIPSE_X_AXIS + (2 * adjustment),
ELLIPSE_Y_AXIS, WIDTH, HEIGHT);
newConcept = new Ellipse2D.Double(ELLIPSE_X_AXIS + shiftXAxis
+ adjustment, ELLIPSE_Y_AXIS, WIDTH + distortionOld, HEIGHT
+ distortionOld);
- this.computeIndividualPoints();
+ this.computeIndividualPoints(300);
this.addMouseMotionListener(handler);
this.addMouseListener(handler);
}
@@ -149,16 +149,33 @@
p = p + 20;
}
g2D.setColor(darkGreen);
- g2D.drawString("*", 310, p+3);
+ Ellipse2D circlePoint = new Ellipse2D.Double(315 - 1, p - 6, 3, 3);
+ g2D.draw(circlePoint);
g2D.setColor(Color.BLACK);
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("additional or not covered individuals", 320, p);
+ if(id.equals(EQUI_STRING)) {
+ g2D.setColor(darkRed);
+ Ellipse2D circlePoint2 = new Ellipse2D.Double(315 - 1, p - 6, 3, 3);
+ g2D.draw(circlePoint2);
+ g2D.setColor(Color.BLACK);
+ g2D.drawString("additional or not covered individuals", 320, p);
+ } else {
+ g2D.setColor(darkRed);
+ Ellipse2D circlePoint2 = new Ellipse2D.Double(315 - 1, p - 6, 3, 3);
+ g2D.draw(circlePoint2);
+ g2D.setColor(Color.BLACK);
+ g2D.drawString("not covered individuals", 320, p);
+ p = p + 20;
+ g2D.setColor(Color.BLACK);
+ Ellipse2D circlePoint3 = new Ellipse2D.Double(315 - 1, p - 6, 3, 3);
+ g2D.draw(circlePoint3);
+ g2D.setColor(Color.BLACK);
+ g2D.drawString("additional individuals", 320, p);
+ }
+
g2D.setColor(Color.YELLOW);
g2D.fill(oldConcept);
g2D.fillOval(310, 0, 9, 9);
@@ -297,7 +314,7 @@
}
}
- private void computeGraphics() {
+ private void computeGraphics(int w, int h) {
if (eval != null) {
this.setVisible(true);
panel.repaint();
@@ -306,7 +323,7 @@
distortionOld = 0;
adjustment = 0;
Ellipse2D old = new Ellipse2D.Double(ELLIPSE_X_AXIS, ELLIPSE_Y_AXIS,
- WIDTH, HEIGHT);
+ WIDTH + w, HEIGHT + h);
x1 = (int) old.getCenterX() - PLUS_SIZE;
x2 = (int) old.getCenterX() + PLUS_SIZE;
y1 = (int) old.getCenterY() - PLUS_SIZE;
@@ -314,19 +331,19 @@
centerX = (int) old.getCenterX();
centerY = (int) old.getCenterY();
double coverage = ((EvaluatedDescriptionClass) eval).getCoverage();
- shiftXAxis = (int) Math.round(WIDTH * (1 - coverage));
+ shiftXAxis = (int) Math.round((WIDTH + w) * (1 - coverage));
if (additionalIndividualSize != 0 && ((EvaluatedDescriptionClass) eval).getCoverage() == 1.0 && ((EvaluatedDescriptionClass) eval).getAddition() < 1.0) {
- distortionOld = (int) Math.round(WIDTH * 0.3);
+ distortionOld = (int) Math.round((WIDTH + w) * 0.3);
Ellipse2D newer = new Ellipse2D.Double(ELLIPSE_X_AXIS + shiftXAxis,
- ELLIPSE_Y_AXIS, WIDTH, HEIGHT);
+ ELLIPSE_Y_AXIS, (WIDTH + w), HEIGHT + h);
adjustment = (int) Math.round(newer.getCenterY() / 4);
}
- this.renderPlus();
+ this.renderPlus(w);
}
}
- private void renderPlus() {
+ private void renderPlus(int w) {
if (eval != null) {
coveredIndividualSize = ((EvaluatedDescriptionClass) eval)
.getCoveredInstances().size();
@@ -339,17 +356,17 @@
shiftNewConceptX = 0;
shiftCovered = 0;
if (coveredIndividualSize == 0) {
- shiftNewConcept = (int) Math.round((WIDTH / 2.0) * newConcepts);
+ shiftNewConcept = (int) Math.round(((WIDTH + w) / 2.0) * newConcepts);
} else if (additionalIndividualSize != coveredIndividualSize) {
- shiftNewConcept = (int) Math.round((WIDTH / 2.0)
+ shiftNewConcept = (int) Math.round(((WIDTH + w) / 2.0)
* (1.0 + (1.0 - oldConcepts)));
- shiftOldConcept = (int) Math.round((WIDTH / 2.0) * oldConcepts);
- shiftCovered = (int) Math.round((WIDTH / 2.0)
+ shiftOldConcept = (int) Math.round(((WIDTH + w) / 2.0) * oldConcepts);
+ shiftCovered = (int) Math.round(((WIDTH + w) / 2.0)
* (1 - oldConcepts));
}
if (((EvaluatedDescriptionClass) eval).getAddition() != 1.0 && ((EvaluatedDescriptionClass) eval)
.getCoverage() == 1.0) {
- shiftCovered = (int) Math.round((WIDTH / 2.0) * 0.625);
+ shiftCovered = (int) Math.round(((WIDTH + w) / 2.0) * 0.625);
shiftNewConceptX = shiftCovered;
shiftNewConcept = 2 * shiftNewConceptX;
}
@@ -392,13 +409,13 @@
}
}
- private void computeIndividualPoints() {
+ private void computeIndividualPoints(int n) {
if (eval != null) {
Set<Individual> posInd = ((EvaluatedDescriptionClass) eval)
.getCoveredInstances();
int i = 0;
- double x = random.nextInt(300);
- double y = random.nextInt(300);
+ double x = random.nextInt(n);
+ double y = random.nextInt(n);
boolean flag = true;
for (Individual ind : posInd) {
flag = true;
@@ -421,12 +438,12 @@
i++;
flag = false;
- x = random.nextInt(300);
- y = random.nextInt(300);
+ x = random.nextInt(n);
+ y = random.nextInt(n);
break;
} else {
- x = random.nextInt(300);
- y = random.nextInt(300);
+ x = random.nextInt(n);
+ y = random.nextInt(n);
}
}
@@ -436,8 +453,8 @@
Set<Individual> posNotCovInd = ((EvaluatedDescriptionClass) eval)
.getAdditionalInstances();
int j = 0;
- x = random.nextInt(300);
- y = random.nextInt(300);
+ x = random.nextInt(n);
+ y = random.nextInt(n);
for (Individual ind : posNotCovInd) {
flag = true;
if (j < MAX_NUMBER_OF_INDIVIDUAL_POINTS) {
@@ -477,12 +494,12 @@
}
j++;
flag = false;
- x = random.nextInt(300);
- y = random.nextInt(300);
+ x = random.nextInt(n);
+ y = random.nextInt(n);
break;
} else {
- x = random.nextInt(300);
- y = random.nextInt(300);
+ x = random.nextInt(n);
+ y = random.nextInt(n);
}
}
@@ -493,8 +510,8 @@
model.getCurrentConcept());
notCovInd.removeAll(posInd);
int k = 0;
- x = random.nextInt(300);
- y = random.nextInt(300);
+ x = random.nextInt(n);
+ y = random.nextInt(n);
for (Individual ind : notCovInd) {
flag = true;
if (k < MAX_NUMBER_OF_INDIVIDUAL_POINTS) {
@@ -516,12 +533,12 @@
}
k++;
flag = false;
- x = random.nextInt(300);
- y = random.nextInt(300);
+ x = random.nextInt(n);
+ y = random.nextInt(n);
break;
} else {
- x = random.nextInt(300);
- y = random.nextInt(300);
+ x = random.nextInt(n);
+ y = random.nextInt(n);
}
}
@@ -645,4 +662,17 @@
public EvaluatedDescription getEvaluateddescription() {
return eval;
}
+
+ public void resizePanel(int w, int h) {
+ this.setPreferredSize(new Dimension(WIDTH + w, HEIGHT + 100 + h));
+ this.computeGraphics(w, h);
+ oldConcept = new Ellipse2D.Double(ELLIPSE_X_AXIS + (2 * adjustment),
+ ELLIPSE_Y_AXIS, WIDTH + w, HEIGHT + h);
+ newConcept = new Ellipse2D.Double(ELLIPSE_X_AXIS + shiftXAxis
+ + adjustment, ELLIPSE_Y_AXIS, WIDTH + distortionOld + w, HEIGHT
+ + distortionOld + h);
+ this.computeIndividualPoints(300 + w + h);
+ this.repaint();
+
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/META-INF/plugin.xml
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/META-INF/plugin.xml 2009-04-06 12:23:42 UTC (rev 1683)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/META-INF/plugin.xml 2009-04-07 09:45:11 UTC (rev 1684)
@@ -3,7 +3,9 @@
<extension id="org.dllearner.tools.protege.ProtegePlugin"
point="org.protege.editor.owl.ui.editor.description">
<label value="DL-Learner"/>
+ <axiomTypes value="Equivalent classes axiom,SubClass axiom"/>
<class value="org.dllearner.tools.protege.ProtegePlugin"/>
+ <index value="E"/>
</extension>
</plugin>
\ No newline at end of file
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java 2009-04-06 12:23:42 UTC (rev 1683)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java 2009-04-07 09:45:11 UTC (rev 1684)
@@ -37,6 +37,8 @@
public class ProtegePlugin extends AbstractOWLDescriptionEditor {
private static final long serialVersionUID = 728362819273927L;
private DLLearnerView view;
+ private static final String EQUIVALENT_CLASS_STRING = "Equivalent classes axiom";
+ private static final String SUPERCLASS_STRING = "SubClass axiom";
@Override
@@ -51,7 +53,11 @@
@Override
public boolean isValidInput() {
- view.makeView();
+ if(this.getAxiomType().toString().equals(EQUIVALENT_CLASS_STRING)) {
+ view.makeView("equivalent class");
+ } else if(this.getAxiomType().toString().equals(SUPERCLASS_STRING)) {
+ view.makeView("super class");
+ }
view.getMoreDetailForSuggestedConceptsPanel().unsetPanel();
return true;
}
@@ -63,8 +69,12 @@
@Override
public void initialise() throws Exception {
- view = new DLLearnerView("equivalent class", super.getOWLEditorKit());
- view.makeView();
+ 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-06 12:23:42 UTC (rev 1683)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-04-07 09:45:11 UTC (rev 1684)
@@ -98,7 +98,6 @@
currentConcept = concept;
if (reasoner.getIndividuals(concept) != null) {
if (reasoner.getIndividuals(concept).size() > 0) {
- model.setInstancesCount(reasoner.getIndividuals(concept).size());
hasIndividuals = true;
}
individual = reasoner.getIndividuals(concept);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2009-04-06 12:23:42 UTC (rev 1683)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2009-04-07 09:45:11 UTC (rev 1684)
@@ -48,6 +48,8 @@
//Scroll panel if the suggestions are longer than the Panel itself
private final JScrollPane suggestScroll;
+ private static final int WIDTH = 460;
+ private static final int HEIGHT = 108;
/**
* This is the constructor for the suggest panel.
* It creates a new Scroll panel and puts the Suggest List in it.
@@ -61,7 +63,7 @@
suggestPanel = new JPanel();
descriptions.setVisible(true);
suggestPanel.add(descriptions);
- suggestScroll.setPreferredSize(new Dimension(460, 108));
+ suggestScroll.setPreferredSize(new Dimension(WIDTH, HEIGHT));
suggestScroll.setViewportView(descriptions);
descriptions.setCellRenderer(new SuggestListCellRenderer());
add(suggestScroll);
@@ -102,5 +104,11 @@
}
+ public void resizePanel(int w, int h) {
+ suggestScroll.setPreferredSize(new Dimension(WIDTH + w, HEIGHT + h));
+ suggestScroll.setViewportView(descriptions);
+ add(suggestScroll);
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
