NISS

13 files changed, 40 insertions, 22 deletions

diff --git a/test/130_appendsolution/00_empty.in b/test/130_appendsolution/00_empty.in
index c4cad6e..1100b95 100644
--- a/test/130_appendsolution/00_empty.in
+++ b/test/130_appendsolution/00_empty.in
@@ -1,5 +1,5 @@
 
-
 0
 1
 rotation UF
+0
diff --git a/test/130_appendsolution/01_simple_onlynormal_nounniss.in b/test/130_appendsolution/01_simple_onlynormal_nounniss.in
index 37b6f3d..fb1eaed 100644
--- a/test/130_appendsolution/01_simple_onlynormal_nounniss.in
+++ b/test/130_appendsolution/01_simple_onlynormal_nounniss.in
@@ -1,5 +1,5 @@
 U F R D2 B'
-
 0
 1
 rotation UF
+0
diff --git a/test/130_appendsolution/02_simple_onlynormal_nounnis_multitrans.in b/test/130_appendsolution/02_simple_onlynormal_nounnis_multitrans.in
index c4ff41a..db5f074 100644
--- a/test/130_appendsolution/02_simple_onlynormal_nounnis_multitrans.in
+++ b/test/130_appendsolution/02_simple_onlynormal_nounnis_multitrans.in
@@ -1,8 +1,8 @@
 U F R
-
 0
 4
 rotation UF
 mirrored UR
 rotation BD
 mirrored LB
+0
diff --git a/test/130_appendsolution/03_simple_unniss.in b/test/130_appendsolution/03_simple_unniss.in
index 231f60c..2c5a331 100644
--- a/test/130_appendsolution/03_simple_unniss.in
+++ b/test/130_appendsolution/03_simple_unniss.in
@@ -1,5 +1,5 @@
-U F B2
-R' F D
+U F B2 (R' F D)
 1
 1
 rotation UF
+0
diff --git a/test/130_appendsolution/04_niss_nounniss.in b/test/130_appendsolution/04_niss_nounniss.in
index 39c6518..b07f970 100644
--- a/test/130_appendsolution/04_niss_nounniss.in
+++ b/test/130_appendsolution/04_niss_nounniss.in
@@ -1,5 +1,5 @@
-U F B2
-R' F D
+U F B2 (R' F D)
 0
 1
 rotation UF
+0
diff --git a/test/130_appendsolution/05_sort_parallel.in b/test/130_appendsolution/05_sort_parallel.in
index 7c8c4f5..bc1cf0f 100644
--- a/test/130_appendsolution/05_sort_parallel.in
+++ b/test/130_appendsolution/05_sort_parallel.in
@@ -1,5 +1,5 @@
 L R' B2 F
-
 0
 1
 rotation UF
+0
diff --git a/test/130_appendsolution/06_unniss_trans_sort.in b/test/130_appendsolution/06_unniss_trans_sort.in
index 9be03a6..2ffab93 100644
--- a/test/130_appendsolution/06_unniss_trans_sort.in
+++ b/test/130_appendsolution/06_unniss_trans_sort.in
@@ -1,5 +1,5 @@
-B
-R2 F2
+B (R2 F2)
 1
 1
 rotation UR
+0
diff --git a/test/130_appendsolution/07_unniss_cancel_nosol.in b/test/130_appendsolution/07_unniss_cancel_nosol.in
index 561c909..6883d05 100644
--- a/test/130_appendsolution/07_unniss_cancel_nosol.in
+++ b/test/130_appendsolution/07_unniss_cancel_nosol.in
@@ -1,5 +1,5 @@
-B' F
-R2 B2
+B' F (R2 B2)
 1
 1
 rotation UF
+0
diff --git a/test/130_appendsolution/08_unniss_cancel_nosol_v2.in b/test/130_appendsolution/08_unniss_cancel_nosol_v2.in
index e707537..3d461f0 100644
--- a/test/130_appendsolution/08_unniss_cancel_nosol_v2.in
+++ b/test/130_appendsolution/08_unniss_cancel_nosol_v2.in
@@ -1,5 +1,5 @@
-F' B
-R2 F2
+F' B (R2 F2)
 1
 1
 rotation UF
+0
diff --git a/test/130_appendsolution/09_fullinverse_niss.in b/test/130_appendsolution/09_fullinverse_niss.in
index 33f0a26..bb2b640 100644
--- a/test/130_appendsolution/09_fullinverse_niss.in
+++ b/test/130_appendsolution/09_fullinverse_niss.in
@@ -1,5 +1,5 @@
-
-F
+(F)
 0
 1
 rotation UF
+0
diff --git a/test/130_appendsolution/10_rotated.in b/test/130_appendsolution/10_rotated.in
new file mode 100644
index 0000000..5210cd5
--- /dev/null
+++ b/test/130_appendsolution/10_rotated.in
@@ -0,0 +1,5 @@
+U2 F B L'
+1
+1
+rotation UF
+7
diff --git a/test/130_appendsolution/10_rotated.out b/test/130_appendsolution/10_rotated.out
new file mode 100644
index 0000000..e70b2fe
--- /dev/null
+++ b/test/130_appendsolution/10_rotated.out
@@ -0,0 +1,4 @@
+D2 R L F'
+Number of solutions: 1
+Shortest solution length: 4
+Used bytes: 10
diff --git a/test/130_appendsolution/appendsolution_tests.c b/test/130_appendsolution/appendsolution_tests.c
index abff359..e1b7e98 100644
--- a/test/130_appendsolution/appendsolution_tests.c
+++ b/test/130_appendsolution/appendsolution_tests.c
@@ -1,11 +1,11 @@
 /*
 Input format for appendsolution tests:
 
-moves on normal
-moves on inverse (without parentheses)
+moves on normal (with NISS notation)
 unniss flag (0=false, 1=true)
 number of transformations
 transformations, one per line
+the orientation of the cube, as a number from 0 to 23
 
 See below for the output format.
 */
@@ -13,7 +13,8 @@ See below for the output format.
 #include "../test.h"
 
 uint8_t readtrans(const char [NISSY_SIZE_TRANSFORMATION]);
-int64_t readmoves(const char *, size_t n, uint8_t [n]);
+int64_t readmoves(const char *, size_t n, size_t m,
+    uint64_t *, uint64_t *, uint8_t [n], uint8_t [m]);
 void solution_moves_reset(solution_moves_t [static 1]);
 bool solution_list_init(solution_list_t [static 1], size_t n, char [n]);
 int64_t appendsolution(const solution_moves_t [static 1],
@@ -22,6 +23,8 @@ int64_t appendsolution(const solution_moves_t [static 1],
 
 void run(void) {
         int i, ntrans;
+        int64_t tot;
+        uint64_t nm, np;
         char str[STRLENMAX], buf[STRLENMAX];
         solution_moves_t moves;
         solution_settings_t settings;
@@ -38,9 +41,13 @@ void run(void) {
         };
 
         fgets(str, STRLENMAX, stdin);
-        moves.nmoves = (uint8_t)readmoves(str, 20, moves.moves);
-        fgets(str, STRLENMAX, stdin);
-        moves.npremoves = (uint8_t)readmoves(str, 20, moves.premoves);
+        tot = readmoves(str, 20, 20, &nm, &np, moves.moves, moves.premoves);
+        if (tot < 0) {
+                printf("Test error reading moves\n");
+                return;
+        }
+        moves.nmoves = nm;
+        moves.npremoves = np;
         fgets(str, STRLENMAX, stdin);
         settings.unniss = (bool)atoi(str);
         fgets(str, STRLENMAX, stdin);
@@ -49,6 +56,8 @@ void run(void) {
                 fgets(str, STRLENMAX, stdin);
                 settings.tmask |= UINT64_C(1) << (uint64_t)readtrans(str);
         }
+        fgets(str, STRLENMAX, stdin);
+        settings.orientation = atoi(str);
 
         appendsolution(&moves, &settings, &list, false, "Test");