Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1497] trunk/src/dl-learner/org/dllearner/tools/ protege
|
From: <hee...@us...> - 2008-11-07 18:41:53
|
Revision: 1497
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1497&view=rev
Author: heeroyuy
Date: 2008-11-07 18:41:48 +0000 (Fri, 07 Nov 2008)
Log Message:
-----------
-added listener to new example panel
-some bug fixes
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/IndividualObject.java
trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java
trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanelHandler.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2008-11-07 17:46:34 UTC (rev 1496)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2008-11-07 18:41:48 UTC (rev 1497)
@@ -95,11 +95,6 @@
if (model.getAlreadyLearned()) {
model.unsetListModel();
}
- if (view.getPosAndNegSelectPanel().getPosAndNegSelectPanel()
- .getComponentCount() <= 2) {
- view
- .renderErrorMessage("Could not start learning. No Examples where available");
- } else {
view.getPosAndNegSelectPanel().setCheckBoxesEnable(false);
model.setKnowledgeSource();
model.setReasoner();
@@ -111,7 +106,7 @@
view.getRunButton().setEnabled(false);
view.renderErrorMessage("Learning started");
//view.getPosAndNegSelectPanel().unsetCheckBoxes();
- }
+
}
if (z.getActionCommand().equals("ADD")) {
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2008-11-07 17:46:34 UTC (rev 1496)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2008-11-07 18:41:48 UTC (rev 1497)
@@ -280,15 +280,12 @@
public void setPositiveAndNegativeExamples() {
positiveExamples = new TreeSet<String>();
negativeExamples = new TreeSet<String>();
- for (int i = 0; i < positiv.size(); i++) {
- if (positiv.get(i).isSelected()) {
-
- positiveExamples.add(normalIndividuals.get(i));
+ for (int i = 0; i < individualVector.size(); i++) {
+ if (individualVector.get(i).isPositiveExample()) {
+ positiveExamples.add(individualVector.get(i).getIndividualString());
+ } else {
+ negativeExamples.add(individualVector.get(i).getIndividualString());
}
-
- if (negativ.get(i).isSelected()) {
- negativeExamples.add(normalIndividuals.get(i));
- }
}
}
@@ -400,6 +397,7 @@
*/
public void run() {
error = "Learning succesful";
+
String message = "To view details about why a class description was suggested, please doubleclick on it.";
// start the algorithm and print the best concept found
la.start();
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/IndividualObject.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/IndividualObject.java 2008-11-07 17:46:34 UTC (rev 1496)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/IndividualObject.java 2008-11-07 18:41:48 UTC (rev 1497)
@@ -27,4 +27,5 @@
public void setExamplePositive(boolean pos) {
isPos = pos;
}
+
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java 2008-11-07 17:46:34 UTC (rev 1496)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java 2008-11-07 18:41:48 UTC (rev 1497)
@@ -458,7 +458,6 @@
model.unsetListModel();
model.initReasoner();
model.setPosVector();
- System.out.println(model.getPosListModel());
posPanel.setExampleList(model.getPosListModel(), model.getNegListModel());
accept.setEnabled(false);
action.resetToggled();
@@ -474,6 +473,8 @@
advanced.setBounds(10, 200, 20, 20);
sugPanel.setVisible(true);
posPanel.setVisible(false);
+ posPanel.getAddToNegPanelButton().setEnabled(false);
+ posPanel.getAddToPosPanelButton().setEnabled(false);
posPanel.setBounds(10, 230, 490, 250);
accept.setBounds(510, 40, 80, 110);
hint.setBounds(10, 150, 490, 20);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanel.java 2008-11-07 17:46:34 UTC (rev 1496)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanel.java 2008-11-07 18:41:48 UTC (rev 1497)
@@ -148,8 +148,6 @@
buttonPanel.setPreferredSize(new Dimension(90, 85));
addToPosExamples.setBounds(0, 50, 70, 30);
addToNegExamples.setBounds(0, 80, 70, 30);
- addToPosExamples.setEnabled(false);
- addToNegExamples.setEnabled(false);
buttonPanel.add(addToPosExamples);
buttonPanel.add(addToNegExamples);
posLabelPanel.add(pos);
@@ -184,6 +182,10 @@
addHelpButtonListener(handler);
add(optionPanel);
add(examplePanel);
+ posList.addMouseListener(handler);
+ negList.addMouseListener(handler);
+ addToPosExamples.addActionListener(handler);
+ addToNegExamples.addActionListener(handler);
}
/**
@@ -260,6 +262,41 @@
}
+ public void setExampleToOtherList(boolean toPos, String example) {
+ if (toPos) {
+ for(int i = 0; i < negListModel.size(); i++) {
+ if(negListModel.get(i).equals(example)) {
+ negListModel.remove(i);
+ for (int j = 0; j < model.getIndividualVector().size(); j++ ) {
+ if (model.getIndividualVector().get(j).getManchesterIndividual().equals(example)) {
+ model.getIndividualVector().get(j).setExamplePositive(true);
+ break;
+ }
+ }
+
+ }
+ }
+ posListModel.add(0, example);
+ } else {
+ for(int i = 0; i < posListModel.size(); i++) {
+ if(posListModel.get(i).equals(example)) {
+ posListModel.remove(i);
+ for (int j = 0; j < model.getIndividualVector().size(); j++ ) {
+ if (model.getIndividualVector().get(j).getManchesterIndividual().equals(example)) {
+ model.getIndividualVector().get(j).setExamplePositive(false);
+ }
+ }
+ break;
+ }
+ }
+ negListModel.add(0, example);
+ }
+ setExampleList(posListModel, negListModel);
+ addToPosExamples.setEnabled(false);
+ addToNegExamples.setEnabled(false);
+
+ }
+
/**
* This method adds the Action listener to the help buttons.
*
@@ -280,5 +317,13 @@
public OptionPanel getOptionPanel() {
return optionPanel;
}
+
+ public JList getPosExampleList() {
+ return posList;
+ }
+
+ public JList getNegExampleList() {
+ return negList;
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanelHandler.java 2008-11-07 17:46:34 UTC (rev 1496)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanelHandler.java 2008-11-07 18:41:48 UTC (rev 1497)
@@ -13,7 +13,7 @@
// This is the DLLearnerModel.
private DLLearnerModel model;
-//private PosAndNegSelectPanel panel;
+private PosAndNegSelectPanel panel;
// This is the view of the DL-Learner tab.
private OWLClassDescriptionEditorWithDLLearnerTab.DLLearnerView view;
@@ -32,7 +32,7 @@
*/
public PosAndNegSelectPanelHandler(DLLearnerModel m, OWLClassDescriptionEditorWithDLLearnerTab.DLLearnerView v, PosAndNegSelectPanel p) {
model = m;
- //panel = p;
+ panel = p;
view = v;
}
@@ -44,11 +44,11 @@
if (action.getActionCommand().equals("pos")) {
-
+ panel.setExampleToOtherList(true, panel.getNegExampleList().getSelectedValue().toString());
}
if (action.getActionCommand().equals("neg")) {
-
+ panel.setExampleToOtherList(false, panel.getPosExampleList().getSelectedValue().toString());
}
if (action.getActionCommand().equals("?")) {
@@ -125,12 +125,17 @@
* @param m MouseEvent
*/
public void mouseClicked(MouseEvent m) {
- if (view.getSuggestClassPanel().getSuggestList()
- .getSelectedValue() != null) {
+ if (panel.getPosExampleList().getSelectedValue() != null) {
+ panel.getAddToNegPanelButton().setEnabled(true);
} else {
-
+ panel.getAddToNegPanelButton().setEnabled(false);
+ }
+ if (panel.getNegExampleList().getSelectedValue()!= null) {
+ panel.getAddToPosPanelButton().setEnabled(true);
+ } else {
+ panel.getAddToPosPanelButton().setEnabled(false);
+ }
}
-}
/**
* Nothing happens here.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
