Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [547] trunk/src/dl-learner/org/dllearner
|
From: <jen...@us...> - 2008-02-12 12:10:58
|
Revision: 547
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=547&view=rev
Author: jenslehmann
Date: 2008-02-12 04:10:53 -0800 (Tue, 12 Feb 2008)
Log Message:
-----------
- another visitor for arbitrary elements of a knowledge base
- implemented export of double data type assertion using OWL API
- marker interface for named elements of a knowledge base
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java
trunk/src/dl-learner/org/dllearner/core/owl/AssertionalAxiom.java
trunk/src/dl-learner/org/dllearner/core/owl/Axiom.java
trunk/src/dl-learner/org/dllearner/core/owl/AxiomVisitor.java
trunk/src/dl-learner/org/dllearner/core/owl/BooleanDataRange.java
trunk/src/dl-learner/org/dllearner/core/owl/ClassAssertionAxiom.java
trunk/src/dl-learner/org/dllearner/core/owl/DataRange.java
trunk/src/dl-learner/org/dllearner/core/owl/DatatypeExactCardinalityRestriction.java
trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMaxCardinalityRestriction.java
trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMinCardinalityRestriction.java
trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java
trunk/src/dl-learner/org/dllearner/core/owl/DatatypeSomeRestriction.java
trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java
trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java
trunk/src/dl-learner/org/dllearner/core/owl/DoubleMaxValue.java
trunk/src/dl-learner/org/dllearner/core/owl/DoubleMinValue.java
trunk/src/dl-learner/org/dllearner/core/owl/EquivalentClassesAxiom.java
trunk/src/dl-learner/org/dllearner/core/owl/FunctionalObjectPropertyAxiom.java
trunk/src/dl-learner/org/dllearner/core/owl/Individual.java
trunk/src/dl-learner/org/dllearner/core/owl/Intersection.java
trunk/src/dl-learner/org/dllearner/core/owl/InverseObjectPropertyAxiom.java
trunk/src/dl-learner/org/dllearner/core/owl/KB.java
trunk/src/dl-learner/org/dllearner/core/owl/KBElement.java
trunk/src/dl-learner/org/dllearner/core/owl/KBElementVisitor.java
trunk/src/dl-learner/org/dllearner/core/owl/NamedClass.java
trunk/src/dl-learner/org/dllearner/core/owl/Negation.java
trunk/src/dl-learner/org/dllearner/core/owl/Nothing.java
trunk/src/dl-learner/org/dllearner/core/owl/ObjectAllRestriction.java
trunk/src/dl-learner/org/dllearner/core/owl/ObjectExactCardinalityRestriction.java
trunk/src/dl-learner/org/dllearner/core/owl/ObjectMaxCardinalityRestriction.java
trunk/src/dl-learner/org/dllearner/core/owl/ObjectMinCardinalityRestriction.java
trunk/src/dl-learner/org/dllearner/core/owl/ObjectProperty.java
trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java
trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java
trunk/src/dl-learner/org/dllearner/core/owl/ObjectSomeRestriction.java
trunk/src/dl-learner/org/dllearner/core/owl/ObjectValueRestriction.java
trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiom.java
trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiomVisitor.java
trunk/src/dl-learner/org/dllearner/core/owl/SubClassAxiom.java
trunk/src/dl-learner/org/dllearner/core/owl/SubObjectPropertyAxiom.java
trunk/src/dl-learner/org/dllearner/core/owl/SymmetricObjectPropertyAxiom.java
trunk/src/dl-learner/org/dllearner/core/owl/TerminologicalAxiom.java
trunk/src/dl-learner/org/dllearner/core/owl/Thing.java
trunk/src/dl-learner/org/dllearner/core/owl/TransitiveObjectPropertyAxiom.java
trunk/src/dl-learner/org/dllearner/core/owl/Union.java
trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIAxiomConvertVisitor.java
trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java
Added Paths:
-----------
trunk/src/dl-learner/org/dllearner/core/owl/NamedKBElement.java
Modified: trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -4,6 +4,7 @@
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.DescriptionVisitor;
+import org.dllearner.core.owl.KBElementVisitor;
public class ADC extends Description {
@@ -39,4 +40,8 @@
visitor.visit(this);
}
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
+
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/AssertionalAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/AssertionalAxiom.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/AssertionalAxiom.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -1,5 +1,5 @@
package org.dllearner.core.owl;
public abstract class AssertionalAxiom extends Axiom {
-
+
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/Axiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/Axiom.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/Axiom.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -7,4 +7,5 @@
return toString(null, null);
}
+ public abstract void accept(AxiomVisitor visitor);
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/AxiomVisitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/AxiomVisitor.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/AxiomVisitor.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -27,7 +27,5 @@
*
*/
public interface AxiomVisitor extends AssertionalAxiomVisitor, PropertyAxiomVisitor, TerminologicalAxiomVisitor {
-
-
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/BooleanDataRange.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/BooleanDataRange.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/BooleanDataRange.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -19,10 +19,47 @@
*/
package org.dllearner.core.owl;
+import java.util.Map;
+
/**
+ * Allows to specify the value of a boolean datatype restriction,
+ * e.g. ChemicalSubstance AND EXISTS acidTest = true
+ *
* @author Jens Lehmann
*
*/
public class BooleanDataRange extends DataRange {
+ private boolean isTrue;
+
+ public BooleanDataRange(boolean isTrue) {
+ this.isTrue = isTrue;
+ }
+
+ /**
+ * @return The boolean value of this restriction.
+ */
+ public boolean isTrue() {
+ return isTrue;
+ }
+
+ /* (non-Javadoc)
+ * @see org.dllearner.core.owl.KBElement#getLength()
+ */
+ public int getLength() {
+ // length is 1, because we have either true or false
+ return 1;
+ }
+
+ /* (non-Javadoc)
+ * @see org.dllearner.core.owl.KBElement#toString(java.lang.String, java.util.Map)
+ */
+ public String toString(String baseURI, Map<String, String> prefixes) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/ClassAssertionAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/ClassAssertionAxiom.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/ClassAssertionAxiom.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -53,4 +53,13 @@
public String toString(String baseURI, Map<String,String> prefixes) {
return concept.toString(baseURI, prefixes) + "(" + individual + ")";
}
+
+ @Override
+ public void accept(AxiomVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/DataRange.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/DataRange.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/DataRange.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -23,6 +23,6 @@
* @author Jens Lehmann
*
*/
-public abstract class DataRange {
+public abstract class DataRange implements KBElement {
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeExactCardinalityRestriction.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeExactCardinalityRestriction.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeExactCardinalityRestriction.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -52,12 +52,12 @@
return null;
}
- /* (non-Javadoc)
- * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor)
- */
@Override
public void accept(DescriptionVisitor visitor) {
visitor.visit(this);
}
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMaxCardinalityRestriction.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMaxCardinalityRestriction.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMaxCardinalityRestriction.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -52,11 +52,12 @@
return null;
}
- /* (non-Javadoc)
- * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor)
- */
@Override
public void accept(DescriptionVisitor visitor) {
visitor.visit(this);
- }
+ }
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMinCardinalityRestriction.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMinCardinalityRestriction.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMinCardinalityRestriction.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -59,4 +59,8 @@
public void accept(DescriptionVisitor visitor) {
visitor.visit(this);
}
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -27,7 +27,7 @@
* @author Jens Lehmann
*
*/
-public class DatatypeProperty extends PropertyExpression implements Property {
+public class DatatypeProperty extends PropertyExpression implements Property, NamedKBElement {
protected String name;
@@ -42,6 +42,10 @@
return 1;
}
+ public String getName() {
+ return name;
+ }
+
/* (non-Javadoc)
* @see org.dllearner.core.dl.KBElement#toString(java.lang.String, java.util.Map)
*/
@@ -49,4 +53,7 @@
return Helper.getAbbreviatedString(name, baseURI, prefixes);
}
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeSomeRestriction.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeSomeRestriction.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeSomeRestriction.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -66,5 +66,8 @@
public void accept(DescriptionVisitor visitor) {
visitor.visit(this);
}
-
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -32,4 +32,8 @@
public void accept(DescriptionVisitor visitor) {
visitor.visit(this);
}
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -33,9 +33,7 @@
super(datatypeProperty, individual);
this.value = value;
}
-
-
/* (non-Javadoc)
* @see org.dllearner.core.dl.KBElement#toString(java.lang.String, java.util.Map)
*/
@@ -47,4 +45,12 @@
return value;
}
+ @Override
+ public void accept(AxiomVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/DoubleMaxValue.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/DoubleMaxValue.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/DoubleMaxValue.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -19,6 +19,8 @@
*/
package org.dllearner.core.owl;
+import java.util.Map;
+
/**
* Double data range restricted by a maximum value, e.g.
* hasAge <= 65.
@@ -40,5 +42,24 @@
public double getValue() {
return value;
}
+
+ /* (non-Javadoc)
+ * @see org.dllearner.core.owl.KBElement#getLength()
+ */
+ public int getLength() {
+ return 2;
+ }
+
+ /* (non-Javadoc)
+ * @see org.dllearner.core.owl.KBElement#toString(java.lang.String, java.util.Map)
+ */
+ public String toString(String baseURI, Map<String, String> prefixes) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
+
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/DoubleMinValue.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/DoubleMinValue.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/DoubleMinValue.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -19,6 +19,8 @@
*/
package org.dllearner.core.owl;
+import java.util.Map;
+
/**
* Double data range restricted by a maximum value, e.g.
* hasAge >= 18.
@@ -39,6 +41,24 @@
*/
public double getValue() {
return value;
+ }
+
+ /* (non-Javadoc)
+ * @see org.dllearner.core.owl.KBElement#getLength()
+ */
+ public int getLength() {
+ return 2;
+ }
+
+ /* (non-Javadoc)
+ * @see org.dllearner.core.owl.KBElement#toString(java.lang.String, java.util.Map)
+ */
+ public String toString(String baseURI, Map<String, String> prefixes) {
+ // TODO Auto-generated method stub
+ return null;
}
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/EquivalentClassesAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/EquivalentClassesAxiom.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/EquivalentClassesAxiom.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -27,4 +27,13 @@
public String toString(String baseURI, Map<String,String> prefixes) {
return concept1.toString(baseURI, prefixes) + " = " + concept2.toString(baseURI, prefixes);
}
+
+ @Override
+ public void accept(AxiomVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/FunctionalObjectPropertyAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/FunctionalObjectPropertyAxiom.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/FunctionalObjectPropertyAxiom.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -21,4 +21,13 @@
public String toString(String baseURI, Map<String,String> prefixes) {
return "Functional(" + role.toString(baseURI, prefixes) + ")";
}
+
+ @Override
+ public void accept(AxiomVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/Individual.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/Individual.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/Individual.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -29,7 +29,7 @@
* @author Jens Lehmann
*
*/
-public class Individual implements KBElement, Comparable<Individual> {
+public class Individual implements NamedKBElement, Comparable<Individual> {
private String name;
@@ -62,5 +62,9 @@
public String toString(String baseURI, Map<String,String> prefixes) {
return Helper.getAbbreviatedString(name, baseURI, prefixes);
}
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/Intersection.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/Intersection.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/Intersection.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -62,4 +62,8 @@
public void accept(DescriptionVisitor visitor) {
visitor.visit(this);
}
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/InverseObjectPropertyAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/InverseObjectPropertyAxiom.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/InverseObjectPropertyAxiom.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -27,4 +27,13 @@
public String toString(String baseURI, Map<String,String> prefixes) {
return "Inverse(" + inverseRole + "," + role.toString(baseURI, prefixes) + ")";
}
+
+ @Override
+ public void accept(AxiomVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/KB.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/KB.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/KB.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -223,4 +223,8 @@
return (abox.size() + tbox.size() + rbox.size());
}
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
+
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/KBElement.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/KBElement.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/KBElement.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -13,4 +13,6 @@
public int getLength();
public String toString(String baseURI, Map<String,String> prefixes);
+
+ public void accept(KBElementVisitor visitor);
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/KBElementVisitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/KBElementVisitor.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/KBElementVisitor.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -27,4 +27,14 @@
*/
public interface KBElementVisitor extends AxiomVisitor, DescriptionVisitor, PropertyExpressionVisitor {
+ void visit(BooleanDataRange booleanDataRange);
+
+ void visit(DoubleMaxValue doubleMaxValue);
+
+ void visit(DoubleMinValue doubleMinValue);
+
+ void visit(Individual individual);
+
+ void visit(KB kb);
+
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/NamedClass.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/NamedClass.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/NamedClass.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -30,7 +30,7 @@
* @author Jens Lehmann
*
*/
-public class NamedClass extends Description {
+public class NamedClass extends Description implements NamedKBElement {
String name;
@@ -66,5 +66,9 @@
@Override
public void accept(DescriptionVisitor visitor) {
visitor.visit(this);
- }
+ }
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Added: trunk/src/dl-learner/org/dllearner/core/owl/NamedKBElement.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/NamedKBElement.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/core/owl/NamedKBElement.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -0,0 +1,33 @@
+/**
+ * Copyright (C) 2007-2008, Jens Lehmann
+ *
+ * This file is part of DL-Learner.
+ *
+ * DL-Learner is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * DL-Learner 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package org.dllearner.core.owl;
+
+/**
+ * Marker interface for those OWL elements, which have a name, e.g.
+ * the name of an individual, an object property, a data type property
+ * or a named class.
+ *
+ * @author Jens Lehmann
+ *
+ */
+public interface NamedKBElement extends KBElement {
+
+ public String getName();
+}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/Negation.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/Negation.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/Negation.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -38,4 +38,8 @@
public void accept(DescriptionVisitor visitor) {
visitor.visit(this);
}
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/Nothing.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/Nothing.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/Nothing.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -34,4 +34,8 @@
public void accept(DescriptionVisitor visitor) {
visitor.visit(this);
}
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectAllRestriction.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/ObjectAllRestriction.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectAllRestriction.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -102,5 +102,9 @@
@Override
public void accept(DescriptionVisitor visitor) {
visitor.visit(this);
- }
+ }
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectExactCardinalityRestriction.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/ObjectExactCardinalityRestriction.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectExactCardinalityRestriction.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -47,4 +47,8 @@
public void accept(DescriptionVisitor visitor) {
visitor.visit(this);
}
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectMaxCardinalityRestriction.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/ObjectMaxCardinalityRestriction.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectMaxCardinalityRestriction.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -24,4 +24,8 @@
public void accept(DescriptionVisitor visitor) {
visitor.visit(this);
}
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectMinCardinalityRestriction.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/ObjectMinCardinalityRestriction.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectMinCardinalityRestriction.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -24,4 +24,8 @@
public void accept(DescriptionVisitor visitor) {
visitor.visit(this);
}
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectProperty.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/ObjectProperty.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectProperty.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -30,7 +30,7 @@
* @author Jens Lehmann
*
*/
-public class ObjectProperty extends ObjectPropertyExpression implements Property {
+public class ObjectProperty extends ObjectPropertyExpression implements Property, NamedKBElement {
public ObjectProperty(String name) {
super(name);
@@ -48,4 +48,8 @@
public String toString(String baseURI, Map<String,String> prefixes) {
return Helper.getAbbreviatedString(name, baseURI, prefixes);
}
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -51,6 +51,11 @@
public ObjectProperty getRole() {
return role;
}
+
+ @Override
+ public void accept(AxiomVisitor visitor) {
+ visitor.visit(this);
+ }
public int getLength() {
return 2 + role.getLength();
@@ -59,4 +64,8 @@
public String toString(String baseURI, Map<String,String> prefixes) {
return role.toString(baseURI, prefixes) + "(" + individual1.toString(baseURI, prefixes) + "," + individual2.toString(baseURI, prefixes) +")";
}
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -49,4 +49,8 @@
public String toString(String baseURI, Map<String,String> prefixes) {
return Helper.getAbbreviatedString(name, baseURI, prefixes) + "-";
}
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectSomeRestriction.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/ObjectSomeRestriction.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectSomeRestriction.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -104,4 +104,8 @@
public void accept(DescriptionVisitor visitor) {
visitor.visit(this);
}
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectValueRestriction.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/ObjectValueRestriction.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectValueRestriction.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -20,6 +20,9 @@
package org.dllearner.core.owl;
/**
+ * Restricts the value of an object property to a single individual
+ * (corresponds to owl:hasValue).
+ *
* @author Jens Lehmann
*
*/
@@ -33,4 +36,7 @@
visitor.visit(this);
}
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiom.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiom.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -1,5 +1,5 @@
package org.dllearner.core.owl;
public abstract class PropertyAxiom extends Axiom {
-
+
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiomVisitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiomVisitor.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiomVisitor.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -34,4 +34,6 @@
public void visit(SymmetricObjectPropertyAxiom axiom);
public void visit(TransitiveObjectPropertyAxiom axiom);
+
+ public void visit(SubObjectPropertyAxiom axiom);
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/SubClassAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/SubClassAxiom.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/SubClassAxiom.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -27,4 +27,13 @@
public String toString(String baseURI, Map<String,String> prefixes) {
return subConcept.toString(baseURI, prefixes) + " SUBCONCEPTOF " + superConcept.toString(baseURI, prefixes);
}
+
+ @Override
+ public void accept(AxiomVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/SubObjectPropertyAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/SubObjectPropertyAxiom.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/SubObjectPropertyAxiom.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -26,5 +26,14 @@
public String toString(String baseURI, Map<String,String> prefixes) {
return "Subrole(" + subRole.toString(baseURI, prefixes) + "," + role.toString(baseURI, prefixes) + ")";
- }
+ }
+
+ @Override
+ public void accept(AxiomVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/SymmetricObjectPropertyAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/SymmetricObjectPropertyAxiom.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/SymmetricObjectPropertyAxiom.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -20,5 +20,14 @@
public String toString(String baseURI, Map<String,String> prefixes) {
return "Symmetric(" + role.toString(baseURI, prefixes) + ")";
+ }
+
+ @Override
+ public void accept(AxiomVisitor visitor) {
+ visitor.visit(this);
}
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/TerminologicalAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/TerminologicalAxiom.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/TerminologicalAxiom.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -1,5 +1,5 @@
package org.dllearner.core.owl;
public abstract class TerminologicalAxiom extends Axiom {
-
+
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/Thing.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/Thing.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/Thing.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -32,4 +32,8 @@
public void accept(DescriptionVisitor visitor) {
visitor.visit(this);
}
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/TransitiveObjectPropertyAxiom.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/TransitiveObjectPropertyAxiom.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/TransitiveObjectPropertyAxiom.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -21,4 +21,13 @@
public String toString(String baseURI, Map<String,String> prefixes) {
return "Transitive(" + role.toString(baseURI, prefixes) + ")";
}
+
+ @Override
+ public void accept(AxiomVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/core/owl/Union.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/Union.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/core/owl/Union.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -65,4 +65,7 @@
visitor.visit(this);
}
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIAxiomConvertVisitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIAxiomConvertVisitor.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIAxiomConvertVisitor.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -23,6 +23,7 @@
import java.util.HashSet;
import java.util.Set;
+import org.dllearner.core.owl.Axiom;
import org.dllearner.core.owl.AxiomVisitor;
import org.dllearner.core.owl.ClassAssertionAxiom;
import org.dllearner.core.owl.DoubleDatatypePropertyAssertion;
@@ -32,17 +33,22 @@
import org.dllearner.core.owl.KB;
import org.dllearner.core.owl.ObjectPropertyAssertion;
import org.dllearner.core.owl.SubClassAxiom;
+import org.dllearner.core.owl.SubObjectPropertyAxiom;
import org.dllearner.core.owl.SymmetricObjectPropertyAxiom;
import org.dllearner.core.owl.TransitiveObjectPropertyAxiom;
import org.semanticweb.owl.model.AddAxiom;
import org.semanticweb.owl.model.OWLAxiom;
import org.semanticweb.owl.model.OWLDataFactory;
+import org.semanticweb.owl.model.OWLDataProperty;
+import org.semanticweb.owl.model.OWLDataType;
import org.semanticweb.owl.model.OWLDescription;
import org.semanticweb.owl.model.OWLIndividual;
import org.semanticweb.owl.model.OWLObjectProperty;
import org.semanticweb.owl.model.OWLOntology;
import org.semanticweb.owl.model.OWLOntologyChangeException;
import org.semanticweb.owl.model.OWLOntologyManager;
+import org.semanticweb.owl.model.OWLTypedConstant;
+import org.semanticweb.owl.vocab.XSDVocabulary;
// static import for easy access to the description converter
import static org.dllearner.reasoning.OWLAPIDescriptionConvertVisitor.getOWLDescription;
@@ -71,11 +77,14 @@
}
public static void fillOWLOntology(OWLOntologyManager manager, OWLOntology ontology, KB kb) {
- // OWLAPIAxiomConvertVisitor converter = new OWLAPIAxiomConvertVisitor(manager, ontology, kb);
- // for(Axiom axiom : kb.getTbox())
- // axiom.accept(this);
- // return converter.getOWLDescription();
- }
+ OWLAPIAxiomConvertVisitor converter = new OWLAPIAxiomConvertVisitor(manager, ontology, kb);
+ for(Axiom axiom : kb.getTbox())
+ axiom.accept(converter);
+ for(Axiom axiom : kb.getRbox())
+ axiom.accept(converter);
+ for(Axiom axiom : kb.getAbox())
+ axiom.accept(converter);
+ }
// convencience function for adding an axiom to the ontology
private void addAxiom(OWLAxiom axiom) {
@@ -122,8 +131,13 @@
* @see org.dllearner.core.owl.AssertionalAxiomVisitor#visit(org.dllearner.core.owl.DoubleDatatypePropertyAssertion)
*/
public void visit(DoubleDatatypePropertyAssertion axiom) {
- // TODO Auto-generated method stub
-
+ OWLIndividual i = factory.getOWLIndividual(URI.create(axiom.getIndividual().getName()));
+ OWLDataProperty dp = factory.getOWLDataProperty(URI.create(axiom.getDatatypeProperty().getName()));
+ Double value = axiom.getValue();
+ OWLDataType doubleType = factory.getOWLDataType(XSDVocabulary.DOUBLE.getURI());
+ OWLTypedConstant valueConstant = factory.getOWLTypedConstant(value.toString(), doubleType);
+ OWLAxiom axiomOWLAPI = factory.getOWLDataPropertyAssertionAxiom(i, dp, valueConstant);
+ addAxiom(axiomOWLAPI);
}
/*
@@ -176,6 +190,18 @@
addAxiom(axiomOWLAPI);
}
+ /* (non-Javadoc)
+ * @see org.dllearner.core.owl.PropertyAxiomVisitor#visit(org.dllearner.core.owl.SubObjectPropertyAxiom)
+ */
+ public void visit(SubObjectPropertyAxiom axiom) {
+ OWLObjectProperty role = factory.getOWLObjectProperty(
+ URI.create(((SubObjectPropertyAxiom) axiom).getRole().getName()));
+ OWLObjectProperty subRole = factory.getOWLObjectProperty(
+ URI.create(((SubObjectPropertyAxiom) axiom).getSubRole().getName()));
+ OWLAxiom axiomOWLAPI = factory.getOWLSubObjectPropertyAxiom(subRole, role);
+ addAxiom(axiomOWLAPI);
+ }
+
/*
* (non-Javadoc)
*
@@ -206,4 +232,6 @@
addAxiom(axiomOWLAPI);
}
+
+
}
Modified: trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java 2008-02-12 11:36:32 UTC (rev 546)
+++ trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java 2008-02-12 12:10:53 UTC (rev 547)
@@ -532,7 +532,8 @@
OWLOntology ontology;
try {
ontology = manager.createOntology(ontologyURI);
- OWLAPIReasoner.fillOWLAPIOntology(manager, ontology, kb);
+ // OWLAPIReasoner.fillOWLAPIOntology(manager, ontology, kb);
+ OWLAPIAxiomConvertVisitor.fillOWLOntology(manager, ontology, kb);
manager.saveOntology(ontology);
} catch (OWLOntologyCreationException e) {
// TODO Auto-generated catch block
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
