diff options
Diffstat (limited to 'src/solvers/coord/dr.h')
| -rw-r--r-- | src/solvers/coord/dr.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/solvers/coord/dr.h b/src/solvers/coord/dr.h index 03473df..8100910 100644 --- a/src/solvers/coord/dr.h +++ b/src/solvers/coord/dr.h | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | STATIC uint64_t coord_dreoesep_nosym(cube_t); | 4 | STATIC uint64_t coord_dreoesep_nosym(cube_t); |
| 5 | STATIC cube_t invcoord_dreoesep_nosym(uint64_t); | 5 | STATIC cube_t invcoord_dreoesep_nosym(uint64_t); |
| 6 | STATIC cube_t coordinate_dr_merge(cube_t, cube_t); | ||
| 7 | 6 | ||
| 8 | STATIC uint64_t coordinate_dr_coord(cube_t, const unsigned char *); | 7 | STATIC uint64_t coordinate_dr_coord(cube_t, const unsigned char *); |
| 9 | STATIC cube_t coordinate_dr_cube(uint64_t, const unsigned char *); | 8 | STATIC cube_t coordinate_dr_cube(uint64_t, const unsigned char *); |
| @@ -23,6 +22,7 @@ STATIC coord_t coordinate_dr = { | |||
| 23 | .moves_mask_gendata = MM18_ALLMOVES, | 22 | .moves_mask_gendata = MM18_ALLMOVES, |
| 24 | .moves_mask_solve = MM18_ALLMOVES, | 23 | .moves_mask_solve = MM18_ALLMOVES, |
| 25 | .is_admissible = &solution_lastqt_cw, | 24 | .is_admissible = &solution_lastqt_cw, |
| 25 | .solution_prune = NULL, | ||
| 26 | .is_solvable = &is_eoco_solvable, | 26 | .is_solvable = &is_eoco_solvable, |
| 27 | .is_solved = NULL, | 27 | .is_solved = NULL, |
| 28 | .allow_niss = true, | 28 | .allow_niss = true, |
| @@ -50,7 +50,7 @@ STATIC coord_t coordinate_dr = { | |||
| 50 | .max2 = POW_3_7, | 50 | .max2 = POW_3_7, |
| 51 | .coord2 = &coord_co, | 51 | .coord2 = &coord_co, |
| 52 | .cube2 = &invcoord_co, | 52 | .cube2 = &invcoord_co, |
| 53 | .merge = &coordinate_dr_merge, | 53 | .merge = &coordinate_merge_ec, |
| 54 | }, | 54 | }, |
| 55 | }; | 55 | }; |
| 56 | 56 | ||
| @@ -79,17 +79,6 @@ invcoord_dreoesep_nosym(uint64_t coord) | |||
| 79 | return cube; | 79 | return cube; |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | STATIC cube_t | ||
| 83 | coordinate_dr_merge(cube_t c1, cube_t c2) | ||
| 84 | { | ||
| 85 | cube_t merged; | ||
| 86 | |||
| 87 | merged = c1; | ||
| 88 | copy_corners(&merged, c2); | ||
| 89 | |||
| 90 | return merged; | ||
| 91 | } | ||
| 92 | |||
| 93 | STATIC uint64_t | 82 | STATIC uint64_t |
| 94 | coordinate_dr_coord(cube_t cube, const unsigned char *data) | 83 | coordinate_dr_coord(cube_t cube, const unsigned char *data) |
| 95 | { | 84 | { |
