From 4f98cb7df7f2921808d825cdcd82f95a0899640e Mon Sep 17 00:00:00 2001 From: yujiao Date: Mon, 25 May 2015 22:07:14 -0700 Subject: fixed a bug in the process of generating gap tuples, see test in TestGapMappedToLower.java --- src/uk/ac/ox/cs/pagoda/tracking/TrackingRuleEncoderWithGap.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/uk/ac/ox/cs/pagoda/tracking/TrackingRuleEncoderWithGap.java') diff --git a/src/uk/ac/ox/cs/pagoda/tracking/TrackingRuleEncoderWithGap.java b/src/uk/ac/ox/cs/pagoda/tracking/TrackingRuleEncoderWithGap.java index 555f0af..99028ca 100644 --- a/src/uk/ac/ox/cs/pagoda/tracking/TrackingRuleEncoderWithGap.java +++ b/src/uk/ac/ox/cs/pagoda/tracking/TrackingRuleEncoderWithGap.java @@ -1,6 +1,7 @@ package uk.ac.ox.cs.pagoda.tracking; import java.util.Collection; +import java.util.HashSet; import java.util.LinkedList; import java.util.Set; @@ -37,7 +38,8 @@ public class TrackingRuleEncoderWithGap extends TrackingRuleEncoder { AtomicRole trackingSameAs = AtomicRole.create(Namespace.EQUALITY + "_tn"); OWLOntology onto = program.getOntology(); Atom[] headAtom = new Atom[] {Atom.create(trackingSameAs, X, X)}, bodyAtom; - for (OWLClass cls: onto.getClassesInSignature(true)) { + for (OWLOntology o: onto.getImportsClosure()) + for (OWLClass cls: o.getClassesInSignature()) { String clsIRI = cls.getIRI().toString(); unaryPredicates.add(clsIRI); bodyAtom = new Atom[] { @@ -47,7 +49,10 @@ public class TrackingRuleEncoderWithGap extends TrackingRuleEncoder { } Variable Y = Variable.create("Y"); - Set setOfProperties = onto.getObjectPropertiesInSignature(true); + Set setOfProperties = new HashSet(); + for (OWLOntology o: onto.getImportsClosure()) + for (OWLObjectProperty prop: o.getObjectPropertiesInSignature()) + setOfProperties.add(prop); setOfProperties.add(onto.getOWLOntologyManager().getOWLDataFactory().getOWLObjectProperty(IRI.create(Namespace.INEQUALITY))); for (OWLObjectProperty prop: setOfProperties) { String propIRI = prop.getIRI().toString(); -- cgit v1.2.3