diff options
| author | Sebastiano Tronto <sebastiano@tronto.net> | 2024-09-18 10:15:06 +0200 |
|---|---|---|
| committer | Sebastiano Tronto <sebastiano@tronto.net> | 2024-09-18 10:15:06 +0200 |
| commit | c0aa77e610366e60f7ecf70db481d8d2cfb66c35 (patch) | |
| tree | a4d20f1c20fa6077e35c060b00e0b07282e919c0 | |
| parent | 11a966eeb4fcd88e251fb9d77a18d6b67c36dd61 (diff) | |
| download | nissy-core-c0aa77e610366e60f7ecf70db481d8d2cfb66c35.tar.gz nissy-core-c0aa77e610366e60f7ecf70db481d8d2cfb66c35.zip | |
Renamed gen_48_short -> gendata_h48_short
| -rw-r--r-- | src/solvers/h48/gendata_h48.h | 6 | ||||
| -rw-r--r-- | test/112_gendata_h48short/00_depth_1.in (renamed from test/112_gen_h48short/00_depth_1.in) | 0 | ||||
| -rw-r--r-- | test/112_gendata_h48short/00_depth_1.out (renamed from test/112_gen_h48short/00_depth_1.out) | 0 | ||||
| -rw-r--r-- | test/112_gendata_h48short/01_depth_3.in (renamed from test/112_gen_h48short/01_depth_3.in) | 0 | ||||
| -rw-r--r-- | test/112_gendata_h48short/01_depth_3.out (renamed from test/112_gen_h48short/01_depth_3.out) | 0 | ||||
| -rw-r--r-- | test/112_gendata_h48short/gendata_h48short_tests.c (renamed from test/112_gen_h48short/gen_h48short_tests.c) | 4 |
6 files changed, 5 insertions, 5 deletions
diff --git a/src/solvers/h48/gendata_h48.h b/src/solvers/h48/gendata_h48.h index 76a2532..0362c69 100644 --- a/src/solvers/h48/gendata_h48.h +++ b/src/solvers/h48/gendata_h48.h | |||
| @@ -76,7 +76,7 @@ typedef struct { | |||
| 76 | uint64_t *count; | 76 | uint64_t *count; |
| 77 | } h48k2_dfs_arg_t; | 77 | } h48k2_dfs_arg_t; |
| 78 | 78 | ||
| 79 | STATIC uint64_t gen_h48short(gendata_h48short_arg_t *); | 79 | STATIC uint64_t gendata_h48short(gendata_h48short_arg_t *); |
| 80 | STATIC size_t gendata_h48(gendata_h48_arg_t *); | 80 | STATIC size_t gendata_h48(gendata_h48_arg_t *); |
| 81 | STATIC size_t gendata_h48h0k4(gendata_h48_arg_t *); | 81 | STATIC size_t gendata_h48h0k4(gendata_h48_arg_t *); |
| 82 | STATIC int64_t gendata_h48h0k4_bfs(h48h0k4_bfs_arg_t *); | 82 | STATIC int64_t gendata_h48h0k4_bfs(h48h0k4_bfs_arg_t *); |
| @@ -96,7 +96,7 @@ STATIC_INLINE void set_h48_pval(uint8_t *, int64_t, uint8_t, uint8_t); | |||
| 96 | STATIC_INLINE uint8_t get_h48_bound(cube_t, uint32_t, uint8_t, uint8_t, uint8_t *); | 96 | STATIC_INLINE uint8_t get_h48_bound(cube_t, uint32_t, uint8_t, uint8_t, uint8_t *); |
| 97 | 97 | ||
| 98 | STATIC uint64_t | 98 | STATIC uint64_t |
| 99 | gen_h48short(gendata_h48short_arg_t *arg) | 99 | gendata_h48short(gendata_h48short_arg_t *arg) |
| 100 | { | 100 | { |
| 101 | uint8_t i, m; | 101 | uint8_t i, m; |
| 102 | int64_t coord; | 102 | int64_t coord; |
| @@ -368,7 +368,7 @@ gendata_h48k2(gendata_h48_arg_t *arg) | |||
| 368 | .selfsim = arg->selfsim, | 368 | .selfsim = arg->selfsim, |
| 369 | .map = &shortcubes | 369 | .map = &shortcubes |
| 370 | }; | 370 | }; |
| 371 | nshort = gen_h48short(&shortarg); | 371 | nshort = gendata_h48short(&shortarg); |
| 372 | LOG("Cubes in <= %" PRIu8 " moves: %" PRIu64 "\n", shortdepth, nshort); | 372 | LOG("Cubes in <= %" PRIu8 " moves: %" PRIu64 "\n", shortdepth, nshort); |
| 373 | 373 | ||
| 374 | selectedbase = base[arg->h]; | 374 | selectedbase = base[arg->h]; |
diff --git a/test/112_gen_h48short/00_depth_1.in b/test/112_gendata_h48short/00_depth_1.in index c86f15b..c86f15b 100644 --- a/test/112_gen_h48short/00_depth_1.in +++ b/test/112_gendata_h48short/00_depth_1.in | |||
diff --git a/test/112_gen_h48short/00_depth_1.out b/test/112_gendata_h48short/00_depth_1.out index b0dba31..b0dba31 100644 --- a/test/112_gen_h48short/00_depth_1.out +++ b/test/112_gendata_h48short/00_depth_1.out | |||
diff --git a/test/112_gen_h48short/01_depth_3.in b/test/112_gendata_h48short/01_depth_3.in index 920e70a..920e70a 100644 --- a/test/112_gen_h48short/01_depth_3.in +++ b/test/112_gendata_h48short/01_depth_3.in | |||
diff --git a/test/112_gen_h48short/01_depth_3.out b/test/112_gendata_h48short/01_depth_3.out index dbce376..dbce376 100644 --- a/test/112_gen_h48short/01_depth_3.out +++ b/test/112_gendata_h48short/01_depth_3.out | |||
diff --git a/test/112_gen_h48short/gen_h48short_tests.c b/test/112_gendata_h48short/gendata_h48short_tests.c index a706dff..fb432d3 100644 --- a/test/112_gen_h48short/gen_h48short_tests.c +++ b/test/112_gendata_h48short/gendata_h48short_tests.c | |||
| @@ -33,7 +33,7 @@ void h48map_create(h48map_t *, uint64_t, uint64_t); | |||
| 33 | void h48map_destroy(h48map_t *); | 33 | void h48map_destroy(h48map_t *); |
| 34 | kvpair_t h48map_nextkvpair(h48map_t *, uint64_t *); | 34 | kvpair_t h48map_nextkvpair(h48map_t *, uint64_t *); |
| 35 | size_t gendata_cocsep(void *, uint64_t *, cube_t *); | 35 | size_t gendata_cocsep(void *, uint64_t *, cube_t *); |
| 36 | uint64_t gen_h48short(gendata_h48short_arg_t *); | 36 | uint64_t gendata_h48short(gendata_h48short_arg_t *); |
| 37 | 37 | ||
| 38 | char str[STRLENMAX]; | 38 | char str[STRLENMAX]; |
| 39 | 39 | ||
| @@ -69,7 +69,7 @@ void run(void) { | |||
| 69 | h48map_create(&map, capacity, randomizer); | 69 | h48map_create(&map, capacity, randomizer); |
| 70 | gendata_cocsep(buf, selfsim, crep); | 70 | gendata_cocsep(buf, selfsim, crep); |
| 71 | arg.cocsepdata = (uint32_t *)((char *)buf + INFOSIZE); | 71 | arg.cocsepdata = (uint32_t *)((char *)buf + INFOSIZE); |
| 72 | gen_h48short(&arg); | 72 | gendata_h48short(&arg); |
| 73 | 73 | ||
| 74 | i = 0; | 74 | i = 0; |
| 75 | for (kv = h48map_nextkvpair(&map, &i), j = 0; | 75 | for (kv = h48map_nextkvpair(&map, &i), j = 0; |
