Merge branch 'master' into logger

1 files changed, 10 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 79f2ef3..dc64c79 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
@@ -11,6 +11,7 @@ import org.semanticweb.owlapi.model.{OWLOntology, OWLAxiom, OWLLogicalAxiom}
 import org.semanticweb.owlapi.model.{
   OWLClass,
   OWLClassExpression,
+  OWLDataPropertyAssertionAxiom,
   OWLObjectProperty,
   OWLSubObjectPropertyOfAxiom,
   OWLObjectPropertyExpression,
@@ -35,7 +36,8 @@ import tech.oxfordsemantic.jrdfox.logic.expression.{
   Term,
   Variable,
   IRI,
-  Resource
+  Resource,
+  Literal
 }
 import tech.oxfordsemantic.jrdfox.logic.sparql.statement.SelectQuery
 
@@ -122,6 +124,12 @@ class RSAOntology(val ontology: OWLOntology) {
       .map(implicits.RDFox.owlapiToRdfoxIri)
       .toList
 
+  val literals: List[Literal] =
+    abox
+      .collect { case a: OWLDataPropertyAssertionAxiom => a }
+      .map(_.getObject)
+      .map(implicits.RDFox.owlapiToRdfoxLiteral)
+
   val concepts: List[OWLClass] =
     ontology.getClassesInSignature().asScala.toList
 
@@ -298,7 +306,7 @@ class RSAOntology(val ontology: OWLOntology) {
 
   def filteringProgram(query: ConjunctiveQuery): FilteringProgram =
     Logger.timed(
-      new FilteringProgram(query, individuals),
+      new FilteringProgram(query, individuals ++ literals),
       "Generating filtering program",
       Logger.DEBUG
     )