Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[2136] trunk/src/dl-learner/org/dllearner
|
From: <lor...@us...> - 2010-03-24 15:20:20
|
Revision: 2136
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2136&view=rev
Author: lorenz_b
Date: 2010-03-24 15:20:13 +0000 (Wed, 24 Mar 2010)
Log Message:
-----------
Added new OWL construct ObjectOneOf.
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/core/owl/DescriptionVisitor.java
trunk/src/dl-learner/org/dllearner/kb/sparql/NaturalLanguageDescriptionConvertVisitor.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryDescriptionConvertVisitor.java
trunk/src/dl-learner/org/dllearner/utilities/owl/DLLearnerDescriptionConvertVisitor.java
trunk/src/dl-learner/org/dllearner/utilities/owl/OWLAPIConverter.java
trunk/src/dl-learner/org/dllearner/utilities/owl/OWLAPIDescriptionConvertVisitor.java
Added Paths:
-----------
trunk/src/dl-learner/org/dllearner/core/owl/ObjectOneOf.java
Modified: trunk/src/dl-learner/org/dllearner/core/owl/DescriptionVisitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/DescriptionVisitor.java 2010-03-24 14:22:45 UTC (rev 2135)
+++ trunk/src/dl-learner/org/dllearner/core/owl/DescriptionVisitor.java 2010-03-24 15:20:13 UTC (rev 2136)
@@ -51,6 +51,8 @@
public void visit(Union description);
+ public void visit(ObjectOneOf description);
+
public void visit(ObjectMinCardinalityRestriction description);
public void visit(ObjectExactCardinalityRestriction description);
Added: trunk/src/dl-learner/org/dllearner/core/owl/ObjectOneOf.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/owl/ObjectOneOf.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectOneOf.java 2010-03-24 15:20:13 UTC (rev 2136)
@@ -0,0 +1,92 @@
+package org.dllearner.core.owl;
+
+import java.util.Map;
+import java.util.Set;
+
+public class ObjectOneOf extends Description{
+
+ private static final long serialVersionUID = 5494347630962268139L;
+
+ private Set<Individual> individuals;
+
+
+ public ObjectOneOf(Set<Individual> individuals){
+ this.individuals = individuals;
+ }
+
+ public Set<Individual> getIndividuals(){
+ return individuals;
+ }
+
+ @Override
+ public void accept(DescriptionVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ @Override
+ public int getArity() {
+ return 0;
+ }
+
+ @Override
+ public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) {
+ StringBuffer sb = new StringBuffer();
+ int count = 1;
+ sb.append("{");
+ for(Individual ind : individuals){
+ sb.append(ind.toString(baseURI, prefixes));
+ if(count < individuals.size()){
+ sb.append(",");
+ count++;
+ }
+ }
+ sb.append("}");
+
+ return sb.toString();
+ }
+
+ @Override
+ public void accept(KBElementVisitor visitor) {
+ visitor.visit(this);
+ }
+
+ @Override
+ public int getLength() {
+ return 1;
+ }
+
+ @Override
+ public String toKBSyntaxString(String baseURI, Map<String, String> prefixes) {
+ StringBuffer sb = new StringBuffer();
+ int count = 1;
+ sb.append("{");
+ for(Individual ind : individuals){
+ sb.append(ind.toKBSyntaxString(baseURI, prefixes));
+ if(count < individuals.size()){
+ sb.append(",");
+ count++;
+ }
+ }
+ sb.append("}");
+
+ return sb.toString();
+ }
+
+ @Override
+ public String toString(String baseURI, Map<String, String> prefixes) {
+ StringBuffer sb = new StringBuffer();
+ int count = 1;
+ sb.append("{");
+ for(Individual ind : individuals){
+ sb.append(ind.toString(baseURI, prefixes));
+ if(count < individuals.size()){
+ sb.append(", ");
+ count++;
+ }
+ }
+ sb.append("}");
+
+ return sb.toString();
+ }
+
+}
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/NaturalLanguageDescriptionConvertVisitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/NaturalLanguageDescriptionConvertVisitor.java 2010-03-24 14:22:45 UTC (rev 2135)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/NaturalLanguageDescriptionConvertVisitor.java 2010-03-24 15:20:13 UTC (rev 2136)
@@ -24,6 +24,7 @@
import org.dllearner.core.owl.ObjectExactCardinalityRestriction;
import org.dllearner.core.owl.ObjectMaxCardinalityRestriction;
import org.dllearner.core.owl.ObjectMinCardinalityRestriction;
+import org.dllearner.core.owl.ObjectOneOf;
import org.dllearner.core.owl.ObjectProperty;
import org.dllearner.core.owl.ObjectSomeRestriction;
import org.dllearner.core.owl.ObjectValueRestriction;
@@ -344,4 +345,12 @@
public void visit(DatatypeSomeRestriction description) {
logger.trace("DatatypeSomeRestriction");
}
+
+ /* (non-Javadoc)
+ * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.ObjectOneOf)
+ */
+ @Override
+ public void visit(ObjectOneOf description) {
+ logger.trace("ObjectOneOf");
+ }
}
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryDescriptionConvertVisitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryDescriptionConvertVisitor.java 2010-03-24 14:22:45 UTC (rev 2135)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlQueryDescriptionConvertVisitor.java 2010-03-24 15:20:13 UTC (rev 2136)
@@ -50,6 +50,7 @@
import org.dllearner.core.owl.ObjectExactCardinalityRestriction;
import org.dllearner.core.owl.ObjectMaxCardinalityRestriction;
import org.dllearner.core.owl.ObjectMinCardinalityRestriction;
+import org.dllearner.core.owl.ObjectOneOf;
import org.dllearner.core.owl.ObjectProperty;
import org.dllearner.core.owl.ObjectSomeRestriction;
import org.dllearner.core.owl.ObjectValueRestriction;
@@ -625,6 +626,12 @@
logger.trace("DatatypeSomeRestriction");
}
+ @Override
+ public void visit(ObjectOneOf description) {
+ logger.trace("ObjectOneOf");
+
+ }
+
}
Modified: trunk/src/dl-learner/org/dllearner/utilities/owl/DLLearnerDescriptionConvertVisitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/owl/DLLearnerDescriptionConvertVisitor.java 2010-03-24 14:22:45 UTC (rev 2135)
+++ trunk/src/dl-learner/org/dllearner/utilities/owl/DLLearnerDescriptionConvertVisitor.java 2010-03-24 15:20:13 UTC (rev 2136)
@@ -19,6 +19,7 @@
import org.dllearner.core.owl.ObjectExactCardinalityRestriction;
import org.dllearner.core.owl.ObjectMaxCardinalityRestriction;
import org.dllearner.core.owl.ObjectMinCardinalityRestriction;
+import org.dllearner.core.owl.ObjectOneOf;
import org.dllearner.core.owl.ObjectProperty;
import org.dllearner.core.owl.ObjectPropertyExpression;
import org.dllearner.core.owl.ObjectSomeRestriction;
@@ -163,8 +164,7 @@
@Override
public void visit(OWLObjectOneOf description) {
- // TODO Auto-generated method stub
-
+ stack.push(new ObjectOneOf(OWLAPIConverter.convertIndividuals(description.getIndividuals())));
}
@Override
Modified: trunk/src/dl-learner/org/dllearner/utilities/owl/OWLAPIConverter.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/owl/OWLAPIConverter.java 2010-03-24 14:22:45 UTC (rev 2135)
+++ trunk/src/dl-learner/org/dllearner/utilities/owl/OWLAPIConverter.java 2010-03-24 15:20:13 UTC (rev 2136)
@@ -88,6 +88,14 @@
return staticFactory.getOWLIndividual(URI.create(individual.getName()));
}
+ public static Set<OWLIndividual> getOWLAPIIndividuals(Set<Individual> individuals) {
+ Set<OWLIndividual> inds = new TreeSet<OWLIndividual>();
+ for(Individual individual : individuals) {
+ inds.add(getOWLAPIIndividual(individual));
+ }
+ return inds;
+ }
+
public static OWLObjectProperty getOWLAPIObjectProperty(ObjectProperty role) {
return staticFactory.getOWLObjectProperty(URI.create(role.getName()));
}
Modified: trunk/src/dl-learner/org/dllearner/utilities/owl/OWLAPIDescriptionConvertVisitor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/owl/OWLAPIDescriptionConvertVisitor.java 2010-03-24 14:22:45 UTC (rev 2135)
+++ trunk/src/dl-learner/org/dllearner/utilities/owl/OWLAPIDescriptionConvertVisitor.java 2010-03-24 15:20:13 UTC (rev 2136)
@@ -44,6 +44,7 @@
import org.dllearner.core.owl.ObjectExactCardinalityRestriction;
import org.dllearner.core.owl.ObjectMaxCardinalityRestriction;
import org.dllearner.core.owl.ObjectMinCardinalityRestriction;
+import org.dllearner.core.owl.ObjectOneOf;
import org.dllearner.core.owl.ObjectProperty;
import org.dllearner.core.owl.ObjectSomeRestriction;
import org.dllearner.core.owl.ObjectValueRestriction;
@@ -360,4 +361,10 @@
}
return owlConstant;
}
+
+ @Override
+ public void visit(ObjectOneOf description) {
+ stack.push(factory.getOWLObjectOneOf(OWLAPIConverter.getOWLAPIIndividuals(description.getIndividuals())));
+
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
