From 99fabe8592a4022313b1cb0581881ee1bc6b1c99 Mon Sep 17 00:00:00 2001 From: Sebastiano Tronto Date: Wed, 20 Sep 2023 21:48:04 +0200 Subject: Added tests for compose --- src/cube.h | 13 ++++++++++++- src/cube_array.c | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/cube.h b/src/cube.h index 836bb5d..e5434e3 100644 --- a/src/cube.h +++ b/src/cube.h @@ -1,9 +1,18 @@ typedef enum { - U, U2, U3, D, D2, D3, + U = 0, U2, U3, D, D2, D3, R, R2, R3, L, L2, L3, F, F2, F3, B, B2, B3 } move_t; +typedef enum { + UF_i = 0, UL_i, UB_i, UR_i, DF_i, DL_i, DB_i, DR_i, + UF_m, UL_m, UB_m, UR_m, DF_m, DL_m, DB_m, DR_m, + RU_i, RF_i, RD_i, RB_i, LU_i, LF_i, LD_i, LB_i, + RU_m, RF_m, RD_m, RB_m, LU_m, LF_m, LD_m, LB_m, + FU_i, FR_i, FD_i, FL_i, BU_i, BR_i, BD_i, BL_i, + FU_m, FR_m, FD_m, FL_m, BU_m, BR_m, BD_m, BL_m +} trans_t; + typedef struct { uint8_t c[8]; uint8_t e[12]; @@ -51,3 +60,5 @@ void writemoves(move_t *, int, char *); cube_t move(cube_t, move_t); cube_t inverse(cube_t); +cube_t compose(cube_t, cube_t); +cube_t transform(cube_t, trans_t); diff --git a/src/cube_array.c b/src/cube_array.c index 3445658..a051610 100644 --- a/src/cube_array.c +++ b/src/cube_array.c @@ -155,7 +155,6 @@ static uint8_t readep(char *); static uint8_t readmove(char); static uint8_t readmodifier(char); static int permsign(uint8_t *, int); -static cube_t compose(cube_t, cube_t); static uint8_t readco(char *str) @@ -710,3 +709,15 @@ inverse_inconsistent: fprintf(stderr, "inverse error, inconsistent cube\n"); return errorcube; } + +cube_t +compose(cube_t c1, cube_t c2) +{ + return errorcube; +} + +cube_t +transform(cube_t c, trans_t t) +{ + return errorcube; +} -- cgit v1.3