Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1897] trunk/src/dl-learner/org/dllearner/tools/ protege
|
From: <hee...@us...> - 2009-10-28 11:03:33
|
Revision: 1897
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1897&view=rev
Author: heeroyuy
Date: 2009-10-28 11:03:23 +0000 (Wed, 28 Oct 2009)
Log Message:
-----------
-code cleanup
-add javadoc
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java
trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java
trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java
trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java
trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-28 10:07:09 UTC (rev 1896)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-28 11:03:23 UTC (rev 1897)
@@ -22,7 +22,6 @@
import java.awt.Color;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
import java.util.List;
import java.util.Set;
import java.util.Timer;
@@ -34,7 +33,6 @@
import javax.swing.JTextArea;
import javax.swing.SwingUtilities;
import javax.swing.SwingWorker;
-import javax.swing.event.ListSelectionEvent;
import org.dllearner.algorithms.celoe.CELOE;
import org.dllearner.core.EvaluatedDescription;
@@ -165,34 +163,6 @@
}
/**
- * select/deselect the Check boxes.
- *
- * @param i
- * ItemEvent
- */
- public void itemStateChanged(ItemEvent i) {
-
- }
-
- /**
- * Nothing happens here.
- *
- * @param e
- * ListSelectionEvent
- */
- public void valueChanged(ListSelectionEvent e) {
-
- }
-
-
- /**
- * Destroys the Thread after the Pluigin is closed.
- */
- public void destroyDLLearnerThread() {
- // dlLearner = null;
- }
-
- /**
* Resets the toggled Button after the plugin is closed.
*/
public void resetToggled() {
@@ -258,7 +228,6 @@
try {
dlLearner.join();
} catch (InterruptedException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
List<? extends EvaluatedDescription> result = la
@@ -284,7 +253,6 @@
}
setProgress(0);
view.stopStatusBar();
- //view.algorithmTerminated();
updateList(result);
view.algorithmTerminated();
@@ -297,23 +265,8 @@
for (List<? extends EvaluatedDescription> list : resultLists) {
updateList(list);
- this.checkSelectedItem(list);
}
}
- /*
- * TODO: ueberlegen wegen umsetzung.
- */
- private void checkSelectedItem(List<? extends EvaluatedDescription> result) {
- if(!view.getSuggestClassPanel().getSuggestList().isSelectionEmpty()) {
- SuggestListItem item = (SuggestListItem) view.getSuggestClassPanel().getSuggestList().getSelectedValue();
- String itemString = item.getValue();
- for(EvaluatedDescription desc: result) {
- if(desc.getDescription().toString().equals(itemString)) {
-
- }
- }
- }
- }
private void updateList(
final List<? extends EvaluatedDescription> result) {
@@ -329,12 +282,6 @@
for (String ontology : ont) {
if (eval.getDescription().toString().contains(
ontology)) {
- // dm.add(i, new SuggestListItem(colorGreen,
- // eval
- // .getDescription().toManchesterSyntaxString
- // (ontology, null),
- // ((EvaluatedDescriptionClass)
- // eval).getAccuracy()*100));
if (((EvaluatedDescriptionClass) eval)
.isConsistent()) {
dm.add(i, new SuggestListItem(colorGreen,
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-10-28 10:07:09 UTC (rev 1896)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-10-28 11:03:23 UTC (rev 1897)
@@ -234,7 +234,6 @@
isReasonerSet = true;
}catch (ComponentInitException e) {
view.setIsInconsistent(true);
- //e.printStackTrace();
} catch (InconsistentOntologyException incon) {
view.setIsInconsistent(true);
}
@@ -266,7 +265,6 @@
try {
currentConceptURL = new URL(currentConcept.toString());
} catch (MalformedURLException e1) {
- // TODO Auto-generated catch block
String error = "Cannot convert to URL.";
view.renderErrorMessage(error);
e1.printStackTrace();
@@ -297,25 +295,30 @@
this.la = cm.learningAlgorithm(CELOE.class, lp,
reasoner);
} catch (LearningProblemUnsupportedException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
}
+
+ //Config options set in the gui.
+ //config option if all is used for suggestions
cm.applyConfigEntry(la, "useAllConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getAllBox());
+ //config option if exists is used for suggestions
cm.applyConfigEntry(la, "useExistsConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getSomeBox());
+ //config option if hasValue is used for suggestions
cm.applyConfigEntry(la, "useHasValueConstructor", view.getPosAndNegSelectPanel().getOptionPanel().getValueBox());
+ //config option if negation is used for suggestions
cm.applyConfigEntry(la, "useNegation", view.getPosAndNegSelectPanel().getOptionPanel().getNotBox());
+ //config option if cardinalitylimits is used for suggestions
cm.applyConfigEntry(la, "useCardinalityRestrictions", view.getPosAndNegSelectPanel().getOptionPanel().getMoreBox());
if(view.getPosAndNegSelectPanel().getOptionPanel().getMoreBox()) {
+ //config option to set the cardinalityrestrictions
cm.applyConfigEntry(la, "cardinalityLimit", view.getPosAndNegSelectPanel().getOptionPanel().getCountMoreBox());
}
-
+ //config option to set the noise
cm.applyConfigEntry(la, "noisePercentage", view.getPosAndNegSelectPanel().getOptionPanel().getMinAccuracy());
+ //config option to set the maximum execution time
cm.applyConfigEntry(la, "maxExecutionTimeInSeconds", view
.getPosAndNegSelectPanel().getOptionPanel()
.getMaxExecutionTime());
- view.setLearningDuration(view
- .getPosAndNegSelectPanel().getOptionPanel()
- .getMaxExecutionTime());
try {
// initializes the learning algorithm
la.init();
@@ -545,18 +548,22 @@
return evalDescriptions.get(index);
}
+ /**
+ * This methode sets if the knowledge source is updated or not.
+ * @param isUpdated boolean if knowledge sourec is updated
+ */
public void setKnowledgeSourceIsUpdated(boolean isUpdated) {
knowledgeSourceIsUpdated = isUpdated;
}
+ /**
+ * This methode returns a boolean if the knowledge
+ * source is updated.
+ * @return boolean if knowledge source is updated
+ */
public boolean getIsKnowledgeSourceIsUpdated() {
return knowledgeSourceIsUpdated;
}
-
- public OWLEditorKit getOWLEditorKit() {
- return editor;
- }
-
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-10-28 10:07:09 UTC (rev 1896)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-10-28 11:03:23 UTC (rev 1897)
@@ -340,6 +340,10 @@
learnerScroll.setPreferredSize(new Dimension(SCROLL_WIDTH, SCROLL_HEIGHT));
}
}
+ /**
+ * This methode returns the help button.
+ * @return help button
+ */
public JButton getHelpButton() {
return helpButton;
}
@@ -402,7 +406,6 @@
*/
public void setExamplePanelVisible(boolean visible) {
posPanel.setVisible(visible);
- //detail.repaint();
}
/**
@@ -448,7 +451,6 @@
public void unsetEverything() {
run.setEnabled(true);
model.getNewOWLDescription().clear();
- action.destroyDLLearnerThread();
errorMessage.setText("");
learner.removeAll();
}
@@ -485,6 +487,10 @@
this.isInconsistent = isIncon;
}
+ /**
+ * This methode returns if the ontology is inconsistent.
+ * @return boolean if ontology is inconsistent
+ */
public boolean getIsInconsistent() {
return isInconsistent;
}
@@ -517,7 +523,6 @@
* This method sets the run button enable after learning.
*/
public void algorithmTerminated() {
- this.stopStatusBar();
CELOE celoe = (CELOE) model.getLearningAlgorithm();
String error = "Learning successful. Currently searching class expressions with length between " + celoe.getMinimumHorizontalExpansion() + " and " + celoe.getMaximumHorizontalExpansion() + ".";
hint.setForeground(Color.RED);
@@ -541,6 +546,10 @@
return learnerScroll;
}
+ /**
+ * This methode sets the help button visible.
+ * @param isVisible boolean if help button is visible
+ */
public void setHelpButtonVisible(boolean isVisible) {
helpButton.setVisible(isVisible);
}
@@ -561,18 +570,24 @@
return readThread;
}
- public void setLearningDuration(int time) {
- stat.setMaximumValue(time);
- }
-
+ /**
+ * This Methode starts the status bar.
+ */
public void startStatusBar() {
stat.showProgress(true);
}
+ /**
+ * This methode stops the status bar.
+ */
public void stopStatusBar() {
stat.showProgress(false);
}
+ /**
+ * This methode returns the statusbar.
+ * @return statusbar
+ */
public StatusBar getStatusBar() {
return stat;
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java 2009-10-28 10:07:09 UTC (rev 1896)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java 2009-10-28 11:03:23 UTC (rev 1897)
@@ -40,7 +40,8 @@
/**
* This class takes care of all events happening in the GraphicalCoveragePanel.
- *
+ * It renders the Informations for the individual points and sets the
+ * individuals for the popup component.
* @author Christian Koetteritzsch
*
*/
@@ -74,12 +75,18 @@
}
@Override
+ /**
+ * Nothing happens here.
+ */
public void mouseDragged(MouseEvent arg0) {
- // TODO Auto-generated method stub
}
@Override
+ /**
+ * This methode renders the tool tip message when the mouse goes over
+ * the plus symbole. It also renders the the informations for the individual point.
+ */
public void mouseMoved(MouseEvent m) {
if (m.getX() >= panel.getX1() + panel.getShiftCovered()
&& m.getX() <= panel.getX2() + panel.getShiftCovered()
@@ -132,10 +139,17 @@
}
@Override
+ /**
+ * Nothing happens here.
+ */
public void propertyChange(PropertyChangeEvent arg0) {
}
@Override
+ /**
+ * This methode renders the popup box and
+ * computes which individuals must be shown.
+ */
public void mouseClicked(MouseEvent arg0) {
if (panel.getEvaluateddescription() != null) {
if (arg0.getX() >= panel.getX1() + panel.getShiftCovered()
@@ -229,26 +243,34 @@
}
@Override
+ /**
+ * Nothing happens here.
+ */
public void mouseEntered(MouseEvent arg0) {
- // TODO Auto-generated method stub
}
@Override
+ /**
+ * Nothing happens here.
+ */
public void mouseExited(MouseEvent arg0) {
- // TODO Auto-generated method stub
}
@Override
+ /**
+ * Nothing happens here.
+ */
public void mousePressed(MouseEvent arg0) {
- // TODO Auto-generated method stub
}
@Override
+ /**
+ * Nothing happens here.
+ */
public void mouseReleased(MouseEvent arg0) {
- // TODO Auto-generated method stub
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java 2009-10-28 10:07:09 UTC (rev 1896)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/IndividualPoint.java 2009-10-28 11:03:23 UTC (rev 1897)
@@ -139,10 +139,18 @@
return circlePoint;
}
+ /**
+ * This method returns the DLLearner Individual.
+ * @return DLLearner Individual
+ */
public Individual getDLLearnerIndividual() {
return individualDLLearner;
}
+ /**
+ * This method returns the base uri of the Individual.
+ * @return base uri of the individual
+ */
public String getBaseUri() {
return baseUri;
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java 2009-10-28 10:07:09 UTC (rev 1896)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java 2009-10-28 11:03:23 UTC (rev 1897)
@@ -38,6 +38,10 @@
panel = m;
}
@Override
+ /**
+ * This methode sets the Informations on the panel where the
+ * graphic is shown.
+ */
public void propertyChange(PropertyChangeEvent arg0) {
panel.setInformation();
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-10-28 10:07:09 UTC (rev 1896)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-10-28 11:03:23 UTC (rev 1897)
@@ -192,96 +192,81 @@
}
/**
- *
- * @return
+ * This methode returns the OWLRadioButton.
+ * @return OWLRAdioButton
*/
public JRadioButton getOwlRadioButton() {
return owlRadioButton;
}
/**
- *
- * @return
+ * This methode returns the ELProfileButton.
+ * @return ELProfileButton
*/
public JRadioButton getElProfileButton() {
return elProfileButton;
}
/**
- *
- * @return
+ * This methode returns if the allquantor box is selected.
+ * @return boolean if allquantor box is selected
*/
public boolean getAllBox() {
return allBox.isSelected();
}
/**
- *
- * @return
+ * This methode returns if the some box is selected.
+ * @return boolean if some box is selected
*/
public boolean getSomeBox() {
return someBox.isSelected();
}
/**
- *
- * @return
+ * This methode returns if the not box is selected.
+ * @return boolean if not box is selected
*/
public boolean getNotBox() {
return notBox.isSelected();
}
/**
- *
- * @return
+ * This methode returns if the value box is selected.
+ * @return boolean if value box is selected
*/
public boolean getValueBox() {
return valueBox.isSelected();
}
/**
- *
- * @return
+ * This methode returns the ProfilePanel.
+ * @return Profile Panel
*/
public JPanel getProfilePanel() {
return profilePanel;
}
/**
- *
- * @return
+ * This methode returns the int of the cardinality restriction.
+ * @return cardinality restriction int
*/
public int getCountMoreBox() {
return Integer.parseInt(countMoreBox.getSelectedItem().toString());
}
/**
- *
- * @return
+ * This methode returns if the cardinality restiction box is selected.
+ * @return boolean if cardinality restiction box is selected
*/
public boolean getMoreBox() {
return moreBox.isSelected();
}
/**
- *
- * @return
+ * This methode sets the the checkboxes enable that are needed for
+ * the OWL 2 Profile.
*/
- public JPanel getRadioBoxPanel() {
- return radioBoxPanel;
- }
-
- /**
- *
- * @return
- */
- public JPanel getCheckBoxPanel() {
- return checkBoxPanel;
- }
-
- /**
- *
- */
public void setToOWLProfile() {
allBox.setSelected(true);
someBox.setSelected(true);
@@ -292,7 +277,8 @@
}
/**
- *
+ * This methode sets the the checkboxes enable that are needed for
+ * the EL Profile.
*/
public void setToELProfile() {
allBox.setSelected(false);
@@ -304,7 +290,8 @@
}
/**
- *
+ * This methode sets the combo box for the cardinality restriction
+ * enabled/disabled.
* @param isEnabled
*/
public void setCountMoreBoxEnabled(boolean isEnabled) {
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-10-28 10:07:09 UTC (rev 1896)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-10-28 11:03:23 UTC (rev 1897)
@@ -29,7 +29,6 @@
import org.dllearner.core.owl.NamedClass;
import org.dllearner.reasoning.FastInstanceChecker;
import org.protege.editor.owl.OWLEditorKit;
-import org.semanticweb.owl.model.OWLAxiom;
import org.semanticweb.owl.model.OWLClass;
import org.semanticweb.owl.model.OWLOntology;
@@ -62,18 +61,6 @@
this.editor = editorKit;
this.view = v;
this.model = m;
-
- //TODO: mehr informationen fuer grafische anzeige herraussuchen.
- //editor.getOWLModelManager().getActiveOntology().getDataPropertyAssertionAxioms(null);
- //editor.getOWLModelManager().getActiveOntology().getObjectPropertyAssertionAxioms(null);
- //editor.getOWLModelManager().getActiveOntology().getSameIndividualAxioms(null);
- //editor.getOWLModelManager().getActiveOntology().getDifferentIndividualAxioms(null);
- /*Set<OWLAxiom> test = editor.getOWLModelManager().getActiveOntology().getAxioms();
- for(OWLAxiom t : test) {
- System.out.println("hier: " + t);
- //System.out.println("da: " + t);
- }*/
- //System.out.println();
}
/**
@@ -97,7 +84,6 @@
*/
private void setPositiveConcept() {
current = editor.getOWLWorkspace().getOWLSelectionModel().getLastSelectedClass();
- //editor.getOWLWorkspace().getOWLIndividualSelectorPanel().getSelectedObjects();
if(current != null) {
SortedSet<Individual> individuals = null;
hasIndividuals = false;
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java 2009-10-28 10:07:09 UTC (rev 1896)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java 2009-10-28 11:03:23 UTC (rev 1897)
@@ -51,7 +51,8 @@
@Override
/**
- *
+ * This methode sets the graphical coverage panel enable when a
+ * suggested class expression is selected.
*/
public void mouseClicked(MouseEvent e) {
if (view.getSuggestClassPanel().getSuggestList().getSelectedValue() != null) {
@@ -72,7 +73,6 @@
}
}
}
- view.getSuggestClassPanel().getSuggestModel().indexOf(item);
view.getMoreDetailForSuggestedConceptsPanel().renderDetailPanel(evaluatedDescription);
view.setGraphicalPanel();
}
@@ -96,7 +96,8 @@
@Override
/**
- *
+ * This methode sets the add button enable when
+ * a suggested class expression is selected.
*/
public void mousePressed(MouseEvent e) {
if (view.getSuggestClassPanel().getSuggestList().getSelectedValue() != null) {
@@ -116,13 +117,11 @@
@Override
- /*
- * TODO: Ueberlegen wie ich das mit dem selektierten Objekt umsetze
+ /**
+ * Nothing happens here.
*/
public void valueChanged(ListSelectionEvent e) {
- Object selectedObject = view.getSuggestClassPanel().getSuggestList().getSelectedValue();
-
- view.getSuggestClassPanel().getSuggestList().setSelectedValue(selectedObject, true);
+
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
