aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFederico Igne <git@federicoigne.com>2021-07-29 11:54:44 +0100
committerFederico Igne <git@federicoigne.com>2021-07-29 11:54:44 +0100
commitcbfa987d5c8d2f550d509c0a3d8226f302df476a (patch)
tree99e6dfa0fb2235a5289cb04b67b6f8ec3c5b603f
parent30b199205f3a16cc92577393ddf9b5d7b36d9dc3 (diff)
downloadRSAComb-cbfa987d5c8d2f550d509c0a3d8226f302df476a.tar.gz
RSAComb-cbfa987d5c8d2f550d509c0a3d8226f302df476a.zip
Change spelling: LowerBound to Lowerbound
-rw-r--r--src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala4
-rw-r--r--src/main/scala/uk/ac/ox/cs/rsacomb/approximation/Lowerbound.scala18
2 files changed, 11 insertions, 11 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..4c63e17 100644
--- a/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala
+++ b/src/main/scala/uk/ac/ox/cs/rsacomb/Main.scala
@@ -28,7 +28,7 @@ import sparql.ConjunctiveQuery
28 28
29import uk.ac.ox.cs.rsacomb.ontology.Ontology 29import uk.ac.ox.cs.rsacomb.ontology.Ontology
30import uk.ac.ox.cs.rsacomb.converter.Normalizer 30import uk.ac.ox.cs.rsacomb.converter.Normalizer
31import uk.ac.ox.cs.rsacomb.approximation.LowerBound 31import uk.ac.ox.cs.rsacomb.approximation.Lowerbound
32 32
33case class RSAOption[+T](opt: T) { 33case class RSAOption[+T](opt: T) {
34 def get[T]: T = opt.asInstanceOf[T] 34 def get[T]: T = opt.asInstanceOf[T]
@@ -133,7 +133,7 @@ object RSAComb extends App {
133 ).normalize(new Normalizer) 133 ).normalize(new Normalizer)
134 134
135 /* Approximate the ontology to RSA */ 135 /* Approximate the ontology to RSA */
136 val toRSA = new LowerBound 136 val toRSA = new Lowerbound
137 val rsa = ontology approximate toRSA 137 val rsa = ontology approximate toRSA
138 138
139 if (config contains 'query) { 139 if (config contains 'query) {
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 60a88fb..290cbaf 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
@@ -16,7 +16,7 @@ import uk.ac.ox.cs.rsacomb.RSAOntology
16import uk.ac.ox.cs.rsacomb.RSAUtil 16import uk.ac.ox.cs.rsacomb.RSAUtil
17import uk.ac.ox.cs.rsacomb.ontology.Ontology 17import uk.ac.ox.cs.rsacomb.ontology.Ontology
18 18
19object LowerBound { 19object Lowerbound {
20 20
21 private val manager = OWLManager.createOWLOntologyManager() 21 private val manager = OWLManager.createOWLOntologyManager()
22 private val factory = manager.getOWLDataFactory() 22 private val factory = manager.getOWLDataFactory()
@@ -38,7 +38,7 @@ object LowerBound {
38 * 38 *
39 * @see [[uk.ac.ox.cs.rsacomb.converter.Normalizer]] 39 * @see [[uk.ac.ox.cs.rsacomb.converter.Normalizer]]
40 */ 40 */
41class LowerBound extends Approximation[RSAOntology] { 41class Lowerbound extends Approximation[RSAOntology] {
42 42
43 /** Simplify conversion between Java and Scala collections */ 43 /** Simplify conversion between Java and Scala collections */
44 import uk.ac.ox.cs.rsacomb.implicits.JavaCollections._ 44 import uk.ac.ox.cs.rsacomb.implicits.JavaCollections._
@@ -130,19 +130,19 @@ class LowerBound extends Approximation[RSAOntology] {
130 ) 130 )
131 131
132 val r1 = 132 val r1 =
133 LowerBound.factory.getOWLSubClassOfAxiom( 133 Lowerbound.factory.getOWLSubClassOfAxiom(
134 LowerBound.factory.getOWLObjectIntersectionOf( 134 Lowerbound.factory.getOWLObjectIntersectionOf(
135 (body.map(_._1) ++ head.map(_._2)): _* 135 (body.map(_._1) ++ head.map(_._2)): _*
136 ), 136 ),
137 LowerBound.factory.getOWLNothing 137 Lowerbound.factory.getOWLNothing
138 ) 138 )
139 139
140 val r2s = 140 val r2s =
141 for { 141 for {
142 (a, na) <- head 142 (a, na) <- head
143 hs = head.map(_._2).filterNot(_ equals na) 143 hs = head.map(_._2).filterNot(_ equals na)
144 } yield LowerBound.factory.getOWLSubClassOfAxiom( 144 } yield Lowerbound.factory.getOWLSubClassOfAxiom(
145 LowerBound.factory.getOWLObjectIntersectionOf( 145 Lowerbound.factory.getOWLObjectIntersectionOf(
146 (body.map(_._1) ++ hs): _* 146 (body.map(_._1) ++ hs): _*
147 ), 147 ),
148 a 148 a
@@ -152,8 +152,8 @@ class LowerBound extends Approximation[RSAOntology] {
152 for { 152 for {
153 (a, na) <- body 153 (a, na) <- body
154 bs = body.map(_._1).filterNot(_ equals a) 154 bs = body.map(_._1).filterNot(_ equals a)
155 } yield LowerBound.factory.getOWLSubClassOfAxiom( 155 } yield Lowerbound.factory.getOWLSubClassOfAxiom(
156 LowerBound.factory.getOWLObjectIntersectionOf( 156 Lowerbound.factory.getOWLObjectIntersectionOf(
157 (bs ++ head.map(_._2)): _* 157 (bs ++ head.map(_._2)): _*
158 ), 158 ),
159 na 159 na