From 283effb16646112ee9c6bba57e021e80f322b29f Mon Sep 17 00:00:00 2001 From: Sebastiano Tronto Date: Fri, 4 Oct 2024 14:29:00 +0200 Subject: Avoid repeating typedefs in tests --- src/solvers/h48/gendata_h48.h | 73 ------------------------------------------- 1 file changed, 73 deletions(-) (limited to 'src/solvers/h48/gendata_h48.h') diff --git a/src/solvers/h48/gendata_h48.h b/src/solvers/h48/gendata_h48.h index 6db3998..5da9dc3 100644 --- a/src/solvers/h48/gendata_h48.h +++ b/src/solvers/h48/gendata_h48.h @@ -1,16 +1,3 @@ -#define H48_COORDMAX_NOEO ((int64_t)(COCSEP_CLASSES * COMB_12_4 * COMB_8_4)) -#define H48_COORDMAX(h) (H48_COORDMAX_NOEO << (int64_t)(h)) -#define H48_DIV(k) ((size_t)8 / (size_t)(k)) -#define H48_TABLESIZE(h, k) DIV_ROUND_UP((size_t)H48_COORDMAX((h)), H48_DIV(k)) - -#define H48_COEFF(k) (INT64_C(8) / (int64_t)(k)) -#define H48_INDEX(i, k) ((i) / H48_COEFF(k)) -#define H48_SHIFT(i, k) ((uint8_t)(k) * (uint8_t)((i) % H48_COEFF(k))) -#define H48_MASK(i, k) ((UINT8_BIT(k) - UINT8_C(1)) << H48_SHIFT(i, k)) - -#define MAXLEN 20 -#define CHUNKS COCSEP_CLASSES - /* TODO: This loop over similar h48 coordinates can be improved by only transforming edges, but we need to compose transformations (i.e. conjugate @@ -30,66 +17,6 @@ _t by _ttrep). ARG_ACTION \ } -typedef struct { - uint8_t h; - uint8_t k; - uint8_t base; - uint8_t maxdepth; - tableinfo_t info; - void *buf; - void *h48buf; - uint32_t *cocsepdata; - uint64_t selfsim[COCSEP_CLASSES]; - cube_t crep[COCSEP_CLASSES]; -} gendata_h48_arg_t; - -typedef struct { - uint8_t maxdepth; - const uint32_t *cocsepdata; - const cube_t *crep; - const uint64_t *selfsim; - h48map_t *map; -} gendata_h48short_arg_t; - -typedef struct { - uint8_t depth; - uint32_t *cocsepdata; - _Atomic uint8_t *table; - uint64_t *selfsim; - cube_t *crep; - uint64_t start; - uint64_t end; - pthread_mutex_t *table_mutex[CHUNKS]; -} h48h0k4_bfs_arg_t; - -typedef struct { - cube_t cube; - uint8_t h; - uint8_t k; - uint8_t base; - uint8_t shortdepth; - uint32_t *cocsepdata; - _Atomic uint8_t *table; - uint64_t *selfsim; - cube_t *crep; - h48map_t *shortcubes; - pthread_mutex_t *shortcubes_mutex; - pthread_mutex_t *table_mutex[CHUNKS]; - uint64_t *next; - uint64_t *count; -} h48k2_dfs_arg_t; - -typedef struct { - cube_t cube; - int8_t depth; - uint8_t h; - uint8_t k; - uint32_t *cocsepdata; - uint64_t *selfsim; - _Atomic uint8_t *table; - pthread_mutex_t **table_mutex; -} gendata_h48_mark_t; - STATIC uint64_t gendata_h48short(gendata_h48short_arg_t *); STATIC size_t gendata_h48(gendata_h48_arg_t *); STATIC size_t gendata_h48h0k4(gendata_h48_arg_t *); -- cgit v1.3