aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/uk/ac/ox/cs/pagoda/tracking/TrackingRuleEncoderWithGap.java8
-rw-r--r--src/uk/ac/ox/cs/pagoda/util/Utility.java2
-rw-r--r--test/uk/ac/ox/cs/pagoda/junit/ClauseTester.java25
3 files changed, 32 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");
diff --git a/test/uk/ac/ox/cs/pagoda/junit/ClauseTester.java b/test/uk/ac/ox/cs/pagoda/junit/ClauseTester.java
index d23f186..ff98b3c 100644
--- a/test/uk/ac/ox/cs/pagoda/junit/ClauseTester.java
+++ b/test/uk/ac/ox/cs/pagoda/junit/ClauseTester.java
@@ -8,6 +8,7 @@ import org.semanticweb.HermiT.model.AtomicConcept;
8import org.semanticweb.HermiT.model.AtomicRole; 8import org.semanticweb.HermiT.model.AtomicRole;
9import org.semanticweb.HermiT.model.DLClause; 9import org.semanticweb.HermiT.model.DLClause;
10import org.semanticweb.HermiT.model.Equality; 10import org.semanticweb.HermiT.model.Equality;
11import org.semanticweb.HermiT.model.Individual;
11import org.semanticweb.HermiT.model.Variable; 12import org.semanticweb.HermiT.model.Variable;
12import org.semanticweb.owlapi.apibinding.OWLManager; 13import org.semanticweb.owlapi.apibinding.OWLManager;
13import org.semanticweb.owlapi.model.OWLOntology; 14import org.semanticweb.owlapi.model.OWLOntology;
@@ -17,7 +18,31 @@ import uk.ac.ox.cs.pagoda.approx.Clause;
17import uk.ac.ox.cs.pagoda.approx.Clausifier; 18import uk.ac.ox.cs.pagoda.approx.Clausifier;
18 19
19public class ClauseTester { 20public class ClauseTester {
21
22 public void test_clause(Atom[] headAtoms, Atom[] bodyAtoms) {
23 OWLOntologyManager m = OWLManager.createOWLOntologyManager();
24 OWLOntology emptyOntology = null;
25 try {
26 emptyOntology = m.createOntology();
27 } catch (Exception e) {
28 e.printStackTrace();
29 fail("failed to create a new ontology");
30 }
31 Clause c = new Clause(Clausifier.getInstance(emptyOntology), DLClause.create(headAtoms, bodyAtoms));
32 System.out.println(c.toString());
33 }
20 34
35 @Test
36 public void test_nominal() {
37 Variable x = Variable.create("X");
38 AtomicRole r = AtomicRole.create("r");
39 Individual o = Individual.create("o");
40 Atom[] bodyAtoms = new Atom[] { Atom.create(r, x, o) };
41 AtomicConcept A = AtomicConcept.create("A");
42 Atom[] headAtoms = new Atom[] { Atom.create(A, x) };
43 test_clause(headAtoms, bodyAtoms);
44 }
45
21 @Test 46 @Test
22 public void test_simple() { 47 public void test_simple() {
23 Variable x = Variable.create("X"), y1 = Variable.create("y1"), y2 = Variable.create("y2"); 48 Variable x = Variable.create("X"), y1 = Variable.create("y1"), y2 = Variable.create("y2");