From 43327d8a986e41ba26b6f2b5c911646c7c9a254b Mon Sep 17 00:00:00 2001 From: Federico Igne Date: Wed, 9 Dec 2020 11:19:27 +0000 Subject: Keep track of answer multiplicity --- src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala') 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 dc64c79..0f1cd5e 100644 --- a/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala @@ -298,9 +298,8 @@ class RSAOntology(val ontology: OWLOntology) { ): Graph[Resource, UnDiEdge] = { val query = "SELECT ?X ?Y WHERE { ?X rsa:E ?Y }" val answers = RDFoxUtil.submitQuery(data, query, RSA.Prefixes).get - var edges: Seq[UnDiEdge[Resource]] = answers.map { case Seq(n1, n2) => - UnDiEdge(n1, n2) - } + var edges: Seq[UnDiEdge[Resource]] = + answers.collect { case (_, Seq(n1, n2)) => UnDiEdge(n1, n2) } Graph(edges: _*) } @@ -402,7 +401,7 @@ class RSAOntology(val ontology: OWLOntology) { query: String, prefixes: Prefixes = new Prefixes(), opts: ju.Map[String, String] = new ju.HashMap[String, String]() - ): Option[Seq[Seq[Resource]]] = { + ): Option[Seq[(Long, Seq[Resource])]] = { val (server, data) = RDFoxUtil.openConnection(RSAOntology.DataStore) val answers = RDFoxUtil.submitQuery(data, query, prefixes, opts) RDFoxUtil.closeConnection(server, data) @@ -418,7 +417,9 @@ class RSAOntology(val ontology: OWLOntology) { * [[uk.ac.ox.cs.rsacomb.RSAOntology.ask RSAOntology.ask]] * for the corresponding query has been called. */ - def askUnfiltered(cq: ConjunctiveQuery): Option[Seq[Seq[Resource]]] = { + def askUnfiltered( + cq: ConjunctiveQuery + ): Option[Seq[(Long, Seq[Resource])]] = { val query = RDFoxUtil.buildDescriptionQuery("QM", cq.variables.length) queryDataStore(cq, query, RSA.Prefixes) } -- cgit v1.2.3