From cd866d68cf1bf6ea928cc48a4f2b753c0b1baa6f Mon Sep 17 00:00:00 2001 From: Sebastiano Tronto Date: Tue, 22 Apr 2025 11:14:06 +0200 Subject: Updated tests and added fixed =A to B32 output --- test/030_move/000_nomove_solved.in | 2 +- test/030_move/000_nomove_solved.out | 2 +- test/030_move/001_nomove_scrambled.in | 2 +- test/030_move/001_nomove_scrambled.out | 2 +- test/030_move/010_U_solved.in | 2 +- test/030_move/010_U_solved.out | 2 +- test/030_move/011_U_scrambled.in | 2 +- test/030_move/011_U_scrambled.out | 2 +- test/030_move/012_U_inverse.in | 2 +- test/030_move/012_U_inverse.out | 2 +- test/030_move/020_U2_solved.in | 2 +- test/030_move/020_U2_solved.out | 2 +- test/030_move/021_U2_scrambled.in | 2 +- test/030_move/021_U2_scrambled.out | 2 +- test/030_move/022_U2_inverse.in | 2 +- test/030_move/022_U2_inverse.out | 2 +- test/030_move/030_U3_solved.in | 2 +- test/030_move/030_U3_solved.out | 2 +- test/030_move/031_U3_inverse.in | 2 +- test/030_move/031_U3_inverse.out | 2 +- test/030_move/032_U3_scrambled.in | 2 +- test/030_move/032_U3_scrambled.out | 2 +- test/030_move/033_U3_with_prime.in | 2 +- test/030_move/033_U3_with_prime.out | 2 +- test/030_move/040_D_solved.in | 2 +- test/030_move/040_D_solved.out | 2 +- test/030_move/050_D2_solved.in | 2 +- test/030_move/050_D2_solved.out | 2 +- test/030_move/060_D3_solved.in | 2 +- test/030_move/060_D3_solved.out | 2 +- test/030_move/070_R_solved.in | 2 +- test/030_move/070_R_solved.out | 2 +- test/030_move/071_R_scrambled.in | 2 +- test/030_move/071_R_scrambled.out | 2 +- test/030_move/080_R2_solved.in | 2 +- test/030_move/080_R2_solved.out | 2 +- test/030_move/090_R3_solved.in | 2 +- test/030_move/090_R3_solved.out | 2 +- test/030_move/100_L_solved.in | 2 +- test/030_move/100_L_solved.out | 2 +- test/030_move/110_L2_solved.in | 2 +- test/030_move/110_L2_solved.out | 2 +- test/030_move/120_L3_solved.in | 2 +- test/030_move/120_L3_solved.out | 2 +- test/030_move/130_F_solved.in | 2 +- test/030_move/130_F_solved.out | 2 +- test/030_move/132_F_scrambled.in | 2 +- test/030_move/132_F_scrambled.out | 2 +- test/030_move/133_F_scrambled_2.in | 2 +- test/030_move/133_F_scrambled_2.out | 2 +- test/030_move/140_F2_solved.in | 2 +- test/030_move/140_F2_solved.out | 2 +- test/030_move/150_F3_solved.in | 2 +- test/030_move/150_F3_solved.out | 2 +- test/030_move/160_B_solved.in | 2 +- test/030_move/160_B_solved.out | 2 +- test/030_move/170_B2_solved.in | 2 +- test/030_move/170_B2_solved.out | 2 +- test/030_move/180_B3_solved.in | 2 +- test/030_move/180_B3_solved.out | 2 +- test/030_move/200_scramble_solved.in | 2 +- test/030_move/200_scramble_solved.out | 2 +- test/030_move/201_solution_scrambled.in | 2 +- test/030_move/201_solution_scrambled.out | 2 +- test/030_move/300_multimove_solved.in | 2 +- test/030_move/300_multimove_solved.out | 2 +- test/030_move/301_multimove_scrambled.in | 2 +- test/030_move/301_multimove_scrambled.out | 2 +- test/030_move/move_tests.c | 4 ++-- 69 files changed, 70 insertions(+), 70 deletions(-) (limited to 'test/030_move') diff --git a/test/030_move/000_nomove_solved.in b/test/030_move/000_nomove_solved.in index 07cf178..149c123 100644 --- a/test/030_move/000_nomove_solved.in +++ b/test/030_move/000_nomove_solved.in @@ -1,2 +1,2 @@ -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/030_move/000_nomove_solved.out b/test/030_move/000_nomove_solved.out index dff224d..5aa6ba7 100644 --- a/test/030_move/000_nomove_solved.out +++ b/test/030_move/000_nomove_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/030_move/001_nomove_scrambled.in b/test/030_move/001_nomove_scrambled.in index fd1d23c..700d45f 100644 --- a/test/030_move/001_nomove_scrambled.in +++ b/test/030_move/001_nomove_scrambled.in @@ -1,2 +1,2 @@ -BR0 DF1 DL1 FR0 UB1 DR1 UF0 UR0 UL0 FL1 BL0 DB1 UBL0 DBR1 UFL1 DFR2 UFR0 UBR1 DBL1 DFL0 +BLMWANPC=LTWIRXAEFZKS=A diff --git a/test/030_move/001_nomove_scrambled.out b/test/030_move/001_nomove_scrambled.out index bd2cca0..d1fc648 100644 --- a/test/030_move/001_nomove_scrambled.out +++ b/test/030_move/001_nomove_scrambled.out @@ -1 +1 @@ -BR0 DF1 DL1 FR0 UB1 DR1 UF0 UR0 UL0 FL1 BL0 DB1 UBL0 DBR1 UFL1 DFR2 UFR0 UBR1 DBL1 DFL0 +BLMWANPC=LTWIRXAEFZKS=A diff --git a/test/030_move/010_U_solved.in b/test/030_move/010_U_solved.in index 62495cb..3c87da7 100644 --- a/test/030_move/010_U_solved.in +++ b/test/030_move/010_U_solved.in @@ -1,2 +1,2 @@ U -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/030_move/010_U_solved.out b/test/030_move/010_U_solved.out index b5b36ad..250d3a1 100644 --- a/test/030_move/010_U_solved.out +++ b/test/030_move/010_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/030_move/011_U_scrambled.in b/test/030_move/011_U_scrambled.in index 012faaf..7245f4e 100644 --- a/test/030_move/011_U_scrambled.in +++ b/test/030_move/011_U_scrambled.in @@ -1,2 +1,2 @@ U -BR0 DF1 DL1 FR0 UB1 DR1 UF0 UR0 UL0 FL1 BL0 DB1 UBL0 DBR1 UFL1 DFR2 UFR0 UBR1 DBL1 DFL0 +BLMWANPC=LTWIRXAEFZKS=A diff --git a/test/030_move/011_U_scrambled.out b/test/030_move/011_U_scrambled.out index 46d2ef7..fb9b6c9 100644 --- a/test/030_move/011_U_scrambled.out +++ b/test/030_move/011_U_scrambled.out @@ -1 +1 @@ -UB1 DR1 DL1 FR0 DF1 BR0 UF0 UR0 UL0 FL1 BL0 DB1 UBR1 UFR0 UFL1 DFR2 UBL0 DBR1 DBL1 DFL0 +NAMWBLPC=RXWITLAEFZKS=A diff --git a/test/030_move/012_U_inverse.in b/test/030_move/012_U_inverse.in index 2aa7ffa..4a41554 100644 --- a/test/030_move/012_U_inverse.in +++ b/test/030_move/012_U_inverse.in @@ -1,2 +1,2 @@ U -UL0 UR0 DB0 DF0 UF0 UB0 DL0 DR0 FR0 FL0 BL0 BR0 UFL0 UBR0 DFL0 DBR0 UBL0 UFR0 DFR0 DBL0 +EFCDBAGH=FECDABGHIJKL=A diff --git a/test/030_move/012_U_inverse.out b/test/030_move/012_U_inverse.out index dff224d..5aa6ba7 100644 --- a/test/030_move/012_U_inverse.out +++ b/test/030_move/012_U_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/030_move/020_U2_solved.in b/test/030_move/020_U2_solved.in index ccc84ef..a261a22 100644 --- a/test/030_move/020_U2_solved.in +++ b/test/030_move/020_U2_solved.in @@ -1,2 +1,2 @@ U2 -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/030_move/020_U2_solved.out b/test/030_move/020_U2_solved.out index 316ad57..b14792e 100644 --- a/test/030_move/020_U2_solved.out +++ b/test/030_move/020_U2_solved.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/030_move/021_U2_scrambled.in b/test/030_move/021_U2_scrambled.in index bdc034e..5e7fab6 100644 --- a/test/030_move/021_U2_scrambled.in +++ b/test/030_move/021_U2_scrambled.in @@ -1,2 +1,2 @@ U2 -BR0 DF1 DL1 FR0 UB1 DR1 UF0 UR0 UL0 FL1 BL0 DB1 UBL0 DBR1 UFL1 DFR2 UFR0 UBR1 DBL1 DFL0 +BLMWANPC=LTWIRXAEFZKS=A diff --git a/test/030_move/021_U2_scrambled.out b/test/030_move/021_U2_scrambled.out index c89ca1f..c95806f 100644 --- a/test/030_move/021_U2_scrambled.out +++ b/test/030_move/021_U2_scrambled.out @@ -1 +1 @@ -DF1 BR0 DL1 FR0 DR1 UB1 UF0 UR0 UL0 FL1 BL0 DB1 DBR1 UBL0 UFL1 DFR2 UBR1 UFR0 DBL1 DFL0 +LBMWNAPC=TLWIXRAEFZKS=A diff --git a/test/030_move/022_U2_inverse.in b/test/030_move/022_U2_inverse.in index 8ace160..071ab85 100644 --- a/test/030_move/022_U2_inverse.in +++ b/test/030_move/022_U2_inverse.in @@ -1,2 +1,2 @@ U2 -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/030_move/022_U2_inverse.out b/test/030_move/022_U2_inverse.out index dff224d..5aa6ba7 100644 --- a/test/030_move/022_U2_inverse.out +++ b/test/030_move/022_U2_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/030_move/030_U3_solved.in b/test/030_move/030_U3_solved.in index 49a8847..42bfad7 100644 --- a/test/030_move/030_U3_solved.in +++ b/test/030_move/030_U3_solved.in @@ -1,2 +1,2 @@ U3 -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/030_move/030_U3_solved.out b/test/030_move/030_U3_solved.out index 7721ab5..111ba2b 100644 --- a/test/030_move/030_U3_solved.out +++ b/test/030_move/030_U3_solved.out @@ -1 +1 @@ -UL0 UR0 DB0 DF0 UF0 UB0 DL0 DR0 FR0 FL0 BL0 BR0 UFL0 UBR0 DFL0 DBR0 UBL0 UFR0 DFR0 DBL0 +EFCDBAGH=FECDABGHIJKL=A diff --git a/test/030_move/031_U3_inverse.in b/test/030_move/031_U3_inverse.in index 44b6ce3..50788bd 100644 --- a/test/030_move/031_U3_inverse.in +++ b/test/030_move/031_U3_inverse.in @@ -1,2 +1,2 @@ U3 -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/030_move/031_U3_inverse.out b/test/030_move/031_U3_inverse.out index dff224d..5aa6ba7 100644 --- a/test/030_move/031_U3_inverse.out +++ b/test/030_move/031_U3_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/030_move/032_U3_scrambled.in b/test/030_move/032_U3_scrambled.in index a00608c..49293ff 100644 --- a/test/030_move/032_U3_scrambled.in +++ b/test/030_move/032_U3_scrambled.in @@ -1,2 +1,2 @@ U3 -UF1 BR0 DL1 UR1 FR1 FL0 UL0 BL1 DR0 DF1 DB0 UB0 UBR2 DFL1 UFL0 DBR1 UBL2 DFR0 DBL2 UFR1 +VKELRGXI=QLWUYJFaHTCB=A diff --git a/test/030_move/032_U3_scrambled.out b/test/030_move/032_U3_scrambled.out index 7d1e8cd..80862a2 100644 --- a/test/030_move/032_U3_scrambled.out +++ b/test/030_move/032_U3_scrambled.out @@ -1 +1 @@ -FL0 FR1 DL1 UR1 UF1 BR0 UL0 BL1 DR0 DF1 DB0 UB0 UBL2 DFR0 UFL0 DBR1 DFL1 UBR2 DBL2 UFR1 +RGELKVXI=JYWUQLFaHTCB=A diff --git a/test/030_move/033_U3_with_prime.in b/test/030_move/033_U3_with_prime.in index 95e5405..7c16119 100644 --- a/test/030_move/033_U3_with_prime.in +++ b/test/030_move/033_U3_with_prime.in @@ -1,2 +1,2 @@ U' -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/030_move/033_U3_with_prime.out b/test/030_move/033_U3_with_prime.out index 7721ab5..111ba2b 100644 --- a/test/030_move/033_U3_with_prime.out +++ b/test/030_move/033_U3_with_prime.out @@ -1 +1 @@ -UL0 UR0 DB0 DF0 UF0 UB0 DL0 DR0 FR0 FL0 BL0 BR0 UFL0 UBR0 DFL0 DBR0 UBL0 UFR0 DFR0 DBL0 +EFCDBAGH=FECDABGHIJKL=A diff --git a/test/030_move/040_D_solved.in b/test/030_move/040_D_solved.in index cb5edb7..adc471e 100644 --- a/test/030_move/040_D_solved.in +++ b/test/030_move/040_D_solved.in @@ -1,2 +1,2 @@ D -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/030_move/040_D_solved.out b/test/030_move/040_D_solved.out index cf4f816..ffcea5d 100644 --- a/test/030_move/040_D_solved.out +++ b/test/030_move/040_D_solved.out @@ -1 +1 @@ -UF0 UB0 DR0 DL0 UR0 UL0 DB0 DF0 FR0 FL0 BL0 BR0 UFR0 UBL0 DBL0 DFR0 UFL0 UBR0 DFL0 DBR0 +ABHGEFCD=ABHGEFCDIJKL=A diff --git a/test/030_move/050_D2_solved.in b/test/030_move/050_D2_solved.in index 56f47cd..0696727 100644 --- a/test/030_move/050_D2_solved.in +++ b/test/030_move/050_D2_solved.in @@ -1,2 +1,2 @@ D2 -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/030_move/050_D2_solved.out b/test/030_move/050_D2_solved.out index 13b229e..f872210 100644 --- a/test/030_move/050_D2_solved.out +++ b/test/030_move/050_D2_solved.out @@ -1 +1 @@ -UF0 UB0 DF0 DB0 UR0 UL0 DR0 DL0 FR0 FL0 BL0 BR0 UFR0 UBL0 DBR0 DFL0 UFL0 UBR0 DBL0 DFR0 +ABDCEFHG=ABDCEFHGIJKL=A diff --git a/test/030_move/060_D3_solved.in b/test/030_move/060_D3_solved.in index 64d1dd8..867183d 100644 --- a/test/030_move/060_D3_solved.in +++ b/test/030_move/060_D3_solved.in @@ -1,2 +1,2 @@ D3 -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/030_move/060_D3_solved.out b/test/030_move/060_D3_solved.out index 2864f5b..acd829c 100644 --- a/test/030_move/060_D3_solved.out +++ b/test/030_move/060_D3_solved.out @@ -1 +1 @@ -UF0 UB0 DL0 DR0 UR0 UL0 DF0 DB0 FR0 FL0 BL0 BR0 UFR0 UBL0 DFR0 DBL0 UFL0 UBR0 DBR0 DFL0 +ABGHEFDC=ABGHEFDCIJKL=A diff --git a/test/030_move/070_R_solved.in b/test/030_move/070_R_solved.in index 108538a..e164209 100644 --- a/test/030_move/070_R_solved.in +++ b/test/030_move/070_R_solved.in @@ -1,2 +1,2 @@ R -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/030_move/070_R_solved.out b/test/030_move/070_R_solved.out index 8c8fcb3..1be2e89 100644 --- a/test/030_move/070_R_solved.out +++ b/test/030_move/070_R_solved.out @@ -1 +1 @@ -UF0 UB0 DB0 DF0 FR0 UL0 DL0 BR0 DR0 FL0 BL0 UR0 DFR2 UBL0 DFL0 UBR2 UFL0 UFR1 DBR1 DBL0 +WBCVEILH=ABCDIFGLHJKE=A diff --git a/test/030_move/071_R_scrambled.in b/test/030_move/071_R_scrambled.in index 0c9dcaf..4134942 100644 --- a/test/030_move/071_R_scrambled.in +++ b/test/030_move/071_R_scrambled.in @@ -1,2 +1,2 @@ R -UF1 BR0 DL1 UR1 FR1 FL0 UL0 BL1 DR0 DF1 DB0 UB0 UBR2 DFL1 UFL0 DBR1 UBL2 DFR0 DBL2 UFR1 +VKELRGXI=QLWUYJFaHTCB=A diff --git a/test/030_move/071_R_scrambled.out b/test/030_move/071_R_scrambled.out index 650bcc8..1711b22 100644 --- a/test/030_move/071_R_scrambled.out +++ b/test/030_move/071_R_scrambled.out @@ -1 +1 @@ -UF1 BR0 DL1 UR1 DR0 FL0 UL0 UB0 BL1 DF1 DB0 FR1 DBL1 DFL1 UFL0 DFR2 UBL2 UBR0 DBR2 UFR1 +PKEWRFTI=QLWUHJFBaTCY=A diff --git a/test/030_move/080_R2_solved.in b/test/030_move/080_R2_solved.in index 554a084..25b0b10 100644 --- a/test/030_move/080_R2_solved.in +++ b/test/030_move/080_R2_solved.in @@ -1,2 +1,2 @@ R2 -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/030_move/080_R2_solved.out b/test/030_move/080_R2_solved.out index 90765e2..6611740 100644 --- a/test/030_move/080_R2_solved.out +++ b/test/030_move/080_R2_solved.out @@ -1 +1 @@ -UF0 UB0 DB0 DF0 DR0 UL0 DL0 UR0 BR0 FL0 BL0 FR0 DBR0 UBL0 DFL0 UFR0 UFL0 DFR0 UBR0 DBL0 +DBCAEGFH=ABCDHFGELJKI=A diff --git a/test/030_move/090_R3_solved.in b/test/030_move/090_R3_solved.in index ca6cfd8..ffab472 100644 --- a/test/030_move/090_R3_solved.in +++ b/test/030_move/090_R3_solved.in @@ -1,2 +1,2 @@ R3 -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/030_move/090_R3_solved.out b/test/030_move/090_R3_solved.out index d4abffc..a14e69b 100644 --- a/test/030_move/090_R3_solved.out +++ b/test/030_move/090_R3_solved.out @@ -1 +1 @@ -UF0 UB0 DB0 DF0 BR0 UL0 DL0 FR0 UR0 FL0 BL0 DR0 UBR2 UBL0 DFL0 DFR2 UFL0 DBR1 UFR1 DBL0 +VBCWELIH=ABCDLFGIEJKH=A diff --git a/test/030_move/100_L_solved.in b/test/030_move/100_L_solved.in index 14ebb5f..e47b8ff 100644 --- a/test/030_move/100_L_solved.in +++ b/test/030_move/100_L_solved.in @@ -1,2 +1,2 @@ L -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/030_move/100_L_solved.out b/test/030_move/100_L_solved.out index 0b0565c..5aa4131 100644 --- a/test/030_move/100_L_solved.out +++ b/test/030_move/100_L_solved.out @@ -1 +1 @@ -UF0 UB0 DB0 DF0 UR0 BL0 FL0 DR0 FR0 UL0 DL0 BR0 UFR0 DBL2 UFL2 DBR0 UBL1 UBR0 DFR0 DFL1 +AXUDJFGK=ABCDEKJHIFGL=A diff --git a/test/030_move/110_L2_solved.in b/test/030_move/110_L2_solved.in index 8224bcd..c71e7ff 100644 --- a/test/030_move/110_L2_solved.in +++ b/test/030_move/110_L2_solved.in @@ -1,2 +1,2 @@ L2 -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/030_move/110_L2_solved.out b/test/030_move/110_L2_solved.out index 2498c87..4fe322f 100644 --- a/test/030_move/110_L2_solved.out +++ b/test/030_move/110_L2_solved.out @@ -1 +1 @@ -UF0 UB0 DB0 DF0 UR0 DL0 UL0 DR0 FR0 BL0 FL0 BR0 UFR0 DFL0 UBL0 DBR0 DBL0 UBR0 DFR0 UFL0 +ACBDHFGE=ABCDEGFHIKJL=A diff --git a/test/030_move/120_L3_solved.in b/test/030_move/120_L3_solved.in index 552d319..7f82d91 100644 --- a/test/030_move/120_L3_solved.in +++ b/test/030_move/120_L3_solved.in @@ -1,2 +1,2 @@ L3 -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/030_move/120_L3_solved.out b/test/030_move/120_L3_solved.out index 2ac2912..fbe35f3 100644 --- a/test/030_move/120_L3_solved.out +++ b/test/030_move/120_L3_solved.out @@ -1 +1 @@ -UF0 UB0 DB0 DF0 UR0 FL0 BL0 DR0 FR0 DL0 UL0 BR0 UFR0 UFL2 DBL2 DBR0 DFL1 UBR0 DFR0 UBL1 +AUXDKFGJ=ABCDEJKHIGFL=A diff --git a/test/030_move/130_F_solved.in b/test/030_move/130_F_solved.in index abdbd35..dcb65dc 100644 --- a/test/030_move/130_F_solved.in +++ b/test/030_move/130_F_solved.in @@ -1,2 +1,2 @@ F -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/030_move/130_F_solved.out b/test/030_move/130_F_solved.out index e805af8..a75744c 100644 --- a/test/030_move/130_F_solved.out +++ b/test/030_move/130_F_solved.out @@ -1 +1 @@ -FL1 UB0 DB0 FR1 UR0 UL0 DL0 DR0 UF1 DF1 BL0 BR0 UFL1 UBL0 DFR1 DBR0 DFL2 UBR0 UFR2 DBL0 +MBODSFQH=ZBCYEFGHQTKL=A diff --git a/test/030_move/132_F_scrambled.in b/test/030_move/132_F_scrambled.in index 8b15575..e793507 100644 --- a/test/030_move/132_F_scrambled.in +++ b/test/030_move/132_F_scrambled.in @@ -1,2 +1,2 @@ F -DL1 BR0 DR0 UR1 DF0 FL1 BL0 UL0 FR0 UF0 DB1 UB0 UFR0 DBL1 DBR0 UFL1 DFR1 DFL1 UBL2 UBR0 +APDMOKRF=WLHUDZKFIASB=A diff --git a/test/030_move/132_F_scrambled.out b/test/030_move/132_F_scrambled.out index 3aea663..2992f71 100644 --- a/test/030_move/132_F_scrambled.out +++ b/test/030_move/132_F_scrambled.out @@ -1 +1 @@ -UF1 BR0 DR0 FR1 DF0 FL1 BL0 UL0 DL0 UR0 DB1 UB0 DFR2 DBL1 UBL0 UFL1 DBR2 DFL1 UFR2 UBR0 +WPBMTKQF=QLHYDZKFGESB=A diff --git a/test/030_move/133_F_scrambled_2.in b/test/030_move/133_F_scrambled_2.in index fdd5139..35af326 100644 --- a/test/030_move/133_F_scrambled_2.in +++ b/test/030_move/133_F_scrambled_2.in @@ -1,2 +1,2 @@ F -BL1 DB0 UL1 DF0 BR1 UF1 DL0 FL1 UB0 DR1 FR1 UR1 UBR2 UBL1 DFR2 DBL2 DBR0 DFL0 UFR0 UFL2 +VJWXDCAU=aCVDbQGZBXYU=A diff --git a/test/030_move/133_F_scrambled_2.out b/test/030_move/133_F_scrambled_2.out index 3546894..7fd0f96 100644 --- a/test/030_move/133_F_scrambled_2.out +++ b/test/030_move/133_F_scrambled_2.out @@ -1 +1 @@ -DR0 DB0 UL1 UB1 BR1 UF1 DL0 FL1 BL0 DF1 FR1 UR1 DBR1 UBL1 UFR1 DBL2 DFR1 DFL0 UBR1 UFL2 +LJIXOCNU=HCVRbQGZKTYU=A diff --git a/test/030_move/140_F2_solved.in b/test/030_move/140_F2_solved.in index 83aab30..9ac2bbf 100644 --- a/test/030_move/140_F2_solved.in +++ b/test/030_move/140_F2_solved.in @@ -1,2 +1,2 @@ F2 -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/030_move/140_F2_solved.out b/test/030_move/140_F2_solved.out index 8aa701f..69720be 100644 --- a/test/030_move/140_F2_solved.out +++ b/test/030_move/140_F2_solved.out @@ -1 +1 @@ -DF0 UB0 DB0 UF0 UR0 UL0 DL0 DR0 FL0 FR0 BL0 BR0 DFL0 UBL0 UFR0 DBR0 DFR0 UBR0 UFL0 DBL0 +CBADGFEH=DBCAEFGHJIKL=A diff --git a/test/030_move/150_F3_solved.in b/test/030_move/150_F3_solved.in index 2c766c1..dbfb928 100644 --- a/test/030_move/150_F3_solved.in +++ b/test/030_move/150_F3_solved.in @@ -1,2 +1,2 @@ F3 -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/030_move/150_F3_solved.out b/test/030_move/150_F3_solved.out index 40f1260..500d969 100644 --- a/test/030_move/150_F3_solved.out +++ b/test/030_move/150_F3_solved.out @@ -1 +1 @@ -FR1 UB0 DB0 FL1 UR0 UL0 DL0 DR0 DF1 UF1 BL0 BR0 DFR1 UBL0 UFL1 DBR0 UFR2 UBR0 DFL2 DBL0 +OBMDQFSH=YBCZEFGHTQKL=A diff --git a/test/030_move/160_B_solved.in b/test/030_move/160_B_solved.in index 6062e45..25b045d 100644 --- a/test/030_move/160_B_solved.in +++ b/test/030_move/160_B_solved.in @@ -1,2 +1,2 @@ B -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/030_move/160_B_solved.out b/test/030_move/160_B_solved.out index f7fb13c..73e099a 100644 --- a/test/030_move/160_B_solved.out +++ b/test/030_move/160_B_solved.out @@ -1 +1 @@ -UF0 BR1 BL1 DF0 UR0 UL0 DL0 DR0 FR0 FL0 UB1 DB1 UFR0 UBR1 DFL0 DBL1 UFL0 DBR2 DFR0 UBL2 +ANCPETGR=AbaDEFGHIJRS=A diff --git a/test/030_move/170_B2_solved.in b/test/030_move/170_B2_solved.in index 0ff1190..bd25f3a 100644 --- a/test/030_move/170_B2_solved.in +++ b/test/030_move/170_B2_solved.in @@ -1,2 +1,2 @@ B2 -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/030_move/170_B2_solved.out b/test/030_move/170_B2_solved.out index 9b33e35..1021aeb 100644 --- a/test/030_move/170_B2_solved.out +++ b/test/030_move/170_B2_solved.out @@ -1 +1 @@ -UF0 DB0 UB0 DF0 UR0 UL0 DL0 DR0 FR0 FL0 BR0 BL0 UFR0 DBR0 DFL0 UBL0 UFL0 DBL0 DFR0 UBR0 +ADCBEHGF=ACBDEFGHIJLK=A diff --git a/test/030_move/180_B3_solved.in b/test/030_move/180_B3_solved.in index c59636f..a38d932 100644 --- a/test/030_move/180_B3_solved.in +++ b/test/030_move/180_B3_solved.in @@ -1,2 +1,2 @@ B3 -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/030_move/180_B3_solved.out b/test/030_move/180_B3_solved.out index 1367517..78bd94a 100644 --- a/test/030_move/180_B3_solved.out +++ b/test/030_move/180_B3_solved.out @@ -1 +1 @@ -UF0 BL1 BR1 DF0 UR0 UL0 DL0 DR0 FR0 FL0 DB1 UB1 UFR0 DBL1 DFL0 UBR1 UFL0 UBL2 DFR0 DBR2 +APCNERGT=AabDEFGHIJSR=A diff --git a/test/030_move/200_scramble_solved.in b/test/030_move/200_scramble_solved.in index 939d876..65127d4 100644 --- a/test/030_move/200_scramble_solved.in +++ b/test/030_move/200_scramble_solved.in @@ -1,2 +1,2 @@ B' D' B' R2 B' R F D F2 U2 B D2 F R2 F2 L2 F L2 U2 -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/030_move/200_scramble_solved.out b/test/030_move/200_scramble_solved.out index 690ff6b..6d77f16 100644 --- a/test/030_move/200_scramble_solved.out +++ b/test/030_move/200_scramble_solved.out @@ -1 +1 @@ -BR0 DF0 FL1 UB0 BL0 FR1 UR1 UL0 DR1 DB0 UF1 DL1 DFL0 DFR0 UFL1 UBL2 DBR1 DBL0 UFR1 UBR1 +CGMRLHIN=LDZBKYUFXCQW=A diff --git a/test/030_move/201_solution_scrambled.in b/test/030_move/201_solution_scrambled.in index a838b4c..e4d20b5 100644 --- a/test/030_move/201_solution_scrambled.in +++ b/test/030_move/201_solution_scrambled.in @@ -1,2 +1,2 @@ F' B' D2 U2 F2 U' L' U D B D' R2 B' L' R' D' R D L2 U' L' B L L U F U' F' U F U' F2 L' F U F U' F' U2 F2 R2 L2 B2 -BR0 DF0 FL1 UB0 BL0 FR1 UR1 UL0 DR1 DB0 UF1 DL1 DFL0 DFR0 UFL1 UBL2 DBR1 DBL0 UFR1 UBR1 +CGMRLHIN=LDZBKYUFXCQW=A diff --git a/test/030_move/201_solution_scrambled.out b/test/030_move/201_solution_scrambled.out index dff224d..5aa6ba7 100644 --- a/test/030_move/201_solution_scrambled.out +++ b/test/030_move/201_solution_scrambled.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/030_move/300_multimove_solved.in b/test/030_move/300_multimove_solved.in index e084353..751602a 100644 --- a/test/030_move/300_multimove_solved.in +++ b/test/030_move/300_multimove_solved.in @@ -1,2 +1,2 @@ B2 D' L2 D' B2 D B2 R2 B2 D U2 R D R2 B L' B' L2 U B2 U -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/030_move/300_multimove_solved.out b/test/030_move/300_multimove_solved.out index 6c52430..d069105 100644 --- a/test/030_move/300_multimove_solved.out +++ b/test/030_move/300_multimove_solved.out @@ -1 +1 @@ -UB1 UL0 UF1 DL0 FL0 DB0 BR0 BL0 DF0 FR0 DR0 UR0 UBR1 DFR1 UBL0 DFL2 DBR1 DBL2 UFR1 UFL1 +NOBSLXIM=RFQGJCLKDIHE=A diff --git a/test/030_move/301_multimove_scrambled.in b/test/030_move/301_multimove_scrambled.in index cc649c0..dbe14c6 100644 --- a/test/030_move/301_multimove_scrambled.in +++ b/test/030_move/301_multimove_scrambled.in @@ -1,2 +1,2 @@ D2 B2 L U2 B2 L' B2 R' D2 R D2 B F L U F2 L' R' B2 U B2 -UB1 UL0 UF1 DL0 FL0 DB0 BR0 BL0 DF0 FR0 DR0 UR0 UBR1 DFR1 UBL0 DFL2 DBR1 DBL2 UFR1 UFL1 +NOBSLXIM=RFQGJCLKDIHE=A diff --git a/test/030_move/301_multimove_scrambled.out b/test/030_move/301_multimove_scrambled.out index 102ac1b..9c668da 100644 --- a/test/030_move/301_multimove_scrambled.out +++ b/test/030_move/301_multimove_scrambled.out @@ -1 +1 @@ -UL1 UB0 DL1 UR0 BL1 DR1 BR0 DB0 FL1 UF0 FR1 DF0 DFR2 DFL0 DBL0 UFL0 UBR1 UBL0 UFR2 DBR1 +WCHENBQL=VBWEaXLCZAYD=A diff --git a/test/030_move/move_tests.c b/test/030_move/move_tests.c index 2f0ecfb..e5aed44 100644 --- a/test/030_move/move_tests.c +++ b/test/030_move/move_tests.c @@ -8,7 +8,7 @@ void run(void) { fgets(movestr, STRLENMAX, stdin); fgets(cubestr, STRLENMAX, stdin); - cube = readcube("H48", cubestr); + cube = readcube(cubestr); cube = applymoves(cube, movestr); @@ -17,7 +17,7 @@ void run(void) { } else if (!issolvable(cube)) { printf("Moved cube is not solvable\n"); } else { - writecube("H48", cube, NISSY_SIZE_H48, cubestr); + writecube(cube, NISSY_SIZE_CUBE, cubestr); printf("%s\n", cubestr); } } -- cgit v1.3