aboutsummaryrefslogtreecommitdiff
path: root/src/solvers/coord/drslice.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/solvers/coord/drslice.h')
-rw-r--r--src/solvers/coord/drslice.h15
1 files changed, 2 insertions, 13 deletions
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
5if we reduced the coordinate by rotations. TODO. 5if we reduced the coordinate by rotations. TODO.
6*/ 6*/
7 7
8STATIC cube_t coordinate_drslice_merge(cube_t, cube_t);
9STATIC uint64_t coordinate_drslice_coord(cube_t, const unsigned char *); 8STATIC uint64_t coordinate_drslice_coord(cube_t, const unsigned char *);
10STATIC cube_t coordinate_drslice_cube(uint64_t, const unsigned char *); 9STATIC cube_t coordinate_drslice_cube(uint64_t, const unsigned char *);
11STATIC bool coordinate_drslice_isnasty(uint64_t, const unsigned char *); 10STATIC bool coordinate_drslice_isnasty(uint64_t, const unsigned char *);
@@ -24,6 +23,7 @@ STATIC coord_t coordinate_drslice = {
24 .moves_mask_gendata = MM18_DR, 23 .moves_mask_gendata = MM18_DR,
25 .moves_mask_solve = MM18_DR_NOD, 24 .moves_mask_solve = MM18_DR_NOD,
26 .is_admissible = &solution_always_valid, 25 .is_admissible = &solution_always_valid,
26 .solution_prune = NULL,
27 .is_solvable = &is_drslice_solvable, 27 .is_solvable = &is_drslice_solvable,
28 .is_solved = &is_drslice_solved, 28 .is_solved = &is_drslice_solved,
29 .allow_niss = false, 29 .allow_niss = false,
@@ -54,21 +54,10 @@ STATIC coord_t coordinate_drslice = {
54 .max2 = FACT_8, 54 .max2 = FACT_8,
55 .coord2 = &coord_epud, 55 .coord2 = &coord_epud,
56 .cube2 = &invcoord_epud, 56 .cube2 = &invcoord_epud,
57 .merge = &coordinate_drslice_merge, 57 .merge = &coordinate_merge_ce,
58 }, 58 },
59}; 59};
60 60
61STATIC cube_t
62coordinate_drslice_merge(cube_t c1, cube_t c2)
63{
64 cube_t merged;
65
66 merged = c1;
67 copy_edges(&merged, c2);
68
69 return merged;
70}
71
72STATIC uint64_t 61STATIC uint64_t
73coordinate_drslice_coord(cube_t cube, const unsigned char *data) 62coordinate_drslice_coord(cube_t cube, const unsigned char *data)
74{ 63{

Generated with cgit - Back to sebastiano.tronto.net