Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1860] trunk/src/dl-learner/org/dllearner/tools/ore
|
From: <lor...@us...> - 2009-09-24 08:51:13
|
Revision: 1860
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1860&view=rev
Author: lorenz_b
Date: 2009-09-24 08:51:02 +0000 (Thu, 24 Sep 2009)
Log Message:
-----------
some gui fixes
cleaned up code
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/ore/OREManager.java
trunk/src/dl-learner/org/dllearner/tools/ore/Sparql.java
trunk/src/dl-learner/org/dllearner/tools/ore/TaskManager.java
trunk/src/dl-learner/org/dllearner/tools/ore/explanation/LaconicTest.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/DescriptionLabel.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/StatusBar.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/Wizard.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/InconsistencyExplanationPanelDescriptor.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/KnowledgeSourcePanelDescriptor.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/UnsatisfiableExplanationPanelDescriptor.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/UnsatisfiableExplanationPanel.java
Removed Paths:
-------------
trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExtractFromSparqlPanel.java
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/OREManager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/OREManager.java 2009-09-23 12:23:52 UTC (rev 1859)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/OREManager.java 2009-09-24 08:51:02 UTC (rev 1860)
@@ -25,6 +25,7 @@
import org.dllearner.core.owl.Individual;
import org.dllearner.core.owl.Intersection;
import org.dllearner.core.owl.NamedClass;
+import org.dllearner.core.owl.ObjectPropertyExpression;
import org.dllearner.core.owl.Union;
import org.dllearner.kb.OWLFile;
import org.dllearner.kb.sparql.SparqlKnowledgeSource;
@@ -32,7 +33,12 @@
import org.dllearner.learningproblems.EvaluatedDescriptionClass;
import org.dllearner.reasoning.PelletReasoner;
import org.dllearner.tools.ore.ui.DescriptionLabel;
+import org.dllearner.utilities.owl.OWLAPIConverter;
import org.mindswap.pellet.exceptions.InconsistentOntologyException;
+import org.mindswap.pellet.utils.SetUtils;
+import org.semanticweb.owl.model.OWLDataFactory;
+import org.semanticweb.owl.model.OWLDescription;
+import org.semanticweb.owl.model.OWLObjectProperty;
import org.semanticweb.owl.model.OWLOntologyCreationException;
public class OREManager {
@@ -144,6 +150,7 @@
e.printStackTrace();
}
reasoner.loadOntologies();
+ reasoner.addProgressMonitor(TaskManager.getInstance().getStatusBar());
baseURI = reasoner.getBaseURI();
prefixes = reasoner.getPrefixes();
modifier = new OntologyModifier(reasoner);
@@ -447,7 +454,6 @@
Set<Individual> allIndividuals = new HashSet<Individual>();
-
for(Individual i : reasoner.getIndividuals()){
if(!reasoner.hasType(desc, i)){
@@ -456,10 +462,36 @@
}
allIndividuals.remove(ind);
+ System.out.println();
return allIndividuals;
}
+ public boolean isAssertable(ObjectPropertyExpression role, Individual ind){
+ OWLDataFactory factory = reasoner.getOWLOntologyManager().getOWLDataFactory();
+ OWLObjectProperty property = factory.getOWLObjectProperty(URI.create(role.getName()));
+
+ //get the objectproperty domains
+ Set<OWLDescription> domains = SetUtils.union(getReasoner().getReasoner().getDomains(property));
+
+ //get the classes where the individual belongs to
+ Set<NamedClass> classes = reasoner.getTypes(ind);
+
+ //get the complements of the classes, the individual belongs to
+ Set<Description> complements = new HashSet<Description>();
+ for(NamedClass nc : classes){
+ complements.addAll(reasoner.getComplementClasses(nc));
+ }
+
+ for(OWLDescription domain : domains){
+ if(complements.contains(OWLAPIConverter.convertClass(domain.asOWLClass()))){
+ System.out.println(domain);
+ return false;
+ }
+ }
+ return true;
+ }
+
/**
* Returns classes where individual might moved to.
* @param ind the individual
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/Sparql.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/Sparql.java 2009-09-23 12:23:52 UTC (rev 1859)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/Sparql.java 2009-09-24 08:51:02 UTC (rev 1860)
@@ -1,7 +1,6 @@
package org.dllearner.tools.ore;
import java.net.MalformedURLException;
-import java.net.URL;
import org.dllearner.kb.sparql.SPARQLTasks;
import org.dllearner.kb.sparql.SparqlEndpoint;
@@ -13,8 +12,7 @@
* @throws MalformedURLException
*/
public static void main(String[] args) throws MalformedURLException {
- URL url = new URL("http://dbpedia.org/sparql");
- SPARQLTasks task = new SPARQLTasks(SparqlEndpoint.getEndpointDBpedia());//new SparqlEndpoint(url));
+ SPARQLTasks task = new SPARQLTasks(SparqlEndpoint.getEndpointDBpedia());
String queryString = "SELECT DISTINCT ?class WHERE {?class rdf:type owl:Class ." +
"?class rdfs:label ?label . FILTER(regex(?label, \"City\")) }";
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/TaskManager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/TaskManager.java 2009-09-23 12:23:52 UTC (rev 1859)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/TaskManager.java 2009-09-24 08:51:02 UTC (rev 1860)
@@ -3,7 +3,6 @@
import java.awt.Cursor;
import javax.swing.JFrame;
-import javax.swing.SwingWorker;
import org.dllearner.tools.ore.ui.StatusBar;
@@ -11,9 +10,6 @@
private static TaskManager instance;
- private SwingWorker<?, ?> currentTask;
-
-
private StatusBar statusBar;
private JFrame dialog;
@@ -40,29 +36,15 @@
return dialog;
}
- public void setCurrentTask(SwingWorker<?, ?> task){
- this.currentTask = task;
- }
-
- public void cancelCurrentTask(){
- if(currentTask != null && !currentTask.isCancelled() && !currentTask.isDone()){
- currentTask.cancel(true);
- }
-// statusBar.setProgressTitle("Canceled");
-// dialog.setCursor(null);
- }
-
-
-
public void setTaskStarted(String message){
dialog.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
- statusBar.setProgressTitle(message);
+ statusBar.setMessage(message);
statusBar.showProgress(true);
}
public void setTaskFinished(){
dialog.setCursor(null);
- statusBar.setProgressTitle("Done");
+ statusBar.setMessage("Done");
statusBar.showProgress(false);
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/explanation/LaconicTest.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/explanation/LaconicTest.java 2009-09-23 12:23:52 UTC (rev 1859)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/explanation/LaconicTest.java 2009-09-24 08:51:02 UTC (rev 1860)
@@ -3,13 +3,11 @@
import java.io.PrintWriter;
import java.net.URI;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Set;
import org.dllearner.tools.ore.explanation.laconic.LaconicExplanationGenerator;
import org.mindswap.pellet.owlapi.PelletReasonerFactory;
import org.mindswap.pellet.owlapi.Reasoner;
-import org.mindswap.pellet.utils.progress.SwingProgressMonitor;
import org.semanticweb.owl.apibinding.OWLManager;
import org.semanticweb.owl.inference.OWLReasoner;
import org.semanticweb.owl.inference.OWLReasonerException;
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/DescriptionLabel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/DescriptionLabel.java 2009-09-23 12:23:52 UTC (rev 1859)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/DescriptionLabel.java 2009-09-24 08:51:02 UTC (rev 1860)
@@ -133,7 +133,7 @@
menu.add(new RemoveAllPropertyAssertionsToMenuItem(((ObjectSomeRestriction) desc).getRole(), ((ObjectSomeRestriction) desc).getChild(0))); //2.b remove property assertions with objects in range
}
} else if(desc instanceof ObjectAllRestriction){ //3. description is a object all restriction
- if (!(desc.getChild(0) instanceof Thing)) {
+ if (!(desc.getChild(0) instanceof Thing)) {System.out.println(ore.isAssertable(((ObjectAllRestriction)desc).getRole(), ind));
JMenu dme = new JMenu("add property assertion " + ((ObjectAllRestriction) desc).getRole().toKBSyntaxString(baseURI, prefixes) //3.a add property assertion with object not in range
+ " with object ...");
for (Individual i : ore.getIndividualsNotInPropertyRange(desc.getChild(0), ind)){
Deleted: trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExtractFromSparqlPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExtractFromSparqlPanel.java 2009-09-23 12:23:52 UTC (rev 1859)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExtractFromSparqlPanel.java 2009-09-24 08:51:02 UTC (rev 1860)
@@ -1,348 +0,0 @@
-package org.dllearner.tools.ore.ui;
-
-import java.awt.Dimension;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.swing.AbstractAction;
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-import javax.swing.JToggleButton;
-import javax.swing.ProgressMonitor;
-import javax.swing.SwingWorker;
-import javax.swing.border.TitledBorder;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-
-import org.dllearner.core.ComponentManager;
-import org.dllearner.kb.sparql.SPARQLTasks;
-import org.dllearner.kb.sparql.SparqlEndpoint;
-import org.dllearner.kb.sparql.SparqlKnowledgeSource;
-import org.dllearner.utilities.datastructures.SetManipulation;
-import org.dllearner.utilities.examples.AutomaticPositiveExampleFinderSPARQL;
-import org.jdesktop.swingx.autocomplete.AutoCompleteDecorator;
-
-public class ExtractFromSparqlPanel extends JPanel implements DocumentListener, ActionListener, PropertyChangeListener{
-
- /**
- *
- */
- private static final long serialVersionUID = -2164059829630727931L;
-
-
- private JComboBox comboBox;
- private JTextField classField;
- private JTextField defaultGraphField;
-
- private JRadioButton asLabelButton;
- private JRadioButton asURLButton;
-
- private JButton extractButton;
-
- private GridBagConstraints c;
-
- private SPARQLTasks task;
- private SparqlKnowledgeSource ks;
- private OntologyExtractingTask extractTask;
- private ProgressMonitor mon;
- private List<SparqlEndpoint> endpoints;
-
- private SparqlExtractOptionsPanel optionsPanel;
-
- public ExtractFromSparqlPanel(){
-
- setLayout(new GridBagLayout());
- c = new GridBagConstraints();
- c.fill = GridBagConstraints.HORIZONTAL;
- c.weightx = 1.0;
- c.gridwidth = GridBagConstraints.REMAINDER;
-
- JPanel endPointHolderPanel = new JPanel();
- endPointHolderPanel.setLayout(new GridLayout(0, 1));
- endPointHolderPanel.setBorder(new TitledBorder("Sparql endpoint"));
- comboBox = new JComboBox();
- comboBox.setEditable(true);
- AutoCompleteDecorator.decorate(this.comboBox);
- endPointHolderPanel.add(new JLabel("URL"));
- endPointHolderPanel.add(comboBox);
- defaultGraphField = new JTextField();
- endPointHolderPanel.add(new JLabel("Default graph URI"));
- endPointHolderPanel.add(defaultGraphField);
- add(endPointHolderPanel, c);
-
-
- JPanel classHolderPanel = new JPanel();
- classHolderPanel.setLayout(new GridLayout(0, 1));
- classHolderPanel.setBorder(new TitledBorder("Class to learn"));
- asLabelButton = new JRadioButton("label");
- asURLButton = new JRadioButton("URI");
- asURLButton.setSelected(true);
- ButtonGroup bG = new ButtonGroup();
- bG.add(asLabelButton);
- bG.add(asURLButton);
- JPanel buttonPanel = new JPanel();
- buttonPanel.add(new JLabel("input type:"));
- buttonPanel.add(asURLButton);
- buttonPanel.add(asLabelButton);
-
- classHolderPanel.add(buttonPanel);
- classField = new JTextField();
- classField.getDocument().addDocumentListener(this);
- classHolderPanel.add(classField);
- add(classHolderPanel, c);
-
- extractButton = new JButton("extract");
- extractButton.addActionListener(this);
- c.fill = GridBagConstraints.NONE;
- add(extractButton, c);
-
-
-// JToggleButton button = new JToggleButton(new AbstractAction("Options") {
-//
-// @Override
-// public void actionPerformed(ActionEvent e) {
-// JToggleButton button = (JToggleButton)e.getSource();
-//
-// if(!button.getModel().isSelected()){
-//
-// collapseOptionsPanel();
-// } else {
-// expandOptionsPanel();
-// }
-//
-//
-// }
-// });
-//
-//
-// add(button, c);
-
-
- optionsPanel = new SparqlExtractOptionsPanel();
- add(optionsPanel, c);
-// optionsPanel.setVisible(false);
- JLabel padding = new JLabel();
- c.weighty = 1.0;
- add(padding, c);
-
- }
-
- private void expandOptionsPanel(){
- Dimension dialogSize = getSize ();
- Dimension detailSize = optionsPanel.getPreferredSize ();
- dialogSize.height += detailSize.height;
- setSize (dialogSize);
- optionsPanel.setVisible(true);
- // Cause the new layout to take effect
- invalidate ();
- validate ();
-
- }
-
- private void collapseOptionsPanel(){
- optionsPanel.setVisible(false);
- }
-
-
-
-
- private void extract() {
- mon = new ProgressMonitor(this, "Extracting fragment", "", 0, 100);
-
- extractTask = new OntologyExtractingTask(mon);
- extractTask.addPropertyChangeListener(this);
- extractTask.execute();
-
-
- }
-
- private String getClassFromLabel(){
-
- String queryString = "SELECT DISTINCT ?class WHERE {" +
- "?class rdf:type owl:Class ." +
- "?class rdfs:label ?label . " +
- "FILTER(regex(?label, '" + classField.getText() + "')) }";
- SortedSet<String> classes = task.queryAsSet(queryString, "class");
-
- return classes.iterator().next();
- }
- private void autocomplete(){
-
-
-
-
-
- }
-
- public static SparqlKnowledgeSource showDialog() {
-
- ExtractFromSparqlPanel panel = new ExtractFromSparqlPanel();
-
- int ret = JOptionPaneEx.showConfirmDialog(null,
- "Extract fragment from Sparql-Endpoint",
- new JScrollPane(panel),
- JOptionPane.PLAIN_MESSAGE,
- JOptionPane.OK_CANCEL_OPTION,
- panel.comboBox);
- if (ret == JOptionPane.OK_OPTION) {
- return panel.ks;
- }
- return null;
- }
-
-
- @Override
- public void changedUpdate(DocumentEvent e) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void insertUpdate(DocumentEvent e) {
-// autocomplete();
-
- }
-
- @Override
- public void removeUpdate(DocumentEvent e) {
- // TODO Auto-generated method stub
-
- }
-
-
- @Override
- public void actionPerformed(ActionEvent e) {
- extract();
-
- }
-
- @Override
- public void propertyChange(PropertyChangeEvent evt) {
- if ("progress" == evt.getPropertyName() ) {
- if(mon.isCanceled()){
- extractTask.cancel(true);
- }
- }
-
- }
-
- class OntologyExtractingTask extends SwingWorker<Void, Void>{
-
- private ProgressMonitor mon;
-
- public OntologyExtractingTask(ProgressMonitor mon) {
- this.mon = mon;
- }
-
- @Override
- public Void doInBackground() {
- ComponentManager cm = ComponentManager.getInstance();
- URL endpointURL = null;
- try {
- endpointURL = new URL(comboBox.getSelectedItem().toString());
- } catch (MalformedURLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- List<String> defaultGraphURIS = new ArrayList<String>(1);
- defaultGraphURIS.add(defaultGraphField.getText());
- SparqlEndpoint endpoint = new SparqlEndpoint(endpointURL, defaultGraphURIS, Collections.<String>emptyList());
- task = new SPARQLTasks(endpoint);
-
- String exampleClassKBString = "\"" + getClassFromLabel() + "\"";
-
- AutomaticPositiveExampleFinderSPARQL pos = new AutomaticPositiveExampleFinderSPARQL(
- task);
- pos.makePositiveExamplesFromConcept(exampleClassKBString);
-
- SortedSet<String> allPosExamples = pos.getPosExamples();
- SortedSet<String> posExamples = SetManipulation.stableShrink(
- allPosExamples, 20);
- System.out.println(posExamples.size());
- System.out.println(posExamples);
- SortedSet<String> instances = new TreeSet<String>(posExamples);
-
- ks = cm.knowledgeSource(SparqlKnowledgeSource.class);
- ks.getConfigurator().setUrl(SparqlEndpoint.getEndpointDBpedia().getURL());
- ks.getConfigurator().setInstances(instances);
- ks.getConfigurator().setPredefinedFilter("YAGO");
- ks.getConfigurator().setBreakSuperClassRetrievalAfter(optionsPanel.getBreakSuperClassRetrievalAfterValue());
- ks.getConfigurator().setRecursionDepth(optionsPanel.getRecursionDepthValue());
- ks.getConfigurator().setUseCache(optionsPanel.isUseCache());
- ks.getConfigurator().setGetAllSuperClasses(optionsPanel.isGetAllSuperClasses());
- ks.getConfigurator().setDissolveBlankNodes(optionsPanel.isDissolveBlankNodes());
- ks.getConfigurator().setUseImprovedSparqlTupelAquisitor(optionsPanel.isUseImprovedSparqlTupelAquisitor());
- ks.getConfigurator().setUseLits(optionsPanel.isUseLiterals());
- ks.getConfigurator().setGetPropertyInformation(optionsPanel.isGetPropertyInformation());
- ks.getConfigurator().setCloseAfterRecursion(optionsPanel.isCloseAfterRecursion());
- ks.addProgressMonitor(mon);
-
- ks.init();
-
- return null;
- }
-
- @Override
- public void done() {
- mon.setProgress(0);
- }
- }
-
- private static class JOptionPaneEx extends JOptionPane {
-
- /**
- *
- */
- private static final long serialVersionUID = -8531422911783932819L;
-
- public static int showConfirmDialog(JComponent parent, String title, JComponent content, int messageType,
- int optionType, final JComponent defaultFocusedComponent) {
-
- JOptionPane optionPane = new JOptionPane(content, messageType, optionType);
- JDialog dlg = optionPane.createDialog(parent, title);
- dlg.addWindowListener(new WindowAdapter() {
- public void windowOpened(WindowEvent e) {
- if (defaultFocusedComponent != null) {
- defaultFocusedComponent.requestFocusInWindow();
- }
- }
- });
- dlg.setSize(400, 300);
- dlg.setResizable(true);
- dlg.setVisible(true);
- Object value = optionPane.getValue();
- return (value != null) ? (Integer) value : JOptionPane.CLOSED_OPTION;
- }
- }
-
-
- public static void main(String[] args){
- ExtractFromSparqlPanel.showDialog();
- }
-
-
-
-}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/StatusBar.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/StatusBar.java 2009-09-23 12:23:52 UTC (rev 1859)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/StatusBar.java 2009-09-24 08:51:02 UTC (rev 1860)
@@ -3,7 +3,6 @@
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
-import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.Graphics;
@@ -36,21 +35,17 @@
private static final long serialVersionUID = 1L;
private JLabel infoLabel;
private JProgressBar progressBar;
- private int progress = 0;
- private int progressLength = 0;
- private int progressPercent = -1;
- private String progressMessage;
+
private boolean isIndeterminateMode;
private boolean isCanceled = false;
public StatusBar() {
+ setLayout(new BorderLayout());
infoLabel = new JLabel("");
progressBar = new JProgressBar();
-// progressBar.setStringPainted(true);
- setLayout(new BorderLayout());
-// setPreferredSize(new Dimension(10, 23));
+
JPanel rightPanel = new JPanel(new BorderLayout());
rightPanel.add(new JLabel(new AngledLinesWindowsCornerIcon()),
BorderLayout.SOUTH);
@@ -68,7 +63,17 @@
rB.setToolTipText("Abort");
// leftPanel.add(rB);
- leftPanel.add(new Cancel());
+ Cancel cancelButton = new Cancel();
+ cancelButton.addActionListener(new ActionListener() {
+
+ @Override
+ public void actionPerformed(ActionEvent arg0) {
+ isCanceled = true;
+ System.out.println("Task canceled");
+ }
+ });
+ cancelButton.setToolTipText("Abort current task");
+ leftPanel.add(cancelButton);
leftPanel.add(progressBar);
leftPanel.add(new JSeparator(JSeparator.VERTICAL));
@@ -125,113 +130,82 @@
}
- @Override
- public int getProgress() {
- return progress;
- }
+
@Override
- public int getProgressPercent() {
- return progressPercent;
+ public void foundAllExplanations() {
+ // TODO Auto-generated method stub
+
}
@Override
- public void incrementProgress() {
- SwingUtilities.invokeLater(new Runnable() {
-
- @Override
- public void run() {
- setProgress(progress + 1);
-
- }
- });
+ public void foundExplanation(Set<OWLAxiom> explanation) {
+ System.out.println(explanation);
}
@Override
- public boolean isCanceled() {
+ public boolean isCancelled() {
return isCanceled;
}
@Override
- public void setProgress(int progress) {
- this.progress = progress;
- updateProgress();
-
+ public int getProgress() {
+ // TODO Auto-generated method stub
+ return 0;
}
@Override
- public void setProgressLength(int length) {
- progressLength = length;
- SwingUtilities.invokeLater(new Runnable() {
-
- @Override
- public void run() {
- progressBar.setMaximum(progressLength);
-
- }
- });
-
-
-
-
-
+ public int getProgressPercent() {
+ // TODO Auto-generated method stub
+ return 0;
}
@Override
- public void setProgressMessage(String message) {
- progressMessage = message;
- infoLabel.setText(message);
+ public void incrementProgress() {
+ // TODO Auto-generated method stub
-
}
@Override
- public void setProgressTitle(String title) {
- infoLabel.setText(title);
-
+ public boolean isCanceled() {
+ return isCanceled;
}
@Override
- public void taskFinished() {
- setCursor(null);
+ public void setProgress(int arg0) {
+ // TODO Auto-generated method stub
}
@Override
- public void taskStarted() {
- setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+ public void setProgressLength(int arg0) {
+ // TODO Auto-generated method stub
}
-
- private void updateProgress(){
- SwingUtilities.invokeLater(new Runnable(){
- @Override
- public void run() {
- progressBar.setValue(progress);
-
-
- }
-
- });
+ @Override
+ public void setProgressMessage(String arg0) {
+ // TODO Auto-generated method stub
+
}
@Override
- public void foundAllExplanations() {
+ public void setProgressTitle(String arg0) {
// TODO Auto-generated method stub
}
@Override
- public void foundExplanation(Set<OWLAxiom> explanation) {
- System.out.println(explanation);
+ public void taskFinished() {
+ // TODO Auto-generated method stub
}
@Override
- public boolean isCancelled() {
- return isCanceled;
+ public void taskStarted() {
+ // TODO Auto-generated method stub
+
}
@@ -346,6 +320,11 @@
class Cancel extends JButton {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 4624954971172916869L;
+
public Cancel() {
super();
setIcon(new ImageIcon(
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/Wizard.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/Wizard.java 2009-09-23 12:23:52 UTC (rev 1859)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/Wizard.java 2009-09-24 08:51:02 UTC (rev 1860)
@@ -143,6 +143,7 @@
public void windowClosing(WindowEvent e) {
System.out.println("Exited application");
wizardDialog.dispose();
+ System.exit(0);
}
});
@@ -366,6 +367,7 @@
returnCode = code;
System.out.println("Exited application");
wizardDialog.dispose();
+ System.exit(0);
}
/**
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/InconsistencyExplanationPanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/InconsistencyExplanationPanelDescriptor.java 2009-09-23 12:23:52 UTC (rev 1859)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/InconsistencyExplanationPanelDescriptor.java 2009-09-24 08:51:02 UTC (rev 1860)
@@ -45,8 +45,7 @@
private void showExplanations(){
ExplanationTask task = new ExplanationTask();
- TaskManager.getInstance().setCurrentTask(task);
- TaskManager.getInstance().setTaskStarted("Computing explanations");
+ TaskManager.getInstance().setTaskStarted("Computing explanations...");
task.execute();
}
@@ -115,6 +114,7 @@
if(!isCancelled()){
showExplanations();
}
+ TaskManager.getInstance().setTaskFinished();
}
private void showExplanations(){
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/KnowledgeSourcePanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/KnowledgeSourcePanelDescriptor.java 2009-09-23 12:23:52 UTC (rev 1859)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/KnowledgeSourcePanelDescriptor.java 2009-09-24 08:51:02 UTC (rev 1860)
@@ -106,7 +106,7 @@
public void loadOntology(URI uri){
OREManager.getInstance().setCurrentKnowledgeSource(uri);
currentURI = uri;
- TaskManager.getInstance().setTaskStarted("Loading ontology");
+ TaskManager.getInstance().setTaskStarted("Loading ontology...");
new OntologyLoadingTask(getWizard().getStatusBar()).execute();
}
@@ -172,10 +172,6 @@
}
private void handleOpenFromRecent(URI uri){
-// currentURI = uri;
-// OREManager.getInstance().setCurrentKnowledgeSource(
-// uri);
-// new OntologyLoadingTask(getWizard().getStatusBar()).execute();
loadOntology(uri);
}
@@ -206,9 +202,9 @@
RecentManager.getInstance().addURI(currentURI);
RecentManager.getInstance().serialize();
if(oreMan.consistentOntology()){
- statusBar.setProgressTitle("Classifying ontology");
+ statusBar.setMessage("Classifying ontology...");
oreMan.getReasoner().classify();
- statusBar.setProgressTitle("Realising ontology");
+ statusBar.setMessage("Realising ontology...");
oreMan.getReasoner().realise();
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/UnsatisfiableExplanationPanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/UnsatisfiableExplanationPanelDescriptor.java 2009-09-23 12:23:52 UTC (rev 1859)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/UnsatisfiableExplanationPanelDescriptor.java 2009-09-24 08:51:02 UTC (rev 1860)
@@ -2,7 +2,6 @@
import java.awt.BorderLayout;
import java.awt.Component;
-import java.awt.Cursor;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
@@ -31,7 +30,6 @@
import org.dllearner.tools.ore.RepairManager;
import org.dllearner.tools.ore.RepairManagerListener;
import org.dllearner.tools.ore.TaskManager;
-import org.dllearner.tools.ore.ui.StatusBar;
import org.dllearner.tools.ore.ui.wizard.WizardPanelDescriptor;
import org.dllearner.tools.ore.ui.wizard.panels.UnsatisfiableExplanationPanel;
import org.semanticweb.owl.model.OWLClass;
@@ -71,9 +69,8 @@
}
private void showExplanations(){
- ExplanationTask task = new ExplanationTask(getWizard().getStatusBar());
- TaskManager.getInstance().setCurrentTask(task);
- task.execute();
+ TaskManager.getInstance().setTaskStarted("Computing explanations...");
+ new ExplanationTask().execute();
}
@Override
@@ -124,13 +121,14 @@
@Override
public void repairPlanExecuted(List<OWLOntologyChange> changes) {
panel.clearExplanationsPanel();
- new RootDerivedTask(getWizard().getStatusBar()).execute();
+ new RootDerivedTask().execute();
panel.repaint();
}
public void fillUnsatisfiableClassesList(){
- new RootDerivedTask(getWizard().getStatusBar()).execute();
+ TaskManager.getInstance().setTaskStarted("Computing root and derived classes...");
+ new RootDerivedTask().execute();
}
@Override
@@ -194,38 +192,21 @@
class ExplanationTask extends SwingWorker<Void, Void>{
- private StatusBar statusBar;
-
-
- public ExplanationTask(StatusBar statusBar) {
- this.statusBar = statusBar;
-
- }
@Override
- public Void doInBackground() {
- statusBar.showProgress(true);
- statusBar.setProgressTitle("Computing explanations...");
- getWizard().getDialog().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+ public Void doInBackground() {
for(OWLClass unsat : panel.getUnsatTable().getSelectedClasses()){
expMan.getUnsatisfiableExplanations(unsat);
- }
-
+ }
return null;
}
@Override
public void done() {
if(!isCancelled()){
- showExplanations();
- statusBar.setProgressTitle("Done");
+ showExplanations();
}
-
- statusBar.showProgress(false);
- getWizard().getDialog().setCursor(null);
-
-
-
+ TaskManager.getInstance().setTaskFinished();
}
private void showExplanations(){
@@ -234,12 +215,10 @@
@Override
public void run() {
-
panel.clearExplanationsPanel();
for(OWLClass unsat : panel.getUnsatTable().getSelectedClasses()){
panel.addExplanations(expMan.getUnsatisfiableExplanations(unsat), unsat);
- }
-
+ }
panel.validate();
}
});
@@ -249,20 +228,10 @@
}
class RootDerivedTask extends SwingWorker<Void, Void>{
-
- private StatusBar statusBar;
-
- public RootDerivedTask(StatusBar statusBar) {
- this.statusBar = statusBar;
-
- }
@Override
public Void doInBackground() {
- statusBar.showProgress(true);
- statusBar.setProgressTitle("Computing root and derived classes...");
- getWizard().getDialog().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
expMan.getRootUnsatisfiableClasses();
expMan.getDerivedClasses();
return null;
@@ -270,9 +239,7 @@
@Override
public void done() {
- statusBar.showProgress(false);
- statusBar.setProgressTitle("Done");
- getWizard().getDialog().setCursor(null);
+ TaskManager.getInstance().setTaskFinished();
if(!isCancelled()){
fillUnsatClassesTable();
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/UnsatisfiableExplanationPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/UnsatisfiableExplanationPanel.java 2009-09-23 12:23:52 UTC (rev 1859)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/UnsatisfiableExplanationPanel.java 2009-09-24 08:51:02 UTC (rev 1860)
@@ -85,6 +85,17 @@
mainSplitPane.setRightComponent(createDebuggingPanel());
add(mainSplitPane);
+
+
+// String layoutDef = "(ROW unsat (COLUMN explanation (ROW repair impact)))";
+// MultiSplitLayout.Node modelRoot = MultiSplitLayout.parseModel(layoutDef);
+// JXMultiSplitPane mainSplitPane = new JXMultiSplitPane();
+// mainSplitPane.setModel(modelRoot);
+// mainSplitPane.add(createUnsatClassesPanel(), "unsat");
+// mainSplitPane.add(createExplanationPanel(), "explanation");
+// mainSplitPane.add(createRepairPanel(), "repair");
+// mainSplitPane.add(createImpactPanel(), "impact");
+// add(mainSplitPane);
}
private JComponent createUnsatClassesPanel(){
@@ -206,6 +217,20 @@
return impactRepairPanel;
}
+ private JComponent createRepairPanel(){
+ return new RepairPlanPanel();
+ }
+
+ private JComponent createImpactPanel(){
+ ImpactTable impactTable = new ImpactTable();
+ JScrollPane impScr = new JScrollPane(impactTable);
+ JPanel impactPanel = new JPanel();
+ impactPanel.setLayout(new BorderLayout());
+ impactPanel.add(new JLabel("Impact"), BorderLayout.NORTH);
+ impactPanel.add(impScr);
+ return impactPanel;
+ }
+
public void fillUnsatClassesTable(List<OWLClass> unsatClasses) {
unsatClassesTable.addUnsatClasses(unsatClasses);
unsatClassesScrollPane.validate();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
