1 files changed, 131 insertions, 2 deletions

diff --git a/src/solvers/coord/common.h b/src/solvers/coord/common.h
index 4cfc36f..95c0e6c 100644
--- a/src/solvers/coord/common.h
+++ b/src/solvers/coord/common.h
@@ -1,10 +1,139 @@
-STATIC void append_coord_name(const coord_t *, char *);
+STATIC uint64_t coord_coord_generic(
+    const coord_t [static 1], cube_t, const void *);
+STATIC cube_t coord_cube_generic(
+    const coord_t [static 1], uint64_t, const void *);
+STATIC bool coord_isnasty_generic(
+    const coord_t [static 1], uint64_t, const void *);
+STATIC size_t coord_gendata_generic(const coord_t [static 1], void *);
+
+STATIC void append_coord_name(const coord_t [static 1], char *);
 STATIC bool solution_lastqt_cw(const solution_moves_t [static 1]);
 STATIC bool coord_can_switch(
     const coord_t [static 1], const void *, size_t n, const uint8_t [n]);
 
+STATIC uint64_t
+coord_coord_generic(const coord_t coord[static 1], cube_t c, const void *data)
+{
+        const char *datanoinfo;
+        const uint32_t *data32;
+        uint32_t d;
+        cube_t tr;
+
+        datanoinfo = (const char *)data + INFOSIZE;
+        data32 = (const uint32_t *)datanoinfo;
+        d = data32[coord->sym.coord(c)];
+        tr = transform(c, COORD_TTREP(d));
+
+        return COORD_CLASS(d) * coord->sym.max2 + coord->sym.coord2(tr);
+}
+
+STATIC cube_t
+coord_cube_generic(const coord_t coord[static 1], uint64_t i, const void *data)
+{
+        const char *datanoinfo;
+        const uint32_t *rep32;
+        cube_t c;
+
+        datanoinfo = (const char *)data + INFOSIZE;
+        rep32 = (const uint32_t *)(datanoinfo + 4 * (size_t)coord->sym.max);
+        c = coord->sym.cube(rep32[i / coord->sym.max2]);
+
+        return coord->sym.merge(c, coord->sym.cube2(i % coord->sym.max2));
+}
+
+STATIC bool
+coord_isnasty_generic(
+        const coord_t coord[static 1],
+        uint64_t i,
+        const void *data
+)
+{
+        const char *datanoinfo;
+        const uint32_t *classttrep, *rep32;
+        uint32_t r;
+
+        datanoinfo = (const char *)data + INFOSIZE;
+        classttrep = (const uint32_t *)datanoinfo;
+        rep32 = (const uint32_t *)(datanoinfo + 4 * (size_t)coord->sym.max);
+        r = rep32[i / coord->sym.max2];
+
+        return COORD_ISNASTY(classttrep[r]);
+}
+
+STATIC size_t
+coord_gendata_generic(
+        const coord_t coord[static 1],
+        void *data
+)
+{
+        uint64_t i, j, n, t, nasty;
+        char *datanoinfo;
+        uint32_t *classttrep, *rep;
+        size_t coord_datasize;
+        cube_t c;
+        tableinfo_t info;
+
+        coord_datasize = INFOSIZE + 4*(coord->sym.classes + coord->sym.max);
+
+        if (data == NULL)
+                return coord_datasize;
+
+        datanoinfo = (char *)data + INFOSIZE;
+        classttrep = (uint32_t *)datanoinfo;
+        rep = classttrep + coord->sym.max;
+        memset(data, 0xFF, coord_datasize);
+
+        info = (tableinfo_t) {
+                .solver = "coord data for ",
+                .type = TABLETYPE_SPECIAL,
+                .infosize = INFOSIZE,
+                .fullsize = coord_datasize,
+                .hash = 0,
+                .entries = coord->sym.classes + coord->sym.max,
+                .classes = coord->sym.classes,
+                .bits = 32,
+                .base = 0,
+                .maxvalue = 0,
+                .next = 0
+        };
+        append_coord_name(coord, info.solver);
+
+        for (i = 0, n = 0; i < coord->sym.max; i++) {
+                if (classttrep[i] != 0xFFFFFFFF)
+                        continue;
+
+                c = coord->sym.cube(i);
+                for (t = 1, nasty = 0; t < NTRANS && !nasty; t++) {
+                        if (!((UINT64_C(1) << t) & coord->trans_mask))
+                                continue;
+
+                        nasty = i == coord->sym.coord(transform(c, t));
+                }
+
+                for (t = 0; t < NTRANS; t++) {
+                        if (!((UINT64_C(1) << t) & coord->trans_mask))
+                                continue;
+
+                        j = coord->sym.coord(transform(c, t));
+                        classttrep[j] =
+                            (n << COORD_CLASS_SHIFT) |
+                            (nasty << COORD_ISNASTY_SHIFT) |
+                            (inverse_trans(t) << COORD_TTREP_SHIFT);
+                }
+                rep[n++] = i;
+        }
+
+        writetableinfo(&info, coord_datasize, data);
+
+        DBG_ASSERT(n == coord->sym.classes, 0,
+            "%s coordinate data: computed %" PRIu64 " classes, "
+            "expected %" PRIu64 "\n", coord->name, n, coord->sym.classes);
+
+        return coord_datasize;
+}
+
 STATIC void
-append_coord_name(const coord_t *coord, char *str)
+append_coord_name(const coord_t coord[static 1], char *str)
 {
         int i, j;