Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [996] trunk/src/dl-learner/org/dllearner/tools/ protege
|
From: <hee...@us...> - 2008-07-03 12:01:56
|
Revision: 996
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=996&view=rev
Author: heeroyuy
Date: 2008-07-03 05:01:50 -0700 (Thu, 03 Jul 2008)
Log Message:
-----------
-started a panel for more infos for the concept
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/META-INF/MANIFEST.MF
trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java
Added Paths:
-----------
trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java
Removed Paths:
-------------
trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerViewPanel.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2008-06-30 14:37:58 UTC (rev 995)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2008-07-03 12:01:50 UTC (rev 996)
@@ -9,13 +9,15 @@
import javax.swing.event.ListSelectionListener;
import javax.swing.event.ListSelectionEvent;
+import javax.swing.JDialog;
+
import org.dllearner.core.owl.Description;
/**
*
* @author Heero Yuy
*
*/
-public class ActionHandler implements ActionListener, ItemListener, MouseListener, ListSelectionListener{
+public class ActionHandler implements ActionListener, ItemListener, MouseListener, ListSelectionListener{
/**
* This is the DLLearnerModel.
*/
@@ -37,6 +39,7 @@
* This is the view of the DL-Learner tab.
*/
private OWLClassDescriptionEditorWithDLLearnerTab.DLLearnerView view;
+ private JDialog detailDialog;
/**
* This is the constructor for the action handler
* @param a ActionHandler
@@ -132,6 +135,10 @@
view.setExamplePanelVisible(toggled);
}
}
+ if(z.getActionCommand().equals("Why"))
+ {
+ view.getMoreDetailForSuggestedConceptsPanel().renderDetailPanel(model.getEvaluatedDescription());
+ }
}
/**
@@ -226,6 +233,7 @@
{
if(!view.getAddButton().isEnabled())
{
+ view.getWhyButton().setEnabled(true);
view.getAddButton().setEnabled(true);
}
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2008-06-30 14:37:58 UTC (rev 995)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2008-07-03 12:01:50 UTC (rev 996)
@@ -1,8 +1,8 @@
package org.dllearner.tools.protege;
-import java.util.Observable;
import java.util.Set;
import java.util.TreeSet;
+//import java.util.List;
import java.util.Vector;
import java.util.HashSet;
import java.util.Iterator;
@@ -16,6 +16,7 @@
import org.dllearner.core.owl.Description;
import org.dllearner.core.KnowledgeSource;
+import org.dllearner.core.EvaluatedDescription;
import org.dllearner.core.LearningAlgorithm;
import org.dllearner.core.LearningProblem;
import org.dllearner.core.ComponentManager;
@@ -51,12 +52,12 @@
-/**
+/**2
* This Class provides the necessary methods to learn Concepts from the DL-Learner.
* @author Heero Yuy
*
*/
-public class DLLearnerModel extends Observable implements Runnable{
+public class DLLearnerModel implements Runnable{
/**
* The Sting is for components that are available in the DL-Learner
*/
@@ -175,7 +176,7 @@
*
*/
private OWLAxiom axiomOWLAPI;
-
+ private EvaluatedDescription evalDescription;
/**
* This is the constructor for DL-Learner model
* @param editorKit
@@ -224,9 +225,10 @@
*/
private void addToListModel()
{
+ evalDescription = la.getCurrentlyBestEvaluatedDescription();
for(int j = 0;j<la.getCurrentlyBestEvaluatedDescriptions(anzahl).size();j++)
{
- suggestModel.add(j,la.getCurrentlyBestEvaluatedDescriptions(anzahl).get(j));
+ suggestModel.add(j,la.getCurrentlyBestEvaluatedDescriptions(anzahl).get(j).getDescription());
}
}
@@ -356,7 +358,6 @@
addToListModel();
view.renderErrorMessage(error);
view.getRunButton().setEnabled(true);
- //view.getPosAndNegSelectPanel().unsetCheckBoxes();
view.getCancelButton().setEnabled(false);
view.getSuggestClassPanel().setSuggestList(suggestModel);
}
@@ -426,6 +427,10 @@
}
}
+ public EvaluatedDescription getEvaluatedDescription()
+ {
+ return evalDescription;
+ }
/**
* This method resets the Concepts that are learned.
*/
Deleted: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerViewPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerViewPanel.java 2008-06-30 14:37:58 UTC (rev 995)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerViewPanel.java 2008-07-03 12:01:50 UTC (rev 996)
@@ -1,43 +0,0 @@
-package org.dllearner.tools.protege;
-
-import org.protege.editor.core.ui.view.ViewComponent;
-import org.protege.editor.core.ui.view.ViewComponentPlugin;
-import org.protege.editor.core.ui.view.ViewComponentPluginAdapter;
-import org.protege.editor.core.ui.workspace.Workspace;
-import org.protege.editor.owl.ui.clshierarchy.ToldOWLClassHierarchyViewComponent;
-import org.protege.editor.owl.ui.selector.AbstractSelectorPanel;
-import org.protege.editor.owl.OWLEditorKit;
-
-public class DLLearnerViewPanel extends AbstractSelectorPanel {
-
-
- private ToldOWLClassHierarchyViewComponent viewComponent;
- private final static long serialVersionUID = 3546352435L;
- public DLLearnerViewPanel(OWLEditorKit editor)
- {
- super(editor);
- }
-
- @Override
- protected ViewComponentPlugin getViewComponentPlugin() {
-
- return new ViewComponentPluginAdapter() {
- public String getLabel() {
- return "OWL Asserted Class Hierarchy";
- }
-
-
- public Workspace getWorkspace() {
- return getOWLEditorKit().getOWLWorkspace();
- }
-
-
- public ViewComponent newInstance() throws ClassNotFoundException, IllegalAccessException,
- InstantiationException {
- viewComponent = new ToldOWLClassHierarchyViewComponent();
- viewComponent.setup(this);
- return viewComponent;
- }
-
-};
- }}
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 2008-06-30 14:37:58 UTC (rev 995)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/META-INF/MANIFEST.MF 2008-07-03 12:01:50 UTC (rev 996)
@@ -6,7 +6,7 @@
Bundle-Description: blablabla
Bundle-Vendor: blablabla
Bundle-DocURL: blablabla
-Bundle-ClassPath: .,lib/junit-4.4.jar,lib/pellet/pellet.jar,lib/pellet/aterm-java-1.6.jar,lib/pellet/relaxngDatatype.jar,lib/pellet/xsdlib.jar,lib/jena/commons-logging-1.1.jar
+Bundle-ClassPath: .,lib/junit-4.4.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.jar
Import-Package: org.osgi.framework,org.apache.log4j
Export-Package: lib
Bundle-Version: 1.0.0
Added: trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2008-07-03 12:01:50 UTC (rev 996)
@@ -0,0 +1,72 @@
+package org.dllearner.tools.protege;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.swing.JPanel;
+import javax.swing.JLabel;
+import javax.swing.JScrollPane;
+import javax.swing.JDialog;
+
+import java.awt.GridLayout;
+
+import org.dllearner.core.EvaluatedDescription;
+
+import org.dllearner.core.owl.Individual;
+public class MoreDetailForSuggestedConceptsPanel extends JPanel{
+
+ private static final long serialVersionUID = 785272797932584581L;
+
+ private DLLearnerModel model;
+
+ private JLabel accuracy;
+ private JPanel accuracyPanel;
+ private JPanel coveredExamplesPanel;
+
+ private JLabel coveredExamples;
+
+ private JDialog detailPopup;
+
+ private JScrollPane detailScroll;
+
+ private JPanel detailPanel;
+ private EvaluatedDescription evalDescription;
+ public MoreDetailForSuggestedConceptsPanel(DLLearnerModel model)
+ {
+ this.model = model;
+ }
+
+ public JDialog getMoreDialog()
+ {
+ return detailPopup;
+ }
+
+ public JScrollPane getDetailScrollPane()
+ {
+ return detailScroll;
+ }
+
+ public void renderDetailPanel(EvaluatedDescription eval)
+ {
+ this.evalDescription = eval;
+ accuracy = new JLabel("Accuracy:");
+ coveredExamples = new JLabel("Covered Examples:");
+ detailPopup = new JDialog();
+ detailPopup.setSize(300, 300);
+ accuracyPanel = new JPanel(new GridLayout(0,1));
+ coveredExamplesPanel = new JPanel(new GridLayout(0,1));
+ detailScroll = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+ detailPanel = new JPanel(new GridLayout(0,2));
+ accuracyPanel.add(new JLabel(String.valueOf(evalDescription.getAccuracy())));
+ Set<Individual> posCovered = evalDescription.getCoveredPositives();
+ for(Iterator<Individual> i = posCovered.iterator(); i.hasNext();)
+ {
+ coveredExamplesPanel.add(new JLabel(i.next().toString()));
+ }
+ detailPanel.add(accuracy);
+ detailPanel.add(accuracyPanel);
+ detailPanel.add(coveredExamples);
+ detailPanel.add(coveredExamplesPanel);
+ detailScroll.setViewportView(detailPanel);
+ detailPopup.add(detailScroll);
+ }
+}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java 2008-06-30 14:37:58 UTC (rev 995)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java 2008-07-03 12:01:50 UTC (rev 996)
@@ -261,10 +261,6 @@
*
*/
private final static long serialVersionUID = 624829578325729385L;
- /**
- *
- */
- private DLLearnerViewPanel panel;
/**
*
*/
@@ -280,7 +276,7 @@
/**
*
*/
- private OWLEditorKit editor;
+
/**
*
*/
@@ -312,26 +308,31 @@
/**
*
*/
-
private SuggestClassPanel sugPanel;
+ /**
+ *
+ */
private PosAndNegSelectPanel posPanel;
+ /**
+ *
+ */
private ImageIcon icon;
+ /**
+ *
+ */
private ImageIcon toggledIcon;
/**
*
- * @return
*/
- public DLLearnerViewPanel getDLLearnerViewPanel()
- {
- return panel;
- }
+ private JButton why;
+ private MoreDetailForSuggestedConceptsPanel detail;
/**
* The constructor for the DL-Learner tab in the class description editor
* @param aktuell
* @param label
*/
- public DLLearnerView(OWLFrame<OWLClass> aktuell,String label){
- editor = editorKit;
+ public DLLearnerView(OWLFrame<OWLClass> aktuell,String label)
+ {
classSelectorPanel = new OWLClassSelectorPanel(editorKit);
classSelectorPanel.firePropertyChange("test", false, true);
URL iconUrl = this.getClass().getResource("pfeil.gif");
@@ -339,7 +340,6 @@
URL toggledIconUrl = this.getClass().getResource("pfeil2.gif");
toggledIcon = new ImageIcon(toggledIconUrl);
model = new DLLearnerModel(editorKit,aktuell, label,this);
- panel = new DLLearnerViewPanel(editor);
sugPanel = new SuggestClassPanel();
action = new ActionHandler(this.action, model,this,label);
adv = new JLabel("Advanced");
@@ -348,6 +348,7 @@
run = new JButton("Suggest "+label);
cancel = new JButton("Cancel");
accept = new JButton("ADD");
+ why = new JButton("Why");
sugPanel.addSuggestPanelMouseListener(action);
errorMessage = new JLabel();
learner = new JPanel();
@@ -361,6 +362,7 @@
addRunButtonListener(this.action);
addCancelButtonListener(this.action);
addAdvancedButtonListener(this.action);
+ addWhyButtonListener(this.action);
}
@@ -379,6 +381,7 @@
*/
public void makeView()
{
+ why.setEnabled(false);
advanced.setIcon(icon);
model.clearVector();
model.unsetListModel();
@@ -390,6 +393,7 @@
action.resetToggled();
sugPanel.setSuggestList(model.getSuggestList());
sugPanel = sugPanel.updateSuggestClassList();
+ why.setBounds(10,160,200,30);
advanced.setSelected(false);
sugPanel.setBounds(10,40,490,110);
adv.setBounds(40,200,200,20);
@@ -400,9 +404,10 @@
posPanel.setBounds(10, 230, 490, 250);
cancel.setBounds(260,0,200,30);
accept.setBounds(510,40,80,110);
- errorMessage.setBounds(10,160,590,20);
+ errorMessage.setBounds(220,160,300,20);
learner.add(run);
learner.add(adv);
+ learner.add(why);
learner.add(advanced);
learner.add(cancel);
learner.add(sugPanel);
@@ -410,6 +415,7 @@
learner.add(errorMessage);
learner.add(posPanel);
posPanel.addHelpButtonListener(action);
+ detail = new MoreDetailForSuggestedConceptsPanel(model);
add(learner);
}
public void setIconToggled(boolean toggled)
@@ -423,10 +429,7 @@
advanced.setIcon(icon);
}
}
- public void setArrowForToggleButton()
- {
-
- }
+
/**
*
* @return
@@ -435,6 +438,11 @@
{
return learner;
}
+
+ public JButton getWhyButton()
+ {
+ return why;
+ }
/**
*
* @param visible
@@ -500,6 +508,10 @@
errorMessage.setText(s);
}
+ public MoreDetailForSuggestedConceptsPanel getMoreDetailForSuggestedConceptsPanel()
+ {
+ return detail;
+ }
/**
*
* @return
@@ -522,7 +534,11 @@
public void dispose() {
}
-
+
+ public void addWhyButtonListener(ActionListener a)
+ {
+ why.addActionListener(a);
+ }
/**
*
* @param a
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
