Renamed tools; fixed solve tool; added gendata_h48h1k2 tool

1 files changed, 0 insertions, 99 deletions

diff --git a/tools/010_stats_tables_h48/stats_tables_h48.c b/tools/010_stats_tables_h48/stats_tables_h48.c
deleted file mode 100644
index adac8fa..0000000
--- a/tools/010_stats_tables_h48/stats_tables_h48.c
+++ /dev/null
@@ -1,99 +0,0 @@
-#include <pthread.h>
-
-#include "../tool.h"
-
-#define MAXMOVES 20
-#define NCUBES_PER_THREAD 10000
-#define LOG_EVERY (NCUBES_PER_THREAD / 10)
-
-const char *solver = "h48stats";
-const char *options = "";
-const char *filename = "tables/h48h0k4";
-char *buf;
-
-typedef struct {
-        int n;
-        int thread_id;
-        int64_t v[12][100];
-} thread_arg_t;
-
-uint64_t rand64(void) {
-        uint64_t i, ret;
-
-        for (i = 0, ret = 0; i < 64; i++)
-                ret |= (uint64_t)(rand() % 2) << i;
-
-        return ret;
-}
-
-static void *
-run_thread(void *arg)
-{
-        char sols[12], cube[22];
-        int64_t ep, eo, cp, co;
-        int i, j;
-
-        thread_arg_t *a = (thread_arg_t *)arg;
-
-        for (i = 0; i < a->n; i++) {
-                ep = rand64();
-                eo = rand64();
-                cp = rand64();
-                co = rand64();
-                nissy_getcube(ep, eo, cp, co, "fix", cube);
-                nissy_solve(cube, "h48stats", "", "",
-                    0, MAXMOVES, 1, -1, buf, sols);
-                for (j = 0; j < 12; j++)
-                        a->v[j][(int)sols[j]]++;
-                if ((i+1) % LOG_EVERY == 0)
-                        fprintf(stderr, "[thread %d] %d cubes solved...\n",
-                            a->thread_id, i+1);
-        }
-
-        return NULL;
-}
-
-void run(void) {
-        int64_t i, j, k, tot;
-        double avg;
-        pthread_t thread[THREADS];
-        thread_arg_t arg[THREADS];
-
-        for (i = 0; i < THREADS; i++) {
-                arg[i] = (thread_arg_t) {
-                        .thread_id = i,
-                        .n = NCUBES_PER_THREAD,
-                        .v = {{0}}
-                };
-                pthread_create(&thread[i], NULL, run_thread, &arg[i]);
-        }
-
-        for (i = 0; i < THREADS; i++)
-                pthread_join(thread[i], NULL);
-
-        for (j = 0; j < 12; j++) {
-                printf("Data for h=%" PRId64 "\n", j);
-                for (k = 0, avg = 0.0; k < 16; k++) {
-                        for (i = 0, tot = 0; i < THREADS; i++)
-                                tot += arg[i].v[j][k];
-                        printf("%" PRId64 "\t%" PRId64 "\n", k, tot);
-                        avg += tot * k;
-                }
-                avg /= (double)(NCUBES_PER_THREAD * THREADS);
-                printf("Average: %.4lf\n", avg);
-                printf("\n");
-        }
-}
-
-int main(void) {
-        srand(time(NULL));
-        nissy_setlogger(log_stderr);
-
-        if (getdata(solver, options, &buf, filename) != 0)
-                return 1;
-
-        timerun(run, "h48 table stats");
-
-        free(buf);
-        return 0;
-}