Added checkdata for coord EO

3 files changed, 30 insertions, 0 deletions

diff --git a/src/nissy.c b/src/nissy.c
index 2766b12..431362d 100644
--- a/src/nissy.c
+++ b/src/nissy.c
@@ -80,8 +80,13 @@ checkdata(const char *buf, const tableinfo_t *info)
         } else if (!strncmp(info->solver, "h48", 3)) {
                 getdistribution_h48((uint8_t *)buf + INFOSIZE, distr,
                     info->h48h, info->bits);
+        } else if (!strncmp(info->solver, "coordinate solver for ", 22)) {
+                getdistribution_coord((uint8_t *)buf + INFOSIZE,
+                    info->solver + 22, distr);
         } else if (!strncmp(info->solver, "eoesep data for h48", 19)) {
                 return true;
+        } else if (!strncmp(info->solver, "coord helper table for ", 23)) {
+                return true;
         } else {
                 LOG("checkdata: unknown solver %s\n", info->solver);
                 return false;
diff --git a/src/solvers/coord/gendata.h b/src/solvers/coord/gendata.h
index 9512b93..93ffc65 100644
--- a/src/solvers/coord/gendata.h
+++ b/src/solvers/coord/gendata.h
@@ -1,6 +1,8 @@
 STATIC size_t gendata_coord(const coord_t *, void *);
 STATIC int64_t gendata_coord_dispatch(const char *, void *);
 STATIC tableinfo_t genptable_coord(const coord_t *, const void *, uint8_t *);
+STATIC void getdistribution_coord(
+    const uint8_t *, const char *, uint64_t [static INFO_DISTRIBUTION_LEN]);
 STATIC uint8_t get_coord_pval(const coord_t *, const uint8_t *, uint64_t);
 STATIC void set_coord_pval(const coord_t *, uint8_t *, uint64_t, uint8_t);
 
@@ -122,6 +124,28 @@ genptable_coord(const coord_t *coord, const void *data, uint8_t *table)
         return info;
 }
 
+STATIC void
+getdistribution_coord(
+        const uint8_t *table,
+        const char *coord,
+        uint64_t distr[static INFO_DISTRIBUTION_LEN]
+)
+{
+        uint8_t v;
+        uint64_t i;
+        coord_t *c;
+
+        memset(distr, 0, INFO_DISTRIBUTION_LEN * sizeof(uint64_t));
+
+        if((c = parse_coord(coord, strlen(coord))) == NULL)
+                return;
+
+        for (i = 0; i < c->max; i++) {
+                v = get_coord_pval(c, table, i);
+                distr[v]++;
+        }
+}
+
 STATIC uint8_t
 get_coord_pval(const coord_t *coord, const uint8_t *table, uint64_t i)
 {
diff --git a/src/solvers/h48/gendata_h48.h b/src/solvers/h48/gendata_h48.h
index fe4b259..55db1be 100644
--- a/src/solvers/h48/gendata_h48.h
+++ b/src/solvers/h48/gendata_h48.h
@@ -682,6 +682,7 @@ getdistribution_h48(
                 distr[val]++;
         }
 }
+
 STATIC const uint32_t *
 get_cocsepdata_constptr(const void *data)
 {