Towards a definitve API

34 files changed, 5 insertions, 57 deletions

diff --git a/test/061_coord_eo/00_solved.in b/test/020_move/300_multimove_solved.in
index dff224d..e084353 100644
--- a/test/061_coord_eo/00_solved.in
+++ b/test/020_move/300_multimove_solved.in
@@ -1 +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
diff --git a/test/020_move/300_multimove_solved.out b/test/020_move/300_multimove_solved.out
new file mode 100644
index 0000000..6c52430
--- /dev/null
+++ b/test/020_move/300_multimove_solved.out
@@ -0,0 +1 @@
+UB1 UL0 UF1 DL0 FL0 DB0 BR0 BL0 DF0 FR0 DR0 UR0 UBR1 DFR1 UBL0 DFL2 DBR1 DBL2 UFR1 UFL1
diff --git a/test/020_move/301_multimove_scrambled.in b/test/020_move/301_multimove_scrambled.in
new file mode 100644
index 0000000..cc649c0
--- /dev/null
+++ b/test/020_move/301_multimove_scrambled.in
@@ -0,0 +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
diff --git a/test/020_move/301_multimove_scrambled.out b/test/020_move/301_multimove_scrambled.out
new file mode 100644
index 0000000..102ac1b
--- /dev/null
+++ b/test/020_move/301_multimove_scrambled.out
@@ -0,0 +1 @@
+UL1 UB0 DL1 UR0 BL1 DR1 BR0 DB0 FL1 UF0 FR1 DF0 DFR2 DFL0 DBL0 UFL0 UBR1 UBL0 UFR2 DBR1
diff --git a/test/061_coord_eo/00_solved.out b/test/061_coord_eo/00_solved.out
deleted file mode 100644
index 573541a..0000000
--- a/test/061_coord_eo/00_solved.out
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/061_coord_eo/01_U.in b/test/061_coord_eo/01_U.in
deleted file mode 100644
index b5b36ad..0000000
--- a/test/061_coord_eo/01_U.in
+++ /dev/null
@@ -1 +0,0 @@
-UR0 UL0 DB0 DF0 UB0 UF0 DL0 DR0 FR0 FL0 BL0 BR0 UBR0 UFL0 DFL0 DBR0 UFR0 UBL0 DFR0 DBL0
diff --git a/test/061_coord_eo/01_U.out b/test/061_coord_eo/01_U.out
deleted file mode 100644
index 573541a..0000000
--- a/test/061_coord_eo/01_U.out
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/061_coord_eo/02_U2.in b/test/061_coord_eo/02_U2.in
deleted file mode 100644
index 316ad57..0000000
--- a/test/061_coord_eo/02_U2.in
+++ /dev/null
@@ -1 +0,0 @@
-UB0 UF0 DB0 DF0 UL0 UR0 DL0 DR0 FR0 FL0 BL0 BR0 UBL0 UFR0 DFL0 DBR0 UBR0 UFL0 DFR0 DBL0
diff --git a/test/061_coord_eo/02_U2.out b/test/061_coord_eo/02_U2.out
deleted file mode 100644
index 573541a..0000000
--- a/test/061_coord_eo/02_U2.out
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/061_coord_eo/03_U3.in b/test/061_coord_eo/03_U3.in
deleted file mode 100644
index 7721ab5..0000000
--- a/test/061_coord_eo/03_U3.in
+++ /dev/null
@@ -1 +0,0 @@
-UL0 UR0 DB0 DF0 UF0 UB0 DL0 DR0 FR0 FL0 BL0 BR0 UFL0 UBR0 DFL0 DBR0 UBL0 UFR0 DFR0 DBL0
diff --git a/test/061_coord_eo/03_U3.out b/test/061_coord_eo/03_U3.out
deleted file mode 100644
index 573541a..0000000
--- a/test/061_coord_eo/03_U3.out
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/061_coord_eo/04_D.in b/test/061_coord_eo/04_D.in
deleted file mode 100644
index cf4f816..0000000
--- a/test/061_coord_eo/04_D.in
+++ /dev/null
@@ -1 +0,0 @@
-UF0 UB0 DR0 DL0 UR0 UL0 DB0 DF0 FR0 FL0 BL0 BR0 UFR0 UBL0 DBL0 DFR0 UFL0 UBR0 DFL0 DBR0
diff --git a/test/061_coord_eo/04_D.out b/test/061_coord_eo/04_D.out
deleted file mode 100644
index 573541a..0000000
--- a/test/061_coord_eo/04_D.out
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/061_coord_eo/07_R.in b/test/061_coord_eo/07_R.in
deleted file mode 100644
index 8c8fcb3..0000000
--- a/test/061_coord_eo/07_R.in
+++ /dev/null
@@ -1 +0,0 @@
-UF0 UB0 DB0 DF0 FR0 UL0 DL0 BR0 DR0 FL0 BL0 UR0 DFR2 UBL0 DFL0 UBR2 UFL0 UFR1 DBR1 DBL0
diff --git a/test/061_coord_eo/07_R.out b/test/061_coord_eo/07_R.out
deleted file mode 100644
index 573541a..0000000
--- a/test/061_coord_eo/07_R.out
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/061_coord_eo/08_R2.in b/test/061_coord_eo/08_R2.in
deleted file mode 100644
index 90765e2..0000000
--- a/test/061_coord_eo/08_R2.in
+++ /dev/null
@@ -1 +0,0 @@
-UF0 UB0 DB0 DF0 DR0 UL0 DL0 UR0 BR0 FL0 BL0 FR0 DBR0 UBL0 DFL0 UFR0 UFL0 DFR0 UBR0 DBL0
diff --git a/test/061_coord_eo/08_R2.out b/test/061_coord_eo/08_R2.out
deleted file mode 100644
index 573541a..0000000
--- a/test/061_coord_eo/08_R2.out
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/061_coord_eo/10_L.in b/test/061_coord_eo/10_L.in
deleted file mode 100644
index 0b0565c..0000000
--- a/test/061_coord_eo/10_L.in
+++ /dev/null
@@ -1 +0,0 @@
-UF0 UB0 DB0 DF0 UR0 BL0 FL0 DR0 FR0 UL0 DL0 BR0 UFR0 DBL2 UFL2 DBR0 UBL1 UBR0 DFR0 DFL1
diff --git a/test/061_coord_eo/10_L.out b/test/061_coord_eo/10_L.out
deleted file mode 100644
index 573541a..0000000
--- a/test/061_coord_eo/10_L.out
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/061_coord_eo/13_F.in b/test/061_coord_eo/13_F.in
deleted file mode 100644
index e805af8..0000000
--- a/test/061_coord_eo/13_F.in
+++ /dev/null
@@ -1 +0,0 @@
-FL1 UB0 DB0 FR1 UR0 UL0 DL0 DR0 UF1 DF1 BL0 BR0 UFL1 UBL0 DFR1 DBR0 DFL2 UBR0 UFR2 DBL0
diff --git a/test/061_coord_eo/13_F.out b/test/061_coord_eo/13_F.out
deleted file mode 100644
index 2c60641..0000000
--- a/test/061_coord_eo/13_F.out
+++ /dev/null
@@ -1 +0,0 @@
-388
diff --git a/test/061_coord_eo/14_F2.in b/test/061_coord_eo/14_F2.in
deleted file mode 100644
index 8aa701f..0000000
--- a/test/061_coord_eo/14_F2.in
+++ /dev/null
@@ -1 +0,0 @@
-DF0 UB0 DB0 UF0 UR0 UL0 DL0 DR0 FL0 FR0 BL0 BR0 DFL0 UBL0 UFR0 DBR0 DFR0 UBR0 UFL0 DBL0
diff --git a/test/061_coord_eo/14_F2.out b/test/061_coord_eo/14_F2.out
deleted file mode 100644
index 573541a..0000000
--- a/test/061_coord_eo/14_F2.out
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/061_coord_eo/15_F3.in b/test/061_coord_eo/15_F3.in
deleted file mode 100644
index 40f1260..0000000
--- a/test/061_coord_eo/15_F3.in
+++ /dev/null
@@ -1 +0,0 @@
-FR1 UB0 DB0 FL1 UR0 UL0 DL0 DR0 DF1 UF1 BL0 BR0 DFR1 UBL0 UFL1 DBR0 UFR2 UBR0 DFL2 DBL0
diff --git a/test/061_coord_eo/15_F3.out b/test/061_coord_eo/15_F3.out
deleted file mode 100644
index 2c60641..0000000
--- a/test/061_coord_eo/15_F3.out
+++ /dev/null
@@ -1 +0,0 @@
-388
diff --git a/test/061_coord_eo/16_B.in b/test/061_coord_eo/16_B.in
deleted file mode 100644
index f7fb13c..0000000
--- a/test/061_coord_eo/16_B.in
+++ /dev/null
@@ -1 +0,0 @@
-UF0 BR1 BL1 DF0 UR0 UL0 DL0 DR0 FR0 FL0 UB1 DB1 UFR0 UBR1 DFL0 DBL1 UFL0 DBR2 DFR0 UBL2
diff --git a/test/061_coord_eo/16_B.out b/test/061_coord_eo/16_B.out
deleted file mode 100644
index 1fd9918..0000000
--- a/test/061_coord_eo/16_B.out
+++ /dev/null
@@ -1 +0,0 @@
-1539
diff --git a/test/061_coord_eo/17_B2.in b/test/061_coord_eo/17_B2.in
deleted file mode 100644
index 9b33e35..0000000
--- a/test/061_coord_eo/17_B2.in
+++ /dev/null
@@ -1 +0,0 @@
-UF0 DB0 UB0 DF0 UR0 UL0 DL0 DR0 FR0 FL0 BR0 BL0 UFR0 DBR0 DFL0 UBL0 UFL0 DBL0 DFR0 UBR0
diff --git a/test/061_coord_eo/17_B2.out b/test/061_coord_eo/17_B2.out
deleted file mode 100644
index 573541a..0000000
--- a/test/061_coord_eo/17_B2.out
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/061_coord_eo/18_B3.in b/test/061_coord_eo/18_B3.in
deleted file mode 100644
index 1367517..0000000
--- a/test/061_coord_eo/18_B3.in
+++ /dev/null
@@ -1 +0,0 @@
-UF0 BL1 BR1 DF0 UR0 UL0 DL0 DR0 FR0 FL0 DB1 UB1 UFR0 DBL1 DFL0 UBR1 UFL0 UBL2 DFR0 DBR2
diff --git a/test/061_coord_eo/18_B3.out b/test/061_coord_eo/18_B3.out
deleted file mode 100644
index 1fd9918..0000000
--- a/test/061_coord_eo/18_B3.out
+++ /dev/null
@@ -1 +0,0 @@
-1539
diff --git a/test/061_coord_eo/20_scrambled.in b/test/061_coord_eo/20_scrambled.in
deleted file mode 100644
index 274d30b..0000000
--- a/test/061_coord_eo/20_scrambled.in
+++ /dev/null
@@ -1,3 +0,0 @@
-UL0 BL0 BR1 DL0 FR0 DF0 DB1 DR1 UB0 FL0 UF0 UR1 DFL0 UFR1 DBR1 UBR2 DBL2 DFR0 UFL1 UBL2
-
-// 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/061_coord_eo/20_scrambled.out b/test/061_coord_eo/20_scrambled.out
deleted file mode 100644
index aa309cc..0000000
--- a/test/061_coord_eo/20_scrambled.out
+++ /dev/null
@@ -1 +0,0 @@
-1122
diff --git a/test/061_coord_eo/coord_eo_tests.c b/test/061_coord_eo/coord_eo_tests.c
deleted file mode 100644
index 30989e8..0000000
--- a/test/061_coord_eo/coord_eo_tests.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <stdbool.h>
-#include <inttypes.h>
-#include <stdio.h>
-
-#ifdef CUBE_AVX2
-#include <immintrin.h>
-#endif
-
-#include "../../cube.h"
-
-#define STRLENMAX 10000
-
-int main() {
-        char str[STRLENMAX];
-        cube_t cube;
-        int16_t result;
-
-        fgets(str, STRLENMAX, stdin);
-        cube = readcube("H48", str);
-
-        result = coord_eo(cube);
-
-        printf("%" PRId16 "\n", result);
-
-        return 0;
-}