Change ConjunctiveQuery constructors interface

One of the object constructor was returning an Option. It was weird to
have a constructor that would not always return an object.

3 files changed, 3 insertions, 3 deletions

diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala
index d41ca8c..c7ace0f 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala
@@ -61,7 +61,7 @@ object RSAComb extends App {
     source.close()
 
     /* Compute answers to query */
-    val answers = ConjunctiveQuery(query).map(ontology ask _)
+    val answers = ConjunctiveQuery.parse(query).map(ontology ask _)
     answers map (_.toString) foreach println
   }
 }
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 52d4905..7b4b142 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
@@ -336,7 +336,7 @@ class RSAOntology(val ontology: OWLOntology) {
         RSA.Prefixes
       )
       .map(
-        new ConjunctiveQueryAnswers(query.bcq, _)
+        new ConjunctiveQueryAnswers(query.bcq, query.variables, _)
       )
       .get
     RDFoxUtil.closeConnection(server, data)
diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/sparql/ConjunctiveQuery.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/sparql/ConjunctiveQuery.scala
index 451d1f4..1fb75d7 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/sparql/ConjunctiveQuery.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/sparql/ConjunctiveQuery.scala
@@ -31,7 +31,7 @@ object ConjunctiveQuery {
     * @return an [[scala.Option]] containing a ConjunctiveQuery if the
     *         input query represents one, None is returned otherwise.
     */
-  def apply(
+  def parse(
       query: String,
       prefixes: Prefixes = new Prefixes()
   ): Option[ConjunctiveQuery] =