Menu
▾
▴
dl-learner-svn
|
From: <hee...@us...> - 2009-04-09 09:44:26
|
Revision: 1691
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1691&view=rev
Author: heeroyuy
Date: 2009-04-09 09:44:15 +0000 (Thu, 09 Apr 2009)
Log Message:
-----------
-small changes in plugin view
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-04-09 09:31:24 UTC (rev 1690)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-04-09 09:44:15 UTC (rev 1691)
@@ -100,7 +100,7 @@
*/
public void actionPerformed(ActionEvent z) {
- if (z.getActionCommand().equals("suggest class expression")) {
+ if (z.getActionCommand().equals("suggest equivalent class expression") || z.getActionCommand().equals("suggest super class expression")) {
model.setKnowledgeSource();
model.setReasoner();
model.setLearningProblem();
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-04-09 09:31:24 UTC (rev 1690)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-04-09 09:44:15 UTC (rev 1691)
@@ -22,6 +22,7 @@
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
+import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.event.ActionListener;
@@ -103,6 +104,8 @@
private final JLabel wikiPane;
private final ImageIcon toggledIcon;
private final JTextArea hint;
+ private final JPanel runPanel;
+ private final JPanel advancedPanel;
private boolean isInconsistent;
// This is the Panel for more details of the suggested concept
private final MoreDetailForSuggestedConceptsPanel detail;
@@ -141,9 +144,9 @@
adv = new JLabel("Advanced Settings");
advanced = new JToggleButton(icon);
advanced.setVisible(true);
-
- run = new JButton("suggest class expression");
-
+ advancedPanel = new JPanel();
+ run = new JButton();
+ runPanel = new JPanel(new FlowLayout());
accept = new JButton("ADD");
addButtonPanel = new JPanel(new BorderLayout());
sugPanel.addSuggestPanelMouseListener(action);
@@ -156,7 +159,7 @@
advanced.setSize(20, 20);
learner.setLayout(new GridBagLayout());
accept.setPreferredSize(new Dimension(90, 50));
- run.setPreferredSize(new Dimension(130, 30));
+ run.setPreferredSize(new Dimension(220, 50));
advanced.setName("Advanced");
learnerScroll.setPreferredSize(new Dimension(SCROLL_WIDTH, SCROLL_HEIGHT));
learnerScroll.getVerticalScrollBar().setUnitIncrement(SCROLL_SPEED);
@@ -187,27 +190,35 @@
* This Method renders the view of the plugin.
*/
public void makeView(String label) {
+ run.setText("suggest " + label + " expression");
GridBagConstraints c = new GridBagConstraints();
learner.remove(detail);
model.setID(label);
-
+ runPanel.add(BorderLayout.WEST, run);
+ runPanel.add(BorderLayout.EAST, wikiPane);
run.setEnabled(false);
- c.fill = GridBagConstraints.NONE;
- c.gridwidth = GridBagConstraints.RELATIVE;
c.anchor = GridBagConstraints.FIRST_LINE_START;
- learner.add(run, c);
+ c.gridx = 0;
+ c.gridy = 0;
+ c.gridwidth = 3;
+ c.ipady = 0;
+ learner.add(runPanel, 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;
+ c.gridx = 0;
+ c.gridy = 1;
+ c.gridwidth = 2;
+ c.ipady = 0;
learner.add(sugPanel, c);
accept.setEnabled(false);
+ c.gridx = 2;
+ c.gridy = 1;
+ c.gridwidth = 1;
+ c.ipady = 0;
addButtonPanel.add("North", accept);
c.gridwidth = GridBagConstraints.REMAINDER;
learner.add(addButtonPanel, c);
@@ -215,28 +226,30 @@
c.fill = GridBagConstraints.HORIZONTAL;
c.gridwidth = GridBagConstraints.REMAINDER;
c.ipady = 20;
+ c.gridx = 0;
+ c.gridy = 2;
+ c.gridwidth = 3;
learner.add(hint, c);
-
+ advancedPanel.add(advanced);
+ advancedPanel.add(adv);
advanced.setIcon(icon);
advanced.setSelected(false);
- c.ipady = 0;
+ c.ipady = 5;
c.fill = GridBagConstraints.NONE;
c.gridwidth = GridBagConstraints.RELATIVE;
- learner.add(advanced, c);
+ c.gridx = 0;
+ c.gridy = 3;
+ c.gridwidth = 3;
+ learner.add(advancedPanel, 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;
+ c.ipady = 65;
learner.add(posPanel, c);
@@ -279,8 +292,7 @@
public void setGraphicalPanel() {
GridBagConstraints c = new GridBagConstraints();
learner.remove(posPanel);
- learner.remove(advanced);
- learner.remove(adv);
+ learner.remove(advancedPanel);
learner.repaint();
detail.setVisible(true);
@@ -288,26 +300,22 @@
c.gridx = 0;
c.gridy = 3;
c.gridwidth = 3;
- c.ipady = 80;
+ c.ipady = 60;
learner.add(detail, c);
- c.fill = GridBagConstraints.HORIZONTAL;
+ c.ipady = 5;
+ c.fill = GridBagConstraints.NONE;
+ c.gridwidth = GridBagConstraints.RELATIVE;
c.gridx = 0;
c.gridy = 4;
- c.gridwidth = 1;
- learner.add(advanced, c);
+ c.gridwidth = 3;
+ learner.add(advancedPanel, 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;
+ c.ipady = 70;
learner.add(posPanel, c);
learnerScroll.setPreferredSize(new Dimension(SCROLL_WIDTH, SCROLL_HEIGHT));
learnerScroll.setViewportView(learner);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hee...@us...> - 2009-04-16 09:41:54
|
Revision: 1705
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1705&view=rev
Author: heeroyuy
Date: 2009-04-16 09:41:39 +0000 (Thu, 16 Apr 2009)
Log Message:
-----------
-update manifest file
-some changes on main 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/META-INF/MANIFEST.MF
trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-04-15 20:08:39 UTC (rev 1704)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-04-16 09:41:39 UTC (rev 1705)
@@ -155,6 +155,7 @@
hint = new JTextArea();
hint.setEditable(false);
hint.setText("To get suggestions for class expression, please click the button above.");
+ hint.setPreferredSize(new Dimension(485, 30));
learner = new JPanel();
advanced.setSize(20, 20);
learner.setLayout(new GridBagLayout());
@@ -197,25 +198,23 @@
runPanel.add(BorderLayout.WEST, run);
runPanel.add(BorderLayout.EAST, wikiPane);
run.setEnabled(false);
+
c.anchor = GridBagConstraints.FIRST_LINE_START;
c.gridx = 0;
c.weightx = 0.0;
c.weighty = 0.0;
c.gridy = 0;
c.gridwidth = 3;
- c.ipady = 0;
learner.add(runPanel, c);
sugPanel.setSuggestList(new DefaultListModel());
- sugPanel = sugPanel.updateSuggestClassList();
- c.gridwidth = GridBagConstraints.RELATIVE;
- c.fill = GridBagConstraints.BOTH;
+ c.fill = GridBagConstraints.NONE;
c.gridx = 0;
c.gridy = 1;
c.weightx = 1.0;
c.weighty = 1.0;
c.gridwidth = 2;
- c.ipady = 0;
+ sugPanel.setSuggestList(model.getSuggestModel());
learner.add(sugPanel, c);
accept.setEnabled(false);
@@ -224,44 +223,39 @@
c.weightx = 0.0;
c.weighty = 0.0;
c.gridwidth = 1;
- c.ipady = 0;
addButtonPanel.add("North", accept);
- c.gridwidth = GridBagConstraints.REMAINDER;
+ //c.gridwidth = GridBagConstraints.REMAINDER;
learner.add(addButtonPanel, c);
c.fill = GridBagConstraints.HORIZONTAL;
c.gridwidth = GridBagConstraints.REMAINDER;
- c.ipady = 20;
c.gridx = 0;
c.weightx = 0.0;
c.weighty = 0.0;
c.gridy = 2;
- c.gridwidth = 3;
learner.add(hint, c);
advancedPanel.add(advanced);
advancedPanel.add(adv);
advanced.setIcon(icon);
advanced.setSelected(false);
- c.ipady = 5;
c.fill = GridBagConstraints.NONE;
c.gridwidth = GridBagConstraints.RELATIVE;
c.gridx = 0;
c.weightx = 0.0;
c.weighty = 0.0;
c.gridy = 3;
- c.gridwidth = 3;
learner.add(advancedPanel, c);
posPanel.setVisible(false);
c.fill = GridBagConstraints.NONE;
c.gridwidth = GridBagConstraints.RELATIVE;
+ c.gridheight = GridBagConstraints.RELATIVE;
c.gridx = 0;
c.gridy = 4;
- c.weightx = 1.0;
- c.weighty = 1.0;
+ c.weightx = 0.0;
+ c.weighty = 0.0;
c.gridwidth = 3;
- c.ipady = 65;
learner.add(posPanel, c);
@@ -274,8 +268,6 @@
readThread.start();
hint.setVisible(true);
action.resetToggled();
- addButtonPanel.setBounds(485, 40, 80, 70);
- detail.setBounds(10, 195, 600, 300);
detail.setVisible(true);
sugPanel.setVisible(true);
learnerScroll.setViewportView(learner);
@@ -305,35 +297,32 @@
GridBagConstraints c = new GridBagConstraints();
learner.remove(posPanel);
learner.remove(advancedPanel);
- learner.repaint();
+ //learner.removeAll();
detail.setVisible(true);
- c.fill = GridBagConstraints.BOTH;
- c.gridx = 0;
- c.gridy = 3;
- c.weightx = 1.0;
- c.weighty = 1.0;
- c.gridwidth = 3;
- c.ipady = 60;
- learner.add(detail, c);
- c.ipady = 5;
c.fill = GridBagConstraints.NONE;
c.gridwidth = GridBagConstraints.RELATIVE;
c.gridx = 0;
+ c.gridy = 3;
c.weightx = 0.0;
c.weighty = 0.0;
+ learner.add(detail, c);
+
+
+ c.fill = GridBagConstraints.NONE;
+ c.anchor = GridBagConstraints.LINE_START;
+ c.gridwidth = GridBagConstraints.REMAINDER;
+ c.gridx = 0;
c.gridy = 4;
- c.gridwidth = 3;
learner.add(advancedPanel, c);
c.fill = GridBagConstraints.NONE;
+ c.anchor = GridBagConstraints.LINE_START;
c.gridx = 0;
c.gridy = 5;
- c.gridwidth = 3;
- c.ipady = 70;
- c.weightx = 1.0;
- c.weighty = 1.0;
+ c.gridwidth = GridBagConstraints.REMAINDER;
learner.add(posPanel, c);
+
learnerScroll.setPreferredSize(new Dimension(SCROLL_WIDTH, SCROLL_HEIGHT));
learnerScroll.setViewportView(learner);
learnerScroll.repaint();
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-04-15 20:08:39 UTC (rev 1704)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-04-16 09:41:39 UTC (rev 1705)
@@ -101,7 +101,7 @@
*/
public GraphicalCoveragePanel(EvaluatedDescription desc, DLLearnerModel m,
String concept, MoreDetailForSuggestedConceptsPanel p) {
- this.setPreferredSize(new Dimension(WIDTH, HEIGHT + 100));
+ this.setPreferredSize(new Dimension(600, 220));
this.setVisible(false);
this.setForeground(Color.GREEN);
this.repaint();
@@ -120,11 +120,23 @@
points = new Vector<IndividualPoint>();
this.computeGraphics(0, 0);
handler = new GraphicalCoveragePanelHandler(this, desc, model);
- oldConcept = new Ellipse2D.Double(ELLIPSE_X_AXIS + (2 * adjustment),
- ELLIPSE_Y_AXIS, WIDTH, HEIGHT);
+ if(shiftXAxis == 0) {
+ oldConcept = new Ellipse2D.Double(ELLIPSE_X_AXIS + (2 * adjustment)+3,
+ ELLIPSE_Y_AXIS+3, WIDTH, HEIGHT);
+ } else {
+ oldConcept = new Ellipse2D.Double(ELLIPSE_X_AXIS + (2 * adjustment),
+ ELLIPSE_Y_AXIS, WIDTH, HEIGHT);
+ }
+
+ if(shiftXAxis == 0){
newConcept = new Ellipse2D.Double(ELLIPSE_X_AXIS + shiftXAxis
- + adjustment, ELLIPSE_Y_AXIS, WIDTH + distortionOld, HEIGHT
- + distortionOld);
+ + adjustment, ELLIPSE_Y_AXIS, WIDTH + distortionOld+6, HEIGHT
+ + distortionOld+6);
+ } else {
+ newConcept = new Ellipse2D.Double(ELLIPSE_X_AXIS + shiftXAxis
+ + adjustment, ELLIPSE_Y_AXIS, WIDTH + distortionOld, HEIGHT
+ + distortionOld);
+ }
this.computeIndividualPoints(300);
this.addMouseMotionListener(handler);
this.addMouseListener(handler);
@@ -152,16 +164,18 @@
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);
+ g2D.drawString("individuals covered by the", 320, p);
p = p + 20;
- g2D.drawString("class expression", 320, p);
+ g2D.drawString("new class expression", 320, p);
p = p + 20;
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);
+ g2D.drawString("additional or not covered", 320, p);
+ p = p + 20;
+ g2D.drawString("individuals", 320, p);
} else {
g2D.setColor(darkRed);
Ellipse2D circlePoint2 = new Ellipse2D.Double(315 - 1, p - 6, 3, 3);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/META-INF/MANIFEST.MF
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/META-INF/MANIFEST.MF 2009-04-15 20:08:39 UTC (rev 1704)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/META-INF/MANIFEST.MF 2009-04-16 09:41:39 UTC (rev 1705)
@@ -6,7 +6,7 @@
Bundle-Description: blablabla
Bundle-Vendor: blablabla
Bundle-DocURL: blablabla
-Bundle-ClassPath: .,lib/junit-4.4.jar,lib/jamon-2.7.jar,lib/pellet/pellet.jar,lib/pellet/aterm-java-1.6.jar,lib/jena/json.jar,lib/pellet/relaxngDatatype.jar,lib/pellet/xsdlib.jar,lib/jena/commons-logging-1.1.1.jar,lib/ore-tool/swingx-0.9.2.jar
+Bundle-ClassPath: .,lib/junit-4.4.jar,lib/jamon-2.7.jar,lib/pellet/pellet-core.jar,lib/pellet/pellet-datatypes.jar,lib/pellet/pellet-el.jar,lib/pellet/pellet-explanation.jar,lib/pellet/pellet-owlapi.jar,lib/pellet/pellet-rules.jar,lib/pellet/aterm-java-1.6.jar,lib/jena/json.jar,lib/pellet/relaxngDatatype.jar,lib/pellet/xsdlib.jar,lib/jena/commons-logging-1.1.1.jar,lib/ore-tool/swingx-0.9.2.jar
Import-Package: org.osgi.framework,org.apache.log4j
Export-Package: lib
Bundle-Version: 1.0.0
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-04-15 20:08:39 UTC (rev 1704)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-04-16 09:41:39 UTC (rev 1705)
@@ -59,8 +59,8 @@
private final JTextArea concept;
private Set<String> ontologiesStrings;
private final JTextArea conceptText;
- private static final int HEIGHT = 350;
- private static final int WIDTH = 600;
+ private static final int HEIGHT = 220;
+ private static final int WIDTH = 485;
private GraphicalCoveragePanel p;
private final MoreDetailForSuggestedConceptsPanelHandler handler;
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanel.java 2009-04-15 20:08:39 UTC (rev 1704)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanel.java 2009-04-16 09:41:39 UTC (rev 1705)
@@ -49,7 +49,7 @@
//set layout for parent Panel
super();
setLayout(new GridLayout(0, 1));
- setPreferredSize(new Dimension(490, 100));
+ setPreferredSize(new Dimension(485, 170));
optionPanel = new OptionPanel();
add(optionPanel);
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2009-04-15 20:08:39 UTC (rev 1704)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2009-04-16 09:41:39 UTC (rev 1705)
@@ -56,6 +56,7 @@
*/
public SuggestClassPanel() {
super();
+ this.setPreferredSize(new Dimension(470, 120));
//renders scroll bars if necessary
suggestScroll = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
descriptions = new JList();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hee...@us...> - 2009-04-19 09:27:14
|
Revision: 1714
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1714&view=rev
Author: heeroyuy
Date: 2009-04-19 09:27:10 +0000 (Sun, 19 Apr 2009)
Log Message:
-----------
-some resize problems fixed
-some changes 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/MoreDetailForSuggestedConceptsPanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.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-19 07:24:32 UTC (rev 1713)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-04-19 09:27:10 UTC (rev 1714)
@@ -398,6 +398,7 @@
}
}
view.getSuggestClassPanel().setSuggestList(dm);
+ view.getLearnerView().repaint();
}
};
SwingUtilities.invokeLater(doUpdateList);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-04-19 07:24:32 UTC (rev 1713)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-04-19 09:27:10 UTC (rev 1714)
@@ -159,7 +159,7 @@
learner = new JPanel();
advanced.setSize(20, 20);
learner.setLayout(new GridBagLayout());
- accept.setPreferredSize(new Dimension(90, 50));
+ accept.setPreferredSize(new Dimension(70, 40));
run.setPreferredSize(new Dimension(220, 50));
advanced.setName("Advanced");
learnerScroll.setPreferredSize(new Dimension(SCROLL_WIDTH, SCROLL_HEIGHT));
@@ -192,6 +192,7 @@
*/
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);
@@ -208,7 +209,7 @@
learner.add(runPanel, c);
sugPanel.setSuggestList(new DefaultListModel());
- c.fill = GridBagConstraints.NONE;
+ c.fill = GridBagConstraints.BOTH;
c.gridx = 0;
c.gridy = 1;
c.weightx = 1.0;
@@ -230,8 +231,6 @@
c.fill = GridBagConstraints.HORIZONTAL;
c.gridwidth = GridBagConstraints.REMAINDER;
c.gridx = 0;
- c.weightx = 0.0;
- c.weighty = 0.0;
c.gridy = 2;
learner.add(hint, c);
@@ -248,7 +247,7 @@
learner.add(advancedPanel, c);
posPanel.setVisible(false);
- c.fill = GridBagConstraints.NONE;
+ c.fill = GridBagConstraints.BOTH;
c.gridwidth = GridBagConstraints.RELATIVE;
c.gridheight = GridBagConstraints.RELATIVE;
c.gridx = 0;
@@ -301,7 +300,8 @@
detail.setVisible(true);
c.fill = GridBagConstraints.NONE;
- c.gridwidth = GridBagConstraints.RELATIVE;
+ c.gridwidth = GridBagConstraints.REMAINDER;
+ c.anchor = GridBagConstraints.LINE_START;
c.gridx = 0;
c.gridy = 3;
c.weightx = 0.0;
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-04-19 07:24:32 UTC (rev 1713)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-04-19 09:27:10 UTC (rev 1714)
@@ -21,6 +21,7 @@
import java.awt.AlphaComposite;
import java.awt.Color;
+import java.awt.Composite;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
@@ -101,13 +102,13 @@
*/
public GraphicalCoveragePanel(EvaluatedDescription desc, DLLearnerModel m,
String concept, MoreDetailForSuggestedConceptsPanel p) {
- this.setPreferredSize(new Dimension(600, 220));
this.setVisible(false);
this.setForeground(Color.GREEN);
- this.repaint();
+ this.setPreferredSize(new Dimension(500, 230));
eval = desc;
model = m;
panel = p;
+ this.repaint();
id = model.getID();
darkGreen = new Color(0, 100, 0);
darkRed = new Color(205, 0, 0);
@@ -147,7 +148,7 @@
if (eval != null) {
Graphics2D g2D;
g2D = (Graphics2D) g;
-
+ Composite original = g2D.getComposite();
AlphaComposite ac = AlphaComposite.getInstance(
AlphaComposite.SRC_OVER, 0.5f);
g2D.setColor(Color.BLACK);
@@ -162,32 +163,47 @@
}
g2D.setColor(darkGreen);
Ellipse2D circlePoint = new Ellipse2D.Double(315 - 1, p - 6, 3, 3);
- g2D.draw(circlePoint);
+ g2D.fill(circlePoint);
g2D.setColor(Color.BLACK);
- g2D.drawString("individuals covered by the", 320, p);
+ g2D.drawString("individuals covered by", 320, p);
+ g2D.setColor(Color.ORANGE);
+ g2D.fillOval(445, p - 9, 9, 9);
+ g2D.setColor(Color.BLACK);
+ g2D.drawString("and", 460, p);
+ g2D.setColor(Color.YELLOW);
+ g2D.fillOval(490, p - 9, 9, 9);
p = p + 20;
- g2D.drawString("new class expression", 320, p);
- p = p + 20;
if(id.equals(EQUI_STRING)) {
g2D.setColor(darkRed);
Ellipse2D circlePoint2 = new Ellipse2D.Double(315 - 1, p - 6, 3, 3);
- g2D.draw(circlePoint2);
+ g2D.fill(circlePoint2);
g2D.setColor(Color.BLACK);
- g2D.drawString("additional or not covered", 320, p);
+ g2D.drawString("individuals covered by", 320, p);
+ g2D.setColor(Color.ORANGE);
+ g2D.fillOval(445, p - 9, 9, 9);
p = p + 20;
- g2D.drawString("individuals", 320, p);
+ g2D.setColor(darkRed);
+ Ellipse2D circlePoint3 = new Ellipse2D.Double(315 - 1, p - 6, 3, 3);
+ 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);
} else {
- g2D.setColor(darkRed);
+ g2D.setColor(Color.BLACK);
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);
+ g2D.fill(circlePoint2);
+ g2D.drawString("individuals covered by", 320, p);
+ g2D.setColor(Color.ORANGE);
+ g2D.fillOval(445, p - 9, 9, 9);
p = p + 20;
- g2D.setColor(Color.BLACK);
+ g2D.setColor(darkRed);
Ellipse2D circlePoint3 = new Ellipse2D.Double(315 - 1, p - 6, 3, 3);
- g2D.draw(circlePoint3);
+ g2D.fill(circlePoint3);
g2D.setColor(Color.BLACK);
- g2D.drawString("additional individuals", 320, p);
+ g2D.drawString("individuals covered by", 320, p);
+ g2D.setColor(Color.YELLOW);
+ g2D.fillOval(445, p - 9, 9, 9);
}
g2D.setColor(Color.YELLOW);
@@ -311,18 +327,23 @@
for (int i = 0; i < posCovIndVector.size(); i++) {
g2D.setColor(darkGreen);
- g2D.draw(posCovIndVector.get(i).getIndividualPoint());
+ g2D.fill(posCovIndVector.get(i).getIndividualPoint());
}
for (int i = 0; i < posNotCovIndVector.size(); i++) {
g2D.setColor(darkRed);
- g2D.draw(posNotCovIndVector.get(i).getIndividualPoint());
+ g2D.fill(posNotCovIndVector.get(i).getIndividualPoint());
}
for (int i = 0; i < additionalIndividuals.size(); i++) {
g2D.setColor(Color.BLACK);
- g2D.draw(additionalIndividuals.get(i).getIndividualPoint());
+ g2D.fill(additionalIndividuals.get(i).getIndividualPoint());
}
+ if(!((EvaluatedDescriptionClass) eval).isConsistent()) {
+ g2D.setComposite(original);
+ g2D.setColor(darkRed);
+ g2D.drawString("Adding this class expression may lead to an inconsistent ontology.", 0, 220);
+ }
this.setVisible(true);
panel.repaint();
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-04-19 07:24:32 UTC (rev 1713)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-04-19 09:27:10 UTC (rev 1714)
@@ -59,8 +59,8 @@
private final JTextArea concept;
private Set<String> ontologiesStrings;
private final JTextArea conceptText;
- private static final int HEIGHT = 220;
- private static final int WIDTH = 485;
+ private static final int HEIGHT = 230;
+ private static final int WIDTH = 510;
private GraphicalCoveragePanel p;
private final MoreDetailForSuggestedConceptsPanelHandler handler;
@@ -112,7 +112,7 @@
//this method adds the informations for the selected concept to the panel
this.setInformation();
p = new GraphicalCoveragePanel(eval, model, conceptText.getText(), this);
- p.setBounds(5, 0, 600, 350);
+ p.setBounds(5, 0, 600, 700);
//adds all information to the example panel
unsetEverything();
conceptPanel.removeAll();
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-04-19 07:24:32 UTC (rev 1713)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-04-19 09:27:10 UTC (rev 1714)
@@ -19,7 +19,8 @@
*/
package org.dllearner.tools.protege;
-import java.awt.Dimension;
+import java.awt.BorderLayout;
+import java.awt.GridLayout;
import javax.swing.JLabel;
import javax.swing.JPanel;
@@ -39,26 +40,27 @@
private final JSlider minAccuracy;
private final JSlider maxExecutionTime;
private final JSlider nrOfConcepts;
+ private JPanel labelPanel;
+ private JPanel sliderPanel;
private double accuracy;
/**
* Constructor for the Option Panel.
*/
public OptionPanel() {
- 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, 60, 150, 40);
- nrOfConceptsLabel = new JLabel("max. number of results");
- nrOfConceptsLabel.setBounds(5, 120, 150, 40);
+ setLayout(new BorderLayout());
+ labelPanel = new JPanel();
+ labelPanel.setLayout(new GridLayout(0,1));
+ sliderPanel = new JPanel();
+ sliderPanel.setLayout(new GridLayout(0,1));
+ minAccuracyLabel = new JLabel("noise in %: ");
+ maxExecutionTimeLabel = new JLabel("maximum execution time: ");
+ nrOfConceptsLabel = new JLabel("max. number of results: ");
minAccuracy = new JSlider(0, 50, 5);
minAccuracy.setPaintTicks(true);
minAccuracy.setMajorTickSpacing(10);
minAccuracy.setMinorTickSpacing(1);
minAccuracy.setPaintLabels(true);
- minAccuracy.setBounds(200, 0, 200, 40);
maxExecutionTime = new JSlider(0, 40, 8);
@@ -66,7 +68,6 @@
maxExecutionTime.setMajorTickSpacing(10);
maxExecutionTime.setMinorTickSpacing(1);
maxExecutionTime.setPaintLabels(true);
- maxExecutionTime.setBounds(200, 60, 200, 40);
nrOfConcepts = new JSlider(2, 20, 10);
@@ -74,14 +75,16 @@
nrOfConcepts.setMajorTickSpacing(2);
nrOfConcepts.setMinorTickSpacing(1);
nrOfConcepts.setPaintLabels(true);
- nrOfConcepts.setBounds(200, 120, 200, 40);
- add(minAccuracyLabel);
- add(minAccuracy);
- add(maxExecutionTimeLabel);
- add(maxExecutionTime);
- add(nrOfConceptsLabel);
- add(nrOfConcepts);
+ labelPanel.add(minAccuracyLabel);
+ labelPanel.add(maxExecutionTimeLabel);
+ labelPanel.add(nrOfConceptsLabel);
+
+ sliderPanel.add(minAccuracy);
+ sliderPanel.add(maxExecutionTime);
+ sliderPanel.add(nrOfConcepts);
+ add(BorderLayout.WEST, labelPanel);
+ add(BorderLayout.CENTER, sliderPanel);
}
/**
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2009-04-19 07:24:32 UTC (rev 1713)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2009-04-19 09:27:10 UTC (rev 1714)
@@ -19,7 +19,7 @@
*/
package org.dllearner.tools.protege;
-import java.awt.Dimension;
+import java.awt.BorderLayout;
import javax.swing.DefaultListModel;
import javax.swing.JList;
@@ -48,26 +48,25 @@
//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.
*/
public SuggestClassPanel() {
super();
- this.setPreferredSize(new Dimension(470, 120));
+ this.setLayout(new BorderLayout());
//renders scroll bars if necessary
suggestScroll = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
descriptions = new JList();
descriptions.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
suggestPanel = new JPanel();
descriptions.setVisible(true);
+ descriptions.setVisibleRowCount(6);
+ descriptions.getPreferredScrollableViewportSize();
suggestPanel.add(descriptions);
- suggestScroll.setPreferredSize(new Dimension(WIDTH, HEIGHT));
suggestScroll.setViewportView(descriptions);
descriptions.setCellRenderer(new SuggestListCellRenderer());
- add(suggestScroll);
+ add(BorderLayout.CENTER, suggestScroll);
}
/**
@@ -86,6 +85,7 @@
*/
public void setSuggestList(DefaultListModel desc) {
descriptions.setModel(desc);
+ descriptions.repaint();
repaint();
}
/**
@@ -104,12 +104,5 @@
descriptions.addMouseListener(action);
}
-
- 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.
|
|
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.
|
|
From: <hee...@us...> - 2009-04-23 10:19:46
|
Revision: 1725
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1725&view=rev
Author: heeroyuy
Date: 2009-04-23 10:19:45 +0000 (Thu, 23 Apr 2009)
Log Message:
-----------
-fixed error in ReadingOntologyThread
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/ProtegePlugin.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-04-21 18:31:13 UTC (rev 1724)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-04-23 10:19:45 UTC (rev 1725)
@@ -155,6 +155,7 @@
// This is a List of evaluated descriptions to get more information of the
// suggested concept
private List<? extends EvaluatedDescription> evalDescriptions;
+ private boolean isReasonerSet;
/**
* This is the constructor for DL-Learner model.
@@ -168,7 +169,7 @@
*/
public DLLearnerModel(OWLEditorKit editorKit, DLLearnerView view) {
editor = editorKit;
-
+ isReasonerSet = false;
this.view = view;
ontologyConsistent = true;
owlDescription = new HashSet<OWLDescription>();
@@ -191,7 +192,6 @@
alreadyLearned = false;
setKnowledgeSource();
setReasoner();
-
}
/**
@@ -225,6 +225,7 @@
reasoner.init();
reasoner.isSatisfiable();
view.setIsInconsistent(false);
+ isReasonerSet = true;
} catch (ComponentInitException e) {
// TODO Auto-generated catch block
System.out.println("fehler!!!!!!!!!");
@@ -494,6 +495,10 @@
public String getID() {
return id;
}
+
+ public boolean isReasonerSet() {
+ return isReasonerSet;
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-04-21 18:31:13 UTC (rev 1724)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-04-23 10:19:45 UTC (rev 1725)
@@ -120,6 +120,7 @@
private static final int SCROLL_WIDTH = 600;
private static final int SCROLL_HEIGHT = 400;
private boolean toogled = false;
+ private String labels;
/**
* The constructor for the DL-Learner tab in the class description
@@ -130,6 +131,7 @@
*/
public DLLearnerView(OWLEditorKit editor) {
editorKit = editor;
+ labels = "";
model = new DLLearnerModel(editorKit, this);
sugPanel = new SuggestClassPanel();
learnerPanel = new JPanel();
@@ -162,7 +164,6 @@
accept.setPreferredSize(new Dimension(70, 40));
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,14 +193,26 @@
* This Method renders the view of the plugin.
*/
public void makeView(String label) {
+ run.setEnabled(false);
+ String currentConcept = editorKit.getOWLWorkspace().getOWLSelectionModel().getLastSelectedClass().toString();
+ if(!labels.equals(currentConcept)) {
+ readThread = new ReadingOntologyThread(editorKit, this, model);
+ }
+ if(!readThread.isAlive() && !labels.equals(currentConcept)) {
+ readThread.start();
+ }
+ if(readThread.hasIndividuals()) {
+ run.setEnabled(true);
+ }
+ labels = currentConcept;
run.setText("suggest " + label + " expression");
GridBagConstraints c = new GridBagConstraints();
learner.remove(detail);
model.setID(label);
runPanel.add(BorderLayout.WEST, run);
runPanel.add(BorderLayout.EAST, wikiPane);
- run.setEnabled(false);
+
c.anchor = GridBagConstraints.FIRST_LINE_START;
c.gridx = 0;
c.weightx = 0.0;
@@ -261,10 +274,8 @@
detail.unsetPanel();
learnerPanel.setPreferredSize(new Dimension(WIDTH, HEIGHT));
detail.setVisible(false);
- hint.setText("");
isInconsistent = false;
- readThread = new ReadingOntologyThread(editorKit, this, model);
- readThread.start();
+
hint.setVisible(true);
action.resetToggled();
detail.setVisible(true);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java 2009-04-21 18:31:13 UTC (rev 1724)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java 2009-04-23 10:19:45 UTC (rev 1725)
@@ -70,11 +70,6 @@
@Override
public void initialise() throws Exception {
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-21 18:31:13 UTC (rev 1724)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-04-23 10:19:45 UTC (rev 1725)
@@ -96,6 +96,7 @@
// individuals of
// the concept
currentConcept = concept;
+
if (reasoner.getIndividuals(concept) != null) {
if (reasoner.getIndividuals(concept).size() > 0) {
hasIndividuals = true;
@@ -160,12 +161,16 @@
@Override
public void run() {
- model.getSuggestModel().removeAllElements();
- //model.initReasoner();
+ String loading ="loading instances...";
+ view.getHintPanel().setForeground(Color.RED);
+ view.setHintMessage(loading);
+ if(!model.isReasonerSet()) {
+ model.setKnowledgeSource();
+ model.setReasoner();
+ }
reasoner = model.getReasoner();
isInconsistent = false;
if(!isInconsistent) {
-
this.checkURI();
this.setPositiveConcept();
if (this.hasIndividuals()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hee...@us...> - 2009-04-29 11:31:03
|
Revision: 1728
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1728&view=rev
Author: heeroyuy
Date: 2009-04-29 11:30:53 +0000 (Wed, 29 Apr 2009)
Log Message:
-----------
-add message when learning algorithm runs
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-04-25 13:29:42 UTC (rev 1727)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-04-29 11:30:53 UTC (rev 1728)
@@ -106,7 +106,8 @@
model.setLearningProblem();
model.setLearningAlgorithm();
view.getRunButton().setEnabled(false);
- view.renderErrorMessage("learning\nstarted");
+ view.getHintPanel().setForeground(Color.RED);
+ view.setHintMessage("learning started");
retriever = new SuggestionRetriever();
retriever.execute();
// model.setCurrentConcept(null);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-04-25 13:29:42 UTC (rev 1727)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-04-29 11:30:53 UTC (rev 1728)
@@ -468,16 +468,20 @@
* This method sets the run button enable after learning.
*/
public void algorithmTerminated() {
- String error = "learning\nsuccessful";
+ String error = "learning successful\n";
+ hint.setForeground(Color.RED);
+ setHintMessage(error);
String message = "";
if(isInconsistent) {
- message = "Class expressions marked red will lead to an inconsistent ontology. \nPlease double click on them to view detail information.";
+ message ="Class expressions marked red will lead to an inconsistent ontology. \nPlease double click on them to view detail information.";
} else {
- message = "To view details about why a class expression was suggested, please click on it.";
+ message ="To view details about why a class expression was suggested, please click on it.";
}
run.setEnabled(true);
// start the algorithm and print the best concept found
- renderErrorMessage(error);
+ //renderErrorMessage(error);
+ hint.setForeground(Color.BLACK);
+ hint.append(message);
setHintMessage(message);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hee...@us...> - 2009-05-06 13:15:11
|
Revision: 1741
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1741&view=rev
Author: heeroyuy
Date: 2009-05-06 13:15:10 +0000 (Wed, 06 May 2009)
Log Message:
-----------
-removed EllipseTest
-removed checkstyle warnings
-update suggest list only when item has changed
-update graphical panel when suggest list item is updated
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/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/OptionPanel.java
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
trunk/src/dl-learner/org/dllearner/tools/protege/SuggestListItem.java
Removed Paths:
-------------
trunk/src/dl-learner/org/dllearner/tools/protege/EllipseTest.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-05-06 10:53:22 UTC (rev 1740)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-05-06 13:15:10 UTC (rev 1741)
@@ -74,15 +74,10 @@
/**
* This is the constructor for the action handler.
- *
- * @param a
- * ActionHandler
* @param m
* DLLearnerModel
* @param view
* DLlearner tab
- * @param i
- * id if it is a subclass or an equivalent class
*
*/
public ActionHandler(DLLearnerModel m, DLLearnerView view) {
@@ -102,7 +97,8 @@
if (z.getActionCommand().equals("suggest equivalent class expression") || z.getActionCommand().equals("suggest super class expression")) {
model.setKnowledgeSource();
- //model.setReasoner();
+ view.getSuggestClassPanel().getSuggestModel().clear();
+ view.getSuggestClassPanel().repaint();
model.setLearningProblem();
model.setLearningAlgorithm();
view.getRunButton().setEnabled(false);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-05-06 10:53:22 UTC (rev 1740)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-05-06 13:15:10 UTC (rev 1741)
@@ -162,8 +162,6 @@
*
* @param editorKit
* Editor Kit to get the currently loaded Ontology
- * @param id
- * String if it learns a subclass or a superclass.
* @param view
* current view of the DL-Learner tab
*/
@@ -181,6 +179,10 @@
sources = new HashSet<KnowledgeSource>();
}
+ /**
+ * Sets the ID if an equivalent or a superclass must be suggested.
+ * @param d ID if it is an equivalent or a superclass
+ */
public void setID(String d) {
this.id = d;
}
@@ -495,13 +497,30 @@
return individual;
}
+ /**
+ * This method returns if the ID is an equivalent or a superclass.
+ * @return id if it is an equivalent or superclass
+ */
public String getID() {
return id;
}
+ /**
+ * Returns boolean if reasoner is allready set.
+ * @return isReasonerSet
+ */
public boolean isReasonerSet() {
return isReasonerSet;
}
+
+ /**
+ * This method returns the currently selected class description as an evaluated description.
+ * @param index which class descriptions is selected
+ * @return selected class description
+ */
+ public EvaluatedDescription getCurrentlySelectedClassDescription(int index) {
+ return evalDescriptions.get(index);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-05-06 10:53:22 UTC (rev 1740)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-05-06 13:15:10 UTC (rev 1741)
@@ -127,13 +127,12 @@
* editor.
*
* @param editor OWLEditorKit
- * @param label String
*/
public DLLearnerView(OWLEditorKit editor) {
editorKit = editor;
labels = "";
model = new DLLearnerModel(editorKit, this);
- sugPanel = new SuggestClassPanel();
+ sugPanel = new SuggestClassPanel(model, this);
learnerPanel = new JPanel();
learnerPanel.setLayout(new BorderLayout());
learnerScroll = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
@@ -191,6 +190,7 @@
/**
* This Method renders the view of the plugin.
+ * @param label label if it is an equivalent or superclass
*/
public void makeView(String label) {
run.setEnabled(false);
@@ -282,6 +282,8 @@
sugPanel.setVisible(true);
learnerScroll.setViewportView(learner);
this.renderErrorMessage("");
+ this.getSuggestClassPanel().getSuggestModel().clear();
+ this.getSuggestClassPanel().repaint();
}
@@ -303,6 +305,10 @@
}
}
+ /**
+ * This method enables the GraphicalCoveragePanel after a class expression is
+ * selected from the list.
+ */
public void setGraphicalPanel() {
GridBagConstraints c = new GridBagConstraints();
learner.remove(posPanel);
@@ -380,6 +386,9 @@
return model.getNewOWLDescription();
}
+ /**
+ * This method unsets all results after closing the plugin.
+ */
public void dispose() {
this.unsetEverything();
sugPanel.getSuggestList().removeAll();
@@ -485,14 +494,26 @@
setHintMessage(message);
}
+ /**
+ * This method returns the view of the plugin.
+ * @return Plugin view
+ */
public JComponent getLearnerView() {
return learnerScroll;
}
+ /**
+ * This method returns the model of the DL-Learner plugin.
+ * @return model of the plugin
+ */
public DLLearnerModel getDLLearnerModel() {
return model;
}
+ /**
+ * This method returns the thread for initializing the reasoner and reading the ontology.
+ * @return thread that initializes the reasoner
+ */
public ReadingOntologyThread getReadingOntologyThread() {
return readThread;
}
Deleted: trunk/src/dl-learner/org/dllearner/tools/protege/EllipseTest.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/EllipseTest.java 2009-05-06 10:53:22 UTC (rev 1740)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/EllipseTest.java 2009-05-06 13:15:10 UTC (rev 1741)
@@ -1,58 +0,0 @@
-package org.dllearner.tools.protege;
-
-import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Point2D;
-import java.util.Random;
-
-import javax.swing.JDialog;
-import javax.swing.JPanel;
-
-public class EllipseTest extends JPanel {
-
- private static final long serialVersionUID = -5676466024192284648L;
- private final Ellipse2D te;
- private final Random random;
-
- public EllipseTest() {
- te = new Ellipse2D.Double(0, 0, 150, 150);
- this.setSize(500, 500);
- random = new Random();
- JDialog dialog = new JDialog();
- dialog.add(this);
- dialog.setSize(600, 600);
- dialog.setVisible(true);
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- Graphics2D g2D;
- g2D = (Graphics2D) g;
- g2D.setColor(Color.YELLOW);
- g2D.fill(te);
- g2D.setColor(Color.RED);
- double x = random.nextInt(500);
- double y = random.nextInt(500);
- int i = 0;
- while (i < 1000) {
- Point2D point = new Point2D.Double(x, y);
- if (te.contains(point)) {
- Ellipse2D circlePoint = new Ellipse2D.Double(x - 1, y - 1, 3, 3);
- g2D.draw(circlePoint);
- // g2D.drawString("*", ((int)x), ((int) y));
- x = random.nextInt(500);
- y = random.nextInt(500);
- i++;
- } else {
- x = random.nextInt(500);
- y = random.nextInt(500);
- }
- }
- }
-
- public static void main(String[] args) {
- new EllipseTest();
- }
-}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-05-06 10:53:22 UTC (rev 1740)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-05-06 13:15:10 UTC (rev 1741)
@@ -53,6 +53,7 @@
private static final int PLUS_SIZE = 5;
private static final int SUBSTRING_SIZE = 25;
private static final int SPACE_SIZE = 7;
+ private static final int MAX_RANDOM_NUMBER = 300;
private static final String EQUI_STRING = "equivalent class";
private final String id;
private int shiftXAxis;
@@ -120,7 +121,7 @@
posNotCovIndVector = new Vector<IndividualPoint>();
additionalIndividuals = new Vector<IndividualPoint>();
points = new Vector<IndividualPoint>();
- this.computeGraphics(0, 0);
+ this.computeGraphics();
handler = new GraphicalCoveragePanelHandler(this, desc, model);
if(shiftXAxis == 0) {
oldConcept = new Ellipse2D.Double(ELLIPSE_X_AXIS + (2 * adjustment)+3,
@@ -139,7 +140,7 @@
+ adjustment, ELLIPSE_Y_AXIS, WIDTH + distortionOld, HEIGHT
+ distortionOld);
}
- this.computeIndividualPoints(300);
+ this.computeIndividualPoints();
this.addMouseMotionListener(handler);
this.addMouseListener(handler);
}
@@ -376,7 +377,7 @@
}
}
- private void computeGraphics(int w, int h) {
+ private void computeGraphics() {
if (eval != null) {
this.setVisible(true);
panel.repaint();
@@ -385,7 +386,7 @@
distortionOld = 0;
adjustment = 0;
Ellipse2D old = new Ellipse2D.Double(ELLIPSE_X_AXIS, ELLIPSE_Y_AXIS,
- WIDTH + w, HEIGHT + h);
+ WIDTH, HEIGHT);
x1 = (int) old.getCenterX() - PLUS_SIZE;
x2 = (int) old.getCenterX() + PLUS_SIZE;
y1 = (int) old.getCenterY() - PLUS_SIZE;
@@ -393,19 +394,19 @@
centerX = (int) old.getCenterX();
centerY = (int) old.getCenterY();
double coverage = ((EvaluatedDescriptionClass) eval).getCoverage();
- shiftXAxis = (int) Math.round((WIDTH + w) * (1 - coverage));
+ shiftXAxis = (int) Math.round((WIDTH) * (1 - coverage));
if (additionalIndividualSize != 0 && ((EvaluatedDescriptionClass) eval).getCoverage() == 1.0 && ((EvaluatedDescriptionClass) eval).getAddition() < 1.0) {
- distortionOld = (int) Math.round((WIDTH + w) * 0.3);
+ distortionOld = (int) Math.round((WIDTH) * 0.3);
Ellipse2D newer = new Ellipse2D.Double(ELLIPSE_X_AXIS + shiftXAxis,
- ELLIPSE_Y_AXIS, (WIDTH + w), HEIGHT + h);
+ ELLIPSE_Y_AXIS, (WIDTH), HEIGHT);
adjustment = (int) Math.round(newer.getCenterY() / 4);
}
- this.renderPlus(w);
+ this.renderPlus();
}
}
- private void renderPlus(int w) {
+ private void renderPlus() {
if (eval != null) {
coveredIndividualSize = ((EvaluatedDescriptionClass) eval)
.getCoveredInstances().size();
@@ -418,17 +419,17 @@
shiftNewConceptX = 0;
shiftCovered = 0;
if (coveredIndividualSize == 0) {
- shiftNewConcept = (int) Math.round(((WIDTH + w) / 2.0) * newConcepts);
+ shiftNewConcept = (int) Math.round(((WIDTH) / 2.0) * newConcepts);
} else if (additionalIndividualSize != coveredIndividualSize) {
- shiftNewConcept = (int) Math.round(((WIDTH + w) / 2.0)
+ shiftNewConcept = (int) Math.round(((WIDTH) / 2.0)
* (1.0 + (1.0 - oldConcepts)));
- shiftOldConcept = (int) Math.round(((WIDTH + w) / 2.0) * oldConcepts);
- shiftCovered = (int) Math.round(((WIDTH + w) / 2.0)
+ shiftOldConcept = (int) Math.round(((WIDTH) / 2.0) * oldConcepts);
+ shiftCovered = (int) Math.round(((WIDTH) / 2.0)
* (1 - oldConcepts));
}
if (((EvaluatedDescriptionClass) eval).getAddition() != 1.0 && ((EvaluatedDescriptionClass) eval)
.getCoverage() == 1.0) {
- shiftCovered = (int) Math.round(((WIDTH + w) / 2.0) * 0.625);
+ shiftCovered = (int) Math.round(((WIDTH) / 2.0) * 0.625);
shiftNewConceptX = shiftCovered;
shiftNewConcept = 2 * shiftNewConceptX;
}
@@ -478,13 +479,13 @@
}
}
- private void computeIndividualPoints(int n) {
+ private void computeIndividualPoints() {
if (eval != null) {
Set<Individual> posInd = ((EvaluatedDescriptionClass) eval)
.getCoveredInstances();
int i = 0;
- double x = random.nextInt(n);
- double y = random.nextInt(n);
+ double x = random.nextInt(MAX_RANDOM_NUMBER);
+ double y = random.nextInt(MAX_RANDOM_NUMBER);
boolean flag = true;
for (Individual ind : posInd) {
flag = true;
@@ -507,12 +508,12 @@
i++;
flag = false;
- x = random.nextInt(n);
- y = random.nextInt(n);
+ x = random.nextInt(MAX_RANDOM_NUMBER);
+ y = random.nextInt(MAX_RANDOM_NUMBER);
break;
} else {
- x = random.nextInt(n);
- y = random.nextInt(n);
+ x = random.nextInt(MAX_RANDOM_NUMBER);
+ y = random.nextInt(MAX_RANDOM_NUMBER);
}
}
@@ -522,8 +523,8 @@
Set<Individual> posNotCovInd = ((EvaluatedDescriptionClass) eval)
.getAdditionalInstances();
int j = 0;
- x = random.nextInt(n);
- y = random.nextInt(n);
+ x = random.nextInt(MAX_RANDOM_NUMBER);
+ y = random.nextInt(MAX_RANDOM_NUMBER);
for (Individual ind : posNotCovInd) {
flag = true;
if (j < MAX_NUMBER_OF_INDIVIDUAL_POINTS) {
@@ -563,12 +564,12 @@
}
j++;
flag = false;
- x = random.nextInt(n);
- y = random.nextInt(n);
+ x = random.nextInt(MAX_RANDOM_NUMBER);
+ y = random.nextInt(MAX_RANDOM_NUMBER);
break;
} else {
- x = random.nextInt(n);
- y = random.nextInt(n);
+ x = random.nextInt(MAX_RANDOM_NUMBER);
+ y = random.nextInt(MAX_RANDOM_NUMBER);
}
}
@@ -580,8 +581,8 @@
notCovInd.removeAll(posInd);
notCoveredInd = notCovInd.size();
int k = 0;
- x = random.nextInt(n);
- y = random.nextInt(n);
+ x = random.nextInt(MAX_RANDOM_NUMBER);
+ y = random.nextInt(MAX_RANDOM_NUMBER);
for (Individual ind : notCovInd) {
flag = true;
if (k < MAX_NUMBER_OF_INDIVIDUAL_POINTS) {
@@ -603,12 +604,12 @@
}
k++;
flag = false;
- x = random.nextInt(n);
- y = random.nextInt(n);
+ x = random.nextInt(MAX_RANDOM_NUMBER);
+ y = random.nextInt(MAX_RANDOM_NUMBER);
break;
} else {
- x = random.nextInt(n);
- y = random.nextInt(n);
+ x = random.nextInt(MAX_RANDOM_NUMBER);
+ y = random.nextInt(MAX_RANDOM_NUMBER);
}
}
@@ -685,32 +686,32 @@
}
/**
- *
- * @return
+ * This method returns how much the old concept must be shifted.
+ * @return shift of the old concept
*/
public int getShiftOldConcept() {
return shiftOldConcept;
}
/**
- *
- * @return
+ * This method returns how much the plus in the middle must be shifted.
+ * @return shift of the middle plus
*/
public int getShiftCovered() {
return shiftCovered;
}
/**
- *
- * @return
+ * This method returns how much the new concept must be shifted.
+ * @return shift of the new concept
*/
public int getShiftNewConcept() {
return shiftNewConcept;
}
/**
- *
- * @return
+ * This method returns how much the new concept must be shifted.
+ * @return shift of the new concept
*/
public int getShiftNewConceptX() {
return shiftNewConceptX;
@@ -732,17 +733,4 @@
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/IndividualPoint.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java 2009-05-06 10:53:22 UTC (rev 1740)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java 2009-05-06 13:15:10 UTC (rev 1741)
@@ -106,6 +106,10 @@
return individual;
}
+ /**
+ * This method returns an ellipse of the individual for the GraphicalCoveragePanel.
+ * @return individual point of the individual
+ */
public Ellipse2D getIndividualPoint() {
return circlePoint;
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-05-06 10:53:22 UTC (rev 1740)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-05-06 13:15:10 UTC (rev 1741)
@@ -156,12 +156,25 @@
}
+ /**
+ * Returns the graphical coverage panel.
+ * @return graphical coverage panel
+ */
public GraphicalCoveragePanel getGraphicalCoveragePanel() {
return p;
}
+
+ /**
+ * Returns the concept panel.
+ * @return concept panel
+ */
public JPanel getConceptPanel() {
return conceptPanel;
}
+
+ /**
+ * Unsets the panel after plugin is closed.
+ */
public void unsetPanel() {
unsetEverything();
conceptPanel.removeAll();
@@ -181,5 +194,4 @@
repaint();
}
-
-}
\ No newline at end of file
+}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-05-06 10:53:22 UTC (rev 1740)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-05-06 13:15:10 UTC (rev 1741)
@@ -49,9 +49,9 @@
public OptionPanel() {
setLayout(new BorderLayout());
labelPanel = new JPanel();
- labelPanel.setLayout(new GridLayout(0,1));
+ labelPanel.setLayout(new GridLayout(0, 1));
sliderPanel = new JPanel();
- sliderPanel.setLayout(new GridLayout(0,1));
+ sliderPanel.setLayout(new GridLayout(0, 1));
minAccuracyLabel = new JLabel("noise in %: ");
maxExecutionTimeLabel = new JLabel("maximum execution time: ");
nrOfConceptsLabel = new JLabel("max. number of results: ");
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java 2009-05-06 10:53:22 UTC (rev 1740)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java 2009-05-06 13:15:10 UTC (rev 1741)
@@ -48,11 +48,19 @@
@Override
public Set<OWLDescription> getDescriptions() {
+ if(view.getDLLearnerModel().getLearningAlgorithm() != null) {
+ if(view.getDLLearnerModel().getLearningAlgorithm().isRunning()) {
+ view.getDLLearnerModel().getLearningAlgorithm().stop();
+ view.unsetEverything();
+ }
+ }
return view.getSolutions();
}
@Override
public boolean isValidInput() {
+ view.getSuggestClassPanel().getSuggestModel().clear();
+ view.getSuggestClassPanel().repaint();
if(this.getAxiomType().toString().equals(EQUIVALENT_CLASS_STRING)) {
view.makeView("equivalent class");
} else if(this.getAxiomType().toString().equals(SUPERCLASS_STRING)) {
@@ -87,8 +95,4 @@
public void removeStatusChangedListener(
InputVerificationStatusChangedListener arg0) {
}
-
-
-
-
-}
\ No newline at end of file
+}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-05-06 10:53:22 UTC (rev 1740)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-05-06 13:15:10 UTC (rev 1741)
@@ -54,7 +54,6 @@
/**
* This is the constructor of the ReadingOntologyThread.
* @param editorKit OWLEditorKit
- * @param frame OWLFrame
* @param v DL-Learner view
* @param m DL-Learner model
*/
@@ -64,10 +63,18 @@
this.model = m;
}
+ /**
+ * This method sets the view of the DL-Learner plugin.
+ * @param v DLLearnerView
+ */
public void setDLLearnerView(DLLearnerView v) {
this.view = v;
}
+ /**
+ * This method sets the model of the DL-Learner plugin.
+ * @param m DLLearnerModel
+ */
public void setDLLearnerModel(DLLearnerModel m) {
this.model = m;
}
@@ -104,7 +111,6 @@
individual = reasoner.getIndividuals(concept);
model.setIndividuals(individual);
model.setHasIndividuals(hasIndividuals);
- System.out.println("current: " + currentConcept);
model.setCurrentConcept(currentConcept);
view.getRunButton().setEnabled(true);
break;
@@ -192,6 +198,10 @@
}
}
+ /**
+ * This method returns the NamedClass for the currently selected class.
+ * @return NamedClass of the currently selected class
+ */
public NamedClass getCurrentConcept() {
return currentConcept;
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2009-05-06 10:53:22 UTC (rev 1740)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2009-05-06 13:15:10 UTC (rev 1741)
@@ -28,36 +28,48 @@
import javax.swing.ListSelectionModel;
/**
- * This class is the panel for the suggest list.
- * It shows the descriptions made by the DL-Learner.
+ * This class is the panel for the suggest list. It shows the descriptions made
+ * by the DL-Learner.
+ *
* @author Christian Koetteritzsch
- *
+ *
*/
public class SuggestClassPanel extends JPanel {
-
+
private static final long serialVersionUID = 724628423947230L;
-
- // Description List
-
+
+ // Description List
+
private final JList descriptions;
-
- // Panel for the description list
-
+
+ // Panel for the description list
+
private final JPanel suggestPanel;
-
- //Scroll panel if the suggestions are longer than the Panel itself
+ // Scroll panel if the suggestions are longer than the Panel itself
+
private final JScrollPane suggestScroll;
+ private DefaultListModel suggestModel;
+ private DLLearnerModel model;
+ private DLLearnerView view;
+
/**
- * This is the constructor for the suggest panel.
- * It creates a new Scroll panel and puts the Suggest List in it.
+ * This is the constructor for the suggest panel. It creates a new Scroll
+ * panel and puts the Suggest List in it.
+ * @param m model of the DL-Learner
+ * @param v view of the DL-Learner
*/
- public SuggestClassPanel() {
+ public SuggestClassPanel(DLLearnerModel m, DLLearnerView v) {
super();
+ this.model = m;
+ this.view = v;
+ suggestModel = new DefaultListModel();
this.setLayout(new BorderLayout());
- //renders scroll bars if necessary
- suggestScroll = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
- descriptions = new JList();
+ // renders scroll bars if necessary
+ suggestScroll = new JScrollPane(
+ JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
+ JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+ descriptions = new JList(suggestModel);
descriptions.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
suggestPanel = new JPanel();
descriptions.setVisible(true);
@@ -68,41 +80,86 @@
descriptions.setCellRenderer(new SuggestListCellRenderer());
add(BorderLayout.CENTER, suggestScroll);
}
-
+
/**
- * this method adds an new Scroll Panel and returns the updated SuggestClassPanel.
+ * this method adds an new Scroll Panel and returns the updated
+ * SuggestClassPanel.
+ *
* @return updated SuggestClassPanel
*/
public SuggestClassPanel updateSuggestClassList() {
add(suggestScroll);
return this;
-
+
}
+
/**
* This method is called after the model for the suggest list is updated.
- *
- * @param desc List model of descriptions made by the DL-Learner
+ *
+ * @param desc
+ * List model of descriptions made by the DL-Learner
*/
public void setSuggestList(DefaultListModel desc) {
- descriptions.setModel(desc);
+ if (desc.size() != 0) {
+ if (suggestModel.size() == 0) {
+ for (int i = 0; i < desc.size(); i++) {
+ suggestModel.add(i, desc.get(i));
+ }
+ } else {
+ for (int i = 0; i < suggestModel.size(); i++) {
+ if (!((SuggestListItem) suggestModel.get(i)).getValue()
+ .equals(((SuggestListItem) desc.get(i)).getValue())) {
+ descriptions.getSelectedIndex();
+ suggestModel.set(i, desc.get(i));
+ if (descriptions.getSelectedIndex() == i) {
+ view
+ .getMoreDetailForSuggestedConceptsPanel()
+ .renderDetailPanel(
+ model
+ .getCurrentlySelectedClassDescription(i));
+ view.setGraphicalPanel();
+ view.getMoreDetailForSuggestedConceptsPanel()
+ .repaint();
+
+ }
+ }
+ }
+ for (int i = suggestModel.getSize(); i < desc.size(); i++) {
+ suggestModel.add(i, desc.get(i));
+ }
+ }
+ }
descriptions.repaint();
repaint();
}
+
/**
* This method returns the current Description list.
+ *
* @return JList of Descriptions
*/
public JList getSuggestList() {
return descriptions;
}
-
+
/**
* This method adds the suggest list to the Mouse Listener.
- * @param action ActionHandler
+ *
+ * @param action
+ * ActionHandler
*/
public void addSuggestPanelMouseListener(ActionHandler action) {
descriptions.addMouseListener(action);
-
+
}
+ /**
+ * Thsi method returns the list model for the suggest list.
+ *
+ * @return list model for the suggest list
+ */
+ public DefaultListModel getSuggestModel() {
+ return suggestModel;
+ }
+
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestListItem.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestListItem.java 2009-05-06 10:53:22 UTC (rev 1740)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestListItem.java 2009-05-06 13:15:10 UTC (rev 1741)
@@ -28,8 +28,8 @@
public class SuggestListItem {
private final Color color;
- private final String value;
- private final double accuracy;
+ private String value;
+ private double accuracy;
/**
* Constructor for the SuggestListItem.
* @param c Color Color in which the text is painted.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hee...@us...> - 2009-05-14 06:33:44
|
Revision: 1750
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1750&view=rev
Author: heeroyuy
Date: 2009-05-14 06:33:31 +0000 (Thu, 14 May 2009)
Log Message:
-----------
-fixed bug that plugin shows loding instances... when ontology is inconsistent
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-10 13:33:52 UTC (rev 1749)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-05-14 06:33:31 UTC (rev 1750)
@@ -228,13 +228,14 @@
reasoner.isSatisfiable();
view.setIsInconsistent(false);
isReasonerSet = true;
- } catch (ComponentInitException e) {
- // TODO Auto-generated catch block
- System.out.println("fehler!!!!!!!!!");
- e.printStackTrace();
+ }catch (ComponentInitException e) {
+ System.out.println("testen");
+ view.setIsInconsistent(true);
+ //e.printStackTrace();
} catch (InconsistentOntologyException incon) {
+ System.out.println("test");
view.setIsInconsistent(true);
- }
+ }
}
/**
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-05-10 13:33:52 UTC (rev 1749)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-05-14 06:33:31 UTC (rev 1750)
@@ -204,6 +204,9 @@
if(readThread.hasIndividuals()) {
run.setEnabled(true);
}
+ //if(labels.equals(currentConcept)) {
+ //model.getReasoner().setUpdated();
+ //}
labels = currentConcept;
run.setText("suggest " + label + " expression");
GridBagConstraints c = new GridBagConstraints();
@@ -238,13 +241,14 @@
c.weighty = 0.0;
c.gridwidth = 1;
addButtonPanel.add("North", accept);
- //c.gridwidth = GridBagConstraints.REMAINDER;
learner.add(addButtonPanel, c);
- c.fill = GridBagConstraints.HORIZONTAL;
- c.gridwidth = GridBagConstraints.REMAINDER;
+ c.fill = GridBagConstraints.BOTH;
+ c.weightx = 0.0;
+ c.weighty = 0.0;
c.gridx = 0;
c.gridy = 2;
+ hint.setPreferredSize(new Dimension(490, 60));
learner.add(hint, c);
advancedPanel.add(advanced);
@@ -252,7 +256,6 @@
advanced.setIcon(icon);
advanced.setSelected(false);
c.fill = GridBagConstraints.NONE;
- c.gridwidth = GridBagConstraints.RELATIVE;
c.gridx = 0;
c.weightx = 0.0;
c.weighty = 0.0;
@@ -261,8 +264,6 @@
posPanel.setVisible(false);
c.fill = GridBagConstraints.BOTH;
- c.gridwidth = GridBagConstraints.RELATIVE;
- c.gridheight = GridBagConstraints.RELATIVE;
c.gridx = 0;
c.gridy = 4;
c.weightx = 0.0;
@@ -449,6 +450,10 @@
this.isInconsistent = isIncon;
}
+ public boolean getIsInconsistent() {
+ return isInconsistent;
+ }
+
/**
* Adds Actionlistener to the run button.
* @param a ActionListener
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-05-10 13:33:52 UTC (rev 1749)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-05-14 06:33:31 UTC (rev 1750)
@@ -175,7 +175,7 @@
model.setReasoner();
}
reasoner = model.getReasoner();
- isInconsistent = false;
+ isInconsistent = view.getIsInconsistent();
if(!isInconsistent) {
this.checkURI();
this.setPositiveConcept();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hee...@us...> - 2009-05-18 14:15:17
|
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.
|
|
From: <hee...@us...> - 2009-10-08 09:48:33
|
Revision: 1883
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1883&view=rev
Author: heeroyuy
Date: 2009-10-08 09:48:07 +0000 (Thu, 08 Oct 2009)
Log Message:
-----------
-added a handler for the option panel
-removed unnecessary methods in the option panel
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java
Added Paths:
-----------
trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-10-08 09:13:46 UTC (rev 1882)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-10-08 09:48:07 UTC (rev 1883)
@@ -41,14 +41,6 @@
private final JLabel minAccuracyLabel;
private final JLabel maxExecutionTimeLabel;
private final JLabel nrOfConceptsLabel;
- private JLabel owlRadioButtonLabel;
- private JLabel elProfileButtonLabel;
- private JLabel allBoxLabel;
- private JLabel someBoxLabel;
- private JLabel notBoxLabel;
- private JLabel valueBoxLabel;
- private JLabel moreBoxLabel;
- private JLabel lessBoxLabel;
private final JSlider minAccuracy;
private final JSlider maxExecutionTime;
@@ -73,12 +65,15 @@
private JPanel labelPanel;
private JPanel sliderPanel;
+ private OptionPanelHandler optionHandler;
private double accuracy;
+
/**
* Constructor for the Option Panel.
*/
public OptionPanel() {
setLayout(new BorderLayout());
+ optionHandler = new OptionPanelHandler(this);
labelPanel = new JPanel();
labelPanel.setLayout(new GridLayout(0, 1));
sliderPanel = new JPanel();
@@ -86,21 +81,13 @@
profilePanel = new JPanel();
profilePanel.setLayout(new GridLayout(0, 1));
radioBoxPanel = new JPanel();
- radioBoxPanel.setLayout(new GridLayout(1, 4));
+ radioBoxPanel.setLayout(new GridLayout(1, 3));
checkBoxPanel = new JPanel();
- checkBoxPanel.setLayout(new GridLayout(1, 14));
+ checkBoxPanel.setLayout(new GridLayout(1, 8));
minAccuracyLabel = new JLabel("noise in %: ");
maxExecutionTimeLabel = new JLabel("maximum execution time: ");
nrOfConceptsLabel = new JLabel("max. number of results: ");
- owlRadioButtonLabel = new JLabel("OWL 2");
- elProfileButtonLabel = new JLabel("EL Profile");
- allBoxLabel = new JLabel("all");
- someBoxLabel = new JLabel("some");
- notBoxLabel = new JLabel("not");
- valueBoxLabel = new JLabel("value");
- lessBoxLabel = new JLabel("<=x with max.:");
- moreBoxLabel = new JLabel(">=x with max.:");
minAccuracy = new JSlider(0, 50, 5);
minAccuracy.setPaintTicks(true);
@@ -122,42 +109,66 @@
nrOfConcepts.setMinorTickSpacing(1);
nrOfConcepts.setPaintLabels(true);
- owlRadioButton = new JRadioButton();
- elProfileButton = new JRadioButton();
+ owlRadioButton = new JRadioButton("OWL 2", true);
+ elProfileButton = new JRadioButton("EL Profile", false);
owlRadioButton.setEnabled(true);
+ owlRadioButton.addItemListener(optionHandler);
+ elProfileButton.addItemListener(optionHandler);
- allBox = new JCheckBox();
- someBox = new JCheckBox();
- notBox = new JCheckBox();
- valueBox = new JCheckBox();
- lessBox = new JCheckBox();
- moreBox = new JCheckBox();
+ allBox = new JCheckBox("all", true);
+ allBox.addItemListener(optionHandler);
+ someBox = new JCheckBox("some", true);
+ someBox.addItemListener(optionHandler);
+ notBox = new JCheckBox("not", true);
+ notBox.addItemListener(optionHandler);
+ valueBox = new JCheckBox("value", true);
+ valueBox.addItemListener(optionHandler);
+ lessBox = new JCheckBox("<=x with max.:", true);
+ lessBox.addItemListener(optionHandler);
+ moreBox = new JCheckBox(">=x with max.:", true);
+ moreBox.addItemListener(optionHandler);
countLessBox = new JComboBox();
+ countLessBox.addItem("1");
+
+ countLessBox.addItem("2");
+ countLessBox.addItem("3");
+ countLessBox.addItem("4");
+ countLessBox.addItem("5");
+ countLessBox.addItem("6");
+ countLessBox.addItem("7");
+ countLessBox.addItem("8");
+ countLessBox.addItem("9");
+ countLessBox.addItem("10");
+ countLessBox.setSelectedItem("3");
countLessBox.setEditable(false);
+
countMoreBox = new JComboBox();
+ countMoreBox.addItem("1");
+ countMoreBox.addItem("2");
+ countMoreBox.addItem("3");
+ countMoreBox.addItem("4");
+ countMoreBox.addItem("5");
+ countMoreBox.addItem("6");
+ countMoreBox.addItem("7");
+ countMoreBox.addItem("8");
+ countMoreBox.addItem("9");
+ countMoreBox.addItem("10");
+ countMoreBox.setSelectedItem("3");
countMoreBox.setEditable(false);
checkBoxPanel.add(allBox);
- checkBoxPanel.add(allBoxLabel);
checkBoxPanel.add(someBox);
- checkBoxPanel.add(someBoxLabel);
checkBoxPanel.add(notBox);
- checkBoxPanel.add(notBoxLabel);
checkBoxPanel.add(valueBox);
- checkBoxPanel.add(valueBoxLabel);
checkBoxPanel.add(lessBox);
- checkBoxPanel.add(lessBoxLabel);
checkBoxPanel.add(countLessBox);
checkBoxPanel.add(moreBox);
- checkBoxPanel.add(moreBoxLabel);
checkBoxPanel.add(countMoreBox);
radioBoxPanel.add(owlRadioButton);
- radioBoxPanel.add(owlRadioButtonLabel);
radioBoxPanel.add(elProfileButton);
- radioBoxPanel.add(elProfileButtonLabel);
profilePanel.add(radioBoxPanel);
profilePanel.add(checkBoxPanel);
@@ -201,58 +212,30 @@
return nrOfConcepts.getValue();
}
- public void setOwlRadioButton(JRadioButton owlRadioButton) {
- this.owlRadioButton = owlRadioButton;
- }
-
public JRadioButton getOwlRadioButton() {
return owlRadioButton;
}
- public void setElProfileButton(JRadioButton elProfileButton) {
- this.elProfileButton = elProfileButton;
- }
-
public JRadioButton getElProfileButton() {
return elProfileButton;
}
- public void setAllBox(JCheckBox allBox) {
- this.allBox = allBox;
- }
-
public JCheckBox getAllBox() {
return allBox;
}
- public void setSomeBox(JCheckBox someBox) {
- this.someBox = someBox;
- }
-
public JCheckBox getSomeBox() {
return someBox;
}
- public void setNotBox(JCheckBox notBox) {
- this.notBox = notBox;
- }
-
public JCheckBox getNotBox() {
return notBox;
}
- public void setValueBox(JCheckBox valueBox) {
- this.valueBox = valueBox;
- }
-
public JCheckBox getValueBox() {
return valueBox;
}
- public void setLessBox(JCheckBox lessBox) {
- this.lessBox = lessBox;
- }
-
public JCheckBox getLessBox() {
return lessBox;
}
@@ -261,28 +244,24 @@
return profilePanel;
}
- public void setCountLessBox(JComboBox countLessBox) {
- this.countLessBox = countLessBox;
- }
-
public JComboBox getCountLessBox() {
return countLessBox;
}
- public void setCountMoreBox(JComboBox countMoreBox) {
- this.countMoreBox = countMoreBox;
- }
-
public JComboBox getCountMoreBox() {
return countMoreBox;
}
- public void setMoreBox(JCheckBox moreBox) {
- this.moreBox = moreBox;
- }
-
public JCheckBox getMoreBox() {
return moreBox;
}
+ public JPanel getRadioBoxPanel() {
+ return radioBoxPanel;
+ }
+
+ public JPanel getCheckBoxPanel() {
+ return checkBoxPanel;
+ }
+
}
Added: trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java 2009-10-08 09:48:07 UTC (rev 1883)
@@ -0,0 +1,63 @@
+package org.dllearner.tools.protege;
+
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+
+public class OptionPanelHandler implements ItemListener {
+
+ private static final String OWL_RADIO_STRING = "OWL 2";
+ private static final String EL_RADIO_STRING = "EL Profile";
+
+ private OptionPanel option;
+
+ public OptionPanelHandler(OptionPanel o) {
+ this.option = o;
+
+ }
+
+ @Override
+ public void itemStateChanged(ItemEvent e) {
+ if (e.toString().contains(OWL_RADIO_STRING)) {
+ if (option.getOwlRadioButton().isSelected()) {
+ this.setToOWLProfile();
+ } else {
+ this.setToELProfile();
+ }
+
+ } else if (e.toString().contains(EL_RADIO_STRING)) {
+ if (option.getElProfileButton().isSelected()) {
+ this.setToELProfile();
+ } else {
+ this.setToOWLProfile();
+ }
+
+ }
+ }
+
+ private void setToOWLProfile() {
+ option.getOwlRadioButton().setSelected(true);
+ option.getElProfileButton().setSelected(false);
+ option.getAllBox().setSelected(true);
+ option.getSomeBox().setSelected(true);
+ option.getNotBox().setSelected(true);
+ option.getValueBox().setSelected(true);
+ option.getLessBox().setSelected(true);
+ option.getCountLessBox().setEnabled(true);
+ option.getMoreBox().setSelected(true);
+ option.getCountMoreBox().setEnabled(true);
+ }
+
+ private void setToELProfile() {
+ option.getOwlRadioButton().setSelected(false);
+ option.getElProfileButton().setSelected(true);
+ option.getAllBox().setSelected(false);
+ option.getSomeBox().setSelected(true);
+ option.getNotBox().setSelected(false);
+ option.getValueBox().setSelected(false);
+ option.getLessBox().setSelected(false);
+ option.getCountLessBox().setEnabled(false);
+ option.getMoreBox().setSelected(false);
+ option.getCountMoreBox().setEnabled(false);
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hee...@us...> - 2009-10-08 11:04:27
|
Revision: 1884
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1884&view=rev
Author: heeroyuy
Date: 2009-10-08 11:04:20 +0000 (Thu, 08 Oct 2009)
Log Message:
-----------
-finished adding new options in protege plugin
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/OptionPanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-08 09:48:07 UTC (rev 1883)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-08 11:04:20 UTC (rev 1884)
@@ -145,7 +145,7 @@
* ItemEvent
*/
public void itemStateChanged(ItemEvent i) {
-
+
}
/**
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-10-08 09:48:07 UTC (rev 1883)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-10-08 11:04:20 UTC (rev 1884)
@@ -300,7 +300,15 @@
// TODO Auto-generated catch block
e.printStackTrace();
}
- cm.applyConfigEntry(la, "useNegation", false);
+ cm.applyConfigEntry(la, "useAllConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getAllBox().isSelected());
+ cm.applyConfigEntry(la, "useExistsConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getSomeBox().isSelected());
+ cm.applyConfigEntry(la, "useHasValueConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getValueBox().isSelected());
+ cm.applyConfigEntry(la, "useNegation", view.getPosAndNegSelectPanel().getOptionPanel().getNotBox().isSelected());
+ cm.applyConfigEntry(la, "useCardinalityRestrictions", view.getPosAndNegSelectPanel().getOptionPanel().getMoreBox().isSelected());
+ if(view.getPosAndNegSelectPanel().getOptionPanel().getMoreBox().isSelected()) {
+ cm.applyConfigEntry(la, "cardinalityLimit", view.getPosAndNegSelectPanel().getOptionPanel().getCountMoreBox().getSelectedItem());
+ }
+
cm.applyConfigEntry(la, "noisePercentage", view.getPosAndNegSelectPanel().getOptionPanel().getMinAccuracy());
cm.applyConfigEntry(la, "maxExecutionTimeInSeconds", view
.getPosAndNegSelectPanel().getOptionPanel()
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-10-08 09:48:07 UTC (rev 1883)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-10-08 11:04:20 UTC (rev 1884)
@@ -53,10 +53,8 @@
private JCheckBox someBox;
private JCheckBox notBox;
private JCheckBox valueBox;
- private JCheckBox lessBox;
private JCheckBox moreBox;
- private JComboBox countLessBox;
private JComboBox countMoreBox;
private JPanel profilePanel;
@@ -83,7 +81,7 @@
radioBoxPanel = new JPanel();
radioBoxPanel.setLayout(new GridLayout(1, 3));
checkBoxPanel = new JPanel();
- checkBoxPanel.setLayout(new GridLayout(1, 8));
+ checkBoxPanel.setLayout(new GridLayout(1, 6));
minAccuracyLabel = new JLabel("noise in %: ");
maxExecutionTimeLabel = new JLabel("maximum execution time: ");
@@ -123,46 +121,27 @@
notBox.addItemListener(optionHandler);
valueBox = new JCheckBox("value", true);
valueBox.addItemListener(optionHandler);
- lessBox = new JCheckBox("<=x with max.:", true);
- lessBox.addItemListener(optionHandler);
- moreBox = new JCheckBox(">=x with max.:", true);
+ moreBox = new JCheckBox("<=x, >=x with max.:", true);
moreBox.addItemListener(optionHandler);
- countLessBox = new JComboBox();
- countLessBox.addItem("1");
-
- countLessBox.addItem("2");
- countLessBox.addItem("3");
- countLessBox.addItem("4");
- countLessBox.addItem("5");
- countLessBox.addItem("6");
- countLessBox.addItem("7");
- countLessBox.addItem("8");
- countLessBox.addItem("9");
- countLessBox.addItem("10");
- countLessBox.setSelectedItem("3");
- countLessBox.setEditable(false);
-
countMoreBox = new JComboBox();
- countMoreBox.addItem("1");
- countMoreBox.addItem("2");
- countMoreBox.addItem("3");
- countMoreBox.addItem("4");
- countMoreBox.addItem("5");
- countMoreBox.addItem("6");
- countMoreBox.addItem("7");
- countMoreBox.addItem("8");
- countMoreBox.addItem("9");
- countMoreBox.addItem("10");
- countMoreBox.setSelectedItem("3");
+ countMoreBox.addItem(1);
+ countMoreBox.addItem(2);
+ countMoreBox.addItem(3);
+ countMoreBox.addItem(4);
+ countMoreBox.addItem(5);
+ countMoreBox.addItem(6);
+ countMoreBox.addItem(7);
+ countMoreBox.addItem(8);
+ countMoreBox.addItem(9);
+ countMoreBox.addItem(10);
+ countMoreBox.setSelectedItem(5);
countMoreBox.setEditable(false);
checkBoxPanel.add(allBox);
checkBoxPanel.add(someBox);
checkBoxPanel.add(notBox);
checkBoxPanel.add(valueBox);
- checkBoxPanel.add(lessBox);
- checkBoxPanel.add(countLessBox);
checkBoxPanel.add(moreBox);
checkBoxPanel.add(countMoreBox);
@@ -236,17 +215,10 @@
return valueBox;
}
- public JCheckBox getLessBox() {
- return lessBox;
- }
-
public JPanel getProfilePanel() {
return profilePanel;
}
- public JComboBox getCountLessBox() {
- return countLessBox;
- }
public JComboBox getCountMoreBox() {
return countMoreBox;
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java 2009-10-08 09:48:07 UTC (rev 1883)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java 2009-10-08 11:04:20 UTC (rev 1884)
@@ -7,6 +7,7 @@
private static final String OWL_RADIO_STRING = "OWL 2";
private static final String EL_RADIO_STRING = "EL Profile";
+ private static final String VALUE_STRING = "<=x, >=x with max.:";
private OptionPanel option;
@@ -31,6 +32,12 @@
this.setToOWLProfile();
}
+ } else if(e.toString().contains(VALUE_STRING)) {
+ if(option.getMoreBox().isSelected()) {
+ option.getCountMoreBox().setEnabled(true);
+ } else {
+ option.getCountMoreBox().setEnabled(false);
+ }
}
}
@@ -41,8 +48,6 @@
option.getSomeBox().setSelected(true);
option.getNotBox().setSelected(true);
option.getValueBox().setSelected(true);
- option.getLessBox().setSelected(true);
- option.getCountLessBox().setEnabled(true);
option.getMoreBox().setSelected(true);
option.getCountMoreBox().setEnabled(true);
}
@@ -54,8 +59,6 @@
option.getSomeBox().setSelected(true);
option.getNotBox().setSelected(false);
option.getValueBox().setSelected(false);
- option.getLessBox().setSelected(false);
- option.getCountLessBox().setEnabled(false);
option.getMoreBox().setSelected(false);
option.getCountMoreBox().setEnabled(false);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hee...@us...> - 2009-10-08 11:51:37
|
Revision: 1885
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1885&view=rev
Author: heeroyuy
Date: 2009-10-08 11:51:27 +0000 (Thu, 08 Oct 2009)
Log Message:
-----------
-small change in OptionPanel class
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-10-08 11:04:20 UTC (rev 1884)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-10-08 11:51:27 UTC (rev 1885)
@@ -300,13 +300,13 @@
// TODO Auto-generated catch block
e.printStackTrace();
}
- cm.applyConfigEntry(la, "useAllConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getAllBox().isSelected());
- cm.applyConfigEntry(la, "useExistsConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getSomeBox().isSelected());
- cm.applyConfigEntry(la, "useHasValueConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getValueBox().isSelected());
- cm.applyConfigEntry(la, "useNegation", view.getPosAndNegSelectPanel().getOptionPanel().getNotBox().isSelected());
- cm.applyConfigEntry(la, "useCardinalityRestrictions", view.getPosAndNegSelectPanel().getOptionPanel().getMoreBox().isSelected());
- if(view.getPosAndNegSelectPanel().getOptionPanel().getMoreBox().isSelected()) {
- cm.applyConfigEntry(la, "cardinalityLimit", view.getPosAndNegSelectPanel().getOptionPanel().getCountMoreBox().getSelectedItem());
+ cm.applyConfigEntry(la, "useAllConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getAllBox());
+ cm.applyConfigEntry(la, "useExistsConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getSomeBox());
+ cm.applyConfigEntry(la, "useHasValueConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getValueBox());
+ cm.applyConfigEntry(la, "useNegation", view.getPosAndNegSelectPanel().getOptionPanel().getNotBox());
+ cm.applyConfigEntry(la, "useCardinalityRestrictions", view.getPosAndNegSelectPanel().getOptionPanel().getMoreBox());
+ if(view.getPosAndNegSelectPanel().getOptionPanel().getMoreBox()) {
+ cm.applyConfigEntry(la, "cardinalityLimit", view.getPosAndNegSelectPanel().getOptionPanel().getCountMoreBox());
}
cm.applyConfigEntry(la, "noisePercentage", view.getPosAndNegSelectPanel().getOptionPanel().getMinAccuracy());
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-10-08 11:04:20 UTC (rev 1884)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-10-08 11:51:27 UTC (rev 1885)
@@ -199,20 +199,20 @@
return elProfileButton;
}
- public JCheckBox getAllBox() {
- return allBox;
+ public boolean getAllBox() {
+ return allBox.isSelected();
}
- public JCheckBox getSomeBox() {
- return someBox;
+ public boolean getSomeBox() {
+ return someBox.isSelected();
}
- public JCheckBox getNotBox() {
- return notBox;
+ public boolean getNotBox() {
+ return notBox.isSelected();
}
- public JCheckBox getValueBox() {
- return valueBox;
+ public boolean getValueBox() {
+ return valueBox.isSelected();
}
public JPanel getProfilePanel() {
@@ -220,12 +220,12 @@
}
- public JComboBox getCountMoreBox() {
- return countMoreBox;
+ public int getCountMoreBox() {
+ return Integer.parseInt(countMoreBox.getSelectedItem().toString());
}
- public JCheckBox getMoreBox() {
- return moreBox;
+ public boolean getMoreBox() {
+ return moreBox.isSelected();
}
public JPanel getRadioBoxPanel() {
@@ -236,4 +236,26 @@
return checkBoxPanel;
}
+ public void setToOWLProfile() {
+ allBox.setSelected(true);
+ someBox.setSelected(true);
+ notBox.setSelected(true);
+ valueBox.setSelected(true);
+ moreBox.setSelected(true);
+ this.setCountMoreBoxEnabled(true);
+ }
+
+ public void setToELProfile() {
+ allBox.setSelected(false);
+ someBox.setSelected(true);
+ notBox.setSelected(false);
+ valueBox.setSelected(false);
+ moreBox.setSelected(false);
+ this.setCountMoreBoxEnabled(false);
+ }
+
+ public void setCountMoreBoxEnabled(boolean isEnabled) {
+ countMoreBox.setEnabled(isEnabled);
+ }
+
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java 2009-10-08 11:04:20 UTC (rev 1884)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java 2009-10-08 11:51:27 UTC (rev 1885)
@@ -33,10 +33,10 @@
}
} else if(e.toString().contains(VALUE_STRING)) {
- if(option.getMoreBox().isSelected()) {
- option.getCountMoreBox().setEnabled(true);
+ if(option.getMoreBox()) {
+ option.setCountMoreBoxEnabled(true);
} else {
- option.getCountMoreBox().setEnabled(false);
+ option.setCountMoreBoxEnabled(false);
}
}
}
@@ -44,23 +44,15 @@
private void setToOWLProfile() {
option.getOwlRadioButton().setSelected(true);
option.getElProfileButton().setSelected(false);
- option.getAllBox().setSelected(true);
- option.getSomeBox().setSelected(true);
- option.getNotBox().setSelected(true);
- option.getValueBox().setSelected(true);
- option.getMoreBox().setSelected(true);
- option.getCountMoreBox().setEnabled(true);
+ option.setToOWLProfile();
+
}
private void setToELProfile() {
option.getOwlRadioButton().setSelected(false);
option.getElProfileButton().setSelected(true);
- option.getAllBox().setSelected(false);
- option.getSomeBox().setSelected(true);
- option.getNotBox().setSelected(false);
- option.getValueBox().setSelected(false);
- option.getMoreBox().setSelected(false);
- option.getCountMoreBox().setEnabled(false);
+ option.setToELProfile();
+
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hee...@us...> - 2009-10-08 13:11:43
|
Revision: 1886
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1886&view=rev
Author: heeroyuy
Date: 2009-10-08 13:11:27 +0000 (Thu, 08 Oct 2009)
Log Message:
-----------
-added information from getMinimumHorizontalExpansion() and getMaximumHorizontalExpansion() on main panel
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-08 11:51:27 UTC (rev 1885)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-08 13:11:27 UTC (rev 1886)
@@ -40,6 +40,7 @@
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
+import org.dllearner.algorithms.celoe.CELOE;
import org.dllearner.core.EvaluatedDescription;
import org.dllearner.core.LearningAlgorithm;
import org.dllearner.core.owl.Description;
@@ -103,7 +104,10 @@
model.setLearningAlgorithm();
view.getRunButton().setEnabled(false);
view.getHintPanel().setForeground(Color.RED);
- view.setHintMessage("learning started");
+ CELOE celoe = (CELOE) model.getLearningAlgorithm();
+
+ String moreInformationsMessage = "Learning started. Currently searching class expressions with length between " + celoe.getMinimumHorizontalExpansion() + " and" + celoe.getMaximumHorizontalExpansion() + ". ";
+ view.setHintMessage(moreInformationsMessage);
retriever = new SuggestionRetriever();
retriever.execute();
// model.setCurrentConcept(null);
@@ -294,6 +298,10 @@
publish(la.getCurrentlyBestEvaluatedDescriptions(view
.getPosAndNegSelectPanel().getOptionPanel()
.getNrOfConcepts()));
+ CELOE celoe = (CELOE) model.getLearningAlgorithm();
+ view.getHintPanel().setForeground(Color.RED);
+ String moreInformationsMessage = "Learning started. Currently searching class expressions with length between " + celoe.getMinimumHorizontalExpansion() + " and " + celoe.getMaximumHorizontalExpansion() + ".";
+ view.setHintMessage(moreInformationsMessage);
}
}
@@ -339,9 +347,9 @@
} catch (ExecutionException e) {
e.printStackTrace();
}
-
view.algorithmTerminated();
updateList(result);
+ view.algorithmTerminated();
}
@Override
@@ -396,6 +404,7 @@
}
}
}
+
view.getSuggestClassPanel().setSuggestList(dm);
view.getLearnerView().repaint();
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-10-08 11:51:27 UTC (rev 1885)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-10-08 13:11:27 UTC (rev 1886)
@@ -39,6 +39,7 @@
import javax.swing.JTextArea;
import javax.swing.JToggleButton;
+import org.dllearner.algorithms.celoe.CELOE;
import org.protege.editor.owl.OWLEditorKit;
import org.semanticweb.owl.model.OWLDescription;
/**
@@ -487,21 +488,23 @@
* This method sets the run button enable after learning.
*/
public void algorithmTerminated() {
- String error = "learning successful\n";
+ CELOE celoe = (CELOE) model.getLearningAlgorithm();
+ String error = "Learning successful. Currently searching class expressions with length between " + celoe.getMinimumHorizontalExpansion() + " and " + celoe.getMaximumHorizontalExpansion() + ".";
hint.setForeground(Color.RED);
- setHintMessage(error);
+ this.setHintMessage(error);
String message = "";
if(isInconsistent) {
- message ="Class expressions marked red will lead to an inconsistent ontology. \nPlease double click on them to view detail information.";
+ message ="\nClass expressions marked red will lead to an inconsistent ontology. \nPlease double click on them to view detail information.";
} else {
- message ="To view details about why a class expression was suggested, please click on it.";
+ message ="\nTo view details about why a class expression was suggested, please click on it.";
}
run.setEnabled(true);
// start the algorithm and print the best concept found
//renderErrorMessage(error);
- hint.setForeground(Color.BLACK);
+ //hint.setForeground(Color.BLACK);
hint.append(message);
- setHintMessage(message);
+ hint.repaint();
+ //setHintMessage(message);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hee...@us...> - 2009-10-08 13:58:33
|
Revision: 1887
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1887&view=rev
Author: heeroyuy
Date: 2009-10-08 13:58:26 +0000 (Thu, 08 Oct 2009)
Log Message:
-----------
-started help button and help text
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
Added Paths:
-----------
trunk/src/dl-learner/org/dllearner/tools/protege/Help-16x16.png
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-08 13:11:27 UTC (rev 1886)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-08 13:58:26 UTC (rev 1887)
@@ -72,9 +72,11 @@
private final Color colorRed = new Color(139, 0, 0);
private final Color colorGreen = new Color(0, 139, 0);
private final DLLearnerView view;
+ private static final String HELP_BUTTON_STRING = "help";
/**
* This is the constructor for the action handler.
+ *
* @param m
* DLLearnerModel
* @param view
@@ -96,7 +98,9 @@
*/
public void actionPerformed(ActionEvent z) {
- if (z.getActionCommand().equals("suggest equivalent class expression") || z.getActionCommand().equals("suggest super class expression")) {
+ if (z.getActionCommand().equals("suggest equivalent class expression")
+ || z.getActionCommand()
+ .equals("suggest super class expression")) {
model.setKnowledgeSource();
view.getSuggestClassPanel().getSuggestModel().clear();
view.getSuggestClassPanel().repaint();
@@ -105,8 +109,12 @@
view.getRunButton().setEnabled(false);
view.getHintPanel().setForeground(Color.RED);
CELOE celoe = (CELOE) model.getLearningAlgorithm();
-
- String moreInformationsMessage = "Learning started. Currently searching class expressions with length between " + celoe.getMinimumHorizontalExpansion() + " and" + celoe.getMaximumHorizontalExpansion() + ". ";
+
+ String moreInformationsMessage = "Learning started. Currently searching class expressions with length between "
+ + celoe.getMinimumHorizontalExpansion()
+ + " and"
+ + celoe.getMaximumHorizontalExpansion() + ". ";
+ view.setHelpButtonVisible(true);
view.setHintMessage(moreInformationsMessage);
retriever = new SuggestionRetriever();
retriever.execute();
@@ -125,8 +133,9 @@
.getSuggestClassPanel().getSuggestList()
.getSelectedValue());
}
- String message = "class expression\nadded";
- view.renderErrorMessage(message);
+ String message = "class expression added";
+ view.setHintMessage(message);
+ view.setHelpButtonVisible(false);
}
if (z.getActionCommand().equals("")) {
if (!toggled) {
@@ -139,9 +148,16 @@
view.setExamplePanelVisible(toggled);
}
}
+ System.out.println(z.getActionCommand());
+ if (z.getActionCommand().equals(HELP_BUTTON_STRING)) {
+ String helpText = "What does a sentence like 'Learning started. Currently searching class expressions with length between 4 and 7.' mean?"
+ + "Length: In Manchester OWL Syntax (the syntax used for class expressions in Protege), we define length simply as the number of words needed to write down the class expression."
+ + "The learning algorithm (called CELOE) for suggesting class expressions starts with the most general expression owl:Thing and then further specializes it. Those class expressions, which fit the existing instances of a given class ($currentClass in this case) get a high accuracy and are displayed as suggestions. The learning algorithm prefers short expressions. 'Currently searching class expressions with length between 4 and 7.' means that it has already evaluated all class expressions of length 1 to 3 or excluded them as possible suggestions. All the expressions currently evaluated have length between 4 and 7. If you want to search for longer expressions, then you have to increase the maximum runtime setting (it is set to $defaultRuntime seconds by default)."
+ + "See $wikiPage for more details. ";
+ view.getHelpButton().setToolTipText(helpText);
+ }
}
-
/**
* select/deselect the Check boxes.
*
@@ -149,7 +165,7 @@
* ItemEvent
*/
public void itemStateChanged(ItemEvent i) {
-
+
}
/**
@@ -208,8 +224,8 @@
}
}
}
- view.getMoreDetailForSuggestedConceptsPanel()
- .renderDetailPanel(evaluatedDescription);
+ view.getMoreDetailForSuggestedConceptsPanel().renderDetailPanel(
+ evaluatedDescription);
view.setGraphicalPanel();
view.getMoreDetailForSuggestedConceptsPanel().repaint();
}
@@ -300,7 +316,10 @@
.getNrOfConcepts()));
CELOE celoe = (CELOE) model.getLearningAlgorithm();
view.getHintPanel().setForeground(Color.RED);
- String moreInformationsMessage = "Learning started. Currently searching class expressions with length between " + celoe.getMinimumHorizontalExpansion() + " and " + celoe.getMaximumHorizontalExpansion() + ".";
+ String moreInformationsMessage = "Learning started. Currently searching class expressions with length between "
+ + celoe.getMinimumHorizontalExpansion()
+ + " and "
+ + celoe.getMaximumHorizontalExpansion() + ".";
view.setHintMessage(moreInformationsMessage);
}
}
@@ -381,7 +400,8 @@
// (ontology, null),
// ((EvaluatedDescriptionClass)
// eval).getAccuracy()*100));
- if (((EvaluatedDescriptionClass) eval).isConsistent()) {
+ if (((EvaluatedDescriptionClass) eval)
+ .isConsistent()) {
dm.add(i, new SuggestListItem(colorGreen,
eval.getDescription()
.toManchesterSyntaxString(
@@ -404,7 +424,7 @@
}
}
}
-
+
view.getSuggestClassPanel().setSuggestList(dm);
view.getLearnerView().repaint();
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-10-08 13:11:27 UTC (rev 1886)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-10-08 13:58:26 UTC (rev 1887)
@@ -104,9 +104,12 @@
private final JPanel addButtonPanel;
private final JLabel wikiPane;
private final ImageIcon toggledIcon;
+ private ImageIcon helpIcon;
private final JTextArea hint;
+ private JButton helpButton;
private final JPanel runPanel;
private final JPanel advancedPanel;
+ private JPanel hintPanel;
private boolean isInconsistent;
// This is the Panel for more details of the suggested concept
private final MoreDetailForSuggestedConceptsPanel detail;
@@ -137,6 +140,7 @@
model = new DLLearnerModel(editorKit, this);
sugPanel = new SuggestClassPanel(model, this);
learnerPanel = new JPanel();
+ hintPanel = new JPanel(new BorderLayout());
learnerPanel.setLayout(new BorderLayout());
learnerScroll = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
action = new ActionHandler(model, this);
@@ -150,6 +154,13 @@
advanced.setVisible(true);
advancedPanel = new JPanel();
run = new JButton();
+ URL helpIconUrl = this.getClass().getResource("Help-16x16.png");
+ helpIcon = new ImageIcon(helpIconUrl);
+ helpButton = new JButton(helpIcon);
+ helpButton.setPreferredSize(new Dimension(20, 20));
+ helpButton.setText("help");
+ helpButton.addActionListener(action);
+ helpButton.setVisible(false);
runPanel = new JPanel(new FlowLayout());
accept = new JButton("ADD");
addButtonPanel = new JPanel(new BorderLayout());
@@ -254,8 +265,11 @@
c.weighty = 0.0;
c.gridx = 0;
c.gridy = 2;
- hint.setPreferredSize(new Dimension(490, 60));
- learner.add(hint, c);
+ hint.setPreferredSize(new Dimension(450, 60));
+ helpButton.setPreferredSize(new Dimension(30, 30));
+ hintPanel.add(BorderLayout.CENTER, hint);
+ hintPanel.add(BorderLayout.EAST, helpButton);
+ learner.add(hintPanel, c);
advancedPanel.add(advanced);
advancedPanel.add(adv);
@@ -311,7 +325,9 @@
learnerScroll.setPreferredSize(new Dimension(SCROLL_WIDTH, SCROLL_HEIGHT));
}
}
-
+ public JButton getHelpButton() {
+ return helpButton;
+ }
/**
* This method enables the GraphicalCoveragePanel after a class expression is
* selected from the list.
@@ -515,6 +531,10 @@
return learnerScroll;
}
+ public void setHelpButtonVisible(boolean isVisible) {
+ helpButton.setVisible(isVisible);
+ }
+
/**
* This method returns the model of the DL-Learner plugin.
* @return model of the plugin
Added: trunk/src/dl-learner/org/dllearner/tools/protege/Help-16x16.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/dl-learner/org/dllearner/tools/protege/Help-16x16.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hee...@us...> - 2009-10-08 16:27:41
|
Revision: 1888
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1888&view=rev
Author: heeroyuy
Date: 2009-10-08 16:27:27 +0000 (Thu, 08 Oct 2009)
Log Message:
-----------
-continued help button with message on a seperate panel
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-08 13:58:26 UTC (rev 1887)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-08 16:27:27 UTC (rev 1888)
@@ -33,6 +33,8 @@
import java.util.concurrent.ExecutionException;
import javax.swing.DefaultListModel;
+import javax.swing.JOptionPane;
+import javax.swing.JTextArea;
import javax.swing.SwingUtilities;
import javax.swing.SwingWorker;
import javax.swing.event.ListDataEvent;
@@ -73,6 +75,8 @@
private final Color colorGreen = new Color(0, 139, 0);
private final DLLearnerView view;
private static final String HELP_BUTTON_STRING = "help";
+ private JTextArea help;
+ private static final String ADVANCED_BUTTON_STRING = "Advanced";
/**
* This is the constructor for the action handler.
@@ -137,7 +141,7 @@
view.setHintMessage(message);
view.setHelpButtonVisible(false);
}
- if (z.getActionCommand().equals("")) {
+ if (z.toString().contains(ADVANCED_BUTTON_STRING)) {
if (!toggled) {
toggled = true;
view.setIconToggled(toggled);
@@ -148,13 +152,21 @@
view.setExamplePanelVisible(toggled);
}
}
- System.out.println(z.getActionCommand());
- if (z.getActionCommand().equals(HELP_BUTTON_STRING)) {
- String helpText = "What does a sentence like 'Learning started. Currently searching class expressions with length between 4 and 7.' mean?"
- + "Length: In Manchester OWL Syntax (the syntax used for class expressions in Protege), we define length simply as the number of words needed to write down the class expression."
- + "The learning algorithm (called CELOE) for suggesting class expressions starts with the most general expression owl:Thing and then further specializes it. Those class expressions, which fit the existing instances of a given class ($currentClass in this case) get a high accuracy and are displayed as suggestions. The learning algorithm prefers short expressions. 'Currently searching class expressions with length between 4 and 7.' means that it has already evaluated all class expressions of length 1 to 3 or excluded them as possible suggestions. All the expressions currently evaluated have length between 4 and 7. If you want to search for longer expressions, then you have to increase the maximum runtime setting (it is set to $defaultRuntime seconds by default)."
+ if (z.toString().contains(HELP_BUTTON_STRING)) {
+ String helpText = "What does a sentence like 'Learning started. Currently searching class expressions with length between 4 and 7.' mean?\n"
+ + "Length: In Manchester OWL Syntax (the syntax used for class expressions in Protege), we define length simply as the number of words\n needed to write down the class expression."
+ + "The learning algorithm (called CELOE) for suggesting class expressions starts with the most general\n expression owl:Thing and then further specializes it. Those class expressions, which fit the existing instances of a given class ($currentClass in this case)\n get a high accuracy and are displayed as suggestions. The learning algorithm prefers short expressions.\n 'Currently searching class expressions with length between 4 and 7.' means that it has already evaluated all class expressions of length 1 to 3\n or excluded them as possible suggestions. All the expressions currently evaluated have length between 4 and 7.\n If you want to search for longer expressions, then you have to increase the maximum runtime setting (it is set to $defaultRuntime seconds by default)\n."
+ "See $wikiPage for more details. ";
- view.getHelpButton().setToolTipText(helpText);
+
+ help = new JTextArea();
+ help.setEditable(false);
+ help.setForeground(Color.black);
+ help.setText(helpText);
+
+ JOptionPane.showMessageDialog(null,
+ help,
+ "Help",
+ JOptionPane.INFORMATION_MESSAGE);
}
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-10-08 13:58:26 UTC (rev 1887)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-10-08 16:27:27 UTC (rev 1888)
@@ -158,7 +158,7 @@
helpIcon = new ImageIcon(helpIconUrl);
helpButton = new JButton(helpIcon);
helpButton.setPreferredSize(new Dimension(20, 20));
- helpButton.setText("help");
+ helpButton.setName("help");
helpButton.addActionListener(action);
helpButton.setVisible(false);
runPanel = new JPanel(new FlowLayout());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hee...@us...> - 2009-10-22 07:21:29
|
Revision: 1892
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1892&view=rev
Author: heeroyuy
Date: 2009-10-22 07:21:21 +0000 (Thu, 22 Oct 2009)
Log Message:
-----------
-code cleanup
-fixed bug
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/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/MoreDetailForSuggestedConceptsPanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java
trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java
trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java
trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java
Added Paths:
-----------
trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-20 10:23:23 UTC (rev 1891)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-22 07:21:21 UTC (rev 1892)
@@ -23,9 +23,6 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
import java.util.List;
import java.util.Set;
import java.util.Timer;
@@ -37,10 +34,7 @@
import javax.swing.JTextArea;
import javax.swing.SwingUtilities;
import javax.swing.SwingWorker;
-import javax.swing.event.ListDataEvent;
-import javax.swing.event.ListDataListener;
import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
import org.dllearner.algorithms.celoe.CELOE;
import org.dllearner.core.EvaluatedDescription;
@@ -54,8 +48,7 @@
* @author Christian Koetteritzsch
*
*/
-public class ActionHandler implements ActionListener, ItemListener,
- MouseListener, ListSelectionListener, ListDataListener {
+public class ActionHandler implements ActionListener {
// This is the DLLearnerModel.
@@ -122,8 +115,6 @@
view.setHintMessage(moreInformationsMessage);
retriever = new SuggestionRetriever();
retriever.execute();
- // model.setCurrentConcept(null);
-
}
if (z.getActionCommand().equals("ADD")) {
@@ -154,19 +145,21 @@
}
if (z.toString().contains(HELP_BUTTON_STRING)) {
String helpText = "What does a sentence like 'Learning started. Currently searching class expressions with length between 4 and 7.' mean?\n"
- + "Length: In Manchester OWL Syntax (the syntax used for class expressions in Protege), we define length simply as the number of words\n needed to write down the class expression."
- + "The learning algorithm (called CELOE) for suggesting class expressions starts with the most general\n expression owl:Thing and then further specializes it. Those class expressions, which fit the existing instances of a given class ($currentClass in this case)\n get a high accuracy and are displayed as suggestions. The learning algorithm prefers short expressions.\n 'Currently searching class expressions with length between 4 and 7.' means that it has already evaluated all class expressions of length 1 to 3\n or excluded them as possible suggestions. All the expressions currently evaluated have length between 4 and 7.\n If you want to search for longer expressions, then you have to increase the maximum runtime setting (it is set to $defaultRuntime seconds by default)\n."
- + "See $wikiPage for more details. ";
-
+ + "Length: In Manchester OWL Syntax (the syntax used for class expressions in Protege), we define length simply as the number of words needed to write down the class expression.\n\n"
+ + "The learning algorithm (called CELOE) for suggesting class expressions starts with the most general expression owl:Thing and then further specializes it.\n"
+ + "Those class expressions, which fit the existing instances of a given class ($currentClass in this case) get a high accuracy and are displayed as suggestions.\n"
+ + "The learning algorithm prefers short expressions. 'Currently searching class expressions with length between 4 and 7.' means that it has already evaluated all class expressions of length 1 to 3\n"
+ + "or excluded them as possible suggestions. All the expressions currently evaluated have length between 4 and 7. If you want to search for longer expressions, then you have to increase\n"
+ + "the maximum runtime setting (it is set to $defaultRuntime seconds by default).\n\n"
+ + "See http://dl-learner.org/wiki/ProtegePlugin for more details. ";
+
help = new JTextArea();
help.setEditable(false);
help.setForeground(Color.black);
help.setText(helpText);
- JOptionPane.showMessageDialog(null,
- help,
- "Help",
- JOptionPane.INFORMATION_MESSAGE);
+ JOptionPane.showMessageDialog(null, help, "Help",
+ JOptionPane.INFORMATION_MESSAGE);
}
}
@@ -190,84 +183,8 @@
}
- /**
- * Nothing happens here.
- *
- * @param m
- * MouseEvent
- */
- public void mouseReleased(MouseEvent m) {
- }
-
/**
- * Nothing happens here.
- *
- * @param m
- * MouseEvent
- */
- public void mouseEntered(MouseEvent m) {
-
- }
-
- /**
- * Choses the right EvaluatedDescription object after a concept is chosen in
- * the list.
- *
- * @param m
- * MouseEvent
- */
- public void mouseClicked(MouseEvent m) {
- if (view.getSuggestClassPanel().getSuggestList().getSelectedValue() != null) {
- SuggestListItem item = (SuggestListItem) view
- .getSuggestClassPanel().getSuggestList().getSelectedValue();
- String desc = item.getValue();
- if (model.getEvaluatedDescriptionList() != null) {
- List<? extends EvaluatedDescription> evalList = model
- .getEvaluatedDescriptionList();
- Set<String> onto = model.getOntologyURIString();
- for (EvaluatedDescription eDescription : evalList) {
- for (String ont : onto) {
- if (desc.equals(eDescription.getDescription()
- .toManchesterSyntaxString(ont, null))) {
- evaluatedDescription = eDescription;
- break;
- }
- }
- }
- }
- view.getMoreDetailForSuggestedConceptsPanel().renderDetailPanel(
- evaluatedDescription);
- view.setGraphicalPanel();
- view.getMoreDetailForSuggestedConceptsPanel().repaint();
- }
- }
-
- /**
- * Nothing happens here.
- *
- * @param m
- * MouseEvent
- */
- public void mouseExited(MouseEvent m) {
-
- }
-
- /**
- * Sets the ADD button enable after a concept is chosen.
- *
- * @param m
- * MouseEvent
- */
- public void mousePressed(MouseEvent m) {
- if (view.getSuggestClassPanel().getSuggestList().getSelectedValue() != null) {
- if (!view.getAddButton().isEnabled()) {
- view.getAddButton().setEnabled(true);
- }
- }
- }
-
- /**
* Destroys the Thread after the Pluigin is closed.
*/
public void destroyDLLearnerThread() {
@@ -281,24 +198,6 @@
toggled = false;
}
- @Override
- public void contentsChanged(ListDataEvent listEvent) {
- System.out.println(listEvent);
-
- }
-
- @Override
- public void intervalAdded(ListDataEvent listEvent) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void intervalRemoved(ListDataEvent listEvent) {
- // TODO Auto-generated method stub
-
- }
-
/**
* Inner Class that retrieves the concepts given by the DL-Learner.
*
@@ -389,9 +288,24 @@
for (List<? extends EvaluatedDescription> list : resultLists) {
updateList(list);
+ this.checkSelectedItem(list);
}
}
-
+ /*
+ * TODO: ueberlegen wegen umsetzung.
+ */
+ private void checkSelectedItem(List<? extends EvaluatedDescription> result) {
+ if(!view.getSuggestClassPanel().getSuggestList().isSelectionEmpty()) {
+ SuggestListItem item = (SuggestListItem) view.getSuggestClassPanel().getSuggestList().getSelectedValue();
+ String itemString = item.getValue();
+ for(EvaluatedDescription desc: result) {
+ if(desc.getDescription().toString().equals(itemString)) {
+
+ }
+ }
+ }
+ }
+
private void updateList(
final List<? extends EvaluatedDescription> result) {
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-10-20 10:23:23 UTC (rev 1891)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-10-22 07:21:21 UTC (rev 1892)
@@ -549,6 +549,12 @@
public boolean getIsKnowledgeSourceIsUpdated() {
return knowledgeSourceIsUpdated;
}
+
+ /*
+ * TODO Add methods to get additional informations about a individual.
+ * Informations needed are the ones in the Individuals tab in protege.
+ */
+
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-10-20 10:23:23 UTC (rev 1891)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-10-22 07:21:21 UTC (rev 1892)
@@ -40,6 +40,7 @@
import javax.swing.JToggleButton;
import org.dllearner.algorithms.celoe.CELOE;
+//import org.dllearner.tools.ore.ui.StatusBar;
import org.protege.editor.owl.OWLEditorKit;
import org.semanticweb.owl.model.OWLDescription;
/**
@@ -126,6 +127,8 @@
private boolean toogled = false;
private String labels;
private int individualSize;
+ private SuggestClassPanelHandler sugPanelHandler;
+ //private StatusBar stat;
/**
* The constructor for the DL-Learner tab in the class description
@@ -140,7 +143,7 @@
model = new DLLearnerModel(editorKit, this);
sugPanel = new SuggestClassPanel(model, this);
learnerPanel = new JPanel();
- hintPanel = new JPanel(new BorderLayout());
+ hintPanel = new JPanel(new FlowLayout());
learnerPanel.setLayout(new BorderLayout());
learnerScroll = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
action = new ActionHandler(model, this);
@@ -160,11 +163,10 @@
helpButton.setPreferredSize(new Dimension(20, 20));
helpButton.setName("help");
helpButton.addActionListener(action);
- helpButton.setVisible(false);
runPanel = new JPanel(new FlowLayout());
accept = new JButton("ADD");
addButtonPanel = new JPanel(new BorderLayout());
- sugPanel.addSuggestPanelMouseListener(action);
+
errorMessage = new JTextArea();
errorMessage.setEditable(false);
hint = new JTextArea();
@@ -181,6 +183,9 @@
learnerScroll.getVerticalScrollBar().setUnitIncrement(SCROLL_SPEED);
posPanel = new PosAndNegSelectPanel(model, action);
detail = new MoreDetailForSuggestedConceptsPanel(model);
+ sugPanelHandler = new SuggestClassPanelHandler(this, model);
+ sugPanel.addSuggestPanelMouseListener(sugPanelHandler);
+ sugPanel.getSuggestList().addListSelectionListener(sugPanelHandler);
this.addAcceptButtonListener(this.action);
this.addRunButtonListener(this.action);
this.addAdvancedButtonListener(this.action);
@@ -208,6 +213,10 @@
*/
public void makeView(String label) {
run.setEnabled(false);
+ //stat = new StatusBar();
+ helpButton.setVisible(false);
+ hint.setForeground(Color.BLACK);
+ hint.setText("To get suggestions for class expression, please click the button above.");
String currentConcept = editorKit.getOWLWorkspace().getOWLSelectionModel().getLastSelectedClass().toString();
if(!labels.equals(currentConcept) || individualSize != editorKit.getModelManager().getActiveOntology().getIndividualAxioms().size()) {
if(individualSize != editorKit.getModelManager().getActiveOntology().getIndividualAxioms().size()) {
@@ -304,7 +313,6 @@
learnerScroll.setViewportView(learner);
this.renderErrorMessage("");
this.getSuggestClassPanel().getSuggestModel().clear();
- this.getSuggestClassPanel().repaint();
}
@@ -336,7 +344,6 @@
GridBagConstraints c = new GridBagConstraints();
learner.remove(posPanel);
learner.remove(advancedPanel);
- //learner.removeAll();
detail.setVisible(true);
c.fill = GridBagConstraints.NONE;
@@ -365,7 +372,6 @@
learnerScroll.setPreferredSize(new Dimension(SCROLL_WIDTH, SCROLL_HEIGHT));
learnerScroll.setViewportView(learner);
- learnerScroll.repaint();
}
/**
* This Method changes the hint message.
@@ -389,7 +395,7 @@
*/
public void setExamplePanelVisible(boolean visible) {
posPanel.setVisible(visible);
- detail.repaint();
+ //detail.repaint();
}
/**
@@ -515,12 +521,8 @@
message ="\nTo view details about why a class expression was suggested, please click on it.";
}
run.setEnabled(true);
- // start the algorithm and print the best concept found
- //renderErrorMessage(error);
- //hint.setForeground(Color.BLACK);
+ // start the algorithm and print the best concept found;
hint.append(message);
- hint.repaint();
- //setHintMessage(message);
}
/**
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-10-20 10:23:23 UTC (rev 1891)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-10-22 07:21:21 UTC (rev 1892)
@@ -110,7 +110,6 @@
eval = desc;
model = m;
panel = p;
- this.repaint();
id = model.getID();
darkGreen = new Color(0, 100, 0);
darkRed = new Color(205, 0, 0);
@@ -373,14 +372,12 @@
g2D.drawString("cover the same instances.", 95, 220);
}
this.setVisible(true);
- panel.repaint();
}
}
private void computeGraphics() {
if (eval != null) {
this.setVisible(true);
- panel.repaint();
additionalIndividualSize = ((EvaluatedDescriptionClass) eval)
.getAdditionalInstances().size();
distortionOld = 0;
@@ -733,4 +730,5 @@
public EvaluatedDescription getEvaluateddescription() {
return eval;
}
+
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java 2009-10-20 10:23:23 UTC (rev 1891)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java 2009-10-22 07:21:21 UTC (rev 1892)
@@ -77,7 +77,6 @@
@Override
public void mouseMoved(MouseEvent m) {
- panel.getMoreDetailForSuggestedConceptsPanel().repaint();
if (m.getX() >= panel.getX1() + panel.getShiftCovered()
&& m.getX() <= panel.getX2() + panel.getShiftCovered()
&& m.getY() >= panel.getY1() && m.getY() <= panel.getY2()
@@ -109,8 +108,6 @@
@Override
public void propertyChange(PropertyChangeEvent arg0) {
- panel.getMoreDetailForSuggestedConceptsPanel().repaint();
- panel.repaint();
}
@Override
@@ -121,7 +118,6 @@
&& arg0.getY() >= panel.getY1()
&& arg0.getY() <= panel.getY2()) {
- // panel.getMoreDetailForSuggestedConceptsPanel().repaint();
individualComboBox.clear();
Set<Individual> covInd = ((EvaluatedDescriptionClass) description)
@@ -140,7 +136,6 @@
scrollPopup = new BasicComboPopup(indiBox);
scrollPopup.setAutoscrolls(true);
scrollPopup.show(panel, arg0.getX(), arg0.getY());
- // panel.getMoreDetailForSuggestedConceptsPanel().repaint();
}
}
@@ -158,7 +153,6 @@
&& arg0.getY() <= panel.getY2()
+ panel.getShiftNewConcept()) {
- // panel.getMoreDetailForSuggestedConceptsPanel().repaint();
individualComboBox.clear();
Set<Individual> addInd = ((EvaluatedDescriptionClass) description)
.getAdditionalInstances();
@@ -176,7 +170,6 @@
scrollPopup = new BasicComboPopup(indiBox);
scrollPopup.setAutoscrolls(true);
scrollPopup.show(panel, arg0.getX(), arg0.getY());
- // panel.getMoreDetailForSuggestedConceptsPanel().repaint();
}
}
@@ -186,7 +179,6 @@
&& arg0.getY() >= panel.getY1()
&& arg0.getY() <= panel.getY2()) {
- // panel.getMoreDetailForSuggestedConceptsPanel().repaint();
individualComboBox.clear();
Set<Individual> notCovInd = model.getReasoner().getIndividuals(
model.getCurrentConcept());
@@ -206,7 +198,6 @@
scrollPopup = new BasicComboPopup(indiBox);
scrollPopup.setAutoscrolls(true);
scrollPopup.show(panel, arg0.getX(), arg0.getY());
- // panel.getMoreDetailForSuggestedConceptsPanel().repaint();
}
}
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/IndividualObject.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/IndividualObject.java 2009-10-20 10:23:23 UTC (rev 1891)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/IndividualObject.java 2009-10-22 07:21:21 UTC (rev 1892)
@@ -27,6 +27,7 @@
private final String normalIndividual;
private boolean isPos;
+ private String additionalInformation;
/**
* Constructor for the IndividualObject.
@@ -61,5 +62,13 @@
public void setExamplePositive(boolean pos) {
isPos = pos;
}
+
+ public void setAdditionalInformation(String additional) {
+ this.additionalInformation = additional;
+ }
+
+ public String getAdditionalInformation() {
+ return additionalInformation;
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-10-20 10:23:23 UTC (rev 1891)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-10-22 07:21:21 UTC (rev 1892)
@@ -121,11 +121,8 @@
conceptPanel.add(conceptText);
conceptPanel.add(accuracyText);
conceptPanel.setVisible(true);
- //this.add(conceptPanel);
this.add(p);
this.addPropertyChangeListener(handler);
- //conceptPanel.addPropertyChangeListener(handler);
- this.repaint();
}
private void unsetEverything() {
@@ -191,7 +188,5 @@
conceptPanel.add(accuracyText);
conceptPanel.setVisible(false);
this.add(conceptPanel);
-
- repaint();
}
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java 2009-10-20 10:23:23 UTC (rev 1891)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java 2009-10-22 07:21:21 UTC (rev 1892)
@@ -40,7 +40,6 @@
@Override
public void propertyChange(PropertyChangeEvent arg0) {
panel.setInformation();
- panel.repaint();
}
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-10-20 10:23:23 UTC (rev 1891)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-10-22 07:21:21 UTC (rev 1892)
@@ -191,51 +191,97 @@
return nrOfConcepts.getValue();
}
+ /**
+ *
+ * @return
+ */
public JRadioButton getOwlRadioButton() {
return owlRadioButton;
}
+ /**
+ *
+ * @return
+ */
public JRadioButton getElProfileButton() {
return elProfileButton;
}
+ /**
+ *
+ * @return
+ */
public boolean getAllBox() {
return allBox.isSelected();
}
+ /**
+ *
+ * @return
+ */
public boolean getSomeBox() {
return someBox.isSelected();
}
+ /**
+ *
+ * @return
+ */
public boolean getNotBox() {
return notBox.isSelected();
}
+ /**
+ *
+ * @return
+ */
public boolean getValueBox() {
return valueBox.isSelected();
}
+ /**
+ *
+ * @return
+ */
public JPanel getProfilePanel() {
return profilePanel;
}
-
+ /**
+ *
+ * @return
+ */
public int getCountMoreBox() {
return Integer.parseInt(countMoreBox.getSelectedItem().toString());
}
+ /**
+ *
+ * @return
+ */
public boolean getMoreBox() {
return moreBox.isSelected();
}
+ /**
+ *
+ * @return
+ */
public JPanel getRadioBoxPanel() {
return radioBoxPanel;
}
+ /**
+ *
+ * @return
+ */
public JPanel getCheckBoxPanel() {
return checkBoxPanel;
}
+ /**
+ *
+ */
public void setToOWLProfile() {
allBox.setSelected(true);
someBox.setSelected(true);
@@ -245,6 +291,9 @@
this.setCountMoreBoxEnabled(true);
}
+ /**
+ *
+ */
public void setToELProfile() {
allBox.setSelected(false);
someBox.setSelected(true);
@@ -254,6 +303,10 @@
this.setCountMoreBoxEnabled(false);
}
+ /**
+ *
+ * @param isEnabled
+ */
public void setCountMoreBoxEnabled(boolean isEnabled) {
countMoreBox.setEnabled(isEnabled);
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java 2009-10-20 10:23:23 UTC (rev 1891)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java 2009-10-22 07:21:21 UTC (rev 1892)
@@ -1,3 +1,22 @@
+/**
+ * Copyright (C) 2007-2009, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ *
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
package org.dllearner.tools.protege;
import java.awt.event.ItemEvent;
@@ -3,4 +22,9 @@
import java.awt.event.ItemListener;
+/**
+ * This class handles the all actions in the option panel.
+ * @author Christian Koetteritzsch
+ *
+ */
public class OptionPanelHandler implements ItemListener {
@@ -11,12 +35,20 @@
private OptionPanel option;
+ /**
+ * This is the Constructor of the class.
+ * @param o Option Panel
+ */
public OptionPanelHandler(OptionPanel o) {
this.option = o;
}
@Override
+ /**
+ * This method handles the actions to be taken if a
+ * radio button is selected/deselected.
+ */
public void itemStateChanged(ItemEvent e) {
if (e.toString().contains(OWL_RADIO_STRING)) {
if (option.getOwlRadioButton().isSelected()) {
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java 2009-10-20 10:23:23 UTC (rev 1891)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java 2009-10-22 07:21:21 UTC (rev 1892)
@@ -60,7 +60,7 @@
@Override
public boolean isValidInput() {
view.getSuggestClassPanel().getSuggestModel().clear();
- view.getSuggestClassPanel().repaint();
+ //view.getSuggestClassPanel().repaint();
if(this.getAxiomType().toString().equals(EQUIVALENT_CLASS_STRING)) {
view.makeView("equivalent class");
} else if(this.getAxiomType().toString().equals(SUPERCLASS_STRING)) {
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2009-10-20 10:23:23 UTC (rev 1891)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2009-10-22 07:21:21 UTC (rev 1892)
@@ -118,8 +118,6 @@
model
.getCurrentlySelectedClassDescription(i));
view.setGraphicalPanel();
- view.getMoreDetailForSuggestedConceptsPanel()
- .repaint();
}
}
@@ -129,8 +127,6 @@
}
}
}
- descriptions.repaint();
- repaint();
}
/**
@@ -148,9 +144,8 @@
* @param action
* ActionHandler
*/
- public void addSuggestPanelMouseListener(ActionHandler action) {
- descriptions.addMouseListener(action);
-
+ public void addSuggestPanelMouseListener(SuggestClassPanelHandler handle) {
+ descriptions.addMouseListener(handle);
}
/**
Added: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java 2009-10-22 07:21:21 UTC (rev 1892)
@@ -0,0 +1,128 @@
+/**
+ * Copyright (C) 2007-2009, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ *
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.dllearner.tools.protege;
+
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.util.List;
+import java.util.Set;
+
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import org.dllearner.core.EvaluatedDescription;
+/**
+ * This is the MouseListener for the Suggest Panel.
+ * @author Christian Koetteritzsch
+ *
+ */
+public class SuggestClassPanelHandler implements MouseListener, ListSelectionListener{
+ private DLLearnerView view;
+ private DLLearnerModel model;
+ private EvaluatedDescription evaluatedDescription;
+
+ /**
+ * This is the constructor for the SuggestClassPanelHandler.
+ * @param v DLLearnerView
+ * @param m DLLearnerModel
+ */
+ public SuggestClassPanelHandler(DLLearnerView v, DLLearnerModel m) {
+ this.view = v;
+ this.model = m;
+ }
+
+
+ @Override
+ /**
+ *
+ */
+ public void mouseClicked(MouseEvent e) {
+ if (view.getSuggestClassPanel().getSuggestList().getSelectedValue() != null) {
+ SuggestListItem item = (SuggestListItem) view
+ .getSuggestClassPanel().getSuggestList().getSelectedValue();
+ String desc = item.getValue();
+ if (model.getEvaluatedDescriptionList() != null) {
+ List<? extends EvaluatedDescription> evalList = model
+ .getEvaluatedDescriptionList();
+ Set<String> onto = model.getOntologyURIString();
+ for (EvaluatedDescription eDescription : evalList) {
+ for (String ont : onto) {
+ if (desc.equals(eDescription.getDescription()
+ .toManchesterSyntaxString(ont, null))) {
+ evaluatedDescription = eDescription;
+ break;
+ }
+ }
+ }
+ }
+ view.getSuggestClassPanel().getSuggestModel().indexOf(item);
+ view.getMoreDetailForSuggestedConceptsPanel().renderDetailPanel(evaluatedDescription);
+ view.setGraphicalPanel();
+ }
+ }
+
+ @Override
+ /**
+ * Nothing happens here.
+ */
+ public void mouseEntered(MouseEvent e) {
+
+ }
+
+ @Override
+ /**
+ * Nothing happens here.
+ */
+ public void mouseExited(MouseEvent e) {
+
+ }
+
+ @Override
+ /**
+ *
+ */
+ public void mousePressed(MouseEvent e) {
+ if (view.getSuggestClassPanel().getSuggestList().getSelectedValue() != null) {
+ if (!view.getAddButton().isEnabled()) {
+ view.getAddButton().setEnabled(true);
+ }
+ }
+ }
+
+ @Override
+ /**
+ * Nothing happens here.
+ */
+ public void mouseReleased(MouseEvent e) {
+
+ }
+
+
+ @Override
+ /*
+ * TODO: Ueberlegen wie ich das mit dem selektierten Objekt umsetze
+ */
+ public void valueChanged(ListSelectionEvent e) {
+ Object selectedObject = view.getSuggestClassPanel().getSuggestList().getSelectedValue();
+
+ view.getSuggestClassPanel().getSuggestList().setSelectedValue(selectedObject, true);
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hee...@us...> - 2009-10-26 10:59:34
|
Revision: 1893
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1893&view=rev
Author: heeroyuy
Date: 2009-10-26 10:59:25 +0000 (Mon, 26 Oct 2009)
Log Message:
-----------
-start to add a progress bar in the main panel
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
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-22 07:21:21 UTC (rev 1892)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-26 10:59:25 UTC (rev 1893)
@@ -216,6 +216,7 @@
protected List<? extends EvaluatedDescription> doInBackground()
throws Exception {
la = model.getLearningAlgorithm();
+ view.startStatusBar();
timer = new Timer();
timer.schedule(new TimerTask() {
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-10-22 07:21:21 UTC (rev 1892)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-10-26 10:59:25 UTC (rev 1893)
@@ -313,6 +313,9 @@
cm.applyConfigEntry(la, "maxExecutionTimeInSeconds", view
.getPosAndNegSelectPanel().getOptionPanel()
.getMaxExecutionTime());
+ view.setLearningDuration(view
+ .getPosAndNegSelectPanel().getOptionPanel()
+ .getMaxExecutionTime());
try {
// initializes the learning algorithm
la.init();
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-10-22 07:21:21 UTC (rev 1892)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-10-26 10:59:25 UTC (rev 1893)
@@ -40,7 +40,7 @@
import javax.swing.JToggleButton;
import org.dllearner.algorithms.celoe.CELOE;
-//import org.dllearner.tools.ore.ui.StatusBar;
+import org.dllearner.tools.ore.ui.StatusBar;
import org.protege.editor.owl.OWLEditorKit;
import org.semanticweb.owl.model.OWLDescription;
/**
@@ -128,7 +128,7 @@
private String labels;
private int individualSize;
private SuggestClassPanelHandler sugPanelHandler;
- //private StatusBar stat;
+ private StatusBar stat;
/**
* The constructor for the DL-Learner tab in the class description
@@ -166,7 +166,7 @@
runPanel = new JPanel(new FlowLayout());
accept = new JButton("ADD");
addButtonPanel = new JPanel(new BorderLayout());
-
+ stat = new StatusBar();
errorMessage = new JTextArea();
errorMessage.setEditable(false);
hint = new JTextArea();
@@ -213,7 +213,7 @@
*/
public void makeView(String label) {
run.setEnabled(false);
- //stat = new StatusBar();
+
helpButton.setVisible(false);
hint.setForeground(Color.BLACK);
hint.setText("To get suggestions for class expression, please click the button above.");
@@ -269,11 +269,18 @@
addButtonPanel.add("North", accept);
learner.add(addButtonPanel, c);
+ c.fill = GridBagConstraints.WEST;
+ c.weightx = 0.0;
+ c.weighty = 0.0;
+ c.gridx = 0;
+ c.gridy = 2;
+ learner.add(stat, c);
+
c.fill = GridBagConstraints.BOTH;
c.weightx = 0.0;
c.weighty = 0.0;
c.gridx = 0;
- c.gridy = 2;
+ c.gridy = 3;
hint.setPreferredSize(new Dimension(450, 60));
helpButton.setPreferredSize(new Dimension(30, 30));
hintPanel.add(BorderLayout.CENTER, hint);
@@ -288,13 +295,13 @@
c.gridx = 0;
c.weightx = 0.0;
c.weighty = 0.0;
- c.gridy = 3;
+ c.gridy = 4;
learner.add(advancedPanel, c);
posPanel.setVisible(false);
c.fill = GridBagConstraints.BOTH;
c.gridx = 0;
- c.gridy = 4;
+ c.gridy = 5;
c.weightx = 0.0;
c.weighty = 0.0;
c.gridwidth = 3;
@@ -510,6 +517,7 @@
* This method sets the run button enable after learning.
*/
public void algorithmTerminated() {
+ this.stopStatusBar();
CELOE celoe = (CELOE) model.getLearningAlgorithm();
String error = "Learning successful. Currently searching class expressions with length between " + celoe.getMinimumHorizontalExpansion() + " and " + celoe.getMaximumHorizontalExpansion() + ".";
hint.setForeground(Color.RED);
@@ -552,4 +560,16 @@
public ReadingOntologyThread getReadingOntologyThread() {
return readThread;
}
+
+ public void setLearningDuration(int time) {
+ stat.setMaximumValue(time);
+ }
+
+ public void startStatusBar() {
+ stat.showProgress(true);
+ }
+
+ public void stopStatusBar() {
+ stat.showProgress(false);
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hee...@us...> - 2009-10-27 08:49:02
|
Revision: 1894
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1894&view=rev
Author: heeroyuy
Date: 2009-10-27 08:48:54 +0000 (Tue, 27 Oct 2009)
Log Message:
-----------
-finished implementing a status bar
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/ReadingOntologyThread.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-26 10:59:25 UTC (rev 1893)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-27 08:48:54 UTC (rev 1894)
@@ -114,6 +114,7 @@
view.setHelpButtonVisible(true);
view.setHintMessage(moreInformationsMessage);
retriever = new SuggestionRetriever();
+ retriever.addPropertyChangeListener(view.getStatusBar());
retriever.execute();
}
@@ -215,13 +216,15 @@
@Override
protected List<? extends EvaluatedDescription> doInBackground()
throws Exception {
+ setProgress(0);
la = model.getLearningAlgorithm();
- view.startStatusBar();
+ view.getStatusBar().setMaximumValue(view.getPosAndNegSelectPanel().getOptionPanel().getMaxExecutionTime());
timer = new Timer();
timer.schedule(new TimerTask() {
-
+ int progress = 0;
@Override
public void run() {
+ progress += 1;setProgress(progress);
if (la != null) {
publish(la.getCurrentlyBestEvaluatedDescriptions(view
.getPosAndNegSelectPanel().getOptionPanel()
@@ -236,7 +239,7 @@
}
}
- }, 0, 500);
+ }, 1000, 1000);
dlLearner = new Thread(new Runnable() {
@@ -270,6 +273,7 @@
public void done() {
timer.cancel();
+
List<? extends EvaluatedDescription> result = null;
try {
result = get();
@@ -278,9 +282,13 @@
} catch (ExecutionException e) {
e.printStackTrace();
}
- view.algorithmTerminated();
+ setProgress(0);
+ view.stopStatusBar();
+ //view.algorithmTerminated();
updateList(result);
view.algorithmTerminated();
+
+
}
@Override
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-10-26 10:59:25 UTC (rev 1893)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-10-27 08:48:54 UTC (rev 1894)
@@ -572,4 +572,8 @@
public void stopStatusBar() {
stat.showProgress(false);
}
+
+ public StatusBar getStatusBar() {
+ return stat;
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-10-26 10:59:25 UTC (rev 1893)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-10-27 08:48:54 UTC (rev 1894)
@@ -61,6 +61,8 @@
this.editor = editorKit;
this.view = v;
this.model = m;
+ //TODO: mehr informationen fuer grafische anzeige herraussuchen.
+ //editor.getOWLModelManager().getActiveOntology().getIndividualAxioms();
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <hee...@us...> - 2009-10-28 11:03:33
|
Revision: 1897
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1897&view=rev
Author: heeroyuy
Date: 2009-10-28 11:03:23 +0000 (Wed, 28 Oct 2009)
Log Message:
-----------
-code cleanup
-add javadoc
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/GraphicalCoveragePanelHandler.java
trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java
trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java
trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java
trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-28 10:07:09 UTC (rev 1896)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-28 11:03:23 UTC (rev 1897)
@@ -22,7 +22,6 @@
import java.awt.Color;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
import java.util.List;
import java.util.Set;
import java.util.Timer;
@@ -34,7 +33,6 @@
import javax.swing.JTextArea;
import javax.swing.SwingUtilities;
import javax.swing.SwingWorker;
-import javax.swing.event.ListSelectionEvent;
import org.dllearner.algorithms.celoe.CELOE;
import org.dllearner.core.EvaluatedDescription;
@@ -165,34 +163,6 @@
}
/**
- * select/deselect the Check boxes.
- *
- * @param i
- * ItemEvent
- */
- public void itemStateChanged(ItemEvent i) {
-
- }
-
- /**
- * Nothing happens here.
- *
- * @param e
- * ListSelectionEvent
- */
- public void valueChanged(ListSelectionEvent e) {
-
- }
-
-
- /**
- * Destroys the Thread after the Pluigin is closed.
- */
- public void destroyDLLearnerThread() {
- // dlLearner = null;
- }
-
- /**
* Resets the toggled Button after the plugin is closed.
*/
public void resetToggled() {
@@ -258,7 +228,6 @@
try {
dlLearner.join();
} catch (InterruptedException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
List<? extends EvaluatedDescription> result = la
@@ -284,7 +253,6 @@
}
setProgress(0);
view.stopStatusBar();
- //view.algorithmTerminated();
updateList(result);
view.algorithmTerminated();
@@ -297,23 +265,8 @@
for (List<? extends EvaluatedDescription> list : resultLists) {
updateList(list);
- this.checkSelectedItem(list);
}
}
- /*
- * TODO: ueberlegen wegen umsetzung.
- */
- private void checkSelectedItem(List<? extends EvaluatedDescription> result) {
- if(!view.getSuggestClassPanel().getSuggestList().isSelectionEmpty()) {
- SuggestListItem item = (SuggestListItem) view.getSuggestClassPanel().getSuggestList().getSelectedValue();
- String itemString = item.getValue();
- for(EvaluatedDescription desc: result) {
- if(desc.getDescription().toString().equals(itemString)) {
-
- }
- }
- }
- }
private void updateList(
final List<? extends EvaluatedDescription> result) {
@@ -329,12 +282,6 @@
for (String ontology : ont) {
if (eval.getDescription().toString().contains(
ontology)) {
- // dm.add(i, new SuggestListItem(colorGreen,
- // eval
- // .getDescription().toManchesterSyntaxString
- // (ontology, null),
- // ((EvaluatedDescriptionClass)
- // eval).getAccuracy()*100));
if (((EvaluatedDescriptionClass) eval)
.isConsistent()) {
dm.add(i, new SuggestListItem(colorGreen,
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-10-28 10:07:09 UTC (rev 1896)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-10-28 11:03:23 UTC (rev 1897)
@@ -234,7 +234,6 @@
isReasonerSet = true;
}catch (ComponentInitException e) {
view.setIsInconsistent(true);
- //e.printStackTrace();
} catch (InconsistentOntologyException incon) {
view.setIsInconsistent(true);
}
@@ -266,7 +265,6 @@
try {
currentConceptURL = new URL(currentConcept.toString());
} catch (MalformedURLException e1) {
- // TODO Auto-generated catch block
String error = "Cannot convert to URL.";
view.renderErrorMessage(error);
e1.printStackTrace();
@@ -297,25 +295,30 @@
this.la = cm.learningAlgorithm(CELOE.class, lp,
reasoner);
} catch (LearningProblemUnsupportedException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
+
+ //Config options set in the gui.
+ //config option if all is used for suggestions
cm.applyConfigEntry(la, "useAllConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getAllBox());
+ //config option if exists is used for suggestions
cm.applyConfigEntry(la, "useExistsConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getSomeBox());
+ //config option if hasValue is used for suggestions
cm.applyConfigEntry(la, "useHasValueConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getValueBox());
+ //config option if negation is used for suggestions
cm.applyConfigEntry(la, "useNegation", view.getPosAndNegSelectPanel().getOptionPanel().getNotBox());
+ //config option if cardinalitylimits is used for suggestions
cm.applyConfigEntry(la, "useCardinalityRestrictions", view.getPosAndNegSelectPanel().getOptionPanel().getMoreBox());
if(view.getPosAndNegSelectPanel().getOptionPanel().getMoreBox()) {
+ //config option to set the cardinalityrestrictions
cm.applyConfigEntry(la, "cardinalityLimit", view.getPosAndNegSelectPanel().getOptionPanel().getCountMoreBox());
}
-
+ //config option to set the noise
cm.applyConfigEntry(la, "noisePercentage", view.getPosAndNegSelectPanel().getOptionPanel().getMinAccuracy());
+ //config option to set the maximum execution time
cm.applyConfigEntry(la, "maxExecutionTimeInSeconds", view
.getPosAndNegSelectPanel().getOptionPanel()
.getMaxExecutionTime());
- view.setLearningDuration(view
- .getPosAndNegSelectPanel().getOptionPanel()
- .getMaxExecutionTime());
try {
// initializes the learning algorithm
la.init();
@@ -545,18 +548,22 @@
return evalDescriptions.get(index);
}
+ /**
+ * This methode sets if the knowledge source is updated or not.
+ * @param isUpdated boolean if knowledge sourec is updated
+ */
public void setKnowledgeSourceIsUpdated(boolean isUpdated) {
knowledgeSourceIsUpdated = isUpdated;
}
+ /**
+ * This methode returns a boolean if the knowledge
+ * source is updated.
+ * @return boolean if knowledge source is updated
+ */
public boolean getIsKnowledgeSourceIsUpdated() {
return knowledgeSourceIsUpdated;
}
-
- 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-28 10:07:09 UTC (rev 1896)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-10-28 11:03:23 UTC (rev 1897)
@@ -340,6 +340,10 @@
learnerScroll.setPreferredSize(new Dimension(SCROLL_WIDTH, SCROLL_HEIGHT));
}
}
+ /**
+ * This methode returns the help button.
+ * @return help button
+ */
public JButton getHelpButton() {
return helpButton;
}
@@ -402,7 +406,6 @@
*/
public void setExamplePanelVisible(boolean visible) {
posPanel.setVisible(visible);
- //detail.repaint();
}
/**
@@ -448,7 +451,6 @@
public void unsetEverything() {
run.setEnabled(true);
model.getNewOWLDescription().clear();
- action.destroyDLLearnerThread();
errorMessage.setText("");
learner.removeAll();
}
@@ -485,6 +487,10 @@
this.isInconsistent = isIncon;
}
+ /**
+ * This methode returns if the ontology is inconsistent.
+ * @return boolean if ontology is inconsistent
+ */
public boolean getIsInconsistent() {
return isInconsistent;
}
@@ -517,7 +523,6 @@
* This method sets the run button enable after learning.
*/
public void algorithmTerminated() {
- this.stopStatusBar();
CELOE celoe = (CELOE) model.getLearningAlgorithm();
String error = "Learning successful. Currently searching class expressions with length between " + celoe.getMinimumHorizontalExpansion() + " and " + celoe.getMaximumHorizontalExpansion() + ".";
hint.setForeground(Color.RED);
@@ -541,6 +546,10 @@
return learnerScroll;
}
+ /**
+ * This methode sets the help button visible.
+ * @param isVisible boolean if help button is visible
+ */
public void setHelpButtonVisible(boolean isVisible) {
helpButton.setVisible(isVisible);
}
@@ -561,18 +570,24 @@
return readThread;
}
- public void setLearningDuration(int time) {
- stat.setMaximumValue(time);
- }
-
+ /**
+ * This Methode starts the status bar.
+ */
public void startStatusBar() {
stat.showProgress(true);
}
+ /**
+ * This methode stops the status bar.
+ */
public void stopStatusBar() {
stat.showProgress(false);
}
+ /**
+ * This methode returns the statusbar.
+ * @return statusbar
+ */
public StatusBar getStatusBar() {
return stat;
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java 2009-10-28 10:07:09 UTC (rev 1896)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java 2009-10-28 11:03:23 UTC (rev 1897)
@@ -40,7 +40,8 @@
/**
* This class takes care of all events happening in the GraphicalCoveragePanel.
- *
+ * It renders the Informations for the individual points and sets the
+ * individuals for the popup component.
* @author Christian Koetteritzsch
*
*/
@@ -74,12 +75,18 @@
}
@Override
+ /**
+ * Nothing happens here.
+ */
public void mouseDragged(MouseEvent arg0) {
- // TODO Auto-generated method stub
}
@Override
+ /**
+ * This methode renders the tool tip message when the mouse goes over
+ * the plus symbole. It also renders the the informations for the individual point.
+ */
public void mouseMoved(MouseEvent m) {
if (m.getX() >= panel.getX1() + panel.getShiftCovered()
&& m.getX() <= panel.getX2() + panel.getShiftCovered()
@@ -132,10 +139,17 @@
}
@Override
+ /**
+ * Nothing happens here.
+ */
public void propertyChange(PropertyChangeEvent arg0) {
}
@Override
+ /**
+ * This methode renders the popup box and
+ * computes which individuals must be shown.
+ */
public void mouseClicked(MouseEvent arg0) {
if (panel.getEvaluateddescription() != null) {
if (arg0.getX() >= panel.getX1() + panel.getShiftCovered()
@@ -229,26 +243,34 @@
}
@Override
+ /**
+ * Nothing happens here.
+ */
public void mouseEntered(MouseEvent arg0) {
- // TODO Auto-generated method stub
}
@Override
+ /**
+ * Nothing happens here.
+ */
public void mouseExited(MouseEvent arg0) {
- // TODO Auto-generated method stub
}
@Override
+ /**
+ * Nothing happens here.
+ */
public void mousePressed(MouseEvent arg0) {
- // TODO Auto-generated method stub
}
@Override
+ /**
+ * Nothing happens here.
+ */
public void mouseReleased(MouseEvent arg0) {
- // TODO Auto-generated method stub
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java 2009-10-28 10:07:09 UTC (rev 1896)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java 2009-10-28 11:03:23 UTC (rev 1897)
@@ -139,10 +139,18 @@
return circlePoint;
}
+ /**
+ * This method returns the DLLearner Individual.
+ * @return DLLearner Individual
+ */
public Individual getDLLearnerIndividual() {
return individualDLLearner;
}
+ /**
+ * This method returns the base uri of the Individual.
+ * @return base uri of the individual
+ */
public String getBaseUri() {
return baseUri;
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java 2009-10-28 10:07:09 UTC (rev 1896)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java 2009-10-28 11:03:23 UTC (rev 1897)
@@ -38,6 +38,10 @@
panel = m;
}
@Override
+ /**
+ * This methode sets the Informations on the panel where the
+ * graphic is shown.
+ */
public void propertyChange(PropertyChangeEvent arg0) {
panel.setInformation();
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-10-28 10:07:09 UTC (rev 1896)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-10-28 11:03:23 UTC (rev 1897)
@@ -192,96 +192,81 @@
}
/**
- *
- * @return
+ * This methode returns the OWLRadioButton.
+ * @return OWLRAdioButton
*/
public JRadioButton getOwlRadioButton() {
return owlRadioButton;
}
/**
- *
- * @return
+ * This methode returns the ELProfileButton.
+ * @return ELProfileButton
*/
public JRadioButton getElProfileButton() {
return elProfileButton;
}
/**
- *
- * @return
+ * This methode returns if the allquantor box is selected.
+ * @return boolean if allquantor box is selected
*/
public boolean getAllBox() {
return allBox.isSelected();
}
/**
- *
- * @return
+ * This methode returns if the some box is selected.
+ * @return boolean if some box is selected
*/
public boolean getSomeBox() {
return someBox.isSelected();
}
/**
- *
- * @return
+ * This methode returns if the not box is selected.
+ * @return boolean if not box is selected
*/
public boolean getNotBox() {
return notBox.isSelected();
}
/**
- *
- * @return
+ * This methode returns if the value box is selected.
+ * @return boolean if value box is selected
*/
public boolean getValueBox() {
return valueBox.isSelected();
}
/**
- *
- * @return
+ * This methode returns the ProfilePanel.
+ * @return Profile Panel
*/
public JPanel getProfilePanel() {
return profilePanel;
}
/**
- *
- * @return
+ * This methode returns the int of the cardinality restriction.
+ * @return cardinality restriction int
*/
public int getCountMoreBox() {
return Integer.parseInt(countMoreBox.getSelectedItem().toString());
}
/**
- *
- * @return
+ * This methode returns if the cardinality restiction box is selected.
+ * @return boolean if cardinality restiction box is selected
*/
public boolean getMoreBox() {
return moreBox.isSelected();
}
/**
- *
- * @return
+ * This methode sets the the checkboxes enable that are needed for
+ * the OWL 2 Profile.
*/
- public JPanel getRadioBoxPanel() {
- return radioBoxPanel;
- }
-
- /**
- *
- * @return
- */
- public JPanel getCheckBoxPanel() {
- return checkBoxPanel;
- }
-
- /**
- *
- */
public void setToOWLProfile() {
allBox.setSelected(true);
someBox.setSelected(true);
@@ -292,7 +277,8 @@
}
/**
- *
+ * This methode sets the the checkboxes enable that are needed for
+ * the EL Profile.
*/
public void setToELProfile() {
allBox.setSelected(false);
@@ -304,7 +290,8 @@
}
/**
- *
+ * This methode sets the combo box for the cardinality restriction
+ * enabled/disabled.
* @param isEnabled
*/
public void setCountMoreBoxEnabled(boolean isEnabled) {
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-10-28 10:07:09 UTC (rev 1896)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-10-28 11:03:23 UTC (rev 1897)
@@ -29,7 +29,6 @@
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;
@@ -62,18 +61,6 @@
this.editor = editorKit;
this.view = v;
this.model = m;
-
- //TODO: mehr informationen fuer grafische anzeige herraussuchen.
- //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();
}
/**
@@ -97,7 +84,6 @@
*/
private void setPositiveConcept() {
current = editor.getOWLWorkspace().getOWLSelectionModel().getLastSelectedClass();
- //editor.getOWLWorkspace().getOWLIndividualSelectorPanel().getSelectedObjects();
if(current != null) {
SortedSet<Individual> individuals = null;
hasIndividuals = false;
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java 2009-10-28 10:07:09 UTC (rev 1896)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java 2009-10-28 11:03:23 UTC (rev 1897)
@@ -51,7 +51,8 @@
@Override
/**
- *
+ * This methode sets the graphical coverage panel enable when a
+ * suggested class expression is selected.
*/
public void mouseClicked(MouseEvent e) {
if (view.getSuggestClassPanel().getSuggestList().getSelectedValue() != null) {
@@ -72,7 +73,6 @@
}
}
}
- view.getSuggestClassPanel().getSuggestModel().indexOf(item);
view.getMoreDetailForSuggestedConceptsPanel().renderDetailPanel(evaluatedDescription);
view.setGraphicalPanel();
}
@@ -96,7 +96,8 @@
@Override
/**
- *
+ * This methode sets the add button enable when
+ * a suggested class expression is selected.
*/
public void mousePressed(MouseEvent e) {
if (view.getSuggestClassPanel().getSuggestList().getSelectedValue() != null) {
@@ -116,13 +117,11 @@
@Override
- /*
- * TODO: Ueberlegen wie ich das mit dem selektierten Objekt umsetze
+ /**
+ * Nothing happens here.
*/
public void valueChanged(ListSelectionEvent e) {
- Object selectedObject = view.getSuggestClassPanel().getSuggestList().getSelectedValue();
-
- view.getSuggestClassPanel().getSuggestList().setSelectedValue(selectedObject, true);
+
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hee...@us...> - 2009-11-04 09:02:19
|
Revision: 1902
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1902&view=rev
Author: heeroyuy
Date: 2009-11-04 09:02:11 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
-code cleanup
Modified Paths:
--------------
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
Removed Paths:
-------------
trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-11-01 22:53:41 UTC (rev 1901)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-11-04 09:02:11 UTC (rev 1902)
@@ -87,7 +87,6 @@
private final Color darkGreen;
private final Color darkRed;
private int notCoveredInd;
- private final MoreDetailForSuggestedConceptsPanel panel;
/**
*
@@ -97,24 +96,23 @@
* EvaluatedDescription
* @param m
* DLLearnerModel
- * @param concept
- * String
- * @param p
- * MoreDetailForSuggestedConceptsPanel
*/
- public GraphicalCoveragePanel(EvaluatedDescription desc, DLLearnerModel m,
- String concept, MoreDetailForSuggestedConceptsPanel p) {
+ public GraphicalCoveragePanel(EvaluatedDescription desc, DLLearnerModel m) {
this.setVisible(false);
this.setForeground(Color.GREEN);
this.setPreferredSize(new Dimension(540, 230));
eval = desc;
model = m;
- panel = p;
id = model.getID();
darkGreen = new Color(0, 100, 0);
darkRed = new Color(205, 0, 0);
random = new Random();
- conceptNew = concept;
+ for(String uri : model.getOntologyURIString()) {
+ if(eval.getDescription().toString().contains(uri)) {
+ conceptNew = eval.getDescription().toManchesterSyntaxString(uri, null);
+ }
+ }
+
conceptVector = new Vector<String>();
posCovIndVector = new Vector<IndividualPoint>();
posNotCovIndVector = new Vector<IndividualPoint>();
@@ -638,15 +636,6 @@
}
/**
- * This method returns the MoreDetailForSuggestedConceptsPanel.
- *
- * @return MoreDetailForSuggestedConceptsPanel
- */
- public MoreDetailForSuggestedConceptsPanel getMoreDetailForSuggestedConceptsPanel() {
- return panel;
- }
-
- /**
* Returns the min. x value of the plus.
*
* @return int min X Value
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java 2009-11-01 22:53:41 UTC (rev 1901)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java 2009-11-04 09:02:11 UTC (rev 1902)
@@ -56,7 +56,7 @@
}
/**
- * This is the second Construktor of the class. This should be used if more
+ * This is the second Constructor 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
@@ -76,14 +76,6 @@
}
/**
- * This method sets the display string of the individual.
- * @param point the point to set
- */
- public void setPoint(String point) {
- this.point = point;
- }
-
- /**
* This method returns the display string of the individual.
* @return the point
*/
@@ -92,14 +84,6 @@
}
/**
- * This method sets the x axis coordinate.
- * @param xAxis the xAxis to set
- */
- public void setXAxis(int xAxis) {
- this.xAxis = xAxis;
- }
-
- /**
* This method returns the x axis coordinate.
* @return the xAxis
*/
@@ -108,14 +92,6 @@
}
/**
- * This method sets the y axis coordinate.
- * @param yAxis the yAxis to set
- */
- public void setYAxis(int yAxis) {
- this.yAxis = yAxis;
- }
-
- /**
* This method returns the y axis coordinate.
* @return the yAxis
*/
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-11-01 22:53:41 UTC (rev 1901)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-11-04 09:02:11 UTC (rev 1902)
@@ -19,14 +19,10 @@
*/
package org.dllearner.tools.protege;
import java.awt.Dimension;
-import java.awt.GridLayout;
-import java.util.Set;
import javax.swing.JPanel;
-import javax.swing.JTextArea;
import org.dllearner.core.EvaluatedDescription;
-import org.dllearner.learningproblems.EvaluatedDescriptionClass;
@@ -45,24 +41,11 @@
// Model of the dllearner
private final DLLearnerModel model;
-
- // Textarea to render the accuracy of the concept
-
- private final JTextArea accuracy;
-
-
- private final JTextArea accuracyText;
- // Evaluated description of the selected concept
- private final JPanel conceptPanel;
-
private EvaluatedDescription eval;
- private final JTextArea concept;
- private Set<String> ontologiesStrings;
- private final JTextArea conceptText;
+ //private final JTextArea concept;
private static final int HEIGHT = 230;
private static final int WIDTH = 540;
private GraphicalCoveragePanel p;
- private final MoreDetailForSuggestedConceptsPanelHandler handler;
/**
* This is the constructor for the Panel.
@@ -73,28 +56,6 @@
setLayout(null);
setPreferredSize(new Dimension(WIDTH, HEIGHT));
this.model = model;
- handler = new MoreDetailForSuggestedConceptsPanelHandler(this);
- concept = new JTextArea("Class Description:");
-
- concept.setEditable(false);
-
-
- conceptPanel = new JPanel(new GridLayout(0, 2));
- conceptPanel.setBounds(5, 0, 800, 50);
-
- accuracy = new JTextArea("Accuracy:");
- accuracy.setEditable(false);
- conceptText = new JTextArea();
- conceptText.setEditable(false);
-
- accuracyText = new JTextArea();
- //sets accuracy text area not editable
- accuracyText.setEditable(false);
- accuracy.setVisible(false);
- accuracyText.setVisible(false);
- concept.setVisible(false);
- conceptText.setVisible(false);
-
}
/**
@@ -102,55 +63,20 @@
* @param desc selected description
*/
public void renderDetailPanel(EvaluatedDescription desc) {
- accuracy.setVisible(false);
- accuracyText.setVisible(false);
- concept.setVisible(false);
- conceptText.setVisible(false);
eval = desc;
//panel for the informations of the selected concept
//this method adds the informations for the selected concept to the panel
- this.setInformation();
- p = new GraphicalCoveragePanel(eval, model, conceptText.getText(), this);
+ p = new GraphicalCoveragePanel(eval, model);
p.setBounds(5, 0, 600, 700);
//adds all information to the example panel
unsetEverything();
- conceptPanel.removeAll();
- conceptPanel.add(concept);
- conceptPanel.add(accuracy);
- conceptPanel.add(conceptText);
- conceptPanel.add(accuracyText);
- conceptPanel.setVisible(true);
this.add(p);
- this.addPropertyChangeListener(handler);
}
private void unsetEverything() {
removeAll();
}
- /**
- * This method sets the Informations of the selected description.
- */
- public void setInformation() {
- ontologiesStrings = model.getOntologyURIString();
- if(eval!=null) {
- //sets the accuracy of the selected concept
- for(String ontoString : ontologiesStrings) {
- if(eval.getDescription().toString().contains(ontoString)) {
- conceptText.setText(eval.getDescription().toManchesterSyntaxString(ontoString, null));
- break;
- }
- }
-
- //sets the accuracy of the concept
- double acc = ((EvaluatedDescriptionClass) eval).getAccuracy()*100;
- accuracyText.setText(String.valueOf(acc)+"%");
- }
- accuracy.setVisible(true);
- accuracyText.setVisible(true);
- concept.setVisible(true);
- conceptText.setVisible(true);
- }
/**
@@ -162,31 +88,12 @@
}
/**
- * Returns the concept panel.
- * @return concept panel
- */
- public JPanel getConceptPanel() {
- return conceptPanel;
- }
-
- /**
* Unsets the panel after plugin is closed.
*/
public void unsetPanel() {
unsetEverything();
- conceptPanel.removeAll();
- accuracy.setVisible(false);
- accuracyText.setVisible(false);
- concept.setVisible(false);
- conceptText.setVisible(false);
if(p != null) {
p.unsetPanel();
}
- conceptPanel.add(concept);
- conceptPanel.add(accuracy);
- conceptPanel.add(conceptText);
- conceptPanel.add(accuracyText);
- conceptPanel.setVisible(false);
- this.add(conceptPanel);
}
}
Deleted: trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java 2009-11-01 22:53:41 UTC (rev 1901)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java 2009-11-04 09:02:11 UTC (rev 1902)
@@ -1,49 +0,0 @@
-/**
- * Copyright (C) 2007-2009, Jens Lehmann
- *
- * This file is part of DL-Learner.
- *
- * DL-Learner is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * DL-Learner is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package org.dllearner.tools.protege;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
-/**
- * This is the Listener for the MoreDetailForSuggestedConceptsPanel.
- * @author Christian Koetteritzsch
- *
- */
-public class MoreDetailForSuggestedConceptsPanelHandler implements PropertyChangeListener{
-private final MoreDetailForSuggestedConceptsPanel panel;
-
- /**
- * This is the constructor of the class.
- * @param m MoreDetailForSuggestedConceptsPanel
- */
- public MoreDetailForSuggestedConceptsPanelHandler(MoreDetailForSuggestedConceptsPanel m) {
- panel = m;
- }
- @Override
- /**
- * This methode sets the Informations on the panel where the
- * graphic is shown.
- */
- public void propertyChange(PropertyChangeEvent arg0) {
- panel.setInformation();
- }
-
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hee...@us...> - 2009-11-04 10:26:58
|
Revision: 1904
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1904&view=rev
Author: heeroyuy
Date: 2009-11-04 10:26:47 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
-fixed a bug
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/SuggestClassPanelHandler.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-11-04 09:15:48 UTC (rev 1903)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-11-04 10:26:47 UTC (rev 1904)
@@ -67,7 +67,10 @@
private final DLLearnerView view;
private static final String HELP_BUTTON_STRING = "help";
private JTextArea help;
+ private static final String ADD_BUTTON_STRING = "<html>ADD</html>";
private static final String ADVANCED_BUTTON_STRING = "Advanced";
+ private static final String EQUIVALENT_CLASS_LEARNING_STRING = "<html>suggest equivalent class expression</html>";
+ private static final String SUPER_CLASS_LEARNING_STRING = "<html>suggest super class expression</html>";
/**
* This is the constructor for the action handler.
@@ -93,9 +96,9 @@
*/
public void actionPerformed(ActionEvent z) {
- if (z.getActionCommand().equals("suggest equivalent class expression")
+ if (z.getActionCommand().equals(EQUIVALENT_CLASS_LEARNING_STRING)
|| z.getActionCommand()
- .equals("suggest super class expression")) {
+ .equals(SUPER_CLASS_LEARNING_STRING)) {
model.setKnowledgeSource();
view.getSuggestClassPanel().getSuggestModel().clear();
view.getSuggestClassPanel().repaint();
@@ -107,8 +110,8 @@
String moreInformationsMessage = "Learning started. Currently searching class expressions with length between "
+ celoe.getMinimumHorizontalExpansion()
- + " and"
- + celoe.getMaximumHorizontalExpansion() + ". ";
+ + " and "
+ + celoe.getMaximumHorizontalExpansion() + ".";
view.setHelpButtonVisible(true);
view.setHintMessage(moreInformationsMessage);
retriever = new SuggestionRetriever();
@@ -116,7 +119,7 @@
retriever.execute();
}
- if (z.getActionCommand().equals("ADD")) {
+ if (z.getActionCommand().equals(ADD_BUTTON_STRING)) {
if (evaluatedDescription != null) {
model
.changeDLLearnerDescriptionsToOWLDescriptions(evaluatedDescription
@@ -150,7 +153,7 @@
+ "The learning algorithm prefers short expressions. 'Currently searching class expressions with length between 4 and 7.' means that it has already evaluated all class expressions of length 1 to 3\n"
+ "or excluded them as possible suggestions. All the expressions currently evaluated have length between 4 and 7. If you want to search for longer expressions, then you have to increase\n"
+ "the maximum runtime setting (it is set to $defaultRuntime seconds by default).\n\n"
- + "See http://dl-learner.org/wiki/ProtegePlugin for more details. ";
+ + "See <a href=\"http://dl-learner.org/wiki/ProtegePlugin\">http://dl-learner.org/wiki/ProtegePlugin</a> for more details.";
help = new JTextArea();
help.setEditable(false);
@@ -170,6 +173,14 @@
}
/**
+ * This Methode sets the evaluated class expression that is selected
+ * in the panel.
+ * @param desc evaluated descriptions
+ */
+ public void setEvaluatedClassExpression(EvaluatedDescription desc) {
+ this.evaluatedDescription = desc;
+ }
+ /**
* Inner Class that retrieves the concepts given by the DL-Learner.
*
* @author Christian Koetteritzsch
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-11-04 09:15:48 UTC (rev 1903)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-11-04 10:26:47 UTC (rev 1904)
@@ -152,7 +152,7 @@
icon = new ImageIcon(iconUrl);
URL toggledIconUrl = this.getClass().getResource("arrow2.gif");
toggledIcon = new ImageIcon(toggledIconUrl);
- adv = new JLabel("Advanced Settings");
+ adv = new JLabel("<html>Advanced Settings</html>");
advanced = new JToggleButton(icon);
advanced.setVisible(true);
advancedPanel = new JPanel();
@@ -164,7 +164,7 @@
helpButton.setName("help");
helpButton.addActionListener(action);
runPanel = new JPanel(new FlowLayout());
- accept = new JButton("ADD");
+ accept = new JButton("<html>ADD</html>");
addButtonPanel = new JPanel(new BorderLayout());
stat = new StatusBar();
errorMessage = new JTextArea();
@@ -183,7 +183,7 @@
learnerScroll.getVerticalScrollBar().setUnitIncrement(SCROLL_SPEED);
posPanel = new PosAndNegSelectPanel(model, action);
detail = new MoreDetailForSuggestedConceptsPanel(model);
- sugPanelHandler = new SuggestClassPanelHandler(this, model);
+ sugPanelHandler = new SuggestClassPanelHandler(this, model, action);
sugPanel.addSuggestPanelMouseListener(sugPanelHandler);
sugPanel.getSuggestList().addListSelectionListener(sugPanelHandler);
this.addAcceptButtonListener(this.action);
@@ -234,7 +234,7 @@
}
individualSize = editorKit.getModelManager().getActiveOntology().getIndividualAxioms().size();
labels = currentConcept;
- run.setText("suggest " + label + " expression");
+ run.setText("<html>suggest " + label + " expression</html>");
GridBagConstraints c = new GridBagConstraints();
learner.remove(detail);
model.setID(label);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java 2009-11-04 09:15:48 UTC (rev 1903)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java 2009-11-04 10:26:47 UTC (rev 1904)
@@ -36,6 +36,7 @@
public class SuggestClassPanelHandler implements MouseListener, ListSelectionListener{
private DLLearnerView view;
private DLLearnerModel model;
+ private ActionHandler action;
private EvaluatedDescription evaluatedDescription;
/**
@@ -43,9 +44,10 @@
* @param v DLLearnerView
* @param m DLLearnerModel
*/
- public SuggestClassPanelHandler(DLLearnerView v, DLLearnerModel m) {
+ public SuggestClassPanelHandler(DLLearnerView v, DLLearnerModel m, ActionHandler a) {
this.view = v;
this.model = m;
+ this.action = a;
}
@@ -68,6 +70,7 @@
if (desc.equals(eDescription.getDescription()
.toManchesterSyntaxString(ont, null))) {
evaluatedDescription = eDescription;
+ action.setEvaluatedClassExpression(eDescription);
break;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hee...@us...> - 2009-11-04 16:18:58
|
Revision: 1905
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1905&view=rev
Author: heeroyuy
Date: 2009-11-04 16:18:47 +0000 (Wed, 04 Nov 2009)
Log Message:
-----------
-added new HyperLinkListener
-some small changes
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/META-INF/MANIFEST.MF
trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java
Added Paths:
-----------
trunk/src/dl-learner/org/dllearner/tools/protege/HyperLinkHandler.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-11-04 10:26:47 UTC (rev 1904)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-11-04 16:18:47 UTC (rev 1905)
@@ -30,7 +30,7 @@
import javax.swing.DefaultListModel;
import javax.swing.JOptionPane;
-import javax.swing.JTextArea;
+import javax.swing.JTextPane;
import javax.swing.SwingUtilities;
import javax.swing.SwingWorker;
@@ -51,6 +51,7 @@
// This is the DLLearnerModel.
private final DLLearnerModel model;
+ private HyperLinkHandler hyperHandler;
// This is the id that checks if the equivalent class or subclass button is
// pressed in protege
@@ -66,7 +67,7 @@
private final Color colorGreen = new Color(0, 139, 0);
private final DLLearnerView view;
private static final String HELP_BUTTON_STRING = "help";
- private JTextArea help;
+ private JTextPane help;
private static final String ADD_BUTTON_STRING = "<html>ADD</html>";
private static final String ADVANCED_BUTTON_STRING = "Advanced";
private static final String EQUIVALENT_CLASS_LEARNING_STRING = "<html>suggest equivalent class expression</html>";
@@ -85,6 +86,7 @@
this.view = view;
this.model = m;
toggled = false;
+ hyperHandler = view.getHyperLinkHandler();
}
@@ -108,10 +110,10 @@
view.getHintPanel().setForeground(Color.RED);
CELOE celoe = (CELOE) model.getLearningAlgorithm();
- String moreInformationsMessage = "Learning started. Currently searching class expressions with length between "
+ String moreInformationsMessage = "<html><font size=\"3\">Learning started. Currently searching class expressions with length between "
+ celoe.getMinimumHorizontalExpansion()
+ " and "
- + celoe.getMaximumHorizontalExpansion() + ".";
+ + celoe.getMaximumHorizontalExpansion() + ".</font></html>";
view.setHelpButtonVisible(true);
view.setHintMessage(moreInformationsMessage);
retriever = new SuggestionRetriever();
@@ -130,7 +132,7 @@
.getSuggestClassPanel().getSuggestList()
.getSelectedValue());
}
- String message = "class expression added";
+ String message = "<html><font size=\"3\">class expression added</font></html>";
view.setHintMessage(message);
view.setHelpButtonVisible(false);
}
@@ -146,18 +148,21 @@
}
}
if (z.toString().contains(HELP_BUTTON_STRING)) {
- String helpText = "What does a sentence like 'Learning started. Currently searching class expressions with length between 4 and 7.' mean?\n"
- + "Length: In Manchester OWL Syntax (the syntax used for class expressions in Protege), we define length simply as the number of words needed to write down the class expression.\n\n"
- + "The learning algorithm (called CELOE) for suggesting class expressions starts with the most general expression owl:Thing and then further specializes it.\n"
- + "Those class expressions, which fit the existing instances of a given class ($currentClass in this case) get a high accuracy and are displayed as suggestions.\n"
- + "The learning algorithm prefers short expressions. 'Currently searching class expressions with length between 4 and 7.' means that it has already evaluated all class expressions of length 1 to 3\n"
- + "or excluded them as possible suggestions. All the expressions currently evaluated have length between 4 and 7. If you want to search for longer expressions, then you have to increase\n"
- + "the maximum runtime setting (it is set to $defaultRuntime seconds by default).\n\n"
- + "See <a href=\"http://dl-learner.org/wiki/ProtegePlugin\">http://dl-learner.org/wiki/ProtegePlugin</a> for more details.";
+ String helpText = "<html><font size=\"3\">What does a sentence like 'Learning started. Currently searching class expressions with length between 4 and 7.' mean?<br>"
+ + "Length: In Manchester OWL Syntax (the syntax used for class expressions in Protege), we define length simply as the number of words needed to write down the class expression.<br><br>"
+ + "The learning algorithm (called CELOE) for suggesting class expressions starts with the most general expression owl:Thing and then further specializes it.<br>"
+ + "Those class expressions, which fit the existing instances of a given class ($currentClass in this case) get a high accuracy and are displayed as suggestions.<br>"
+ + "The learning algorithm prefers short expressions. 'Currently searching class expressions with length between 4 and 7.' means that it has already evaluated all class expressions of length 1 to 3<br>"
+ + "or excluded them as possible suggestions. All the expressions currently evaluated have length between 4 and 7. If you want to search for longer expressions, then you have to increase<br>"
+ + "the maximum runtime setting (it is set to $defaultRuntime seconds by default).<br><br>"
+ + "See <a href=\"http://dl-learner.org/wiki/ProtegePlugin\">http://dl-learner.org/wiki/ProtegePlugin</a> for more details.</font></html>";
- help = new JTextArea();
+ help = new JTextPane();
help.setEditable(false);
+ help.setContentType("text/html");
help.setForeground(Color.black);
+ help.addHyperlinkListener(hyperHandler);
+ help.setBackground(view.getLearnerView().getBackground());
help.setText(helpText);
JOptionPane.showMessageDialog(null, help, "Help",
@@ -212,10 +217,10 @@
.getNrOfConcepts()));
CELOE celoe = (CELOE) model.getLearningAlgorithm();
view.getHintPanel().setForeground(Color.RED);
- String moreInformationsMessage = "Learning started. Currently searching class expressions with length between "
+ String moreInformationsMessage = "<html><font size=\"3\">Learning started. Currently searching class expressions with length between "
+ celoe.getMinimumHorizontalExpansion()
+ " and "
- + celoe.getMaximumHorizontalExpansion() + ".";
+ + celoe.getMaximumHorizontalExpansion() + ".</font></html>";
view.setHintMessage(moreInformationsMessage);
}
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-11-04 10:26:47 UTC (rev 1904)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-11-04 16:18:47 UTC (rev 1905)
@@ -265,8 +265,8 @@
try {
currentConceptURL = new URL(currentConcept.toString());
} catch (MalformedURLException e1) {
- String error = "Cannot convert to URL.";
- view.renderErrorMessage(error);
+ String error = "<html>Cannot convert to URL.</html>";
+ view.setHintMessage(error);
e1.printStackTrace();
}
cm.applyConfigEntry(lp, "classToDescribe", currentConceptURL);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-11-04 10:26:47 UTC (rev 1904)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-11-04 16:18:47 UTC (rev 1905)
@@ -36,7 +36,7 @@
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
+import javax.swing.JTextPane;
import javax.swing.JToggleButton;
import org.dllearner.algorithms.celoe.CELOE;
@@ -54,6 +54,8 @@
private static final long serialVersionUID = 624829578325729385L;
+ //TODO: gucken wie geht
+ private HyperLinkHandler hyperHandler;
// this is the Component which shows the view of the dllearner
private final JComponent learner;
@@ -69,14 +71,6 @@
private final JLabel adv;
- // This is the color for the error message. It is red.
-
- private final Color colorRed = Color.red;
-
- // This is the text area for the error message when an error occurred
-
- private final JTextArea errorMessage;
-
// Advanced Button to activate/deactivate the example select panel
private final JToggleButton advanced;
@@ -103,10 +97,10 @@
// Picture of the advanced button when it is toggled
private final JPanel addButtonPanel;
- private final JLabel wikiPane;
+ private final JTextPane wikiPane;
private final ImageIcon toggledIcon;
private ImageIcon helpIcon;
- private final JTextArea hint;
+ private final JTextPane hint;
private JButton helpButton;
private final JPanel runPanel;
private final JPanel advancedPanel;
@@ -129,6 +123,7 @@
private int individualSize;
private SuggestClassPanelHandler sugPanelHandler;
private StatusBar stat;
+ private static final String WIKI_STRING = "<html><font size=\"3\">See <a href=\"http://dl-learner.org/wiki/ProtegePlugin\">http://dl-learner.org/wiki/ProtegePlugin</a> for an introduction.</font></html>";
/**
* The constructor for the DL-Learner tab in the class description
@@ -147,7 +142,10 @@
learnerPanel.setLayout(new BorderLayout());
learnerScroll = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
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>");
+ wikiPane = new JTextPane();
+ wikiPane.setContentType("text/html");
+ wikiPane.setBackground(learnerScroll.getBackground());
+ wikiPane.setText(WIKI_STRING);
URL iconUrl = this.getClass().getResource("arrow.gif");
icon = new ImageIcon(iconUrl);
URL toggledIconUrl = this.getClass().getResource("arrow2.gif");
@@ -167,12 +165,12 @@
accept = new JButton("<html>ADD</html>");
addButtonPanel = new JPanel(new BorderLayout());
stat = new StatusBar();
- errorMessage = new JTextArea();
- errorMessage.setEditable(false);
- hint = new JTextArea();
+ hint = new JTextPane();
+ hint.setBackground(learnerScroll.getBackground());
+ hint.setContentType("text/html");
hint.setEditable(false);
- hint.setText("To get suggestions for class expression, please click the button above.");
- hint.setPreferredSize(new Dimension(485, 30));
+ hint.setText("<html><font size=\"3\">To get suggestions for class expression, please click the button above.</font></html>");
+ hint.addHyperlinkListener(hyperHandler);
learner = new JPanel();
advanced.setSize(20, 20);
learner.setLayout(new GridBagLayout());
@@ -186,6 +184,7 @@
sugPanelHandler = new SuggestClassPanelHandler(this, model, action);
sugPanel.addSuggestPanelMouseListener(sugPanelHandler);
sugPanel.getSuggestList().addListSelectionListener(sugPanelHandler);
+ hyperHandler = new HyperLinkHandler();
this.addAcceptButtonListener(this.action);
this.addRunButtonListener(this.action);
this.addAdvancedButtonListener(this.action);
@@ -216,7 +215,7 @@
helpButton.setVisible(false);
hint.setForeground(Color.BLACK);
- hint.setText("To get suggestions for class expression, please click the button above.");
+ hint.setText("<html><font size=\"3\">To get suggestions for class expression, please click the button above.</font></html>");
String currentConcept = editorKit.getOWLWorkspace().getOWLSelectionModel().getLastSelectedClass().toString();
if(!labels.equals(currentConcept) || individualSize != editorKit.getModelManager().getActiveOntology().getIndividualAxioms().size()) {
if(individualSize != editorKit.getModelManager().getActiveOntology().getIndividualAxioms().size()) {
@@ -281,7 +280,6 @@
c.weighty = 0.0;
c.gridx = 0;
c.gridy = 3;
- hint.setPreferredSize(new Dimension(450, 60));
helpButton.setPreferredSize(new Dimension(30, 30));
hintPanel.add(BorderLayout.CENTER, hint);
hintPanel.add(BorderLayout.EAST, helpButton);
@@ -318,7 +316,6 @@
detail.setVisible(true);
sugPanel.setVisible(true);
learnerScroll.setViewportView(learner);
- this.renderErrorMessage("");
this.getSuggestClassPanel().getSuggestModel().clear();
}
@@ -396,7 +393,7 @@
* This method returns the hint panel.
* @return hint panel
*/
- public JTextArea getHintPanel() {
+ public JTextPane getHintPanel() {
return hint;
}
@@ -451,19 +448,10 @@
public void unsetEverything() {
run.setEnabled(true);
model.getNewOWLDescription().clear();
- errorMessage.setText("");
learner.removeAll();
}
/**
- * Renders the error message when an error occured.
- * @param s String
- */
- public void renderErrorMessage(String s) {
- errorMessage.setForeground(colorRed);
- errorMessage.setText(s);
- }
- /**
* This Method returns the panel for more details for the chosen concept.
* @return MoreDetailForSuggestedConceptsPanel
*/
@@ -524,18 +512,16 @@
*/
public void algorithmTerminated() {
CELOE celoe = (CELOE) model.getLearningAlgorithm();
- String error = "Learning successful. All expressions up to length " + (celoe.getMinimumHorizontalExpansion()-1) + " and some expressions up to \nlength " + celoe.getMaximumHorizontalExpansion() + " searched.";
+ String message = "<html><font size=\"3\">Learning successful. All expressions up to length " + (celoe.getMinimumHorizontalExpansion()-1) + " and some expressions up to <br>length " + celoe.getMaximumHorizontalExpansion() + " searched.";
hint.setForeground(Color.RED);
- this.setHintMessage(error);
- String message = "";
if(isInconsistent) {
- message ="\nClass expressions marked red will lead to an inconsistent ontology. \nPlease double click on them to view detail information.";
+ message +="<br>Class expressions marked red will lead to an inconsistent ontology. <br>Please double click on them to view detail information.</font></html>";
} else {
- message ="\nTo view details about why a class expression was suggested, please click on it.";
+ message +="<br>To view details about why a class expression was suggested, please click on it.</font><html>";
}
run.setEnabled(true);
// start the algorithm and print the best concept found;
- hint.append(message);
+ this.setHintMessage(message);
}
/**
@@ -591,4 +577,9 @@
public StatusBar getStatusBar() {
return stat;
}
+
+ public HyperLinkHandler getHyperLinkHandler() {
+ return hyperHandler;
+ }
+
}
Added: trunk/src/dl-learner/org/dllearner/tools/protege/HyperLinkHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/HyperLinkHandler.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/HyperLinkHandler.java 2009-11-04 16:18:47 UTC (rev 1905)
@@ -0,0 +1,52 @@
+package org.dllearner.tools.protege;
+
+import java.awt.Cursor;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.swing.JEditorPane;
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkListener;
+
+import edu.stanford.ejalbert.BrowserLauncher;
+import edu.stanford.ejalbert.exception.BrowserLaunchingInitializingException;
+import edu.stanford.ejalbert.exception.UnsupportedOperatingSystemException;
+
+public class HyperLinkHandler implements HyperlinkListener {
+
+ private BrowserLauncher launcher;
+
+ public HyperLinkHandler() {
+ try {
+ launcher = new BrowserLauncher();
+ } catch (BrowserLaunchingInitializingException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (UnsupportedOperatingSystemException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void hyperlinkUpdate(HyperlinkEvent event) {
+ if (event.getEventType() == HyperlinkEvent.EventType.ENTERED) {
+ ((JEditorPane) event.getSource()).setCursor(Cursor
+ .getPredefinedCursor(Cursor.HAND_CURSOR));
+ } else if (event.getEventType() == HyperlinkEvent.EventType.EXITED) {
+ ((JEditorPane) event.getSource()).setCursor(Cursor
+ .getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+ } else if (event.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
+ URL url;
+ try {
+ url = new URL(event.getDescription());
+ launcher.openURLinBrowser(url.toString());
+ } catch (MalformedURLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+
+ }
+
+}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/META-INF/MANIFEST.MF
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/META-INF/MANIFEST.MF 2009-11-04 10:26:47 UTC (rev 1904)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/META-INF/MANIFEST.MF 2009-11-04 16:18:47 UTC (rev 1905)
@@ -6,7 +6,7 @@
Bundle-Description: Protege DL-Learner Plugin
Bundle-Vendor: DL-Learner Project
Bundle-DocURL: http://dl-learner.org/wiki/ProtegePlugin
-Bundle-ClassPath: .,lib/junit-4.4.jar,lib/jamon-2.7.jar,lib/pellet/pellet-core.jar,lib/pellet/pellet-datatypes.jar,lib/pellet/pellet-el.jar,lib/pellet/pellet-explanation.jar,lib/pellet/pellet-owlapi.jar,lib/pellet/pellet-rules.jar,lib/pellet/aterm-java-1.6.jar,lib/jena/json.jar,lib/pellet/relaxngDatatype.jar,lib/pellet/xsdlib.jar,lib/jena/commons-logging-1.1.1.jar,lib/ore-tool/swingx-0.9.2.jar
+Bundle-ClassPath: .,lib/junit-4.4.jar,lib/jamon-2.7.jar,lib/pellet/pellet-core.jar,lib/pellet/pellet-datatypes.jar,lib/ore-tool/BrowserLauncher2-all-1_3.jar,lib/pellet/pellet-el.jar,lib/pellet/pellet-explanation.jar,lib/pellet/pellet-owlapi.jar,lib/pellet/pellet-rules.jar,lib/pellet/aterm-java-1.6.jar,lib/jena/json.jar,lib/pellet/relaxngDatatype.jar,lib/pellet/xsdlib.jar,lib/jena/commons-logging-1.1.1.jar,lib/ore-tool/swingx-0.9.2.jar
Import-Package: org.osgi.framework,org.apache.log4j
Export-Package: lib
Bundle-Version: 0.5.2
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-11-04 10:26:47 UTC (rev 1904)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-11-04 16:18:47 UTC (rev 1905)
@@ -87,7 +87,6 @@
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"))) {
@@ -167,7 +166,7 @@
@Override
public void run() {
- String loading ="loading instances...";
+ String loading ="<html><font size=\"3\">loading instances...</font></html>";
view.getHintPanel().setForeground(Color.RED);
view.setHintMessage(loading);
if(!model.isReasonerSet() || model.getIsKnowledgeSourceIsUpdated() == true) {
@@ -182,12 +181,12 @@
if (this.hasIndividuals()) {
view.getRunButton().setEnabled(true);
view.getHintPanel().setForeground(Color.BLACK);
- view.setHintMessage("To get suggestions for class descriptions, please click the button above.");
+ view.setHintMessage("<html><font size=\"3\">To get suggestions for class descriptions, please click the button above.</font></html>");
} else {
view.getRunButton().setEnabled(false);
view.getHintPanel().setVisible(true);
- String message ="There are no Instances for " + current + " available. Please insert some Instances.";
+ String message ="<html><font size=\"3\">There are no Instances for " + current + " available. Please insert some Instances.</font></html>";
view.getHintPanel().setForeground(Color.RED);
view.setHintMessage(message);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hee...@us...> - 2009-11-05 08:33:03
|
Revision: 1907
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1907&view=rev
Author: heeroyuy
Date: 2009-11-05 08:32:54 +0000 (Thu, 05 Nov 2009)
Log Message:
-----------
-fixed bug
-make errors red on panel
-some javadoc
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/HyperLinkHandler.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-11-04 16:20:27 UTC (rev 1906)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-11-05 08:32:54 UTC (rev 1907)
@@ -265,7 +265,7 @@
try {
currentConceptURL = new URL(currentConcept.toString());
} catch (MalformedURLException e1) {
- String error = "<html>Cannot convert to URL.</html>";
+ String error = "<html><font size=\"3\" color=\"red\">Cannot convert to URL.</font></html>";
view.setHintMessage(error);
e1.printStackTrace();
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-11-04 16:20:27 UTC (rev 1906)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-11-05 08:32:54 UTC (rev 1907)
@@ -145,6 +145,7 @@
wikiPane = new JTextPane();
wikiPane.setContentType("text/html");
wikiPane.setBackground(learnerScroll.getBackground());
+ wikiPane.setEditable(false);
wikiPane.setText(WIKI_STRING);
URL iconUrl = this.getClass().getResource("arrow.gif");
icon = new ImageIcon(iconUrl);
@@ -512,10 +513,10 @@
*/
public void algorithmTerminated() {
CELOE celoe = (CELOE) model.getLearningAlgorithm();
- String message = "<html><font size=\"3\">Learning successful. All expressions up to length " + (celoe.getMinimumHorizontalExpansion()-1) + " and some expressions up to <br>length " + celoe.getMaximumHorizontalExpansion() + " searched.";
+ String message = "<html><font size=\"3\" color=\"black\">Learning successful. All expressions up to length " + (celoe.getMinimumHorizontalExpansion()-1) + " and some expressions up to <br>length " + celoe.getMaximumHorizontalExpansion() + " searched.";
hint.setForeground(Color.RED);
if(isInconsistent) {
- message +="<br>Class expressions marked red will lead to an inconsistent ontology. <br>Please double click on them to view detail information.</font></html>";
+ message +="<font size=\"3\" color=\"red\"><br>Class expressions marked red will lead to an inconsistent ontology. <br>Please double click on them to view detail information.</font></html>";
} else {
message +="<br>To view details about why a class expression was suggested, please click on it.</font><html>";
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/HyperLinkHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/HyperLinkHandler.java 2009-11-04 16:20:27 UTC (rev 1906)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/HyperLinkHandler.java 2009-11-05 08:32:54 UTC (rev 1907)
@@ -1,3 +1,22 @@
+/**
+ * Copyright (C) 2007-2009, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ *
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
package org.dllearner.tools.protege;
import java.awt.Cursor;
@@ -12,10 +31,20 @@
import edu.stanford.ejalbert.exception.BrowserLaunchingInitializingException;
import edu.stanford.ejalbert.exception.UnsupportedOperatingSystemException;
+/**
+ * This is the Hyperlink Handler that handles what happens when a
+ * hyperlink is clicked.
+ * @author Christian Koetteritzsch
+ *
+ */
public class HyperLinkHandler implements HyperlinkListener {
private BrowserLauncher launcher;
+ /**
+ * This is the constructor that instantiate the
+ * BrowserLauncher.
+ */
public HyperLinkHandler() {
try {
launcher = new BrowserLauncher();
@@ -29,6 +58,9 @@
}
@Override
+ /**
+ * This methode handles what happens when a hyperlink is clicked.
+ */
public void hyperlinkUpdate(HyperlinkEvent event) {
if (event.getEventType() == HyperlinkEvent.EventType.ENTERED) {
((JEditorPane) event.getSource()).setCursor(Cursor
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-11-04 16:20:27 UTC (rev 1906)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-11-05 08:32:54 UTC (rev 1907)
@@ -186,7 +186,7 @@
} else {
view.getRunButton().setEnabled(false);
view.getHintPanel().setVisible(true);
- String message ="<html><font size=\"3\">There are no Instances for " + current + " available. Please insert some Instances.</font></html>";
+ String message ="<html><font size=\"3\" color=\"red\">There are no Instances for " + current + " available. Please insert some Instances.</font></html>";
view.getHintPanel().setForeground(Color.RED);
view.setHintMessage(message);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hee...@us...> - 2009-11-05 09:06:23
|
Revision: 1909
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1909&view=rev
Author: heeroyuy
Date: 2009-11-05 09:06:10 +0000 (Thu, 05 Nov 2009)
Log Message:
-----------
-fixed bug in HyperLinkHandler
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-11-05 08:51:04 UTC (rev 1908)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-11-05 09:06:10 UTC (rev 1909)
@@ -155,7 +155,7 @@
+ "The learning algorithm prefers short expressions. 'Currently searching class expressions with length between 4 and 7.' means that it has already evaluated all class expressions of length 1 to 3<br>"
+ "or excluded them as possible suggestions. All the expressions currently evaluated have length between 4 and 7. If you want to search for longer expressions, then you have to increase<br>"
+ "the maximum runtime setting (it is set to $defaultRuntime seconds by default).<br><br>"
- + "See <a href=\"http://dl-learner.org/wiki/ProtegePlugin\">http://dl-learner.org/wiki/ProtegePlugin</a> for more details.</font></html>";
+ + "See <a href=\"http://dl-learner.org/wiki/ProtegePlugin\">Protege Plugin Wiki</a> for more details.</font></html>";
help = new JTextPane();
help.setEditable(false);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-11-05 08:51:04 UTC (rev 1908)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-11-05 09:06:10 UTC (rev 1909)
@@ -123,7 +123,7 @@
private int individualSize;
private SuggestClassPanelHandler sugPanelHandler;
private StatusBar stat;
- private static final String WIKI_STRING = "<html><font size=\"3\">See <a href=\"http://dl-learner.org/wiki/ProtegePlugin\">http://dl-learner.org/wiki/ProtegePlugin</a> for an introduction.</font></html>";
+ private static final String WIKI_STRING = "<html><font size=\"3\">See <a href=\"http://dl-learner.org/wiki/ProtegePlugin\">Protege Plugin Wiki</a> for an introduction.</font></html>";
/**
* The constructor for the DL-Learner tab in the class description
@@ -135,6 +135,7 @@
editorKit = editor;
labels = "";
individualSize = 0;
+ hyperHandler = new HyperLinkHandler();
model = new DLLearnerModel(editorKit, this);
sugPanel = new SuggestClassPanel(model, this);
learnerPanel = new JPanel();
@@ -147,6 +148,7 @@
wikiPane.setBackground(learnerScroll.getBackground());
wikiPane.setEditable(false);
wikiPane.setText(WIKI_STRING);
+ wikiPane.addHyperlinkListener(hyperHandler);
URL iconUrl = this.getClass().getResource("arrow.gif");
icon = new ImageIcon(iconUrl);
URL toggledIconUrl = this.getClass().getResource("arrow2.gif");
@@ -171,7 +173,6 @@
hint.setContentType("text/html");
hint.setEditable(false);
hint.setText("<html><font size=\"3\">To get suggestions for class expression, please click the button above.</font></html>");
- hint.addHyperlinkListener(hyperHandler);
learner = new JPanel();
advanced.setSize(20, 20);
learner.setLayout(new GridBagLayout());
@@ -185,7 +186,6 @@
sugPanelHandler = new SuggestClassPanelHandler(this, model, action);
sugPanel.addSuggestPanelMouseListener(sugPanelHandler);
sugPanel.getSuggestList().addListSelectionListener(sugPanelHandler);
- hyperHandler = new HyperLinkHandler();
this.addAcceptButtonListener(this.action);
this.addRunButtonListener(this.action);
this.addAdvancedButtonListener(this.action);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X