From 57a7520545134ab95f7bb0397dcbe991c906a3e9 Mon Sep 17 00:00:00 2001 From: Sebastiano Tronto Date: Wed, 6 Aug 2025 16:34:21 +0200 Subject: Added HTR solver --- src/solvers/coord/drslice.h | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'src/solvers/coord/drslice.h') diff --git a/src/solvers/coord/drslice.h b/src/solvers/coord/drslice.h index c9403f8..42699f8 100644 --- a/src/solvers/coord/drslice.h +++ b/src/solvers/coord/drslice.h @@ -5,7 +5,6 @@ much of the code of DRFINNOE. We could make the pruning table 4x smaller if we reduced the coordinate by rotations. TODO. */ -STATIC cube_t coordinate_drslice_merge(cube_t, cube_t); STATIC uint64_t coordinate_drslice_coord(cube_t, const unsigned char *); STATIC cube_t coordinate_drslice_cube(uint64_t, const unsigned char *); STATIC bool coordinate_drslice_isnasty(uint64_t, const unsigned char *); @@ -24,6 +23,7 @@ STATIC coord_t coordinate_drslice = { .moves_mask_gendata = MM18_DR, .moves_mask_solve = MM18_DR_NOD, .is_admissible = &solution_always_valid, + .solution_prune = NULL, .is_solvable = &is_drslice_solvable, .is_solved = &is_drslice_solved, .allow_niss = false, @@ -54,21 +54,10 @@ STATIC coord_t coordinate_drslice = { .max2 = FACT_8, .coord2 = &coord_epud, .cube2 = &invcoord_epud, - .merge = &coordinate_drslice_merge, + .merge = &coordinate_merge_ce, }, }; -STATIC cube_t -coordinate_drslice_merge(cube_t c1, cube_t c2) -{ - cube_t merged; - - merged = c1; - copy_edges(&merged, c2); - - return merged; -} - STATIC uint64_t coordinate_drslice_coord(cube_t cube, const unsigned char *data) { -- cgit v1.3