Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1614] trunk/src/dl-learner/org/dllearner/tools/ protege
|
From: <hee...@us...> - 2009-02-19 10:07:43
|
Revision: 1614
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1614&view=rev
Author: heeroyuy
Date: 2009-02-19 10:07:39 +0000 (Thu, 19 Feb 2009)
Log Message:
-----------
-changes to get the plugin to run after refactoring
-removed example selection panel
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
trunk/src/dl-learner/org/dllearner/tools/protege/ButtonList.java
trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java
trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java
trunk/src/dl-learner/org/dllearner/tools/protege/OWLEquivalentClassesAxiomFrameSection.java
trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanelHandler.java
trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java
trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-02-18 17:13:11 UTC (rev 1613)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-02-19 10:07:39 UTC (rev 1614)
@@ -40,7 +40,7 @@
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import org.apache.log4j.Logger;
+//import org.apache.log4j.Logger;
import org.dllearner.algorithms.EvaluatedDescriptionPosNeg;
import org.dllearner.core.EvaluatedDescription;
import org.dllearner.core.LearningAlgorithm;
@@ -56,7 +56,7 @@
// This is the DLLearnerModel.
- private static Logger logger = Logger.getLogger(ActionHandler.class);
+ //private static Logger logger = Logger.getLogger(ActionHandler.class);
private DLLearnerModel model;
@@ -113,7 +113,7 @@
model.setLearningAlgorithm();
view.getRunButton().setEnabled(false);
view.renderErrorMessage("learning started");
- view.getPosAndNegSelectPanel().setCheckBoxesEnable(false);
+ //view.getPosAndNegSelectPanel().setCheckBoxesEnable(false);
retriever = new SuggestionRetriever();
retriever.execute();
@@ -305,11 +305,11 @@
/**
* Errorlogger.
*/
- Logger logger = Logger.getLogger(SuggestionRetriever.class);
+ //Logger logger = Logger.getLogger(SuggestionRetriever.class);
/**
* Errorlogger.
*/
- Logger rootLogger = Logger.getRootLogger();
+ //Logger rootLogger = Logger.getRootLogger();
@SuppressWarnings("unchecked")
@Override
@@ -382,7 +382,7 @@
private void updateList(final List<? extends EvaluatedDescription> result) {
- logger.debug("update list with " + result);
+ //logger.debug("update list with " + result);
Runnable doUpdateList = new Runnable() {
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ButtonList.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ButtonList.java 2009-02-18 17:13:11 UTC (rev 1613)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ButtonList.java 2009-02-19 10:07:39 UTC (rev 1614)
@@ -23,6 +23,8 @@
import org.protege.editor.owl.ui.frame.InheritedAnonymousClassesFrameSection;
import org.protege.editor.owl.ui.frame.OWLClassAssertionAxiomIndividualSection;
import org.protege.editor.owl.ui.frame.OWLDisjointClassesAxiomFrameSection;
+//import org.protege.editor.owl.ui.frame.OWLEquivalentClassesAxiomFrameSection;
+//import org.protege.editor.owl.ui.frame.OWLSubClassAxiomFrameSection;
import org.semanticweb.owl.model.OWLClass;
import org.protege.editor.owl.OWLEditorKit;
@@ -35,21 +37,26 @@
*
*/
public class ButtonList extends AbstractOWLFrame<OWLClass> {
+ private OWLEquivalentClassesAxiomFrameSection equi;
+ private OWLSubClassAxiomFrameSection sub;
/**
- * Construktor of the Buttonlist.
+ * Constructor of the Buttonlist.
*
* @param editorKit EditorKit from Protege
*/
public ButtonList(OWLEditorKit editorKit) {
+
super(editorKit.getModelManager().getOWLOntologyManager());
+ equi = new OWLEquivalentClassesAxiomFrameSection(editorKit, this);
+ sub = new OWLSubClassAxiomFrameSection(editorKit, this);
// own OWLEquivalentClassesAxiomFrameSection to add the dllearner plugin
// to the
// OWLClassDescritpionEditor
- addSection(new OWLEquivalentClassesAxiomFrameSection(editorKit, this));
+ addSection(equi);
// own OWLEquivalentClassesAxiomFrameSection to add the dllearner plugin
// to the
// OWLClassDescritpionEditor
- addSection(new OWLSubClassAxiomFrameSection(editorKit, this));
+ addSection(sub);
addSection(new InheritedAnonymousClassesFrameSection(editorKit, this));
addSection(new OWLClassAssertionAxiomIndividualSection(editorKit, this));
addSection(new OWLDisjointClassesAxiomFrameSection(editorKit, this));
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-02-18 17:13:11 UTC (rev 1613)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-02-19 10:07:39 UTC (rev 1614)
@@ -44,8 +44,8 @@
import org.dllearner.core.owl.NamedClass;
import org.dllearner.core.owl.Thing;
import org.dllearner.kb.OWLAPIOntology;
+import org.dllearner.learningproblems.PosNegInclusionLP;
import org.dllearner.learningproblems.PosNegLPStandard;
-import org.dllearner.learningproblems.PosNegInclusionLP;
import org.dllearner.reasoning.FastInstanceChecker;
import org.dllearner.utilities.owl.OWLAPIDescriptionConvertVisitor;
import org.mindswap.pellet.exceptions.InconsistentOntologyException;
@@ -80,8 +80,9 @@
"org.dllearner.learningproblems.PosNegDefinitionLP",
"org.dllearner.algorithms.RandomGuesser",
"org.dllearner.algorithms.refinement.ROLearner",
- "org.dllearner.algorithms.refexamples.ExampleBasedROLComponent",
- "org.dllearner.algorithms.gp.GP" };
+ "org.dllearner.algorithms.refinement2.ROLComponent2",
+ "org.dllearner.algorithms.gp.GP", "org.dllearner.learningproblems.PosOnlyLP",
+ "org.dllearner.learningproblems.PosNegLPStandard", "org.dllearner.learningproblems.ClassLearningProblem"};
// Component Manager that manages the components of the DL-Learner
@@ -190,6 +191,7 @@
private Vector<IndividualObject> individualVector;
private Set<String> ontologieURI;
private boolean ontologyConsistent;
+ private String learning;
// This is a List of evaluated descriptions to get more information of the
// suggested concept
@@ -215,6 +217,7 @@
this.id = id;
this.view = view;
ontologyConsistent = true;
+ learning = "";
owlDescription = new HashSet<OWLDescription>();
posListModel = new DefaultListModel();
negListModel = new DefaultListModel();
@@ -339,12 +342,18 @@
// sets the learning problem to PosNegDefinitionLP when the
// dllearner should suggest an equivalent class
lp = cm.learningProblem(PosNegLPStandard.class, reasoner);
+ learning = "equivalence";
}
if (id.equals(SUPER_CLASS_AXIOM_STRING)) {
// sets the learning problem to PosNegInclusionLP when the dllearner
// should suggest a subclass
+ learning = "superClass";
lp = cm.learningProblem(PosNegInclusionLP.class, reasoner);
}
+ System.out.println("CURRENT: " + currentConcept);
+ //lp = cm.learningProblem(ClassLearningProblem.class, reasoner);
+ //cm.applyConfigEntry(lp, "classToDescribe", currentConcept);
+ //cm.applyConfigEntry(lp, "type", learning);
// adds the positive examples
cm.applyConfigEntry(lp, "positiveExamples", positiveExamples);
// adds the negative examples
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-02-18 17:13:11 UTC (rev 1613)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-02-19 10:07:39 UTC (rev 1614)
@@ -34,6 +34,7 @@
private Vector<IndividualPoint> negCovIndVector;
private JButton allPositiveIndividuals;
private JButton allNegativeIndividuals;
+ private GraphicalCoveragePanelHandler handler;
/**
* This is the constructor for the GraphicalCoveragePanel.
@@ -50,6 +51,7 @@
posNotCovIndVector = new Vector<IndividualPoint>();
negCovIndVector = new Vector<IndividualPoint>();
this.computeGraphics();
+ handler = new GraphicalCoveragePanelHandler();
oldConcept = new Ellipse2D.Float(5, 25, 250, 250);
newConcept = new Ellipse2D .Float(5+shiftXAxis, 25, width+distortion, height+distortion);
allPositiveIndividuals = new JButton();
@@ -59,6 +61,7 @@
allNegativeIndividuals = new JButton();
//allNegativeIndividuals.setBounds(arg0, arg1, arg2, arg3);
this.computeIndividualPoints();
+ this.addMouseListener(handler);
}
public void drawCoverageForLearnedClassDescription(
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java 2009-02-18 17:13:11 UTC (rev 1613)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java 2009-02-19 10:07:39 UTC (rev 1614)
@@ -1,6 +1,44 @@
package org.dllearner.tools.protege;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+
//hier irgendwie umsetzen das wenn ueber individual fahre das name angezeigt wird.
-public class GraphicalCoveragePanelHandler {
+public class GraphicalCoveragePanelHandler implements MouseListener{
+
+ public GraphicalCoveragePanelHandler() {
+
+ }
+
+ @Override
+ public void mouseClicked(MouseEvent arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void mouseEntered(MouseEvent arg0) {
+ System.out.println("test: " + arg0.getSource());
+
+ }
+
+ @Override
+ public void mouseExited(MouseEvent arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void mousePressed(MouseEvent arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void mouseReleased(MouseEvent arg0) {
+ // TODO Auto-generated method stub
+
+ }
+
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java 2009-02-18 17:13:11 UTC (rev 1613)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java 2009-02-19 10:07:39 UTC (rev 1614)
@@ -434,7 +434,7 @@
* This Method renders the view of the plugin.
*/
public void makeView() {
-
+ run.setEnabled(false);
model.clearVector();
hint.setText("To get suggestions for class descriptions, please click the button above.");
isInconsistent = false;
@@ -458,8 +458,8 @@
advanced.setBounds(10, 200, 20, 20);
sugPanel.setVisible(true);
posPanel.setVisible(false);
- posPanel.getAddToNegPanelButton().setEnabled(false);
- posPanel.getAddToPosPanelButton().setEnabled(false);
+ //posPanel.getAddToNegPanelButton().setEnabled(false);
+ //posPanel.getAddToPosPanelButton().setEnabled(false);
posPanel.setBounds(10, 230, 490, 250);
accept.setBounds(510, 40, 80, 110);
hint.setBounds(10, 150, 490, 35);
@@ -563,7 +563,7 @@
model.unsetNewConcepts();
action.destroyDLLearnerThread();
errorMessage.setText("");
- posPanel.unsetPosAndNegPanel();
+ //posPanel.unsetPosAndNegPanel();
learner.removeAll();
}
@@ -605,8 +605,8 @@
run.removeActionListener(action);
accept.removeActionListener(action);
advanced.removeActionListener(action);
- posPanel.removeListeners(action);
- posPanel.removeHelpButtonListener(action);
+ //posPanel.removeListeners(action);
+ //posPanel.removeHelpButtonListener(action);
}
/**
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OWLEquivalentClassesAxiomFrameSection.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OWLEquivalentClassesAxiomFrameSection.java 2009-02-18 17:13:11 UTC (rev 1613)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OWLEquivalentClassesAxiomFrameSection.java 2009-02-19 10:07:39 UTC (rev 1614)
@@ -26,7 +26,11 @@
import java.util.Set;
import org.protege.editor.owl.OWLEditorKit;
-import org.protege.editor.owl.ui.frame.*;
+import org.protege.editor.owl.ui.frame.AbstractOWLFrameSection;
+import org.protege.editor.owl.ui.frame.OWLEquivalentClassesAxiomFrameSectionRow;
+import org.protege.editor.owl.ui.frame.OWLFrame;
+import org.protege.editor.owl.ui.frame.OWLFrameSectionRow;
+import org.protege.editor.owl.ui.frame.OWLFrameSectionRowObjectEditor;
import org.semanticweb.owl.inference.OWLReasonerException;
import org.semanticweb.owl.inference.UnsupportedReasonerOperationException;
import org.semanticweb.owl.model.AddAxiom;
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanel.java 2009-02-18 17:13:11 UTC (rev 1613)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanel.java 2009-02-19 10:07:39 UTC (rev 1614)
@@ -21,17 +21,17 @@
import java.awt.Dimension;
import java.awt.GridLayout;
-import java.net.URL;
+//import java.net.URL;
-import javax.swing.DefaultListModel;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
+//import javax.swing.DefaultListModel;
+//import javax.swing.ImageIcon;
+//import javax.swing.JButton;
+//import javax.swing.JLabel;
+//import javax.swing.JList;
+//import javax.swing.JOptionPane;
import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.ListSelectionModel;
+//import javax.swing.JScrollPane;
+//import javax.swing.ListSelectionModel;
/**
* This class is the Panel for the Check boxes where the positive and negative
@@ -50,32 +50,32 @@
// This is the DLLearner Model
- private DLLearnerModel model;
+ //private DLLearnerModel model;
// This is the Scroll pane if there are more Check boxes than the view can
// show
- private JScrollPane posScrollList;
+ //private JScrollPane posScrollList;
- private JScrollPane negScrollList;
+ //private JScrollPane negScrollList;
- private JList posList;
- private JList negList;
- private JPanel posPanel;
- private JPanel negPanel;
- private JPanel buttonPanel;
- private JButton addToNegExamples;
- private JButton addToPosExamples;
- private JPanel posLabelPanel;
- private JPanel negLabelPanel;
+ //private JList posList;
+ //private JList negList;
+ //private JPanel posPanel;
+ //private JPanel negPanel;
+ //private JPanel buttonPanel;
+ //private JButton addToNegExamples;
+ //private JButton addToPosExamples;
+ //private JPanel posLabelPanel;
+ //private JPanel negLabelPanel;
// This is the Label that shows "Positive Examples"
- private JLabel pos;
+ //private JLabel pos;
// This is the Label that shows "Negative Examples"
- private JLabel neg;
+ //private JLabel neg;
// This is the Panel where the Label for Positive Examples and
// a help Button is in
@@ -83,21 +83,21 @@
// This is the Help button for positive examples
- private JButton helpForPosExamples;
+ //private JButton helpForPosExamples;
// This is the Help button for negative examples
- private JButton helpForNegExamples;
+ //private JButton helpForNegExamples;
// This is the Text area where the help message is displayed.
private OptionPanel optionPanel;
- private DefaultListModel posListModel;
- private ImageIcon addToPosListIcon;
- private ImageIcon addToNegListIcon;
- private DefaultListModel negListModel;
- private JPanel examplePanel;
- private PosAndNegSelectPanelHandler handler;
- private OWLClassDescriptionEditorWithDLLearnerTab.DLLearnerView view;
+ //private DefaultListModel posListModel;
+ //private ImageIcon addToPosListIcon;
+ //private ImageIcon addToNegListIcon;
+ //private DefaultListModel negListModel;
+ //private JPanel examplePanel;
+ //private PosAndNegSelectPanelHandler handler;
+ //private OWLClassDescriptionEditorWithDLLearnerTab.DLLearnerView view;
/**
* This is the constructor for the Panel that shows the check boxes.
@@ -113,87 +113,87 @@
super();
setLayout(new GridLayout(0, 1));
setPreferredSize(new Dimension(490, 250));
- view = v;
- this.model = model;
- handler = new PosAndNegSelectPanelHandler(model, view, this);
+ //view = v;
+ //this.model = model;
+ //handler = new PosAndNegSelectPanelHandler(model, view, this);
//Instantiate all objects needed
optionPanel = new OptionPanel();
- examplePanel = new JPanel(null);
- posLabelPanel = new JPanel(null);
- negLabelPanel = new JPanel(null);
- URL iconUrl = this.getClass().getResource("backspace.gif");
- addToPosListIcon = new ImageIcon(iconUrl);
- URL toggledIconUrl = this.getClass().getResource("space.gif");
- addToNegListIcon = new ImageIcon(toggledIconUrl);
- posListModel = new DefaultListModel();
- negListModel = new DefaultListModel();
- pos = new JLabel("Positive Examples");
- pos.setBounds(0, 0, 100, 30);
- neg = new JLabel("Negative Examples");
- neg.setBounds(0, 0, 100, 30);
- posList = new JList(posListModel);
- posList.setName("pos");
- posList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- negList = new JList(negListModel);
- negList.setName("neg");
- negList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- addToPosExamples = new JButton(addToPosListIcon);
- addToPosExamples.setName("pos");
- addToNegExamples = new JButton(addToNegListIcon);
- addToNegExamples.setName("neg");
- helpForPosExamples = new JButton("?");
- helpForPosExamples.setBounds(100, 5, 20, 20);
- helpForNegExamples = new JButton("?");
- helpForNegExamples.setBounds(105, 5, 20, 20);
- helpForPosExamples.setName("PosHelpButton");
- helpForNegExamples.setName("NegHelpButton");
+ //examplePanel = new JPanel(null);
+ //posLabelPanel = new JPanel(null);
+ //negLabelPanel = new JPanel(null);
+ //URL iconUrl = this.getClass().getResource("backspace.gif");
+ //addToPosListIcon = new ImageIcon(iconUrl);
+ //URL toggledIconUrl = this.getClass().getResource("space.gif");
+ //addToNegListIcon = new ImageIcon(toggledIconUrl);
+ //posListModel = new DefaultListModel();
+ //negListModel = new DefaultListModel();
+ //pos = new JLabel("Positive Examples");
+ //pos.setBounds(0, 0, 100, 30);
+ //neg = new JLabel("Negative Examples");
+ //neg.setBounds(0, 0, 100, 30);
+ //posList = new JList(posListModel);
+ //posList.setName("pos");
+ //posList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ //negList = new JList(negListModel);
+ //negList.setName("neg");
+ //negList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ //addToPosExamples = new JButton(addToPosListIcon);
+ //addToPosExamples.setName("pos");
+ //addToNegExamples = new JButton(addToNegListIcon);
+ //addToNegExamples.setName("neg");
+ //helpForPosExamples = new JButton("?");
+ //helpForPosExamples.setBounds(100, 5, 20, 20);
+ //helpForNegExamples = new JButton("?");
+ //helpForNegExamples.setBounds(105, 5, 20, 20);
+ //helpForPosExamples.setName("PosHelpButton");
+ //helpForNegExamples.setName("NegHelpButton");
//set size for components that have no layout.
- posPanel = new JPanel(null);
- posPanel.setPreferredSize(new Dimension(200, 100));
- negPanel = new JPanel(null);
- negPanel.setPreferredSize(new Dimension(200, 100));
- buttonPanel = new JPanel(null);
- buttonPanel.setPreferredSize(new Dimension(90, 85));
- addToPosExamples.setBounds(0, 50, 70, 30);
- addToNegExamples.setBounds(0, 80, 70, 30);
- buttonPanel.add(addToPosExamples);
- buttonPanel.add(addToNegExamples);
- posLabelPanel.add(pos);
- posLabelPanel.add(helpForPosExamples);
- negLabelPanel.add(neg);
- negLabelPanel.add(helpForNegExamples);
- posScrollList = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
- JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
- posScrollList.setViewportView(posList);
+ //posPanel = new JPanel(null);
+ //posPanel.setPreferredSize(new Dimension(200, 100));
+ //negPanel = new JPanel(null);
+ //negPanel.setPreferredSize(new Dimension(200, 100));
+ //buttonPanel = new JPanel(null);
+ //buttonPanel.setPreferredSize(new Dimension(90, 85));
+ //addToPosExamples.setBounds(0, 50, 70, 30);
+ //addToNegExamples.setBounds(0, 80, 70, 30);
+ //buttonPanel.add(addToPosExamples);
+ //buttonPanel.add(addToNegExamples);
+ //posLabelPanel.add(pos);
+ //posLabelPanel.add(helpForPosExamples);
+ //negLabelPanel.add(neg);
+ //negLabelPanel.add(helpForNegExamples);
+ //posScrollList = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
+ // JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+ //posScrollList.setViewportView(posList);
- negScrollList = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
- JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
- negScrollList.setViewportView(negList);
+ //negScrollList = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
+ // JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+ //negScrollList.setViewportView(negList);
- posLabelPanel.setBounds(0, 0, 200, 30);
- posScrollList.setBounds(0, 40, 190, 85);
+ //posLabelPanel.setBounds(0, 0, 200, 30);
+ //posScrollList.setBounds(0, 40, 190, 85);
- posPanel.add(posScrollList);
- posPanel.add(posLabelPanel);
+ //posPanel.add(posScrollList);
+ //posPanel.add(posLabelPanel);
- negLabelPanel.setBounds(0, 0, 200, 30);
- negScrollList.setBounds(0, 40, 185, 85);
- negPanel.add(negLabelPanel);
- negPanel.add(negScrollList);
+ //negLabelPanel.setBounds(0, 0, 200, 30);
+ //negScrollList.setBounds(0, 40, 185, 85);
+ //negPanel.add(negLabelPanel);
+ //negPanel.add(negScrollList);
- posPanel.setBounds(0, 0, 200, 250);
- buttonPanel.setBounds(210, 0, 90, 250);
- negPanel.setBounds(300, 0, 200, 250);
- examplePanel.add(posPanel);
- examplePanel.add(buttonPanel);
- examplePanel.add(negPanel);
- addHelpButtonListener(handler);
+ //posPanel.setBounds(0, 0, 200, 250);
+ //buttonPanel.setBounds(210, 0, 90, 250);
+ //negPanel.setBounds(300, 0, 200, 250);
+ //examplePanel.add(posPanel);
+ //examplePanel.add(buttonPanel);
+ //examplePanel.add(negPanel);
+ //addHelpButtonListener(handler);
add(optionPanel);
- add(examplePanel);
- posList.addMouseListener(handler);
- negList.addMouseListener(handler);
- addToPosExamples.addActionListener(handler);
- addToNegExamples.addActionListener(handler);
+ //add(examplePanel);
+ //posList.addMouseListener(handler);
+ //negList.addMouseListener(handler);
+ //addToPosExamples.addActionListener(handler);
+ //addToNegExamples.addActionListener(handler);
}
/**
@@ -202,28 +202,28 @@
* @param posData DefaultListModel
* @param negData DefaultListModel
*/
- public void setExampleList(DefaultListModel posData, DefaultListModel negData) {
- posListModel = posData;
- negListModel = negData;
- posList.setModel(posListModel);
- negList.setModel(negListModel);
- }
+ //public void setExampleList(DefaultListModel posData, DefaultListModel negData) {
+ // posListModel = posData;
+ // negListModel = negData;
+ // posList.setModel(posListModel);
+ // negList.setModel(negListModel);
+ //}
/**
* This method returns the pos button.
* @return JButton
*/
- public JButton getAddToPosPanelButton() {
- return addToPosExamples;
- }
+ //public JButton getAddToPosPanelButton() {
+ // return addToPosExamples;
+ //}
/**
* This method returns the neg button.
* @return JButton
*/
- public JButton getAddToNegPanelButton() {
- return addToNegExamples;
- }
+ //public JButton getAddToNegPanelButton() {
+ // return addToNegExamples;
+ //}
/**
* This method removes the Check boxes, the labels and the help buttons
@@ -274,51 +274,51 @@
*
* @param assistance String
*/
- public void renderHelpMessage(String assistance) {
- // renders scroll bar if necessary
- JOptionPane.showMessageDialog(null, assistance);
-
- }
+ //public void renderHelpMessage(String assistance) {
+ // // renders scroll bar if necessary
+ // JOptionPane.showMessageDialog(null, assistance);
+ //
+ //}
/**
* this method sets the example to the other list when button is pressed.
* @param toPos boolean
* @param example String
*/
- public void setExampleToOtherList(boolean toPos, String example) {
- if (toPos) {
- for(int i = 0; i < negListModel.size(); i++) {
- if(negListModel.get(i).equals(example)) {
- negListModel.remove(i);
- for (int j = 0; j < model.getIndividualVector().size(); j++) {
- if (model.getIndividualVector().get(j).getIndividualString().contains(example)) {
- model.getIndividualVector().get(j).setExamplePositive(true);
- break;
- }
- }
-
- }
- }
- posListModel.add(0, example);
- } else {
- for(int i = 0; i < posListModel.size(); i++) {
- if(posListModel.get(i).equals(example)) {
- posListModel.remove(i);
- for (int j = 0; j < model.getIndividualVector().size(); j++) {
- if (model.getIndividualVector().get(j).getIndividualString().contains(example)) {
- model.getIndividualVector().get(j).setExamplePositive(false);
- }
- }
- break;
- }
- }
- negListModel.add(0, example);
- }
- setExampleList(posListModel, negListModel);
- addToPosExamples.setEnabled(false);
- addToNegExamples.setEnabled(false);
-
- }
+ //public void setExampleToOtherList(boolean toPos, String example) {
+ // if (toPos) {
+ // for(int i = 0; i < negListModel.size(); i++) {
+ // if(negListModel.get(i).equals(example)) {
+ // negListModel.remove(i);
+ // for (int j = 0; j < model.getIndividualVector().size(); j++) {
+ // if (model.getIndividualVector().get(j).getIndividualString().contains(example)) {
+ // model.getIndividualVector().get(j).setExamplePositive(true);
+ // break;
+ // }
+ // }
+ //
+ // }
+ // }
+ // posListModel.add(0, example);
+ // } else {
+ // for(int i = 0; i < posListModel.size(); i++) {
+ // if(posListModel.get(i).equals(example)) {
+ // posListModel.remove(i);
+ // for (int j = 0; j < model.getIndividualVector().size(); j++) {
+ // if (model.getIndividualVector().get(j).getIndividualString().contains(example)) {
+ // model.getIndividualVector().get(j).setExamplePositive(false);
+ // }
+ // }
+ // break;
+ // }
+ // }
+ // negListModel.add(0, example);
+ // }
+ // setExampleList(posListModel, negListModel);
+ // addToPosExamples.setEnabled(false);
+ // addToNegExamples.setEnabled(false);
+ //
+ //}
/**
* This method adds the Action listener to the help buttons.
@@ -326,20 +326,20 @@
* @param handle
* PosAndNegSelectPanelHandler
*/
- public void addHelpButtonListener(PosAndNegSelectPanelHandler handle) {
- // adds listener to the help button for the positive examples
- helpForPosExamples.addActionListener(handle);
- // adds listener to the help button for the negative examples
- helpForNegExamples.addActionListener(handle);
- }
+ //public void addHelpButtonListener(PosAndNegSelectPanelHandler handle) {
+ // // adds listener to the help button for the positive examples
+ // helpForPosExamples.addActionListener(handle);
+ // // adds listener to the help button for the negative examples
+ // helpForNegExamples.addActionListener(handle);
+ //}
/**
* This Method removes the listeners for the help button.
* @param a ActionHandler
*/
- public void removeHelpButtonListener(ActionHandler a) {
- helpForPosExamples.removeActionListener(a);
- helpForNegExamples.removeActionListener(a);
- }
+ //public void removeHelpButtonListener(ActionHandler a) {
+ // helpForPosExamples.removeActionListener(a);
+ // helpForNegExamples.removeActionListener(a);
+ //}
/**
* This method returns the option panel.
@@ -353,16 +353,16 @@
* This method returns the list of positive examples.
* @return JList posExampleList
*/
- public JList getPosExampleList() {
- return posList;
- }
+ //public JList getPosExampleList() {
+ // return posList;
+ //}
/**
* This method returns the list of negative examples.
* @return JList negExampleList
*/
- public JList getNegExampleList() {
- return negList;
- }
+ //public JList getNegExampleList() {
+ // return negList;
+ //}
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanelHandler.java 2009-02-18 17:13:11 UTC (rev 1613)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/PosAndNegSelectPanelHandler.java 2009-02-19 10:07:39 UTC (rev 1614)
@@ -35,9 +35,9 @@
// This is the DLLearnerModel.
//private DLLearnerModel model;
-private PosAndNegSelectPanel panel;
+//private PosAndNegSelectPanel panel;
// This is the view of the DL-Learner tab.
-private OWLClassDescriptionEditorWithDLLearnerTab.DLLearnerView view;
+//private OWLClassDescriptionEditorWithDLLearnerTab.DLLearnerView view;
/**
* This is the constructor for the PosAndNegSelectPanelHandler.
@@ -50,8 +50,8 @@
*/
public PosAndNegSelectPanelHandler(DLLearnerModel m, OWLClassDescriptionEditorWithDLLearnerTab.DLLearnerView v, PosAndNegSelectPanel p) {
//model = m;
- panel = p;
- view = v;
+ //panel = p;
+ //view = v;
}
/**
@@ -62,28 +62,28 @@
System.out.println(action.getSource());
if (action.getSource().toString().contains("pos")) {
- panel.setExampleToOtherList(true, panel.getNegExampleList().getSelectedValue().toString());
- System.out.println("COUNT: " + panel.getPosExampleList().getModel().getSize());
- if(panel.getPosExampleList().getModel().getSize()>0) {
- view.getRunButton().setEnabled(true);
- }
+ //panel.setExampleToOtherList(true, panel.getNegExampleList().getSelectedValue().toString());
+ //System.out.println("COUNT: " + panel.getPosExampleList().getModel().getSize());
+ //if(panel.getPosExampleList().getModel().getSize()>0) {
+ // view.getRunButton().setEnabled(true);
+ //}
}
if (action.getSource().toString().contains("neg")) {
- panel.setExampleToOtherList(false, panel.getPosExampleList().getSelectedValue().toString());
+ //panel.setExampleToOtherList(false, panel.getPosExampleList().getSelectedValue().toString());
}
if (action.getActionCommand().equals("?")) {
if (action.getSource().toString().contains("PosHelpButton")) {
- String help = "An individual that should be an instance of the learned class description.\n"
- +"Per default all that belongs to the class.";
- view.getPosAndNegSelectPanel().renderHelpMessage(help);
+ //String help = "An individual that should be an instance of the learned class description.\n"
+ // +"Per default all that belongs to the class.";
+ //view.getPosAndNegSelectPanel().renderHelpMessage(help);
}
if (action.getSource().toString().contains("NegHelpButton")) {
- String help = "An individual that should not be instance of the learned class description.\n"
- +" By default, these are all individuals, which are not instances of the current class.";
- view.getPosAndNegSelectPanel().renderHelpMessage(help);
+ //String help = "An individual that should not be instance of the learned class description.\n"
+ // +" By default, these are all individuals, which are not instances of the current class.";
+ //view.getPosAndNegSelectPanel().renderHelpMessage(help);
}
}
@@ -113,16 +113,16 @@
* @param m MouseEvent
*/
public void mouseClicked(MouseEvent m) {
- if (!panel.getPosExampleList().isSelectionEmpty() && m.toString().contains("pos")) {
- panel.getAddToNegPanelButton().setEnabled(true);
- panel.getAddToPosPanelButton().setEnabled(false);
- panel.getNegExampleList().clearSelection();
- }
- if (!panel.getNegExampleList().isSelectionEmpty() && m.toString().contains("neg")) {
- panel.getAddToPosPanelButton().setEnabled(true);
- panel.getAddToNegPanelButton().setEnabled(false);
- panel.getPosExampleList().clearSelection();
- }
+ //if (!panel.getPosExampleList().isSelectionEmpty() && m.toString().contains("pos")) {
+ // panel.getAddToNegPanelButton().setEnabled(true);
+ // panel.getAddToPosPanelButton().setEnabled(false);
+ // panel.getNegExampleList().clearSelection();
+ //}
+ //if (!panel.getNegExampleList().isSelectionEmpty() && m.toString().contains("neg")) {
+ // panel.getAddToPosPanelButton().setEnabled(true);
+ // panel.getAddToNegPanelButton().setEnabled(false);
+ // panel.getPosExampleList().clearSelection();
+ //}
}
/**
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java 2009-02-18 17:13:11 UTC (rev 1613)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java 2009-02-19 10:07:39 UTC (rev 1614)
@@ -19,11 +19,11 @@
*/
package org.dllearner.tools.protege;
-import org.apache.log4j.FileAppender;
-import org.apache.log4j.HTMLLayout;
-import org.apache.log4j.Layout;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+//import org.apache.log4j.FileAppender;
+//import org.apache.log4j.HTMLLayout;
+//import org.apache.log4j.Layout;
+//import org.apache.log4j.Level;
+//import org.apache.log4j.Logger;
import org.protege.editor.owl.ui.view.AbstractOWLClassViewComponent;
import org.semanticweb.owl.model.OWLClass;
import org.protege.editor.owl.ui.framelist.OWLFrameList2;
@@ -39,7 +39,7 @@
public class ProtegePlugin extends AbstractOWLClassViewComponent {
private static final long serialVersionUID = 728362819273927L;
/**
- * List of the lists for equibvalent classes and so on.
+ * List of the lists for equivalent classes and so on.
*/
private OWLFrameList2<OWLClass> list;
@@ -54,21 +54,21 @@
add(dlLearner);
// add file logger (comment out if not needed)
- boolean useAdditionalLogger = true;
- if(useAdditionalLogger) {
- Layout layout = new HTMLLayout();
- String fileName = "logs/dllearner_log.html";
- FileAppender fileAppender = new FileAppender(layout, fileName, true);
+ //boolean useAdditionalLogger = true;
+ //if(useAdditionalLogger) {
+ // Layout layout = new HTMLLayout();
+ // String fileName = "logs/dllearner_log.html";
+ // FileAppender fileAppender = new FileAppender(layout, fileName, true);
// only add log statements in protege package to log file
- Logger protegeLogger = Logger.getLogger("org.dllearner.tools.protege");
- protegeLogger.addAppender(fileAppender);
- protegeLogger.setLevel(Level.DEBUG);
- }
+ // Logger protegeLogger = Logger.getLogger("org.dllearner.tools.protege");
+ // protegeLogger.addAppender(fileAppender);
+ // protegeLogger.setLevel(Level.DEBUG);
+ //}
}
@Override
/**
- * updates the view if somthing changes
+ * updates the view if something changes
*/
protected OWLClass updateView(OWLClass selectedClass) {
list.setRootObject(selectedClass);
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-02-18 17:13:11 UTC (rev 1613)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-02-19 10:07:39 UTC (rev 1614)
@@ -141,13 +141,13 @@
if (setPositivExamplesChecked(indiv)) {
if (indiv.contains(ont)) {
// when yes then it sets the positive example checked
-
+
// OWLExpressionCheckerFactory
posListModel.add(0, ind.toManchesterSyntaxString(ont, null));
individualVector.add(new IndividualObject(indiv, true));
break;
}
-
+
} else {
// When no it unchecks the positive example
if (indiv.contains(ont)) {
@@ -159,7 +159,7 @@
}
}
}
- view.getPosAndNegSelectPanel().setExampleList(posListModel, negListModel);
+ //view.getPosAndNegSelectPanel().setExampleList(posListModel, negListModel);
model.setPosListModel(posListModel);
model.setNegListModel(negListModel);
model.setIndividualVector(individualVector);
@@ -184,7 +184,7 @@
}
}
return isChecked;
-
+
}
@Override
@@ -206,7 +206,7 @@
String message ="There are no Instances for "+ current.getRootObject()+" available. Please insert some Instances.";
view.renderErrorMessage(message);
}
- view.getPosAndNegSelectPanel().setExampleList(model.getPosListModel(), model.getNegListModel());
+ //view.getPosAndNegSelectPanel().setExampleList(model.getPosListModel(), model.getNegListModel());
} else {
view.getHintPanel().setForeground(Color.RED);
view.getRunButton().setEnabled(false);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
