Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [348] trunk/src/dl-learner/org/dllearner/gui
|
From: <ton...@us...> - 2008-01-07 16:12:17
|
Revision: 348
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=348&view=rev
Author: tonytacker
Date: 2008-01-07 08:12:15 -0800 (Mon, 07 Jan 2008)
Log Message:
-----------
now it runs up to Reasoner and a list will be shown - don't forget to choose first KnowledgeSource OWL (the others don't work yet) and load a file
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/gui/Config.java
trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java
trunk/src/dl-learner/org/dllearner/gui/OutputPanel.java
trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java
Modified: trunk/src/dl-learner/org/dllearner/gui/Config.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-01-07 09:47:05 UTC (rev 347)
+++ trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-01-07 16:12:15 UTC (rev 348)
@@ -39,20 +39,20 @@
*/
public class Config {
- protected static ComponentManager cm = ComponentManager.getInstance();
- protected static KnowledgeSource source;
- protected static File selectedFile;
- protected static ReasonerComponent reasoner;
- protected static ReasoningService rs;
- protected static List<Individual> individuals;
- protected String[] kbBoxItems = {"Pleae select a type", "KBFile", "OWLFile", "SparqleEndpoint"};
+ private ComponentManager cm = ComponentManager.getInstance();
+ private KnowledgeSource source;
+ private File selectedFile;
+ private ReasonerComponent reasoner;
+ private ReasoningService rs;
+ private List<Individual> individuals;
+ private String[] kbBoxItems = {"Pleae select a type", "KBFile", "OWLFile", "SparqleEndpoint"};
/**
* status should show witch variables are set
* status[0] ... cm
* status[1] ... KnowledgeSource
* status[2] ... File or URL
- * status[3] ...
+ * status[3] ... Resoner
*/
protected static boolean[] status = new boolean[8];
@@ -112,11 +112,11 @@
}
protected KnowledgeSource getKnowledgeSource() {
- status[1] = true;
return source;
}
protected void setKnowledgeSource(KnowledgeSource input) {
+ status[1] = true;
source = input;
}
Modified: trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-01-07 09:47:05 UTC (rev 347)
+++ trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-01-07 16:12:15 UTC (rev 348)
@@ -21,7 +21,7 @@
*/
import java.io.File;
-import java.util.List;
+//import java.util.List;
import javax.swing.*;
@@ -30,9 +30,9 @@
import java.awt.event.ActionListener;
import org.dllearner.kb.OWLFile;
-import org.dllearner.kb.KBFile;
+// import org.dllearner.kb.KBFile;
-import org.dllearner.core.KnowledgeSource;
+//import org.dllearner.core.KnowledgeSource;
/**
@@ -62,9 +62,10 @@
fileDisplay = new JTextField(35);
fileDisplay.setEditable(false);
- // test output
- List<Class<? extends KnowledgeSource>> sources = StartGUI.myconfig.getComponentManager().getKnowledgeSources();
- for (int i=0; i<sources.size(); i++) cb.addItem(sources.get(i));
+ // test output - if you activat next 2 lines, it will show alle available kb.classes
+ // activate import too!
+ //List<Class<? extends KnowledgeSource>> sources = StartGUI.myconfig.getComponentManager().getKnowledgeSources();
+ //for (int i=0; i<sources.size(); i++) cb.addItem(sources.get(i));
cb.addActionListener(this);
JPanel choosePanel = new JPanel();
@@ -81,8 +82,8 @@
if (returnVal == JFileChooser.APPROVE_OPTION) {
StartGUI.myconfig.setFile(fc.getSelectedFile()); //save variable
fileDisplay.setText(StartGUI.myconfig.getFile().toString());
- System.out.println("Init KnowledgeSource after loading file ... show over output");
- System.out.println("test: " + StartGUI.myconfig.getFile().toURI().toString());
+ //System.out.println("Init KnowledgeSource after loading file ... show over output");
+ //System.out.println("test: " + StartGUI.myconfig.getFile().toURI().toString());
StartGUI.myconfig.getComponentManager().applyConfigEntry(StartGUI.myconfig.getKnowledgeSource(), "url", StartGUI.myconfig.getFile().toURI().toString());
StartGUI.myconfig.getKnowledgeSource().init();
}
@@ -91,17 +92,17 @@
// choose none
if (cb.getSelectedItem().toString() == kbBoxItems[0]) {
- System.out.println("Item: " + cb.getSelectedItem());
+ //System.out.println("Item: " + cb.getSelectedItem());
makeCenterClean();
}
// choose KB class
if (cb.getSelectedItem().toString() == kbBoxItems[1]) {
- System.out.println("Item: " + cb.getSelectedItem());
+ //System.out.println("Item: " + cb.getSelectedItem());
makeCenterClean();
}
// choose OWL class
if (cb.getSelectedItem().toString() == kbBoxItems[2]) {
- System.out.println("Item: " + cb.getSelectedItem());
+ //System.out.println("Item: " + cb.getSelectedItem());
makeCenterClean();
openPanel.add(fileDisplay);
openPanel.add(openButton);
@@ -110,7 +111,7 @@
}
// choose SPARCLE class
if (cb.getSelectedItem().toString() == kbBoxItems[3]) {
- System.out.println("Item: " + cb.getSelectedItem());
+ //System.out.println("Item: " + cb.getSelectedItem());
makeCenterClean();
}
}
Modified: trunk/src/dl-learner/org/dllearner/gui/OutputPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/OutputPanel.java 2008-01-07 09:47:05 UTC (rev 347)
+++ trunk/src/dl-learner/org/dllearner/gui/OutputPanel.java 2008-01-07 16:12:15 UTC (rev 348)
@@ -45,27 +45,36 @@
showButton = new JButton("Show Variables");
showButton.addActionListener(this);
- infoArea = new JTextArea(20,40);
-
+ infoArea = new JTextArea(20, 50);
+ JScrollPane infoScroll = new JScrollPane(infoArea);
+
JPanel showPanel = new JPanel();
showPanel.add(showButton);
JPanel infoPanel = new JPanel();
- infoPanel.add(infoArea);
-
+ infoPanel.add(infoScroll);
+
add(showPanel, BorderLayout.PAGE_START);
add(infoPanel, BorderLayout.CENTER);
}
public void actionPerformed(ActionEvent e) {
if (e.getSource() == showButton) {
- if (StartGUI.myconfig.getStatus(1)) { // file is selected and exist?
+ infoArea.setText("");
+ if (StartGUI.myconfig.getStatus(2)) { // file is selected and exist?
infoArea.append("SourceClass: " + StartGUI.myconfig.getKnowledgeSource().toString() + "\n");
- infoArea.append("FILE: " + StartGUI.myconfig.getFile().toString() + "\n");
+ infoArea.append("FILE: " + StartGUI.myconfig.getFile() + "\n");
}
- if (StartGUI.myconfig.getStatus(2)) {
-
+ if (StartGUI.myconfig.getStatus(3)) { // Reasoner is set
+ infoArea.append("Reasoner: " + StartGUI.myconfig.getReasoner() + "\n");
}
-
+ if (StartGUI.myconfig.getStatus(4)) { // ReasoningServic is set
+ infoArea.append("ReasoningService: " + StartGUI.myconfig.getReasoningService() + "\n");
+ }
+ if (false) {
+ for (int i = 0; i<8; i++) { // show status-vars
+ infoArea.append("i: " + StartGUI.myconfig.getStatus(i) + "\n");
+ }
+ }
}
}
}
Modified: trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-01-07 09:47:05 UTC (rev 347)
+++ trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-01-07 16:12:15 UTC (rev 348)
@@ -24,9 +24,13 @@
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
import javax.swing.*;
+import org.dllearner.core.dl.Individual;
import org.dllearner.reasoning.DIGReasoner;
//import org.dllearner.core.ReasonerComponent;
@@ -50,6 +54,7 @@
private JPanel centerPanel = new JPanel();
private JButton digButton;
private JList digList = new JList();
+ private List<Individual> individuals;
ReasonerPanel() {
super(new BorderLayout());
@@ -58,43 +63,48 @@
digButton.addActionListener(this);
// create a scrollable list of examples
+ digList = new JList();
digList.setLayoutOrientation(JList.VERTICAL);
digList.setVisibleRowCount(-1);
JScrollPane listScroller = new JScrollPane(digList);
- listScroller.setPreferredSize(new Dimension(250, 80));
- centerPanel.add(listScroller);
+ listScroller.setPreferredSize(new Dimension(550, 350));
digPanel.add(digButton);
add(digPanel, BorderLayout.PAGE_START);
- centerPanel.add(digList);
+ centerPanel.add(listScroller);
add(centerPanel, BorderLayout.CENTER);
}
public void actionPerformed(ActionEvent e) {
- if (e.getSource() == digButton) { // DIG
+ if (e.getSource() == digButton) {
+ // set reasoner
StartGUI.myconfig.setReasoner(StartGUI.myconfig.getComponentManager().reasoner(DIGReasoner.class, StartGUI.myconfig.getKnowledgeSource()));
- System.out.println(StartGUI.myconfig.getKnowledgeSource());
- StartGUI.myconfig.getReasoner().init(); //error
- System.out.println("test");
+ //System.out.println(StartGUI.myconfig.getKnowledgeSource());
+ StartGUI.myconfig.getReasoner().init();
+ //System.out.println(StartGUI.myconfig.getReasoner());
- //config.setReasoningService(config.getComponentManager().reasoningService(config.getReasoner()));
+ // set ReasoningService
+ StartGUI.myconfig.setReasoningService(StartGUI.myconfig.getComponentManager().reasoningService(StartGUI.myconfig.getReasoner()));
- // set list
- //Set<Individual> individualsSet = config.getReasoningService().getIndividuals();
- //config.setListIndividuals(new LinkedList<Individual>(individualsSet));
+ // get list from ReasoningService
+ Set<Individual> individualsSet = StartGUI.myconfig.getReasoningService().getIndividuals();
+ //System.out.println("IndividualsSet: " + individualsSet);
+ individuals = new LinkedList<Individual>(individualsSet);
+ //System.out.println("individuals: " + individuals);
+ // make list
+ DefaultListModel listModel = new DefaultListModel();
+ for(Individual ind : individuals) {
+ listModel.addElement(ind);
+ }
+ //System.out.println("listModel: " + listModel);
+
// graphic
- //DefaultListModel listModel = new DefaultListModel();
- //for(Individual ind : config.getListIndividuals())
- //listModel.addElement(ind);
+ digList.setModel(listModel);
+ StartGUI.myrun.renew();
- // graphic
- //Set<String> exampleSet = new HashSet<String>();
- //int[] selectedIndices = digList.getSelectedIndices();
- //for(int i : selectedIndices)
- //exampleSet.add(config.getListIndividuals().get(i).toString());
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
