aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/cube.h11
-rw-r--r--src/core/oriented_cube.h3
-rw-r--r--src/core/transform.h2
3 files changed, 7 insertions, 9 deletions
diff --git a/src/core/cube.h b/src/core/cube.h
index 842ec59..cdd3946 100644
--- a/src/core/cube.h
+++ b/src/core/cube.h
@@ -87,8 +87,7 @@ issolvable(oriented_cube_t cube)
87{ 87{
88 uint8_t i, eo, co, piece, edge[12], corner[8], ep[12], cp[8]; 88 uint8_t i, eo, co, piece, edge[12], corner[8], ep[12], cp[8];
89 89
90 DBG_ASSERT(isconsistent(cube), false, 90 DBG_ASSERT(isconsistent(cube), "issolvable: cube is inconsistent\n");
91 "issolvable: cube is inconsistent\n");
92 91
93 pieces(&cube.cube, corner, edge); 92 pieces(&cube.cube, corner, edge);
94 for (i = 0; i < 12; i++) 93 for (i = 0; i < 12; i++)
@@ -175,16 +174,16 @@ getcube(int64_t ep, int64_t eo, int64_t cp, int64_t co)
175 uint8_t i, earr[12], carr[8], eoarr[12], coarr[8]; 174 uint8_t i, earr[12], carr[8], eoarr[12], coarr[8];
176 175
177 sumzerotodigits(eo, 12, 2, eoarr); 176 sumzerotodigits(eo, 12, 2, eoarr);
178 DBG_ASSERT(eoarr[0] != UINT8_ERROR, ZERO_CUBE, "Error making EO"); 177 DBG_ASSERT(eoarr[0] != UINT8_ERROR, "Error making EO");
179 indextoperm(ep, 12, earr); 178 indextoperm(ep, 12, earr);
180 DBG_ASSERT(earr[0] != UINT8_ERROR, ZERO_CUBE, "Error making EP"); 179 DBG_ASSERT(earr[0] != UINT8_ERROR, "Error making EP");
181 for (i = 0; i < 12; i++) 180 for (i = 0; i < 12; i++)
182 earr[i] |= eoarr[i] << EOSHIFT; 181 earr[i] |= eoarr[i] << EOSHIFT;
183 182
184 sumzerotodigits(co, 8, 3, coarr); 183 sumzerotodigits(co, 8, 3, coarr);
185 DBG_ASSERT(coarr[0] != UINT8_ERROR, ZERO_CUBE, "Error making CO"); 184 DBG_ASSERT(coarr[0] != UINT8_ERROR, "Error making CO");
186 indextoperm(cp, 8, carr); 185 indextoperm(cp, 8, carr);
187 DBG_ASSERT(carr[0] != UINT8_ERROR, ZERO_CUBE, "Error making CP"); 186 DBG_ASSERT(carr[0] != UINT8_ERROR, "Error making CP");
188 for (i = 0; i < 8; i++) 187 for (i = 0; i < 8; i++)
189 carr[i] |= coarr[i] << COSHIFT; 188 carr[i] |= coarr[i] << COSHIFT;
190 189
diff --git a/src/core/oriented_cube.h b/src/core/oriented_cube.h
index 2c86af0..5449204 100644
--- a/src/core/oriented_cube.h
+++ b/src/core/oriented_cube.h
@@ -56,8 +56,7 @@ applymoves(oriented_cube_t cube, const char *buf)
56 uint8_t m; 56 uint8_t m;
57 oriented_cube_t c, cinv; 57 oriented_cube_t c, cinv;
58 58
59 DBG_ASSERT(isconsistent(cube), ZERO_ORIENTED_CUBE, 59 DBG_ASSERT(isconsistent(cube), "move error: inconsistent cube\n");
60 "move error: inconsistent cube\n");
61 60
62 c = cube; 61 c = cube;
63 cinv = SOLVED_ORIENTED_CUBE; 62 cinv = SOLVED_ORIENTED_CUBE;
diff --git a/src/core/transform.h b/src/core/transform.h
index d1d2931..91d4893 100644
--- a/src/core/transform.h
+++ b/src/core/transform.h
@@ -371,7 +371,7 @@ applytrans(oriented_cube_t cube, const char *buf)
371{ 371{
372 uint8_t t; 372 uint8_t t;
373 373
374 DBG_ASSERT(isconsistent(cube), ZERO_ORIENTED_CUBE, 374 DBG_ASSERT(isconsistent(cube),
375 "transformation error: inconsistent cube\n"); 375 "transformation error: inconsistent cube\n");
376 376
377 t = readtrans(buf); 377 t = readtrans(buf);

Generated with cgit - Back to sebastiano.tronto.net