Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[2155] trunk/src/dl-learner/org/dllearner
|
From: <lor...@us...> - 2010-05-27 16:45:45
|
Revision: 2155
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2155&view=rev
Author: lorenz_b
Date: 2010-05-27 16:45:38 +0000 (Thu, 27 May 2010)
Log Message:
-----------
Added option in evaluation script to skip classes which have already a perfect definition in the underlying ontology.
Added new datatype xsd:dateTime and converting option.
Started removing compiler warnings.
Removed 1 JUnit test.
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/core/owl/Datatype.java
trunk/src/dl-learner/org/dllearner/scripts/evaluation/EvaluationComputingScript.java
trunk/src/dl-learner/org/dllearner/test/junit/OWLAPITests.java
trunk/src/dl-learner/org/dllearner/tools/evaluationplugin/EvaluationPlugin.java
trunk/src/dl-learner/org/dllearner/tools/evaluationplugin/GraphicalCoveragePanel.java
trunk/src/dl-learner/org/dllearner/tools/ore/LearningManager.java
trunk/src/dl-learner/org/dllearner/tools/ore/RepairManager.java
trunk/src/dl-learner/org/dllearner/tools/ore/cache/ManchesterSyntaxRenderingCache.java
trunk/src/dl-learner/org/dllearner/tools/ore/cache/OWLEntityRenderingCache.java
trunk/src/dl-learner/org/dllearner/tools/ore/explanation/LaconicTest.java
trunk/src/dl-learner/org/dllearner/tools/ore/explanation/RootFinder.java
trunk/src/dl-learner/org/dllearner/tools/ore/explanation/relevance/RelevanceBasedGenerator.java
trunk/src/dl-learner/org/dllearner/tools/ore/explanation/relevance/SimpleSelectionFunction.java
trunk/src/dl-learner/org/dllearner/tools/ore/explanation/relevance/SyntacticRelevanceBasedExplanationGenerator.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExplanationTable.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/GraphicalCoveragePanel.java
trunk/src/dl-learner/org/dllearner/tools/ore/ui/rendering/ManchesterOWLSyntaxOWLObjectRendererImpl.java
trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java
trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java
trunk/src/dl-learner/org/dllearner/utilities/owl/OWLAPIConverter.java
Modified: trunk/src/dl-learner/org/dllearner/core/owl/Datatype.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/Datatype.java 2010-05-27 09:35:50 UTC (rev 2154)
+++ trunk/src/dl-learner/org/dllearner/core/owl/Datatype.java 2010-05-27 16:45:38 UTC (rev 2155)
@@ -33,8 +33,9 @@
INTEGER ("http://www.w3.org/2001/XMLSchema#integer"),
BOOLEAN ("http://www.w3.org/2001/XMLSchema#boolean"),
STRING ("http://www.w3.org/2001/XMLSchema#string"),
- DATE ("http://www.w3.org/2001/XMLSchema#date");
-
+ DATE ("http://www.w3.org/2001/XMLSchema#date"),
+ DATETIME ("http://www.w3.org/2001/XMLSchema#dateTime");
+
private URI uri;
private Datatype(String uriString) {
Modified: trunk/src/dl-learner/org/dllearner/scripts/evaluation/EvaluationComputingScript.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/evaluation/EvaluationComputingScript.java 2010-05-27 09:35:50 UTC (rev 2154)
+++ trunk/src/dl-learner/org/dllearner/scripts/evaluation/EvaluationComputingScript.java 2010-05-27 16:45:38 UTC (rev 2155)
@@ -26,6 +26,7 @@
import org.dllearner.core.ReasonerComponent;
import org.dllearner.core.configurators.CELOEConfigurator;
import org.dllearner.core.owl.Axiom;
+import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.EquivalentClassesAxiom;
import org.dllearner.core.owl.NamedClass;
import org.dllearner.core.owl.Thing;
@@ -39,10 +40,6 @@
public class EvaluationComputingScript {
- private static enum ThreeValuedLogic{
- True, False, Both
- }
-
private ReasonerComponent reasoner;
private OWLFile ks;
@@ -65,6 +62,7 @@
private static boolean reuseExistingDescription = false;
private static boolean filterDescriptionsFollowingFromKB = false;
+ private static boolean checkExistingDefinitions = true;
private final ConceptComparator comparator = new ConceptComparator();
private URI ontologyURI;
@@ -82,42 +80,7 @@
private Map<NamedClass, List<EvaluatedDescriptionClass>> owlEquivalenceJaccardMap = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
private Map<NamedClass, List<EvaluatedDescriptionClass>> defaultEquivalenceMap = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> fastEquivalenceStandardMapWithReuse = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> fastEquivalenceFMeasureMapWithReuse = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> fastEquivalencePredaccMapWithReuse = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> fastEquivalenceGenFMeasureMapWithReuse = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> fastEquivalenceJaccardMapWithReuse = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> owlEquivalenceStandardMapWithReuse = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> owlEquivalenceFMeasureMapWithReuse = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> owlEquivalencePredaccMapWithReuse = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> owlEquivalenceGenFMeasureMapWithReuse = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> owlEquivalenceJaccardMapWithReuse = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> defaultEquivalenceMapWithReuse = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> fastEquivalenceStandardMapWithFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> fastEquivalenceFMeasureMapWithFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> fastEquivalencePredaccMapWithFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> fastEquivalenceGenFMeasureMapWithFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> fastEquivalenceJaccardMapWithFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> owlEquivalenceStandardMapWithFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> owlEquivalenceFMeasureMapWithFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> owlEquivalencePredaccMapWithFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> owlEquivalenceGenFMeasureMapWithFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> owlEquivalenceJaccardMapWithFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> defaultEquivalenceMapWithFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
-
- private Map<NamedClass, List<EvaluatedDescriptionClass>> fastEquivalenceStandardMapWithReuseAndFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> fastEquivalenceFMeasureMapWithReuseAndFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> fastEquivalencePredaccMapWithReuseAndFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> fastEquivalenceGenFMeasureMapWithReuseAndFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> fastEquivalenceJaccardMapWithReuseAndFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> owlEquivalenceStandardMapWithReuseAndFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> owlEquivalenceFMeasureMapWithReuseAndFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> owlEquivalencePredaccMapWithReuseAndFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> owlEquivalenceGenFMeasureMapWithReuseAndFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> owlEquivalenceJaccardMapWithReuseAndFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
- private Map<NamedClass, List<EvaluatedDescriptionClass>> defaultEquivalenceMapWithReuseAndFilter = new HashMap<NamedClass, List<EvaluatedDescriptionClass>>();
-
public EvaluationComputingScript(URI ontologyURI) throws ComponentInitException, MalformedURLException, LearningProblemUnsupportedException, URISyntaxException{
new EvaluationComputingScript(ontologyURI, false, false);
}
@@ -256,6 +219,7 @@
}
}
+ @SuppressWarnings("unchecked")
private void computeSuggestions() throws ComponentInitException, MalformedURLException,
LearningProblemUnsupportedException {
ComponentManager cm = ComponentManager.getInstance();
@@ -383,6 +347,7 @@
* @throws MalformedURLException
* @throws LearningProblemUnsupportedException
*/
+ @SuppressWarnings("unchecked")
private void computeGenFMeasureWithoutDefaultNegation() throws ComponentInitException, MalformedURLException,
LearningProblemUnsupportedException {
ComponentManager cm = ComponentManager.getInstance();
@@ -462,6 +427,7 @@
cm.freeComponent(celoe);
}
+ @SuppressWarnings("unchecked")
private void computeWithApproximation() throws ComponentInitException, MalformedURLException, LearningProblemUnsupportedException {
ComponentManager cm = ComponentManager.getInstance();
TreeSet<EvaluatedDescriptionClass> suggestions;
@@ -518,11 +484,22 @@
celoe.init();
celoe.start();
+
+ //check if perfect definition already exists in knowledgebase
+ boolean perfectDefinitionExists = false;
+ if(checkExistingDefinitions){
+ for(Description def : reasoner.getAssertedDefinitions(nc)){
+ if(lp.computeScore(def).getAccuracy() == 1.0){
+ perfectDefinitionExists = true;
+ break;
+ }
+ }
+ }
// test whether a solution above the threshold was found
EvaluatedDescription best = celoe.getCurrentlyBestEvaluatedDescription();
double bestAcc = best.getAccuracy();
-
+
if (bestAcc < minAccuracy || (best.getDescription() instanceof Thing)) {
System.out
.println("The algorithm did not find a suggestion with an accuracy above the threshold of "
@@ -530,6 +507,12 @@
+ "% or the best description is not appropriate. (The best one was \""
+ best.getDescription().toManchesterSyntaxString(baseURI, prefixes)
+ "\" with an accuracy of " + df.format(bestAcc) + ".) - skipping");
+ } else if(perfectDefinitionExists){
+ System.out.println("It does already exists a perfect definition.\n "
+ +"(The best computed was \""
+ + best.getDescription().toManchesterSyntaxString(baseURI, prefixes)
+ + "\" with an accuracy of " + df.format(bestAcc) + ") - skipping ");
+
} else {
suggestions = (TreeSet<EvaluatedDescriptionClass>) celoe
Modified: trunk/src/dl-learner/org/dllearner/test/junit/OWLAPITests.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/test/junit/OWLAPITests.java 2010-05-27 09:35:50 UTC (rev 2154)
+++ trunk/src/dl-learner/org/dllearner/test/junit/OWLAPITests.java 2010-05-27 16:45:38 UTC (rev 2155)
@@ -21,7 +21,6 @@
import org.dllearner.core.owl.Description;
import org.dllearner.utilities.owl.ManchesterOWLSyntaxParser;
-import org.junit.Test;
import org.semanticweb.owlapi.expression.ParserException;
/**
@@ -33,7 +32,7 @@
*/
public class OWLAPITests {
- @Test
+// @Test
public void testManchesterSyntaxParser() throws ParserException {
// String s = "BIGPROP SOME smallclass";
// String s = "<http://test.de/prop> some <http://test.de/Class>";
Modified: trunk/src/dl-learner/org/dllearner/tools/evaluationplugin/EvaluationPlugin.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/evaluationplugin/EvaluationPlugin.java 2010-05-27 09:35:50 UTC (rev 2154)
+++ trunk/src/dl-learner/org/dllearner/tools/evaluationplugin/EvaluationPlugin.java 2010-05-27 16:45:38 UTC (rev 2155)
@@ -77,7 +77,8 @@
+ "(Often, suggestions leading to an inconsistency should still be added. They help to detect problems in "
+ "the ontology elsewhere.<br>"
+ " See http://dl-learner.org/files/screencast/protege/screencast.htm .)</html>";
- private static final String FOLLOWS_FROM_KB_WARNING = "<html>Selected class expressions follows already logically from ontology.</html>";
+ //TODO Add label
+// private static final String FOLLOWS_FROM_KB_WARNING = "<html>Selected class expressions follows already logically from ontology.</html>";
private Map<NamedClass, List<EvaluatedDescriptionClass>> fastEquivalenceStandardMap;
private Map<NamedClass, List<EvaluatedDescriptionClass>> fastEquivalenceFMeasureMap;
Modified: trunk/src/dl-learner/org/dllearner/tools/evaluationplugin/GraphicalCoveragePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/evaluationplugin/GraphicalCoveragePanel.java 2010-05-27 09:35:50 UTC (rev 2154)
+++ trunk/src/dl-learner/org/dllearner/tools/evaluationplugin/GraphicalCoveragePanel.java 2010-05-27 16:45:38 UTC (rev 2155)
@@ -470,7 +470,7 @@
.getY2())) {
posCovIndVector.add(new IndividualPoint("*",
- (int) x, (int) y, ind.toString()));
+ (int) x, (int) y, ind.toString(), ind, ""));
i++;
flag = false;
@@ -515,7 +515,7 @@
posNotCovIndVector.add(new IndividualPoint("*",
- (int) x, (int) y, ind.toString()));
+ (int) x, (int) y, ind.toString(), ind, ""));
j++;
@@ -553,7 +553,7 @@
.getY2())) {
posNotCovIndVector.add(new IndividualPoint("*",
- (int) x, (int) y, ind.toString()));
+ (int) x, (int) y, ind.toString(), ind, ""));
k++;
flag = false;
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/LearningManager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/LearningManager.java 2010-05-27 09:35:50 UTC (rev 2154)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/LearningManager.java 2010-05-27 16:45:38 UTC (rev 2155)
@@ -194,6 +194,7 @@
return la.isRunning();
}
+ @SuppressWarnings("unchecked")
public synchronized List<EvaluatedDescriptionClass> getCurrentlyLearnedDescriptions() {
List<EvaluatedDescriptionClass> result;
if (la != null) {
@@ -334,8 +335,8 @@
}
public void fireLearningFinished() {
- for(LearningManagerListener l : listeners){
- }
+// for(LearningManagerListener l : listeners){
+// }
}
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/RepairManager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/RepairManager.java 2010-05-27 09:35:50 UTC (rev 2154)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/RepairManager.java 2010-05-27 16:45:38 UTC (rev 2155)
@@ -10,33 +10,24 @@
import org.semanticweb.owlapi.model.AddAxiom;
import org.semanticweb.owlapi.model.OWLAxiom;
import org.semanticweb.owlapi.model.OWLOntologyChange;
-import org.semanticweb.owlapi.model.OWLOntologyManager;
import org.semanticweb.owlapi.model.RemoveAxiom;
-import com.clarkparsia.pellet.owlapiv3.PelletReasoner;
-
public class RepairManager implements OREManagerListener{
private static RepairManager instance;
private List<RepairManagerListener> listeners;
- private OWLOntologyManager manager;
- private PelletReasoner reasoner;
private Set<OWLOntologyChange> repairPlan;
private Stack<List<OWLOntologyChange>> undoStack;
private Stack<List<OWLOntologyChange>> redoStack;
- private Set<OWLAxiom> selectedAxioms;
-
private Set<OWLAxiom> scheduled2Remove;
private Set<OWLAxiom> scheduled2Add;
private RepairManager(OREManager oreMan){
- this.reasoner = oreMan.getReasoner().getReasoner();
- this.manager = reasoner.getManager();
listeners = new ArrayList<RepairManagerListener>();
@@ -45,8 +36,6 @@
repairPlan = new LinkedHashSet<OWLOntologyChange>();
- selectedAxioms = new HashSet<OWLAxiom>();
-
scheduled2Remove = new HashSet<OWLAxiom>();
scheduled2Add = new HashSet<OWLAxiom>();
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/cache/ManchesterSyntaxRenderingCache.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/cache/ManchesterSyntaxRenderingCache.java 2010-05-27 09:35:50 UTC (rev 2154)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/cache/ManchesterSyntaxRenderingCache.java 2010-05-27 16:45:38 UTC (rev 2155)
@@ -12,7 +12,6 @@
import org.dllearner.utilities.owl.OWLAPIDescriptionConvertVisitor;
import org.semanticweb.owlapi.io.OWLObjectRenderer;
import org.semanticweb.owlapi.model.OWLObject;
-import org.semanticweb.owlapi.util.SimpleShortFormProvider;
public class ManchesterSyntaxRenderingCache {
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/cache/OWLEntityRenderingCache.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/cache/OWLEntityRenderingCache.java 2010-05-27 09:35:50 UTC (rev 2154)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/cache/OWLEntityRenderingCache.java 2010-05-27 16:45:38 UTC (rev 2155)
@@ -2,16 +2,13 @@
import java.util.HashMap;
import java.util.HashSet;
-import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.log4j.Logger;
import org.dllearner.tools.ore.OREManager;
import org.dllearner.tools.ore.OREManagerListener;
import org.dllearner.tools.ore.ui.rendering.OWLEntityRenderer;
import org.semanticweb.owlapi.model.OWLAnnotationProperty;
-import org.semanticweb.owlapi.model.OWLAxiomChange;
import org.semanticweb.owlapi.model.OWLClass;
import org.semanticweb.owlapi.model.OWLDataProperty;
import org.semanticweb.owlapi.model.OWLDatatype;
@@ -20,14 +17,10 @@
import org.semanticweb.owlapi.model.OWLNamedIndividual;
import org.semanticweb.owlapi.model.OWLObjectProperty;
import org.semanticweb.owlapi.model.OWLOntology;
-import org.semanticweb.owlapi.model.OWLOntologyChange;
-import org.semanticweb.owlapi.model.OWLOntologyChangeListener;
public class OWLEntityRenderingCache{
- private static final Logger logger = Logger.getLogger(OWLEntityRenderingCache.class);
-
private Map<String, OWLClass> owlClassMap = new HashMap<String, OWLClass>();
private Map<String, OWLObjectProperty> owlObjectPropertyMap = new HashMap<String, OWLObjectProperty>();
@@ -44,12 +37,23 @@
private OREManager oreManager;
- private OWLOntologyChangeListener listener = new OWLOntologyChangeListener() {
- public void ontologiesChanged(List<? extends OWLOntologyChange> changes) {
- processChanges(changes);
- }
- };
+// private OWLOntologyChangeListener listener = new OWLOntologyChangeListener() {
+// public void ontologiesChanged(List<? extends OWLOntologyChange> changes) {
+// processChanges(changes);
+// }
+// };
+// private void processChanges(List<? extends OWLOntologyChange> changes) {
+// for (OWLOntologyChange change : changes) {
+// if (change instanceof OWLAxiomChange) {
+// OWLAxiomChange chg = (OWLAxiomChange) change;
+// for (OWLEntity ent : chg.getEntities()) {
+// updateRendering(ent);
+// }
+// }
+// }
+// }
+
private OREManagerListener oreManagerListener = new OREManagerListener() {
@Override
@@ -66,16 +70,7 @@
}
- private void processChanges(List<? extends OWLOntologyChange> changes) {
- for (OWLOntologyChange change : changes) {
- if (change instanceof OWLAxiomChange) {
- OWLAxiomChange chg = (OWLAxiomChange) change;
- for (OWLEntity ent : chg.getEntities()) {
- updateRendering(ent);
- }
- }
- }
- }
+
public void rebuild() {
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/explanation/LaconicTest.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/explanation/LaconicTest.java 2010-05-27 09:35:50 UTC (rev 2154)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/explanation/LaconicTest.java 2010-05-27 16:45:38 UTC (rev 2155)
@@ -18,7 +18,6 @@
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
import org.semanticweb.owlapi.model.OWLSubClassOfAxiom;
-import org.semanticweb.owlapi.reasoner.OWLReasoner;
import org.semanticweb.owlapi.reasoner.OWLReasonerFactory;
import com.clarkparsia.owlapi.explanation.PelletExplanation;
@@ -104,7 +103,7 @@
Set<Explanation> explanations = expGen
.getExplanations(unsatAxiom);
t1.stop();
-// System.out.println(explanations);
+ System.out.println(explanations);
t2.start();
// Set<org.semanticweb.owl.explanation.api.Explanation<OWLAxiom>> expl = copy.getExplanations(unsatAxiom);
t2.stop();
@@ -143,29 +142,23 @@
factory.getOWLObjectIntersectionOf(d, factory.getOWLObjectComplementOf(d), e));
OWLOntology ontology = manager.createOntology(Collections.singleton(axiom));
OWLReasonerFactory resonerFact = new PelletReasonerFactory();
- OWLReasoner reasoner = resonerFact.createReasoner(ontology);
OWLSubClassOfAxiom unsatAxiom = factory.getOWLSubClassOfAxiom(c, factory.getOWLNothing());
LaconicExplanationGenerator expGen = new LaconicExplanationGenerator(manager,
resonerFact, ontology);
Set<Explanation> preciseJusts = expGen.getExplanations(unsatAxiom);
+ System.out.println(preciseJusts);
// renderer.render(unsatAxiom, preciseJusts);
renderer.endRendering();
} catch (OWLOntologyCreationException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
} catch (OWLOntologyChangeException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
} catch (ExplanationException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
- } catch (OWLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
}
}
@@ -186,7 +179,6 @@
OWLReasonerFactory resonerFact = new PelletReasonerFactory();
OWLDataFactory dataFactory = manager.getOWLDataFactory();
- OWLReasoner reasoner = resonerFact.createReasoner(ontology);
OWLSubClassOfAxiom axiom = dataFactory
.getOWLSubClassOfAxiom(
@@ -203,10 +195,12 @@
Set<Explanation> regularJusts = expGen.getRegularExplanations(axiom);
System.out.println("Regular explanations:");
+ System.out.println(regularJusts);
// renderer.render(axiom, regularJusts);
Set<Explanation> preciseJusts = expGen.getExplanations(axiom);
System.out.println("Precise explanations:");
+ System.out.println(preciseJusts);
// renderer.render(axiom, preciseJusts);
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/explanation/RootFinder.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/explanation/RootFinder.java 2010-05-27 09:35:50 UTC (rev 2154)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/explanation/RootFinder.java 2010-05-27 16:45:38 UTC (rev 2155)
@@ -16,7 +16,6 @@
import org.semanticweb.owlapi.model.AddAxiom;
import org.semanticweb.owlapi.model.AxiomType;
import org.semanticweb.owlapi.model.IRI;
-import org.semanticweb.owlapi.model.OWLAxiom;
import org.semanticweb.owlapi.model.OWLClass;
import org.semanticweb.owlapi.model.OWLClassExpression;
import org.semanticweb.owlapi.model.OWLClassExpressionVisitor;
@@ -82,7 +81,7 @@
private Map<OWLClass, Set<OWLClass>> child2Parents;
private Map<OWLClass, Set<OWLClass>> parent2Children;
- private Map<OWLClass, Map<OWLAxiom, Set<OWLClass>>> class2Dependency;
+// private Map<OWLClass, Map<OWLAxiom, Set<OWLClass>>> class2Dependency;
public RootFinder(){
@@ -107,7 +106,7 @@
child2Parents = new HashMap<OWLClass, Set<OWLClass>>();
parent2Children = new HashMap<OWLClass, Set<OWLClass>>();
- class2Dependency = new HashMap<OWLClass, Map<OWLAxiom, Set<OWLClass>>>();
+// class2Dependency = new HashMap<OWLClass, Map<OWLAxiom, Set<OWLClass>>>();
OREManager.getInstance().addListener(this);
RepairManager.getInstance(OREManager.getInstance()).addListener(this);
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/explanation/relevance/RelevanceBasedGenerator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/explanation/relevance/RelevanceBasedGenerator.java 2010-05-27 09:35:50 UTC (rev 2154)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/explanation/relevance/RelevanceBasedGenerator.java 2010-05-27 16:45:38 UTC (rev 2155)
@@ -29,6 +29,7 @@
import com.clarkparsia.pellet.owlapiv3.PelletReasoner;
import com.clarkparsia.pellet.owlapiv3.PelletReasonerFactory;
+@SuppressWarnings("unused")
public class RelevanceBasedGenerator {
static{
setup();
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/explanation/relevance/SimpleSelectionFunction.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/explanation/relevance/SimpleSelectionFunction.java 2010-05-27 09:35:50 UTC (rev 2154)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/explanation/relevance/SimpleSelectionFunction.java 2010-05-27 16:45:38 UTC (rev 2155)
@@ -50,6 +50,7 @@
return relatedAxioms;
}
+ @SuppressWarnings("unchecked")
public Vector<OWLAxiom> getAllRelatedAxioms(OWLEntity concept) {
Vector<OWLAxiom> allRelated = new Vector<OWLAxiom>();
Set<OWLAxiom> relatedAxioms = new HashSet<OWLAxiom>();
@@ -85,6 +86,7 @@
return relatedAxioms;
}
+ @SuppressWarnings("unchecked")
public Vector<OWLAxiom> getAllRelatedAxioms(Set<OWLAxiom> originalAxioms_in) {
Vector<OWLAxiom> allRelated = new Vector<OWLAxiom>();
Set<OWLAxiom> relatedAxioms = new HashSet<OWLAxiom>();
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/explanation/relevance/SyntacticRelevanceBasedExplanationGenerator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/explanation/relevance/SyntacticRelevanceBasedExplanationGenerator.java 2010-05-27 09:35:50 UTC (rev 2154)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/explanation/relevance/SyntacticRelevanceBasedExplanationGenerator.java 2010-05-27 16:45:38 UTC (rev 2155)
@@ -34,6 +34,7 @@
import com.clarkparsia.pellet.owlapiv3.PelletReasoner;
import com.clarkparsia.pellet.owlapiv3.PelletReasonerFactory;
+@SuppressWarnings("unused")
public class SyntacticRelevanceBasedExplanationGenerator {
private PelletReasoner reasoner;
@@ -88,6 +89,7 @@
return rel_all_just(factory.getOWLSubClassOfAxiom(unsat, factory.getOWLNothing()));
}
+ @SuppressWarnings("unchecked")
private Set<Set<OWLAxiom>> computeRelevantJustifications(OWLClass unsat) {
OWLOntology ont = null;
@@ -337,9 +339,6 @@
} catch (OWLOntologyChangeException e) {
// TODO Auto-generated catch block
e.printStackTrace();
- } catch (OWLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
}
return justifications;
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExplanationTable.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExplanationTable.java 2010-05-27 09:35:50 UTC (rev 2154)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExplanationTable.java 2010-05-27 16:45:38 UTC (rev 2155)
@@ -313,7 +313,7 @@
repMan.removeListener(this);
}
- private void showEditorDialog(final OWLAxiomEditor editor, final OWLObject value) {
+ private void showEditorDialog(final OWLAxiomEditor<OWLAxiom> editor, final OWLObject value) {
if (editor == null) {
return;
}
@@ -324,6 +324,11 @@
final VerifyingOptionPane optionPane = new VerifyingOptionPane(
editorComponent) {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1277678457457723435L;
+
public void selectInitialValue() {
// This is overriden so that the option pane dialog default
// button
@@ -368,7 +373,7 @@
dlg.setVisible(true);
}
- void handleEditFinished(OWLAxiomEditor editor, OWLObject value){
+ void handleEditFinished(OWLAxiomEditor<OWLAxiom> editor, OWLObject value){
ImpactManager.getInstance(OREManager.getInstance()).addSelection((OWLAxiom)value);
List<OWLOntologyChange> changes = new ArrayList<OWLOntologyChange>();
for(OWLOntology ont : OREManager.getInstance().getOWLOntologiesForOWLAxiom((OWLAxiom)value)){
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/GraphicalCoveragePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/GraphicalCoveragePanel.java 2010-05-27 09:35:50 UTC (rev 2154)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/GraphicalCoveragePanel.java 2010-05-27 16:45:38 UTC (rev 2155)
@@ -552,7 +552,7 @@
.getY2())) {
posCovIndVector.add(new IndividualPoint("*",
- (int) x, (int) y, ind.toString()));
+ (int) x, (int) y, ind.toString(), ind, ""));
i++;
flag = false;
@@ -597,7 +597,7 @@
posNotCovIndVector.add(new IndividualPoint("*",
- (int) x, (int) y, ind.toString()));
+ (int) x, (int) y, ind.toString(), ind, ""));
j++;
@@ -635,7 +635,7 @@
.getY2())) {
posNotCovIndVector.add(new IndividualPoint("*",
- (int) x, (int) y, ind.toString()));
+ (int) x, (int) y, ind.toString(), ind, ""));
k++;
flag = false;
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/rendering/ManchesterOWLSyntaxOWLObjectRendererImpl.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/rendering/ManchesterOWLSyntaxOWLObjectRendererImpl.java 2010-05-27 09:35:50 UTC (rev 2154)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/rendering/ManchesterOWLSyntaxOWLObjectRendererImpl.java 2010-05-27 16:45:38 UTC (rev 2155)
@@ -1,37 +1,14 @@
package org.dllearner.tools.ore.ui.rendering;
-import org.semanticweb.owlapi.io.OWLObjectRenderer;
-import org.semanticweb.owlapi.model.OWLObject;
-import org.semanticweb.owlapi.util.ShortFormProvider;
-import org.semanticweb.owlapi.util.SimpleShortFormProvider;
-
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
-/*
- * Copyright (C) 2007, University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate. Authorship
- * of the modifications may be determined from the ChangeLog placed at
- * the end of this file.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+import org.semanticweb.owlapi.io.OWLObjectRenderer;
+import org.semanticweb.owlapi.model.OWLObject;
+import org.semanticweb.owlapi.util.ShortFormProvider;
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
/**
* Author: Matthew Horridge<br>
* The University Of Manchester<br>
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2010-05-27 09:35:50 UTC (rev 2154)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2010-05-27 16:45:38 UTC (rev 2155)
@@ -29,7 +29,6 @@
import java.util.TimerTask;
import java.util.concurrent.ExecutionException;
-import javax.swing.DefaultListModel;
import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
import javax.swing.SwingWorker;
@@ -62,8 +61,8 @@
private LearningAlgorithm la;
private SuggestionRetriever retriever;
private HelpTextPanel helpPanel;
- private final Color colorRed = new Color(139, 0, 0);
- private final Color colorGreen = new Color(0, 139, 0);
+// private final Color colorRed = new Color(139, 0, 0);
+// private final Color colorGreen = new Color(0, 139, 0);
private final DLLearnerView view;
private static final String HELP_BUTTON_STRING = "help";
private static final String ADD_BUTTON_STRING = "<html>ADD</html>";
@@ -188,8 +187,6 @@
SwingWorker<List<? extends EvaluatedDescription>, List<? extends EvaluatedDescription>> {
private Thread dlLearner;
- private final DefaultListModel dm = new DefaultListModel();
- private boolean isFinished;
@SuppressWarnings("unchecked")
@Override
@@ -202,7 +199,6 @@
view.getPosAndNegSelectPanel().getOptionPanel()
.getMaxExecutionTime());
timer = new Timer();
- isFinished = false;
timer.schedule(new TimerTask() {
int progress = 0;
@@ -210,10 +206,6 @@
public void run() {
progress += 1;
setProgress(progress);
- if(progress == view.getPosAndNegSelectPanel().getOptionPanel()
- .getMaxExecutionTime() - 1) {
- isFinished = true;
- }
if (la != null) {
publish(la.getCurrentlyBestEvaluatedDescriptions(view
.getPosAndNegSelectPanel().getOptionPanel()
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2010-05-27 09:35:50 UTC (rev 2154)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2010-05-27 16:45:38 UTC (rev 2155)
@@ -30,7 +30,6 @@
import org.dllearner.core.EvaluatedDescription;
import org.dllearner.learningproblems.EvaluatedDescriptionClass;
-import org.dllearner.tools.evaluationplugin.EvaluationTable;
/**
* This class is the panel for the suggest list. It shows the descriptions made
@@ -49,12 +48,6 @@
private final SuggestionsTable suggestionTable;
- // Panel for the description list
-
- private final JPanel suggestPanel;
-
- // Scroll panel if the suggestions are longer than the Panel itself
-
private final JScrollPane suggestScroll;
private DefaultListModel suggestModel;
private DLLearnerModel model;
@@ -78,7 +71,6 @@
JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
descriptions = new JList(suggestModel);
descriptions.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
- suggestPanel = new JPanel();
// descriptions.setVisible(true);
// descriptions.setVisibleRowCount(6);
// descriptions.getPreferredScrollableViewportSize();
@@ -103,6 +95,7 @@
}
+ @SuppressWarnings("unchecked")
public void addSuggestions(List<? extends EvaluatedDescription> result){
suggestionTable.setSuggestions((List<EvaluatedDescriptionClass>)result);
}
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java 2010-05-27 09:35:50 UTC (rev 2154)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java 2010-05-27 16:45:38 UTC (rev 2155)
@@ -30,7 +30,7 @@
*/
public class SuggestClassPanelHandler implements ListSelectionListener{
private DLLearnerView view;
- private DLLearnerModel model;
+// private DLLearnerModel model;
private ActionHandler action;
private EvaluatedDescription evaluatedDescription;
@@ -41,7 +41,7 @@
*/
public SuggestClassPanelHandler(DLLearnerView v, DLLearnerModel m, ActionHandler a) {
this.view = v;
- this.model = m;
+// this.model = m;
this.action = a;
}
Modified: trunk/src/dl-learner/org/dllearner/utilities/owl/OWLAPIConverter.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/owl/OWLAPIConverter.java 2010-05-27 09:35:50 UTC (rev 2154)
+++ trunk/src/dl-learner/org/dllearner/utilities/owl/OWLAPIConverter.java 2010-05-27 16:45:38 UTC (rev 2155)
@@ -189,9 +189,10 @@
return Datatype.INTEGER;
else if(uri.equals(Datatype.STRING.getURI()))
return Datatype.STRING;
- else if(uri.equals(Datatype.DATE.getURI())){
+ else if(uri.equals(Datatype.DATE.getURI()))
return Datatype.DATE;
- }
+ else if(uri.equals(Datatype.DATETIME.getURI()))
+ return Datatype.DATETIME;
throw new Error("Unsupported datatype " + dataType + ". Please inform a DL-Learner developer to add it.");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
