commit 83338a2f753ebbb7ba7b154cc60b2f427b6121b0 parent 56048d13b73ec6e6a9c59d62e82f41e69a3994bd Author: Sebastiano Tronto <sebastiano@tronto.net> Date: Wed, 26 Mar 2025 19:22:50 +0100 Added inverse coordinate for CO this is necessary for DR coordinate Diffstat:
34 files changed, 156 insertions(+), 31 deletions(-)
diff --git a/src/arch/avx2.h b/src/arch/avx2.h @@ -188,6 +188,25 @@ coord_co(cube_t c) return ret; } +STATIC_INLINE cube_t +invcoord_co(int64_t coord) +{ + int64_t i, c, p, co, mem[4] = {0}; + cube_t cube, cc; + + for (i = 0, p = 0, c = coord; i < 8; i++, c /= 3) { + co = i == 7 ? ((3 - (p % 3)) % 3) : (c % 3); + p += co; + mem[0] |= (int64_t)(i + (co << COSHIFT)) << (int64_t)(8 * i); + } + + cc = _mm256_loadu_si256((const __m256i *)mem); + cube = SOLVED_CUBE; + copy_corners(&cube, cc); + + return cube; +} + STATIC_INLINE int64_t coord_csep(cube_t c) { @@ -251,6 +270,21 @@ coord_esep(cube_t c) return ret1 * 70 + ret2; } +STATIC_INLINE cube_t +invcoord_esep(int64_t esep) +{ + cube_t eee, ret; + uint8_t mem[32] = {0}; + + invcoord_esep_array(esep % 70, esep / 70, mem+16); + + ret = SOLVED_CUBE; + eee = _mm256_loadu_si256((__m256i_u *)&mem); + copy_edges(&ret, eee); + + return ret; +} + STATIC_INLINE void copy_corners(cube_t dest[static 1], cube_t src) { @@ -287,18 +321,3 @@ set_eo(cube_t cube[static 1], int64_t eo) *cube = _mm256_andnot_si256(EO_AVX2, *cube); *cube = _mm256_or_si256(*cube, veo); } - -STATIC_INLINE cube_t -invcoord_esep(int64_t esep) -{ - cube_t eee, ret; - uint8_t mem[32] = {0}; - - invcoord_esep_array(esep % 70, esep / 70, mem+16); - - ret = SOLVED_CUBE; - eee = _mm256_loadu_si256((__m256i_u *)&mem); - copy_edges(&ret, eee); - - return ret; -} diff --git a/src/arch/common.h b/src/arch/common.h @@ -9,15 +9,16 @@ STATIC_INLINE cube_t compose(cube_t, cube_t); STATIC_INLINE cube_t inverse(cube_t); STATIC_INLINE int64_t coord_co(cube_t); +STATIC_INLINE cube_t invcoord_co(int64_t); STATIC_INLINE int64_t coord_csep(cube_t); STATIC_INLINE int64_t coord_cocsep(cube_t); STATIC_INLINE int64_t coord_eo(cube_t); STATIC_INLINE int64_t coord_esep(cube_t); +STATIC_INLINE cube_t invcoord_esep(int64_t); STATIC_INLINE void copy_corners(cube_t [static 1], cube_t); STATIC_INLINE void copy_edges(cube_t [static 1], cube_t); STATIC_INLINE void set_eo(cube_t [static 1], int64_t); -STATIC_INLINE cube_t invcoord_esep(int64_t); STATIC_INLINE void invcoord_esep_array(int64_t, int64_t, uint8_t[static 12]); STATIC_INLINE cube_t invcoord_eoesep(int64_t); diff --git a/src/arch/neon.h b/src/arch/neon.h @@ -219,6 +219,25 @@ coord_co(cube_t c) return ret; } +STATIC_INLINE cube_t +invcoord_co(int64_t coord) +{ + int64_t co, c, i, p; + uint8_t mem[8]; + cube_t cube; + + for (i = 0, p = 0, c = coord; i < 8; i++, c /= 3) { + co = i == 7 ? ((3 - (p % 3)) % 3) : (c % 3); + p += co; + mem[i] = i + (co << COSHIFT); + } + + cube.corner = vld1_u8(mem); + cube.edge = SOLVED_CUBE.edge; + + return cube; +} + STATIC_INLINE int64_t coord_csep(cube_t c) { diff --git a/src/arch/portable.h b/src/arch/portable.h @@ -144,8 +144,7 @@ inverse(cube_t cube) STATIC_INLINE int64_t coord_co(cube_t c) { - int i, p; - int64_t ret; + int i, p, ret; for (ret = 0, i = 0, p = 1; i < 7; i++, p *= 3) ret += p * (c.corner[i] >> COSHIFT); @@ -153,6 +152,23 @@ coord_co(cube_t c) return ret; } +STATIC_INLINE cube_t +invcoord_co(int64_t coord) +{ + int64_t i, c, p; + cube_t cube; + + cube = SOLVED_CUBE; + for (i = 0, p = 0, c = coord; i < 7; i++, c /= 3) { + p += c % 3; + cube.corner[i] |= (c % 3) << COSHIFT; + } + + cube.corner[7] |= ((3 - (p % 3)) % 3) << COSHIFT; + + return cube; +} + /* For corner separation, we consider the axis (a.k.a. tetrad) each corner belongs to as 0 or 1 and we translate this sequence into binary. @@ -226,6 +242,17 @@ coord_esep(cube_t c) return ret1 * 70 + ret2; } +STATIC_INLINE cube_t +invcoord_esep(int64_t esep) +{ + cube_t ret; + + ret = SOLVED_CUBE; + invcoord_esep_array(esep % 70, esep / 70, ret.edge); + + return ret; +} + STATIC_INLINE void copy_corners(cube_t dest[static 1], cube_t src) { @@ -250,14 +277,3 @@ set_eo(cube_t cube[static 1], int64_t eo) } cube->edge[0] = (cube->edge[0] & ~EOBIT) | (EOBIT * (sum % 2)); } - -STATIC_INLINE cube_t -invcoord_esep(int64_t esep) -{ - cube_t ret; - - ret = SOLVED_CUBE; - invcoord_esep_array(esep % 70, esep / 70, ret.edge); - - return ret; -} diff --git a/src/core/cube.h b/src/core/cube.h @@ -61,7 +61,7 @@ isconsistent(cube_t cube) } for (i = 0; i < 8; i++) if (!found[i]) - goto inconsistent_co; + goto inconsistent_cp; return true; diff --git a/src/core/io_moves.h b/src/core/io_moves.h @@ -1,5 +1,6 @@ STATIC uint8_t readmove(char); STATIC int64_t readmoves(const char *, size_t n, uint8_t [n]); +STATIC int64_t countmoves(const char *); STATIC uint8_t readmodifier(char); STATIC int64_t writemoves(size_t n, const uint8_t [n], size_t m, char [m]); @@ -72,6 +73,21 @@ readmoves(const char *buf, size_t n, uint8_t ret[n]) } STATIC int64_t +countmoves(const char *buf) +{ + uint8_t m; + uint64_t c; + + FOREACH_READMOVE(buf, m, c, INT_MAX, NISSY_ERROR_INVALID_MOVES, + {} + ) + + (void)m; /* Ignore "variable set but not used" warning */ + + return (int64_t)c; +} + +STATIC int64_t writemoves( size_t nmoves, const uint8_t m[nmoves], diff --git a/src/nissy.c b/src/nissy.c @@ -620,7 +620,7 @@ nissy_countmoves( if (moves == NULL) return NISSY_ERROR_NULL_POINTER; - return readmoves(moves, INT_MAX, NULL); + return countmoves(moves); } long long diff --git a/test/079_invcoord_co/00_solved.in b/test/079_invcoord_co/00_solved.in @@ -0,0 +1 @@ +0 diff --git a/test/079_invcoord_co/00_solved.out b/test/079_invcoord_co/00_solved.out @@ -0,0 +1 @@ +0 diff --git a/test/079_invcoord_co/01_U.in b/test/079_invcoord_co/01_U.in @@ -0,0 +1 @@ +0 diff --git a/test/079_invcoord_co/01_U.out b/test/079_invcoord_co/01_U.out @@ -0,0 +1 @@ +0 diff --git a/test/079_invcoord_co/02_U2.in b/test/079_invcoord_co/02_U2.in @@ -0,0 +1 @@ +0 diff --git a/test/079_invcoord_co/02_U2.out b/test/079_invcoord_co/02_U2.out @@ -0,0 +1 @@ +0 diff --git a/test/079_invcoord_co/03_U3.in b/test/079_invcoord_co/03_U3.in @@ -0,0 +1 @@ +0 diff --git a/test/079_invcoord_co/03_U3.out b/test/079_invcoord_co/03_U3.out @@ -0,0 +1 @@ +0 diff --git a/test/079_invcoord_co/04_D.in b/test/079_invcoord_co/04_D.in @@ -0,0 +1 @@ +0 diff --git a/test/079_invcoord_co/04_D.out b/test/079_invcoord_co/04_D.out @@ -0,0 +1 @@ +0 diff --git a/test/079_invcoord_co/07_R.in b/test/079_invcoord_co/07_R.in @@ -0,0 +1 @@ +1028 diff --git a/test/079_invcoord_co/07_R.out b/test/079_invcoord_co/07_R.out @@ -0,0 +1 @@ +1028 diff --git a/test/079_invcoord_co/08_R2.in b/test/079_invcoord_co/08_R2.in @@ -0,0 +1 @@ +0 diff --git a/test/079_invcoord_co/08_R2.out b/test/079_invcoord_co/08_R2.out @@ -0,0 +1 @@ +0 diff --git a/test/079_invcoord_co/10_L.in b/test/079_invcoord_co/10_L.in @@ -0,0 +1 @@ +105 diff --git a/test/079_invcoord_co/10_L.out b/test/079_invcoord_co/10_L.out @@ -0,0 +1 @@ +105 diff --git a/test/079_invcoord_co/13_F.in b/test/079_invcoord_co/13_F.in @@ -0,0 +1 @@ +1630 diff --git a/test/079_invcoord_co/13_F.out b/test/079_invcoord_co/13_F.out @@ -0,0 +1 @@ +1630 diff --git a/test/079_invcoord_co/14_F2.in b/test/079_invcoord_co/14_F2.in @@ -0,0 +1 @@ +0 diff --git a/test/079_invcoord_co/14_F2.out b/test/079_invcoord_co/14_F2.out @@ -0,0 +1 @@ +0 diff --git a/test/079_invcoord_co/16_B.in b/test/079_invcoord_co/16_B.in @@ -0,0 +1 @@ +516 diff --git a/test/079_invcoord_co/16_B.out b/test/079_invcoord_co/16_B.out @@ -0,0 +1 @@ +516 diff --git a/test/079_invcoord_co/17_B2.in b/test/079_invcoord_co/17_B2.in @@ -0,0 +1 @@ +0 diff --git a/test/079_invcoord_co/17_B2.out b/test/079_invcoord_co/17_B2.out @@ -0,0 +1 @@ +0 diff --git a/test/079_invcoord_co/20_scrambled.in b/test/079_invcoord_co/20_scrambled.in @@ -0,0 +1 @@ +957 diff --git a/test/079_invcoord_co/20_scrambled.out b/test/079_invcoord_co/20_scrambled.out @@ -0,0 +1 @@ +957 diff --git a/test/079_invcoord_co/invcoord_co_tests.c b/test/079_invcoord_co/invcoord_co_tests.c @@ -0,0 +1,28 @@ +#include "../test.h" + +int64_t coord_co(cube_t); +cube_t invcoord_co(int64_t); + +void run(void) { + char str[STRLENMAX]; + cube_t cube; + int64_t coord; + + fgets(str, STRLENMAX, stdin); + coord = atoll(str); + + cube = invcoord_co(coord); + + if (!isconsistent(cube)) { + printf("Not consistent\n"); + return; + } + if (!issolvable(cube)) { + printf("Not solvable\n"); + return; + } + + coord = coord_co(cube); + + printf("%" PRId64 "\n", coord); +}