diff options
| author | Sebastiano Tronto <sebastiano@tronto.net> | 2025-04-22 11:14:06 +0200 |
|---|---|---|
| committer | Sebastiano Tronto <sebastiano@tronto.net> | 2025-04-22 11:14:06 +0200 |
| commit | cd866d68cf1bf6ea928cc48a4f2b753c0b1baa6f (patch) | |
| tree | f50ad0087e90e301240b6c93dcd267cbe49b282d /test/050_compose | |
| parent | 8b72e391c7185e3da0dfbf0ab60068ac37e4d5cc (diff) | |
| download | nissy-core-cd866d68cf1bf6ea928cc48a4f2b753c0b1baa6f.tar.gz nissy-core-cd866d68cf1bf6ea928cc48a4f2b753c0b1baa6f.zip | |
Updated tests and added fixed =A to B32 output
Diffstat (limited to 'test/050_compose')
27 files changed, 42 insertions, 42 deletions
diff --git a/test/050_compose/00_solved_solved.in b/test/050_compose/00_solved_solved.in index 4ccdb6e..14c8c39 100644 --- a/test/050_compose/00_solved_solved.in +++ b/test/050_compose/00_solved_solved.in | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | UF0 UB0 DB0 DF0 UR0 UL0 DL0 DR0 FR0 FL0 BL0 BR0 UFR0 UBL0 DFL0 DBR0 UFL0 UBR0 DFR0 DBL0 | 1 | ABCDEFGH=ABCDEFGHIJKL=A |
| 2 | UF0 UB0 DB0 DF0 UR0 UL0 DL0 DR0 FR0 FL0 BL0 BR0 UFR0 UBL0 DFL0 DBR0 UFL0 UBR0 DFR0 DBL0 | 2 | ABCDEFGH=ABCDEFGHIJKL=A |
diff --git a/test/050_compose/00_solved_solved.out b/test/050_compose/00_solved_solved.out index dff224d..5aa6ba7 100644 --- a/test/050_compose/00_solved_solved.out +++ b/test/050_compose/00_solved_solved.out | |||
| @@ -1 +1 @@ | |||
| UF0 UB0 DB0 DF0 UR0 UL0 DL0 DR0 FR0 FL0 BL0 BR0 UFR0 UBL0 DFL0 DBR0 UFL0 UBR0 DFR0 DBL0 | ABCDEFGH=ABCDEFGHIJKL=A | ||
diff --git a/test/050_compose/01_solved_U.in b/test/050_compose/01_solved_U.in index e0559dd..1c136e9 100644 --- a/test/050_compose/01_solved_U.in +++ b/test/050_compose/01_solved_U.in | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | UF0 UB0 DB0 DF0 UR0 UL0 DL0 DR0 FR0 FL0 BL0 BR0 UFR0 UBL0 DFL0 DBR0 UFL0 UBR0 DFR0 DBL0 | 1 | ABCDEFGH=ABCDEFGHIJKL=A |
| 2 | UR0 UL0 DB0 DF0 UB0 UF0 DL0 DR0 FR0 FL0 BL0 BR0 UBR0 UFL0 DFL0 DBR0 UFR0 UBL0 DFR0 DBL0 | 2 | FECDABGH=EFCDBAGHIJKL=A |
diff --git a/test/050_compose/01_solved_U.out b/test/050_compose/01_solved_U.out index b5b36ad..250d3a1 100644 --- a/test/050_compose/01_solved_U.out +++ b/test/050_compose/01_solved_U.out | |||
| @@ -1 +1 @@ | |||
| UR0 UL0 DB0 DF0 UB0 UF0 DL0 DR0 FR0 FL0 BL0 BR0 UBR0 UFL0 DFL0 DBR0 UFR0 UBL0 DFR0 DBL0 | FECDABGH=EFCDBAGHIJKL=A | ||
diff --git a/test/050_compose/02_solved_scrambled.in b/test/050_compose/02_solved_scrambled.in index ad36258..c3c5a24 100644 --- a/test/050_compose/02_solved_scrambled.in +++ b/test/050_compose/02_solved_scrambled.in | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | UF0 UB0 DB0 DF0 UR0 UL0 DL0 DR0 FR0 FL0 BL0 BR0 UFR0 UBL0 DFL0 DBR0 UFL0 UBR0 DFR0 DBL0 | 1 | ABCDEFGH=ABCDEFGHIJKL=A |
| 2 | DR0 DB0 BL0 DF1 UB0 UR1 FR1 UF0 FL1 DL0 BR1 UL1 DBL2 DFL0 UBR1 DFR2 UFR0 DBR1 UBL0 UFL0 | 2 | XCNWALBE=HCKTBUYAZGbV=A |
diff --git a/test/050_compose/02_solved_scrambled.out b/test/050_compose/02_solved_scrambled.out index 263213b..37bad2b 100644 --- a/test/050_compose/02_solved_scrambled.out +++ b/test/050_compose/02_solved_scrambled.out | |||
| @@ -1 +1 @@ | |||
| DR0 DB0 BL0 DF1 UB0 UR1 FR1 UF0 FL1 DL0 BR1 UL1 DBL2 DFL0 UBR1 DFR2 UFR0 DBR1 UBL0 UFL0 | XCNWALBE=HCKTBUYAZGbV=A | ||
diff --git a/test/050_compose/11_U_solved.in b/test/050_compose/11_U_solved.in index 5993795..07fcf2c 100644 --- a/test/050_compose/11_U_solved.in +++ b/test/050_compose/11_U_solved.in | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | UR0 UL0 DB0 DF0 UB0 UF0 DL0 DR0 FR0 FL0 BL0 BR0 UBR0 UFL0 DFL0 DBR0 UFR0 UBL0 DFR0 DBL0 | 1 | FECDABGH=EFCDBAGHIJKL=A |
| 2 | UF0 UB0 DB0 DF0 UR0 UL0 DL0 DR0 FR0 FL0 BL0 BR0 UFR0 UBL0 DFL0 DBR0 UFL0 UBR0 DFR0 DBL0 | 2 | ABCDEFGH=ABCDEFGHIJKL=A |
diff --git a/test/050_compose/11_U_solved.out b/test/050_compose/11_U_solved.out index b5b36ad..250d3a1 100644 --- a/test/050_compose/11_U_solved.out +++ b/test/050_compose/11_U_solved.out | |||
| @@ -1 +1 @@ | |||
| UR0 UL0 DB0 DF0 UB0 UF0 DL0 DR0 FR0 FL0 BL0 BR0 UBR0 UFL0 DFL0 DBR0 UFR0 UBL0 DFR0 DBL0 | FECDABGH=EFCDBAGHIJKL=A | ||
diff --git a/test/050_compose/12_scrambled_solved.in b/test/050_compose/12_scrambled_solved.in index 3efd52c..9ae4ad3 100644 --- a/test/050_compose/12_scrambled_solved.in +++ b/test/050_compose/12_scrambled_solved.in | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | DR0 DB0 BL0 DF1 UB0 UR1 FR1 UF0 FL1 DL0 BR1 UL1 DBL2 DFL0 UBR1 DFR2 UFR0 DBR1 UBL0 UFL0 | 1 | XCNWALBE=HCKTBUYAZGbV=A |
| 2 | UF0 UB0 DB0 DF0 UR0 UL0 DL0 DR0 FR0 FL0 BL0 BR0 UFR0 UBL0 DFL0 DBR0 UFL0 UBR0 DFR0 DBL0 | 2 | ABCDEFGH=ABCDEFGHIJKL=A |
diff --git a/test/050_compose/12_scrambled_solved.out b/test/050_compose/12_scrambled_solved.out index 263213b..37bad2b 100644 --- a/test/050_compose/12_scrambled_solved.out +++ b/test/050_compose/12_scrambled_solved.out | |||
| @@ -1 +1 @@ | |||
| DR0 DB0 BL0 DF1 UB0 UR1 FR1 UF0 FL1 DL0 BR1 UL1 DBL2 DFL0 UBR1 DFR2 UFR0 DBR1 UBL0 UFL0 | XCNWALBE=HCKTBUYAZGbV=A | ||
diff --git a/test/050_compose/20_U_U.in b/test/050_compose/20_U_U.in index 2778e82..b54ecde 100644 --- a/test/050_compose/20_U_U.in +++ b/test/050_compose/20_U_U.in | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | UR0 UL0 DB0 DF0 UB0 UF0 DL0 DR0 FR0 FL0 BL0 BR0 UBR0 UFL0 DFL0 DBR0 UFR0 UBL0 DFR0 DBL0 | 1 | FECDABGH=EFCDBAGHIJKL=A |
| 2 | UR0 UL0 DB0 DF0 UB0 UF0 DL0 DR0 FR0 FL0 BL0 BR0 UBR0 UFL0 DFL0 DBR0 UFR0 UBL0 DFR0 DBL0 | 2 | FECDABGH=EFCDBAGHIJKL=A |
diff --git a/test/050_compose/20_U_U.out b/test/050_compose/20_U_U.out index 316ad57..b14792e 100644 --- a/test/050_compose/20_U_U.out +++ b/test/050_compose/20_U_U.out | |||
| @@ -1 +1 @@ | |||
| UB0 UF0 DB0 DF0 UL0 UR0 DL0 DR0 FR0 FL0 BL0 BR0 UBL0 UFR0 DFL0 DBR0 UBR0 UFL0 DFR0 DBL0 | BACDFEGH=BACDFEGHIJKL=A | ||
diff --git a/test/050_compose/21_U_Uinverse.in b/test/050_compose/21_U_Uinverse.in index 495220e..f9f3b21 100644 --- a/test/050_compose/21_U_Uinverse.in +++ b/test/050_compose/21_U_Uinverse.in | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | UR0 UL0 DB0 DF0 UB0 UF0 DL0 DR0 FR0 FL0 BL0 BR0 UBR0 UFL0 DFL0 DBR0 UFR0 UBL0 DFR0 DBL0 | 1 | FECDABGH=EFCDBAGHIJKL=A |
| 2 | UL0 UR0 DB0 DF0 UF0 UB0 DL0 DR0 FR0 FL0 BL0 BR0 UFL0 UBR0 DFL0 DBR0 UBL0 UFR0 DFR0 DBL0 | 2 | EFCDBAGH=FECDABGHIJKL=A |
diff --git a/test/050_compose/21_U_Uinverse.out b/test/050_compose/21_U_Uinverse.out index dff224d..5aa6ba7 100644 --- a/test/050_compose/21_U_Uinverse.out +++ b/test/050_compose/21_U_Uinverse.out | |||
| @@ -1 +1 @@ | |||
| UF0 UB0 DB0 DF0 UR0 UL0 DL0 DR0 FR0 FL0 BL0 BR0 UFR0 UBL0 DFL0 DBR0 UFL0 UBR0 DFR0 DBL0 | ABCDEFGH=ABCDEFGHIJKL=A | ||
diff --git a/test/050_compose/22_F_Finverse.in b/test/050_compose/22_F_Finverse.in index 4a2f1e6..86a253b 100644 --- a/test/050_compose/22_F_Finverse.in +++ b/test/050_compose/22_F_Finverse.in | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | FL1 UB0 DB0 FR1 UR0 UL0 DL0 DR0 UF1 DF1 BL0 BR0 UFL1 UBL0 DFR1 DBR0 DFL2 UBR0 UFR2 DBL0 | 1 | MBODSFQH=ZBCYEFGHQTKL=A |
| 2 | FR1 UB0 DB0 FL1 UR0 UL0 DL0 DR0 DF1 UF1 BL0 BR0 DFR1 UBL0 UFL1 DBR0 UFR2 UBR0 DFL2 DBL0 | 2 | OBMDQFSH=YBCZEFGHTQKL=A |
diff --git a/test/050_compose/22_F_Finverse.out b/test/050_compose/22_F_Finverse.out index dff224d..5aa6ba7 100644 --- a/test/050_compose/22_F_Finverse.out +++ b/test/050_compose/22_F_Finverse.out | |||
| @@ -1 +1 @@ | |||
| UF0 UB0 DB0 DF0 UR0 UL0 DL0 DR0 FR0 FL0 BL0 BR0 UFR0 UBL0 DFL0 DBR0 UFL0 UBR0 DFR0 DBL0 | ABCDEFGH=ABCDEFGHIJKL=A | ||
diff --git a/test/050_compose/23_F2_F2.in b/test/050_compose/23_F2_F2.in index 5fd1081..f331c99 100644 --- a/test/050_compose/23_F2_F2.in +++ b/test/050_compose/23_F2_F2.in | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | DF0 UB0 DB0 UF0 UR0 UL0 DL0 DR0 FL0 FR0 BL0 BR0 DFL0 UBL0 UFR0 DBR0 DFR0 UBR0 UFL0 DBL0 | 1 | CBADGFEH=DBCAEFGHJIKL=A |
| 2 | DF0 UB0 DB0 UF0 UR0 UL0 DL0 DR0 FL0 FR0 BL0 BR0 DFL0 UBL0 UFR0 DBR0 DFR0 UBR0 UFL0 DBL0 | 2 | CBADGFEH=DBCAEFGHJIKL=A |
diff --git a/test/050_compose/23_F2_F2.out b/test/050_compose/23_F2_F2.out index dff224d..5aa6ba7 100644 --- a/test/050_compose/23_F2_F2.out +++ b/test/050_compose/23_F2_F2.out | |||
| @@ -1 +1 @@ | |||
| UF0 UB0 DB0 DF0 UR0 UL0 DL0 DR0 FR0 FL0 BL0 BR0 UFR0 UBL0 DFL0 DBR0 UFL0 UBR0 DFR0 DBL0 | ABCDEFGH=ABCDEFGHIJKL=A | ||
diff --git a/test/050_compose/24_U_F.in b/test/050_compose/24_U_F.in index d353f95..5bdee45 100644 --- a/test/050_compose/24_U_F.in +++ b/test/050_compose/24_U_F.in | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | UR0 UL0 DB0 DF0 UB0 UF0 DL0 DR0 FR0 FL0 BL0 BR0 UBR0 UFL0 DFL0 DBR0 UFR0 UBL0 DFR0 DBL0 | 1 | FECDABGH=EFCDBAGHIJKL=A |
| 2 | FL1 UB0 DB0 FR1 UR0 UL0 DL0 DR0 UF1 DF1 BL0 BR0 UFL1 UBL0 DFR1 DBR0 DFL2 UBR0 UFR2 DBL0 | 2 | MBODSFQH=ZBCYEFGHQTKL=A |
diff --git a/test/050_compose/24_U_F.out b/test/050_compose/24_U_F.out index 4fda397..facb381 100644 --- a/test/050_compose/24_U_F.out +++ b/test/050_compose/24_U_F.out | |||
| @@ -1 +1 @@ | |||
| FL1 UL0 DB0 FR1 UB0 UF0 DL0 DR0 UR1 DF1 BL0 BR0 UFR1 UFL0 DFR1 DBR0 DFL2 UBL0 UBR2 DBL0 | IEODSBVH=ZFCYBAGHUTKL=A | ||
diff --git a/test/050_compose/25_F_R.in b/test/050_compose/25_F_R.in index 2cb5455..caecc38 100644 --- a/test/050_compose/25_F_R.in +++ b/test/050_compose/25_F_R.in | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | FL1 UB0 DB0 FR1 UR0 UL0 DL0 DR0 UF1 DF1 BL0 BR0 UFL1 UBL0 DFR1 DBR0 DFL2 UBR0 UFR2 DBL0 | 1 | MBODSFQH=ZBCYEFGHQTKL=A |
| 2 | UF0 UB0 DB0 DF0 FR0 UL0 DL0 BR0 DR0 FL0 BL0 UR0 DFR2 UBL0 DFL0 UBR2 UFL0 UFR1 DBR1 DBL0 | 2 | WBCVEILH=ABCDIFGLHJKE=A |
diff --git a/test/050_compose/25_F_R.out b/test/050_compose/25_F_R.out index 2119f37..c4ddf2d 100644 --- a/test/050_compose/25_F_R.out +++ b/test/050_compose/25_F_R.out | |||
| @@ -1 +1 @@ | |||
| FL1 UB0 DB0 FR1 UF1 UL0 DL0 BR0 DR0 DF1 BL0 UR0 UFR1 UBL0 DFR1 UBR2 DFL2 UFL2 DBR1 DBL0 | IBOVSULH=ZBCYQFGLHTKE=A | ||
diff --git a/test/050_compose/30_scrambled_inverse.in b/test/050_compose/30_scrambled_inverse.in index abf72e2..92ebae3 100644 --- a/test/050_compose/30_scrambled_inverse.in +++ b/test/050_compose/30_scrambled_inverse.in | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | UL0 BL0 BR1 DL0 FR0 DF0 DB1 DR1 UB0 FL0 UF0 UR1 DFL0 UFR1 DBR1 UBR2 DBL2 DFR0 UFL1 UBL2 | 1 | CILVXGMR=FKbGIDSXBJAU=A |
| 2 | BL0 FR0 DL1 UL0 BR1 UF0 DF0 DR1 UR0 FL0 UB0 DB1 UBL2 DBL1 UFR0 DFL2 DFR2 DBR1 UBR0 UFL1 | 2 | RPASWLFM=KIWFbADXEJBS=A |
| 3 | 3 | ||
| 4 | // Scramble: U R D' L D' F L2 D L F B D2 B' L2 F U2 L2 D2 R2 L2 B' | 4 | // Scramble: U R D' L D' F L2 D L F B D2 B' L2 F U2 L2 D2 R2 L2 B' |
diff --git a/test/050_compose/30_scrambled_inverse.out b/test/050_compose/30_scrambled_inverse.out index dff224d..5aa6ba7 100644 --- a/test/050_compose/30_scrambled_inverse.out +++ b/test/050_compose/30_scrambled_inverse.out | |||
| @@ -1 +1 @@ | |||
| UF0 UB0 DB0 DF0 UR0 UL0 DL0 DR0 FR0 FL0 BL0 BR0 UFR0 UBL0 DFL0 DBR0 UFL0 UBR0 DFR0 DBL0 | ABCDEFGH=ABCDEFGHIJKL=A | ||
diff --git a/test/050_compose/31_scrambled_scrambled.in b/test/050_compose/31_scrambled_scrambled.in index 7fe874c..904292f 100644 --- a/test/050_compose/31_scrambled_scrambled.in +++ b/test/050_compose/31_scrambled_scrambled.in | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | UL0 BL0 BR1 DL0 FR0 DF0 DB1 DR1 UB0 FL0 UF0 UR1 DFL0 UFR1 DBR1 UBR2 DBL2 DFR0 UFL1 UBL2 | 1 | CILVXGMR=FKbGIDSXBJAU=A |
| 2 | FL1 BR0 DB0 UR1 UF0 UB0 DL0 FR0 UL1 DF1 BL0 DR0 UBL1 DBR1 UFR2 DFR2 DFL2 UBR2 UFL2 DBL0 | 2 | JLQWSVUH=ZLCUABGIVTKH=A |
| 3 | // Scramble: U R D' L D' F L2 D L F B D2 B' L2 F U2 L2 D2 R2 L2 B' | 3 | // Scramble: U R D' L D' F L2 D L F B D2 B' L2 F U2 L2 D2 R2 L2 B' |
| 4 | // Followed by R' U' F | 4 | // Followed by R' U' F |
diff --git a/test/050_compose/31_scrambled_scrambled.out b/test/050_compose/31_scrambled_scrambled.out index 353fb49..426e4fe 100644 --- a/test/050_compose/31_scrambled_scrambled.out +++ b/test/050_compose/31_scrambled_scrambled.out | |||
| @@ -1 +1 @@ | |||
| FL1 UR1 BR1 FR1 UL0 BL0 DB1 UB0 DF1 DL1 UF0 DR1 UFR2 UBR0 DFL2 UFL0 DBR0 DFR2 DBL1 UBL2 | QFSEDWPR=ZUbYFKSBTWAX=A | ||
diff --git a/test/050_compose/compose_tests.c b/test/050_compose/compose_tests.c index c778838..c61775f 100644 --- a/test/050_compose/compose_tests.c +++ b/test/050_compose/compose_tests.c | |||
| @@ -7,9 +7,9 @@ void run(void) { | |||
| 7 | cube_t c1, c2, c3; | 7 | cube_t c1, c2, c3; |
| 8 | 8 | ||
| 9 | fgets(str, STRLENMAX, stdin); | 9 | fgets(str, STRLENMAX, stdin); |
| 10 | c1 = readcube("H48", str); | 10 | c1 = readcube(str); |
| 11 | fgets(str, STRLENMAX, stdin); | 11 | fgets(str, STRLENMAX, stdin); |
| 12 | c2 = readcube("H48", str); | 12 | c2 = readcube(str); |
| 13 | 13 | ||
| 14 | c3 = compose(c1, c2); | 14 | c3 = compose(c1, c2); |
| 15 | 15 | ||
| @@ -18,7 +18,7 @@ void run(void) { | |||
| 18 | } else if (!issolvable(c3)) { | 18 | } else if (!issolvable(c3)) { |
| 19 | printf("Composed cube is not solvable\n"); | 19 | printf("Composed cube is not solvable\n"); |
| 20 | } else { | 20 | } else { |
| 21 | writecube("H48", c3, NISSY_SIZE_H48, str); | 21 | writecube(c3, NISSY_SIZE_CUBE, str); |
| 22 | printf("%s\n", str); | 22 | printf("%s\n", str); |
| 23 | } | 23 | } |
| 24 | } | 24 | } |
