From a45aeff72b82bbc9a52f10929bf15b414c868525 Mon Sep 17 00:00:00 2001
From: Federico Igne <federico.igne@cs.ox.ac.uk>
Date: Wed, 18 Nov 2020 18:24:22 +0000
Subject: Rename internal predicate "EquivTo" to "congruent"

---
 src/main/scala/rsacomb/CanonicalModel.scala   | 10 +++++-----
 src/main/scala/rsacomb/FilteringProgram.scala | 12 ++++++------
 src/main/scala/rsacomb/RSA.scala              |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/main/scala/rsacomb')

diff --git a/src/main/scala/rsacomb/CanonicalModel.scala b/src/main/scala/rsacomb/CanonicalModel.scala
index 5f781d1..d9e1641 100644
--- a/src/main/scala/rsacomb/CanonicalModel.scala
+++ b/src/main/scala/rsacomb/CanonicalModel.scala
@@ -92,14 +92,14 @@ class CanonicalModel(val ontology: RSAOntology) extends RSAAxiom {
     val varZ = Variable.create("Z")
     List(
       // Reflexivity
-      Rule.create(RSA.EquivTo(varX, varX), RSA.Thing(varX)),
+      Rule.create(RSA.congruent(varX, varX), RSA.Thing(varX)),
       // Simmetry
-      Rule.create(RSA.EquivTo(varY, varX), RSA.EquivTo(varX, varY)),
+      Rule.create(RSA.congruent(varY, varX), RSA.congruent(varX, varY)),
       // Transitivity
       Rule.create(
-        RSA.EquivTo(varX, varZ),
-        RSA.EquivTo(varX, varY),
-        RSA.EquivTo(varY, varZ)
+        RSA.congruent(varX, varZ),
+        RSA.congruent(varX, varY),
+        RSA.congruent(varY, varZ)
       )
     )
   }
diff --git a/src/main/scala/rsacomb/FilteringProgram.scala b/src/main/scala/rsacomb/FilteringProgram.scala
index 5aaf5b0..c82dcb6 100644
--- a/src/main/scala/rsacomb/FilteringProgram.scala
+++ b/src/main/scala/rsacomb/FilteringProgram.scala
@@ -159,7 +159,7 @@ class FilteringProgram(query: SelectQuery, constants: List[Term])
         RSA(bounded.indexOf(role1.getArguments.get(2))),
         RSA(bounded.indexOf(role2.getArguments.get(2)))
       ),
-      not(RSA.EquivTo(role1.getArguments.get(0), role2.getArguments.get(0)))
+      not(RSA.congruent(role1.getArguments.get(0), role2.getArguments.get(0)))
     )
     val r4b = for {
       role1 <- body.filter(_.isRoleAssertion)
@@ -174,7 +174,7 @@ class FilteringProgram(query: SelectQuery, constants: List[Term])
         RSA(bounded.indexOf(role1.getArguments.get(2))),
         RSA(bounded.indexOf(role2.getArguments.get(0)))
       ),
-      not(RSA.EquivTo(role1.getArguments.get(0), role2.getArguments.get(2)))
+      not(RSA.congruent(role1.getArguments.get(0), role2.getArguments.get(2)))
     )
     val r4c = for {
       role1 <- body.filter(_.isRoleAssertion)
@@ -189,7 +189,7 @@ class FilteringProgram(query: SelectQuery, constants: List[Term])
         RSA(bounded.indexOf(role1.getArguments.get(0))),
         RSA(bounded.indexOf(role2.getArguments.get(0)))
       ),
-      not(RSA.EquivTo(role1.getArguments.get(2), role2.getArguments.get(2)))
+      not(RSA.congruent(role1.getArguments.get(2), role2.getArguments.get(2)))
     )
 
     /* Rules 5x */
@@ -215,7 +215,7 @@ class FilteringProgram(query: SelectQuery, constants: List[Term])
         RSA(bounded indexOf role1arg2),
         RSA(bounded indexOf role2arg2)
       ),
-      RSA.EquivTo(role1arg0, role2arg0),
+      RSA.congruent(role1arg0, role2arg0),
       not(RSA.NI(role1arg0))
     )
     val r5b = for {
@@ -240,7 +240,7 @@ class FilteringProgram(query: SelectQuery, constants: List[Term])
         RSA(bounded indexOf role1arg2),
         RSA(bounded indexOf role2arg0)
       ),
-      RSA.EquivTo(role1arg0, role2arg2),
+      RSA.congruent(role1arg0, role2arg2),
       not(RSA.NI(role1arg0))
     )
     val r5c = for {
@@ -265,7 +265,7 @@ class FilteringProgram(query: SelectQuery, constants: List[Term])
         RSA(bounded indexOf role1arg0),
         RSA(bounded indexOf role2arg0)
       ),
-      RSA.EquivTo(role1arg2, role2arg2),
+      RSA.congruent(role1arg2, role2arg2),
       not(RSA.NI(role1arg2))
     )
 
diff --git a/src/main/scala/rsacomb/RSA.scala b/src/main/scala/rsacomb/RSA.scala
index 3a37a87..ab4f539 100644
--- a/src/main/scala/rsacomb/RSA.scala
+++ b/src/main/scala/rsacomb/RSA.scala
@@ -42,8 +42,8 @@ object RSA {
 
   def notIn(t: Term)(implicit set: Term) = Negation.create(In(t)(set))
 
-  def EquivTo(t1: Term, t2: Term) =
-    TupleTableAtom.rdf(t1, RSA("EquivTo"), t2)
+  def congruent(t1: Term, t2: Term) =
+    TupleTableAtom.rdf(t1, RSA("congruent"), t2)
 
   def QM(implicit variables: (List[Term], List[Term])) = {
     val (answer, bounded) = variables
-- 
cgit v1.2.3