diff options
Diffstat (limited to 'src/solvers/coord')
| -rw-r--r-- | src/solvers/coord/dr.h | 2 | ||||
| -rw-r--r-- | src/solvers/coord/dreo.h | 2 | ||||
| -rw-r--r-- | src/solvers/coord/eo.h | 2 | ||||
| -rw-r--r-- | src/solvers/coord/types_macros.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/solvers/coord/dr.h b/src/solvers/coord/dr.h index e197f8c..607cc39 100644 --- a/src/solvers/coord/dr.h +++ b/src/solvers/coord/dr.h | |||
| @@ -24,7 +24,7 @@ STATIC coord_t coordinate_dr = { | |||
| 24 | .gendata = coordinate_dr_gendata, | 24 | .gendata = coordinate_dr_gendata, |
| 25 | .max = DREOESEP_CLASSES * POW_3_7, | 25 | .max = DREOESEP_CLASSES * POW_3_7, |
| 26 | .trans_mask = TM_UDFIX, | 26 | .trans_mask = TM_UDFIX, |
| 27 | .moves_mask = MM_ALLMOVES, | 27 | .moves_mask = MM18_ALLMOVES, |
| 28 | .axistrans = { | 28 | .axistrans = { |
| 29 | [AXIS_UD] = TRANS_UFr, | 29 | [AXIS_UD] = TRANS_UFr, |
| 30 | [AXIS_RL] = TRANS_RFr, | 30 | [AXIS_RL] = TRANS_RFr, |
diff --git a/src/solvers/coord/dreo.h b/src/solvers/coord/dreo.h index 2bc8cd1..1cce4e2 100644 --- a/src/solvers/coord/dreo.h +++ b/src/solvers/coord/dreo.h | |||
| @@ -19,7 +19,7 @@ STATIC coord_t coordinate_dreo = { | |||
| 19 | .gendata = coordinate_dreo_gendata, | 19 | .gendata = coordinate_dreo_gendata, |
| 20 | .max = DRESEP_CLASSES * POW_3_7, | 20 | .max = DRESEP_CLASSES * POW_3_7, |
| 21 | .trans_mask = TM_UDRLFIX, | 21 | .trans_mask = TM_UDRLFIX, |
| 22 | .moves_mask = MM_EO, | 22 | .moves_mask = MM18_EO, |
| 23 | .axistrans = { | 23 | .axistrans = { |
| 24 | [AXIS_UD] = TRANS_UFr, | 24 | [AXIS_UD] = TRANS_UFr, |
| 25 | [AXIS_RL] = TRANS_RFr, | 25 | [AXIS_RL] = TRANS_RFr, |
diff --git a/src/solvers/coord/eo.h b/src/solvers/coord/eo.h index c8faaea..51dfb29 100644 --- a/src/solvers/coord/eo.h +++ b/src/solvers/coord/eo.h | |||
| @@ -12,7 +12,7 @@ STATIC coord_t coordinate_eo = { | |||
| 12 | .gendata = coordinate_eo_gendata, | 12 | .gendata = coordinate_eo_gendata, |
| 13 | .max = POW_2_11, | 13 | .max = POW_2_11, |
| 14 | .trans_mask = TM_SINGLE(TRANS_UFr), | 14 | .trans_mask = TM_SINGLE(TRANS_UFr), |
| 15 | .moves_mask = MM_ALLMOVES, | 15 | .moves_mask = MM18_ALLMOVES, |
| 16 | .axistrans = { | 16 | .axistrans = { |
| 17 | [AXIS_UD] = TRANS_FDr, | 17 | [AXIS_UD] = TRANS_FDr, |
| 18 | [AXIS_RL] = TRANS_URr, | 18 | [AXIS_RL] = TRANS_URr, |
diff --git a/src/solvers/coord/types_macros.h b/src/solvers/coord/types_macros.h index 2767dcc..a5ac7f3 100644 --- a/src/solvers/coord/types_macros.h +++ b/src/solvers/coord/types_macros.h | |||
| @@ -21,7 +21,7 @@ typedef struct { | |||
| 21 | bool (*isnasty)(uint64_t, const unsigned char *); | 21 | bool (*isnasty)(uint64_t, const unsigned char *); |
| 22 | size_t (*gendata)(unsigned char *); | 22 | size_t (*gendata)(unsigned char *); |
| 23 | uint64_t max; | 23 | uint64_t max; |
| 24 | uint32_t moves_mask; | 24 | uint64_t moves_mask; |
| 25 | uint64_t trans_mask; | 25 | uint64_t trans_mask; |
| 26 | uint8_t axistrans[3]; | 26 | uint8_t axistrans[3]; |
| 27 | bool (*is_admissible)(const solution_moves_t[static 1]); | 27 | bool (*is_admissible)(const solution_moves_t[static 1]); |
