diff options
Diffstat (limited to 'src/main/scala/uk/ac/ox')
3 files changed, 15 insertions, 13 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 8e5169d..713a9e8 100644 --- a/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala | |||
@@ -131,18 +131,18 @@ object RSAComb extends App { | |||
131 | Logger.print(s"$answers", Logger.VERBOSE) | 131 | Logger.print(s"$answers", Logger.VERBOSE) |
132 | Logger print s"Number of answers: ${answers.length} (${answers.lengthWithMultiplicity})" | 132 | Logger print s"Number of answers: ${answers.length} (${answers.lengthWithMultiplicity})" |
133 | // Retrieve unfiltered answers | 133 | // Retrieve unfiltered answers |
134 | val unfiltered = rsa.queryDataStore( | 134 | // val unfiltered = rsa.queryDataStore( |
135 | """ | 135 | // """ |
136 | SELECT (count(?K) as ?COUNT) | 136 | // SELECT (count(?K) as ?COUNT) |
137 | WHERE { | 137 | // WHERE { |
138 | ?K a rsa:QM . | 138 | // ?K a rsa:QM . |
139 | } | 139 | // } |
140 | """, | 140 | // """, |
141 | RSA.Prefixes | 141 | // RSA.Prefixes |
142 | ) | 142 | // ) |
143 | unfiltered.foreach((u) => | 143 | // unfiltered.foreach((u) => |
144 | Logger print s"Number of unfiltered answers: ${u.head._2}" | 144 | // Logger print s"Number of unfiltered answers: ${u.head._2}" |
145 | ) | 145 | // ) |
146 | } | 146 | } |
147 | case None => | 147 | case None => |
148 | throw new RuntimeException("Submitted query is not conjunctive") | 148 | throw new RuntimeException("Submitted query is not conjunctive") |
diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/approximation/Lowerbound.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/approximation/Lowerbound.scala index 3fc4988..60a88fb 100644 --- a/src/main/scala/uk/ac/ox/cs/rsacomb/approximation/Lowerbound.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/approximation/Lowerbound.scala | |||
@@ -50,7 +50,7 @@ class LowerBound extends Approximation[RSAOntology] { | |||
50 | def approximate(ontology: Ontology): RSAOntology = | 50 | def approximate(ontology: Ontology): RSAOntology = |
51 | toRSA( | 51 | toRSA( |
52 | new Ontology( | 52 | new Ontology( |
53 | ontology.axioms filterNot inALCHOIQ flatMap shift, | 53 | ontology.axioms filter inALCHOIQ flatMap shift, |
54 | ontology.datafiles | 54 | ontology.datafiles |
55 | ) | 55 | ) |
56 | ) | 56 | ) |
diff --git a/src/main/scala/uk/ac/ox/cs/rsacomb/ontology/Ontology.scala b/src/main/scala/uk/ac/ox/cs/rsacomb/ontology/Ontology.scala index d73704f..ba44605 100644 --- a/src/main/scala/uk/ac/ox/cs/rsacomb/ontology/Ontology.scala +++ b/src/main/scala/uk/ac/ox/cs/rsacomb/ontology/Ontology.scala | |||
@@ -216,6 +216,8 @@ class Ontology(val axioms: List[OWLLogicalAxiom], val datafiles: List[File]) { | |||
216 | /** Simplify conversion between Java and Scala collections */ | 216 | /** Simplify conversion between Java and Scala collections */ |
217 | import uk.ac.ox.cs.rsacomb.implicits.JavaCollections._ | 217 | import uk.ac.ox.cs.rsacomb.implicits.JavaCollections._ |
218 | 218 | ||
219 | println(s"Axioms: ${axioms.length}") | ||
220 | |||
219 | /** OWLOntology based on input axioms | 221 | /** OWLOntology based on input axioms |
220 | * | 222 | * |
221 | * This is mainly used to instantiate a new reasoner to be used in | 223 | * This is mainly used to instantiate a new reasoner to be used in |