diff options
| author | Sebastiano Tronto <sebastiano.tronto@gmail.com> | 2021-11-17 00:16:39 +0100 |
|---|---|---|
| committer | Sebastiano Tronto <sebastiano.tronto@gmail.com> | 2021-11-17 00:16:39 +0100 |
| commit | 0df4f6f98101bb3be192ce892aa1452f2c6de1a4 (patch) | |
| tree | 8bd047e4e247812495b1fdb489e2e37c2cf14224 /src/pruning.c | |
| parent | 20ac0e60d7174114965d4419af0bb3028db8e447 (diff) | |
| download | nissy-0df4f6f98101bb3be192ce892aa1452f2c6de1a4.tar.gz nissy-0df4f6f98101bb3be192ce892aa1452f2c6de1a4.zip | |
Use inttypes.h macros to print uint64_t variables (this requires -std=c99). Added a couple of TODOs
Diffstat (limited to '')
| -rw-r--r-- | src/pruning.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/pruning.c b/src/pruning.c index 11705c5..1369892 100644 --- a/src/pruning.c +++ b/src/pruning.c | |||
| @@ -127,7 +127,8 @@ genptable(PruneData *pd) | |||
| 127 | for (j = 0; j < pd->coord->max; j++) | 127 | for (j = 0; j < pd->coord->max; j++) |
| 128 | dfs_set_visited_index(&dd, j, false); | 128 | dfs_set_visited_index(&dd, j, false); |
| 129 | genptable_dfs((Cube){0}, pd, &dd); | 129 | genptable_dfs((Cube){0}, pd, &dd); |
| 130 | fprintf(stderr, "Depth %d done, generated %lu\t(%lu/%lu)\n", | 130 | fprintf(stderr, "Depth %d done, generated %" |
| 131 | PRIu64 "\t(%" PRIu64 "/%" PRIu64 ")\n", | ||
| 131 | dd.d+1, pd->n - oldn, pd->n, pd->coord->max); | 132 | dd.d+1, pd->n - oldn, pd->n, pd->coord->max); |
| 132 | oldn = pd->n; | 133 | oldn = pd->n; |
| 133 | } | 134 | } |
| @@ -169,12 +170,14 @@ genptable(PruneData *pd) | |||
| 169 | ptable_update(pd, (Cube){0}, 0); | 170 | ptable_update(pd, (Cube){0}, 0); |
| 170 | pd->n = 1; | 171 | pd->n = 1; |
| 171 | oldn = 0; | 172 | oldn = 0; |
| 172 | fprintf(stderr, "Depth %d done, generated %lu\t(%lu/%lu)\n", | 173 | fprintf(stderr, "Depth %d done, generated %" |
| 174 | PRIu64 "\t(%" PRIu64 "/%" PRIu64 ")\n", | ||
| 173 | 0, pd->n - oldn, pd->n, pd->coord->max); | 175 | 0, pd->n - oldn, pd->n, pd->coord->max); |
| 174 | oldn = 1; | 176 | oldn = 1; |
| 175 | for (d = 0; d < 15 && pd->n < pd->coord->max; d++) { | 177 | for (d = 0; d < 15 && pd->n < pd->coord->max; d++) { |
| 176 | genptable_bfs(pd, d, ms); | 178 | genptable_bfs(pd, d, ms); |
| 177 | fprintf(stderr, "Depth %d done, generated %lu\t(%lu/%lu)\n", | 179 | fprintf(stderr, "Depth %d done, generated %" |
| 180 | PRIu64 "\t(%" PRIu64 "/%" PRIu64 ")\n", | ||
| 178 | d+1, pd->n - oldn, pd->n, pd->coord->max); | 181 | d+1, pd->n - oldn, pd->n, pd->coord->max); |
| 179 | oldn = pd->n; | 182 | oldn = pd->n; |
| 180 | } | 183 | } |
| @@ -193,11 +196,6 @@ genptable_dfs(Cube c, PruneData *pd, DfsData *dd) | |||
| 193 | Move mm; | 196 | Move mm; |
| 194 | Cube cc; | 197 | Cube cc; |
| 195 | 198 | ||
| 196 | if (pd->coord->index(c) > 2*ptablesize(pd)) { | ||
| 197 | printf("error! %lu > %lu\n", pd->coord->index(c), 2*ptablesize(pd)); | ||
| 198 | print_cube(c); | ||
| 199 | exit(1); | ||
| 200 | } | ||
| 201 | pv = ptableval(pd, c); | 199 | pv = ptableval(pd, c); |
| 202 | 200 | ||
| 203 | if (pv < dd->m || dd->m > dd->d) | 201 | if (pv < dd->m || dd->m > dd->d) |
| @@ -303,7 +301,7 @@ print_ptable(PruneData *pd) | |||
| 303 | 301 | ||
| 304 | fprintf(stderr, "Values for table %s\n", pd->filename); | 302 | fprintf(stderr, "Values for table %s\n", pd->filename); |
| 305 | for (i = 0; i < 16; i++) | 303 | for (i = 0; i < 16; i++) |
| 306 | printf("%2lu\t%10lu\n", i, a[i]); | 304 | printf("%2" PRIu64 "\t%10" PRIu64 "\n", i, a[i]); |
| 307 | } | 305 | } |
| 308 | 306 | ||
| 309 | uint64_t | 307 | uint64_t |
