Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [917] trunk/src/dl-learner/org/dllearner/tools/ protege
|
From: <hee...@us...> - 2008-05-22 11:09:17
|
Revision: 917
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=917&view=rev
Author: heeroyuy
Date: 2008-05-22 04:09:15 -0700 (Thu, 22 May 2008)
Log Message:
-----------
-added scrollbar to the suggestpanel
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/OWLClassDescriptionEditorWithDLLearnerTab.java
Removed Paths:
-------------
trunk/src/dl-learner/org/dllearner/tools/protege/ButtonList.java
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2008-05-22 09:06:42 UTC (rev 916)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2008-05-22 11:09:15 UTC (rev 917)
@@ -45,9 +45,8 @@
view.getCancelButton().setEnabled(false);
String error = "Learning aborted";
view.renderErrorMessage(error);
- model.getLearningAlgorithm().stop();
dlLearner.interrupt();
-
+ model.getLearningAlgorithm().stop();
}
if(z.getActionCommand().equals("ADD"))
@@ -57,6 +56,7 @@
{
if(model.getSolutions()[i].toString().equals(suggest))
{
+ System.out.println(model.getSolutions()[i]);
model.changeDLLearnerDescriptionsToOWLDescriptions(model.getSolutions()[i]);
}
}
@@ -87,7 +87,6 @@
{
toggled=true;
view.setExamplePanelVisible(toggled);
- System.out.println(z.getSource());
}
else
{
Deleted: trunk/src/dl-learner/org/dllearner/tools/protege/ButtonList.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ButtonList.java 2008-05-22 09:06:42 UTC (rev 916)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ButtonList.java 2008-05-22 11:09:15 UTC (rev 917)
@@ -1,23 +0,0 @@
-package org.dllearner.tools.protege;
-
-import org.protege.editor.owl.ui.frame.AbstractOWLFrame;
-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.OWLSubClassAxiomFrameSection;
-import org.semanticweb.owl.model.OWLClass;
-import org.protege.editor.owl.OWLEditorKit;
-
-public class ButtonList extends AbstractOWLFrame<OWLClass>{
-
- public ButtonList(OWLEditorKit editorKit)
- {
- super(editorKit.getOWLModelManager().getOWLOntologyManager());
- //addSection(new SuggestButton(editorKit, this));
- addSection(new SuggestEquivalentClassButton(editorKit, this));
- addSection(new OWLSubClassAxiomFrameSection(editorKit, this));
- 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 2008-05-22 09:06:42 UTC (rev 916)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2008-05-22 11:09:15 UTC (rev 917)
@@ -87,6 +87,7 @@
setKnowledgeSource();
setReasoner();
SortedSet<Individual> pos=rs.getIndividuals();
+ System.out.println(pos);
while(pos.iterator().hasNext())
{
indis.add(pos.iterator().next());
@@ -249,26 +250,45 @@
{
}
-
+ public void unsetNewConcepts()
+ {
+ while(OWLDescription.iterator().hasNext())
+ {
+ OWLDescription.remove(OWLDescription.iterator().next());
+ }
+ }
public void setPositiveConcept()
{
Set<NamedClass> concepts = rs.getAtomicConcepts();
+ System.out.println("!"+rs.getAtomicConcepts());
+ System.out.println("2"+aktuell.getRootObject());
+
SortedSet<Individual> individuals = null;
while(concepts.iterator().hasNext()&&individuals==null)
{
+ System.out.println(concepts.size());
+ System.out.println(individuals==null);
NamedClass concept = concepts.iterator().next();
+ System.out.println("\xA7"+rs.retrieval(concept));
if(concept.toString().endsWith("#"+aktuell.getRootObject().toString()))
{
- individuals = rs.retrieval(concept);
+ if(rs.retrieval(concept)!=null){
+ System.out.println(":-) "+rs.retrieval(concept));
+ individuals = rs.retrieval(concept);
+ }
}
concepts.remove(concept);
+ System.out.println(individuals);
}
- while(individuals.iterator().hasNext())
+ System.out.println(individuals==null);
+ if(individuals!=null)
{
- individual.add(individuals.iterator().next());
- individuals.remove(individuals.iterator().next());
+ while(individuals.iterator().hasNext())
+ {
+ individual.add(individuals.iterator().next());
+ individuals.remove(individuals.iterator().next());
+ }
}
-
}
public boolean setPositivExamplesChecked(String indi)
@@ -277,8 +297,11 @@
for(int i = 0; i<individual.size()&& isChecked==false;i++)
{
String indi1=individual.get(i).getName();
- if(indi1.toString().equals(indi.toString()))
+ System.out.println("1: "+indi);
+ System.out.println("2 :"+indi1);
+ if(indi1.toString().equals(indi.toString()))
{
+ System.out.println(indi);
isChecked = true;
}
else
@@ -393,9 +416,11 @@
{
newConceptOWLAPI = OWLAPIDescriptionConvertVisitor.getOWLDescription(desc);
ds.add(newConceptOWLAPI);
+ OWLDescription.add(newConceptOWLAPI);
}
this.desc = newConceptOWLAPI;
- OWLDescription.add(newConceptOWLAPI);
+
+ System.out.println("hallo:"+OWLDescription);
}
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java 2008-05-22 09:06:42 UTC (rev 916)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java 2008-05-22 11:09:15 UTC (rev 917)
@@ -192,6 +192,7 @@
return restrictionCreatorPanel.createRestrictions();
}
else if(tabbedPane.getSelectedComponent() == dllearner){
+ System.out.println("die loesungen:"+dllearner.getSollutions());
return dllearner.getSollutions();
}
return super.getEditedObjects();
@@ -275,7 +276,7 @@
private JButton helpForNegExamples;
private JLabel errorMessage;
private JToggleButton advanced;
- //private JScrollPane suggestScroll;
+ private JScrollPane suggestScroll;
private ActionHandler action;
private DLLearnerModel model;
private Description[] descriptions = new Description[10];
@@ -304,6 +305,7 @@
accept = new JButton("ADD");
option = new JPanel(new GridLayout(0,2));
scrollPane = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+ suggestScroll = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
errorMessage = new JLabel();
learner = new JPanel();
advanced.setSize(20,20);
@@ -349,6 +351,8 @@
advanced.setBounds(10,200,20,20);
scrollPane.setViewportView(option);
scrollPane.setBounds(10, 230, 490, 250);
+ suggestScroll.setViewportView(suggest);
+ suggestScroll.setBounds(10,40,490,110);
cancel.setBounds(260,0,200,30);
accept.setBounds(510,40,80,110);
errorMessage.setBounds(10,160,590,20);
@@ -356,7 +360,7 @@
learner.add(adv);
learner.add(advanced);
learner.add(cancel);
- learner.add(suggest);
+ learner.add(suggestScroll);
learner.add(accept);
learner.add(errorMessage);
learner.add(scrollPane);
@@ -407,6 +411,7 @@
public OWLDescription getSollution()
{
+ System.out.println(model.getSollution());
return model.getSollution();
}
@@ -426,6 +431,7 @@
{
option.removeAll();
run.setEnabled(true);
+ model.unsetNewConcepts();
action.destroyDLLearnerThread();
suggest.removeAll();
errorMessage.setText("");
@@ -462,14 +468,18 @@
run.setEnabled(true);
cancel.setEnabled(false);
accept.setEnabled(true);
- learner.remove(suggest);
+ learner.remove(suggestScroll);
+ suggestScroll.remove(suggest);
descriptions = desc;
suggest=new JList(descriptions);
- suggest.setBounds(10,40,490,110);
+ suggest.setBounds(10,40,490,110);
suggest.setVisible(true);
- learner.add(suggest);
+ suggestScroll.setViewportView(suggest);
+ suggestScroll.setBounds(10,40,490,110);
+ learner.add(suggestScroll);
+ //suggest.repaint();
suggest.addMouseListener(action);
- suggest.repaint();
+ suggestScroll.repaint();
model.unsetJCheckBoxen();
option.removeAll();
setJCheckBoxen();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
