diff options
| author | Sebastiano Tronto <sebastiano@tronto.net> | 2025-07-29 10:55:29 +0200 |
|---|---|---|
| committer | Sebastiano Tronto <sebastiano@tronto.net> | 2025-07-29 10:55:29 +0200 |
| commit | 52c21640508c3fc668107778ae027ff4428ebd89 (patch) | |
| tree | 821a0a8d4ba7ee8c0311d4fbd4120a37dfc5082b /src | |
| parent | 38014615238a51f1c0c1f2f96d37cbfbf765520a (diff) | |
| download | nissy-core-52c21640508c3fc668107778ae027ff4428ebd89.tar.gz nissy-core-52c21640508c3fc668107778ae027ff4428ebd89.zip | |
Cleanup some TODOs
Diffstat (limited to 'src')
| -rw-r--r-- | src/solvers/coord/gendata.h | 4 | ||||
| -rw-r--r-- | src/solvers/coord/solve.h | 8 | ||||
| -rw-r--r-- | src/solvers/h48/checkdata.h | 5 | ||||
| -rw-r--r-- | src/solvers/h48/gendata_cocsep.h | 2 | ||||
| -rw-r--r-- | src/solvers/h48/gendata_h48.h | 6 | ||||
| -rw-r--r-- | src/solvers/solutions.h | 1 | ||||
| -rw-r--r-- | src/solvers/tables_types_macros.h | 2 |
7 files changed, 8 insertions, 20 deletions
diff --git a/src/solvers/coord/gendata.h b/src/solvers/coord/gendata.h index b43c56d..7118b08 100644 --- a/src/solvers/coord/gendata.h +++ b/src/solvers/coord/gendata.h | |||
| @@ -57,7 +57,7 @@ gendata_coord(const coord_t coord[static 1], unsigned char *buf) | |||
| 57 | .type = TABLETYPE_SPECIAL, | 57 | .type = TABLETYPE_SPECIAL, |
| 58 | .infosize = INFOSIZE, | 58 | .infosize = INFOSIZE, |
| 59 | .fullsize = INFOSIZE + coord_dsize, | 59 | .fullsize = INFOSIZE + coord_dsize, |
| 60 | .hash = 0, /* TODO */ | 60 | .hash = 0, |
| 61 | .next = INFOSIZE + coord_dsize, | 61 | .next = INFOSIZE + coord_dsize, |
| 62 | 62 | ||
| 63 | /* Unknown / non-applicable values */ | 63 | /* Unknown / non-applicable values */ |
| @@ -105,7 +105,7 @@ genptable_coord( | |||
| 105 | .type = TABLETYPE_PRUNING, | 105 | .type = TABLETYPE_PRUNING, |
| 106 | .infosize = INFOSIZE, | 106 | .infosize = INFOSIZE, |
| 107 | .fullsize = INFOSIZE + tablesize, | 107 | .fullsize = INFOSIZE + tablesize, |
| 108 | .hash = 0, /* TODO */ | 108 | .hash = 0, |
| 109 | .entries = coord->max, | 109 | .entries = coord->max, |
| 110 | .classes = 0, | 110 | .classes = 0, |
| 111 | .bits = 4, | 111 | .bits = 4, |
diff --git a/src/solvers/coord/solve.h b/src/solvers/coord/solve.h index a2f89db..75ec200 100644 --- a/src/solvers/coord/solve.h +++ b/src/solvers/coord/solve.h | |||
| @@ -312,14 +312,6 @@ solve_coord( | |||
| 312 | .solution_settings = &solution_settings, | 312 | .solution_settings = &solution_settings, |
| 313 | .solution_list = &solution_list, | 313 | .solution_list = &solution_list, |
| 314 | .nissflag = nissflag, | 314 | .nissflag = nissflag, |
| 315 | |||
| 316 | /* | ||
| 317 | Since no move has been done yet, this field should be | ||
| 318 | neither true nor false; using its value now is logically | ||
| 319 | undefined behavior. | ||
| 320 | TODO: find a more elegant solution | ||
| 321 | */ | ||
| 322 | .lastisnormal = true, | ||
| 323 | }; | 315 | }; |
| 324 | 316 | ||
| 325 | if (coord->coord(c, coord_data) == 0) { | 317 | if (coord->coord(c, coord_data) == 0) { |
diff --git a/src/solvers/h48/checkdata.h b/src/solvers/h48/checkdata.h index 1ee053d..af0499d 100644 --- a/src/solvers/h48/checkdata.h +++ b/src/solvers/h48/checkdata.h | |||
| @@ -1,10 +1,7 @@ | |||
| 1 | STATIC long long checkdata_h48( | 1 | STATIC long long checkdata_h48( |
| 2 | const char *, unsigned long long, const unsigned char *); | 2 | const char *, unsigned long long, const unsigned char *); |
| 3 | 3 | ||
| 4 | /* | 4 | /* TODO: Currently unused, re-introduce check on cocsep table */ |
| 5 | Currently unused. | ||
| 6 | TODO: re-introduce check on cocsep table | ||
| 7 | */ | ||
| 8 | uint64_t expected_cocsep[21] = { | 5 | uint64_t expected_cocsep[21] = { |
| 9 | [0] = 1, | 6 | [0] = 1, |
| 10 | [1] = 6, | 7 | [1] = 6, |
diff --git a/src/solvers/h48/gendata_cocsep.h b/src/solvers/h48/gendata_cocsep.h index 7a589b5..5d14db7 100644 --- a/src/solvers/h48/gendata_cocsep.h +++ b/src/solvers/h48/gendata_cocsep.h | |||
| @@ -35,7 +35,7 @@ gendata_cocsep( | |||
| 35 | .type = TABLETYPE_SPECIAL, | 35 | .type = TABLETYPE_SPECIAL, |
| 36 | .infosize = INFOSIZE, | 36 | .infosize = INFOSIZE, |
| 37 | .fullsize = COCSEP_FULLSIZE, | 37 | .fullsize = COCSEP_FULLSIZE, |
| 38 | .hash = 0, /* TODO */ | 38 | .hash = 0, |
| 39 | .entries = COCSEP_TABLESIZE, | 39 | .entries = COCSEP_TABLESIZE, |
| 40 | .classes = COCSEP_CLASSES, | 40 | .classes = COCSEP_CLASSES, |
| 41 | .bits = 32, | 41 | .bits = 32, |
diff --git a/src/solvers/h48/gendata_h48.h b/src/solvers/h48/gendata_h48.h index a7d8408..72cb05d 100644 --- a/src/solvers/h48/gendata_h48.h +++ b/src/solvers/h48/gendata_h48.h | |||
| @@ -117,7 +117,7 @@ gendata_h48(gendata_h48_arg_t arg[static 1]) | |||
| 117 | arg->cocsepdata = (uint32_t *)cocsepdata_offset; | 117 | arg->cocsepdata = (uint32_t *)cocsepdata_offset; |
| 118 | arg->h48buf = (_Atomic unsigned char*)arg->buf + cocsepsize; | 118 | arg->h48buf = (_Atomic unsigned char*)arg->buf + cocsepsize; |
| 119 | 119 | ||
| 120 | arg->base = 99; /* TODO: set this somewhere else */ | 120 | arg->base = 99; |
| 121 | 121 | ||
| 122 | if (arg->h == 0 && arg->k == 4) { | 122 | if (arg->h == 0 && arg->k == 4) { |
| 123 | gendata_h48h0k4(arg); | 123 | gendata_h48h0k4(arg); |
| @@ -220,7 +220,7 @@ gendata_h48h0k4(gendata_h48_arg_t arg[static 1]) | |||
| 220 | .type = TABLETYPE_PRUNING, | 220 | .type = TABLETYPE_PRUNING, |
| 221 | .infosize = INFOSIZE, | 221 | .infosize = INFOSIZE, |
| 222 | .fullsize = H48_TABLESIZE(0, 4) + INFOSIZE, | 222 | .fullsize = H48_TABLESIZE(0, 4) + INFOSIZE, |
| 223 | .hash = 0, /* TODO */ | 223 | .hash = 0, |
| 224 | .entries = H48_COORDMAX(0), | 224 | .entries = H48_COORDMAX(0), |
| 225 | .classes = 0, | 225 | .classes = 0, |
| 226 | .h48h = 0, | 226 | .h48h = 0, |
| @@ -676,7 +676,7 @@ makeinfo_h48k2(gendata_h48_arg_t arg[static 1]) | |||
| 676 | .type = TABLETYPE_PRUNING, | 676 | .type = TABLETYPE_PRUNING, |
| 677 | .infosize = INFOSIZE, | 677 | .infosize = INFOSIZE, |
| 678 | .fullsize = H48_TABLESIZE(arg->h, 2) + INFOSIZE, | 678 | .fullsize = H48_TABLESIZE(arg->h, 2) + INFOSIZE, |
| 679 | .hash = 0, /* TODO */ | 679 | .hash = 0, |
| 680 | .entries = H48_COORDMAX(arg->h), | 680 | .entries = H48_COORDMAX(arg->h), |
| 681 | .classes = 0, | 681 | .classes = 0, |
| 682 | .h48h = arg->h, | 682 | .h48h = arg->h, |
diff --git a/src/solvers/solutions.h b/src/solvers/solutions.h index cdb1fdb..f3761d9 100644 --- a/src/solvers/solutions.h +++ b/src/solvers/solutions.h | |||
| @@ -186,7 +186,6 @@ appendsolution( | |||
| 186 | later, because the allowedmoves check would fail with | 186 | later, because the allowedmoves check would fail with |
| 187 | improperly sorted parallel moves, but then transforming | 187 | improperly sorted parallel moves, but then transforming |
| 188 | could swap the pairs the wrong way around. | 188 | could swap the pairs the wrong way around. |
| 189 | TODO: maybe fix this | ||
| 190 | */ | 189 | */ |
| 191 | sortparallel_moves(tsol[r].nmoves, tsol[r].moves); | 190 | sortparallel_moves(tsol[r].nmoves, tsol[r].moves); |
| 192 | 191 | ||
diff --git a/src/solvers/tables_types_macros.h b/src/solvers/tables_types_macros.h index 3db2d25..16e1346 100644 --- a/src/solvers/tables_types_macros.h +++ b/src/solvers/tables_types_macros.h | |||
| @@ -26,7 +26,7 @@ typedef struct { | |||
| 26 | uint64_t type; | 26 | uint64_t type; |
| 27 | uint64_t infosize; | 27 | uint64_t infosize; |
| 28 | uint64_t fullsize; | 28 | uint64_t fullsize; |
| 29 | uint64_t hash; | 29 | uint64_t hash; /* Currently unused */ |
| 30 | uint64_t entries; | 30 | uint64_t entries; |
| 31 | uint64_t classes; /* Used only by cocsepdata, for now */ | 31 | uint64_t classes; /* Used only by cocsepdata, for now */ |
| 32 | uint64_t next; | 32 | uint64_t next; |
