-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
efb43eb
commit 51d0b0b
Showing
28 changed files
with
85 additions
and
96 deletions.
There are no files selected for viewing
10 changes: 5 additions & 5 deletions
10
tests/custom/permutations/04_image/enum/0001_given_permutation_given_enum/stdout.expected
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| Generating models for permutation.essence | ||
| Generated models: model000001.eprime | ||
| Saved under: conjure-output | ||
| Savile Row: model000001.eprime permutation2.param | ||
| Savile Row: model000001.eprime permutation.param | ||
| Running minion for domain filtering. | ||
| Running solver: minion | ||
| Savile Row: model000001.eprime permutation.param | ||
| Savile Row: model000001.eprime permutation2.param | ||
| Running minion for domain filtering. | ||
| Running solver: minion | ||
| Copying solution to: permutation-permutation2.solution | ||
| Copying solution to: permutation-permutation.solution | ||
| Copying solution to: permutation-permutation2.solution | ||
| language Essence 1.3 | ||
|
|
||
| letting j be E6 | ||
| letting j be E3 | ||
| language Essence 1.3 | ||
|
|
||
| letting j be E3 | ||
| letting j be E6 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletions
10
tests/custom/permutations/04_image/enum/0005_find_permutation_given_enums/stdout.expected
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| Generating models for permutation.essence | ||
| Generated models: model000001.eprime | ||
| Saved under: conjure-output | ||
| Savile Row: model000001.eprime permutation2.param | ||
| Savile Row: model000001.eprime permutation.param | ||
| Running minion for domain filtering. | ||
| Running solver: minion | ||
| Savile Row: model000001.eprime permutation.param | ||
| Savile Row: model000001.eprime permutation2.param | ||
| Running minion for domain filtering. | ||
| Running solver: minion | ||
| Copying solution to: permutation-permutation2.solution | ||
| Copying solution to: permutation-permutation.solution | ||
| Copying solution to: permutation-permutation2.solution | ||
| language Essence 1.3 | ||
|
|
||
| letting p be permutation((E4, E5, E6)) | ||
| letting p be permutation((E3, E5, E4)) | ||
| language Essence 1.3 | ||
|
|
||
| letting p be permutation((E3, E5, E4)) | ||
| letting p be permutation((E4, E5, E6)) |
10 changes: 5 additions & 5 deletions
10
tests/custom/permutations/04_image/enum/0006_letting_permutation_given_enum/stdout.expected
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| Generating models for permutation.essence | ||
| Generated models: model000001.eprime | ||
| Saved under: conjure-output | ||
| Savile Row: model000001.eprime permutation2.param | ||
| Savile Row: model000001.eprime permutation.param | ||
| Running minion for domain filtering. | ||
| Running solver: minion | ||
| Savile Row: model000001.eprime permutation.param | ||
| Savile Row: model000001.eprime permutation2.param | ||
| Running minion for domain filtering. | ||
| Running solver: minion | ||
| Copying solution to: permutation-permutation2.solution | ||
| Copying solution to: permutation-permutation.solution | ||
| Copying solution to: permutation-permutation2.solution | ||
| language Essence 1.3 | ||
|
|
||
| letting j be E6 | ||
| letting j be E3 | ||
| language Essence 1.3 | ||
|
|
||
| letting j be E3 | ||
| letting j be E6 |
10 changes: 5 additions & 5 deletions
10
tests/custom/permutations/04_image/int/0001_given_permutation_given_int/stdout.expected
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| Generating models for permutation.essence | ||
| Generated models: model000001.eprime | ||
| Saved under: conjure-output | ||
| Savile Row: model000001.eprime permutation2.param | ||
| Savile Row: model000001.eprime permutation.param | ||
| Running minion for domain filtering. | ||
| Running solver: minion | ||
| Savile Row: model000001.eprime permutation.param | ||
| Savile Row: model000001.eprime permutation2.param | ||
| Running minion for domain filtering. | ||
| Running solver: minion | ||
| Copying solution to: permutation-permutation2.solution | ||
| Copying solution to: permutation-permutation.solution | ||
| Copying solution to: permutation-permutation2.solution | ||
| language Essence 1.3 | ||
|
|
||
| letting j be 6 | ||
| letting j be 3 | ||
| language Essence 1.3 | ||
|
|
||
| letting j be 3 | ||
| letting j be 6 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletions
10
tests/custom/permutations/04_image/int/0005_find_permutation_given_ints/stdout.expected
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| Generating models for permutation.essence | ||
| Generated models: model000001.eprime | ||
| Saved under: conjure-output | ||
| Savile Row: model000001.eprime permutation2.param | ||
| Savile Row: model000001.eprime permutation.param | ||
| Running minion for domain filtering. | ||
| Running solver: minion | ||
| Savile Row: model000001.eprime permutation.param | ||
| Savile Row: model000001.eprime permutation2.param | ||
| Running minion for domain filtering. | ||
| Running solver: minion | ||
| Copying solution to: permutation-permutation2.solution | ||
| Copying solution to: permutation-permutation.solution | ||
| Copying solution to: permutation-permutation2.solution | ||
| language Essence 1.3 | ||
|
|
||
| letting p be permutation((1, 2, 4)) | ||
| letting p be permutation((2, 4, 3)) | ||
| language Essence 1.3 | ||
|
|
||
| letting p be permutation((2, 4, 3)) | ||
| letting p be permutation((1, 2, 4)) |
10 changes: 5 additions & 5 deletions
10
tests/custom/permutations/04_image/int/0006_letting_permutation_given_int/stdout.expected
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| Generating models for permutation.essence | ||
| Generated models: model000001.eprime | ||
| Saved under: conjure-output | ||
| Savile Row: model000001.eprime permutation2.param | ||
| Savile Row: model000001.eprime permutation.param | ||
| Running minion for domain filtering. | ||
| Running solver: minion | ||
| Savile Row: model000001.eprime permutation.param | ||
| Savile Row: model000001.eprime permutation2.param | ||
| Running minion for domain filtering. | ||
| Running solver: minion | ||
| Copying solution to: permutation-permutation2.solution | ||
| Copying solution to: permutation-permutation.solution | ||
| Copying solution to: permutation-permutation2.solution | ||
| language Essence 1.3 | ||
|
|
||
| letting j be 6 | ||
| letting j be 3 | ||
| language Essence 1.3 | ||
|
|
||
| letting j be 3 | ||
| letting j be 6 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletions
10
tests/custom/permutations/07_compose/enum/0003_letting_and_find/stdout.expected
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| Generating models for permutation.essence | ||
| Generated models: model000001.eprime | ||
| Saved under: conjure-output | ||
| Savile Row: model000001.eprime permutation2.param | ||
| Savile Row: model000001.eprime permutation.param | ||
| Running minion for domain filtering. | ||
| Running solver: minion | ||
| Savile Row: model000001.eprime permutation.param | ||
| Savile Row: model000001.eprime permutation2.param | ||
| Running minion for domain filtering. | ||
| Running solver: minion | ||
| Copying solution to: permutation-permutation2.solution | ||
| Copying solution to: permutation-permutation.solution | ||
| Copying solution to: permutation-permutation2.solution | ||
| language Essence 1.3 | ||
|
|
||
| letting p be permutation((E2, E3)) | ||
| letting p be permutation((E2, E4, E3)) | ||
| language Essence 1.3 | ||
|
|
||
| letting p be permutation((E2, E4, E3)) | ||
| letting p be permutation((E2, E3)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletions
10
tests/custom/permutations/07_compose/int/0003_letting_and_find/stdout.expected
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| Generating models for permutation.essence | ||
| Generated models: model000001.eprime | ||
| Saved under: conjure-output | ||
| Savile Row: model000001.eprime permutation2.param | ||
| Savile Row: model000001.eprime permutation.param | ||
| Running minion for domain filtering. | ||
| Running solver: minion | ||
| Savile Row: model000001.eprime permutation.param | ||
| Savile Row: model000001.eprime permutation2.param | ||
| Running minion for domain filtering. | ||
| Running solver: minion | ||
| Copying solution to: permutation-permutation2.solution | ||
| Copying solution to: permutation-permutation.solution | ||
| Copying solution to: permutation-permutation2.solution | ||
| language Essence 1.3 | ||
|
|
||
| letting p be permutation((2, 3)) | ||
| letting p be permutation((2, 4, 3)) | ||
| language Essence 1.3 | ||
|
|
||
| letting p be permutation((2, 4, 3)) | ||
| letting p be permutation((2, 3)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 0 additions & 6 deletions
6
...permutations/17_transform_partition/enum/0010_given_partition_of_enum_BUG/stderr.expected
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 0 additions & 7 deletions
7
.../permutations/17_transform_partition/enum/0020_find_partition_of_enum_BUG/stderr.expected
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 0 additions & 7 deletions
7
...entation/enum/0001_given_permutation_in_param/expected/model-cyc1-solution000001.solution
This file was deleted.
Oops, something went wrong.
6 changes: 0 additions & 6 deletions
6
...entation/enum/0001_given_permutation_in_param/expected/model-cyc2-solution000001.solution
This file was deleted.
Oops, something went wrong.
2 changes: 2 additions & 0 deletions
2
...s/01_representation/enum/0001_given_permutation_in_param/permutation-permutation.solution
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| language Essence 1.3 | ||
|
|
3 changes: 3 additions & 0 deletions
3
...sic/perms/01_representation/enum/0001_given_permutation_in_param/permutation.eprime-param
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| language ESSENCE' 1.0 | ||
|
|
||
| letting p_PermutationAsFunction_PermutationFunction_Function1D be [3, 2, 4, 1; int(1..4)] |
4 changes: 0 additions & 4 deletions
4
...n/enum/0002_given_permutation_in_param/expected/model-permutation-solution000001.solution
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,2 @@ | ||
| language Essence 1.3 | ||
|
|
||
| <<<<<<<< HEAD:tests/exhaustive/basic/perms/01_representation/enum/0002_given_permutation_in_param/expected/model-permutation-solution000001.solution | ||
| ======== | ||
| letting b be 0 | ||
| >>>>>>>> main:tests/exhaustive/basic/perms/01_representation/enum/0001_given_permutation_in_param/expected/model-cyc2-solution000001.solution |
4 changes: 0 additions & 4 deletions
4
...003_given_permutation_in_param_2_cycle/expected/model-permutation-solution000001.solution
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,2 @@ | ||
| 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 |
4 changes: 0 additions & 4 deletions
4
...004_given_permutation_in_param_2_cycle/expected/model-permutation-solution000001.solution
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,2 @@ | ||
| 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 |
4 changes: 0 additions & 4 deletions
4
...enum/0001_given_permutation_given_enum/expected/model-permutation-solution000001.solution
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,3 @@ | ||
| language Essence 1.3 | ||
|
|
||
| <<<<<<<< HEAD:tests/exhaustive/basic/perms/04_image/enum/0001_given_permutation_given_enum/expected/model-permutation-solution000001.solution | ||
| letting j be E3 | ||
| ======== | ||
| letting b be 0 | ||
| >>>>>>>> main:tests/exhaustive/basic/perms/01_representation/enum/0001_given_permutation_in_param/expected/model-cyc1-solution000001.solution |
4 changes: 0 additions & 4 deletions
4
.../enum/0001_given_permutations_in_param/expected/model-permutation-solution000001.solution
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
4 changes: 0 additions & 4 deletions
4
...y/int/0001_given_permutations_in_param/expected/model-permutation-solution000001.solution
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |