1 files changed, 43 insertions, 122 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 258c226..121c65f 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala
@@ -16,7 +16,8 @@
 
 package uk.ac.ox.cs.rsacomb
 
-import java.io.File
+import java.io.{File, PrintWriter}
+import java.nio.file.{Path, Paths, InvalidPathException}
 import java.util.HashMap
 import scala.collection.JavaConverters._
 import tech.oxfordsemantic.jrdfox.client.UpdateType
@@ -28,97 +29,7 @@ import sparql.ConjunctiveQuery
 
 import uk.ac.ox.cs.rsacomb.ontology.Ontology
 import uk.ac.ox.cs.rsacomb.converter.Normalizer
-import uk.ac.ox.cs.rsacomb.approximation.LowerBound
-
-case class RSAOption[+T](opt: T) {
-  def get[T]: T = opt.asInstanceOf[T]
-}
-
-object RSAConfig {
-  type Config = Map[Symbol, RSAOption[Any]]
-
-  private implicit def toRSAOption[T](opt: T) = RSAOption[T](opt)
-
-  /** Help message */
-  private val help: String = """
-  rsacomb - combined approach for CQ answering for RSA ontologies.
-
-  USAGE
-    rsacomb [OPTIONS] <ontology> [<data> ...]
-
-      -h | -? | --help
-          print this help message
-
-      -q <file> | --query <file>
-          path to a file containing a single SPARQL query. If no query
-          is provided, only the approximation to RSA will be performed.
-
-      <ontology>
-          file containing the ontology
-
-      <data>
-          one or more data files
-
-  """
-
-  /** Default config values */
-  private val default: Config = Map.empty
-
-  /** Utility to exit the program with a custom message on stderr.
-    *
-    * The program will exit with error code 1 after printing the help
-    * message.
-    *
-    * @param msg message printed to stderr.
-    */
-  private def exit(msg: String): Nothing = {
-    System.err.println(msg)
-    System.err.println()
-    System.err.println(help)
-    sys.exit(1)
-  }
-
-  /** Parse arguments with default options
-    *
-    * @param args arguments list
-    * @return map of config options
-    */
-  def parse(args: List[String]): Config = parse(args, default)
-
-  /** Parse arguments
-    *
-    * @param args arguments list
-    * @param config default configuration
-    * @return map of config options
-    */
-  def parse(args: List[String], config: Config): Config = {
-    args match {
-      case flag @ ("-h" | "-?" | "--help") :: _ => {
-        println(help)
-        sys.exit(0)
-      }
-      case flag @ ("-q" | "--query") :: _query :: tail => {
-        val query = new File(_query)
-        if (!query.isFile)
-          exit(s"'$query' is not a valid filename.")
-        parse(tail, config ++ Map('query -> query))
-      }
-      case _ontology :: _data => {
-        val ontology = new File(_ontology)
-        val data = _data.map(new File(_))
-        (ontology :: data) foreach { (file) =>
-          if (!file.isFile)
-            exit(s"'$file' is not a valid filename.")
-        }
-        finalise(config ++ Map('ontology -> ontology, 'data -> data))
-      }
-      case a => exit(s"Invalid sequence of arguments '${a.mkString(" ")}'.")
-    }
-  }
-
-  /** Perform final checks on parsed options */
-  private def finalise(config: Config): Config = config
-}
+import uk.ac.ox.cs.rsacomb.approximation.{Upperbound, Lowerbound}
 
 /** Main entry point to the program */
 object RSAComb extends App {
@@ -126,42 +37,52 @@ object RSAComb extends App {
   /* Command-line options */
   val config = RSAConfig.parse(args.toList)
 
+  /* Set logger level */
+  if (config.contains('logger))
+    Logger.level = config('logger).get[Logger.Level]
+
   /* Load original ontology and normalize it */
   val ontology = Ontology(
-    config('ontology).get[File],
-    config('data).get[List[File]]
+    config('ontology).get[os.Path],
+    config('data).get[List[os.Path]]
   ).normalize(new Normalizer)
 
+  //ontology.axioms foreach println
+
   /* Approximate the ontology to RSA */
-  val toRSA = new LowerBound
+  val toRSA = new Upperbound
   val rsa = ontology approximate toRSA
 
-  if (config contains 'query) {
-    val query =
-      RDFoxUtil.loadQueryFromFile(config('query).get[File].getAbsoluteFile)
-
-    ConjunctiveQuery.parse(query) match {
-      case Some(query) => {
-        // Retrieve answers
-        val answers = rsa ask query
-        Logger.print(s"$answers", Logger.VERBOSE)
-        Logger print s"Number of answers: ${answers.length} (${answers.lengthWithMultiplicity})"
-        // Retrieve unfiltered answers
-        // val unfiltered = rsa.queryDataStore(
-        //   """
-        //     SELECT (count(?K) as ?COUNT)
-        //     WHERE {
-        //         ?K a rsa:QM .
-        //     }
-        //   """,
-        //   RSA.Prefixes
-        // )
-        // unfiltered.foreach((u) =>
-        //   Logger print s"Number of unfiltered answers: ${u.head._2}"
-        // )
-      }
-      case None =>
-        throw new RuntimeException("Submitted query is not conjunctive")
-    }
+  if (config contains 'queries) {
+    val queries =
+      RDFoxUtil.loadQueriesFromFile(
+        config('queries).get[os.Path]
+      )
+
+    val answers = rsa ask queries
+
+    /* Write answers to output file */
+    if (config.contains('answers))
+      os.write(
+        config('answers).get[os.Path],
+        ujson.write(ujson.Arr(answers.map(_.toJSON)), indent = 4),
+        createFolders = true
+      )
+
+    // Logger.print(s"$answers", Logger.VERBOSE)
+    // Logger print s"Number of answers: ${answers.length} (${answers.lengthWithMultiplicity})"
+    // Retrieve unfiltered answers
+    // val unfiltered = rsa.queryDataStore(
+    //   """
+    //     SELECT (count(?K) as ?COUNT)
+    //     WHERE {
+    //         ?K a rsa:QM .
+    //     }
+    //   """,
+    //   RSA.Prefixes
+    // )
+    // unfiltered.foreach((u) =>
+    //   Logger print s"Number of unfiltered answers: ${u.head._2}"
+    // )
   }
 }