diff options
Diffstat (limited to '')
| -rw-r--r-- | test/061_coord_eo/00_solved.in (renamed from old/061_coord_eo/00_solved.in) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/00_solved.out (renamed from old/061_coord_eo/00_solved.out) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/01_U.in (renamed from old/061_coord_eo/01_U.in) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/01_U.out (renamed from old/061_coord_eo/01_U.out) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/02_U2.in (renamed from old/061_coord_eo/02_U2.in) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/02_U2.out (renamed from old/061_coord_eo/02_U2.out) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/03_U3.in (renamed from old/061_coord_eo/03_U3.in) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/03_U3.out (renamed from old/061_coord_eo/03_U3.out) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/04_D.in (renamed from old/061_coord_eo/04_D.in) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/04_D.out (renamed from old/061_coord_eo/04_D.out) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/07_R.in (renamed from old/061_coord_eo/07_R.in) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/07_R.out (renamed from old/061_coord_eo/07_R.out) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/08_R2.in (renamed from old/061_coord_eo/08_R2.in) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/08_R2.out (renamed from old/061_coord_eo/08_R2.out) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/10_L.in (renamed from old/061_coord_eo/10_L.in) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/10_L.out (renamed from old/061_coord_eo/10_L.out) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/13_F.in (renamed from old/061_coord_eo/13_F.in) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/13_F.out (renamed from old/061_coord_eo/13_F.out) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/14_F2.in (renamed from old/061_coord_eo/14_F2.in) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/14_F2.out (renamed from old/061_coord_eo/14_F2.out) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/15_F3.in (renamed from old/061_coord_eo/15_F3.in) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/15_F3.out (renamed from old/061_coord_eo/15_F3.out) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/16_B.in (renamed from old/061_coord_eo/16_B.in) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/16_B.out (renamed from old/061_coord_eo/16_B.out) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/17_B2.in (renamed from old/061_coord_eo/17_B2.in) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/17_B2.out (renamed from old/061_coord_eo/17_B2.out) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/18_B3.in (renamed from old/061_coord_eo/18_B3.in) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/18_B3.out (renamed from old/061_coord_eo/18_B3.out) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/20_scrambled.in (renamed from old/061_coord_eo/20_scrambled.in) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/20_scrambled.out (renamed from old/061_coord_eo/20_scrambled.out) | 0 | ||||
| -rw-r--r-- | test/061_coord_eo/coord_eo_tests.c (renamed from old/061_coord_eo/coord_eo_tests.c) | 9 | ||||
| -rw-r--r-- | test/070_solve_simple/01_U_U3.in (renamed from test/060_solve_simple/01_U_U3.in) | 0 | ||||
| -rw-r--r-- | test/070_solve_simple/01_U_U3.out (renamed from test/060_solve_simple/01_U_U3.out) | 0 | ||||
| -rw-r--r-- | test/070_solve_simple/02_MUMU_alloptimal.in (renamed from test/060_solve_simple/02_MUMU_alloptimal.in) | 0 | ||||
| -rw-r--r-- | test/070_solve_simple/02_MUMU_alloptimal.out (renamed from test/060_solve_simple/02_MUMU_alloptimal.out) | 0 | ||||
| -rw-r--r-- | test/070_solve_simple/solve_simple_tests.c (renamed from test/060_solve_simple/solve_simple_tests.c) | 0 | ||||
| -rw-r--r-- | test/test.h | 7 |
37 files changed, 14 insertions, 2 deletions
diff --git a/old/061_coord_eo/00_solved.in b/test/061_coord_eo/00_solved.in index dff224d..dff224d 100644 --- a/old/061_coord_eo/00_solved.in +++ b/test/061_coord_eo/00_solved.in | |||
diff --git a/old/061_coord_eo/00_solved.out b/test/061_coord_eo/00_solved.out index 573541a..573541a 100644 --- a/old/061_coord_eo/00_solved.out +++ b/test/061_coord_eo/00_solved.out | |||
diff --git a/old/061_coord_eo/01_U.in b/test/061_coord_eo/01_U.in index b5b36ad..b5b36ad 100644 --- a/old/061_coord_eo/01_U.in +++ b/test/061_coord_eo/01_U.in | |||
diff --git a/old/061_coord_eo/01_U.out b/test/061_coord_eo/01_U.out index 573541a..573541a 100644 --- a/old/061_coord_eo/01_U.out +++ b/test/061_coord_eo/01_U.out | |||
diff --git a/old/061_coord_eo/02_U2.in b/test/061_coord_eo/02_U2.in index 316ad57..316ad57 100644 --- a/old/061_coord_eo/02_U2.in +++ b/test/061_coord_eo/02_U2.in | |||
diff --git a/old/061_coord_eo/02_U2.out b/test/061_coord_eo/02_U2.out index 573541a..573541a 100644 --- a/old/061_coord_eo/02_U2.out +++ b/test/061_coord_eo/02_U2.out | |||
diff --git a/old/061_coord_eo/03_U3.in b/test/061_coord_eo/03_U3.in index 7721ab5..7721ab5 100644 --- a/old/061_coord_eo/03_U3.in +++ b/test/061_coord_eo/03_U3.in | |||
diff --git a/old/061_coord_eo/03_U3.out b/test/061_coord_eo/03_U3.out index 573541a..573541a 100644 --- a/old/061_coord_eo/03_U3.out +++ b/test/061_coord_eo/03_U3.out | |||
diff --git a/old/061_coord_eo/04_D.in b/test/061_coord_eo/04_D.in index cf4f816..cf4f816 100644 --- a/old/061_coord_eo/04_D.in +++ b/test/061_coord_eo/04_D.in | |||
diff --git a/old/061_coord_eo/04_D.out b/test/061_coord_eo/04_D.out index 573541a..573541a 100644 --- a/old/061_coord_eo/04_D.out +++ b/test/061_coord_eo/04_D.out | |||
diff --git a/old/061_coord_eo/07_R.in b/test/061_coord_eo/07_R.in index 8c8fcb3..8c8fcb3 100644 --- a/old/061_coord_eo/07_R.in +++ b/test/061_coord_eo/07_R.in | |||
diff --git a/old/061_coord_eo/07_R.out b/test/061_coord_eo/07_R.out index 573541a..573541a 100644 --- a/old/061_coord_eo/07_R.out +++ b/test/061_coord_eo/07_R.out | |||
diff --git a/old/061_coord_eo/08_R2.in b/test/061_coord_eo/08_R2.in index 90765e2..90765e2 100644 --- a/old/061_coord_eo/08_R2.in +++ b/test/061_coord_eo/08_R2.in | |||
diff --git a/old/061_coord_eo/08_R2.out b/test/061_coord_eo/08_R2.out index 573541a..573541a 100644 --- a/old/061_coord_eo/08_R2.out +++ b/test/061_coord_eo/08_R2.out | |||
diff --git a/old/061_coord_eo/10_L.in b/test/061_coord_eo/10_L.in index 0b0565c..0b0565c 100644 --- a/old/061_coord_eo/10_L.in +++ b/test/061_coord_eo/10_L.in | |||
diff --git a/old/061_coord_eo/10_L.out b/test/061_coord_eo/10_L.out index 573541a..573541a 100644 --- a/old/061_coord_eo/10_L.out +++ b/test/061_coord_eo/10_L.out | |||
diff --git a/old/061_coord_eo/13_F.in b/test/061_coord_eo/13_F.in index e805af8..e805af8 100644 --- a/old/061_coord_eo/13_F.in +++ b/test/061_coord_eo/13_F.in | |||
diff --git a/old/061_coord_eo/13_F.out b/test/061_coord_eo/13_F.out index 2c60641..2c60641 100644 --- a/old/061_coord_eo/13_F.out +++ b/test/061_coord_eo/13_F.out | |||
diff --git a/old/061_coord_eo/14_F2.in b/test/061_coord_eo/14_F2.in index 8aa701f..8aa701f 100644 --- a/old/061_coord_eo/14_F2.in +++ b/test/061_coord_eo/14_F2.in | |||
diff --git a/old/061_coord_eo/14_F2.out b/test/061_coord_eo/14_F2.out index 573541a..573541a 100644 --- a/old/061_coord_eo/14_F2.out +++ b/test/061_coord_eo/14_F2.out | |||
diff --git a/old/061_coord_eo/15_F3.in b/test/061_coord_eo/15_F3.in index 40f1260..40f1260 100644 --- a/old/061_coord_eo/15_F3.in +++ b/test/061_coord_eo/15_F3.in | |||
diff --git a/old/061_coord_eo/15_F3.out b/test/061_coord_eo/15_F3.out index 2c60641..2c60641 100644 --- a/old/061_coord_eo/15_F3.out +++ b/test/061_coord_eo/15_F3.out | |||
diff --git a/old/061_coord_eo/16_B.in b/test/061_coord_eo/16_B.in index f7fb13c..f7fb13c 100644 --- a/old/061_coord_eo/16_B.in +++ b/test/061_coord_eo/16_B.in | |||
diff --git a/old/061_coord_eo/16_B.out b/test/061_coord_eo/16_B.out index 1fd9918..1fd9918 100644 --- a/old/061_coord_eo/16_B.out +++ b/test/061_coord_eo/16_B.out | |||
diff --git a/old/061_coord_eo/17_B2.in b/test/061_coord_eo/17_B2.in index 9b33e35..9b33e35 100644 --- a/old/061_coord_eo/17_B2.in +++ b/test/061_coord_eo/17_B2.in | |||
diff --git a/old/061_coord_eo/17_B2.out b/test/061_coord_eo/17_B2.out index 573541a..573541a 100644 --- a/old/061_coord_eo/17_B2.out +++ b/test/061_coord_eo/17_B2.out | |||
diff --git a/old/061_coord_eo/18_B3.in b/test/061_coord_eo/18_B3.in index 1367517..1367517 100644 --- a/old/061_coord_eo/18_B3.in +++ b/test/061_coord_eo/18_B3.in | |||
diff --git a/old/061_coord_eo/18_B3.out b/test/061_coord_eo/18_B3.out index 1fd9918..1fd9918 100644 --- a/old/061_coord_eo/18_B3.out +++ b/test/061_coord_eo/18_B3.out | |||
diff --git a/old/061_coord_eo/20_scrambled.in b/test/061_coord_eo/20_scrambled.in index 274d30b..274d30b 100644 --- a/old/061_coord_eo/20_scrambled.in +++ b/test/061_coord_eo/20_scrambled.in | |||
diff --git a/old/061_coord_eo/20_scrambled.out b/test/061_coord_eo/20_scrambled.out index aa309cc..aa309cc 100644 --- a/old/061_coord_eo/20_scrambled.out +++ b/test/061_coord_eo/20_scrambled.out | |||
diff --git a/old/061_coord_eo/coord_eo_tests.c b/test/061_coord_eo/coord_eo_tests.c index 30989e8..bd3db8a 100644 --- a/old/061_coord_eo/coord_eo_tests.c +++ b/test/061_coord_eo/coord_eo_tests.c | |||
| @@ -6,19 +6,24 @@ | |||
| 6 | #include <immintrin.h> | 6 | #include <immintrin.h> |
| 7 | #endif | 7 | #endif |
| 8 | 8 | ||
| 9 | #include "../../cube.h" | 9 | #include "../test.h" |
| 10 | 10 | ||
| 11 | #define STRLENMAX 10000 | 11 | #define STRLENMAX 10000 |
| 12 | 12 | ||
| 13 | int64_t coord_fast_eo(cube_fast_t); | ||
| 14 | cube_fast_t cubetofast(cube_t); | ||
| 15 | |||
| 13 | int main() { | 16 | int main() { |
| 14 | char str[STRLENMAX]; | 17 | char str[STRLENMAX]; |
| 15 | cube_t cube; | 18 | cube_t cube; |
| 19 | cube_fast_t fast; | ||
| 16 | int16_t result; | 20 | int16_t result; |
| 17 | 21 | ||
| 18 | fgets(str, STRLENMAX, stdin); | 22 | fgets(str, STRLENMAX, stdin); |
| 19 | cube = readcube("H48", str); | 23 | cube = readcube("H48", str); |
| 24 | fast = cubetofast(cube); | ||
| 20 | 25 | ||
| 21 | result = coord_eo(cube); | 26 | result = coord_fast_eo(fast); |
| 22 | 27 | ||
| 23 | printf("%" PRId16 "\n", result); | 28 | printf("%" PRId16 "\n", result); |
| 24 | 29 | ||
diff --git a/test/060_solve_simple/01_U_U3.in b/test/070_solve_simple/01_U_U3.in index c0f7930..c0f7930 100644 --- a/test/060_solve_simple/01_U_U3.in +++ b/test/070_solve_simple/01_U_U3.in | |||
diff --git a/test/060_solve_simple/01_U_U3.out b/test/070_solve_simple/01_U_U3.out index ca934b4..ca934b4 100644 --- a/test/060_solve_simple/01_U_U3.out +++ b/test/070_solve_simple/01_U_U3.out | |||
diff --git a/test/060_solve_simple/02_MUMU_alloptimal.in b/test/070_solve_simple/02_MUMU_alloptimal.in index f97c95f..f97c95f 100644 --- a/test/060_solve_simple/02_MUMU_alloptimal.in +++ b/test/070_solve_simple/02_MUMU_alloptimal.in | |||
diff --git a/test/060_solve_simple/02_MUMU_alloptimal.out b/test/070_solve_simple/02_MUMU_alloptimal.out index 06cd521..06cd521 100644 --- a/test/060_solve_simple/02_MUMU_alloptimal.out +++ b/test/070_solve_simple/02_MUMU_alloptimal.out | |||
diff --git a/test/060_solve_simple/solve_simple_tests.c b/test/070_solve_simple/solve_simple_tests.c index 14a1674..14a1674 100644 --- a/test/060_solve_simple/solve_simple_tests.c +++ b/test/070_solve_simple/solve_simple_tests.c | |||
diff --git a/test/test.h b/test/test.h new file mode 100644 index 0000000..607a52d --- /dev/null +++ b/test/test.h | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | #include "../cube.h" | ||
| 2 | |||
| 3 | #ifdef CUBE_AVX2 | ||
| 4 | typedef __m256i cube_fast_t; | ||
| 5 | #else | ||
| 6 | typedef cube_t cube_fast_t; | ||
| 7 | #endif | ||
