Merge branch 'master' into logger

2 files changed, 2 insertions, 2 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 5246d2f..60511af 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala
@@ -60,7 +60,7 @@ object RSAComb extends App {
     val query = RDFoxUtil.loadQueryFromFile(queryPath.getAbsoluteFile)
 
     /* Compute answers to query */
-    ConjunctiveQuery(query).map(ontology ask _) match {
+    ConjunctiveQuery.parse(query).map(ontology ask _) match {
       case Some(answers) => Logger print answers
       case None =>
         throw new RuntimeException("Submitted query is not conjunctive")
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] =