Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1943] trunk
|
From: <lor...@us...> - 2009-12-21 16:43:39
|
Revision: 1943
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1943&view=rev
Author: lorenz_b
Date: 2009-12-21 16:43:19 +0000 (Mon, 21 Dec 2009)
Log Message:
-----------
Modified evaluation GUI.
Added example examples/test.ser as serialized learning results.
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/tools/ore/ui/GraphicalCoveragePanel.java
Added Paths:
-----------
trunk/examples/test.ser
Added: trunk/examples/test.ser
===================================================================
(Binary files differ)
Property changes on: trunk/examples/test.ser
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/src/dl-learner/org/dllearner/scripts/evaluation/EvaluationComputingScript.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/evaluation/EvaluationComputingScript.java 2009-12-21 16:00:20 UTC (rev 1942)
+++ trunk/src/dl-learner/org/dllearner/scripts/evaluation/EvaluationComputingScript.java 2009-12-21 16:43:19 UTC (rev 1943)
@@ -8,7 +8,6 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.text.DecimalFormat;
-import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@@ -120,25 +119,25 @@
o.writeObject(owlEquivalenceFMeasureMap);
o.writeObject(owlEquivalencePredaccMap);
o.writeObject(owlEquivalenceJaccardMap);
-// o.writeObject(owlEquivalenceGenFMeasureMap);
+ o.writeObject(owlEquivalenceGenFMeasureMap);
o.writeObject(owlSuperStandardMap);
o.writeObject(owlSuperFMeasureMap);
o.writeObject(owlSuperPredaccMap);
o.writeObject(owlSuperJaccardMap);
-// o.writeObject(owlSuperGenFMeasureMap);
+ o.writeObject(owlSuperGenFMeasureMap);
o.writeObject(fastEquivalenceStandardMap);
o.writeObject(fastEquivalenceFMeasureMap);
o.writeObject(fastEquivalencePredaccMap);
o.writeObject(fastEquivalenceJaccardMap);
-// o.writeObject(fastEquivalenceGenFMeasureMap);
+ o.writeObject(fastEquivalenceGenFMeasureMap);
o.writeObject(fastSuperStandardMap);
o.writeObject(fastSuperFMeasureMap);
o.writeObject(fastSuperPredaccMap);
o.writeObject(fastSuperJaccardMap);
-// o.writeObject(fastSuperGenFMeasureMap);
+ o.writeObject(fastSuperGenFMeasureMap);
o.writeObject(defaultEquivalenceMap);
o.writeObject(defaultSuperMap);
@@ -196,7 +195,7 @@
lp.getConfigurator().setType("superClass");
System.out.println("Learning superClass expressions");
}
- for(int k = 0; k <= 3; k++){
+ for(int k = 0; k <= 4; k++){
if(k == 0){
lp.getConfigurator().setAccuracyMethod("standard");
System.out.println("Using accuracy method: standard");
@@ -206,9 +205,12 @@
} else if(k == 2){
lp.getConfigurator().setAccuracyMethod("pred_acc");
System.out.println("Using accuracy method: Predictive accuracy");
- } else {
+ } else if(k == 3){
lp.getConfigurator().setAccuracyMethod("jaccard");
System.out.println("Using accuracy method: Jaccard");
+ } else{
+ lp.getConfigurator().setAccuracyMethod("generalised_fmeasure");
+ System.out.println("Using accuracy method: Generalised F-Measure");
}
lp.getConfigurator().setUseApproximations(useApproximations);
lp.init();
@@ -255,8 +257,10 @@
owlEquivalenceFMeasureMap.put(nc, suggestionsList);
} else if(k == 2){
owlEquivalencePredaccMap.put(nc, suggestionsList);
+ } else if(k == 3){
+ owlEquivalenceJaccardMap.put(nc, suggestionsList);
} else {
- owlEquivalenceJaccardMap.put(nc, suggestionsList);
+ owlEquivalenceGenFMeasureMap.put(nc, suggestionsList);
}
} else {
if(k == 0){
@@ -265,8 +269,10 @@
owlSuperFMeasureMap.put(nc, suggestionsList);
} else if(k == 2){
owlSuperPredaccMap.put(nc, suggestionsList);
+ } else if(k == 3){
+ owlSuperJaccardMap.put(nc, suggestionsList);
} else {
- owlSuperJaccardMap.put(nc, suggestionsList);
+ owlSuperGenFMeasureMap.put(nc, suggestionsList);
}
}
} else {
@@ -277,8 +283,10 @@
fastEquivalenceFMeasureMap.put(nc, suggestionsList);
} else if(k == 2){
fastEquivalencePredaccMap.put(nc, suggestionsList);
+ } else if(k == 3){
+ fastEquivalenceJaccardMap.put(nc, suggestionsList);
} else {
- fastEquivalenceJaccardMap.put(nc, suggestionsList);
+ fastEquivalenceGenFMeasureMap.put(nc, suggestionsList);
}
} else {
if(k == 0){
@@ -287,8 +295,10 @@
fastSuperFMeasureMap.put(nc, suggestionsList);
} else if(k == 2){
fastSuperPredaccMap.put(nc, suggestionsList);
+ } else if(k == 3){
+ fastSuperJaccardMap.put(nc, suggestionsList);
} else {
- fastSuperJaccardMap.put(nc, suggestionsList);
+ fastSuperGenFMeasureMap.put(nc, suggestionsList);
}
}
}
Modified: trunk/src/dl-learner/org/dllearner/scripts/evaluation/EvaluationGUI.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/evaluation/EvaluationGUI.java 2009-12-21 16:00:20 UTC (rev 1942)
+++ trunk/src/dl-learner/org/dllearner/scripts/evaluation/EvaluationGUI.java 2009-12-21 16:43:19 UTC (rev 1943)
@@ -32,15 +32,19 @@
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.LearningProblemUnsupportedException;
import org.dllearner.core.owl.NamedClass;
import org.dllearner.learningproblems.EvaluatedDescriptionClass;
+import org.dllearner.tools.ore.ui.GraphicalCoveragePanel;
import org.dllearner.tools.ore.ui.MarkableClassesTable;
+import org.dllearner.tools.ore.ui.ResultTable;
import org.dllearner.tools.ore.ui.SelectableClassExpressionsTable;
-public class EvaluationGUI extends JFrame implements ActionListener{
+public class EvaluationGUI extends JFrame implements ActionListener, ListSelectionListener{
@@ -49,17 +53,21 @@
*/
private static final long serialVersionUID = -3097551929270352556L;
- private SelectableClassExpressionsTable tab1;
- private SelectableClassExpressionsTable tab2;
- private SelectableClassExpressionsTable tab3;
- private SelectableClassExpressionsTable tab4;
- private SelectableClassExpressionsTable tab5;
- private SelectableClassExpressionsTable tab6;
- private SelectableClassExpressionsTable tab7;
- private SelectableClassExpressionsTable tab8;
+ private ResultTable tab1;
+ private ResultTable tab2;
+ private ResultTable tab3;
+ private ResultTable tab4;
+ private ResultTable tab5;
+ private ResultTable tab6;
+ private ResultTable tab7;
+ private ResultTable tab8;
+ private ResultTable tab9;
+ private ResultTable tab10;
private SelectableClassExpressionsTable defaultTab;
+ private GraphicalCoveragePanel graphPanel;
+
private MarkableClassesTable classesTable;
private JButton nextFinishButton;
private JLabel messageLabel;
@@ -173,35 +181,44 @@
private JPanel createSingleTablePanel(){
JPanel tableHolderPanel = new JPanel(new BorderLayout());
defaultTab = new SelectableClassExpressionsTable();
+ defaultTab.getSelectionModel().addListSelectionListener(this);
tableHolderPanel.add(defaultTab);
+ graphPanel = new GraphicalCoveragePanel("");
+ tableHolderPanel.add(graphPanel, BorderLayout.EAST);
+
+
return tableHolderPanel;
}
private JPanel createMultiTablesPanel(){
JPanel tablesHolderPanel = new JPanel();
tablesHolderPanel.setLayout(new GridLayout(5, 2));
- tab1 = new SelectableClassExpressionsTable();
+ tab1 = new ResultTable();
tablesHolderPanel.add(createSelectablePanel(tab1));
- tab2 = new SelectableClassExpressionsTable();
+ tab2 = new ResultTable();
tablesHolderPanel.add(createSelectablePanel(tab2));
- tab3 = new SelectableClassExpressionsTable();
+ tab3 = new ResultTable();
tablesHolderPanel.add(createSelectablePanel(tab3));
- tab4 = new SelectableClassExpressionsTable();
+ tab4 = new ResultTable();
tablesHolderPanel.add(createSelectablePanel(tab4));
- tab5 = new SelectableClassExpressionsTable();
+ tab5 = new ResultTable();
tablesHolderPanel.add(createSelectablePanel(tab5));
- tab6 = new SelectableClassExpressionsTable();
+ tab6 = new ResultTable();
tablesHolderPanel.add(createSelectablePanel(tab6));
- tab7 = new SelectableClassExpressionsTable();
+ tab7 = new ResultTable();
tablesHolderPanel.add(createSelectablePanel(tab7));
- tab8 = new SelectableClassExpressionsTable();
+ tab8 = new ResultTable();
tablesHolderPanel.add(createSelectablePanel(tab8));
+ tab9 = new ResultTable();
+ tablesHolderPanel.add(createSelectablePanel(tab9));
+ tab10 = new ResultTable();
+ tablesHolderPanel.add(createSelectablePanel(tab10));
return tablesHolderPanel;
}
- private JPanel createSelectablePanel(SelectableClassExpressionsTable table){
+ private JPanel createSelectablePanel(ResultTable table){
JPanel panel = new JPanel(new BorderLayout());
panel.setBorder(BorderFactory.createLineBorder(Color.BLACK));
JCheckBox box = new JCheckBox();
@@ -212,6 +229,8 @@
}
private void showSingleTable(){
+ defaultTab.clearSelection();
+ graphPanel.clear();
cardLayout.first(cardPanel);
showingMultiTables = false;
}
@@ -228,11 +247,13 @@
tab2.addResults(owlEquivalenceFMeasureMap.get(nc));
tab3.addResults(owlEquivalencePredaccMap.get(nc));
tab4.addResults(owlEquivalenceJaccardMap.get(nc));
+ tab5.addResults(owlEquivalenceGenFMeasureMap.get(nc));
- tab5.addResults(fastEquivalenceStandardMap.get(nc));
- tab6.addResults(fastEquivalenceFMeasureMap.get(nc));
- tab7.addResults(fastEquivalencePredaccMap.get(nc));
- tab8.addResults(fastEquivalenceJaccardMap.get(nc));
+ tab6.addResults(fastEquivalenceStandardMap.get(nc));
+ tab7.addResults(fastEquivalenceFMeasureMap.get(nc));
+ tab8.addResults(fastEquivalencePredaccMap.get(nc));
+ tab9.addResults(fastEquivalenceJaccardMap.get(nc));
+ tab10.addResults(fastEquivalenceGenFMeasureMap.get(nc));
defaultTab.addResults(defaultEquivalenceMap.get(nc));
@@ -246,13 +267,15 @@
tab2.addResults(owlSuperFMeasureMap.get(nc));
tab3.addResults(owlSuperPredaccMap.get(nc));
tab4.addResults(owlSuperJaccardMap.get(nc));
+ tab5.addResults(owlSuperGenFMeasureMap.get(nc));
- tab5.addResults(fastSuperStandardMap.get(nc));
- tab6.addResults(fastSuperFMeasureMap.get(nc));
- tab7.addResults(fastSuperPredaccMap.get(nc));
- tab8.addResults(fastSuperJaccardMap.get(nc));
+ tab6.addResults(fastSuperStandardMap.get(nc));
+ tab7.addResults(fastSuperFMeasureMap.get(nc));
+ tab8.addResults(fastSuperPredaccMap.get(nc));
+ tab9.addResults(fastSuperJaccardMap.get(nc));
+ tab10.addResults(fastSuperGenFMeasureMap.get(nc));
- defaultTab.addResults(defaultEquivalenceMap.get(nc));
+ defaultTab.addResults(defaultSuperMap.get(nc));
showingEquivalentSuggestions = false;
}
@@ -269,25 +292,25 @@
owlEquivalenceFMeasureMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
owlEquivalencePredaccMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
owlEquivalenceJaccardMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
-// owlEquivalenceGenFMeasureMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
+ owlEquivalenceGenFMeasureMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
owlSuperStandardMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
owlSuperFMeasureMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
owlSuperPredaccMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
owlSuperJaccardMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
-// owlSuperGenFMeasureMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
+ owlSuperGenFMeasureMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
fastEquivalenceStandardMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
fastEquivalenceFMeasureMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
fastEquivalencePredaccMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
fastEquivalenceJaccardMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
-// fastEquivalenceGenFMeasureMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
+ fastEquivalenceGenFMeasureMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
fastSuperStandardMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
fastSuperFMeasureMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
fastSuperPredaccMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
fastSuperJaccardMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
-// fastSuperGenFMeasureMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
+ fastSuperGenFMeasureMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
defaultEquivalenceMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
defaultSuperMap = (HashMap<NamedClass, List<EvaluatedDescriptionClass>>) o.readObject();
@@ -318,7 +341,6 @@
if(showingMultiTables && showingEquivalentSuggestions){
showSingleTable();
} else if(!showingMultiTables && showingEquivalentSuggestions){
- selectedEquivalenceMap.put(nc, defaultTab.getSelectedValue());
showSuperSuggestions(nc);
showMultiTables();
} else if(showingMultiTables && !showingEquivalentSuggestions){
@@ -328,7 +350,7 @@
nextFinishButton.setActionCommand("finish");
}
} else {
- selectedSuperMap.put(nc, defaultTab.getSelectedValue());
+
currentClassIndex++;
classesTable.setSelectedClass(currentClassIndex);
showEquivalentSuggestions(classesTable.getSelectedClass(currentClassIndex));
@@ -341,6 +363,14 @@
}
}
+
+ @Override
+ public void valueChanged(ListSelectionEvent e) {
+ if(!e.getValueIsAdjusting() && defaultTab.getSelectedRow() >= 0){
+ graphPanel.setNewClassDescription(defaultTab.getSelectedValue());
+ }
+
+ }
/**
* @param args
@@ -385,4 +415,6 @@
+
+
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/GraphicalCoveragePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/GraphicalCoveragePanel.java 2009-12-21 16:00:20 UTC (rev 1942)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/GraphicalCoveragePanel.java 2009-12-21 16:43:19 UTC (rev 1943)
@@ -573,8 +573,9 @@
}
}
- Set<Individual> notCovInd = OREManager.getInstance().getPositiveFailureExamples();
+ Set<Individual> notCovInd = ((EvaluatedDescriptionClass) eval).getNotCoveredInstances();
+
// notCoveredInd = notCovInd.size();
int k = 0;
x = random.nextInt(MAX_RANDOM_NUMBER);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
