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/drfinnoe.h | |
| parent | a5c9b857a346343443baf49679eebf12c18b4008 (diff) | |
| download | nissy-core-57a7520545134ab95f7bb0397dcbe991c906a3e9.tar.gz nissy-core-57a7520545134ab95f7bb0397dcbe991c906a3e9.zip | |
Added HTR solver
Diffstat (limited to 'src/solvers/coord/drfinnoe.h')
| -rw-r--r-- | src/solvers/coord/drfinnoe.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/solvers/coord/drfinnoe.h b/src/solvers/coord/drfinnoe.h index 4370779..63f4edf 100644 --- a/src/solvers/coord/drfinnoe.h +++ b/src/solvers/coord/drfinnoe.h | |||
| @@ -13,7 +13,6 @@ In the worst case, it is a bug to be fixed, but I find it unlikely. | |||
| 13 | 13 | ||
| 14 | #define CLASSES_CP_16 2768 | 14 | #define CLASSES_CP_16 2768 |
| 15 | 15 | ||
| 16 | STATIC cube_t coordinate_drfinnoe_merge(cube_t, cube_t); | ||
| 17 | STATIC uint64_t coordinate_drfinnoe_coord(cube_t, const unsigned char *); | 16 | STATIC uint64_t coordinate_drfinnoe_coord(cube_t, const unsigned char *); |
| 18 | STATIC cube_t coordinate_drfinnoe_cube(uint64_t, const unsigned char *); | 17 | STATIC cube_t coordinate_drfinnoe_cube(uint64_t, const unsigned char *); |
| 19 | STATIC bool coordinate_drfinnoe_isnasty(uint64_t, const unsigned char *); | 18 | STATIC bool coordinate_drfinnoe_isnasty(uint64_t, const unsigned char *); |
| @@ -32,6 +31,7 @@ STATIC coord_t coordinate_drfinnoe = { | |||
| 32 | .moves_mask_gendata = MM18_DR, | 31 | .moves_mask_gendata = MM18_DR, |
| 33 | .moves_mask_solve = MM18_DR, | 32 | .moves_mask_solve = MM18_DR, |
| 34 | .is_admissible = &solution_always_valid, | 33 | .is_admissible = &solution_always_valid, |
| 34 | .solution_prune = NULL, | ||
| 35 | .is_solvable = &is_drfinnoe_solvable, | 35 | .is_solvable = &is_drfinnoe_solvable, |
| 36 | .is_solved = NULL, | 36 | .is_solved = NULL, |
| 37 | .allow_niss = false, | 37 | .allow_niss = false, |
| @@ -62,21 +62,10 @@ STATIC coord_t coordinate_drfinnoe = { | |||
| 62 | .max2 = FACT_8, | 62 | .max2 = FACT_8, |
| 63 | .coord2 = &coord_epud, | 63 | .coord2 = &coord_epud, |
| 64 | .cube2 = &invcoord_epud, | 64 | .cube2 = &invcoord_epud, |
| 65 | .merge = &coordinate_drfinnoe_merge, | 65 | .merge = &coordinate_merge_ce, |
| 66 | }, | 66 | }, |
| 67 | }; | 67 | }; |
| 68 | 68 | ||
| 69 | STATIC cube_t | ||
| 70 | coordinate_drfinnoe_merge(cube_t c1, cube_t c2) | ||
| 71 | { | ||
| 72 | cube_t merged; | ||
| 73 | |||
| 74 | merged = c1; | ||
| 75 | copy_edges(&merged, c2); | ||
| 76 | |||
| 77 | return merged; | ||
| 78 | } | ||
| 79 | |||
| 80 | STATIC uint64_t | 69 | STATIC uint64_t |
| 81 | coordinate_drfinnoe_coord(cube_t cube, const unsigned char *data) | 70 | coordinate_drfinnoe_coord(cube_t cube, const unsigned char *data) |
| 82 | { | 71 | { |
