Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [930] trunk/src/dl-learner/org/dllearner/tools/ore
|
From: <lor...@us...> - 2008-05-26 17:00:20
|
Revision: 930
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=930&view=rev
Author: lorenz_b
Date: 2008-05-26 10:00:14 -0700 (Mon, 26 May 2008)
Log Message:
-----------
added second list for repair panel
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanel.java
trunk/src/dl-learner/org/dllearner/tools/ore/Main.java
trunk/src/dl-learner/org/dllearner/tools/ore/ORE.java
trunk/src/dl-learner/org/dllearner/tools/ore/OntologyModifierOWLAPI.java
trunk/src/dl-learner/org/dllearner/tools/ore/RepairPanel.java
trunk/src/dl-learner/org/dllearner/tools/ore/RepairPanelDescriptor.java
trunk/src/dl-learner/org/dllearner/tools/ore/WizardController.java
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanel.java 2008-05-26 14:48:00 UTC (rev 929)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanel.java 2008-05-26 17:00:14 UTC (rev 930)
@@ -12,13 +12,10 @@
import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
-import javax.swing.ListSelectionModel;
+import javax.swing.JSlider;
import javax.swing.event.ListSelectionListener;
-import javax.swing.table.DefaultTableModel;
import org.jdesktop.swingx.JXBusyLabel;
-import org.jdesktop.swingx.JXTable;
-import org.jdesktop.swingx.decorator.HighlighterFactory;
import org.jdesktop.swingx.icon.EmptyIcon;
import org.jdesktop.swingx.painter.BusyPainter;
@@ -31,9 +28,6 @@
private javax.swing.JList resultList;
private DefaultListModel model;
- private JXTable resultTable;
- private DefaultTableModel model1;
-
private JLabel statusLabel;
private JXBusyLabel loadingLabel;
@@ -46,11 +40,7 @@
super();
model = new DefaultListModel();
- model1 = new DefaultTableModel();
- model1.addColumn("Description");
- model1.addColumn("Correctness");
-
-
+
JPanel buttonPanel = new JPanel();
startButton = new JButton("Start");
stopButton = new JButton("Stop");
@@ -88,21 +78,23 @@
JPanel contentPanel1 = new JPanel();
JScrollPane scroll = new JScrollPane();
- resultTable = new JXTable(model1 );
- resultTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- resultTable.setHighlighters(HighlighterFactory.createSimpleStriping());
-
-
resultList = new JList(model);
// resultList.setCellRenderer(new ColumnListCellRenderer());
scroll.setPreferredSize(new Dimension(400, 400));
-
scroll.setViewportView(resultList);
+ JSlider noise = new JSlider(JSlider.HORIZONTAL, 0, 100, 0);
+ noise.setMajorTickSpacing(50);
+ noise.setMinorTickSpacing(25);
+ noise.setPaintTicks(true);
+ noise.setPaintLabels(true);
+
contentPanel1.add(scroll);
+ contentPanel1.add(noise);
+
return contentPanel1;
}
@@ -135,10 +127,6 @@
return model;
}
-// public DefaultTableModel getModel() {
-// return model1;
-// }
-
public javax.swing.JList getResultList() {
return resultList;
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/Main.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/Main.java 2008-05-26 14:48:00 UTC (rev 929)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/Main.java 2008-05-26 17:00:14 UTC (rev 930)
@@ -26,7 +26,7 @@
}
Wizard wizard = new Wizard();
wizard.getDialog().setTitle("DL-Learner ORE-Tool");
- wizard.getDialog().setSize(800, 500);
+ wizard.getDialog().setSize(1300, 600);
WizardPanelDescriptor descriptor1 = new IntroductionPanelDescriptor();
wizard.registerWizardPanel(IntroductionPanelDescriptor.IDENTIFIER, descriptor1);
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ORE.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ORE.java 2008-05-26 14:48:00 UTC (rev 929)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ORE.java 2008-05-26 17:00:14 UTC (rev 930)
@@ -2,12 +2,13 @@
import java.io.File;
import java.math.BigDecimal;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.dllearner.algorithms.refinement.ROLearner;
+import org.dllearner.algorithms.refexamples.ExampleBasedROLComponent;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.ComponentManager;
import org.dllearner.core.KnowledgeSource;
@@ -99,7 +100,7 @@
public void setLearningAlgorithm(){
try {
- la = cm.learningAlgorithm(ROLearner.class, lp, rs);
+ la = cm.learningAlgorithm(ExampleBasedROLComponent.class, lp, rs);
} catch (LearningProblemUnsupportedException e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
@@ -147,12 +148,10 @@
double result_tmp = 0.0f;
for(Individual ind : posExamples){
- rs.instanceCheck(d, ind);
if(rs.instanceCheck(d, ind))
numberPosExamples++;
}
for(Individual ind : negExamples){
- rs.instanceCheck(d, ind);
if(!rs.instanceCheck(d, ind))
numberNegExamples++;
}
@@ -164,6 +163,31 @@
}
+
+ public HashSet<Individual> getNegFailureExamples(){
+ HashSet<Individual> negFailureExamples = new HashSet<Individual>() ;
+
+ for(Individual ind : negExamples){
+ if(rs.instanceCheck(conceptToAdd, ind))
+ negFailureExamples.add(ind);
+
+ }
+
+ return negFailureExamples;
+ }
+
+ public SortedSet<Individual> getPosFailureExamples(){
+
+ SortedSet<Individual> posFailureExamples = null ;
+
+ for(Individual ind : posExamples){
+ if(!rs.instanceCheck(conceptToAdd, ind))
+ posFailureExamples.add(ind);
+
+ }
+
+ return posFailureExamples;
+ }
@@ -196,24 +220,24 @@
public static void main(String[] args){
- ORE test = new ORE();
- //File owlFile = new File("examples/family/father.owl");
- File owlFile = new File("src/dl-learner/org/dllearner/tools/ore/father.owl");
-
- test.setKnowledgeSource(owlFile);
-
- test.detectReasoner();
- ReasoningService rs = test.getReasoningService();
- System.err.println("Concepts :" + rs.getAtomicConcepts());
-
-
- test.setConcept(new NamedClass("http://example.com/father#father"));
- test.setPosNegExamples();
- System.out.println(test.posExamples);
- System.out.println(test.negExamples);
- test.setLearningProblem();
- test.setLearningAlgorithm();
- test.start();
+// ORE test = new ORE();
+//
+// File owlFile = new File("src/dl-learner/org/dllearner/tools/ore/father.owl");
+//
+// test.setKnowledgeSource(owlFile);
+//
+// test.detectReasoner();
+// ReasoningService rs = test.getReasoningService();
+// System.err.println("Concepts :" + rs.getAtomicConcepts());
+//
+//
+// test.setConcept(new NamedClass("http://example.com/father#father"));
+// test.setPosNegExamples();
+// System.out.println(test.posExamples);
+// System.out.println(test.negExamples);
+// test.setLearningProblem();
+// test.setLearningAlgorithm();
+// test.start();
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/OntologyModifierOWLAPI.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/OntologyModifierOWLAPI.java 2008-05-26 14:48:00 UTC (rev 929)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/OntologyModifierOWLAPI.java 2008-05-26 17:00:14 UTC (rev 930)
@@ -131,7 +131,7 @@
//Hinzufuegen
OWLDescription newConceptOWLAPI = OWLAPIDescriptionConvertVisitor.getOWLDescription(newConcept);
-
+
OWLAxiom axiomOWLAPI = factory.getOWLClassAssertionAxiom(individualOWLAPI, newConceptOWLAPI);
AddAxiom axiom = new AddAxiom(ontology, axiomOWLAPI);
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/RepairPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/RepairPanel.java 2008-05-26 14:48:00 UTC (rev 929)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/RepairPanel.java 2008-05-26 17:00:14 UTC (rev 930)
@@ -4,6 +4,7 @@
import java.awt.Dimension;
import java.awt.GridLayout;
import java.awt.event.ActionListener;
+import java.awt.event.MouseListener;
import java.awt.geom.Ellipse2D;
import java.awt.geom.RoundRectangle2D;
@@ -25,17 +26,16 @@
private JPanel contentPanel;
- private javax.swing.JList resultList;
- private DefaultListModel model;
+ private JList posFailureList;
+ private JList negFailureList;
+ private DefaultListModel posFailureModel;
+ private DefaultListModel negFailureModel;
private JLabel statusLabel;
private JXBusyLabel loadingLabel;
- private JButton deleteButton;
- private JButton moveButton;
- private JButton addButton;
private JButton saveButton;
@@ -43,18 +43,14 @@
public RepairPanel() {
super();
- model = new DefaultListModel();
-
+ posFailureModel = new DefaultListModel();
+ negFailureModel = new DefaultListModel();
JPanel buttonPanel = new JPanel();
- deleteButton = new JButton("delete");
- moveButton = new JButton("move");
- addButton = new JButton("add property");
+
saveButton = new JButton("save");
- buttonPanel.add(deleteButton);
- buttonPanel.add(moveButton);
- buttonPanel.add(addButton);
+
buttonPanel.add(saveButton);
buttonPanel.setLayout(new GridLayout(5,1,0,10));
@@ -86,36 +82,27 @@
private JPanel getContentPanel() {
JPanel contentPanel1 = new JPanel();
- JScrollPane scroll = new JScrollPane();
+ JScrollPane posScroll = new JScrollPane();
+ posFailureList = new JList(posFailureModel);
+ posScroll.setPreferredSize(new Dimension(400, 400));
+ posScroll.setViewportView(posFailureList);
+ JScrollPane negScroll = new JScrollPane();
+ negFailureList = new JList(negFailureModel);
+ negScroll.setPreferredSize(new Dimension(400, 400));
+ negScroll.setViewportView(negFailureList);
- resultList = new JList(model);
-
- scroll.setPreferredSize(new Dimension(400, 400));
+ contentPanel1.add(posScroll);
+ contentPanel1.add(negScroll);
- scroll.setViewportView(resultList);
-
- contentPanel1.add(scroll);
-
return contentPanel1;
}
- public void addDeleteButtonListener(ActionListener a){
- deleteButton.addActionListener(a);
- }
-
- public void addMoveButtonListener(ActionListener a){
- moveButton.addActionListener(a);
- }
-
- public void addAddButtonListener(ActionListener a){
- addButton.addActionListener(a);
- }
-
+
public void addSaveButtonListener(ActionListener a){
saveButton.addActionListener(a);
}
@@ -128,32 +115,34 @@
return loadingLabel;
}
- public JButton getDeleteButton() {
- return deleteButton;
+ public DefaultListModel getPosFailureModel() {
+ return posFailureModel;
}
-
- public JButton getMoveButton() {
- return moveButton;
+
+ public DefaultListModel getNegFailureModel() {
+ return negFailureModel;
}
- public JButton getAddButton() {
- return addButton;
+ public javax.swing.JList getPosFailureList() {
+ return posFailureList;
}
-
- public DefaultListModel getModel() {
- return model;
- }
- public javax.swing.JList getResultList() {
- return resultList;
+ public javax.swing.JList getNegFailureList() {
+ return negFailureList;
}
public void addSelectionListener(ListSelectionListener l){
- resultList.addListSelectionListener(l);
+ posFailureList.addListSelectionListener(l);
+ negFailureList.addListSelectionListener(l);
}
+ public void addMouseListener(MouseListener m){
+ posFailureList.addMouseListener(m);
+ negFailureList.addMouseListener(m);
+ }
+
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/RepairPanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/RepairPanelDescriptor.java 2008-05-26 14:48:00 UTC (rev 929)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/RepairPanelDescriptor.java 2008-05-26 17:00:14 UTC (rev 930)
@@ -2,6 +2,8 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
@@ -11,7 +13,7 @@
-public class RepairPanelDescriptor extends WizardPanelDescriptor implements ActionListener, ListSelectionListener{
+public class RepairPanelDescriptor extends WizardPanelDescriptor implements ActionListener, ListSelectionListener, MouseListener{
public static final String IDENTIFIER = "REPAIR_PANEL";
@@ -21,11 +23,10 @@
public RepairPanelDescriptor() {
panel4 = new RepairPanel();
- panel4.addDeleteButtonListener(this);
- panel4.addMoveButtonListener(this);
- panel4.addAddButtonListener(this);
+
panel4.addSaveButtonListener(this);
panel4.addSelectionListener(this);
+ panel4.addMouseListener(this);
setPanelDescriptorIdentifier(IDENTIFIER);
setPanelComponent(panel4);
@@ -48,9 +49,10 @@
public void valueChanged(ListSelectionEvent e) {
- if (!e.getValueIsAdjusting())
- System.out.println(panel4.getResultList().getSelectedValue());
+// if (!e.getValueIsAdjusting())
+// System.err.println(panel4.getNegFailureList().getSelectedValue());
+
}
public void actionPerformed(ActionEvent event) {
@@ -58,38 +60,40 @@
getWizardModel().getOre().getModi().saveOntology();
}
- if(event.getActionCommand().equals("delete")){
-
- int idx = panel4.getResultList().getSelectedIndex();
- if (-1 == idx) {
- //No item selected
- return;
- }
- System.out.println("Index: " +idx);
-
-
- getWizardModel().getOre().getModi().deleteIndividual((Individual)panel4.getResultList().getSelectedValue());
- panel4.getModel().removeElementAt(idx);
-
- }
- if(event.getActionCommand().equals("move")){
-
- int idx = panel4.getResultList().getSelectedIndex();
- if (-1 == idx) {
- //No item selected
- return;
- }
- System.out.println(getWizardModel().getOre().allAtomicConcepts);
-
- MoveDialog dialog = new MoveDialog(getWizardModel().getOre().allAtomicConcepts, getWizard().getDialog());
- dialog.init();
- System.err.println("Verschiebe " +(Individual)panel4.getResultList().getSelectedValue()+
- " von " + "......." + " nach " +dialog.getSelectedValue());
+ }
+
+ @Override
+ public void mouseClicked(MouseEvent e) {
-
+ if(e.getClickCount() == 2 && e.getSource() == panel4.getNegFailureList() ){
+ System.out.println(panel4.getNegFailureList().getSelectedValue());
}
+ }
+
+ @Override
+ public void mouseEntered(MouseEvent e) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void mouseExited(MouseEvent e) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void mousePressed(MouseEvent e) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void mouseReleased(MouseEvent e) {
+ // TODO Auto-generated method stub
+
}}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/WizardController.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/WizardController.java 2008-05-26 14:48:00 UTC (rev 929)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/WizardController.java 2008-05-26 17:00:14 UTC (rev 930)
@@ -2,6 +2,7 @@
import java.awt.event.ActionListener;
+import java.util.HashSet;
import java.util.Set;
import java.util.SortedSet;
import java.util.concurrent.ExecutionException;
@@ -73,7 +74,7 @@
}
if( nextPanelDescriptor.equals("REPAIR_PANEL")){
- ((RepairPanelDescriptor)wizard.getModel().getPanelHashMap().get(nextPanelDescriptor)).panel4.getModel().clear();
+ ((RepairPanelDescriptor)wizard.getModel().getPanelHashMap().get(nextPanelDescriptor)).panel4.getNegFailureModel().clear();
wizard.getModel().getOre().getModi().addAxiomToOWL(wizard.getModel().getOre().getConceptToAdd(), wizard.getModel().getOre().getConcept());
new FailInstancesRetriever(nextPanelDescriptor).execute();
}
@@ -230,7 +231,7 @@
}
}
- class FailInstancesRetriever extends SwingWorker<SortedSet<Individual>, Individual> {
+ class FailInstancesRetriever extends SwingWorker<HashSet<Individual>, Individual> {
Object nextPanelID;
public FailInstancesRetriever(Object nextPanelDescriptor) {
@@ -239,25 +240,25 @@
}
@Override
- public SortedSet<Individual> doInBackground() {
+ public HashSet<Individual> doInBackground() {
((RepairPanelDescriptor) wizard.getModel().getPanelHashMap().get(
nextPanelID)).panel4.getStatusLabel().setText(
- "Loading instances");
+ "Loading conflicting instances");
((RepairPanelDescriptor) wizard.getModel().getPanelHashMap().get(
nextPanelID)).panel4.getLoadingLabel().setBusy(true);
- SortedSet<Individual> ind = wizard.getModel().getOre()
- .getReasoningService().getIndividuals();
+ HashSet<Individual> ind = wizard.getModel().getOre()
+ .getNegFailureExamples();
return ind;
}
@Override
public void done() {
- SortedSet<Individual> ind = null;
+ HashSet<Individual> ind = null;
try {
ind = get();
} catch (InterruptedException e) {
@@ -269,20 +270,16 @@
}
RepairPanelDescriptor nextPanel = (RepairPanelDescriptor) wizard
.getModel().getPanelHashMap().get(nextPanelID);
- DefaultListModel dm = ((RepairPanelDescriptor) wizard.getModel().getPanelHashMap().get(
- nextPanelID)).panel4.getModel();
+ DefaultListModel dm = nextPanel.panel4.getNegFailureModel();
for (Individual cl : ind) {
dm.addElement(cl);
- //nextPanel.panel3.getModel().addElement(cl);
System.out.println(cl.getName());
}
- nextPanel.panel4.getResultList().setModel(dm);
- ((RepairPanelDescriptor) wizard.getModel().getPanelHashMap().get(
- nextPanelID)).panel4.getStatusLabel().setText(
+
+ nextPanel.panel4.getStatusLabel().setText(
"Instances loaded");
- ((RepairPanelDescriptor) wizard.getModel().getPanelHashMap().get(
- nextPanelID)).panel4.getLoadingLabel().setBusy(false);
+ nextPanel.panel4.getLoadingLabel().setBusy(false);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
