aboutsummaryrefslogtreecommitdiff
path: root/src/uk/ac/ox/cs/pagoda
diff options
context:
space:
mode:
authoryzhou <yzhou@krr-linux.cs.ox.ac.uk>2015-05-22 05:17:31 +0100
committeryzhou <yzhou@krr-linux.cs.ox.ac.uk>2015-05-22 05:17:31 +0100
commite02ad77cefc3005e36ae48fe47bf7914007f094a (patch)
treeeaac6a47dda706e45ef74da98dc7be65e61061a5 /src/uk/ac/ox/cs/pagoda
parent58e6d87cb604702e7b307bad73c4fd42a694c3ec (diff)
downloadACQuA-e02ad77cefc3005e36ae48fe47bf7914007f094a.tar.gz
ACQuA-e02ad77cefc3005e36ae48fe47bf7914007f094a.zip
turned on the LOG switch in Utility
added a tracking rule for inequality in TrackingRuleEncoderWithGap added a testcase in ClauseTester
Diffstat (limited to 'src/uk/ac/ox/cs/pagoda')
-rw-r--r--src/uk/ac/ox/cs/pagoda/tracking/TrackingRuleEncoderWithGap.java8
-rw-r--r--src/uk/ac/ox/cs/pagoda/util/Utility.java2
2 files changed, 7 insertions, 3 deletions
diff --git a/src/uk/ac/ox/cs/pagoda/tracking/TrackingRuleEncoderWithGap.java b/src/uk/ac/ox/cs/pagoda/tracking/TrackingRuleEncoderWithGap.java
index 67d07a8..555f0af 100644
--- a/src/uk/ac/ox/cs/pagoda/tracking/TrackingRuleEncoderWithGap.java
+++ b/src/uk/ac/ox/cs/pagoda/tracking/TrackingRuleEncoderWithGap.java
@@ -2,6 +2,7 @@ package uk.ac.ox.cs.pagoda.tracking;
2 2
3import java.util.Collection; 3import java.util.Collection;
4import java.util.LinkedList; 4import java.util.LinkedList;
5import java.util.Set;
5 6
6import org.semanticweb.HermiT.model.AnnotatedEquality; 7import org.semanticweb.HermiT.model.AnnotatedEquality;
7import org.semanticweb.HermiT.model.Atom; 8import org.semanticweb.HermiT.model.Atom;
@@ -10,6 +11,7 @@ import org.semanticweb.HermiT.model.AtomicRole;
10import org.semanticweb.HermiT.model.DLClause; 11import org.semanticweb.HermiT.model.DLClause;
11import org.semanticweb.HermiT.model.Equality; 12import org.semanticweb.HermiT.model.Equality;
12import org.semanticweb.HermiT.model.Variable; 13import org.semanticweb.HermiT.model.Variable;
14import org.semanticweb.owlapi.model.IRI;
13import org.semanticweb.owlapi.model.OWLClass; 15import org.semanticweb.owlapi.model.OWLClass;
14import org.semanticweb.owlapi.model.OWLObjectProperty; 16import org.semanticweb.owlapi.model.OWLObjectProperty;
15import org.semanticweb.owlapi.model.OWLOntology; 17import org.semanticweb.owlapi.model.OWLOntology;
@@ -44,8 +46,10 @@ public class TrackingRuleEncoderWithGap extends TrackingRuleEncoder {
44 equalityRelatedClauses.add(DLClause.create(headAtom, bodyAtom)); 46 equalityRelatedClauses.add(DLClause.create(headAtom, bodyAtom));
45 } 47 }
46 48
47 Variable Y = Variable.create("Y"); 49 Variable Y = Variable.create("Y");
48 for (OWLObjectProperty prop: onto.getObjectPropertiesInSignature(true)) { 50 Set<OWLObjectProperty> setOfProperties = onto.getObjectPropertiesInSignature(true);
51 setOfProperties.add(onto.getOWLOntologyManager().getOWLDataFactory().getOWLObjectProperty(IRI.create(Namespace.INEQUALITY)));
52 for (OWLObjectProperty prop: setOfProperties) {
49 String propIRI = prop.getIRI().toString(); 53 String propIRI = prop.getIRI().toString();
50 binaryPredicates.add(propIRI); 54 binaryPredicates.add(propIRI);
51 AtomicRole trackingRole = AtomicRole.create(propIRI + "_tn"); 55 AtomicRole trackingRole = AtomicRole.create(propIRI + "_tn");
diff --git a/src/uk/ac/ox/cs/pagoda/util/Utility.java b/src/uk/ac/ox/cs/pagoda/util/Utility.java
index cb05de4..0edfac2 100644
--- a/src/uk/ac/ox/cs/pagoda/util/Utility.java
+++ b/src/uk/ac/ox/cs/pagoda/util/Utility.java
@@ -26,7 +26,7 @@ import org.semanticweb.HermiT.model.Atom;
26 26
27public class Utility { 27public class Utility {
28 28
29 private static final Logger LOGS = null; // Logger.getLogger(""); 29 private static final Logger LOGS = Logger.getLogger(""); // null; //
30 30
31 public static final String JAVA_FILE_SEPARATOR = "/"; 31 public static final String JAVA_FILE_SEPARATOR = "/";
32 public static final String FILE_SEPARATOR = System.getProperty("file.separator"); 32 public static final String FILE_SEPARATOR = System.getProperty("file.separator");