Added tests allowednext

22 files changed, 97 insertions, 17 deletions

diff --git a/TODO.txt b/TODO.txt
index 1841d38..5e2cfd0 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -22,8 +22,6 @@ See the sections below for details
 ## Small change
 
 * solve tests: make smaller, split
-* add lots of tests for things that were static, now visible:
-  allowednextmove
 
 ## Solving
 
diff --git a/cube.c b/cube.c
index 780c3a6..23c5132 100644
--- a/cube.c
+++ b/cube.c
@@ -3165,19 +3165,19 @@ applymoves(cube_t cube, char *buf)
                 while (*b == ' ' || *b == '\t' || *b == '\n')
                         b++;
                 if (*b == '\0')
-                        goto readmoves_finish;
+                        goto applymoves_finish;
                 if ((r = readmove(*b)) == _error)
-                        goto readmoves_error;
+                        goto applymoves_error;
                 if ((m = readmodifier(*(b+1))) != 0)
                         b++;
                 fast = move(fast, r + m);
         }
 
-readmoves_finish:
+applymoves_finish:
         return fasttocube(fast);
 
-readmoves_error:
-        DBG_LOG("readmoves error\n");
+applymoves_error:
+        DBG_LOG("applymoves error\n");
         return zero;
 }
 
@@ -3725,7 +3725,7 @@ int64_t solve(cube_t, char *, char *, char *, int8_t, int8_t, int64_t, int8_t,
 void multisolve(int, cube_t *, char *, void *, char *);
 int64_t gendata(char *, void *);
 
-_static bool allowednextmove(dfsarg_generic_t, uint8_t);
+_static bool allowednextmove(uint8_t *, int, uint8_t);
 _static void solve_generic_appendsolution(dfsarg_generic_t);
 _static int solve_generic_dfs(dfsarg_generic_t);
 _static int64_t solve_generic(cube_t, char *, int8_t, int8_t, int64_t, int8_t,
@@ -3796,20 +3796,17 @@ gendata(char *solver, void *data)
 }
 
 _static bool
-allowednextmove(dfsarg_generic_t arg, uint8_t m)
+allowednextmove(uint8_t *moves, int n, uint8_t m)
 {
-        int n;
         uint8_t mbase, l1base, l2base, maxis, l1axis, l2axis;
 
-        n = arg.nmoves;
-
         if (n == 0)
                 return true;
 
         mbase = movebase(m);
         maxis = moveaxis(m);
-        l1base = movebase(arg.moves[n-1]);
-        l1axis = moveaxis(arg.moves[n-1]);
+        l1base = movebase(moves[n-1]);
+        l1axis = moveaxis(moves[n-1]);
 
         if (mbase == l1base || (maxis == l1axis && mbase < l1base))
                 return false;
@@ -3817,8 +3814,8 @@ allowednextmove(dfsarg_generic_t arg, uint8_t m)
         if (n == 1)
                 return true;
 
-        l2base = movebase(arg.moves[n-2]);
-        l2axis = moveaxis(arg.moves[n-2]);
+        l2base = movebase(moves[n-2]);
+        l2axis = moveaxis(moves[n-2]);
 
         return l1axis != l2axis || mbase != l2base;
 }
@@ -3858,7 +3855,7 @@ solve_generic_dfs(dfsarg_generic_t arg)
         memcpy(&nextarg, &arg, sizeof(dfsarg_generic_t));
         nextarg.nmoves = arg.nmoves + 1;
         for (m = 0, ret = 0; m < 18; m++) {
-                if (allowednextmove(arg, m)) {
+                if (allowednextmove(arg.moves, arg.nmoves, m)) {
                         nextarg.cube = move(arg.cube, m);
                         nextarg.moves[arg.nmoves] = m;
                         ret += solve_generic_dfs(nextarg);
diff --git a/test/080_allowednext/00_empty_U.in b/test/080_allowednext/00_empty_U.in
new file mode 100644
index 0000000..feb4bc3
--- /dev/null
+++ b/test/080_allowednext/00_empty_U.in
@@ -0,0 +1,2 @@
+0
+U
diff --git a/test/080_allowednext/00_empty_U.out b/test/080_allowednext/00_empty_U.out
new file mode 100644
index 0000000..27ba77d
--- /dev/null
+++ b/test/080_allowednext/00_empty_U.out
@@ -0,0 +1 @@
+true
diff --git a/test/080_allowednext/02_F_F2.in b/test/080_allowednext/02_F_F2.in
new file mode 100644
index 0000000..06f504f
--- /dev/null
+++ b/test/080_allowednext/02_F_F2.in
@@ -0,0 +1,3 @@
+1
+F
+F2
diff --git a/test/080_allowednext/02_F_F2.out b/test/080_allowednext/02_F_F2.out
new file mode 100644
index 0000000..c508d53
--- /dev/null
+++ b/test/080_allowednext/02_F_F2.out
@@ -0,0 +1 @@
+false
diff --git a/test/080_allowednext/02_U_F.in b/test/080_allowednext/02_U_F.in
new file mode 100644
index 0000000..3a41149
--- /dev/null
+++ b/test/080_allowednext/02_U_F.in
@@ -0,0 +1,3 @@
+1
+U
+F
diff --git a/test/080_allowednext/02_U_F.out b/test/080_allowednext/02_U_F.out
new file mode 100644
index 0000000..27ba77d
--- /dev/null
+++ b/test/080_allowednext/02_U_F.out
@@ -0,0 +1 @@
+true
diff --git a/test/080_allowednext/03_R_L_R.in b/test/080_allowednext/03_R_L_R.in
new file mode 100644
index 0000000..e215381
--- /dev/null
+++ b/test/080_allowednext/03_R_L_R.in
@@ -0,0 +1,4 @@
+2
+R
+L'
+R2
diff --git a/test/080_allowednext/03_R_L_R.out b/test/080_allowednext/03_R_L_R.out
new file mode 100644
index 0000000..c508d53
--- /dev/null
+++ b/test/080_allowednext/03_R_L_R.out
@@ -0,0 +1 @@
+false
diff --git a/test/080_allowednext/04_longer_true.in b/test/080_allowednext/04_longer_true.in
new file mode 100644
index 0000000..e1f1d62
--- /dev/null
+++ b/test/080_allowednext/04_longer_true.in
@@ -0,0 +1,12 @@
+10
+F2
+B
+D2
+D'
+L
+R2
+U
+U'
+D
+F
+L
diff --git a/test/080_allowednext/04_longer_true.out b/test/080_allowednext/04_longer_true.out
new file mode 100644
index 0000000..27ba77d
--- /dev/null
+++ b/test/080_allowednext/04_longer_true.out
@@ -0,0 +1 @@
+true
diff --git a/test/080_allowednext/05_longer_false.in b/test/080_allowednext/05_longer_false.in
new file mode 100644
index 0000000..6befeff
--- /dev/null
+++ b/test/080_allowednext/05_longer_false.in
@@ -0,0 +1,9 @@
+7
+D
+B2
+F'
+L'
+F'
+L'
+R2
+L
diff --git a/test/080_allowednext/05_longer_false.out b/test/080_allowednext/05_longer_false.out
new file mode 100644
index 0000000..c508d53
--- /dev/null
+++ b/test/080_allowednext/05_longer_false.out
@@ -0,0 +1 @@
+false
diff --git a/test/080_allowednext/06_D_U_false_order.in b/test/080_allowednext/06_D_U_false_order.in
new file mode 100644
index 0000000..7bfd8c2
--- /dev/null
+++ b/test/080_allowednext/06_D_U_false_order.in
@@ -0,0 +1,3 @@
+1
+D
+U
diff --git a/test/080_allowednext/06_D_U_false_order.out b/test/080_allowednext/06_D_U_false_order.out
new file mode 100644
index 0000000..c508d53
--- /dev/null
+++ b/test/080_allowednext/06_D_U_false_order.out
@@ -0,0 +1 @@
+false
diff --git a/test/080_allowednext/allowednext_tests.c b/test/080_allowednext/allowednext_tests.c
new file mode 100644
index 0000000..98a437f
--- /dev/null
+++ b/test/080_allowednext/allowednext_tests.c
@@ -0,0 +1,42 @@
+#include "../test.h"
+
+bool allowednextmove(uint8_t *, int, uint8_t);
+
+static char *moves[] = {
+        "U", "U2", "U'",
+        "D", "D2", "D'",
+        "R", "R2", "R'",
+        "L", "L2", "L'",
+        "F", "F2", "F'",
+        "B", "B2", "B'",
+};
+
+int main() {
+        char movestr[STRLENMAX];
+        uint8_t m[100], next;
+        int n, i, j;
+
+        fgets(movestr, STRLENMAX, stdin);
+        n = atoi(movestr);
+
+        for (i = 0; i < n; i++) {
+                fgets(movestr, STRLENMAX, stdin);
+                movestr[strcspn(movestr, "\n")] = 0;
+                for (j = 0; j < 18; j++)
+                        if (!strcmp(movestr, moves[j]))
+                                m[i] = j;
+        }
+        fgets(movestr, STRLENMAX, stdin);
+        movestr[strcspn(movestr, "\n")] = 0;
+        for (j = 0; j < 18; j++)
+                if (!strcmp(movestr, moves[j]))
+                        next = j;
+
+        fprintf(stderr, "Last two: %s, %s\nNext: %s\n",
+            n > 1 ? moves[m[n-2]] : "-",
+            n > 0 ? moves[m[n-1]] : "-",
+            moves[next]);
+        printf("%s\n", allowednextmove(m, n, next) ? "true" : "false");
+
+        return 0;
+}
diff --git a/test/080_solve_simple/01_U_U3.in b/test/090_solve_simple/01_U_U3.in
index c0f7930..c0f7930 100644
--- a/test/080_solve_simple/01_U_U3.in
+++ b/test/090_solve_simple/01_U_U3.in
diff --git a/test/080_solve_simple/01_U_U3.out b/test/090_solve_simple/01_U_U3.out
index ca934b4..ca934b4 100644
--- a/test/080_solve_simple/01_U_U3.out
+++ b/test/090_solve_simple/01_U_U3.out
diff --git a/test/080_solve_simple/02_MUMU_alloptimal.in b/test/090_solve_simple/02_MUMU_alloptimal.in
index f97c95f..f97c95f 100644
--- a/test/080_solve_simple/02_MUMU_alloptimal.in
+++ b/test/090_solve_simple/02_MUMU_alloptimal.in
diff --git a/test/080_solve_simple/02_MUMU_alloptimal.out b/test/090_solve_simple/02_MUMU_alloptimal.out
index 06cd521..06cd521 100644
--- a/test/080_solve_simple/02_MUMU_alloptimal.out
+++ b/test/090_solve_simple/02_MUMU_alloptimal.out
diff --git a/test/080_solve_simple/solve_simple_tests.c b/test/090_solve_simple/solve_simple_tests.c
index 4756dc0..4756dc0 100644
--- a/test/080_solve_simple/solve_simple_tests.c
+++ b/test/090_solve_simple/solve_simple_tests.c