From a18d4b0ba97b301193597a963a77a40ef7c2254b Mon Sep 17 00:00:00 2001 From: Sebastiano Tronto Date: Sat, 13 Apr 2024 15:31:32 +0200 Subject: Some renaming --- test/000_basic/basic_tests.c | 11 ++++------- test/001_cube_conversion/cube_conversion_tests.c | 4 ++-- test/020_io_H48_read_write/io_H48_tests.c | 4 ++-- test/023_io_LST_write/io_LST_tests.c | 4 ++-- test/024_io_LST_read/io_LST_tests.c | 4 ++-- test/030_move/move_tests.c | 4 ++-- test/040_inverse_cube/inverse_tests.c | 8 +++----- test/050_compose/compose_tests.c | 4 ++-- test/060_transform/transform_tests.c | 4 ++-- test/061_inverse_trans/inverse_trans_tests.c | 8 ++++---- test/last.err | 0 test/last.out | 1 + test/test.h | 21 ++------------------- 13 files changed, 28 insertions(+), 49 deletions(-) create mode 100644 test/last.err create mode 100644 test/last.out (limited to 'test') diff --git a/test/000_basic/basic_tests.c b/test/000_basic/basic_tests.c index c4434c5..53ccc9f 100644 --- a/test/000_basic/basic_tests.c +++ b/test/000_basic/basic_tests.c @@ -1,27 +1,24 @@ #include "../test.h" -bool issolved(cube_t); -bool equal(cube_t, cube_t); - void check(cube_t cube, char *name) { - printf("%s is%s solvable\n", name, issolvable(cube) ? "" : " NOT"); - printf("%s is%s solved\n", name, issolved(cube) ? "" : " NOT"); + printf("%s is%s solvable\n", name, cube_solvable(cube) ? "" : " NOT"); + printf("%s is%s solved\n", name, cube_solved(cube) ? "" : " NOT"); } void check2(cube_t cube1, char *name1, cube_t cube2, char *name2) { printf("%s and %s are%s equal\n", name1, name2, - equal(cube1, cube2) ? "" : " NOT"); + cube_equal(cube1, cube2) ? "" : " NOT"); } int main(void) { cube_t zero, solved; memset(&zero, 0, sizeof(cube_t)); - solved = solvedcube(); + solved = cube_new(); check(solved, "Solved"); check(zero, "Zero"); diff --git a/test/001_cube_conversion/cube_conversion_tests.c b/test/001_cube_conversion/cube_conversion_tests.c index 589eb82..fe8a68f 100644 --- a/test/001_cube_conversion/cube_conversion_tests.c +++ b/test/001_cube_conversion/cube_conversion_tests.c @@ -14,9 +14,9 @@ int main(void) { fast = cubetofast(cube); cube2 = fasttocube(fast); - if (iserror(cube)) { + if (cube_error(cube)) { printf("Error reading cube\n"); - } else if (iserror(cube2)) { + } else if (cube_error(cube2)) { printf("Error converting cube\n"); } else { writecube("H48", cube2, cubestr); diff --git a/test/020_io_H48_read_write/io_H48_tests.c b/test/020_io_H48_read_write/io_H48_tests.c index 705356c..222e4d4 100644 --- a/test/020_io_H48_read_write/io_H48_tests.c +++ b/test/020_io_H48_read_write/io_H48_tests.c @@ -11,9 +11,9 @@ int main(void) { cube = readcube("H48", str); - if (iserror(cube)) { + if (cube_error(cube)) { printf("Error reading cube\n"); - } else if (!issolvable(cube)) { + } else if (!cube_solvable(cube)) { printf("Cube is not solvable\n"); } else { writecube("H48", cube, str); diff --git a/test/023_io_LST_write/io_LST_tests.c b/test/023_io_LST_write/io_LST_tests.c index df35632..8a3ce22 100644 --- a/test/023_io_LST_write/io_LST_tests.c +++ b/test/023_io_LST_write/io_LST_tests.c @@ -11,9 +11,9 @@ int main(void) { cube = readcube("H48", str); - if (iserror(cube)) { + if (cube_error(cube)) { printf("Error reading cube\n"); - } else if (!issolvable(cube)) { + } else if (!cube_solvable(cube)) { printf("Cube is not solvable\n"); } else { writecube("LST", cube, str); diff --git a/test/024_io_LST_read/io_LST_tests.c b/test/024_io_LST_read/io_LST_tests.c index 506a23d..81d4c54 100644 --- a/test/024_io_LST_read/io_LST_tests.c +++ b/test/024_io_LST_read/io_LST_tests.c @@ -11,9 +11,9 @@ int main(void) { cube = readcube("LST", str); - if (iserror(cube)) { + if (cube_error(cube)) { printf("Error reading cube\n"); - } else if (!issolvable(cube)) { + } else if (!cube_solvable(cube)) { printf("Cube is not solvable\n"); } else { writecube("H48", cube, str); diff --git a/test/030_move/move_tests.c b/test/030_move/move_tests.c index 73e9dbe..39458ba 100644 --- a/test/030_move/move_tests.c +++ b/test/030_move/move_tests.c @@ -12,9 +12,9 @@ int main(void) { cube = applymoves(cube, movestr); - if (iserror(cube)) { + if (cube_error(cube)) { printf("Error moving cube\n"); - } else if (!issolvable(cube)) { + } else if (!cube_solvable(cube)) { printf("Moved cube is not solvable\n"); } else { writecube("H48", cube, cubestr); diff --git a/test/040_inverse_cube/inverse_tests.c b/test/040_inverse_cube/inverse_tests.c index 2ff3bc7..ca7e481 100644 --- a/test/040_inverse_cube/inverse_tests.c +++ b/test/040_inverse_cube/inverse_tests.c @@ -1,18 +1,16 @@ #include "../test.h" -cube_t inverse(cube_t); - int main(void) { char str[STRLENMAX]; cube_t cube, inv; fgets(str, STRLENMAX, stdin); cube = readcube("H48", str); - inv = inverse(cube); + inv = cube_inverse(cube); - if (iserror(inv)) { + if (cube_error(inv)) { printf("Error inverting cube\n"); - } else if (!issolvable(inv)) { + } else if (!cube_solvable(inv)) { printf("Inverted cube is not solvable\n"); } else { writecube("H48", inv, str); diff --git a/test/050_compose/compose_tests.c b/test/050_compose/compose_tests.c index 0ea4eff..c0bbbef 100644 --- a/test/050_compose/compose_tests.c +++ b/test/050_compose/compose_tests.c @@ -13,9 +13,9 @@ int main(void) { c3 = compose(c1, c2); - if (iserror(c3)) { + if (cube_error(c3)) { printf("Error composing cubes\n"); - } else if (!issolvable(c3)) { + } else if (!cube_solvable(c3)) { printf("Composed cube is not solvable\n"); } else { writecube("H48", c3, str); diff --git a/test/060_transform/transform_tests.c b/test/060_transform/transform_tests.c index f95ad67..8680a0b 100644 --- a/test/060_transform/transform_tests.c +++ b/test/060_transform/transform_tests.c @@ -12,9 +12,9 @@ int main(void) { cube = applytrans(cube, transtr); - if (iserror(cube)) { + if (cube_error(cube)) { printf("Error transforming cube\n"); - } else if (!issolvable(cube)) { + } else if (!cube_solvable(cube)) { printf("Transformed cube is not solvable\n"); } else { writecube("H48", cube, cubestr); diff --git a/test/061_inverse_trans/inverse_trans_tests.c b/test/061_inverse_trans/inverse_trans_tests.c index 77bd40b..7de8f66 100644 --- a/test/061_inverse_trans/inverse_trans_tests.c +++ b/test/061_inverse_trans/inverse_trans_tests.c @@ -11,7 +11,7 @@ int main(void) { cube_t cube; for (t = 0; t < 48; t++) { - cube = solvedcube(); + cube = cube_new(); cube = applymoves(cube, "R"); cube = applymoves(cube, "U"); cube = applymoves(cube, "F"); @@ -20,15 +20,15 @@ int main(void) { tinv = inverse_trans(t); cube = applytrans(cube, transstr[tinv]); - if (iserror(cube)) { + if (cube_error(cube)) { printf("Error transforming cube\n"); - } else if (!issolvable(cube)) { + } else if (!cube_solvable(cube)) { printf("Transformed cube is not solvable\n"); } else { cube = applymoves(cube, "F'"); cube = applymoves(cube, "U'"); cube = applymoves(cube, "R'"); - if (!issolved(cube)) + if (!cube_solved(cube)) printf("%s: Error! Got %" PRIu8 "\n", transstr[t], tinv); } diff --git a/test/last.err b/test/last.err new file mode 100644 index 0000000..e69de29 diff --git a/test/last.out b/test/last.out new file mode 100644 index 0000000..102ac1b --- /dev/null +++ b/test/last.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/test.h b/test/test.h index 3cbfd10..92ed0db 100644 --- a/test/test.h +++ b/test/test.h @@ -4,24 +4,7 @@ #include #include -#define STRLENMAX 10000 - -typedef struct { - uint8_t corner[8]; - uint8_t edge[12]; -} cube_t; +#include "../cube.h" -#ifdef CUBE_AVX2 -#include -typedef __m256i cube_fast_t; -#else +#define STRLENMAX 10000 typedef cube_t cube_fast_t; -#endif - -/* Basic functions used in most tests */ -cube_t solvedcube(void); -bool iserror(cube_t); -bool issolvable(cube_t); -bool issolved(cube_t); -cube_t readcube(char *, char *); -void writecube(char *, cube_t, char *); -- cgit v1.3