From: <hee...@us...> - 2009-02-19 13:56:34
|
Revision: 1617 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1617&view=rev Author: heeroyuy Date: 2009-02-19 13:55:58 +0000 (Thu, 19 Feb 2009) Log Message: ----------- -added method to display all individuals belonging to the old class and the new learned class description Modified Paths: -------------- 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/MoreDetailForSuggestedConceptsPanel.java Added Paths: ----------- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-02-19 12:32:54 UTC (rev 1616) +++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-02-19 13:55:58 UTC (rev 1617) @@ -191,7 +191,7 @@ private Vector<IndividualObject> individualVector; private Set<String> ontologieURI; private boolean ontologyConsistent; - private String learning; + //private String learning; // This is a List of evaluated descriptions to get more information of the // suggested concept @@ -217,7 +217,7 @@ this.id = id; this.view = view; ontologyConsistent = true; - learning = ""; + //learning = ""; owlDescription = new HashSet<OWLDescription>(); posListModel = new DefaultListModel(); negListModel = new DefaultListModel(); @@ -342,12 +342,12 @@ // sets the learning problem to PosNegDefinitionLP when the // dllearner should suggest an equivalent class lp = cm.learningProblem(PosNegLPStandard.class, reasoner); - learning = "equivalence"; + //learning = "equivalence"; } if (id.equals(SUPER_CLASS_AXIOM_STRING)) { // sets the learning problem to PosNegInclusionLP when the dllearner // should suggest a subclass - learning = "superClass"; + //Slearning = "superClass"; lp = cm.learningProblem(PosNegInclusionLP.class, reasoner); } System.out.println("CURRENT: " + currentConcept); @@ -713,7 +713,7 @@ owlDescription.add(newConceptOWLAPI); this.desc = newConceptOWLAPI; } - + /** * This methode returns the Model for the suggested Concepts. * Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-02-19 12:32:54 UTC (rev 1616) +++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-02-19 13:55:58 UTC (rev 1617) @@ -8,7 +8,6 @@ import java.util.Set; import java.util.Vector; -import javax.swing.JButton; import javax.swing.JPanel; import org.dllearner.algorithms.EvaluatedDescriptionPosNeg; @@ -34,8 +33,6 @@ private Vector<IndividualPoint> posNotCovIndVector; private Vector<IndividualPoint> negCovIndVector; private Vector<IndividualPoint> points; - private JButton allPositiveIndividuals; - private JButton allNegativeIndividuals; private GraphicalCoveragePanelHandler handler; private MoreDetailForSuggestedConceptsPanel panel; @@ -59,12 +56,6 @@ handler = new GraphicalCoveragePanelHandler(this); oldConcept = new Ellipse2D.Float(5, 25, 250, 250); newConcept = new Ellipse2D.Float(5+shiftXAxis, 25, width+distortion, height+distortion); - allPositiveIndividuals = new JButton(); - //immer in der mitte und unten rauszubekommen mittels getMittelpunkt fuer x - //und getMaxY fuer y. - //allPositiveIndividuals.setBounds(arg0, arg1, arg2, arg3); - allNegativeIndividuals = new JButton(); - //allNegativeIndividuals.setBounds(arg0, arg1, arg2, arg3); this.computeIndividualPoints(); //this.addMouseListener(handler); this.addMouseMotionListener(handler); @@ -111,8 +102,8 @@ private void computeGraphics(){ int posGes = model.getPosListModel().size(); int notCovPos = ((EvaluatedDescriptionPosNeg)eval).getNotCoveredPositives().size(); - int covNeg = ((EvaluatedDescriptionPosNeg)eval).getCoveredNegatives().size(); - int negGes = model.getNegListModel().size(); + //int covNeg = ((EvaluatedDescriptionPosNeg)eval).getCoveredNegatives().size(); + //int negGes = model.getNegListModel().size(); double notCov = notCovPos; float shift = (float) (width*(notCov/posGes)); shiftXAxis = Math.round(shift); Modified: trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-02-19 12:32:54 UTC (rev 1616) +++ trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-02-19 13:55:58 UTC (rev 1617) @@ -23,6 +23,7 @@ import java.awt.GridLayout; import java.util.Set; +import javax.swing.JButton; import javax.swing.JDialog; import javax.swing.JLabel; import javax.swing.JPanel; @@ -118,6 +119,9 @@ private static final int height = 500; private static final int width = 600; private GraphicalCoveragePanel p; + private JButton allPositiveIndividuals; + private JButton allNegativeIndividuals; + private MoreDetailForSuggestedConceptsPanelHandler handler; /** * This is the constructor for the Panel. * @param model DLLearnerModel @@ -127,8 +131,17 @@ setLayout(null); setPreferredSize(new Dimension(width, height)); this.model = model; + handler = new MoreDetailForSuggestedConceptsPanelHandler(model); + allPositiveIndividuals = new JButton("old"); + allPositiveIndividuals.setBounds(100, 400, 50, 30); + allPositiveIndividuals.addActionListener(handler); + allNegativeIndividuals = new JButton("new"); + allNegativeIndividuals.setBounds(400, 400, 50, 30); + allNegativeIndividuals.addActionListener(handler); + + } /** * This method returns the Detail Panel. @@ -137,7 +150,6 @@ public JDialog getMoreDialog() { return detailPopup; } - /** * This method renders the output for the detail panel. @@ -205,8 +217,8 @@ //panel for the informations of the selected concept //this method adds the informations for the selected concept to the panel setInformation(); - p = new GraphicalCoveragePanel(eval, model, conceptText.getText(), width, height, this); - p.setBounds(5, 110, 600, 650); + p = new GraphicalCoveragePanel(eval, model, conceptText.getText(), width, height-200, this); + p.setBounds(5, 110, 600, 300); detailPopup = new JDialog(); detailPopup.setSize(width, height); //window will be disposed if the x button is pressed @@ -228,6 +240,9 @@ add(conceptPanel); add(accuracyPanel); add(p); + add(allPositiveIndividuals); + add(allNegativeIndividuals); + handler.setEvaluadtedDescription(eval); /* add(coveredPositiveExamples); add(notCoveredPositiveExamples); @@ -239,7 +254,13 @@ add(negNotCoveredScroll);*/ detailPopup.add(this); } + public JButton getAllPositiveindividuals() { + return allPositiveIndividuals; + } + public JButton getAllNegativeIndividuals() { + return allNegativeIndividuals; + } private void unsetEverything() { removeAll(); } Added: trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java 2009-02-19 13:55:58 UTC (rev 1617) @@ -0,0 +1,68 @@ +package org.dllearner.tools.protege; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.Set; +import java.util.SortedSet; + +import javax.swing.JOptionPane; + +import org.dllearner.algorithms.EvaluatedDescriptionPosNeg; +import org.dllearner.core.EvaluatedDescription; +import org.dllearner.core.owl.Individual; + +public class MoreDetailForSuggestedConceptsPanelHandler implements ActionListener{ + + private static final String OLD_BUTTON_LABEL = "old"; + private static final String NEW_BUTTON_LABEL = "new"; + private DLLearnerModel model; + private EvaluatedDescription eval; + public MoreDetailForSuggestedConceptsPanelHandler(DLLearnerModel m) { + model = m; + } + + @Override + public void actionPerformed(ActionEvent a) { + if(a.getActionCommand().equals(OLD_BUTTON_LABEL)) { + String toolTip = "This are the Individuals beloning to " + model.getOldConceptOWLAPI() +":\n\n"; + SortedSet<Individual> ind = model.getReasoner().getIndividuals(model.getCurrentConcept()); + for(Individual i : ind) { + Set<String> ur = model.getOntologyURIString(); + for(String str : ur) { + if(i.toString().contains(str)) { + toolTip = toolTip + i.toManchesterSyntaxString(str, null) + "\n"; + } + } + } + JOptionPane.showMessageDialog(null, toolTip); + } + + if(a.getActionCommand().equals(NEW_BUTTON_LABEL)) { + Set<Individual> posInd = ((EvaluatedDescriptionPosNeg)eval).getCoveredPositives(); + Set<String> uri = model.getOntologyURIString(); + String toolTip = "This are the Individuals beloning to\n "; + for(String u : uri) { + if(eval.getDescription().toString().contains(u)) { + toolTip = toolTip + eval.getDescription().toManchesterSyntaxString(u, null) + ":\n\n"; + } + } + + for(Individual ind : posInd ) { + + for(String u : uri) { + if(ind.toString().contains(u)) { + toolTip = toolTip + ind.toManchesterSyntaxString(u, null) + "\n"; + } + } + + } + JOptionPane.showMessageDialog(null, toolTip); + + } + + } + + public void setEvaluadtedDescription(EvaluatedDescription e) { + eval = e; + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |