diff options
Diffstat (limited to 'src/solvers/h48/coordinate.h')
| -rw-r--r-- | src/solvers/h48/coordinate.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/solvers/h48/coordinate.h b/src/solvers/h48/coordinate.h index 6caac2a..eb08fd8 100644 --- a/src/solvers/h48/coordinate.h +++ b/src/solvers/h48/coordinate.h | |||
| @@ -1,12 +1,15 @@ | |||
| 1 | /* Macros defined in a separate file for easier testing */ | 1 | STATIC_INLINE int64_t coord_h48( |
| 2 | #include "coordinate_macros.h" | 2 | cube_t, const uint32_t [static COCSEP_TABLESIZE], uint8_t); |
| 3 | |||
| 4 | STATIC_INLINE int64_t coord_h48(cube_t, const uint32_t *, uint8_t); | ||
| 5 | STATIC_INLINE int64_t coord_h48_edges(cube_t, int64_t, uint8_t, uint8_t); | 3 | STATIC_INLINE int64_t coord_h48_edges(cube_t, int64_t, uint8_t, uint8_t); |
| 6 | STATIC_INLINE cube_t invcoord_h48(int64_t, const cube_t *, uint8_t); | 4 | STATIC_INLINE cube_t invcoord_h48( |
| 5 | int64_t, const cube_t [static COCSEP_CLASSES], uint8_t); | ||
| 7 | 6 | ||
| 8 | STATIC_INLINE int64_t | 7 | STATIC_INLINE int64_t |
| 9 | coord_h48(cube_t c, const uint32_t *cocsepdata, uint8_t h) | 8 | coord_h48( |
| 9 | cube_t c, | ||
| 10 | const uint32_t cocsepdata[static COCSEP_TABLESIZE], | ||
| 11 | uint8_t h | ||
| 12 | ) | ||
| 10 | { | 13 | { |
| 11 | int64_t cocsep, coclass; | 14 | int64_t cocsep, coclass; |
| 12 | uint32_t data; | 15 | uint32_t data; |
| @@ -42,7 +45,11 @@ the given value, because it works up to symmetry. This means that the | |||
| 42 | returned cube is a transformed cube of one that gives the correct value. | 45 | returned cube is a transformed cube of one that gives the correct value. |
| 43 | */ | 46 | */ |
| 44 | STATIC_INLINE cube_t | 47 | STATIC_INLINE cube_t |
| 45 | invcoord_h48(int64_t i, const cube_t *crep, uint8_t h) | 48 | invcoord_h48( |
| 49 | int64_t i, | ||
| 50 | const cube_t crep[static COCSEP_CLASSES], | ||
| 51 | uint8_t h | ||
| 52 | ) | ||
| 46 | { | 53 | { |
| 47 | cube_t ret; | 54 | cube_t ret; |
| 48 | int64_t hh, coclass, ee, esep, eo; | 55 | int64_t hh, coclass, ee, esep, eo; |
