From: <jen...@us...> - 2009-03-23 15:36:23
|
Revision: 1660 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1660&view=rev Author: jenslehmann Date: 2009-03-23 15:36:15 +0000 (Mon, 23 Mar 2009) Log Message: ----------- fixed Manchester syntax for value restrictions Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/core/owl/Annotation.java trunk/src/dl-learner/org/dllearner/core/owl/BooleanDataRange.java trunk/src/dl-learner/org/dllearner/core/owl/BooleanDatatypePropertyAssertion.java trunk/src/dl-learner/org/dllearner/core/owl/ClassAssertionAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/Datatype.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyDomainAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyRangeAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/DifferentIndividualsAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/DisjointClassesAxiom.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/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/ObjectProperty.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyDomainAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyRangeAxiom.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/TransitiveObjectPropertyAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/TypedConstant.java trunk/src/dl-learner/org/dllearner/core/owl/UntypedConstant.java Modified: trunk/src/dl-learner/org/dllearner/core/owl/Annotation.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Annotation.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/Annotation.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -84,4 +84,13 @@ return annotationValue; } + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; + } + } Modified: trunk/src/dl-learner/org/dllearner/core/owl/BooleanDataRange.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/BooleanDataRange.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/BooleanDataRange.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -68,5 +68,14 @@ public void accept(KBElementVisitor visitor) { visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/BooleanDatatypePropertyAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/BooleanDatatypePropertyAssertion.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/BooleanDatatypePropertyAssertion.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -54,6 +54,15 @@ public void accept(KBElementVisitor visitor) { visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ClassAssertionAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ClassAssertionAxiom.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/ClassAssertionAxiom.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -70,5 +70,14 @@ public void accept(KBElementVisitor visitor) { visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/Datatype.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Datatype.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/Datatype.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -61,5 +61,14 @@ public void accept(KBElementVisitor visitor) { visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -86,5 +86,14 @@ @Override public int hashCode() { return name.hashCode(); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyDomainAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyDomainAxiom.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyDomainAxiom.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -73,6 +73,15 @@ */ public void accept(KBElementVisitor visitor) { visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyRangeAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyRangeAxiom.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyRangeAxiom.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -69,6 +69,15 @@ */ public void accept(KBElementVisitor visitor) { visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -40,8 +40,7 @@ */ @Override public String toManchesterSyntaxString(String baseURI, Map<String,String> prefixes) { - // TODO Auto-generated method stub - return null; + return restrictedPropertyExpression.toString(baseURI, prefixes) + " value " + value.toManchesterSyntaxString(baseURI, prefixes); } /* (non-Javadoc) @@ -66,7 +65,7 @@ * @see org.dllearner.core.owl.KBElement#toString(java.lang.String, java.util.Map) */ public String toString(String baseURI, Map<String, String> prefixes) { - return restrictedPropertyExpression.toString(baseURI, prefixes) + " = " + value.toString(baseURI, prefixes); + return restrictedPropertyExpression.toString(baseURI, prefixes) + " value " + value.toString(baseURI, prefixes); } public String toKBSyntaxString(String baseURI, Map<String, String> prefixes) { Modified: trunk/src/dl-learner/org/dllearner/core/owl/DifferentIndividualsAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DifferentIndividualsAxiom.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/DifferentIndividualsAxiom.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -65,6 +65,15 @@ public void accept(KBElementVisitor visitor) { visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DisjointClassesAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DisjointClassesAxiom.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/DisjointClassesAxiom.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -73,6 +73,15 @@ */ public Set<Description> getDescriptions() { return descriptions; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -59,5 +59,14 @@ public void accept(KBElementVisitor visitor) { visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DoubleMaxValue.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DoubleMaxValue.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/DoubleMaxValue.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -63,6 +63,15 @@ public void accept(KBElementVisitor visitor) { visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DoubleMinValue.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DoubleMinValue.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/DoubleMinValue.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -63,5 +63,14 @@ public void accept(KBElementVisitor visitor) { visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/EquivalentClassesAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/EquivalentClassesAxiom.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/EquivalentClassesAxiom.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -39,5 +39,14 @@ public void accept(KBElementVisitor visitor) { visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/FunctionalObjectPropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/FunctionalObjectPropertyAxiom.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/FunctionalObjectPropertyAxiom.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -39,5 +39,14 @@ public void accept(KBElementVisitor visitor) { visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/InverseObjectPropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/InverseObjectPropertyAxiom.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/InverseObjectPropertyAxiom.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -39,5 +39,14 @@ public void accept(KBElementVisitor visitor) { visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/KB.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/KB.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/KB.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -304,4 +304,13 @@ e.printStackTrace(); } } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/KBElement.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/KBElement.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/KBElement.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -26,5 +26,8 @@ public String toKBSyntaxString(String baseURI, Map<String,String> prefixes); + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes); + public void accept(KBElementVisitor visitor); + } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectProperty.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectProperty.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectProperty.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -77,5 +77,14 @@ @Override public int hashCode() { return name.hashCode(); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -71,5 +71,14 @@ public void accept(KBElementVisitor visitor) { visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyDomainAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyDomainAxiom.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyDomainAxiom.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -65,6 +65,15 @@ public void accept(KBElementVisitor visitor) { visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -56,5 +56,14 @@ public void accept(KBElementVisitor visitor) { visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyRangeAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyRangeAxiom.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyRangeAxiom.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -71,5 +71,14 @@ visitor.visit(this); } + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; + } + } Modified: trunk/src/dl-learner/org/dllearner/core/owl/SubClassAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/SubClassAxiom.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/SubClassAxiom.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -39,5 +39,14 @@ public void accept(KBElementVisitor visitor) { visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/SubObjectPropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/SubObjectPropertyAxiom.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/SubObjectPropertyAxiom.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -39,5 +39,14 @@ public void accept(KBElementVisitor visitor) { visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/SymmetricObjectPropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/SymmetricObjectPropertyAxiom.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/SymmetricObjectPropertyAxiom.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -33,5 +33,14 @@ public void accept(KBElementVisitor visitor) { visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/TransitiveObjectPropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/TransitiveObjectPropertyAxiom.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/TransitiveObjectPropertyAxiom.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -33,5 +33,14 @@ public void accept(KBElementVisitor visitor) { visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/TypedConstant.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/TypedConstant.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/TypedConstant.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -55,6 +55,14 @@ return literal; // return literal + "^^" + datatype; } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + return literal; + } /** * @return the datatype @@ -88,4 +96,6 @@ return literal + "^^" + datatype; } + + } Modified: trunk/src/dl-learner/org/dllearner/core/owl/UntypedConstant.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/UntypedConstant.java 2009-03-23 14:03:26 UTC (rev 1659) +++ trunk/src/dl-learner/org/dllearner/core/owl/UntypedConstant.java 2009-03-23 15:36:15 UTC (rev 1660) @@ -69,6 +69,17 @@ return literal; } + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toManchesterSyntaxString(java.lang.String, java.util.Map) + */ + @Override + public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { + if(hasLang) + return literal + "@" + lang; + else + return literal; + } + /** * @return the lang */ @@ -97,5 +108,7 @@ } else { return literal; } - } + } + + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jen...@us...> - 2009-10-02 16:41:19
|
Revision: 1875 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1875&view=rev Author: jenslehmann Date: 2009-10-02 16:29:11 +0000 (Fri, 02 Oct 2009) Log Message: ----------- corrected display of double datatype restriction in MOS syntax Modified Paths: -------------- 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/DifferentIndividualsAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/DisjointClassesAxiom.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/InverseObjectPropertyAxiom.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/ObjectPropertyDomainAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyRangeAxiom.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/TransitiveObjectPropertyAxiom.java Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java 2009-10-02 15:50:46 UTC (rev 1874) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java 2009-10-02 16:29:11 UTC (rev 1875) @@ -98,7 +98,6 @@ */ @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { - // TODO Auto-generated method stub - return null; + return Helper.getAbbreviatedString(name, baseURI, prefixes); } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeSomeRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeSomeRestriction.java 2009-10-02 15:50:46 UTC (rev 1874) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeSomeRestriction.java 2009-10-02 16:29:11 UTC (rev 1875) @@ -88,8 +88,7 @@ */ @Override public String toManchesterSyntaxString(String baseURI, Map<String,String> prefixes) { - // TODO Auto-generated method stub - return null; + return restrictedPropertyExpression.toManchesterSyntaxString(baseURI, prefixes) + dataRange.toManchesterSyntaxString(baseURI, prefixes); } /** Modified: trunk/src/dl-learner/org/dllearner/core/owl/DifferentIndividualsAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DifferentIndividualsAxiom.java 2009-10-02 15:50:46 UTC (rev 1874) +++ trunk/src/dl-learner/org/dllearner/core/owl/DifferentIndividualsAxiom.java 2009-10-02 16:29:11 UTC (rev 1875) @@ -72,8 +72,7 @@ */ @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { - // TODO Auto-generated method stub - return null; + return "DIFFERENT_INDIVIDUALS_AXIOM NOT IMPLEMENTED"; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DisjointClassesAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DisjointClassesAxiom.java 2009-10-02 15:50:46 UTC (rev 1874) +++ trunk/src/dl-learner/org/dllearner/core/owl/DisjointClassesAxiom.java 2009-10-02 16:29:11 UTC (rev 1875) @@ -80,8 +80,7 @@ */ @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { - // TODO Auto-generated method stub - return null; + return "DISJOINT_CLASSES_AXIOM NOT IMPLEMENTED"; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java 2009-10-02 15:50:46 UTC (rev 1874) +++ trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java 2009-10-02 16:29:11 UTC (rev 1875) @@ -66,7 +66,6 @@ */ @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { - // TODO Auto-generated method stub - return null; + return "DOUBLEDATAPROPASSERTION NOT IMPLEMENTED"; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DoubleMaxValue.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DoubleMaxValue.java 2009-10-02 15:50:46 UTC (rev 1874) +++ trunk/src/dl-learner/org/dllearner/core/owl/DoubleMaxValue.java 2009-10-02 16:29:11 UTC (rev 1875) @@ -70,8 +70,7 @@ */ @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { - // TODO Auto-generated method stub - return null; + return " <= " + value; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DoubleMinValue.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DoubleMinValue.java 2009-10-02 15:50:46 UTC (rev 1874) +++ trunk/src/dl-learner/org/dllearner/core/owl/DoubleMinValue.java 2009-10-02 16:29:11 UTC (rev 1875) @@ -70,7 +70,6 @@ */ @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { - // TODO Auto-generated method stub - return null; + return " >= " + value; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/EquivalentClassesAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/EquivalentClassesAxiom.java 2009-10-02 15:50:46 UTC (rev 1874) +++ trunk/src/dl-learner/org/dllearner/core/owl/EquivalentClassesAxiom.java 2009-10-02 16:29:11 UTC (rev 1875) @@ -46,7 +46,6 @@ */ @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { - // TODO Auto-generated method stub - return null; + return "EQ_CLASSES_AXIOM NOT IMPLEMENTED"; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/FunctionalObjectPropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/FunctionalObjectPropertyAxiom.java 2009-10-02 15:50:46 UTC (rev 1874) +++ trunk/src/dl-learner/org/dllearner/core/owl/FunctionalObjectPropertyAxiom.java 2009-10-02 16:29:11 UTC (rev 1875) @@ -46,7 +46,6 @@ */ @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { - // TODO Auto-generated method stub - return null; + return "FUNCTIONALOBJECTPROPERTYAXIOM NOT IMPLEMENTED"; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/InverseObjectPropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/InverseObjectPropertyAxiom.java 2009-10-02 15:50:46 UTC (rev 1874) +++ trunk/src/dl-learner/org/dllearner/core/owl/InverseObjectPropertyAxiom.java 2009-10-02 16:29:11 UTC (rev 1875) @@ -2,6 +2,8 @@ import java.util.Map; +import org.dllearner.utilities.Helper; + public class InverseObjectPropertyAxiom extends PropertyAxiom { private ObjectProperty inverseRole; @@ -46,7 +48,6 @@ */ @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { - // TODO Auto-generated method stub - return null; + return "INVERSEOBJECTPROPERTYAXIOM NOT IMPLEMENTED"; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectProperty.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectProperty.java 2009-10-02 15:50:46 UTC (rev 1874) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectProperty.java 2009-10-02 16:29:11 UTC (rev 1875) @@ -89,7 +89,6 @@ */ @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { - // TODO Auto-generated method stub - return null; + return Helper.getAbbreviatedString(name, baseURI, prefixes); } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java 2009-10-02 15:50:46 UTC (rev 1874) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java 2009-10-02 16:29:11 UTC (rev 1875) @@ -78,7 +78,6 @@ */ @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { - // TODO Auto-generated method stub - return null; + return "OBJECTPROPERTYASSERTION NOT IMPLEMENTED"; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyDomainAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyDomainAxiom.java 2009-10-02 15:50:46 UTC (rev 1874) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyDomainAxiom.java 2009-10-02 16:29:11 UTC (rev 1875) @@ -72,8 +72,7 @@ */ @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { - // TODO Auto-generated method stub - return null; + return "OBJECTPROPERTYDOMAIN NOT IMPLEMENTED"; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java 2009-10-02 15:50:46 UTC (rev 1874) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java 2009-10-02 16:29:11 UTC (rev 1875) @@ -63,7 +63,6 @@ */ @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { - // TODO Auto-generated method stub - return null; + return "OBJECTPROPERTYINVERSE NOT IMPLEMENTED"; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyRangeAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyRangeAxiom.java 2009-10-02 15:50:46 UTC (rev 1874) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyRangeAxiom.java 2009-10-02 16:29:11 UTC (rev 1875) @@ -76,8 +76,7 @@ */ @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { - // TODO Auto-generated method stub - return null; + return "OBJECTPROPERTYRANGE NOT IMPLEMENTED"; } Modified: trunk/src/dl-learner/org/dllearner/core/owl/SubClassAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/SubClassAxiom.java 2009-10-02 15:50:46 UTC (rev 1874) +++ trunk/src/dl-learner/org/dllearner/core/owl/SubClassAxiom.java 2009-10-02 16:29:11 UTC (rev 1875) @@ -47,6 +47,6 @@ @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { // TODO Auto-generated method stub - return null; + return "SUBCLASS NOT IMPLEMENTED"; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/SubObjectPropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/SubObjectPropertyAxiom.java 2009-10-02 15:50:46 UTC (rev 1874) +++ trunk/src/dl-learner/org/dllearner/core/owl/SubObjectPropertyAxiom.java 2009-10-02 16:29:11 UTC (rev 1875) @@ -46,7 +46,6 @@ */ @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { - // TODO Auto-generated method stub - return null; + return "Subrole(" + subRole.toString(baseURI, prefixes) + "," + role.toString(baseURI, prefixes) + ")"; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/SymmetricObjectPropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/SymmetricObjectPropertyAxiom.java 2009-10-02 15:50:46 UTC (rev 1874) +++ trunk/src/dl-learner/org/dllearner/core/owl/SymmetricObjectPropertyAxiom.java 2009-10-02 16:29:11 UTC (rev 1875) @@ -40,7 +40,6 @@ */ @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { - // TODO Auto-generated method stub - return null; + return "Symmetric(" + role.toString(baseURI, prefixes) + ")"; } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/TransitiveObjectPropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/TransitiveObjectPropertyAxiom.java 2009-10-02 15:50:46 UTC (rev 1874) +++ trunk/src/dl-learner/org/dllearner/core/owl/TransitiveObjectPropertyAxiom.java 2009-10-02 16:29:11 UTC (rev 1875) @@ -40,7 +40,6 @@ */ @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { - // TODO Auto-generated method stub - return null; + return "Transitive(" + role.toString(baseURI, prefixes) + ")"; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lor...@us...> - 2009-12-31 11:28:28
|
Revision: 1976 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1976&view=rev Author: lorenz_b Date: 2009-12-31 11:28:21 +0000 (Thu, 31 Dec 2009) Log Message: ----------- Made all KB elements serializable. Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/core/owl/Annotation.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/BooleanDataRange.java trunk/src/dl-learner/org/dllearner/core/owl/BooleanDatatypePropertyAssertion.java trunk/src/dl-learner/org/dllearner/core/owl/ClassAssertionAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/Constant.java trunk/src/dl-learner/org/dllearner/core/owl/ConstantAnnotation.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyAssertion.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyDomainAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyRangeAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/Description.java trunk/src/dl-learner/org/dllearner/core/owl/DifferentIndividualsAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/DisjointClassesAxiom.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/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/LabelAnnotation.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyDomainAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyRangeAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/PropertyAssertion.java trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/PropertyDomainAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/PropertyRangeAxiom.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/TransitiveObjectPropertyAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/TypedConstant.java trunk/src/dl-learner/org/dllearner/core/owl/UntypedConstant.java Modified: trunk/src/dl-learner/org/dllearner/core/owl/Annotation.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Annotation.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/Annotation.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -30,6 +30,10 @@ */ public class Annotation implements KBElement { + /** + * + */ + private static final long serialVersionUID = 46761104877109257L; protected URI annotationURI; protected KBElement annotationValue; Modified: trunk/src/dl-learner/org/dllearner/core/owl/AssertionalAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/AssertionalAxiom.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/AssertionalAxiom.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -1,5 +1,10 @@ package org.dllearner.core.owl; public abstract class AssertionalAxiom extends Axiom { + + /** + * + */ + private static final long serialVersionUID = -5773812719923003848L; } Modified: trunk/src/dl-learner/org/dllearner/core/owl/Axiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Axiom.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/Axiom.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -2,6 +2,11 @@ public abstract class Axiom implements KBElement { + /** + * + */ + private static final long serialVersionUID = -8064697058621473304L; + @Override public String toString() { return toString(null, null); Modified: trunk/src/dl-learner/org/dllearner/core/owl/BooleanDataRange.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/BooleanDataRange.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/BooleanDataRange.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -30,6 +30,10 @@ */ public class BooleanDataRange implements DataRange { + /** + * + */ + private static final long serialVersionUID = -5269818053715347143L; private boolean isTrue; public BooleanDataRange(boolean isTrue) { Modified: trunk/src/dl-learner/org/dllearner/core/owl/BooleanDatatypePropertyAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/BooleanDatatypePropertyAssertion.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/BooleanDatatypePropertyAssertion.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -27,6 +27,10 @@ */ public class BooleanDatatypePropertyAssertion extends DatatypePropertyAssertion { + /** + * + */ + private static final long serialVersionUID = -7624507967222663104L; private boolean value; public BooleanDatatypePropertyAssertion(DatatypeProperty datatypeProperty, Individual individual, boolean value) { Modified: trunk/src/dl-learner/org/dllearner/core/owl/ClassAssertionAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ClassAssertionAxiom.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/ClassAssertionAxiom.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -30,6 +30,10 @@ */ public class ClassAssertionAxiom extends AssertionalAxiom { + /** + * + */ + private static final long serialVersionUID = -790952686329481774L; private Description concept; private Individual individual; Modified: trunk/src/dl-learner/org/dllearner/core/owl/Constant.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Constant.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/Constant.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -27,6 +27,10 @@ */ public abstract class Constant implements KBElement { + /** + * + */ + private static final long serialVersionUID = 2331790456049452753L; String literal; public Constant(String literal) { Modified: trunk/src/dl-learner/org/dllearner/core/owl/ConstantAnnotation.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ConstantAnnotation.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/ConstantAnnotation.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -27,6 +27,11 @@ */ public class ConstantAnnotation extends Annotation { + /** + * + */ + private static final long serialVersionUID = -3705538440580894606L; + public ConstantAnnotation(URI annotationURI, Constant annotationValue) { super(annotationURI, annotationValue); } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyAssertion.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyAssertion.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -27,6 +27,10 @@ */ public abstract class DatatypePropertyAssertion extends PropertyAssertion { + /** + * + */ + private static final long serialVersionUID = -7202070934971240534L; protected DatatypeProperty datatypeProperty; protected Individual individual; Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyDomainAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyDomainAxiom.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyDomainAxiom.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -27,6 +27,11 @@ */ public class DatatypePropertyDomainAxiom extends PropertyDomainAxiom { + /** + * + */ + private static final long serialVersionUID = -4545077497129132116L; + public DatatypePropertyDomainAxiom(DatatypeProperty property, Description domain) { super(property, domain); } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyRangeAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyRangeAxiom.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyRangeAxiom.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -27,6 +27,11 @@ */ public class DatatypePropertyRangeAxiom extends PropertyRangeAxiom { + /** + * + */ + private static final long serialVersionUID = -6632066237684906382L; + public DatatypePropertyRangeAxiom(DatatypeProperty property, DataRange domain) { super(property, domain); } Modified: trunk/src/dl-learner/org/dllearner/core/owl/Description.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Description.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/Description.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -19,7 +19,6 @@ */ package org.dllearner.core.owl; -import java.io.Serializable; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -30,7 +29,7 @@ * @author Jens Lehmann * */ -public abstract class Description implements Cloneable, PropertyRange, KBElement, Serializable { +public abstract class Description implements Cloneable, PropertyRange, KBElement{ /** * Modified: trunk/src/dl-learner/org/dllearner/core/owl/DifferentIndividualsAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DifferentIndividualsAxiom.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/DifferentIndividualsAxiom.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -28,6 +28,10 @@ */ public class DifferentIndividualsAxiom extends AssertionalAxiom { + /** + * + */ + private static final long serialVersionUID = -2109917591559200265L; private Set<Individual> individuals; public DifferentIndividualsAxiom(Set<Individual> individuals) { Modified: trunk/src/dl-learner/org/dllearner/core/owl/DisjointClassesAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DisjointClassesAxiom.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/DisjointClassesAxiom.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -28,6 +28,10 @@ */ public class DisjointClassesAxiom extends TerminologicalAxiom { + /** + * + */ + private static final long serialVersionUID = 7788863077013583508L; private Set<Description> descriptions; public DisjointClassesAxiom(Set<Description> descriptions) { Modified: trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -27,6 +27,10 @@ */ public class DoubleDatatypePropertyAssertion extends DatatypePropertyAssertion { + /** + * + */ + private static final long serialVersionUID = -5879849456632960783L; private double value; public DoubleDatatypePropertyAssertion(DatatypeProperty datatypeProperty, Individual individual, double value) { Modified: trunk/src/dl-learner/org/dllearner/core/owl/DoubleMaxValue.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DoubleMaxValue.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/DoubleMaxValue.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -30,6 +30,10 @@ */ public class DoubleMaxValue implements SimpleDoubleDataRange { + /** + * + */ + private static final long serialVersionUID = 465847501541695475L; private double value; public DoubleMaxValue(double value) { Modified: trunk/src/dl-learner/org/dllearner/core/owl/DoubleMinValue.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DoubleMinValue.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/DoubleMinValue.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -30,6 +30,10 @@ */ public class DoubleMinValue implements SimpleDoubleDataRange { + /** + * + */ + private static final long serialVersionUID = 8808907963085216763L; private double value; public DoubleMinValue(double value) { Modified: trunk/src/dl-learner/org/dllearner/core/owl/EquivalentClassesAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/EquivalentClassesAxiom.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/EquivalentClassesAxiom.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -4,6 +4,10 @@ public class EquivalentClassesAxiom extends TerminologicalAxiom { + /** + * + */ + private static final long serialVersionUID = -2893732406014114441L; private Description concept1; private Description concept2; Modified: trunk/src/dl-learner/org/dllearner/core/owl/FunctionalObjectPropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/FunctionalObjectPropertyAxiom.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/FunctionalObjectPropertyAxiom.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -4,6 +4,10 @@ public class FunctionalObjectPropertyAxiom extends PropertyAxiom { + /** + * + */ + private static final long serialVersionUID = 2571916949143387591L; private ObjectProperty role; public FunctionalObjectPropertyAxiom(ObjectProperty role) { Modified: trunk/src/dl-learner/org/dllearner/core/owl/InverseObjectPropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/InverseObjectPropertyAxiom.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/InverseObjectPropertyAxiom.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -4,6 +4,10 @@ public class InverseObjectPropertyAxiom extends PropertyAxiom { + /** + * + */ + private static final long serialVersionUID = 6402501966040365366L; private ObjectProperty inverseRole; private ObjectProperty role; Modified: trunk/src/dl-learner/org/dllearner/core/owl/KB.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/KB.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/KB.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -19,6 +19,10 @@ public class KB implements KBElement { + /** + * + */ + private static final long serialVersionUID = -1114373618440145279L; // private Set<Axiom> axioms = new HashSet<Axiom>(); private Set<AssertionalAxiom> abox = new HashSet<AssertionalAxiom>(); private Set<TerminologicalAxiom> tbox = new HashSet<TerminologicalAxiom>(); Modified: trunk/src/dl-learner/org/dllearner/core/owl/KBElement.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/KBElement.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/KBElement.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -1,5 +1,6 @@ package org.dllearner.core.owl; +import java.io.Serializable; import java.util.Map; /** @@ -8,7 +9,7 @@ * @author Jens Lehmann * */ -public interface KBElement { +public interface KBElement extends Serializable{ /** * Gets the length of this knowledge base element. For instance, Modified: trunk/src/dl-learner/org/dllearner/core/owl/LabelAnnotation.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/LabelAnnotation.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/LabelAnnotation.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -27,6 +27,11 @@ */ public class LabelAnnotation extends ConstantAnnotation { + /** + * + */ + private static final long serialVersionUID = -2217233341939580997L; + public LabelAnnotation(URI annotationURI, Constant annotationValue) { super(annotationURI, annotationValue); } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -30,6 +30,10 @@ */ public class ObjectPropertyAssertion extends PropertyAssertion { + /** + * + */ + private static final long serialVersionUID = -7546114914807945292L; private ObjectProperty role; private Individual individual1; private Individual individual2; Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyDomainAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyDomainAxiom.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyDomainAxiom.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -27,6 +27,11 @@ */ public class ObjectPropertyDomainAxiom extends PropertyDomainAxiom { + /** + * + */ + private static final long serialVersionUID = 5667601806790834821L; + public ObjectPropertyDomainAxiom(ObjectProperty property, Description domain) { super(property, domain); } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyRangeAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyRangeAxiom.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyRangeAxiom.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -28,6 +28,11 @@ public class ObjectPropertyRangeAxiom extends PropertyRangeAxiom { + /** + * + */ + private static final long serialVersionUID = 4076807871628918900L; + public ObjectPropertyRangeAxiom(ObjectProperty property, Description range) { super(property, range); } Modified: trunk/src/dl-learner/org/dllearner/core/owl/PropertyAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/PropertyAssertion.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/PropertyAssertion.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -25,4 +25,9 @@ */ public abstract class PropertyAssertion extends AssertionalAxiom { + /** + * + */ + private static final long serialVersionUID = -150218033647420267L; + } Modified: trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiom.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiom.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -1,5 +1,10 @@ package org.dllearner.core.owl; public abstract class PropertyAxiom extends Axiom { + + /** + * + */ + private static final long serialVersionUID = 6412979010418769156L; } Modified: trunk/src/dl-learner/org/dllearner/core/owl/PropertyDomainAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/PropertyDomainAxiom.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/PropertyDomainAxiom.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -27,6 +27,10 @@ */ public abstract class PropertyDomainAxiom extends PropertyAxiom { + /** + * + */ + private static final long serialVersionUID = -3075192895197509256L; Description domain; Property property; Modified: trunk/src/dl-learner/org/dllearner/core/owl/PropertyRangeAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/PropertyRangeAxiom.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/PropertyRangeAxiom.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -25,6 +25,10 @@ */ public abstract class PropertyRangeAxiom extends PropertyAxiom { + /** + * + */ + private static final long serialVersionUID = 3438094891570651204L; Property property; PropertyRange range; Modified: trunk/src/dl-learner/org/dllearner/core/owl/SubClassAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/SubClassAxiom.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/SubClassAxiom.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -4,6 +4,10 @@ public class SubClassAxiom extends TerminologicalAxiom { + /** + * + */ + private static final long serialVersionUID = -5059709557246520213L; private Description subConcept; private Description superConcept; Modified: trunk/src/dl-learner/org/dllearner/core/owl/SubObjectPropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/SubObjectPropertyAxiom.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/SubObjectPropertyAxiom.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -4,6 +4,10 @@ public class SubObjectPropertyAxiom extends PropertyAxiom { + /** + * + */ + private static final long serialVersionUID = -1085651734702155330L; private ObjectProperty role; private ObjectProperty subRole; Modified: trunk/src/dl-learner/org/dllearner/core/owl/SymmetricObjectPropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/SymmetricObjectPropertyAxiom.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/SymmetricObjectPropertyAxiom.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -4,6 +4,10 @@ public class SymmetricObjectPropertyAxiom extends PropertyAxiom { + /** + * + */ + private static final long serialVersionUID = 8698680348695324368L; private ObjectProperty role; public SymmetricObjectPropertyAxiom(ObjectProperty role) { Modified: trunk/src/dl-learner/org/dllearner/core/owl/TerminologicalAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/TerminologicalAxiom.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/TerminologicalAxiom.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -1,5 +1,10 @@ package org.dllearner.core.owl; public abstract class TerminologicalAxiom extends Axiom { + + /** + * + */ + private static final long serialVersionUID = 4685685915631672353L; } Modified: trunk/src/dl-learner/org/dllearner/core/owl/TransitiveObjectPropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/TransitiveObjectPropertyAxiom.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/TransitiveObjectPropertyAxiom.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -4,6 +4,10 @@ public class TransitiveObjectPropertyAxiom extends PropertyAxiom { + /** + * + */ + private static final long serialVersionUID = -3877477886974844568L; private ObjectPropertyExpression role; public TransitiveObjectPropertyAxiom(ObjectPropertyExpression role) { Modified: trunk/src/dl-learner/org/dllearner/core/owl/TypedConstant.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/TypedConstant.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/TypedConstant.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -29,6 +29,10 @@ */ public class TypedConstant extends Constant implements Comparable<TypedConstant> { + /** + * + */ + private static final long serialVersionUID = -9135242138291085300L; private Datatype datatype; public TypedConstant(String literal, Datatype datatype) { Modified: trunk/src/dl-learner/org/dllearner/core/owl/UntypedConstant.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/UntypedConstant.java 2009-12-31 11:06:37 UTC (rev 1975) +++ trunk/src/dl-learner/org/dllearner/core/owl/UntypedConstant.java 2009-12-31 11:28:21 UTC (rev 1976) @@ -30,6 +30,10 @@ */ public class UntypedConstant extends Constant { + /** + * + */ + private static final long serialVersionUID = 2569002545544130198L; private String lang; private boolean hasLang = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jen...@us...> - 2010-03-05 10:20:13
|
Revision: 2090 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2090&view=rev Author: jenslehmann Date: 2010-03-05 10:20:06 +0000 (Fri, 05 Mar 2010) Log Message: ----------- fixes for bug #2951205 Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/core/owl/TypedConstant.java trunk/src/dl-learner/org/dllearner/core/owl/UntypedConstant.java Modified: trunk/src/dl-learner/org/dllearner/core/owl/TypedConstant.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/TypedConstant.java 2010-03-05 06:53:39 UTC (rev 2089) +++ trunk/src/dl-learner/org/dllearner/core/owl/TypedConstant.java 2010-03-05 10:20:06 UTC (rev 2090) @@ -65,7 +65,19 @@ */ @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { - return literal; + // implemented according to http://www.w3.org/TR/owl2-manchester-syntax/ + // (not completely clear because "typedLiteral" and "integerLiteral" definitions there overlap, but hopefully correct) + if(datatype.equals(Datatype.INT) || datatype.equals(Datatype.DOUBLE)) { + if(Double.valueOf(literal) >= 0) { + return "+" + literal; + } else { + return "-" + literal; + } + } else if(datatype.equals(Datatype.STRING)) { + return "\"" + literal + "\""; + } else { + return "\"" + literal + "\"^^" + datatype.toManchesterSyntaxString(baseURI, prefixes); + } } /** Modified: trunk/src/dl-learner/org/dllearner/core/owl/UntypedConstant.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/UntypedConstant.java 2010-03-05 06:53:39 UTC (rev 2089) +++ trunk/src/dl-learner/org/dllearner/core/owl/UntypedConstant.java 2010-03-05 10:20:06 UTC (rev 2090) @@ -79,10 +79,10 @@ @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { if(hasLang) - return literal + "@" + lang; + return "\"" + literal + "\"@" + lang; else - return literal; - } + return "\"" + literal + "\""; + } /** * @return the lang This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |