Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1991] trunk/src/dl-learner/org/dllearner
|
From: <lor...@us...> - 2010-02-05 08:35:10
|
Revision: 1991
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1991&view=rev
Author: lorenz_b
Date: 2010-02-05 08:35:01 +0000 (Fri, 05 Feb 2010)
Log Message:
-----------
Fixed some bugs.
Added some help messages.
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/scripts/evaluation/EvaluationComputingScript.java
trunk/src/dl-learner/org/dllearner/scripts/evaluation/EvaluationGUI.java
trunk/src/dl-learner/org/dllearner/scripts/evaluation/StatsGenerator.java
trunk/src/dl-learner/org/dllearner/scripts/evaluation/ontologies.txt
trunk/src/dl-learner/org/dllearner/tools/ore/OREApplication.java
trunk/src/dl-learner/org/dllearner/tools/ore/explanation/Explanation.java
trunk/src/dl-learner/org/dllearner/tools/ore/explanation/PelletExplanationGenerator.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExtractFromSparqlDialog.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/SparqlExtractOptionsPanel.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/Wizard.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/WizardModel.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/AutoLearnPanelDescriptor.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/ClassChoosePanelDescriptor.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/ClassChoosePanel.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/ManualLearnPanel.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/UnsatisfiableExplanationPanel.java
trunk/src/dl-learner/org/dllearner/utilities/statistics/FleissKappa.java
Modified: trunk/src/dl-learner/org/dllearner/scripts/evaluation/EvaluationComputingScript.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/evaluation/EvaluationComputingScript.java 2010-02-02 16:28:41 UTC (rev 1990)
+++ trunk/src/dl-learner/org/dllearner/scripts/evaluation/EvaluationComputingScript.java 2010-02-05 08:35:01 UTC (rev 1991)
@@ -625,12 +625,8 @@
System.out.println("You need to give an OWL file as argument.");
System.exit(0);
}
- URL fileURL = null;
- if(args[0].startsWith("http")){
- fileURL = new URL(args[0]);
- } else {
- fileURL = new File(new URL(args[0]).toURI()).toURI().toURL();
- }
+ URL fileURL = new URL(args[0]);
+
long startTime = System.currentTimeMillis();
new EvaluationComputingScript(fileURL);
System.out.println("Overall computing time: " + (System.currentTimeMillis() - startTime)/1000 +" s");
Modified: trunk/src/dl-learner/org/dllearner/scripts/evaluation/EvaluationGUI.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/evaluation/EvaluationGUI.java 2010-02-02 16:28:41 UTC (rev 1990)
+++ trunk/src/dl-learner/org/dllearner/scripts/evaluation/EvaluationGUI.java 2010-02-05 08:35:01 UTC (rev 1991)
@@ -795,7 +795,7 @@
* @throws ClassNotFoundException
* @throws URISyntaxException
*/
- public static void main(String[] args) throws ComponentInitException, MalformedURLException,
+ public static void main(String[] args) throws ComponentInitException,
LearningProblemUnsupportedException, ClassNotFoundException, InstantiationException,
IllegalAccessException, UnsupportedLookAndFeelException, URISyntaxException {
Modified: trunk/src/dl-learner/org/dllearner/scripts/evaluation/StatsGenerator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/evaluation/StatsGenerator.java 2010-02-02 16:28:41 UTC (rev 1990)
+++ trunk/src/dl-learner/org/dllearner/scripts/evaluation/StatsGenerator.java 2010-02-05 08:35:01 UTC (rev 1991)
@@ -12,6 +12,7 @@
import java.net.URISyntaxException;
import java.net.URL;
import java.text.DecimalFormat;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@@ -20,10 +21,14 @@
import java.util.Set;
import java.util.Map.Entry;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
import org.dllearner.core.owl.Individual;
import org.dllearner.core.owl.NamedClass;
import org.dllearner.learningproblems.EvaluatedDescriptionClass;
+import org.dllearner.utilities.statistics.FleissKappa;
import org.dllearner.utilities.statistics.Stat;
+import org.mindswap.pellet.utils.SetUtils;
import org.semanticweb.owl.apibinding.OWLManager;
import org.semanticweb.owl.model.OWLOntology;
import org.semanticweb.owl.model.OWLOntologyCreationException;
@@ -72,6 +77,11 @@
private int suggestionListsCount;
private int logicalAxiomCount;
private OWLOntology ont;
+
+ //matrix for Fleiss Kappa input
+ private short[][] mat;
+ private List<NamedClass> equivalentLists;
+ private List<NamedClass> superLists;
public StatsGenerator(File directory) {
// begin latex table with headers
@@ -79,9 +89,9 @@
beginStatsTable();
// for each ontology
for (File suggestionFile : directory.listFiles(new ResultFileFilter())) {
- clearStats();
loadSuggestions(suggestionFile);
loadOntology(suggestionFile);
+ resetStats();
// for each user evaluation input file
for (File inputFile : directory.listFiles(new NameFilter(suggestionFile))) {
loadUserInput(inputFile);
@@ -110,7 +120,7 @@
}
}
- private void clearStats() {
+ private void resetStats() {
acceptedGlobalStat = new Stat();
rejectedGlobalStat = new Stat();
failedGlobalStat = new Stat();
@@ -126,6 +136,10 @@
accSelectedStatsSC.clear();
accAboveThresholdStatsSC.clear();
positionStatsSC.clear();
+
+ equivalentLists = new ArrayList<NamedClass>(equivalentSuggestions.keySet());
+ superLists = new ArrayList<NamedClass>(superSuggestions.keySet());
+ mat = new short[suggestionListsCount][3];
}
private void makeSingleStat() {
@@ -156,16 +170,21 @@
Stat accSelectedStatSC = new Stat();
Stat accAboveThresholdStatSC = new Stat();
Stat positionStatSC = new Stat();
-
// analysing input for equivalent class expressions
for (Entry<NamedClass, String> e : equivalentInput.entrySet()) {
NamedClass currentClass = e.getKey();
String input = e.getValue();
+ if(input.equals("-1")){
+ input = "n";
+ }
if (input.equals("m")) {
missesCount++;
+ mat[equivalentLists.indexOf(currentClass)][2]++;
} else if (input.equals("n")) {
noSensibleDescriptionCount++;
+ mat[equivalentLists.indexOf(currentClass)][1]++;
} else {
+ mat[equivalentLists.indexOf(currentClass)][0]++;
int selectedIndex = Integer.parseInt(input);
EvaluatedDescriptionClass selectedExpression = equivalentSuggestions.get(currentClass).get(
selectedIndex);
@@ -204,9 +223,12 @@
NamedClass currentClass = e.getKey();
if (e.getValue().equals("m")) {
missesCountSC++;
+ mat[superLists.indexOf(currentClass) + equivalentLists.size()][2]++;
} else if (e.getValue().equals("n")) {
noSensibleDescriptionCountSC++;
+ mat[superLists.indexOf(currentClass) + equivalentLists.size()][1]++;
} else {
+ mat[superLists.indexOf(currentClass) + equivalentLists.size()][0]++;
int selectedIndex = Integer.parseInt(e.getValue());
EvaluatedDescriptionClass selectedExpression = superSuggestions.get(currentClass).get(selectedIndex);
double bestAcc = superSuggestions.get(currentClass).get(0).getAccuracy();
@@ -351,6 +373,13 @@
+ df.format(additionalInstanceCountEq) + " & "
+ df.format(additionalInstanceCount)
+ "\\\\\n");
+ for(int i = 0; i < mat.length; i++){
+ for(int j = 0; j < mat[i].length; j++){
+ System.out.print(mat[i][j]);
+ }
+ System.out.println();
+ }
+ System.out.println(new FleissKappa().computeKappa(mat));
}
private void addOntologyMetricsTableRow(){
@@ -403,7 +432,7 @@
} catch (Exception e) {
}
}
- suggestionListsCount = equivalentSuggestions.size() + superSuggestions.size();
+ suggestionListsCount = equivalentSuggestions.keySet().size() + superSuggestions.keySet().size();
}
/**
@@ -459,6 +488,7 @@
*/
public static void main(String[] args) throws MalformedURLException, URISyntaxException {
Locale.setDefault(Locale.ENGLISH);
+ Logger.getRootLogger().setLevel(Level.DEBUG);
File directory = new File(new URL(args[0]).toURI());
new StatsGenerator(directory);
}
Modified: trunk/src/dl-learner/org/dllearner/scripts/evaluation/ontologies.txt
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/evaluation/ontologies.txt 2010-02-02 16:28:41 UTC (rev 1990)
+++ trunk/src/dl-learner/org/dllearner/scripts/evaluation/ontologies.txt 2010-02-05 08:35:01 UTC (rev 1991)
@@ -1 +1 @@
-http://www.mindswap.org/ontologies/SC.owl
\ No newline at end of file
+http://www.inter2geo.eu/2008/ontology/ontology.owl
\ No newline at end of file
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/OREApplication.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/OREApplication.java 2010-02-02 16:28:41 UTC (rev 1990)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/OREApplication.java 2010-02-05 08:35:01 UTC (rev 1991)
@@ -64,6 +64,9 @@
try {
+ UIManager.put("OptionPane.cancelButtonText","Cancel");
+ UIManager.put("ProgressMonitor.progressText","Progress");
+
UIManager.setLookAndFeel(new PlasticLookAndFeel());
UIDefaults def = UIManager.getLookAndFeelDefaults();
Vector<?> vec = new Vector<Object>(def.keySet());
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/explanation/Explanation.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/explanation/Explanation.java 2010-02-02 16:28:41 UTC (rev 1990)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/explanation/Explanation.java 2010-02-05 08:35:01 UTC (rev 1991)
@@ -42,8 +42,14 @@
}
@Override
- public boolean equals(Object obj) {
- Explanation exp = (Explanation)obj;
+ public boolean equals(Object o) {
+ if(o == this){
+ return true;
+ }
+ if(!(o instanceof Explanation)){
+ return false;
+ }
+ Explanation exp = (Explanation)o;
return exp.getEntailment().equals(entailment) && exp.getAxioms().equals(axioms);
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/explanation/PelletExplanationGenerator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/explanation/PelletExplanationGenerator.java 2010-02-02 16:28:41 UTC (rev 1990)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/explanation/PelletExplanationGenerator.java 2010-02-05 08:35:01 UTC (rev 1991)
@@ -69,7 +69,7 @@
// Set the necessary fields
expGen.setReasonerFactory( new PelletReasonerFactory() );
expGen.setReasoner( reasoner );
- expGen.setOntologies( manager.getImportsClosure(ontologies.iterator().next()) );
+ expGen.setOntologies( ontologies );
// Create the converter that will translate axioms into class expressions
converter = new SatisfiabilityConverter( manager.getOWLDataFactory() );
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExtractFromSparqlDialog.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExtractFromSparqlDialog.java 2010-02-02 16:28:41 UTC (rev 1990)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExtractFromSparqlDialog.java 2010-02-05 08:35:01 UTC (rev 1991)
@@ -15,7 +15,10 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.IOException;
+import java.net.HttpURLConnection;
import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
@@ -90,7 +93,7 @@
private ImageIcon toggledIcon = new ImageIcon(this.getClass().getResource("../toggled.gif"));
private ImageIcon untoggledIcon = new ImageIcon(this.getClass().getResource("../untoggled.gif"));
- private final String URLHelpText = "<html><table border=\"1\">" +
+ private static final String URL_HELP_TEXT = "<html><table border=\"1\">" +
"<tr>" +
"<th>SPARQL endpoint URL</th>" +
"<th>The URL of the SPARQL endpoint</th>" +
@@ -101,7 +104,7 @@
"</tr> " +
"</table></html>";
- private final String classHelpText = "Enter a class uri or label for which a " +
+ private static final String CLASS_HELP_TEXT = "Enter a class uri or label for which a " +
"relevant fragment should be extracted.";
private SPARQLTasks task;
@@ -110,7 +113,7 @@
private ProgressMonitor mon;
private Timer t;
- private Map<URL, List<String>> endpointToDefaultGraph;
+ private Map<URI, List<String>> endpointToDefaultGraph;
public ExtractFromSparqlDialog(JFrame owner) {
super(owner, "Extract fragment from SPARQL endpoint", true);
@@ -178,7 +181,7 @@
endPointHolderPanel.add(new JLabel("Default graph URI (optional)"));
endPointHolderPanel.add(defaultGraphField);
HelpablePanel endPointHelpPanel = new HelpablePanel(endPointHolderPanel);
- endPointHelpPanel.setHelpText(URLHelpText);
+ endPointHelpPanel.setHelpText(URL_HELP_TEXT);
endPointHelpPanel.setBorder(new TitledBorder("SPARQL endpoint"));
panel.add(endPointHelpPanel, c);
@@ -207,7 +210,7 @@
gbc.weighty = 1.0;
classHolderPanel.add(classField,gbc);
HelpablePanel classHelpPanel = new HelpablePanel(classHolderPanel);
- classHelpPanel.setHelpText(classHelpText);
+ classHelpPanel.setHelpText(CLASS_HELP_TEXT);
classHelpPanel.setBorder(new TitledBorder("Class to investigate"));
panel.add(classHelpPanel, c);
@@ -274,11 +277,16 @@
}
private void addPredefinedEndpoints(){
- endpointToDefaultGraph = new HashMap<URL, List<String>>();
+ endpointToDefaultGraph = new HashMap<URI, List<String>>();
for(SparqlEndpoint endpoint : SparqlEndpoint.listEndpoints()){
- endpointToDefaultGraph.put(endpoint.getURL(), endpoint.getDefaultGraphURIs());
+ try {
+ endpointToDefaultGraph.put(endpoint.getURL().toURI(), endpoint.getDefaultGraphURIs());
+ } catch (URISyntaxException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
- for(URL url : endpointToDefaultGraph.keySet()){
+ for(URI url : endpointToDefaultGraph.keySet()){
comboBox.addItem(url.toString());
}
}
@@ -355,13 +363,12 @@
private void extract() {
message.setText("Checking SPARQL endpoint availability");
setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-
- setLocale(Locale.ENGLISH);
mon = new ProgressMonitor(this, "Extracting fragment", "", 0, 100);
mon.setMillisToDecideToPopup(0);
mon.setMillisToPopup(0);
- mon.getAccessibleContext().getLocale().setDefault(Locale.ENGLISH);
+ mon.getAccessibleContext().getLocale();
+
t = new Timer(1000,new ActionListener() {
@@ -387,6 +394,21 @@
}
+ private boolean URLExists(){
+ try {
+ HttpURLConnection.setFollowRedirects(false);
+ HttpURLConnection con = (HttpURLConnection)new URL(comboBox.getSelectedItem().toString()).openConnection();
+ con.setRequestMethod("HEAD");
+ return con.getResponseCode() == HttpURLConnection.HTTP_OK;
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ return false;
+ } catch (IOException e) {
+ e.printStackTrace();
+ return false;
+ }
+ }
+
private boolean urlIsConnectable()
{
@@ -565,13 +587,7 @@
message.setText("");
JComboBox cb = (JComboBox)e.getSource();
if(cb.getSelectedIndex() >= 0){
- URL endpointURL = null;
- try {
- endpointURL = new URL((String)cb.getSelectedItem());
- } catch (MalformedURLException e1) {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
+ URI endpointURL = URI.create((String)cb.getSelectedItem());
List<String> defaultGraphs = endpointToDefaultGraph.get(endpointURL);
if(defaultGraphs != null && !defaultGraphs.isEmpty()){
defaultGraphField.setText(defaultGraphs.iterator().next());
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/SparqlExtractOptionsPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/SparqlExtractOptionsPanel.java 2010-02-02 16:28:41 UTC (rev 1990)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/SparqlExtractOptionsPanel.java 2010-02-05 08:35:01 UTC (rev 1991)
@@ -124,15 +124,15 @@
c.gridy = 7;
add(getAllSuperClassesCheckBox, c);
-// c.anchor = GridBagConstraints.LINE_START;
-// c.gridx = 1;
-// c.gridy = 8;
-// add(new JLabel("Use literals"), c);
-// useLitsCheckBox = new JCheckBox();
-// c.anchor = GridBagConstraints.LINE_END;
-// c.gridx = 0;
-// c.gridy = 8;
-// add(useLitsCheckBox, c);
+ c.anchor = GridBagConstraints.LINE_START;
+ c.gridx = 1;
+ c.gridy = 8;
+ add(new JLabel("Use literals"), c);
+ useLitsCheckBox = new JCheckBox();
+ c.anchor = GridBagConstraints.LINE_END;
+ c.gridx = 0;
+ c.gridy = 8;
+ add(useLitsCheckBox, c);
}
@@ -181,7 +181,7 @@
getPropertyInformationCheckBox.setSelected(false);
closeAfterRecursionCheckBox.setSelected(true);
getAllSuperClassesCheckBox.setSelected(true);
-// useLitsCheckBox.setSelected(true);
+ useLitsCheckBox.setSelected(false);
}
public void setToolTips(){
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 2010-02-02 16:28:41 UTC (rev 1990)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/Wizard.java 2010-02-05 08:35:01 UTC (rev 1991)
@@ -324,7 +324,7 @@
* @param newValue The new enabled status of the button.
*/
public void setBackButtonEnabled(boolean newValue) {
- wizardModel.setBackButtonEnabled(new Boolean(newValue));
+ wizardModel.setBackButtonEnabled(Boolean.valueOf(newValue));
}
/**
@@ -340,7 +340,7 @@
* @param newValue The new enabled status of the button.
*/
public void setNextFinishButtonEnabled(boolean newValue) {
- wizardModel.setNextFinishButtonEnabled(new Boolean(newValue));
+ wizardModel.setNextFinishButtonEnabled(Boolean.valueOf(newValue));
}
/**
@@ -356,7 +356,7 @@
* @param newValue The new enabled status of the button.
*/
public void setCancelButtonEnabled(boolean newValue) {
- wizardModel.setCancelButtonEnabled(new Boolean(newValue));
+ wizardModel.setCancelButtonEnabled(Boolean.valueOf(newValue));
}
/**
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/WizardModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/WizardModel.java 2010-02-02 16:28:41 UTC (rev 1990)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/WizardModel.java 2010-02-05 08:35:01 UTC (rev 1991)
@@ -194,7 +194,7 @@
void setBackButtonEnabled(Boolean newValue) {
Boolean oldValue = getBackButtonEnabled();
- if (newValue != oldValue) {
+ if (!newValue.equals(oldValue)) {
buttonEnabledHashmap.put(BACK_BUTTON_ENABLED_PROPERTY, newValue);
firePropertyChange(BACK_BUTTON_ENABLED_PROPERTY, oldValue, newValue);
}
@@ -207,7 +207,7 @@
void setNextFinishButtonEnabled(Boolean newValue) {
Boolean oldValue = getNextFinishButtonEnabled();
- if (newValue != oldValue) {
+ if (!newValue.equals(oldValue)) {
buttonEnabledHashmap.put(NEXT_FINISH_BUTTON_ENABLED_PROPERTY, newValue);
firePropertyChange(NEXT_FINISH_BUTTON_ENABLED_PROPERTY, oldValue, newValue);
}
@@ -220,7 +220,7 @@
void setCancelButtonEnabled(Boolean newValue) {
Boolean oldValue = getCancelButtonEnabled();
- if (newValue != oldValue) {
+ if (!newValue.equals(oldValue)) {
buttonEnabledHashmap.put(CANCEL_BUTTON_ENABLED_PROPERTY, newValue);
firePropertyChange(CANCEL_BUTTON_ENABLED_PROPERTY, oldValue, newValue);
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/AutoLearnPanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/AutoLearnPanelDescriptor.java 2010-02-02 16:28:41 UTC (rev 1990)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/AutoLearnPanelDescriptor.java 2010-02-05 08:35:01 UTC (rev 1991)
@@ -20,7 +20,6 @@
import org.dllearner.core.LearningAlgorithm;
import org.dllearner.core.owl.NamedClass;
import org.dllearner.learningproblems.EvaluatedDescriptionClass;
-import org.dllearner.tools.ore.LearningManager;
import org.dllearner.tools.ore.OREManager;
import org.dllearner.tools.ore.TaskManager;
import org.dllearner.tools.ore.ui.wizard.WizardPanelDescriptor;
@@ -45,11 +44,6 @@
private EquivalentLearningTask equivalentLearningTask;
private SuperClassLearningTask superLearningTask;
- private Timer timer;
- private LearningAlgorithm la;
-
- private SwingWorker<Void, List<? extends EvaluatedDescription>> currentLearningTask;
-
private int currentClassIndex = 0;
@@ -97,7 +91,6 @@
TaskManager.getInstance().getStatusBar().setMessage("Learning equivalent class expressions...");
getWizard().getDialog().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
equivalentLearningTask = new EquivalentLearningTask();
- currentLearningTask = equivalentLearningTask;
equivalentLearningTask.addPropertyChangeListener(TaskManager.getInstance().getStatusBar());
equivalentLearningTask.execute();
}
@@ -107,7 +100,6 @@
TaskManager.getInstance().getStatusBar().setProgress(0);
getWizard().getDialog().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
superLearningTask = new SuperClassLearningTask();
- currentLearningTask = superLearningTask;
superLearningTask.addPropertyChangeListener(TaskManager.getInstance().getStatusBar());
superLearningTask.execute();
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/ClassChoosePanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/ClassChoosePanelDescriptor.java 2010-02-02 16:28:41 UTC (rev 1990)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/ClassChoosePanelDescriptor.java 2010-02-05 08:35:01 UTC (rev 1991)
@@ -191,11 +191,11 @@
while(iter.hasNext()){
NamedClass nc = iter.next();
int instanceCount = OREManager.getInstance().getReasoner().getIndividuals(nc).size();
- Set<NamedClass> temp = instanceCountToClasses.get(new Integer(instanceCount));
+ Set<NamedClass> temp = instanceCountToClasses.get(Integer.valueOf(instanceCount));
if(temp == null) {
temp = new HashSet<NamedClass>();
temp.add(nc);
- instanceCountToClasses.put(new Integer(instanceCount), temp);
+ instanceCountToClasses.put(Integer.valueOf(instanceCount), temp);
}
temp.add(nc);
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/ClassChoosePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/ClassChoosePanel.java 2010-02-02 16:28:41 UTC (rev 1990)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/ClassChoosePanel.java 2010-02-05 08:35:01 UTC (rev 1991)
@@ -62,6 +62,11 @@
private JPanel manualLearnPanel;
private JPanel autoLearnPanel;
+ private static final String HELP_TEXT = "<html>You can choose whether you want to learn class " +
+ "descriptions for a single, manually selected class,<br>" +
+ "or you can learn class descriptions step by step for all classes with a minimum " +
+ "number of instances.</html>";
+
private LearningOptionsPanel learningOptionsPanel;
/**
@@ -92,6 +97,7 @@
HelpablePanel optionsHelpPanel = new HelpablePanel(optionsPanel);
optionsHelpPanel.setBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED));
+ optionsHelpPanel.setHelpText(HELP_TEXT);
c.gridwidth = GridBagConstraints.REMAINDER;
add(optionsHelpPanel, c);
@@ -192,7 +198,7 @@
public void reset(){
classesTable.clear();
- minInstanceCountSpinner.setValue(new Integer(1));
+ minInstanceCountSpinner.setValue(Integer.valueOf(1));
autoLearnButton.setSelected(true);
setAutoLearningPanel(true);
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/ManualLearnPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/ManualLearnPanel.java 2010-02-02 16:28:41 UTC (rev 1990)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/ManualLearnPanel.java 2010-02-05 08:35:01 UTC (rev 1991)
@@ -74,11 +74,36 @@
private GridBagConstraints c;
- private static String INCONSISTENCYWARNING = "<html><font color=red>" +
+ private static final String INCONSISTENCY_WARNING = "<html><font color=red>" +
"Warning! Adding selected class expression leads to an inconsistent ontology." +
"</font></html>";
+
+ private static final String LEARNTYPE_HELP_TEXT = "<html>You can choose between learning class " +
+ "expressions, which are equivalent to your selected class,<br>" +
+ "or learning class expressions, which subsumes the seleminimal number ofcted class.</html>";
+
+ private static final String LEARNOPTIONS_HELP_TEXT = "<html><table border=\"1\">" +
+ "<tr>" +
+ "<th>Noise</th>" +
+ "<th></th>" +
+ "</tr>" +
+ "<tr>" +
+ "<th>Max. execution time</th>" +
+ "<th>The maximal time in seconds after which the algorithm terminates.</th>" +
+ "</tr>" +
+ "<tr>" +
+ "<th>Max. number of results</th>" +
+ "<th>The maximal number of class expressions which will be returned.</th>" +
+ "</tr>" +
+ "<tr>" +
+ "<th>Threshold</th>" +
+ "<th>Specifies the minimal accuracy value, which the results must have to be shown.</th>" +
+ "</tr>"+
+ "</table></html>";
+
+ private static final String COVERAGE_HELP_TEXT = "This panel shows an abstract coverage view " +
+ "of the instances in the ontology.";
-
public ManualLearnPanel() {
createUI();
}
@@ -158,6 +183,7 @@
learnTypePanel.add(superClassButton);
HelpablePanel learnTypeHelpPanel = new HelpablePanel(learnTypePanel);
learnTypeHelpPanel.setBorder(new TitledBorder("Learning type"));
+ learnTypeHelpPanel.setHelpText(LEARNTYPE_HELP_TEXT);
buttonSliderPanel.add(learnTypeHelpPanel, new GridBagConstraints(0, 1,
1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
@@ -165,6 +191,7 @@
optionsPanel = new LearningOptionsPanel();
HelpablePanel optionsHelpPanel = new HelpablePanel(optionsPanel);
optionsHelpPanel.setBorder(new TitledBorder("Options"));
+ optionsHelpPanel.setHelpText(LEARNOPTIONS_HELP_TEXT);
buttonSliderPanel.add(optionsHelpPanel, new GridBagConstraints(0, 2,
1, 1, 0.0, 0.0, GridBagConstraints.CENTER,
GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
@@ -181,6 +208,7 @@
graphicPanel = new GraphicalCoveragePanel("");
HelpablePanel coverageHelpPanel = new HelpablePanel(graphicPanel);
+ coverageHelpPanel.setHelpText(COVERAGE_HELP_TEXT);
JPanel graphicHolderPanel = new JPanel(new BorderLayout());
graphicHolderPanel.add(coverageHelpPanel);
@@ -227,7 +255,7 @@
public void showInconsistencyWarning(boolean show){
if(show){
- inconsistencyLabel.setText(INCONSISTENCYWARNING);
+ inconsistencyLabel.setText(INCONSISTENCY_WARNING);
} else {
inconsistencyLabel.setText(" ");
}
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 2010-02-02 16:28:41 UTC (rev 1990)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/UnsatisfiableExplanationPanel.java 2010-02-05 08:35:01 UTC (rev 1991)
@@ -56,8 +56,12 @@
private JPanel buttonExplanationsPanel;
- private final String EXPLANATION_TYPE_TEXT = "";
- private final String EXPLANATION_COUNT_TEXT = "";
+ private static final String EXPLANATION_TYPE_TEXT = "<html>You can select whether the shown explanations shell " +
+ "only contain axioms, which are asserted in the ontology," +
+ "<br>or whether the explanations show only relevant parts of the original axioms.</html>" +
+ "";
+ private static final String EXPLANATION_COUNT_TEXT = "<html>You can choose between showing/computing all " +
+ "explanations,<br> or only a limited number of them.</html>";
private ButtonGroup explanationType;
Modified: trunk/src/dl-learner/org/dllearner/utilities/statistics/FleissKappa.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/statistics/FleissKappa.java 2010-02-02 16:28:41 UTC (rev 1990)
+++ trunk/src/dl-learner/org/dllearner/utilities/statistics/FleissKappa.java 2010-02-05 08:35:01 UTC (rev 1991)
@@ -49,6 +49,10 @@
final int N = mat.length;
final int k = mat[0].length;
+ if(n < 2){
+ System.err.println("Only " + n + " raters per subject detected. There have to be at least 2 raters per subject");
+ return -999;
+ }
logger.debug(n + " raters.");
logger.debug(N + " subjects.");
logger.debug(k + " categories.");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
