Merge branch 'master' of tronto.net:h48

2 files changed, 35 insertions, 1 deletions

diff --git a/src/solvers/h48/gendata_cocsep.h b/src/solvers/h48/gendata_cocsep.h
index 2189145..262793b 100644
--- a/src/solvers/h48/gendata_cocsep.h
+++ b/src/solvers/h48/gendata_cocsep.h
@@ -25,6 +25,7 @@ STATIC_INLINE void set_visited(uint8_t *, int64_t);
 
 STATIC size_t gendata_cocsep(void *, uint64_t *, cube_t *);
 STATIC uint32_t gendata_cocsep_dfs(cocsep_dfs_arg_t *);
+STATIC void getdistribution_cocsep(const uint32_t *, uint64_t [static 21]);
 
 STATIC_INLINE int8_t get_h48_cdata(cube_t, uint32_t *, uint32_t *);
 
@@ -157,6 +158,17 @@ gendata_cocsep_dfs(cocsep_dfs_arg_t *arg)
         return cc;
 }
 
+STATIC void
+getdistribution_cocsep(const uint32_t *table, uint64_t distr[static 21])
+{
+        size_t i;
+
+        memset(distr, 0, 21 * sizeof(uint64_t));
+
+        for (i = 0; i < COCSEP_TABLESIZE; i++)
+                distr[CBOUND(table[i])]++;
+}
+
 STATIC_INLINE bool
 get_visited(const uint8_t *a, int64_t i)
 {
diff --git a/src/solvers/h48/gendata_h48.h b/src/solvers/h48/gendata_h48.h
index a88eb4f..48d5582 100644
--- a/src/solvers/h48/gendata_h48.h
+++ b/src/solvers/h48/gendata_h48.h
@@ -104,13 +104,16 @@ STATIC size_t gendata_h48k2_realcoord(gendata_h48_arg_t *);
 STATIC void gendata_h48k2_dfs(h48k2_dfs_arg_t *arg);
 STATIC void * gendata_h48k2_runthread(void *);
 STATIC tableinfo_t makeinfo_h48k2(gendata_h48_arg_t *);
+STATIC void getdistribution_h48(
+    const uint8_t *, uint64_t [static 21], uint8_t, uint8_t);
 
 STATIC uint32_t *get_cocsepdata_ptr(const void *);
 STATIC uint8_t *get_h48data_ptr(const void *);
 
 STATIC_INLINE uint8_t get_h48_pval(const uint8_t *, int64_t, uint8_t);
 STATIC_INLINE void set_h48_pval(uint8_t *, int64_t, uint8_t, uint8_t);
-STATIC_INLINE uint8_t get_h48_bound(cube_t, uint32_t, uint8_t, uint8_t, uint8_t *);
+STATIC_INLINE uint8_t get_h48_bound(
+    cube_t, uint32_t, uint8_t, uint8_t, uint8_t *);
 
 size_t gendata_h48_derive(uint8_t, const void *, void *);
 
@@ -665,6 +668,25 @@ makeinfo_h48k2(gendata_h48_arg_t *arg)
         return info;
 }
 
+STATIC void
+getdistribution_h48(
+        const uint8_t *table,
+        uint64_t distr[static 21],
+        uint8_t h,
+        uint8_t k
+) {
+        uint8_t val;
+        int64_t i, h48max;
+
+        memset(distr, 0, 21 * sizeof(uint64_t));
+
+        h48max = H48_COORDMAX(h);
+        for (i = 0; i < h48max; i++) {
+                val = get_h48_pval(table, i, k);
+                distr[val]++;
+        }
+}
+
 STATIC uint32_t *
 get_cocsepdata_ptr(const void *data)
 {