diff options
| author | Sebastiano Tronto <sebastiano@tronto.net> | 2024-10-06 09:15:21 +0200 |
|---|---|---|
| committer | Sebastiano Tronto <sebastiano@tronto.net> | 2024-10-06 09:15:21 +0200 |
| commit | 68ec5f85e346863bffb64b186d7ef9046ba5b9a4 (patch) | |
| tree | 03644d2bc61eac929a4c89b3dee685f582297c16 /src/solvers | |
| parent | 561b7521370fc0f3c97b86aa71005baa9fea08ce (diff) | |
| download | nissy-core-68ec5f85e346863bffb64b186d7ef9046ba5b9a4.tar.gz nissy-core-68ec5f85e346863bffb64b186d7ef9046ba5b9a4.zip | |
Removed some useless output
Diffstat (limited to 'src/solvers')
| -rw-r--r-- | src/solvers/h48/gendata_cocsep.h | 6 | ||||
| -rw-r--r-- | src/solvers/h48/gendata_h48.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/solvers/h48/gendata_cocsep.h b/src/solvers/h48/gendata_cocsep.h index a8142b4..18bfc38 100644 --- a/src/solvers/h48/gendata_cocsep.h +++ b/src/solvers/h48/gendata_cocsep.h | |||
| @@ -23,7 +23,7 @@ gendata_cocsep(void *buf, uint64_t *selfsim, cube_t *rep) | |||
| 23 | { | 23 | { |
| 24 | uint32_t *buf32, cc; | 24 | uint32_t *buf32, cc; |
| 25 | uint16_t n; | 25 | uint16_t n; |
| 26 | uint8_t i, j, visited[COCSEP_VISITEDSIZE]; | 26 | uint8_t i, visited[COCSEP_VISITEDSIZE]; |
| 27 | tableinfo_t info; | 27 | tableinfo_t info; |
| 28 | cocsep_dfs_arg_t arg; | 28 | cocsep_dfs_arg_t arg; |
| 29 | 29 | ||
| @@ -71,10 +71,14 @@ gendata_cocsep(void *buf, uint64_t *selfsim, cube_t *rep) | |||
| 71 | "expected %zu\n", n, COCSEP_CLASSES); | 71 | "expected %zu\n", n, COCSEP_CLASSES); |
| 72 | 72 | ||
| 73 | LOG("cocsep data computed\n"); | 73 | LOG("cocsep data computed\n"); |
| 74 | |||
| 75 | /* The following output is just noise | ||
| 76 | |||
| 74 | LOG("Symmetry classes: %" PRIu32 "\n", COCSEP_CLASSES); | 77 | LOG("Symmetry classes: %" PRIu32 "\n", COCSEP_CLASSES); |
| 75 | LOG("Pruning value distribution:\n"); | 78 | LOG("Pruning value distribution:\n"); |
| 76 | for (j = 0; j < 10; j++) | 79 | for (j = 0; j < 10; j++) |
| 77 | LOG("%" PRIu8 ":\t%" PRIu32 "\n", j, info.distribution[j]); | 80 | LOG("%" PRIu8 ":\t%" PRIu32 "\n", j, info.distribution[j]); |
| 81 | */ | ||
| 78 | 82 | ||
| 79 | gendata_cocsep_return_size: | 83 | gendata_cocsep_return_size: |
| 80 | return COCSEP_FULLSIZE; | 84 | return COCSEP_FULLSIZE; |
diff --git a/src/solvers/h48/gendata_h48.h b/src/solvers/h48/gendata_h48.h index b5af03a..3979a39 100644 --- a/src/solvers/h48/gendata_h48.h +++ b/src/solvers/h48/gendata_h48.h | |||
| @@ -32,19 +32,15 @@ gendata_h48short(gendata_h48short_arg_t *arg) | |||
| 32 | { | 32 | { |
| 33 | uint8_t i, m; | 33 | uint8_t i, m; |
| 34 | int64_t coord; | 34 | int64_t coord; |
| 35 | uint64_t j, oldn; | 35 | uint64_t j; |
| 36 | kvpair_t kv; | 36 | kvpair_t kv; |
| 37 | cube_t cube, d; | 37 | cube_t cube, d; |
| 38 | 38 | ||
| 39 | cube = SOLVED_CUBE; | 39 | cube = SOLVED_CUBE; |
| 40 | coord = coord_h48(cube, arg->cocsepdata, 11); | 40 | coord = coord_h48(cube, arg->cocsepdata, 11); |
| 41 | h48map_insertmin(arg->map, coord, 0); | 41 | h48map_insertmin(arg->map, coord, 0); |
| 42 | oldn = 0; | ||
| 43 | LOG("Short h48: depth 0\nfound %" PRIu8 "\n", arg->map->n-oldn); | ||
| 44 | for (i = 0; i < arg->maxdepth; i++) { | 42 | for (i = 0; i < arg->maxdepth; i++) { |
| 45 | LOG("Short h48: depth %" PRIu8 "\n", i+1); | ||
| 46 | j = 0; | 43 | j = 0; |
| 47 | oldn = arg->map->n; | ||
| 48 | for (kv = h48map_nextkvpair(arg->map, &j); | 44 | for (kv = h48map_nextkvpair(arg->map, &j); |
| 49 | j != arg->map->capacity; | 45 | j != arg->map->capacity; |
| 50 | kv = h48map_nextkvpair(arg->map, &j) | 46 | kv = h48map_nextkvpair(arg->map, &j) |
| @@ -60,7 +56,6 @@ gendata_h48short(gendata_h48short_arg_t *arg) | |||
| 60 | ) | 56 | ) |
| 61 | } | 57 | } |
| 62 | } | 58 | } |
| 63 | LOG("found %" PRIu8 "\n", arg->map->n-oldn); | ||
| 64 | } | 59 | } |
| 65 | 60 | ||
| 66 | return arg->map->n; | 61 | return arg->map->n; |
| @@ -336,6 +331,7 @@ gendata_h48k2(gendata_h48_arg_t *arg) | |||
| 336 | .map = &shortcubes | 331 | .map = &shortcubes |
| 337 | }; | 332 | }; |
| 338 | gendata_h48short(&shortarg); | 333 | gendata_h48short(&shortarg); |
| 334 | LOG("Computed %" PRIu64 " positions\n", shortarg.map->n); | ||
| 339 | 335 | ||
| 340 | if (arg->base >= 20) | 336 | if (arg->base >= 20) |
| 341 | arg->base = base[arg->h]; | 337 | arg->base = base[arg->h]; |
