Fix suffix generation in filtering program

Also a small step into generalizing the concept of suffix

2 files changed, 15 insertions, 15 deletions

diff --git a/src/main/scala/rsacomb/FilteringProgram.scala b/src/main/scala/rsacomb/FilteringProgram.scala
index 9c51a1c..4d5a5c0 100644
--- a/src/main/scala/rsacomb/FilteringProgram.scala
+++ b/src/main/scala/rsacomb/FilteringProgram.scala
@@ -161,8 +161,8 @@ class FilteringProgram(query: SelectQuery, constants: List[Term])
       if bounded contains (role2.getArguments.get(2))
     } yield Rule.create(
       predFK,
-      role1 suffix "_f",
-      role2 suffix "_f",
+      role1 suffix "f",
+      role2 suffix "f",
       predID(
         RSA.internal(bounded.indexOf(role1.getArguments.get(2))),
         RSA.internal(bounded.indexOf(role2.getArguments.get(2)))
@@ -182,8 +182,8 @@ class FilteringProgram(query: SelectQuery, constants: List[Term])
       if bounded contains (role2.getArguments.get(0))
     } yield Rule.create(
       predFK,
-      role1 suffix "_f",
-      role2 suffix "_b",
+      role1 suffix "f",
+      role2 suffix "b",
       predID(
         RSA.internal(bounded.indexOf(role1.getArguments.get(2))),
         RSA.internal(bounded.indexOf(role2.getArguments.get(0)))
@@ -203,8 +203,8 @@ class FilteringProgram(query: SelectQuery, constants: List[Term])
       if bounded contains (role2.getArguments.get(0))
     } yield Rule.create(
       predFK,
-      role1 suffix "_b",
-      role2 suffix "_b",
+      role1 suffix "b",
+      role2 suffix "b",
       predID(
         RSA.internal(bounded.indexOf(role1.getArguments.get(0))),
         RSA.internal(bounded.indexOf(role2.getArguments.get(0)))
@@ -235,8 +235,8 @@ class FilteringProgram(query: SelectQuery, constants: List[Term])
         RSA.internal(bounded indexOf role1arg0),
         RSA.internal(bounded indexOf role2arg0)
       ),
-      role1 suffix "_f",
-      role2 suffix "_f",
+      role1 suffix "f",
+      role2 suffix "f",
       predID(
         RSA.internal(bounded indexOf role1arg2),
         RSA.internal(bounded indexOf role2arg2)
@@ -260,8 +260,8 @@ class FilteringProgram(query: SelectQuery, constants: List[Term])
         RSA.internal(bounded indexOf role1arg0),
         RSA.internal(bounded indexOf role2arg2)
       ),
-      role1 suffix "_f",
-      role2 suffix "_b",
+      role1 suffix "f",
+      role2 suffix "b",
       predID(
         RSA.internal(bounded indexOf role1arg2),
         RSA.internal(bounded indexOf role2arg0)
@@ -285,8 +285,8 @@ class FilteringProgram(query: SelectQuery, constants: List[Term])
         RSA.internal(bounded indexOf role1arg2),
         RSA.internal(bounded indexOf role2arg2)
       ),
-      role1 suffix "_b",
-      role2 suffix "_b",
+      role1 suffix "b",
+      role2 suffix "b",
       predID(
         RSA.internal(bounded indexOf role1arg0),
         RSA.internal(bounded indexOf role2arg0)
diff --git a/src/main/scala/rsacomb/RDFTriple.scala b/src/main/scala/rsacomb/RDFTriple.scala
index 9e593df..4054d42 100644
--- a/src/main/scala/rsacomb/RDFTriple.scala
+++ b/src/main/scala/rsacomb/RDFTriple.scala
@@ -33,7 +33,7 @@ trait RDFTriple {
     def suffix(sx: String): TupleTableAtom =
       if (this.isClassAssertion) {
         val newclass = atom.getArguments.get(2) match {
-          case iri: IRI => IRI.create(iri.getIRI.appendedAll(sx))
+          case iri: IRI => IRI.create(s"${iri.getIRI}_$sx")
           case other    => other
         }
         TupleTableAtom.rdf(
@@ -43,7 +43,7 @@ trait RDFTriple {
         )
       } else if (this.isRoleAssertion) {
         val newrole = atom.getArguments.get(1) match {
-          case iri: IRI => IRI.create(iri.getIRI.appendedAll(sx))
+          case iri: IRI => IRI.create(s"${iri.getIRI}_$sx")
           case other    => other
         }
         TupleTableAtom.rdf(
@@ -53,7 +53,7 @@ trait RDFTriple {
         )
       } else {
         val newname =
-          TupleTableName.create(atom.getTupleTableName.getName.appendedAll(sx))
+          TupleTableName.create(s"${atom.getTupleTableName.getName}_$sx")
         TupleTableAtom.create(newname, atom.getArguments())
       }
   }