aboutsummaryrefslogtreecommitdiff
path: root/src/solvers/coord/common.h
diff options
context:
space:
mode:
authorSebastiano Tronto <sebastiano@tronto.net>2025-12-19 07:38:05 +0100
committerSebastiano Tronto <sebastiano@tronto.net>2025-12-19 07:38:05 +0100
commit30d976107352ecf74c57acc1032bed6032cd3da3 (patch)
tree665bb9940af179cbd955c57eeadf0d6af6dc31d6 /src/solvers/coord/common.h
parentf283c08db86777fe77bdf00d3d70687107a376d9 (diff)
parentde04d37e8520079f5bba3b1a87d42313297543db (diff)
downloadnissy-core-30d976107352ecf74c57acc1032bed6032cd3da3.tar.gz
nissy-core-30d976107352ecf74c57acc1032bed6032cd3da3.zip
Merge branch 'h48-corner-estimate'
Diffstat (limited to 'src/solvers/coord/common.h')
-rw-r--r--src/solvers/coord/common.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/solvers/coord/common.h b/src/solvers/coord/common.h
index 5f2435d..d154636 100644
--- a/src/solvers/coord/common.h
+++ b/src/solvers/coord/common.h
@@ -14,6 +14,7 @@ STATIC bool coord_is_solved(
14 14
15STATIC cube_t coordinate_merge_ce(cube_t, cube_t); 15STATIC cube_t coordinate_merge_ce(cube_t, cube_t);
16STATIC cube_t coordinate_merge_ec(cube_t, cube_t); 16STATIC cube_t coordinate_merge_ec(cube_t, cube_t);
17STATIC cube_t coordinate_merge_cpco(cube_t, cube_t);
17 18
18STATIC uint64_t 19STATIC uint64_t
19coord_coord_generic( 20coord_coord_generic(
@@ -215,3 +216,14 @@ coordinate_merge_ec(cube_t edges, cube_t corners)
215{ 216{
216 return coordinate_merge_ce(corners, edges); 217 return coordinate_merge_ce(corners, edges);
217} 218}
219
220STATIC cube_t
221coordinate_merge_cpco(cube_t cp, cube_t co)
222{
223 cube_t merged;
224
225 merged = cp;
226 copy_co(&merged, co);
227
228 return merged;
229}

Generated with cgit - Back to sebastiano.tronto.net