From bab22e1946a656088804b61cf765461b48744971 Mon Sep 17 00:00:00 2001 From: Sebastiano Tronto Date: Tue, 22 Apr 2025 16:12:21 +0200 Subject: Update tests for oriented_cube_t --- test/000_basic/basic_tests.c | 16 +++++++++------- test/001_pieces/pieces_tests.c | 4 ++-- test/020_io_cube_read_write/01_solved_oneline.in | 1 - test/020_io_cube_read_write/01_solved_oneline.out | 1 - test/020_io_cube_read_write/01_solved_oriented.in | 1 + test/020_io_cube_read_write/01_solved_oriented.out | 1 + test/020_io_cube_read_write/02_solve_misoriented.in | 1 + test/020_io_cube_read_write/02_solve_misoriented.out | 1 + test/020_io_cube_read_write/io_cube_tests.c | 2 +- test/030_move/move_tests.c | 4 ++-- test/031_premove/premove_tests.c | 4 ++-- test/040_inverse_cube/inverse_tests.c | 7 +++++-- test/050_compose/compose_tests.c | 7 +++++-- test/060_transform/transform_tests.c | 4 ++-- test/061_inverse_trans/inverse_trans_tests.c | 6 +++--- test/062_transform_move/transform_move_tests.c | 6 +++--- test/063_symmetry_mask/symmetry_mask_tests.c | 4 ++-- test/071_coord_eo/coord_eo_tests.c | 4 ++-- test/072_coord_co/coord_co_tests.c | 4 ++-- test/073_coord_csep/coord_csep_tests.c | 4 ++-- test/074_coord_esep/coord_esep_tests.c | 4 ++-- test/075_set_eo/set_eo_tests.c | 6 +++--- test/076_copy_corners/copy_corners_tests.c | 4 ++-- test/077_copy_edges/copy_edges_tests.c | 4 ++-- test/078_invcoord_esep/invcoord_esep_tests.c | 8 ++++---- test/079_invcoord_co/invcoord_co_tests.c | 8 +++++--- test/081_getcube/getcube_tests.c | 7 +++++-- .../cocsep_transform_invariant.c | 7 ++++--- test/102_cocsep_selfsim/cocsep_selfsim_tests.c | 5 +++-- test/110_coord_invcoord_h48/coord_invcoord_h48_tests.c | 9 +++++---- test/121_coorddata_dr/coorddata_dr.c | 7 +++++-- test/122_coorddata_dreo/coorddata_dreo.c | 7 +++++-- test/test.h | 15 ++++++++------- 33 files changed, 99 insertions(+), 74 deletions(-) delete mode 100644 test/020_io_cube_read_write/01_solved_oneline.in delete mode 100644 test/020_io_cube_read_write/01_solved_oneline.out create mode 100644 test/020_io_cube_read_write/01_solved_oriented.in create mode 100644 test/020_io_cube_read_write/01_solved_oriented.out create mode 100644 test/020_io_cube_read_write/02_solve_misoriented.in create mode 100644 test/020_io_cube_read_write/02_solve_misoriented.out (limited to 'test') diff --git a/test/000_basic/basic_tests.c b/test/000_basic/basic_tests.c index accde66..df38e88 100644 --- a/test/000_basic/basic_tests.c +++ b/test/000_basic/basic_tests.c @@ -1,27 +1,29 @@ #include "../test.h" -bool issolved(cube_t); +bool issolved(oriented_cube_t); bool equal(cube_t, cube_t); void -check(cube_t cube, char *name) +check(oriented_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"); } void -check2(cube_t cube1, char *name1, cube_t cube2, char *name2) +check2(oriented_cube_t cube1, char *name1, oriented_cube_t cube2, char *name2) { - printf("%s and %s are%s equal\n", name1, name2, - equal(cube1, cube2) ? "" : " NOT"); + bool eq = equal(cube1.cube, cube2.cube) && + cube1.orientation == cube2.orientation; + printf("%s and %s are%s equal\n", name1, name2, eq ? "" : " NOT"); } void run(void) { - cube_t zero, solved; + oriented_cube_t zero, solved; - memset(&zero, 0, sizeof(cube_t)); + memset(&zero, 0, sizeof(oriented_cube_t)); solved = solvedcube(); + check(solved, "Solved"); check(zero, "Zero"); diff --git a/test/001_pieces/pieces_tests.c b/test/001_pieces/pieces_tests.c index 452a11b..f46a143 100644 --- a/test/001_pieces/pieces_tests.c +++ b/test/001_pieces/pieces_tests.c @@ -6,7 +6,7 @@ void run(void) { int i; uint8_t corner[8], edge[12]; char str[STRLENMAX], *aux; - cube_t cube; + oriented_cube_t cube; aux = str; while (fgets(aux, STRLENMAX, stdin) != NULL) @@ -14,7 +14,7 @@ void run(void) { aux++; cube = readcube(str); - pieces(&cube, corner, edge); + pieces(&cube.cube, corner, edge); for (i = 0; i < 8; i++) printf("%" PRIu8 " ", corner[i]); diff --git a/test/020_io_cube_read_write/01_solved_oneline.in b/test/020_io_cube_read_write/01_solved_oneline.in deleted file mode 100644 index 5aa6ba7..0000000 --- a/test/020_io_cube_read_write/01_solved_oneline.in +++ /dev/null @@ -1 +0,0 @@ -ABCDEFGH=ABCDEFGHIJKL=A diff --git a/test/020_io_cube_read_write/01_solved_oneline.out b/test/020_io_cube_read_write/01_solved_oneline.out deleted file mode 100644 index 5aa6ba7..0000000 --- a/test/020_io_cube_read_write/01_solved_oneline.out +++ /dev/null @@ -1 +0,0 @@ -ABCDEFGH=ABCDEFGHIJKL=A diff --git a/test/020_io_cube_read_write/01_solved_oriented.in b/test/020_io_cube_read_write/01_solved_oriented.in new file mode 100644 index 0000000..5aa6ba7 --- /dev/null +++ b/test/020_io_cube_read_write/01_solved_oriented.in @@ -0,0 +1 @@ +ABCDEFGH=ABCDEFGHIJKL=A diff --git a/test/020_io_cube_read_write/01_solved_oriented.out b/test/020_io_cube_read_write/01_solved_oriented.out new file mode 100644 index 0000000..5aa6ba7 --- /dev/null +++ b/test/020_io_cube_read_write/01_solved_oriented.out @@ -0,0 +1 @@ +ABCDEFGH=ABCDEFGHIJKL=A diff --git a/test/020_io_cube_read_write/02_solve_misoriented.in b/test/020_io_cube_read_write/02_solve_misoriented.in new file mode 100644 index 0000000..f3279c5 --- /dev/null +++ b/test/020_io_cube_read_write/02_solve_misoriented.in @@ -0,0 +1 @@ +ABCDEFGH=ABCDEFGHIJKL=L diff --git a/test/020_io_cube_read_write/02_solve_misoriented.out b/test/020_io_cube_read_write/02_solve_misoriented.out new file mode 100644 index 0000000..f3279c5 --- /dev/null +++ b/test/020_io_cube_read_write/02_solve_misoriented.out @@ -0,0 +1 @@ +ABCDEFGH=ABCDEFGHIJKL=L diff --git a/test/020_io_cube_read_write/io_cube_tests.c b/test/020_io_cube_read_write/io_cube_tests.c index c9df1a9..3d7601c 100644 --- a/test/020_io_cube_read_write/io_cube_tests.c +++ b/test/020_io_cube_read_write/io_cube_tests.c @@ -2,7 +2,7 @@ void run(void) { char str[STRLENMAX], *aux; - cube_t cube; + oriented_cube_t cube; aux = str; while (fgets(aux, STRLENMAX, stdin) != NULL) diff --git a/test/030_move/move_tests.c b/test/030_move/move_tests.c index e5aed44..98c9592 100644 --- a/test/030_move/move_tests.c +++ b/test/030_move/move_tests.c @@ -1,10 +1,10 @@ #include "../test.h" -cube_t applymoves(cube_t, char *); +oriented_cube_t applymoves(oriented_cube_t, char *); void run(void) { char movestr[STRLENMAX], cubestr[STRLENMAX]; - cube_t cube; + oriented_cube_t cube; fgets(movestr, STRLENMAX, stdin); fgets(cubestr, STRLENMAX, stdin); diff --git a/test/031_premove/premove_tests.c b/test/031_premove/premove_tests.c index 24773cd..10bed92 100644 --- a/test/031_premove/premove_tests.c +++ b/test/031_premove/premove_tests.c @@ -7,14 +7,14 @@ cube_t premove(cube_t, uint8_t); void run(void) { char movestr[STRLENMAX], cubestr[STRLENMAX]; uint8_t move; - cube_t cube; + oriented_cube_t cube; fgets(movestr, STRLENMAX, stdin); move = readmove(movestr[0]) + readmodifier(movestr[1]); fgets(cubestr, STRLENMAX, stdin); cube = readcube(cubestr); - cube = premove(cube, move); + cube.cube = premove(cube.cube, move); if (iserror(cube)) { printf("Error moving cube\n"); diff --git a/test/040_inverse_cube/inverse_tests.c b/test/040_inverse_cube/inverse_tests.c index 9e8925a..f0401ea 100644 --- a/test/040_inverse_cube/inverse_tests.c +++ b/test/040_inverse_cube/inverse_tests.c @@ -4,11 +4,14 @@ cube_t inverse(cube_t); void run(void) { char str[STRLENMAX]; - cube_t cube, inv; + oriented_cube_t cube, inv; fgets(str, STRLENMAX, stdin); cube = readcube(str); - inv = inverse(cube); + inv = (oriented_cube_t) { + .cube = inverse(cube.cube), + .orientation = cube.orientation + }; if (iserror(inv)) { printf("Error inverting cube\n"); diff --git a/test/050_compose/compose_tests.c b/test/050_compose/compose_tests.c index c61775f..3dea055 100644 --- a/test/050_compose/compose_tests.c +++ b/test/050_compose/compose_tests.c @@ -4,14 +4,17 @@ cube_t compose(cube_t, cube_t); void run(void) { char str[STRLENMAX]; - cube_t c1, c2, c3; + oriented_cube_t c1, c2, c3; fgets(str, STRLENMAX, stdin); c1 = readcube(str); fgets(str, STRLENMAX, stdin); c2 = readcube(str); - c3 = compose(c1, c2); + c3 = (oriented_cube_t) { + .cube = compose(c1.cube, c2.cube), + .orientation = c1.orientation + }; if (iserror(c3)) { printf("Error composing cubes\n"); diff --git a/test/060_transform/transform_tests.c b/test/060_transform/transform_tests.c index 4ae161c..82694b2 100644 --- a/test/060_transform/transform_tests.c +++ b/test/060_transform/transform_tests.c @@ -1,10 +1,10 @@ #include "../test.h" -cube_t applytrans(cube_t, char *); +oriented_cube_t applytrans(oriented_cube_t, char *); void run(void) { char cubestr[STRLENMAX], transtr[STRLENMAX]; - cube_t cube; + oriented_cube_t cube; fgets(transtr, STRLENMAX, stdin); fgets(cubestr, STRLENMAX, stdin); diff --git a/test/061_inverse_trans/inverse_trans_tests.c b/test/061_inverse_trans/inverse_trans_tests.c index 441fef8..bad39fa 100644 --- a/test/061_inverse_trans/inverse_trans_tests.c +++ b/test/061_inverse_trans/inverse_trans_tests.c @@ -2,13 +2,13 @@ uint8_t readtrans(char [static NISSY_SIZE_TRANSFORMATION]); uint8_t inverse_trans(uint8_t); -cube_t applymoves(cube_t, char *); -cube_t applytrans(cube_t, char *); +oriented_cube_t applymoves(oriented_cube_t, char *); +oriented_cube_t applytrans(oriented_cube_t, char *); extern char *transstr[]; void run(void) { uint8_t t, tinv; - cube_t cube; + oriented_cube_t cube; for (t = 0; t < 48; t++) { cube = solvedcube(); diff --git a/test/062_transform_move/transform_move_tests.c b/test/062_transform_move/transform_move_tests.c index 66889f9..4f554c7 100644 --- a/test/062_transform_move/transform_move_tests.c +++ b/test/062_transform_move/transform_move_tests.c @@ -6,14 +6,14 @@ cube_t applytrans(cube_t, const char *); uint8_t transform_move(uint8_t, uint8_t); int64_t readmoves(const char *, size_t n, uint8_t [n]); cube_t move(cube_t, uint8_t); -cube_t applymoves(cube_t, const char *); +oriented_cube_t applymoves(oriented_cube_t, const char *); uint8_t readtrans(const char[static NISSY_SIZE_TRANSFORMATION]); void run(void) { char movestr[STRLENMAX], transtr[STRLENMAX], cubestr[STRLENMAX]; uint8_t t, moves[MAXMOVES]; int i, n; - cube_t cube; + oriented_cube_t cube; fgets(transtr, STRLENMAX, stdin); fgets(movestr, STRLENMAX, stdin); @@ -22,7 +22,7 @@ void run(void) { n = readmoves(movestr, MAXMOVES, moves); t = readtrans(transtr); for (i = 0; i < n; i++) - cube = move(cube, transform_move(moves[i], t)); + cube.cube = move(cube.cube, transform_move(moves[i], t)); writecube(cube, STRLENMAX, cubestr); printf("%s\n", cubestr); diff --git a/test/063_symmetry_mask/symmetry_mask_tests.c b/test/063_symmetry_mask/symmetry_mask_tests.c index c14fd14..e717b12 100644 --- a/test/063_symmetry_mask/symmetry_mask_tests.c +++ b/test/063_symmetry_mask/symmetry_mask_tests.c @@ -5,11 +5,11 @@ uint64_t symmetry_mask(cube_t); void run(void) { char str[STRLENMAX]; uint64_t i, result; - cube_t cube; + oriented_cube_t cube; fgets(str, STRLENMAX, stdin); cube = readcube(str); - result = symmetry_mask(cube); + result = symmetry_mask(cube.cube); for (i = 0; i < 48; result >>= 1, i++) printf("%" PRIu64, result % UINT64_C(2)); diff --git a/test/071_coord_eo/coord_eo_tests.c b/test/071_coord_eo/coord_eo_tests.c index 11a8ac3..360720e 100644 --- a/test/071_coord_eo/coord_eo_tests.c +++ b/test/071_coord_eo/coord_eo_tests.c @@ -4,13 +4,13 @@ int64_t coord_eo(cube_t); void run(void) { char str[STRLENMAX]; - cube_t cube; + oriented_cube_t cube; int64_t result; fgets(str, STRLENMAX, stdin); cube = readcube(str); - result = coord_eo(cube); + result = coord_eo(cube.cube); printf("%" PRId64 "\n", result); } diff --git a/test/072_coord_co/coord_co_tests.c b/test/072_coord_co/coord_co_tests.c index b1de223..440ad2e 100644 --- a/test/072_coord_co/coord_co_tests.c +++ b/test/072_coord_co/coord_co_tests.c @@ -4,13 +4,13 @@ int64_t coord_co(cube_t); void run(void) { char str[STRLENMAX]; - cube_t cube; + oriented_cube_t cube; int64_t result; fgets(str, STRLENMAX, stdin); cube = readcube(str); - result = coord_co(cube); + result = coord_co(cube.cube); printf("%" PRId64 "\n", result); } diff --git a/test/073_coord_csep/coord_csep_tests.c b/test/073_coord_csep/coord_csep_tests.c index 6fe16b2..21a3b3a 100644 --- a/test/073_coord_csep/coord_csep_tests.c +++ b/test/073_coord_csep/coord_csep_tests.c @@ -4,13 +4,13 @@ int64_t coord_csep(cube_t); void run(void) { char str[STRLENMAX]; - cube_t cube; + oriented_cube_t cube; int64_t result; fgets(str, STRLENMAX, stdin); cube = readcube(str); - result = coord_csep(cube); + result = coord_csep(cube.cube); printf("%" PRId64 "\n", result); } diff --git a/test/074_coord_esep/coord_esep_tests.c b/test/074_coord_esep/coord_esep_tests.c index 7c53c9a..679e1c6 100644 --- a/test/074_coord_esep/coord_esep_tests.c +++ b/test/074_coord_esep/coord_esep_tests.c @@ -4,13 +4,13 @@ int64_t coord_esep(cube_t); void run(void) { char str[STRLENMAX]; - cube_t cube; + oriented_cube_t cube; int64_t result; fgets(str, STRLENMAX, stdin); cube = readcube(str); - result = coord_esep(cube); + result = coord_esep(cube.cube); printf("%" PRId64 "\n", result); } diff --git a/test/075_set_eo/set_eo_tests.c b/test/075_set_eo/set_eo_tests.c index 2e05e9a..ef2156d 100644 --- a/test/075_set_eo/set_eo_tests.c +++ b/test/075_set_eo/set_eo_tests.c @@ -6,7 +6,7 @@ void pieces(cube_t *, uint8_t [static 8], uint8_t [static 12]); void run(void) { char str[STRLENMAX]; - cube_t cube; + oriented_cube_t cube; uint8_t edge[12], corner[8]; int64_t eo; @@ -15,12 +15,12 @@ void run(void) { fgets(str, STRLENMAX, stdin); eo = atoi(str); - set_eo(&cube, eo); + set_eo(&cube.cube, eo); if (iserror(cube)) { printf("Error setting EO\n"); } else if (!isconsistent(cube)) { - pieces(&cube, corner, edge); + pieces(&cube.cube, corner, edge); fprintf(stderr, "edges: "); for (int i = 0; i < 12; i++) fprintf(stderr, "%d ", edge[i]); diff --git a/test/076_copy_corners/copy_corners_tests.c b/test/076_copy_corners/copy_corners_tests.c index 94e2a2a..02e949b 100644 --- a/test/076_copy_corners/copy_corners_tests.c +++ b/test/076_copy_corners/copy_corners_tests.c @@ -4,7 +4,7 @@ void copy_corners(cube_t *, cube_t); void run(void) { char str[STRLENMAX]; - cube_t c1, c2; + oriented_cube_t c1, c2; fgets(str, STRLENMAX, stdin); c1 = readcube(str); @@ -12,7 +12,7 @@ void run(void) { fgets(str, STRLENMAX, stdin); c2 = readcube(str); - copy_corners(&c1, c2); + copy_corners(&c1.cube, c2.cube); if (iserror(c1)) { printf("Error setting EO\n"); diff --git a/test/077_copy_edges/copy_edges_tests.c b/test/077_copy_edges/copy_edges_tests.c index 36e32af..f3b0589 100644 --- a/test/077_copy_edges/copy_edges_tests.c +++ b/test/077_copy_edges/copy_edges_tests.c @@ -4,7 +4,7 @@ void copy_edges(cube_t *, cube_t); void run(void) { char str[STRLENMAX]; - cube_t c1, c2; + oriented_cube_t c1, c2; fgets(str, STRLENMAX, stdin); c1 = readcube(str); @@ -12,7 +12,7 @@ void run(void) { fgets(str, STRLENMAX, stdin); c2 = readcube(str); - copy_edges(&c1, c2); + copy_edges(&c1.cube, c2.cube); if (iserror(c1)) { printf("Error setting EO\n"); diff --git a/test/078_invcoord_esep/invcoord_esep_tests.c b/test/078_invcoord_esep/invcoord_esep_tests.c index ebf35b0..9945e77 100644 --- a/test/078_invcoord_esep/invcoord_esep_tests.c +++ b/test/078_invcoord_esep/invcoord_esep_tests.c @@ -5,15 +5,15 @@ cube_t invcoord_esep(int64_t); void run(void) { char str[STRLENMAX]; - cube_t cube; + oriented_cube_t cube; int64_t i; fgets(str, STRLENMAX, stdin); cube = readcube(str); - i = coord_esep(cube); - cube = invcoord_esep(i); - i = coord_esep(cube); + i = coord_esep(cube.cube); + cube.cube = invcoord_esep(i); + i = coord_esep(cube.cube); printf("%" PRId64 "\n", i); } diff --git a/test/079_invcoord_co/invcoord_co_tests.c b/test/079_invcoord_co/invcoord_co_tests.c index 9f7c3d5..fcd68d0 100644 --- a/test/079_invcoord_co/invcoord_co_tests.c +++ b/test/079_invcoord_co/invcoord_co_tests.c @@ -6,12 +6,14 @@ int64_t coord_co(cube_t); cube_t invcoord_co(int64_t); void run(void) { - cube_t cube; + oriented_cube_t cube; int64_t coord, coord2; + cube.orientation = 0; + /* Test all possible values for CO coordinate */ for (coord = 0; coord < POW_3_7; coord++) { - cube = invcoord_co(coord); + cube.cube = invcoord_co(coord); if (!isconsistent(cube)) { printf("Not consistent\n"); @@ -22,7 +24,7 @@ void run(void) { return; } - coord2 = coord_co(cube); + coord2 = coord_co(cube.cube); if (coord != coord2) { printf("Error: invcoord of %" PRId64 " returns %" PRId64 "\n", coord, coord2); diff --git a/test/081_getcube/getcube_tests.c b/test/081_getcube/getcube_tests.c index 916c42b..07e621e 100644 --- a/test/081_getcube/getcube_tests.c +++ b/test/081_getcube/getcube_tests.c @@ -4,7 +4,7 @@ cube_t getcube(int64_t, int64_t, int64_t, int64_t); void run(void) { char str[STRLENMAX]; - cube_t cube; + oriented_cube_t cube; int64_t ep, eo, cp, co; fgets(str, STRLENMAX, stdin); @@ -16,7 +16,10 @@ void run(void) { fgets(str, STRLENMAX, stdin); co = atoll(str); - cube = getcube(ep, eo, cp, co); + cube = (oriented_cube_t) { + .cube = getcube(ep, eo, cp, co), + .orientation = 0 + }; if (iserror(cube)) { printf("Error cube\n"); diff --git a/test/101_cocsep_transform_invariant/cocsep_transform_invariant.c b/test/101_cocsep_transform_invariant/cocsep_transform_invariant.c index 7ded2e9..5553fd1 100644 --- a/test/101_cocsep_transform_invariant/cocsep_transform_invariant.c +++ b/test/101_cocsep_transform_invariant/cocsep_transform_invariant.c @@ -11,7 +11,8 @@ void run(void) { uint64_t selfsim[COCSEP_CLASSES]; int64_t coord, tcoord; char str[STRLENMAX]; - cube_t cube, transd, rep[COCSEP_CLASSES]; + oriented_cube_t cube; + cube_t rep[COCSEP_CLASSES], transd; fgets(str, STRLENMAX, stdin); cube = readcube(str); @@ -19,9 +20,9 @@ void run(void) { gendata_cocsep(buf, selfsim, rep); cocsepdata = (uint32_t *)((char *)buf + INFOSIZE); - coord = (int64_t)COCLASS(cocsepdata[coord_cocsep(cube)]); + coord = (int64_t)COCLASS(cocsepdata[coord_cocsep(cube.cube)]); for (t = 0; t < 48; t++) { - transd = transform(cube, t); + transd = transform(cube.cube, t); tcoord = (int64_t)COCLASS(cocsepdata[coord_cocsep(transd)]); if (coord != tcoord) printf("Error: expected %" PRId64 diff --git a/test/102_cocsep_selfsim/cocsep_selfsim_tests.c b/test/102_cocsep_selfsim/cocsep_selfsim_tests.c index 9966321..1a1c6f2 100644 --- a/test/102_cocsep_selfsim/cocsep_selfsim_tests.c +++ b/test/102_cocsep_selfsim/cocsep_selfsim_tests.c @@ -16,7 +16,8 @@ void run(void) { uint32_t *cocsepdata, data; int64_t coord, coclass; uint64_t selfsim[COCSEP_CLASSES], sim, t; - cube_t cube, rep[COCSEP_CLASSES]; + oriented_cube_t cube; + cube_t rep[COCSEP_CLASSES]; gendata_cocsep(buf, selfsim, rep); cocsepdata = (uint32_t *)(buf + INFOSIZE); @@ -25,7 +26,7 @@ void run(void) { while (fgets(str, STRLENMAX, stdin) != NULL) { cube = readcube(str); - coord = coord_cocsep(cube); + coord = coord_cocsep(cube.cube); data = cocsepdata[coord]; coclass = (data & (0xFFFU << 16)) >> 16; sim = selfsim[coclass]; diff --git a/test/110_coord_invcoord_h48/coord_invcoord_h48_tests.c b/test/110_coord_invcoord_h48/coord_invcoord_h48_tests.c index 458ad31..0333f27 100644 --- a/test/110_coord_invcoord_h48/coord_invcoord_h48_tests.c +++ b/test/110_coord_invcoord_h48/coord_invcoord_h48_tests.c @@ -14,7 +14,8 @@ void run(void) { uint32_t *cocsepdata; uint64_t selfsim[COCSEP_CLASSES]; int64_t c, cc; - cube_t cube, invc, rep[COCSEP_CLASSES]; + oriented_cube_t cube; + cube_t invc, rep[COCSEP_CLASSES]; gendata_cocsep(buf, selfsim, rep); cocsepdata = (uint32_t *)(buf + INFOSIZE); @@ -23,11 +24,11 @@ void run(void) { h = 11; while (fgets(str, STRLENMAX, stdin) != NULL) { cube = readcube(str); - c = coord_h48(cube, cocsepdata, h); + c = coord_h48(cube.cube, cocsepdata, h); invc = invcoord_h48(c, rep, h); for (t = 0, found = false; t < 48; t++) { - cube = transform(invc, t); - cc = coord_h48(cube, cocsepdata, h); + cube.cube = transform(invc, t); + cc = coord_h48(cube.cube, cocsepdata, h); found = found || cc == c; } printf("%d %s\n", i, found ? "ok" : "ERROR"); diff --git a/test/121_coorddata_dr/coorddata_dr.c b/test/121_coorddata_dr/coorddata_dr.c index d7efcfb..e8407c8 100644 --- a/test/121_coorddata_dr/coorddata_dr.c +++ b/test/121_coorddata_dr/coorddata_dr.c @@ -16,6 +16,7 @@ void run(void) { unsigned char *data; size_t size; cube_t cube; + oriented_cube_t oc; uint64_t coord, coord2; size = coordinate_dr_gendata(NULL); @@ -25,7 +26,8 @@ void run(void) { for (coord = 0; coord < BOUND; coord++) { cube = coordinate_dr_cube(coord, data); - if (!isconsistent(cube)) { + oc = (oriented_cube_t) { .cube = cube, .orientation = 0 }; + if (!isconsistent(oc)) { printf("Error: invcoord of %" PRId64 " is not consistent\n", coord); goto cleanup; @@ -43,9 +45,10 @@ void run(void) { } if (!found) { + oc = (oriented_cube_t){.cube = cube, .orientation = 0}; printf("Error: invcoord of %" PRId64 " returns %" PRId64 " with cube:\n", coord, coord2); - writecube(cube, STRLENMAX, str); + writecube(oc, STRLENMAX, str); printf("%s\n", str); goto cleanup; } diff --git a/test/122_coorddata_dreo/coorddata_dreo.c b/test/122_coorddata_dreo/coorddata_dreo.c index 98c954d..942e837 100644 --- a/test/122_coorddata_dreo/coorddata_dreo.c +++ b/test/122_coorddata_dreo/coorddata_dreo.c @@ -16,6 +16,7 @@ void run(void) { unsigned char *data; size_t size; cube_t cube; + oriented_cube_t oc; uint64_t coord, coord2; size = coordinate_dreo_gendata(NULL); @@ -25,7 +26,8 @@ void run(void) { for (coord = 0; coord < BOUND; coord++) { cube = coordinate_dreo_cube(coord, data); - if (!isconsistent(cube)) { + oc = (oriented_cube_t) { .cube = cube, .orientation = 0 }; + if (!isconsistent(oc)) { printf("Error: invcoord of %" PRId64 " is not consistent\n", coord); goto cleanup; @@ -43,9 +45,10 @@ void run(void) { } if (!found) { + oc = (oriented_cube_t){.cube = cube, .orientation = 0}; printf("Error: invcoord of %" PRId64 " returns %" PRId64 " with cube:\n", coord, coord2); - writecube(cube, STRLENMAX, str); + writecube(oc, STRLENMAX, str); printf("%s\n", str); goto cleanup; } diff --git a/test/test.h b/test/test.h index 78a3fd9..6230f36 100644 --- a/test/test.h +++ b/test/test.h @@ -10,6 +10,7 @@ #include "../src/nissy.h" #include "../src/arch/arch.h" +#include "../src/core/core_types.h" #include "../src/solvers/solutions_types_macros.h" #include "../src/solvers/tables_types_macros.h" #include "../src/solvers/h48/coordinate_types_macros.h" @@ -20,13 +21,13 @@ #define STRLENMAX 10000 /* Basic functions used in most tests */ -cube_t solvedcube(void); -bool iserror(cube_t); -bool isconsistent(cube_t); -bool issolvable(cube_t); -bool issolved(cube_t); -cube_t readcube(char *); -int64_t writecube(cube_t, size_t n, char [n]); +oriented_cube_t solvedcube(void); +bool iserror(oriented_cube_t); +bool isconsistent(oriented_cube_t); +bool issolvable(oriented_cube_t); +bool issolved(oriented_cube_t); +oriented_cube_t readcube(char *); +int64_t writecube(oriented_cube_t, size_t n, char [n]); /* Test function to be implemented by all tests */ void run(void); -- cgit v1.3