Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[3898] trunk/components-core/src/main/java/org/ dllearner
|
From: <lor...@us...> - 2013-02-11 12:18:12
|
Revision: 3898
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3898&view=rev
Author: lorenz_b
Date: 2013-02-11 12:18:04 +0000 (Mon, 11 Feb 2013)
Log Message:
-----------
Changed datatype URI to IRI to avoid problems with special chars.
Modified Paths:
--------------
trunk/components-core/src/main/java/org/dllearner/core/owl/Datatype.java
trunk/components-core/src/main/java/org/dllearner/core/owl/OWL2Datatype.java
trunk/components-core/src/main/java/org/dllearner/core/owl/TypedConstant.java
trunk/components-core/src/main/java/org/dllearner/reasoning/OWLAPIReasoner.java
trunk/components-core/src/main/java/org/dllearner/reasoning/PelletReasoner.java
trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyOWLAPIReasoner.java
trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIAxiomConvertVisitor.java
trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIConverter.java
trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIDescriptionConvertVisitor.java
Modified: trunk/components-core/src/main/java/org/dllearner/core/owl/Datatype.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/owl/Datatype.java 2013-02-07 14:03:54 UTC (rev 3897)
+++ trunk/components-core/src/main/java/org/dllearner/core/owl/Datatype.java 2013-02-11 12:18:04 UTC (rev 3898)
@@ -19,7 +19,6 @@
package org.dllearner.core.owl;
-import java.net.URI;
import java.util.Map;
import org.semanticweb.owlapi.model.IRI;
@@ -31,19 +30,19 @@
*/
public class Datatype implements DataRange, Comparable<Datatype> {
- private URI uri;
+ private IRI iri;
- public Datatype(String uriString) {
- uri = URI.create(uriString);
+ public Datatype(String iriString) {
+ iri = IRI.create(iriString);
}
- public URI getURI() {
- return uri;
+ public IRI getIRI() {
+ return iri;
}
@Override
public String toString() {
- return uri.toString();
+ return iri.toString();
}
public int getLength() {
@@ -55,11 +54,11 @@
}
public String toString(String baseURI, Map<String, String> prefixes) {
- return uri.toString();
+ return iri.toString();
}
public String toKBSyntaxString(String baseURI, Map<String, String> prefixes) {
- return uri.toString();
+ return iri.toString();
}
/* (non-Javadoc)
@@ -67,14 +66,14 @@
*/
@Override
public String toManchesterSyntaxString(String baseURI, Map<String, String> prefixes) {
- return uri.toString();
+ return iri.toString();
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((uri == null) ? 0 : uri.hashCode());
+ result = prime * result + ((iri == null) ? 0 : iri.hashCode());
return result;
}
@@ -87,16 +86,16 @@
if (getClass() != obj.getClass())
return false;
Datatype other = (Datatype) obj;
- if (uri == null) {
- if (other.uri != null)
+ if (iri == null) {
+ if (other.iri != null)
return false;
- } else if (!uri.equals(other.uri))
+ } else if (!iri.equals(other.iri))
return false;
return true;
}
@Override
public int compareTo(Datatype o) {
- return this.getURI().compareTo(o.getURI());
+ return this.getIRI().compareTo(o.getIRI());
}
}
Modified: trunk/components-core/src/main/java/org/dllearner/core/owl/OWL2Datatype.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/owl/OWL2Datatype.java 2013-02-07 14:03:54 UTC (rev 3897)
+++ trunk/components-core/src/main/java/org/dllearner/core/owl/OWL2Datatype.java 2013-02-11 12:18:04 UTC (rev 3898)
@@ -19,7 +19,7 @@
package org.dllearner.core.owl;
-import java.net.URI;
+import org.semanticweb.owlapi.model.IRI;
public enum OWL2Datatype {
@@ -41,8 +41,8 @@
return datatype;
}
- public URI getURI() {
- return datatype.getURI();
+ public IRI getIRI() {
+ return datatype.getIRI();
}
}
Modified: trunk/components-core/src/main/java/org/dllearner/core/owl/TypedConstant.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/owl/TypedConstant.java 2013-02-07 14:03:54 UTC (rev 3897)
+++ trunk/components-core/src/main/java/org/dllearner/core/owl/TypedConstant.java 2013-02-11 12:18:04 UTC (rev 3898)
@@ -99,7 +99,7 @@
*/
public int compareTo(TypedConstant o) {
// the first criteria is the datatype
- int datatypeComparision = datatype.getURI().compareTo(datatype.getURI());
+ int datatypeComparision = datatype.getIRI().compareTo(datatype.getIRI());
if(datatypeComparision == 0) {
// the second criterion is the literal value
return literal.compareTo(o.literal);
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/OWLAPIReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/OWLAPIReasoner.java 2013-02-07 14:03:54 UTC (rev 3897)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/OWLAPIReasoner.java 2013-02-11 12:18:04 UTC (rev 3898)
@@ -20,7 +20,6 @@
package org.dllearner.reasoning;
import java.io.File;
-import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
@@ -379,19 +378,23 @@
for (OWLDataProperty owlProperty : owlDatatypeProperties) {
DatatypeProperty dtp = new DatatypeProperty(owlProperty.toStringID());
Set<OWLDataRange> ranges = owlProperty.getRanges(allImports);
- Iterator<OWLDataRange> it = ranges.iterator();
- if (it.hasNext()) {
- OWLDataRange range = it.next();
- if (range.isDatatype()) {
- URI uri = ((OWLDatatype) range).getIRI().toURI();
- if (uri.equals(OWL2Datatype.BOOLEAN.getURI())) booleanDatatypeProperties.add(dtp);
- else if (uri.equals(OWL2Datatype.DOUBLE.getURI())) doubleDatatypeProperties.add(dtp);
- else if (uri.equals(OWL2Datatype.INT.getURI())) intDatatypeProperties.add(dtp);
- else if (uri.equals(OWL2Datatype.STRING.getURI())) stringDatatypeProperties.add(dtp);
- }
- } else {
- stringDatatypeProperties.add(dtp);
- }
+ Iterator<OWLDataRange> it = ranges.iterator();
+ if (it.hasNext()) {
+ OWLDataRange range = it.next();
+ if (range.isDatatype()) {
+ IRI iri = ((OWLDatatype) range).getIRI();
+ if (iri.equals(OWL2Datatype.BOOLEAN.getIRI()))
+ booleanDatatypeProperties.add(dtp);
+ else if (iri.equals(OWL2Datatype.DOUBLE.getIRI()))
+ doubleDatatypeProperties.add(dtp);
+ else if (iri.equals(OWL2Datatype.INT.getIRI()))
+ intDatatypeProperties.add(dtp);
+ else if (iri.equals(OWL2Datatype.STRING.getIRI()))
+ stringDatatypeProperties.add(dtp);
+ }
+ } else {
+ stringDatatypeProperties.add(dtp);
+ }
datatypeProperties.add(dtp);
}
for (OWLNamedIndividual owlIndividual : owlIndividuals) {
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/PelletReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/PelletReasoner.java 2013-02-07 14:03:54 UTC (rev 3897)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/PelletReasoner.java 2013-02-11 12:18:04 UTC (rev 3898)
@@ -20,7 +20,6 @@
package org.dllearner.reasoning;
import java.io.File;
-import java.net.URI;
import java.net.URISyntaxException;
import java.util.Collection;
import java.util.Collections;
@@ -255,14 +254,14 @@
if(it.hasNext()) {
OWLDataRange range = it.next();
if(range.isDatatype()) {
- URI uri = ((OWLDatatype)range).getIRI().toURI();
- if(uri.equals(OWL2Datatype.BOOLEAN.getURI()))
+ IRI iri = ((OWLDatatype)range).getIRI();
+ if(iri.equals(OWL2Datatype.BOOLEAN.getIRI()))
booleanDatatypeProperties.add(dtp);
- else if(uri.equals(OWL2Datatype.DOUBLE.getURI()))
+ else if(iri.equals(OWL2Datatype.DOUBLE.getIRI()))
doubleDatatypeProperties.add(dtp);
- else if(uri.equals(OWL2Datatype.INT.getURI()))
+ else if(iri.equals(OWL2Datatype.INT.getIRI()))
intDatatypeProperties.add(dtp);
- else if(uri.equals(OWL2Datatype.STRING.getURI()))
+ else if(iri.equals(OWL2Datatype.STRING.getIRI()))
stringDatatypeProperties.add(dtp);
}
}
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyOWLAPIReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyOWLAPIReasoner.java 2013-02-07 14:03:54 UTC (rev 3897)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyOWLAPIReasoner.java 2013-02-11 12:18:04 UTC (rev 3898)
@@ -21,7 +21,6 @@
import java.io.File;
import java.net.MalformedURLException;
-import java.net.URI;
import java.net.URL;
import java.util.Collection;
import java.util.Collections;
@@ -116,8 +115,6 @@
import org.semanticweb.owlapi.util.SimpleIRIMapper;
import org.semanticweb.owlapi.vocab.PrefixOWLOntologyFormat;
-import uk.ac.manchester.cs.factplusplus.owlapiv3.FaCTPlusPlusReasonerFactory;
-
import com.clarkparsia.pellet.owlapiv3.PelletReasonerFactory;
/**
@@ -385,14 +382,14 @@
if(it.hasNext()) {
OWLDataRange range = it.next();
if(range.isDatatype()) {
- URI uri = ((OWLDatatype)range).getIRI().toURI();
- if(uri.equals(OWL2Datatype.BOOLEAN.getURI()))
+ IRI iri = ((OWLDatatype)range).getIRI();
+ if(iri.equals(OWL2Datatype.BOOLEAN.getIRI()))
booleanDatatypeProperties.add(dtp);
- else if(uri.equals(OWL2Datatype.DOUBLE.getURI()))
+ else if(iri.equals(OWL2Datatype.DOUBLE.getIRI()))
doubleDatatypeProperties.add(dtp);
- else if(uri.equals(OWL2Datatype.INT.getURI()))
+ else if(iri.equals(OWL2Datatype.INT.getIRI()))
intDatatypeProperties.add(dtp);
- else if(uri.equals(OWL2Datatype.STRING.getURI()))
+ else if(iri.equals(OWL2Datatype.STRING.getIRI()))
stringDatatypeProperties.add(dtp);
}
} else {
Modified: trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIAxiomConvertVisitor.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIAxiomConvertVisitor.java 2013-02-07 14:03:54 UTC (rev 3897)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIAxiomConvertVisitor.java 2013-02-11 12:18:04 UTC (rev 3898)
@@ -346,7 +346,7 @@
public void visit(DatatypePropertyRangeAxiom axiom) {
DataRange dr = axiom.getRange();
Datatype dt = (Datatype) dr;
- OWLDatatype odt = factory.getOWLDatatype(IRI.create(dt.getURI()));
+ OWLDatatype odt = factory.getOWLDatatype(dt.getIRI());
OWLDataProperty dp = factory.getOWLDataProperty(IRI.create(axiom.getProperty().getName()));
OWLAxiom axiomOWLAPI = factory.getOWLDataPropertyRangeAxiom(dp, odt);
addAxiom(axiomOWLAPI);
Modified: trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIConverter.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIConverter.java 2013-02-07 14:03:54 UTC (rev 3897)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIConverter.java 2013-02-11 12:18:04 UTC (rev 3898)
@@ -19,7 +19,6 @@
package org.dllearner.utilities.owl;
-import java.net.URI;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -177,20 +176,20 @@
}
public static Datatype convertDatatype(OWLDatatype dataType) {
- URI uri = dataType.getIRI().toURI();
- if(uri.equals(OWL2Datatype.BOOLEAN.getURI()))
+ IRI iri = dataType.getIRI();
+ if(iri.equals(OWL2Datatype.BOOLEAN.getIRI()))
return OWL2Datatype.BOOLEAN.getDatatype();
- else if(uri.equals(OWL2Datatype.DOUBLE.getURI()))
+ else if(iri.equals(OWL2Datatype.DOUBLE.getIRI()))
return OWL2Datatype.DOUBLE.getDatatype();
- else if(uri.equals(OWL2Datatype.INT.getURI()))
+ else if(iri.equals(OWL2Datatype.INT.getIRI()))
return OWL2Datatype.INT.getDatatype();
- else if(uri.equals(OWL2Datatype.INTEGER.getURI()))
+ else if(iri.equals(OWL2Datatype.INTEGER.getIRI()))
return OWL2Datatype.INTEGER.getDatatype();
- else if(uri.equals(OWL2Datatype.STRING.getURI()))
+ else if(iri.equals(OWL2Datatype.STRING.getIRI()))
return OWL2Datatype.STRING.getDatatype();
- else if(uri.equals(OWL2Datatype.DATE.getURI()))
+ else if(iri.equals(OWL2Datatype.DATE.getIRI()))
return OWL2Datatype.DATE.getDatatype();
- else if(uri.equals(OWL2Datatype.DATETIME.getURI()))
+ else if(iri.equals(OWL2Datatype.DATETIME.getIRI()))
return OWL2Datatype.DATETIME.getDatatype();
throw new Error("Unsupported datatype " + dataType + ". Please inform a DL-Learner developer to add it.");
}
Modified: trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIDescriptionConvertVisitor.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIDescriptionConvertVisitor.java 2013-02-07 14:03:54 UTC (rev 3897)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/owl/OWLAPIDescriptionConvertVisitor.java 2013-02-11 12:18:04 UTC (rev 3898)
@@ -340,7 +340,7 @@
else if(datatype.equals(OWL2Datatype.DOUBLE.getDatatype()))
return factory.getDoubleOWLDatatype();
else if(datatype.equals(OWL2Datatype.STRING.getDatatype()))
- return factory.getOWLDatatype(IRI.create(OWL2Datatype.STRING.getURI()));
+ return factory.getOWLDatatype(OWL2Datatype.STRING.getIRI());
throw new Error("OWLAPIDescriptionConverter: datatype "+datatype+" not implemented");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
