Maybe fixed bug in internalisation.

2 files changed, 18 insertions, 4 deletions

diff --git a/src/uk/ac/ox/cs/pagoda/query/QueryRecord.java b/src/uk/ac/ox/cs/pagoda/query/QueryRecord.java
index 5878a57..291af27 100644
--- a/src/uk/ac/ox/cs/pagoda/query/QueryRecord.java
+++ b/src/uk/ac/ox/cs/pagoda/query/QueryRecord.java
@@ -188,6 +188,10 @@ public class QueryRecord extends Disposable {
         return new AnswerTuplesImp(answerVariables[0], gapAnswerTuples);
     }
 
+    public int getGapAnswersCount() {
+        return gapAnswerTuples.size();
+    }
+
     public String toString() {
         if(isDisposed()) throw new DisposedException();
 
diff --git a/src/uk/ac/ox/cs/pagoda/query/rollup/QueryGraph.java b/src/uk/ac/ox/cs/pagoda/query/rollup/QueryGraph.java
index a567699..01336ba 100644
--- a/src/uk/ac/ox/cs/pagoda/query/rollup/QueryGraph.java
+++ b/src/uk/ac/ox/cs/pagoda/query/rollup/QueryGraph.java
@@ -88,10 +88,20 @@ public class QueryGraph {
                 Visitor visitor = new Visitor(factory, assignment);
                 Set<OWLAxiom> axioms = getPropertyAssertions(assignment);
                 for(Map.Entry<Term, Set<OWLClassExpression>> entry : concepts.map.entrySet()) {
-                        if(existVars.contains(entry.getKey())) continue;
-                        sub = factory.getOWLNamedIndividual(IRI.create(getIndividual(entry.getKey(), assignment).getIRI()));
-                        for(OWLClassExpression clsExp : entry.getValue()) {
-                                axioms.add(factory.getOWLClassAssertionAxiom(clsExp.accept(visitor), sub));
+                        // TODO check correctness!!!
+                        if(existVars.contains(entry.getKey())) {
+                                OWLClassExpression conjunction =
+                                                factory.getOWLObjectIntersectionOf(factory.getOWLThing());
+                                for(OWLClassExpression owlClassExpression : entry.getValue()) {
+                                        conjunction = factory.getOWLObjectIntersectionOf(conjunction, owlClassExpression.accept(visitor));
+                                }
+                                axioms.add(factory.getOWLSubClassOfAxiom(conjunction, factory.getOWLNothing()));
+                        }
+                        else {
+                                sub = factory.getOWLNamedIndividual(IRI.create(getIndividual(entry.getKey(), assignment).getIRI()));
+                                for(OWLClassExpression clsExp : entry.getValue()) {
+                                        axioms.add(factory.getOWLClassAssertionAxiom(clsExp.accept(visitor), sub));
+                                }
                         }
                 }
                 return axioms;