aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/uk
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/scala/uk')
-rw-r--r--src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala2
-rw-r--r--src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala9
-rw-r--r--src/main/scala/uk/ac/ox/cs/rsacomb/util/Logger.scala14
3 files changed, 16 insertions, 9 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 121c65f..302db75 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala
@@ -65,7 +65,7 @@ object RSAComb extends App {
65 if (config.contains('answers)) 65 if (config.contains('answers))
66 os.write( 66 os.write(
67 config('answers).get[os.Path], 67 config('answers).get[os.Path],
68 ujson.write(ujson.Arr(answers.map(_.toJSON)), indent = 4), 68 ujson.write(ujson.Arr(answers.map(_.toJSON)), indent = 2),
69 createFolders = true 69 createFolders = true
70 ) 70 )
71 71
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 5ae0227..4b8e015 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/RSAOntology.scala
@@ -589,8 +589,8 @@ class RSAOntology(
589 589
590 /* Top/equality axiomatization */ 590 /* Top/equality axiomatization */
591 RDFoxUtil.addRules(data, topAxioms ++ equalityAxioms) 591 RDFoxUtil.addRules(data, topAxioms ++ equalityAxioms)
592 Logger.write(topAxioms.mkString("\n"), "canonical_model.datalog") 592 Logger.write(topAxioms.mkString("\n"), "axiomatisation.dlog")
593 Logger.write(equalityAxioms.mkString("\n"), "canonical_model.datalog") 593 Logger.write(equalityAxioms.mkString("\n"), "axiomatisation.dlog")
594 594
595 /* Introduce `rsacomb:Named` concept */ 595 /* Introduce `rsacomb:Named` concept */
596 data.evaluateUpdate( 596 data.evaluateUpdate(
@@ -608,9 +608,10 @@ class RSAOntology(
608 608
609 /* Add canonical model */ 609 /* Add canonical model */
610 Logger print s"Canonical model facts: ${this.canonicalModel.facts.length}" 610 Logger print s"Canonical model facts: ${this.canonicalModel.facts.length}"
611 Logger.write(canonicalModel.facts.mkString("\n"), "canonical_model.dlog")
611 RDFoxUtil.addFacts(data, RSAOntology.CanonGraph, this.canonicalModel.facts) 612 RDFoxUtil.addFacts(data, RSAOntology.CanonGraph, this.canonicalModel.facts)
612 Logger print s"Canonical model rules: ${this.canonicalModel.rules.length}" 613 Logger print s"Canonical model rules: ${this.canonicalModel.rules.length}"
613 Logger.write(canonicalModel.rules.mkString("\n"), "canonical_model.datalog") 614 Logger.write(canonicalModel.rules.mkString("\n"), "canonical_model.dlog")
614 RDFoxUtil.addRules(data, this.canonicalModel.rules) 615 RDFoxUtil.addRules(data, this.canonicalModel.rules)
615 616
616 RDFoxUtil.closeConnection(server, data) 617 RDFoxUtil.closeConnection(server, data)
@@ -622,7 +623,7 @@ class RSAOntology(
622 623
623 /* Add filtering program */ 624 /* Add filtering program */
624 Logger print s"Filtering program rules: ${filter.rules.length}" 625 Logger print s"Filtering program rules: ${filter.rules.length}"
625 Logger.write(filter.rules.mkString("\n"), s"filter${query.id}.datalog") 626 Logger.write(filter.rules.mkString("\n"), s"filter_query${query.id}.dlog")
626 RDFoxUtil.addRules(data, filter.rules) 627 RDFoxUtil.addRules(data, filter.rules)
627 628
628 // TODO: We remove the rules, should we drop the tuple table as well? 629 // TODO: We remove the rules, should we drop the tuple table as well?
diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/util/Logger.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/util/Logger.scala
index a55b5a0..b86230e 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/util/Logger.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/util/Logger.scala
@@ -17,6 +17,7 @@
17package uk.ac.ox.cs.rsacomb.util 17package uk.ac.ox.cs.rsacomb.util
18 18
19import java.util.Calendar 19import java.util.Calendar
20import java.text.SimpleDateFormat
20import java.io.PrintStream 21import java.io.PrintStream
21 22
22/** Rough implementation of a logger. 23/** Rough implementation of a logger.
@@ -25,9 +26,14 @@ import java.io.PrintStream
25 */ 26 */
26object Logger { 27object Logger {
27 28
28 private val time = Calendar.getInstance() 29 private lazy val dir = {
29 30 val timestamp = (new SimpleDateFormat("yyyyMMddHHmmss")).format(
30 private lazy val dir = os.temp.dir(os.pwd, "rsacomb-", false) 31 Calendar.getInstance().getTime
32 )
33 val dir = os.pwd / s"rsacomb-$timestamp"
34 os.makeDir(dir)
35 dir
36 }
31 37
32 /** Output stream for the logger. */ 38 /** Output stream for the logger. */
33 var output: PrintStream = System.out 39 var output: PrintStream = System.out
@@ -48,7 +54,7 @@ object Logger {
48 54
49 def print(str: Any, lvl: Level = NORMAL): Unit = 55 def print(str: Any, lvl: Level = NORMAL): Unit =
50 if (lvl <= level) 56 if (lvl <= level)
51 output println s"[$lvl][${time.getTime}] $str" 57 output println s"[$lvl][${Calendar.getInstance().getTime}] $str"
52 58
53 def write(content: => os.Source, file: String, lvl: Level = VERBOSE): Unit = 59 def write(content: => os.Source, file: String, lvl: Level = VERBOSE): Unit =
54 if (lvl <= level) 60 if (lvl <= level)