aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastiano Tronto <sebastiano@tronto.net>2025-07-17 08:54:20 +0200
committerSebastiano Tronto <sebastiano@tronto.net>2025-07-17 08:54:20 +0200
commit2d0ab15ac1f81c76cb6bb31bbdad3d2ee339e062 (patch)
treea20741b4fb345d24b3149bd50bcfe5833484fd2b
parent0ad2e864f63e77157815242b96faafdfae376dd8 (diff)
downloadnissy-core-2d0ab15ac1f81c76cb6bb31bbdad3d2ee339e062.tar.gz
nissy-core-2d0ab15ac1f81c76cb6bb31bbdad3d2ee339e062.zip
Renamed drslice drfinnoe
Diffstat (limited to '')
-rw-r--r--src/solvers/coord/coord.h2
-rw-r--r--src/solvers/coord/drfinnoe.h (renamed from src/solvers/coord/drslice.h)48
-rw-r--r--src/solvers/coord/list.h2
3 files changed, 26 insertions, 26 deletions
diff --git a/src/solvers/coord/coord.h b/src/solvers/coord/coord.h
index 7716078..e487964 100644
--- a/src/solvers/coord/coord.h
+++ b/src/solvers/coord/coord.h
@@ -3,7 +3,7 @@
3#include "eo.h" 3#include "eo.h"
4#include "dr.h" 4#include "dr.h"
5#include "dreo.h" 5#include "dreo.h"
6#include "drslice.h" 6#include "drfinnoe.h"
7#include "list.h" 7#include "list.h"
8#include "utils.h" 8#include "utils.h"
9#include "gendata.h" 9#include "gendata.h"
diff --git a/src/solvers/coord/drslice.h b/src/solvers/coord/drfinnoe.h
index a0eb57e..984b10a 100644
--- a/src/solvers/coord/drslice.h
+++ b/src/solvers/coord/drfinnoe.h
@@ -17,21 +17,21 @@ STATIC uint64_t coordinate_cp_coord(cube_t);
17STATIC cube_t coordinate_cp_cube(uint64_t); 17STATIC cube_t coordinate_cp_cube(uint64_t);
18STATIC uint64_t coordinate_epud_coord(cube_t); 18STATIC uint64_t coordinate_epud_coord(cube_t);
19STATIC cube_t coordinate_epud_cube(uint64_t); 19STATIC cube_t coordinate_epud_cube(uint64_t);
20STATIC cube_t coordinate_drslice_merge(cube_t, cube_t); 20STATIC cube_t coordinate_drfinnoe_merge(cube_t, cube_t);
21 21
22STATIC uint64_t coordinate_drslice_coord(cube_t, const unsigned char *); 22STATIC uint64_t coordinate_drfinnoe_coord(cube_t, const unsigned char *);
23STATIC cube_t coordinate_drslice_cube(uint64_t, const unsigned char *); 23STATIC cube_t coordinate_drfinnoe_cube(uint64_t, const unsigned char *);
24STATIC bool coordinate_drslice_isnasty(uint64_t, const unsigned char *); 24STATIC bool coordinate_drfinnoe_isnasty(uint64_t, const unsigned char *);
25STATIC size_t coordinate_drslice_gendata(unsigned char *); 25STATIC size_t coordinate_drfinnoe_gendata(unsigned char *);
26 26
27STATIC bool is_drslice_solvable(cube_t); 27STATIC bool is_drfinnoe_solvable(cube_t);
28 28
29STATIC coord_t coordinate_drslice = { 29STATIC coord_t coordinate_drfinnoe = {
30 .name = "DRSLICE", 30 .name = "DRFINNOE",
31 .coord = &coordinate_drslice_coord, 31 .coord = &coordinate_drfinnoe_coord,
32 .cube = &coordinate_drslice_cube, 32 .cube = &coordinate_drfinnoe_cube,
33 .isnasty = &coordinate_drslice_isnasty, 33 .isnasty = &coordinate_drfinnoe_isnasty,
34 .gendata = coordinate_drslice_gendata, 34 .gendata = coordinate_drfinnoe_gendata,
35 .max = CLASSES_CP_16 * FACT_8, 35 .max = CLASSES_CP_16 * FACT_8,
36 .trans_mask = TM_UDFIX, 36 .trans_mask = TM_UDFIX,
37 .moves_mask = MM18_DR, 37 .moves_mask = MM18_DR,
@@ -41,7 +41,7 @@ STATIC coord_t coordinate_drslice = {
41 [AXIS_FB] = TRANS_FDr, 41 [AXIS_FB] = TRANS_FDr,
42 }, 42 },
43 .is_admissible = &solution_always_valid, 43 .is_admissible = &solution_always_valid,
44 .is_solvable = &is_drslice_solvable, 44 .is_solvable = &is_drfinnoe_solvable,
45 .pruning_distribution = { 45 .pruning_distribution = {
46 [0] = 1, 46 [0] = 1,
47 [1] = 3, 47 [1] = 3,
@@ -69,7 +69,7 @@ STATIC coord_t coordinate_drslice = {
69 .max2 = FACT_8, 69 .max2 = FACT_8,
70 .coord2 = &coordinate_epud_coord, 70 .coord2 = &coordinate_epud_coord,
71 .cube2 = &coordinate_epud_cube, 71 .cube2 = &coordinate_epud_cube,
72 .merge = &coordinate_drslice_merge, 72 .merge = &coordinate_drfinnoe_merge,
73 }, 73 },
74}; 74};
75 75
@@ -98,7 +98,7 @@ coordinate_epud_cube(uint64_t i)
98} 98}
99 99
100STATIC cube_t 100STATIC cube_t
101coordinate_drslice_merge(cube_t c1, cube_t c2) 101coordinate_drfinnoe_merge(cube_t c1, cube_t c2)
102{ 102{
103 cube_t merged; 103 cube_t merged;
104 104
@@ -109,31 +109,31 @@ coordinate_drslice_merge(cube_t c1, cube_t c2)
109} 109}
110 110
111STATIC uint64_t 111STATIC uint64_t
112coordinate_drslice_coord(cube_t cube, const unsigned char *data) 112coordinate_drfinnoe_coord(cube_t cube, const unsigned char *data)
113{ 113{
114 return coord_coord_generic(&coordinate_drslice, cube, data); 114 return coord_coord_generic(&coordinate_drfinnoe, cube, data);
115} 115}
116 116
117STATIC cube_t 117STATIC cube_t
118coordinate_drslice_cube(uint64_t i, const unsigned char *data) 118coordinate_drfinnoe_cube(uint64_t i, const unsigned char *data)
119{ 119{
120 return coord_cube_generic(&coordinate_drslice, i, data); 120 return coord_cube_generic(&coordinate_drfinnoe, i, data);
121} 121}
122 122
123STATIC bool 123STATIC bool
124coordinate_drslice_isnasty(uint64_t i, const unsigned char *data) 124coordinate_drfinnoe_isnasty(uint64_t i, const unsigned char *data)
125{ 125{
126 return coord_isnasty_generic(&coordinate_drslice, i, data); 126 return coord_isnasty_generic(&coordinate_drfinnoe, i, data);
127} 127}
128 128
129STATIC size_t 129STATIC size_t
130coordinate_drslice_gendata(unsigned char *data) 130coordinate_drfinnoe_gendata(unsigned char *data)
131{ 131{
132 return coord_gendata_generic(&coordinate_drslice, data); 132 return coord_gendata_generic(&coordinate_drfinnoe, data);
133} 133}
134 134
135STATIC bool 135STATIC bool
136is_drslice_solvable(cube_t cube) { 136is_drfinnoe_solvable(cube_t cube) {
137 return coord_eo(cube) == 0 && 137 return coord_eo(cube) == 0 &&
138 coord_eo(transform_edges(cube, TRANS_URr)) == 0 && 138 coord_eo(transform_edges(cube, TRANS_URr)) == 0 &&
139 coord_co(cube) == 0; 139 coord_co(cube) == 0;
diff --git a/src/solvers/coord/list.h b/src/solvers/coord/list.h
index 3badc8f..a3d3206 100644
--- a/src/solvers/coord/list.h
+++ b/src/solvers/coord/list.h
@@ -2,6 +2,6 @@ coord_t *all_coordinates[] = {
2 &coordinate_eo, 2 &coordinate_eo,
3 &coordinate_dr, 3 &coordinate_dr,
4 &coordinate_dreo, 4 &coordinate_dreo,
5 &coordinate_drslice, 5 &coordinate_drfinnoe,
6 NULL 6 NULL
7}; 7};

Generated with cgit - Back to sebastiano.tronto.net