Add revised implementation of filtering program

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
index b0b52c7..4243b7b 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
@@ -410,7 +410,7 @@ class RSAOntology(_ontology: File, val datafiles: File*) {
 
   def filteringProgram(query: ConjunctiveQuery): FilteringProgram =
     Logger.timed(
-      FilteringProgram(FilterType.FILTER_NAIVE)(query),
+      FilteringProgram(FilterType.REVISED)(query),
       "Generating filtering program",
       Logger.DEBUG
     )
@@ -491,7 +491,7 @@ class RSAOntology(_ontology: File, val datafiles: File*) {
       //}
 
       val answers = {
-        val ans = RDFoxUtil.buildDescriptionQuery("Ans", query.answer.size)
+        val ans = filter.answerQuery
         RDFoxUtil
           .submitQuery(data, ans, RSA.Prefixes)
           .map(new ConjunctiveQueryAnswers(query.bcq, query.variables, _))