diff options
Diffstat (limited to 'src/solvers/coord/common.h')
| -rw-r--r-- | src/solvers/coord/common.h | 12 |
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 | ||
| 15 | STATIC cube_t coordinate_merge_ce(cube_t, cube_t); | 15 | STATIC cube_t coordinate_merge_ce(cube_t, cube_t); |
| 16 | STATIC cube_t coordinate_merge_ec(cube_t, cube_t); | 16 | STATIC cube_t coordinate_merge_ec(cube_t, cube_t); |
| 17 | STATIC cube_t coordinate_merge_cpco(cube_t, cube_t); | ||
| 17 | 18 | ||
| 18 | STATIC uint64_t | 19 | STATIC uint64_t |
| 19 | coord_coord_generic( | 20 | coord_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 | |||
| 220 | STATIC cube_t | ||
| 221 | coordinate_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 | } | ||
