diff --git a/tests/custom/STARIS_2022/basic/greatest-common-factor/gcf-inputs.solution b/tests/custom/STARIS_2022/basic/greatest-common-factor/gcf-inputs.solution index db745d9b9d..68bf6ab330 100644 --- a/tests/custom/STARIS_2022/basic/greatest-common-factor/gcf-inputs.solution +++ b/tests/custom/STARIS_2022/basic/greatest-common-factor/gcf-inputs.solution @@ -1,6 +1,3 @@ language Essence 1.3 -<<<<<<<< HEAD:tests/exhaustive/basic/perms/01_representation/enum/0003_given_permutation_in_param_2_cycle/expected/model-permutation-solution000001.solution -======== letting z be 6 ->>>>>>>> main:tests/custom/STARIS_2022/basic/greatest-common-factor/gcf-inputs.solution diff --git a/tests/custom/STARIS_2022/basic/letting-arithmetic/letting.solution b/tests/custom/STARIS_2022/basic/letting-arithmetic/letting.solution index b08ed022d6..a838675173 100644 --- a/tests/custom/STARIS_2022/basic/letting-arithmetic/letting.solution +++ b/tests/custom/STARIS_2022/basic/letting-arithmetic/letting.solution @@ -1,6 +1,3 @@ language Essence 1.3 -<<<<<<<< HEAD:tests/exhaustive/basic/perms/01_representation/enum/0004_given_permutation_in_param_2_cycle/expected/model-permutation-solution000001.solution -======== letting b be 5 ->>>>>>>> main:tests/custom/STARIS_2022/basic/letting-arithmetic/letting.solution diff --git a/tests/custom/STARIS_2022/basic/partitions/partition-01/apart.solution b/tests/custom/STARIS_2022/basic/partitions/partition-01/apart.solution index d2566910f7..4d2259d4d4 100644 --- a/tests/custom/STARIS_2022/basic/partitions/partition-01/apart.solution +++ b/tests/custom/STARIS_2022/basic/partitions/partition-01/apart.solution @@ -1,7 +1,3 @@ language Essence 1.3 -<<<<<<<< HEAD:tests/exhaustive/basic/perms/05_equality/enum/0001_given_permutations_in_param/expected/model-permutation-solution000001.solution -letting b be true -======== letting a be false ->>>>>>>> main:tests/custom/STARIS_2022/basic/partitions/partition-01/apart.solution diff --git a/tests/custom/STARIS_2022/basic/tuples/tuple-index/tuple.solution b/tests/custom/STARIS_2022/basic/tuples/tuple-index/tuple.solution index 5667f45a23..be10adf4bc 100644 --- a/tests/custom/STARIS_2022/basic/tuples/tuple-index/tuple.solution +++ b/tests/custom/STARIS_2022/basic/tuples/tuple-index/tuple.solution @@ -1,7 +1,3 @@ language Essence 1.3 -<<<<<<<< HEAD:tests/exhaustive/basic/perms/05_equality/int/0001_given_permutations_in_param/expected/model-permutation-solution000001.solution -letting b be true -======== letting x be true ->>>>>>>> main:tests/custom/STARIS_2022/basic/tuples/tuple-index/tuple.solution diff --git a/tests/custom/issues/383/stdout.expected b/tests/custom/issues/383/stdout.expected index 70e36bd72b..56a927a1c7 100644 --- a/tests/custom/issues/383/stdout.expected +++ b/tests/custom/issues/383/stdout.expected @@ -59,6 +59,6 @@ Error: 10 | find c : colours such that c = |toSet([ f(u) | u : vertices ])| | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Type error: - Expected: colours + Expected: unnamed:colours Got: int diff --git a/tests/custom/issues/459/stderr.expected b/tests/custom/issues/459/stderr.expected index 7cb7b5a5b1..0d70778ffd 100644 --- a/tests/custom/issues/459/stderr.expected +++ b/tests/custom/issues/459/stderr.expected @@ -1,5 +1,5 @@ Error: In a letting statement: letting s be domain int(S) Error: - Expected an integer, but got: set of direction + Expected an integer, but got: set of enum:direction In domain: int(S) diff --git a/tests/exhaustive/autogen/gen26_3/expected/model.eprime b/tests/exhaustive/autogen/gen26_3/expected/model.eprime index 7a5abf9891..49815d0709 100644 --- a/tests/exhaustive/autogen/gen26_3/expected/model.eprime +++ b/tests/exhaustive/autogen/gen26_3/expected/model.eprime @@ -17,7 +17,7 @@ branching on such that false, var3_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1] = - sum([toInt(q31 <= var3_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1]) | q31 : int(1..let2)]), + sum([toInt(q29 <= var3_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1]) | q29 : int(1..let2)]), var3_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1] >= 1, var3_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1] <= let2, 4096 = var3_PartitionAsSet_ExplicitR5_ExplicitVarSizeWithMarker_Marker[1] diff --git a/tests/exhaustive/issues/182/expected/model.eprime b/tests/exhaustive/issues/182/expected/model.eprime index 42f89e0671..18c701db1d 100644 --- a/tests/exhaustive/issues/182/expected/model.eprime +++ b/tests/exhaustive/issues/182/expected/model.eprime @@ -13,19 +13,19 @@ branching on p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values] such that and([1 = - sum([toInt(q23 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\ - or([q25 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q23] + sum([toInt(q21 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker /\ + or([q23 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q21] /\ and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values - [q23, q25, q26] - = q1[q26] - | q26 : int(1..2)]) - | q25 : int(1..4)])) - | q23 : int(1..4)]) + [q21, q23, q24] + = q1[q24] + | q24 : int(1..2)]) + | q23 : int(1..4)])) + | q21 : int(1..4)]) | q1 : matrix indexed by [int(1..2)] of int(1..2)]), - and([q28 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker -> - p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q28] >= 1 - | q28 : int(1..4)]), + and([q26 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker -> + p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q26] >= 1 + | q26 : int(1..4)]), and([q4 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker -> flatten([[p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q4]; int(1)], flatten([[p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values @@ -51,24 +51,21 @@ such that p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker <= 4, and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker -> and([q7 + 1 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] -> - [p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, q7, q18] - | q18 : int(1..2)] - and([q8 > p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] -> - and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, q8, q20] = 1 - | q20 : int(1..2)]) + and([p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Values[q6, q8, q18] = 1 + | q18 : int(1..2)]) | q8 : int(1..4)]) | q6 : int(1..4)]), and([q6 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker -> p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q6] <= 4 | q6 : int(1..4)]), 4 = - sum([toInt(q21 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker) * - catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q21], 0) - | q21 : int(1..4)]) + sum([toInt(q19 <= p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Marker) * + catchUndef(p_PartitionAsSet_ExplicitVarSizeWithMarkerR5_Values_ExplicitVarSizeWithMarker_Marker[q19], 0) + | q19 : int(1..4)])