mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2025-12-14 13:23:53 +00:00
Code Issues Projects Releases Wiki Activity

Fix failing tabling tests.

Browse Source 
tests/tabling/rotate.exp:
tests/tabling/rotate2.exp:
     Conform to standard library changes.
This commit is contained in:
Julien Fischer
2016-07-01 11:51:30 +10:00
parent a7159f86b0
commit 2337612c8f
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/tabling/rotate.exp
View File

@@ -14,9 +14,9 @@ rotations(3, 2, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) =
soln 0: [[3, 0], [4, 0], [5, 0], [1, 0], [2, 0]] soln 0: [[3, 0], [4, 0], [5, 0], [1, 0], [2, 0]]
soln 1: [[4, 0], [5, 0], [1, 0], [2, 0], [3, 0]] soln 1: [[4, 0], [5, 0], [1, 0], [2, 0], [3, 0]]
rotations(3, 2, [[1], [1, 2], [1, 2, 3], [1, 2, 3, 4]]) = rotations(3, 2, [sol([1]), sol([1, 2]), sol([1, 2, 3]), sol([1, 2, 3, 4])]) =
soln 0: [[1, 2, 3], [1, 2, 3, 4], [1], [1, 2]] soln 0: [sol([1, 2, 3]), sol([1, 2, 3, 4]), sol([1]), sol([1, 2])]
soln 1: [[1, 2, 3, 4], [1], [1, 2], [1, 2, 3]] soln 1: [sol([1, 2, 3, 4]), sol([1]), sol([1, 2]), sol([1, 2, 3])]
rotations(3, 1, [10, 20, 30, 40, 50]) = rotations(3, 1, [10, 20, 30, 40, 50]) =
soln 0: [40, 50, 10, 20, 30] soln 0: [40, 50, 10, 20, 30]
@@ -30,8 +30,8 @@ rotations(3, 1, ["ten", "twenty", "thirty", "forty", "fifty"]) =
rotations(3, 1, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) = rotations(3, 1, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) =
soln 0: [[4, 0], [5, 0], [1, 0], [2, 0], [3, 0]] soln 0: [[4, 0], [5, 0], [1, 0], [2, 0], [3, 0]]
rotations(3, 1, [[1], [1, 2], [1, 2, 3], [1, 2, 3, 4]]) = rotations(3, 1, [sol([1]), sol([1, 2]), sol([1, 2, 3]), sol([1, 2, 3, 4])]) =
soln 0: [[1, 2, 3, 4], [1], [1, 2], [1, 2, 3]] soln 0: [sol([1, 2, 3, 4]), sol([1]), sol([1, 2]), sol([1, 2, 3])]
rotations(2, 1, [10, 20, 30, 40, 50]) = rotations(2, 1, [10, 20, 30, 40, 50]) =
soln 0: [30, 40, 50, 10, 20] soln 0: [30, 40, 50, 10, 20]
@@ -45,8 +45,8 @@ rotations(2, 1, ["ten", "twenty", "thirty", "forty", "fifty"]) =
rotations(2, 1, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) = rotations(2, 1, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) =
soln 0: [[3, 0], [4, 0], [5, 0], [1, 0], [2, 0]] soln 0: [[3, 0], [4, 0], [5, 0], [1, 0], [2, 0]]
rotations(2, 1, [[1], [1, 2], [1, 2, 3], [1, 2, 3, 4]]) = rotations(2, 1, [sol([1]), sol([1, 2]), sol([1, 2, 3]), sol([1, 2, 3, 4])]) =
soln 0: [[1, 2, 3], [1, 2, 3, 4], [1], [1, 2]] soln 0: [sol([1, 2, 3]), sol([1, 2, 3, 4]), sol([1]), sol([1, 2])]
rotations(2, 0, [10, 20, 30, 40, 50]) = rotations(2, 0, [10, 20, 30, 40, 50]) =
@@ -56,5 +56,5 @@ rotations(2, 0, ["ten", "twenty", "thirty", "forty", "fifty"]) =
rotations(2, 0, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) = rotations(2, 0, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) =
rotations(2, 0, [[1], [1, 2], [1, 2, 3], [1, 2, 3, 4]]) = rotations(2, 0, [sol([1]), sol([1, 2]), sol([1, 2, 3]), sol([1, 2, 3, 4])]) =

16
tests/tabling/rotate2.exp
View File

@@ -14,9 +14,9 @@ rotations(3, 2, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) =
soln 0: [[3, 0], [4, 0], [5, 0], [1, 0], [2, 0]] soln 0: [[3, 0], [4, 0], [5, 0], [1, 0], [2, 0]]
soln 1: [[4, 0], [5, 0], [1, 0], [2, 0], [3, 0]] soln 1: [[4, 0], [5, 0], [1, 0], [2, 0], [3, 0]]
rotations(3, 2, [[1], [1, 2], [1, 2, 3], [1, 2, 3, 4]]) = rotations(3, 2, [sol([1]), sol([1, 2]), sol([1, 2, 3]), sol([1, 2, 3, 4])]) =
soln 0: [[1, 2, 3], [1, 2, 3, 4], [1], [1, 2]] soln 0: [sol([1, 2, 3]), sol([1, 2, 3, 4]), sol([1]), sol([1, 2])]
soln 1: [[1, 2, 3, 4], [1], [1, 2], [1, 2, 3]] soln 1: [sol([1, 2, 3, 4]), sol([1]), sol([1, 2]), sol([1, 2, 3])]
rotations(3, 1, [10, 20, 30, 40, 50]) = rotations(3, 1, [10, 20, 30, 40, 50]) =
soln 0: [40, 50, 10, 20, 30] soln 0: [40, 50, 10, 20, 30]
@@ -30,8 +30,8 @@ rotations(3, 1, ["ten", "twenty", "thirty", "forty", "fifty"]) =
rotations(3, 1, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) = rotations(3, 1, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) =
soln 0: [[4, 0], [5, 0], [1, 0], [2, 0], [3, 0]] soln 0: [[4, 0], [5, 0], [1, 0], [2, 0], [3, 0]]
rotations(3, 1, [[1], [1, 2], [1, 2, 3], [1, 2, 3, 4]]) = rotations(3, 1, [sol([1]), sol([1, 2]), sol([1, 2, 3]), sol([1, 2, 3, 4])]) =
soln 0: [[1, 2, 3, 4], [1], [1, 2], [1, 2, 3]] soln 0: [sol([1, 2, 3, 4]), sol([1]), sol([1, 2]), sol([1, 2, 3])]
rotations(2, 1, [10, 20, 30, 40, 50]) = rotations(2, 1, [10, 20, 30, 40, 50]) =
soln 0: [30, 40, 50, 10, 20] soln 0: [30, 40, 50, 10, 20]
@@ -45,8 +45,8 @@ rotations(2, 1, ["ten", "twenty", "thirty", "forty", "fifty"]) =
rotations(2, 1, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) = rotations(2, 1, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) =
soln 0: [[3, 0], [4, 0], [5, 0], [1, 0], [2, 0]] soln 0: [[3, 0], [4, 0], [5, 0], [1, 0], [2, 0]]
rotations(2, 1, [[1], [1, 2], [1, 2, 3], [1, 2, 3, 4]]) = rotations(2, 1, [sol([1]), sol([1, 2]), sol([1, 2, 3]), sol([1, 2, 3, 4])]) =
soln 0: [[1, 2, 3], [1, 2, 3, 4], [1], [1, 2]] soln 0: [sol([1, 2, 3]), sol([1, 2, 3, 4]), sol([1]), sol([1, 2])]
rotations(2, 0, [10, 20, 30, 40, 50]) = rotations(2, 0, [10, 20, 30, 40, 50]) =
@@ -56,5 +56,5 @@ rotations(2, 0, ["ten", "twenty", "thirty", "forty", "fifty"]) =
rotations(2, 0, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) = rotations(2, 0, [[1, 0], [2, 0], [3, 0], [4, 0], [5, 0]]) =
rotations(2, 0, [[1], [1, 2], [1, 2, 3], [1, 2, 3, 4]]) = rotations(2, 0, [sol([1]), sol([1, 2]), sol([1, 2, 3]), sol([1, 2, 3, 4])]) =