Merge branch 'h48-corner-estimate'

5 files changed, 87 insertions, 0 deletions

diff --git a/src/solvers/coord/common.h b/src/solvers/coord/common.h
index 5f2435d..d154636 100644
--- a/src/solvers/coord/common.h
+++ b/src/solvers/coord/common.h
@@ -14,6 +14,7 @@ STATIC bool coord_is_solved(
 
 STATIC cube_t coordinate_merge_ce(cube_t, cube_t);
 STATIC cube_t coordinate_merge_ec(cube_t, cube_t);
+STATIC cube_t coordinate_merge_cpco(cube_t, cube_t);
 
 STATIC uint64_t
 coord_coord_generic(
@@ -215,3 +216,14 @@ coordinate_merge_ec(cube_t edges, cube_t corners)
 {
         return coordinate_merge_ce(corners, edges);
 }
+
+STATIC cube_t
+coordinate_merge_cpco(cube_t cp, cube_t co)
+{
+        cube_t merged;
+
+        merged = cp;
+        copy_co(&merged, co);
+
+        return merged;
+}
diff --git a/src/solvers/coord/coord.h b/src/solvers/coord/coord.h
index db40239..2ef8482 100644
--- a/src/solvers/coord/coord.h
+++ b/src/solvers/coord/coord.h
@@ -8,6 +8,7 @@
 #include "cpepe.h"
 #include "drfin.h"
 #include "htr.h"
+#include "corners.h"
 #include "list.h"
 #include "utils.h"
 #include "gendata.h"
diff --git a/src/solvers/coord/corners.h b/src/solvers/coord/corners.h
new file mode 100644
index 0000000..cc0d9a5
--- /dev/null
+++ b/src/solvers/coord/corners.h
@@ -0,0 +1,72 @@
+#define CLASSES_CP_48 984
+
+STATIC uint64_t coordinate_corners_coord(const cube_t, const unsigned char *);
+STATIC cube_t coordinate_corners_cube(uint64_t, const unsigned char *);
+STATIC bool coordinate_corners_isnasty(uint64_t, const unsigned char *);
+STATIC size_t coordinate_corners_gendata(unsigned char *);
+
+STATIC coord_t coordinate_corners = {
+        .name = "CORNERS",
+        .coord = &coordinate_corners_coord,
+        .cube = &coordinate_corners_cube,
+        .isnasty = &coordinate_corners_isnasty,
+        .gendata = coordinate_corners_gendata,
+        .max = CLASSES_CP_48 * POW_3_7,
+        .trans_mask = TM_ALLTRANS,
+        .moves_mask_gendata = MM18_ALLMOVES,
+        .moves_mask_solve = MM18_ALLMOVES,
+        .is_admissible = &solution_always_valid,
+        .solution_prune = NULL,
+        .is_solvable = &cube_true,
+        .is_solved = NULL,
+        .allow_niss = false,
+        .pruning_distribution = {
+                [0] = 1,
+                [1] = 2,
+                [2] = 9,
+                [3] = 76,
+                [4] = 708,
+                [5] = 5022,
+                [6] = 28248,
+                [7] = 132076,
+                [8] = 505705,
+                [9] = 1102421,
+                [10] = 375380,
+                [11] = 2360,
+        },
+        .pruning_max = 11,
+        .sym = {
+                .classes = CLASSES_CP_48,
+                .max = FACT_8,
+                .coord = &coord_cp,
+                .cube = &invcoord_cp,
+                .max2 = POW_3_7,
+                .coord2 = &coord_co,
+                .cube2 = &invcoord_co,
+                .merge = &coordinate_merge_cpco,
+        },
+};
+
+STATIC uint64_t
+coordinate_corners_coord(const cube_t cube, const unsigned char *data)
+{
+        return coord_coord_generic(&coordinate_corners, cube, data);
+}
+
+STATIC cube_t
+coordinate_corners_cube(uint64_t i, const unsigned char *data)
+{
+        return coord_cube_generic(&coordinate_corners, i, data);
+}
+
+STATIC bool
+coordinate_corners_isnasty(uint64_t i, const unsigned char *data)
+{
+        return coord_isnasty_generic(&coordinate_corners, i, data);
+}
+
+STATIC size_t
+coordinate_corners_gendata(unsigned char *data)
+{
+        return coord_gendata_generic(&coordinate_corners, data);
+}
diff --git a/src/solvers/coord/list.h b/src/solvers/coord/list.h
index 9b59969..f2b7368 100644
--- a/src/solvers/coord/list.h
+++ b/src/solvers/coord/list.h
@@ -6,6 +6,7 @@ coord_t *all_coordinates[] = {
         &coordinate_drslice,
         &coordinate_cpepe,
         &coordinate_htr,
+        &coordinate_corners,
         NULL
 };
 
diff --git a/src/solvers/coord/types_macros.h b/src/solvers/coord/types_macros.h
index 98f9822..a9e604c 100644
--- a/src/solvers/coord/types_macros.h
+++ b/src/solvers/coord/types_macros.h
@@ -30,6 +30,7 @@ typedef struct {
         bool (*is_admissible)(const solution_moves_t[static 1]);
         bool (*solution_prune)(const solution_moves_t[static 1]);
         bool (*is_solvable)(cube_t);
+        /* if is_solved is nulle, coord == 0 is used */
         bool (*is_solved)(uint64_t, const unsigned char *);
         uint64_t pruning_distribution[INFO_DISTRIBUTION_LEN];
         uint8_t pruning_max;