From 270e5b0444f67781856bf80db51650af9cb89b0c Mon Sep 17 00:00:00 2001 From: Sebastiano Tronto Date: Thu, 17 Jul 2025 08:54:44 +0200 Subject: Renamed tests to make space for more coordinate tests --- test/130_appendsolution/00_empty.in | 5 -- test/130_appendsolution/00_empty.out | 4 -- .../01_simple_onlynormal_nounniss.in | 5 -- .../01_simple_onlynormal_nounniss.out | 4 -- .../02_simple_onlynormal_nounnis_multitrans.in | 8 --- .../02_simple_onlynormal_nounnis_multitrans.out | 7 --- test/130_appendsolution/03_simple_unniss.in | 5 -- test/130_appendsolution/03_simple_unniss.out | 4 -- test/130_appendsolution/04_niss_nounniss.in | 5 -- test/130_appendsolution/04_niss_nounniss.out | 4 -- test/130_appendsolution/05_sort_parallel.in | 5 -- test/130_appendsolution/05_sort_parallel.out | 4 -- test/130_appendsolution/06_unniss_trans_sort.in | 5 -- test/130_appendsolution/06_unniss_trans_sort.out | 4 -- test/130_appendsolution/07_unniss_cancel_nosol.in | 5 -- test/130_appendsolution/07_unniss_cancel_nosol.out | 3 - .../08_unniss_cancel_nosol_v2.in | 5 -- .../08_unniss_cancel_nosol_v2.out | 3 - test/130_appendsolution/09_fullinverse_niss.in | 5 -- test/130_appendsolution/09_fullinverse_niss.out | 4 -- test/130_appendsolution/10_rotated.in | 5 -- test/130_appendsolution/10_rotated.out | 4 -- test/130_appendsolution/appendsolution_tests.c | 68 ---------------------- 23 files changed, 171 deletions(-) delete mode 100644 test/130_appendsolution/00_empty.in delete mode 100644 test/130_appendsolution/00_empty.out delete mode 100644 test/130_appendsolution/01_simple_onlynormal_nounniss.in delete mode 100644 test/130_appendsolution/01_simple_onlynormal_nounniss.out delete mode 100644 test/130_appendsolution/02_simple_onlynormal_nounnis_multitrans.in delete mode 100644 test/130_appendsolution/02_simple_onlynormal_nounnis_multitrans.out delete mode 100644 test/130_appendsolution/03_simple_unniss.in delete mode 100644 test/130_appendsolution/03_simple_unniss.out delete mode 100644 test/130_appendsolution/04_niss_nounniss.in delete mode 100644 test/130_appendsolution/04_niss_nounniss.out delete mode 100644 test/130_appendsolution/05_sort_parallel.in delete mode 100644 test/130_appendsolution/05_sort_parallel.out delete mode 100644 test/130_appendsolution/06_unniss_trans_sort.in delete mode 100644 test/130_appendsolution/06_unniss_trans_sort.out delete mode 100644 test/130_appendsolution/07_unniss_cancel_nosol.in delete mode 100644 test/130_appendsolution/07_unniss_cancel_nosol.out delete mode 100644 test/130_appendsolution/08_unniss_cancel_nosol_v2.in delete mode 100644 test/130_appendsolution/08_unniss_cancel_nosol_v2.out delete mode 100644 test/130_appendsolution/09_fullinverse_niss.in delete mode 100644 test/130_appendsolution/09_fullinverse_niss.out delete mode 100644 test/130_appendsolution/10_rotated.in delete mode 100644 test/130_appendsolution/10_rotated.out delete mode 100644 test/130_appendsolution/appendsolution_tests.c (limited to 'test/130_appendsolution') diff --git a/test/130_appendsolution/00_empty.in b/test/130_appendsolution/00_empty.in deleted file mode 100644 index 1100b95..0000000 --- a/test/130_appendsolution/00_empty.in +++ /dev/null @@ -1,5 +0,0 @@ - -0 -1 -rotation UF -0 diff --git a/test/130_appendsolution/00_empty.out b/test/130_appendsolution/00_empty.out deleted file mode 100644 index 8581416..0000000 --- a/test/130_appendsolution/00_empty.out +++ /dev/null @@ -1,4 +0,0 @@ - -Number of solutions: 1 -Shortest solution length: 0 -Used bytes: 1 diff --git a/test/130_appendsolution/01_simple_onlynormal_nounniss.in b/test/130_appendsolution/01_simple_onlynormal_nounniss.in deleted file mode 100644 index fb1eaed..0000000 --- a/test/130_appendsolution/01_simple_onlynormal_nounniss.in +++ /dev/null @@ -1,5 +0,0 @@ -U F R D2 B' -0 -1 -rotation UF -0 diff --git a/test/130_appendsolution/01_simple_onlynormal_nounniss.out b/test/130_appendsolution/01_simple_onlynormal_nounniss.out deleted file mode 100644 index b577962..0000000 --- a/test/130_appendsolution/01_simple_onlynormal_nounniss.out +++ /dev/null @@ -1,4 +0,0 @@ -U F R D2 B' -Number of solutions: 1 -Shortest solution length: 5 -Used bytes: 12 diff --git a/test/130_appendsolution/02_simple_onlynormal_nounnis_multitrans.in b/test/130_appendsolution/02_simple_onlynormal_nounnis_multitrans.in deleted file mode 100644 index db5f074..0000000 --- a/test/130_appendsolution/02_simple_onlynormal_nounnis_multitrans.in +++ /dev/null @@ -1,8 +0,0 @@ -U F R -0 -4 -rotation UF -mirrored UR -rotation BD -mirrored LB -0 diff --git a/test/130_appendsolution/02_simple_onlynormal_nounnis_multitrans.out b/test/130_appendsolution/02_simple_onlynormal_nounnis_multitrans.out deleted file mode 100644 index e1b5631..0000000 --- a/test/130_appendsolution/02_simple_onlynormal_nounnis_multitrans.out +++ /dev/null @@ -1,7 +0,0 @@ -U F R -B D L -U' L' B' -R' B' D' -Number of solutions: 4 -Shortest solution length: 3 -Used bytes: 30 diff --git a/test/130_appendsolution/03_simple_unniss.in b/test/130_appendsolution/03_simple_unniss.in deleted file mode 100644 index 2c5a331..0000000 --- a/test/130_appendsolution/03_simple_unniss.in +++ /dev/null @@ -1,5 +0,0 @@ -U F B2 (R' F D) -1 -1 -rotation UF -0 diff --git a/test/130_appendsolution/03_simple_unniss.out b/test/130_appendsolution/03_simple_unniss.out deleted file mode 100644 index 3ca210e..0000000 --- a/test/130_appendsolution/03_simple_unniss.out +++ /dev/null @@ -1,4 +0,0 @@ -U F B2 D' F' R -Number of solutions: 1 -Shortest solution length: 6 -Used bytes: 15 diff --git a/test/130_appendsolution/04_niss_nounniss.in b/test/130_appendsolution/04_niss_nounniss.in deleted file mode 100644 index b07f970..0000000 --- a/test/130_appendsolution/04_niss_nounniss.in +++ /dev/null @@ -1,5 +0,0 @@ -U F B2 (R' F D) -0 -1 -rotation UF -0 diff --git a/test/130_appendsolution/04_niss_nounniss.out b/test/130_appendsolution/04_niss_nounniss.out deleted file mode 100644 index a616b4c..0000000 --- a/test/130_appendsolution/04_niss_nounniss.out +++ /dev/null @@ -1,4 +0,0 @@ -U F B2 (R' F D) -Number of solutions: 1 -Shortest solution length: 6 -Used bytes: 16 diff --git a/test/130_appendsolution/05_sort_parallel.in b/test/130_appendsolution/05_sort_parallel.in deleted file mode 100644 index bc1cf0f..0000000 --- a/test/130_appendsolution/05_sort_parallel.in +++ /dev/null @@ -1,5 +0,0 @@ -L R' B2 F -0 -1 -rotation UF -0 diff --git a/test/130_appendsolution/05_sort_parallel.out b/test/130_appendsolution/05_sort_parallel.out deleted file mode 100644 index fc09830..0000000 --- a/test/130_appendsolution/05_sort_parallel.out +++ /dev/null @@ -1,4 +0,0 @@ -R' L F B2 -Number of solutions: 1 -Shortest solution length: 4 -Used bytes: 10 diff --git a/test/130_appendsolution/06_unniss_trans_sort.in b/test/130_appendsolution/06_unniss_trans_sort.in deleted file mode 100644 index 2ffab93..0000000 --- a/test/130_appendsolution/06_unniss_trans_sort.in +++ /dev/null @@ -1,5 +0,0 @@ -B (R2 F2) -1 -1 -rotation UR -0 diff --git a/test/130_appendsolution/06_unniss_trans_sort.out b/test/130_appendsolution/06_unniss_trans_sort.out deleted file mode 100644 index 28d7827..0000000 --- a/test/130_appendsolution/06_unniss_trans_sort.out +++ /dev/null @@ -1,4 +0,0 @@ -R2 L B2 -Number of solutions: 1 -Shortest solution length: 3 -Used bytes: 8 diff --git a/test/130_appendsolution/07_unniss_cancel_nosol.in b/test/130_appendsolution/07_unniss_cancel_nosol.in deleted file mode 100644 index 6883d05..0000000 --- a/test/130_appendsolution/07_unniss_cancel_nosol.in +++ /dev/null @@ -1,5 +0,0 @@ -B' F (R2 B2) -1 -1 -rotation UF -0 diff --git a/test/130_appendsolution/07_unniss_cancel_nosol.out b/test/130_appendsolution/07_unniss_cancel_nosol.out deleted file mode 100644 index ed5ea65..0000000 --- a/test/130_appendsolution/07_unniss_cancel_nosol.out +++ /dev/null @@ -1,3 +0,0 @@ -Number of solutions: 0 -Shortest solution length: 21 -Used bytes: 0 diff --git a/test/130_appendsolution/08_unniss_cancel_nosol_v2.in b/test/130_appendsolution/08_unniss_cancel_nosol_v2.in deleted file mode 100644 index 3d461f0..0000000 --- a/test/130_appendsolution/08_unniss_cancel_nosol_v2.in +++ /dev/null @@ -1,5 +0,0 @@ -F' B (R2 F2) -1 -1 -rotation UF -0 diff --git a/test/130_appendsolution/08_unniss_cancel_nosol_v2.out b/test/130_appendsolution/08_unniss_cancel_nosol_v2.out deleted file mode 100644 index ed5ea65..0000000 --- a/test/130_appendsolution/08_unniss_cancel_nosol_v2.out +++ /dev/null @@ -1,3 +0,0 @@ -Number of solutions: 0 -Shortest solution length: 21 -Used bytes: 0 diff --git a/test/130_appendsolution/09_fullinverse_niss.in b/test/130_appendsolution/09_fullinverse_niss.in deleted file mode 100644 index bb2b640..0000000 --- a/test/130_appendsolution/09_fullinverse_niss.in +++ /dev/null @@ -1,5 +0,0 @@ -(F) -0 -1 -rotation UF -0 diff --git a/test/130_appendsolution/09_fullinverse_niss.out b/test/130_appendsolution/09_fullinverse_niss.out deleted file mode 100644 index 9721085..0000000 --- a/test/130_appendsolution/09_fullinverse_niss.out +++ /dev/null @@ -1,4 +0,0 @@ -(F) -Number of solutions: 1 -Shortest solution length: 1 -Used bytes: 4 diff --git a/test/130_appendsolution/10_rotated.in b/test/130_appendsolution/10_rotated.in deleted file mode 100644 index 5210cd5..0000000 --- a/test/130_appendsolution/10_rotated.in +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index e70b2fe..0000000 --- a/test/130_appendsolution/10_rotated.out +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index e1b7e98..0000000 --- a/test/130_appendsolution/appendsolution_tests.c +++ /dev/null @@ -1,68 +0,0 @@ -/* -Input format for appendsolution tests: - -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. -*/ - -#include "../test.h" - -uint8_t readtrans(const char [NISSY_SIZE_TRANSFORMATION]); -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], - const solution_settings_t [static 1], solution_list_t [static 1], bool, - const char *); - -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; - solution_list_t list; - - solution_moves_reset(&moves); - solution_list_init(&list, STRLENMAX, buf); - settings = (solution_settings_t) { - .tmask = UINT64_C(0), - .unniss = false, - .maxmoves = 20, - .maxsolutions = 100, - .optimal = -1, - }; - - fgets(str, STRLENMAX, stdin); - 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); - ntrans = atoi(str); - for (i = 0; i < ntrans; i++) { - 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"); - - printf("%s", list.buf); - printf("Number of solutions: %" PRIu64 "\n", list.nsols); - printf("Shortest solution length: %" PRIu8 "\n", list.shortest_sol); - printf("Used bytes: %zu\n", list.used); -} -- cgit v1.3