diff options
| author | Sebastiano Tronto <sebastiano@tronto.net> | 2025-08-06 16:34:21 +0200 |
|---|---|---|
| committer | Sebastiano Tronto <sebastiano@tronto.net> | 2025-08-06 16:52:12 +0200 |
| commit | 57a7520545134ab95f7bb0397dcbe991c906a3e9 (patch) | |
| tree | 689e20a92ec3830533d2fb868e5dc141dec45877 /src/solvers/coord/dreo.h | |
| parent | a5c9b857a346343443baf49679eebf12c18b4008 (diff) | |
| download | nissy-core-57a7520545134ab95f7bb0397dcbe991c906a3e9.tar.gz nissy-core-57a7520545134ab95f7bb0397dcbe991c906a3e9.zip | |
Added HTR solver
Diffstat (limited to 'src/solvers/coord/dreo.h')
| -rw-r--r-- | src/solvers/coord/dreo.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/solvers/coord/dreo.h b/src/solvers/coord/dreo.h index f563129..c5cacac 100644 --- a/src/solvers/coord/dreo.h +++ b/src/solvers/coord/dreo.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | 2 | ||
| 3 | STATIC uint64_t coord_dresep_nosym(cube_t); | 3 | STATIC uint64_t coord_dresep_nosym(cube_t); |
| 4 | STATIC cube_t invcoord_dresep_nosym(uint64_t); | 4 | STATIC cube_t invcoord_dresep_nosym(uint64_t); |
| 5 | STATIC cube_t coordinate_dreo_merge(cube_t, cube_t); | ||
| 6 | 5 | ||
| 7 | STATIC uint64_t coordinate_dreo_coord(cube_t, const unsigned char *); | 6 | STATIC uint64_t coordinate_dreo_coord(cube_t, const unsigned char *); |
| 8 | STATIC cube_t coordinate_dreo_cube(uint64_t, const unsigned char *); | 7 | STATIC cube_t coordinate_dreo_cube(uint64_t, const unsigned char *); |
| @@ -22,6 +21,7 @@ STATIC coord_t coordinate_dreo = { | |||
| 22 | .moves_mask_gendata = MM18_EO, | 21 | .moves_mask_gendata = MM18_EO, |
| 23 | .moves_mask_solve = MM18_EO, | 22 | .moves_mask_solve = MM18_EO, |
| 24 | .is_admissible = &solution_lastqt_cw, | 23 | .is_admissible = &solution_lastqt_cw, |
| 24 | .solution_prune = NULL, | ||
| 25 | .is_solvable = &is_dreo_solvable, | 25 | .is_solvable = &is_dreo_solvable, |
| 26 | .is_solved = NULL, | 26 | .is_solved = NULL, |
| 27 | .allow_niss = true, | 27 | .allow_niss = true, |
| @@ -47,7 +47,7 @@ STATIC coord_t coordinate_dreo = { | |||
| 47 | .max2 = POW_3_7, | 47 | .max2 = POW_3_7, |
| 48 | .coord2 = &coord_co, | 48 | .coord2 = &coord_co, |
| 49 | .cube2 = &invcoord_co, | 49 | .cube2 = &invcoord_co, |
| 50 | .merge = &coordinate_dreo_merge, | 50 | .merge = &coordinate_merge_ec, |
| 51 | }, | 51 | }, |
| 52 | }; | 52 | }; |
| 53 | 53 | ||
| @@ -63,17 +63,6 @@ invcoord_dresep_nosym(uint64_t coord) | |||
| 63 | return invcoord_esep(coord * COMB_8_4); | 63 | return invcoord_esep(coord * COMB_8_4); |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | STATIC cube_t | ||
| 67 | coordinate_dreo_merge(cube_t c1, cube_t c2) | ||
| 68 | { | ||
| 69 | cube_t merged; | ||
| 70 | |||
| 71 | merged = c1; | ||
| 72 | copy_corners(&merged, c2); | ||
| 73 | |||
| 74 | return merged; | ||
| 75 | } | ||
| 76 | |||
| 77 | STATIC uint64_t | 66 | STATIC uint64_t |
| 78 | coordinate_dreo_coord(cube_t cube, const unsigned char *data) | 67 | coordinate_dreo_coord(cube_t cube, const unsigned char *data) |
| 79 | { | 68 | { |
