update test suite with minor syntactic fixes

tmitsi · tmitsi · commit e75d35a6fb45 · 2020-11-17T00:59:03.000+02:00
diff --git a/PSOATransRun/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query1.psoa b/PSOATransRun/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query1.psoa
@@ -1 +1 @@
-_a2#_betweenObjRel([_canada _usa _mexico] _dim->2 _orient->_northSouth)
+_a2#_betweenObjRel(+[_canada _usa _mexico] _dim->2 _orient->_northSouth)
diff --git a/PSOATransRun/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query16.psoa b/PSOATransRun/test/betweenObjRel-groundfact/betweenObjRel-groundfact-query16.psoa
@@ -1 +1 @@
-_a2#_betweenObjRel([_canada _usa _mexico] [_estonia _latvia _lithuania] _dim->2 _orient->_northSouth)
+_a2#_betweenObjRel(+[_canada _usa _mexico] +[_estonia _latvia _lithuania] _dim->2 _orient->_northSouth)
diff --git a/PSOATransRun/test/external-isopl-function/external-isopl-function-query10.psoa b/PSOATransRun/test/external-isopl-function/external-isopl-function-query10.psoa
@@ -1 +1 @@
-And(:inRange(External(isopl:sin(3.14)) 0.0015 0.0016) :inRange(External(isopl:sin(-10)) 0.5440 0.5441) :inRange(External(isopl:cos(5)) 0.2836 0.2837) :inRange(External(isopl:cos(-90)) -0.4481 -0.4480) :inRange(External(isopl:atan(34)) 1.5413 1.5414) :inRange(External(isopl:atan(-180)) -1.5653 -1.5652)))
+And(:inRange(External(isopl:sin(3.14)) 0.0015 0.0016) :inRange(External(isopl:sin(-10)) 0.5440 0.5441) :inRange(External(isopl:cos(5)) 0.2836 0.2837) :inRange(External(isopl:cos(-90)) -0.4481 -0.4480) :inRange(External(isopl:atan(34)) 1.5413 1.5414) :inRange(External(isopl:atan(-180)) -1.5653 -1.5652))
diff --git a/PSOATransRun/test/external-isopl-function/external-isopl-function-query11.psoa b/PSOATransRun/test/external-isopl-function/external-isopl-function-query11.psoa
@@ -1 +1 @@
-And(:inRange(External(isopl:exp(1)) 2.7182 2.7183) :inRange (External(isopl:exp(2)) 7.3890 7.3891) External(isopl:eq(isopl:log(isopl:exp(1)) 1)) :inRange (External(isopl:log(10)) 2.3025 2.3026))
+And(:inRange(External(isopl:exp(1)) 2.7182 2.7183) :inRange(External(isopl:exp(2)) 7.3890 7.3891) External(isopl:eq(isopl:log(isopl:exp(1)) 1)) :inRange(External(isopl:log(10)) 2.3025 2.3026))
diff --git a/PSOATransRun/test/passive_function/passive_function-answer3.psoa b/PSOATransRun/test/passive_function/passive_function-answer3.psoa
@@ -1 +1 @@
-_eq(_f(_g(_b)) _g(_b))
+Yes
diff --git a/PSOATransRun/test/physics-comparison/physics-comparison-query24.psoa b/PSOATransRun/test/physics-comparison/physics-comparison-query24.psoa
@@ -1 +1 @@
-:eqDatetime(:datetime(2017 5 30 14 20 5) :datetime(2017 5 30 14 20 5)))  
+:eqDatetime(:datetime(2017 5 30 14 20 5) :datetime(2017 5 30 14 20 5))
diff --git a/PSOATransRun/test/psoa-atom-dependency1/psoa-atom-dependency1-query2.psoa b/PSOATransRun/test/psoa-atom-dependency1/psoa-atom-dependency1-query2.psoa
@@ -1 +1 @@
-And(_John#_Teacher(_Wed _Thu) _John#_Teacher([_Wed _Thu]))
+And(_John#_Teacher(_Wed _Thu) _John#_Teacher(+[_Wed _Thu]))
diff --git a/PSOATransRun/test/psoa_facts_with_slots_and_tuples/psoa_facts_with_slots_and_tuples-KB.psoa b/PSOATransRun/test/psoa_facts_with_slots_and_tuples/psoa_facts_with_slots_and_tuples-KB.psoa
@@ -1,8 +1,8 @@
 Document(
   Group(
     _f1#_family(_John _Mary _child->_Tom)
-    _f2#_family([_Tom _Jane] _income->100000)
-    _f3#_family([_Mike _Jessie] [1951] _child->_Fred _child->_Jane)
-    _Jane#_Person([_female] [_bcs _mcs _phd] _job->_engineer)
+    _f2#_family(+[_Tom _Jane] _income->100000)
+    _f3#_family(+[_Mike _Jessie] +[1951] _child->_Fred _child->_Jane)
+    _Jane#_Person(+[_female] +[_bcs _mcs _phd] _job->_engineer)
   )
-)
+)
diff --git a/PSOATransRun/test/psoa_facts_with_slots_and_tuples/psoa_facts_with_slots_and_tuples-query4.psoa b/PSOATransRun/test/psoa_facts_with_slots_and_tuples/psoa_facts_with_slots_and_tuples-query4.psoa
@@ -1 +1 @@
-_Jane#_Person([_bcs _mcs _phd] _job->_engineer)
+_Jane#_Person(+[_bcs _mcs _phd] _job->_engineer)
diff --git a/PSOATransRun/test/recursive_frame_rule/recursive_frame_rule-KB.psoa b/PSOATransRun/test/recursive_frame_rule/recursive_frame_rule-KB.psoa
@@ -9,7 +9,7 @@ Document (
     )
     _Tom#_person(_male _child->_Amy _job->_professor)
     _Eva#_person(_female _child->_Amy)
-    _Amy#_person([_female] [_bcs _mcs _phd] _child->_Fred)
+    _Amy#_person(+[_female] +[_bcs _mcs _phd] _child->_Fred)
     _Fred#_person(_school->_UNB)
   )
-)
+)
diff --git a/PSOATransRun/test/subclass-bird/subclass-bird-KB.psoa b/PSOATransRun/test/subclass-bird/subclass-bird-KB.psoa
@@ -19,7 +19,7 @@ Document(
     
     <!--
         Express a signature declaration of class :swan -- all swans can inhabit in water.
-        ��inhabits�� is a multi-valued slot name pointing to places that an animal can inhabit.
+        "inhabits" is a multi-valued slot name pointing to places that an animal can inhabit.
         DL form: \exists inhabits.{water} \sqsuperset swan
         Flora-2 form: swan[|inhabits->water|].
     -->
@@ -53,4 +53,4 @@ Queries:
    ?B=:b1
    ?B=:b2
 ?B#:apple(:hasPart->:wings)    no
--->
+-->

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-_a2#_betweenObjRel([_canada _usa _mexico] _dim->2 _orient->_northSouth)`
	`1`	`+_a2#_betweenObjRel(+[_canada _usa _mexico] _dim->2 _orient->_northSouth)`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-And(:inRange(External(isopl:sin(3.14)) 0.0015 0.0016) :inRange(External(isopl:sin(-10)) 0.5440 0.5441) :inRange(External(isopl:cos(5)) 0.2836 0.2837) :inRange(External(isopl:cos(-90)) -0.4481 -0.4480) :inRange(External(isopl:atan(34)) 1.5413 1.5414) :inRange(External(isopl:atan(-180)) -1.5653 -1.5652)))`
	`1`	`+And(:inRange(External(isopl:sin(3.14)) 0.0015 0.0016) :inRange(External(isopl:sin(-10)) 0.5440 0.5441) :inRange(External(isopl:cos(5)) 0.2836 0.2837) :inRange(External(isopl:cos(-90)) -0.4481 -0.4480) :inRange(External(isopl:atan(34)) 1.5413 1.5414) :inRange(External(isopl:atan(-180)) -1.5653 -1.5652))`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-And(:inRange(External(isopl:exp(1)) 2.7182 2.7183) :inRange (External(isopl:exp(2)) 7.3890 7.3891) External(isopl:eq(isopl:log(isopl:exp(1)) 1)) :inRange (External(isopl:log(10)) 2.3025 2.3026))`
	`1`	`+And(:inRange(External(isopl:exp(1)) 2.7182 2.7183) :inRange(External(isopl:exp(2)) 7.3890 7.3891) External(isopl:eq(isopl:log(isopl:exp(1)) 1)) :inRange(External(isopl:log(10)) 2.3025 2.3026))`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-:eqDatetime(:datetime(2017 5 30 14 20 5) :datetime(2017 5 30 14 20 5)))`
	`1`	`+:eqDatetime(:datetime(2017 5 30 14 20 5) :datetime(2017 5 30 14 20 5))`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-And(_John#_Teacher(_Wed _Thu) _John#_Teacher([_Wed _Thu]))`
	`1`	`+And(_John#_Teacher(_Wed _Thu) _John#_Teacher(+[_Wed _Thu]))`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-_Jane#_Person([_bcs _mcs _phd] _job->_engineer)`
	`1`	`+_Jane#_Person(+[_bcs _mcs _phd] _job->_engineer)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ Document (`
`9`	`9`	`)`
`10`	`10`	`_Tom#_person(_male _child->_Amy _job->_professor)`
`11`	`11`	`_Eva#_person(_female _child->_Amy)`
`12`		`- _Amy#_person([_female] [_bcs _mcs _phd] _child->_Fred)`
	`12`	`+ _Amy#_person(+[_female] +[_bcs _mcs _phd] _child->_Fred)`
`13`	`13`	`_Fred#_person(_school->_UNB)`
`14`	`14`	`)`
`15`		`-)`
	`15`	`+)`