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/cpepe.h | |
| parent | a5c9b857a346343443baf49679eebf12c18b4008 (diff) | |
| download | nissy-core-57a7520545134ab95f7bb0397dcbe991c906a3e9.tar.gz nissy-core-57a7520545134ab95f7bb0397dcbe991c906a3e9.zip | |
Added HTR solver
Diffstat (limited to 'src/solvers/coord/cpepe.h')
| -rw-r--r-- | src/solvers/coord/cpepe.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/solvers/coord/cpepe.h b/src/solvers/coord/cpepe.h index 9c9bffc..7035400 100644 --- a/src/solvers/coord/cpepe.h +++ b/src/solvers/coord/cpepe.h | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | STATIC cube_t coordinate_cpepe_merge(const cube_t, const cube_t); | ||
| 2 | STATIC uint64_t coordinate_cpepe_coord(const cube_t, const unsigned char *); | 1 | STATIC uint64_t coordinate_cpepe_coord(const cube_t, const unsigned char *); |
| 3 | STATIC cube_t coordinate_cpepe_cube(uint64_t, const unsigned char *); | 2 | STATIC cube_t coordinate_cpepe_cube(uint64_t, const unsigned char *); |
| 4 | STATIC bool coordinate_cpepe_isnasty(uint64_t, const unsigned char *); | 3 | STATIC bool coordinate_cpepe_isnasty(uint64_t, const unsigned char *); |
| @@ -15,6 +14,7 @@ STATIC coord_t coordinate_cpepe = { | |||
| 15 | .moves_mask_gendata = MM18_DR, | 14 | .moves_mask_gendata = MM18_DR, |
| 16 | .moves_mask_solve = MM18_DR, | 15 | .moves_mask_solve = MM18_DR, |
| 17 | .is_admissible = &solution_always_valid, | 16 | .is_admissible = &solution_always_valid, |
| 17 | .solution_prune = NULL, | ||
| 18 | .is_solvable = &is_drfinnoe_solvable, | 18 | .is_solvable = &is_drfinnoe_solvable, |
| 19 | .is_solved = NULL, | 19 | .is_solved = NULL, |
| 20 | .allow_niss = false, | 20 | .allow_niss = false, |
| @@ -44,21 +44,10 @@ STATIC coord_t coordinate_cpepe = { | |||
| 44 | .max2 = FACT_4, | 44 | .max2 = FACT_4, |
| 45 | .coord2 = &coord_epe, | 45 | .coord2 = &coord_epe, |
| 46 | .cube2 = &invcoord_epe, | 46 | .cube2 = &invcoord_epe, |
| 47 | .merge = &coordinate_cpepe_merge, | 47 | .merge = &coordinate_merge_ce, |
| 48 | }, | 48 | }, |
| 49 | }; | 49 | }; |
| 50 | 50 | ||
| 51 | STATIC cube_t | ||
| 52 | coordinate_cpepe_merge(const cube_t c1, const cube_t c2) | ||
| 53 | { | ||
| 54 | cube_t merged; | ||
| 55 | |||
| 56 | merged = c1; | ||
| 57 | copy_edges(&merged, c2); | ||
| 58 | |||
| 59 | return merged; | ||
| 60 | } | ||
| 61 | |||
| 62 | STATIC uint64_t | 51 | STATIC uint64_t |
| 63 | coordinate_cpepe_coord(const cube_t cube, const unsigned char *data) | 52 | coordinate_cpepe_coord(const cube_t cube, const unsigned char *data) |
| 64 | { | 53 | { |
