RuleML · tmitsi · Dec 11, 2018 · Jan 14, 2018 · Jan 16, 2018 · Jan 17, 2018
diff --git a/PSOA2X/pom.xml b/PSOA2X/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.ruleml.psoa</groupId>
 	<artifactId>PSOA2X</artifactId>
-	<version>1.3</version>
+	<version>1.4</version>
 	<name>PSOA2X</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -84,7 +84,7 @@
 		<dependency>
 			<groupId>org.ruleml.psoa</groupId>
 			<artifactId>PSOACore</artifactId>
-			<version>1.3</version>
+			<version>1.4</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/PSOA2X/src/main/java/org/ruleml/psoa/psoa2x/psoa2prolog/AbstractPrologConverter.java b/PSOA2X/src/main/java/org/ruleml/psoa/psoa2x/psoa2prolog/AbstractPrologConverter.java
@@ -19,7 +19,7 @@ public abstract class AbstractPrologConverter extends PrologTermLangConverter {
 	{
 		// Taken from W3C RIF-DTB library
 		s_builtInMap.put("http://www.w3.org/2007/rif-builtin-predicate#numeric-equal", "\'=:=\'");
-		s_builtInMap.put("http://www.w3.org/2007/rif-builtin-predicate#numeric-not-equal", "\'=\\=\'");
+		s_builtInMap.put("http://www.w3.org/2007/rif-builtin-predicate#numeric-not-equal", "\'=\\\\=\'");
 		s_builtInMap.put("http://www.w3.org/2007/rif-builtin-predicate#numeric-greater-than", "\'>\'");
 		s_builtInMap.put("http://www.w3.org/2007/rif-builtin-predicate#numeric-greater-than-or-equal", "\'>=\'");
 		s_builtInMap.put("http://www.w3.org/2007/rif-builtin-predicate#numeric-less-than", "\'<\'");
@@ -58,12 +58,12 @@ public abstract class AbstractPrologConverter extends PrologTermLangConverter {
 		s_builtInMap.put("https://www.iso.org/standard/21413.html#exp", "exp");
 		s_builtInMap.put("https://www.iso.org/standard/21413.html#log", "log");		
 
-		// Predicates
+		// Predicates
 		s_builtInMap.put("https://www.iso.org/standard/21413.html#integer", "integer");  // Test if integer
 		s_builtInMap.put("https://www.iso.org/standard/21413.html#float", "float");  // Test if shortcut or xs:double float number (represented as double) [Currently redundant because of above same-named coerce]
 		s_builtInMap.put("https://www.iso.org/standard/21413.html#number", "number");  // Test if number
 		s_builtInMap.put("https://www.iso.org/standard/21413.html#eq", "\'=:=\'");                // XSB's special character tokens ...
-		s_builtInMap.put("https://www.iso.org/standard/21413.html#not_eq", "\'=\\=\'");           //
+		s_builtInMap.put("https://www.iso.org/standard/21413.html#not_eq", "\'=\\\\=\'");           //
 		s_builtInMap.put("https://www.iso.org/standard/21413.html#greater_than", "\'>\'");        //
 		s_builtInMap.put("https://www.iso.org/standard/21413.html#greater_than_or_eq", "\'>=\'"); //
 		s_builtInMap.put("https://www.iso.org/standard/21413.html#less_than", "\'<\'");           //

diff --git a/PSOACore/pom.xml b/PSOACore/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.ruleml.psoa</groupId>
 	<artifactId>PSOACore</artifactId>
-	<version>1.3</version>
+	<version>1.4</version>
 	<name>PSOACore</name>
 	<build>
 		<defaultGoal>install</defaultGoal>

diff --git a/...-tests/SWI-compatible/test-meta/atomic_2implicit-1tuple1/atomic_2implicit-1tuple1-KB.psoa b/...-tests/SWI-compatible/test-meta/atomic_2implicit-1tuple1/atomic_2implicit-1tuple1-KB.psoa
@@ -0,0 +1,14 @@
+RuleML(
+  Assert(
+    % atomic-formula expressivity
+    % 2 relationships
+    % single tuple
+    %   dependent tuple
+    %     implicit tuple
+    %   1 element
+    %     constant elements
+    p(a)
+    p(b)
+    % '_p'('_a').
+    % '_p'('_b').
+) )
diff --git a/.../SWI-compatible/test-meta/atomic_2implicit-1tuple1/atomic_2implicit-1tuple1-answer10.psoa b/.../SWI-compatible/test-meta/atomic_2implicit-1tuple1/atomic_2implicit-1tuple1-answer10.psoa
@@ -0,0 +1,4 @@
+?x=_a
+?x=_b
+?x=_c
+?x=_d
diff --git a/...s/SWI-compatible/test-meta/atomic_2implicit-1tuple1/atomic_2implicit-1tuple1-query10.psoa b/...s/SWI-compatible/test-meta/atomic_2implicit-1tuple1/atomic_2implicit-1tuple1-query10.psoa
@@ -0,0 +1,4 @@
+p(?x)
+% '_p'(Qx).
+% Correctness Criterion: query for the an implicit atom with query variable matching
+%   both of two implicit atoms in a KB answers with both bindings.
diff --git a/...ts/SWI-compatible/test-meta/atomic_independent-1tuple3/atomic_independent-1tuple3-KB.psoa b/...ts/SWI-compatible/test-meta/atomic_independent-1tuple3/atomic_independent-1tuple3-KB.psoa
@@ -0,0 +1,12 @@
+RuleML(
+  Assert(
+    % atomic-formula expressivity
+    % pn1 (perspeneutral)
+    % single tuple
+    %   independent tuple
+    %   3 elements
+    %     constant elements
+    p(-[a b c])
+    % tupterm('_1','_a','_b','_c').
+    % memterm('_1','_p').
+) )
diff --git a/...I-compatible/test-meta/atomic_independent-1tuple3/atomic_independent-1tuple3-answer3.psoa b/...I-compatible/test-meta/atomic_independent-1tuple3/atomic_independent-1tuple3-answer3.psoa
@@ -0,0 +1,2 @@
+?x=_a
+?x=_b
diff --git a/...I-compatible/test-meta/atomic_independent-1tuple3/atomic_independent-1tuple3-answer4.psoa b/...I-compatible/test-meta/atomic_independent-1tuple3/atomic_independent-1tuple3-answer4.psoa
@@ -0,0 +1,2 @@
+?x=_a ?y=_b ?z=_c
+?x=_c ?y=_b ?z=_a
diff --git a/...I-compatible/test-meta/atomic_independent-1tuple3/atomic_independent-1tuple3-answer8.psoa b/...I-compatible/test-meta/atomic_independent-1tuple3/atomic_independent-1tuple3-answer8.psoa
@@ -0,0 +1,2 @@
+?x=_1
+?x=_2
diff --git a/...WI-compatible/test-meta/atomic_independent-1tuple3/atomic_independent-1tuple3-query3.psoa b/...WI-compatible/test-meta/atomic_independent-1tuple3/atomic_independent-1tuple3-query3.psoa
@@ -0,0 +1,5 @@
+p(-[?x b c])
+% (tupterm(Q1,Qx,'_b','_c'),memterm(Q1,'_p')).
+% Correctness Criterion: Query for non-ground atom with independent single tuple of 
+%    one variable and two constant arguments
+%    against KB containing a matching ground atom answers with appropriate substitution.
diff --git a/...WI-compatible/test-meta/atomic_independent-1tuple3/atomic_independent-1tuple3-query4.psoa b/...WI-compatible/test-meta/atomic_independent-1tuple3/atomic_independent-1tuple3-query4.psoa
@@ -0,0 +1,5 @@
+p(-[?x ?y ?z])
+% (tupterm(Q1,Qx,Qy,Qz),memterm(Q1,'_p')).
+% Correctness Criterion: Query for non-ground atom with independent single tuple of 
+%    three variable arguments
+%    against KB containing a matching ground atom answers with appropriate substitution.
diff --git a/...WI-compatible/test-meta/atomic_independent-1tuple3/atomic_independent-1tuple3-query8.psoa b/...WI-compatible/test-meta/atomic_independent-1tuple3/atomic_independent-1tuple3-query8.psoa
@@ -0,0 +1,6 @@
+?x#Top(-[a b c])
+% tupterm(Qx,'_a','_b','_c').
+% Correctness Criterion: Query for ground atom with Top independent single tuple of three constant arguments
+%    and masked oid variable
+%    against KB containing only the independent version of that ground atom with 
+%    specific predicate answers "Yes".
diff --git a/PSOATransRun/SWI-Prolog-tests/SWI-compatible/test/README.txt b/PSOATransRun/SWI-Prolog-tests/SWI-compatible/test/README.txt
@@ -0,0 +1,37 @@
+The directory stores a test suite used for the automated testing of 
+PSOA implementations, e.g. by our Java-based PSOATransRun 
+testing module. 
+
+The testing module expects the following naming conventions:
+Each test case is stored under one 
+subdirectory, which we will call <testCaseName>. 
+Under this subdirectory, there exists 
+  one main KB file <testCaseName>-KB.psoa, 
+  zero or more imported KB files, e.g. written as 
+    <testCaseName>-KB-importedI.psoa, I=1,2,... (the testing 
+    module will ignore all files whose names contain anything 
+    between "KB" and ".psoa"), 
+  one or more query files <testCaseName>-queryJ.psoa, J=1,2,..., and 
+  one answer file <testCaseName>-answerJ.psoa for each query <testCaseName>-queryJ.psoa.
+
+A query/answer pair of files (-queryJ/-answerJ) is called a "unit test".  
+
+Query and answer files should be authored such that answer bindings 
+use only constants drawn from the KB ("certain answers") instead of
+system-generated ones (e.g., _oidcons, Skolem functions), which can 
+vary under different command-line options and implementations.
+
+An Eclipse Run configuration may be used to automate the test execution as follows:
+Run Configurations
+  Main
+    Project: PSOATransRun
+    Main class: org.ruleml.psoa.psoatransrun.PSOATransRunCmdLine
+  Arguments
+    Program Arguments: --test -i ...\git\PSOATransRunComponents\PSOATransRun\test
+OR
+    Program Arguments: --test -s -i ...\git\PSOATransRunComponents\PSOATransRun\test
+
+The following command is used to manually execute
+<testCaseName>-queryJ.psoa on <testCaseName>-KB.psoa
+(the answers will go to the standard output):
+java -jar PSOATransRunLocal.jar -i <testCaseName>-KB.psoa -q <testCaseName>-queryJ.psoa
diff --git a/...rolog-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-KB.psoa b/...rolog-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-KB.psoa
@@ -0,0 +1,5 @@
+Document(
+  Group (
+    _a2#_betweenObjRel(_canada _usa _mexico _dim->2 _orient->_northSouth)
+  )
+)
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer1.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer1.psoa
@@ -0,0 +1 @@
+yes
diff --git a/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer10.psoa b/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer10.psoa
@@ -0,0 +1 @@
+yes
diff --git a/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer11.psoa b/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer11.psoa
@@ -0,0 +1 @@
+yes
diff --git a/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer12.psoa b/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer12.psoa
@@ -0,0 +1 @@
+no
diff --git a/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer14.psoa b/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer14.psoa
@@ -0,0 +1 @@
+no
diff --git a/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer15.psoa b/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer15.psoa
@@ -0,0 +1 @@
+no
diff --git a/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer16.psoa b/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer16.psoa
@@ -0,0 +1 @@
+no
diff --git a/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer19.psoa b/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer19.psoa
@@ -0,0 +1 @@
+no
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer2.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer2.psoa
@@ -0,0 +1 @@
+yes
diff --git a/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer20.psoa b/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer20.psoa
@@ -0,0 +1 @@
+yes
diff --git a/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer21.psoa b/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer21.psoa
@@ -0,0 +1 @@
+?X=_canada
diff --git a/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer22.psoa b/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer22.psoa
@@ -0,0 +1 @@
+?X=_canada ?Z=_mexico
diff --git a/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer23.psoa b/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer23.psoa
@@ -0,0 +1 @@
+no
diff --git a/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer24.psoa b/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer24.psoa
@@ -0,0 +1 @@
+?V=_northSouth
diff --git a/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer25.psoa b/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer25.psoa
@@ -0,0 +1 @@
+?U=2 ?V=_northSouth
diff --git a/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer26.psoa b/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer26.psoa
@@ -0,0 +1 @@
+no
diff --git a/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer27.psoa b/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer27.psoa
@@ -0,0 +1 @@
+?V=_northSouth
diff --git a/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer28.psoa b/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer28.psoa
@@ -0,0 +1 @@
+?S=_dim
diff --git a/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer29.psoa b/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer29.psoa
@@ -0,0 +1 @@
+?S=_dim ?T=_orient
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer3.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer3.psoa
@@ -0,0 +1 @@
+no
diff --git a/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer30.psoa b/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer30.psoa
@@ -0,0 +1 @@
+no
diff --git a/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer31.psoa b/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer31.psoa
@@ -0,0 +1 @@
+?I=_a2
diff --git a/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer32.psoa b/...tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer32.psoa
@@ -0,0 +1 @@
+?I=_a2
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer4.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer4.psoa
@@ -0,0 +1 @@
+yes
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer5.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer5.psoa
@@ -0,0 +1 @@
+yes
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer6.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer6.psoa
@@ -0,0 +1 @@
+yes
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer7.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer7.psoa
@@ -0,0 +1 @@
+yes
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer8.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer8.psoa
@@ -0,0 +1 @@
+yes
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer9.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-answer9.psoa
@@ -0,0 +1 @@
+yes
diff --git a/...g-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query1.psoa b/...g-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query1.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel([_canada _usa _mexico] _dim->2 _orient->_northSouth)
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query10.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query10.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(_orient->_northSouth)
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query11.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query11.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel()
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query12.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query12.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(_usa _canada _mexico _dim->2 _orient->_northSouth)
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query14.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query14.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(_canada _usa _mexico _dim->3 _orient->_northSouth)
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query15.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query15.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(_canada _usa _mexico _dim->2 _orient->_northSouth _start->1867)
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query16.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query16.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel([_canada _usa _mexico] [_estonia _latvia _lithuania] _dim->2 _orient->_northSouth)
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query19.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query19.psoa
@@ -0,0 +1 @@
+_a1#_betweenObjRel(_canada _usa _mexico _dim->2 _orient->_northSouth)
diff --git a/...g-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query2.psoa b/...g-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query2.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(_canada _usa _mexico _dim->2 _orient->_northSouth)
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query20.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query20.psoa
@@ -0,0 +1 @@
+_betweenObjRel(_canada _usa _mexico _dim->2 _orient->_northSouth)
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query21.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query21.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(?X _usa _mexico _dim->2 _orient->_northSouth)
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query22.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query22.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(?X _usa ?Z _dim->2 _orient->_northSouth)
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query23.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query23.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(?X _usa ?X _dim->2 _orient->_northSouth)
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query24.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query24.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(_canada _usa _mexico _dim->2 _orient->?V)
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query25.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query25.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(_canada _usa _mexico _dim->?U _orient->?V)
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query26.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query26.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(_canada _usa _mexico _dim->?U _orient->?U)
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query27.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query27.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(_canada _usa _mexico _orient->?V)
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query28.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query28.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(_canada _usa _mexico ?S->2 _orient->_northSouth)
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query29.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query29.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(_canada _usa _mexico ?S->2 ?T->_northSouth)
diff --git a/...g-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query3.psoa b/...g-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query3.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(_alaska _usa _mexico _dim->2 _orient->_northSouth)
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query30.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query30.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(_canada _usa _mexico ?S->2 ?S->_northSouth)
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query31.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query31.psoa
@@ -0,0 +1 @@
+?I#_betweenObjRel(_canada _usa _mexico _dim->2 _orient->_northSouth)
diff --git a/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query32.psoa b/...-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query32.psoa
@@ -0,0 +1 @@
+?I#_betweenObjRel(_canada _usa _mexico)
diff --git a/...g-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query4.psoa b/...g-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query4.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(_canada _usa _mexico _orient->_northSouth _dim->2)
diff --git a/...g-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query5.psoa b/...g-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query5.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(_canada _usa _mexico _dim->2 _orient->_northSouth)
diff --git a/...g-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query6.psoa b/...g-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query6.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(_canada _usa _mexico _dim->2 _orient->_northSouth)
diff --git a/...g-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query7.psoa b/...g-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query7.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(_canada _usa _mexico _orient->_northSouth)
diff --git a/...g-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query8.psoa b/...g-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query8.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(_canada _usa _mexico)
diff --git a/...g-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query9.psoa b/...g-tests/SWI-compatible/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query9.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(_dim->2 _orient->_northSouth)
diff --git a/...tests/SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-KB.psoa b/...tests/SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-KB.psoa
@@ -0,0 +1,9 @@
+Document
+(
+  Group
+  (
+    Forall ?M (
+      Exists ?O ( ?O#_betweenObjRel(_northPole ?M _southPole _dim->2 _orient->_northSouth) )
+    )
+  )
+)
diff --git a/.../SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-answer1.psoa b/.../SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-answer1.psoa
@@ -0,0 +1 @@
+no
diff --git a/...SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-answer10.psoa b/...SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-answer10.psoa
@@ -0,0 +1 @@
+yes
diff --git a/...SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-answer11.psoa b/...SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-answer11.psoa
@@ -0,0 +1 @@
+yes
diff --git a/.../SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-answer2.psoa b/.../SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-answer2.psoa
@@ -0,0 +1 @@
+no
diff --git a/.../SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-answer3.psoa b/.../SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-answer3.psoa
@@ -0,0 +1 @@
+yes
diff --git a/.../SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-answer4.psoa b/.../SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-answer4.psoa
@@ -0,0 +1 @@
+yes
diff --git a/.../SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-answer6.psoa b/.../SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-answer6.psoa
@@ -0,0 +1 @@
+yes
diff --git a/.../SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-answer7.psoa b/.../SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-answer7.psoa
@@ -0,0 +1 @@
+?X=_northPole
diff --git a/.../SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-answer8.psoa b/.../SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-answer8.psoa
@@ -0,0 +1 @@
+?X=_northPole ?Z=_southPole
diff --git a/.../SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-answer9.psoa b/.../SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-answer9.psoa
@@ -0,0 +1 @@
+no
diff --git a/...s/SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-query1.psoa b/...s/SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-query1.psoa
@@ -0,0 +1 @@
+_a2#_betweenObjRel(_northPole _usa _southPole _dim->2 _orient->_northSouth)
diff --git a/.../SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-query10.psoa b/.../SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-query10.psoa
@@ -0,0 +1 @@
+?#_betweenObjRel(_northPole _usa _southPole _dim->2 _orient->_northSouth)
diff --git a/.../SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-query11.psoa b/.../SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-query11.psoa
@@ -0,0 +1 @@
+?#_betweenObjRel(_northPole _usa _southPole)
diff --git a/...s/SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-query2.psoa b/...s/SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-query2.psoa
@@ -0,0 +1 @@
+_a1#_betweenObjRel(_northPole _usa _southPole _dim->2 _orient->_northSouth)
diff --git a/...s/SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-query3.psoa b/...s/SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-query3.psoa
@@ -0,0 +1 @@
+Exists ?O (?O#_betweenObjRel(_northPole _usa _southPole _dim->2 _orient->_northSouth))
diff --git a/...s/SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-query4.psoa b/...s/SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-query4.psoa
@@ -0,0 +1 @@
+Exists ?O (?O#_betweenObjRel(_northPole _eu _southPole _dim->2 _orient->_northSouth))
diff --git a/...s/SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-query6.psoa b/...s/SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-query6.psoa
@@ -0,0 +1 @@
+_betweenObjRel(_northPole _usa _southPole _dim->2 _orient->_northSouth)
diff --git a/...s/SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-query7.psoa b/...s/SWI-compatible/test/betweenObjRel-nongroundfact/betweenObjRel-nongroundfact-query7.psoa
@@ -0,0 +1 @@
+Exists ?O (?O#_betweenObjRel(?X _usa _southPole _dim->2 _orient->_northSouth))
-Original file line number
+Diff line change
@@ -0,0 +1,4 @@
+    ?x=_a
+    ?x=_b
+    ?x=_c
+    ?x=_d
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		_a2#_betweenObjRel([_canada _usa _mexico] _dim->2 _orient->_northSouth)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		_a2#_betweenObjRel(_usa _canada _mexico _dim->2 _orient->_northSouth)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		_a2#_betweenObjRel(_canada _usa _mexico _dim->3 _orient->_northSouth)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		_a1#_betweenObjRel(_canada _usa _mexico _dim->2 _orient->_northSouth)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		_betweenObjRel(_canada _usa _mexico _dim->2 _orient->_northSouth)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		_a2#_betweenObjRel(?X _usa _mexico _dim->2 _orient->_northSouth)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		_a2#_betweenObjRel(?X _usa ?Z _dim->2 _orient->_northSouth)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		_a2#_betweenObjRel(?X _usa ?X _dim->2 _orient->_northSouth)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		_a2#_betweenObjRel(_alaska _usa _mexico _dim->2 _orient->_northSouth)