From: <jen...@us...> - 2008-02-24 16:28:42
|
Revision: 634 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=634&view=rev Author: jenslehmann Date: 2008-02-24 08:27:53 -0800 (Sun, 24 Feb 2008) Log Message: ----------- aligned core OWL structures closer to OWL 1.1 structure spec Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/core/owl/CardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeCardinalityRestriction.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/DatatypeQuantorRestriction.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/ObjectAllRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyExpression.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectQuantorRestriction.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/Property.java trunk/src/dl-learner/org/dllearner/core/owl/PropertyExpression.java trunk/src/dl-learner/org/dllearner/core/owl/QuantorRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/Restriction.java trunk/src/dl-learner/org/dllearner/core/owl/ValueRestriction.java trunk/src/dl-learner/org/dllearner/utilities/RoleComparator.java Modified: trunk/src/dl-learner/org/dllearner/core/owl/CardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/CardinalityRestriction.java 2008-02-24 08:45:08 UTC (rev 633) +++ trunk/src/dl-learner/org/dllearner/core/owl/CardinalityRestriction.java 2008-02-24 16:27:53 UTC (rev 634) @@ -25,4 +25,27 @@ */ public abstract class CardinalityRestriction extends Restriction { + int cardinality; + PropertyRange propertyRange; + + public CardinalityRestriction(PropertyExpression propertyExpression, PropertyRange propertyRange, int cardinality) { + super(propertyExpression); + this.propertyRange = propertyRange; + this.cardinality = cardinality; + } + + /** + * @return the cardinality + */ + public int getCardinality() { + return cardinality; + } + + /** + * @return the propertyRange + */ + public PropertyRange getPropertyRange() { + return propertyRange; + } + } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeCardinalityRestriction.java 2008-02-24 08:45:08 UTC (rev 633) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeCardinalityRestriction.java 2008-02-24 16:27:53 UTC (rev 634) @@ -25,4 +25,9 @@ */ public abstract class DatatypeCardinalityRestriction extends CardinalityRestriction { + public DatatypeCardinalityRestriction(DatatypeProperty datatypeProperty, + DataRange dataRange, int cardinality) { + super(datatypeProperty, dataRange, cardinality); + } + } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeExactCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeExactCardinalityRestriction.java 2008-02-24 08:45:08 UTC (rev 633) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeExactCardinalityRestriction.java 2008-02-24 16:27:53 UTC (rev 634) @@ -27,6 +27,17 @@ */ public class DatatypeExactCardinalityRestriction extends DatatypeCardinalityRestriction { + /** + * @param datatypeProperty + * @param dataRange + * @param cardinality + */ + public DatatypeExactCardinalityRestriction(DatatypeProperty datatypeProperty, + DataRange dataRange, int cardinality) { + super(datatypeProperty, dataRange, cardinality); + // TODO Auto-generated constructor stub + } + /* (non-Javadoc) * @see org.dllearner.core.owl.Concept#getArity() */ Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMaxCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMaxCardinalityRestriction.java 2008-02-24 08:45:08 UTC (rev 633) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMaxCardinalityRestriction.java 2008-02-24 16:27:53 UTC (rev 634) @@ -27,6 +27,17 @@ */ public class DatatypeMaxCardinalityRestriction extends DatatypeCardinalityRestriction { + /** + * @param datatypeProperty + * @param dataRange + * @param cardinality + */ + public DatatypeMaxCardinalityRestriction(DatatypeProperty datatypeProperty, + DataRange dataRange, int cardinality) { + super(datatypeProperty, dataRange, cardinality); + // TODO Auto-generated constructor stub + } + /* (non-Javadoc) * @see org.dllearner.core.owl.Concept#getArity() */ Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMinCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMinCardinalityRestriction.java 2008-02-24 08:45:08 UTC (rev 633) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMinCardinalityRestriction.java 2008-02-24 16:27:53 UTC (rev 634) @@ -27,6 +27,17 @@ */ public class DatatypeMinCardinalityRestriction extends DatatypeCardinalityRestriction { + /** + * @param datatypeProperty + * @param dataRange + * @param cardinality + */ + public DatatypeMinCardinalityRestriction(DatatypeProperty datatypeProperty, + DataRange dataRange, int cardinality) { + super(datatypeProperty, dataRange, cardinality); + // TODO Auto-generated constructor stub + } + /* (non-Javadoc) * @see org.dllearner.core.owl.Concept#getArity() */ Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java 2008-02-24 08:45:08 UTC (rev 633) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java 2008-02-24 16:27:53 UTC (rev 634) @@ -27,7 +27,7 @@ * @author Jens Lehmann * */ -public class DatatypeProperty extends PropertyExpression implements Property, NamedKBElement { +public class DatatypeProperty implements Property, NamedKBElement { protected String name; Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeQuantorRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeQuantorRestriction.java 2008-02-24 08:45:08 UTC (rev 633) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeQuantorRestriction.java 2008-02-24 16:27:53 UTC (rev 634) @@ -25,4 +25,11 @@ */ public abstract class DatatypeQuantorRestriction extends QuantorRestriction { + /** + * @param propertyExpression + */ + public DatatypeQuantorRestriction(DatatypeProperty datatypeProperty) { + super(datatypeProperty); + } + } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeSomeRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeSomeRestriction.java 2008-02-24 08:45:08 UTC (rev 633) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeSomeRestriction.java 2008-02-24 16:27:53 UTC (rev 634) @@ -32,8 +32,13 @@ */ public class DatatypeSomeRestriction extends DatatypeQuantorRestriction { + /** + * @param datatypeProperty + */ + public DatatypeSomeRestriction(DatatypeProperty datatypeProperty) { + super(datatypeProperty); + } - /* (non-Javadoc) * @see org.dllearner.core.owl.Description#getArity() */ Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java 2008-02-24 08:45:08 UTC (rev 633) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java 2008-02-24 16:27:53 UTC (rev 634) @@ -31,26 +31,53 @@ */ public class DatatypeValueRestriction extends ValueRestriction { -// public DatatypeValueRestriction(DatatypeProperty) + public DatatypeValueRestriction(DatatypeProperty restrictedPropertyExpression, Constant value) { + super(restrictedPropertyExpression, value); + } /* (non-Javadoc) - * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) + * @see org.dllearner.core.owl.Description#toManchesterSyntaxString() */ @Override - public void accept(DescriptionVisitor visitor) { - visitor.visit(this); - } - - public void accept(KBElementVisitor visitor) { - visitor.visit(this); + public String toManchesterSyntaxString(String baseURI, Map<String,String> prefixes) { + // TODO Auto-generated method stub + return null; } /* (non-Javadoc) - * @see org.dllearner.core.owl.Description#toManchesterSyntaxString() + * @see org.dllearner.core.owl.Description#getArity() */ @Override - public String toManchesterSyntaxString(String baseURI, Map<String,String> prefixes) { + public int getArity() { // TODO Auto-generated method stub - return null; + return 0; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#getLength() + */ + public int getLength() { + return 1 + restrictedPropertyExpression.getLength() + value.getLength(); + } + + /* (non-Javadoc) + * @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); + } + + @Override + public Constant getValue() { + return (Constant) value; } + + @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/ObjectAllRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectAllRestriction.java 2008-02-24 08:45:08 UTC (rev 633) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectAllRestriction.java 2008-02-24 16:27:53 UTC (rev 634) @@ -35,12 +35,12 @@ } public String toString(String baseURI, Map<String,String> prefixes) { - return "ALL " + role + "." + children.get(0).toString(baseURI, prefixes); + return "ALL " + restrictedPropertyExpression.toString(baseURI, prefixes) + "." + children.get(0).toString(baseURI, prefixes); } @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { - return role.toString(baseURI, prefixes) + " some " + children.get(0).toManchesterSyntaxString(baseURI, prefixes); + return restrictedPropertyExpression.toString(baseURI, prefixes) + " some " + children.get(0).toManchesterSyntaxString(baseURI, prefixes); } /* (non-Javadoc) Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectCardinalityRestriction.java 2008-02-24 08:45:08 UTC (rev 633) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectCardinalityRestriction.java 2008-02-24 16:27:53 UTC (rev 634) @@ -6,6 +6,7 @@ protected int number; public ObjectCardinalityRestriction(int number, ObjectPropertyExpression role, Description c) { + super(role, c, number); addChild(c); this.role = role; this.number = number; Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyExpression.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyExpression.java 2008-02-24 08:45:08 UTC (rev 633) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyExpression.java 2008-02-24 16:27:53 UTC (rev 634) @@ -27,7 +27,7 @@ * @author Jens Lehmann * */ -public abstract class ObjectPropertyExpression extends PropertyExpression implements KBElement { +public abstract class ObjectPropertyExpression implements PropertyExpression { protected String name; Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectQuantorRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectQuantorRestriction.java 2008-02-24 08:45:08 UTC (rev 633) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectQuantorRestriction.java 2008-02-24 16:27:53 UTC (rev 634) @@ -1,20 +1,42 @@ +/** + * 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; +/** + * + * @author Jens Lehmann + * + */ public abstract class ObjectQuantorRestriction extends QuantorRestriction { - ObjectPropertyExpression role; - public ObjectQuantorRestriction(ObjectPropertyExpression role, Description c) { - this.role = role; + super(role); addChild(c); } public ObjectPropertyExpression getRole() { - return role; + return (ObjectPropertyExpression) restrictedPropertyExpression; } public int getLength() { - return 1 + role.getLength() + getChild(0).getLength(); + return 1 + restrictedPropertyExpression.getLength() + getChild(0).getLength(); } @Override Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectSomeRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectSomeRestriction.java 2008-02-24 08:45:08 UTC (rev 633) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectSomeRestriction.java 2008-02-24 16:27:53 UTC (rev 634) @@ -34,12 +34,12 @@ } public String toString(String baseURI, Map<String,String> prefixes) { - return "EXISTS " + role.toString(baseURI, prefixes) + "." + children.get(0).toString(baseURI, prefixes); + return "EXISTS " + restrictedPropertyExpression.toString(baseURI, prefixes) + "." + children.get(0).toString(baseURI, prefixes); } @Override public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { - return role.toString(baseURI, prefixes) + " only " + children.get(0).toManchesterSyntaxString(baseURI, prefixes); + return restrictedPropertyExpression.toString(baseURI, prefixes) + " only " + children.get(0).toManchesterSyntaxString(baseURI, prefixes); } /* (non-Javadoc) Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectValueRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectValueRestriction.java 2008-02-24 08:45:08 UTC (rev 633) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectValueRestriction.java 2008-02-24 16:27:53 UTC (rev 634) @@ -30,16 +30,11 @@ */ public class ObjectValueRestriction extends ValueRestriction { - /* (non-Javadoc) - * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) + /** + * @param property */ - @Override - public void accept(DescriptionVisitor visitor) { - visitor.visit(this); - } - - public void accept(KBElementVisitor visitor) { - visitor.visit(this); + public ObjectValueRestriction(Property property, Individual value) { + super(property, value); } /* (non-Javadoc) @@ -49,5 +44,43 @@ public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) { // TODO Auto-generated method stub return null; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.Description#getArity() + */ + @Override + public int getArity() { + // TODO Auto-generated method stub + return 0; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#getLength() + */ + public int getLength() { + // TODO Auto-generated method stub + return 0; + } + + /* (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 Individual getIndividual() { + return (Individual) value; + } + + @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/Property.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Property.java 2008-02-24 08:45:08 UTC (rev 633) +++ trunk/src/dl-learner/org/dllearner/core/owl/Property.java 2008-02-24 16:27:53 UTC (rev 634) @@ -23,6 +23,6 @@ * @author Jens Lehmann * */ -public interface Property extends NamedKBElement { +public interface Property extends PropertyExpression, NamedKBElement { } Modified: trunk/src/dl-learner/org/dllearner/core/owl/PropertyExpression.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/PropertyExpression.java 2008-02-24 08:45:08 UTC (rev 633) +++ trunk/src/dl-learner/org/dllearner/core/owl/PropertyExpression.java 2008-02-24 16:27:53 UTC (rev 634) @@ -23,6 +23,6 @@ * @author Jens Lehmann * */ -public abstract class PropertyExpression implements KBElement { +public interface PropertyExpression extends KBElement { } Modified: trunk/src/dl-learner/org/dllearner/core/owl/QuantorRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/QuantorRestriction.java 2008-02-24 08:45:08 UTC (rev 633) +++ trunk/src/dl-learner/org/dllearner/core/owl/QuantorRestriction.java 2008-02-24 16:27:53 UTC (rev 634) @@ -25,4 +25,8 @@ */ public abstract class QuantorRestriction extends Restriction { + public QuantorRestriction(PropertyExpression restrictedPropertyExpression) { + super(restrictedPropertyExpression); + } + } Modified: trunk/src/dl-learner/org/dllearner/core/owl/Restriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Restriction.java 2008-02-24 08:45:08 UTC (rev 633) +++ trunk/src/dl-learner/org/dllearner/core/owl/Restriction.java 2008-02-24 16:27:53 UTC (rev 634) @@ -20,10 +20,21 @@ package org.dllearner.core.owl; /** + * A restriction always acts along a property expression. + * * @author Jens Lehmann * */ public abstract class Restriction extends Description { + + PropertyExpression restrictedPropertyExpression; + + public Restriction(PropertyExpression restrictedPropertyExpression) { + this.restrictedPropertyExpression = restrictedPropertyExpression; + } - + public PropertyExpression getRestrictedPropertyExpression() { + return restrictedPropertyExpression; + } + } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ValueRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ValueRestriction.java 2008-02-24 08:45:08 UTC (rev 633) +++ trunk/src/dl-learner/org/dllearner/core/owl/ValueRestriction.java 2008-02-24 16:27:53 UTC (rev 634) @@ -19,37 +19,22 @@ */ package org.dllearner.core.owl; -import java.util.Map; - /** + * + * * @author Jens Lehmann * */ -public abstract class ValueRestriction extends Description { +public abstract class ValueRestriction extends Restriction { - /* (non-Javadoc) - * @see org.dllearner.core.owl.Concept#getArity() - */ - @Override - public int getArity() { - // TODO Auto-generated method stub - return 0; + KBElement value; + + public ValueRestriction(PropertyExpression propertyExpression, KBElement value) { + super(propertyExpression); } - /* (non-Javadoc) - * @see org.dllearner.core.owl.KBElement#getLength() - */ - public int getLength() { - // TODO Auto-generated method stub - return 0; + public KBElement getValue() { + return value; } - - /* (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; - } - + } Modified: trunk/src/dl-learner/org/dllearner/utilities/RoleComparator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/utilities/RoleComparator.java 2008-02-24 08:45:08 UTC (rev 633) +++ trunk/src/dl-learner/org/dllearner/utilities/RoleComparator.java 2008-02-24 16:27:53 UTC (rev 634) @@ -1,3 +1,22 @@ +/** + * 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.utilities; import java.util.Comparator; @@ -5,6 +24,12 @@ import org.dllearner.core.owl.ObjectProperty; import org.dllearner.core.owl.ObjectPropertyExpression; +/** + * Compares two object properties. + * + * @author Jens Lehmann + * + */ public class RoleComparator implements Comparator<ObjectPropertyExpression> { public int compare(ObjectPropertyExpression r1, ObjectPropertyExpression r2) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |