aboutsummaryrefslogtreecommitdiff
path: root/src/solvers/coord/cpepe.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/solvers/coord/cpepe.h')
-rw-r--r--src/solvers/coord/cpepe.h15
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 @@
1STATIC cube_t coordinate_cpepe_merge(const cube_t, const cube_t);
2STATIC uint64_t coordinate_cpepe_coord(const cube_t, const unsigned char *); 1STATIC uint64_t coordinate_cpepe_coord(const cube_t, const unsigned char *);
3STATIC cube_t coordinate_cpepe_cube(uint64_t, const unsigned char *); 2STATIC cube_t coordinate_cpepe_cube(uint64_t, const unsigned char *);
4STATIC bool coordinate_cpepe_isnasty(uint64_t, const unsigned char *); 3STATIC 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
51STATIC cube_t
52coordinate_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
62STATIC uint64_t 51STATIC uint64_t
63coordinate_cpepe_coord(const cube_t cube, const unsigned char *data) 52coordinate_cpepe_coord(const cube_t cube, const unsigned char *data)
64{ 53{

Generated with cgit - Back to sebastiano.tronto.net