kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-05-01 09:13:08 +00:00
Code Issues Releases Wiki Activity

Use Square instead of int

Browse source 
No functional change.
This commit is contained in:
lucasart 2016-04-24 13:19:51 +08:00 • committed by Marco Costalba
parent 3771db79eb
commit d434fc465b
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/syzygy/tbprobe.cpp
View file

@ -51,6 +51,9 @@ typedef uint64_t base_t;
inline WDLScore operator-(WDLScore d) { return WDLScore(-int(d)); } inline WDLScore operator-(WDLScore d) { return WDLScore(-int(d)); }
inline WDLScore operator+(WDLScore d1, WDLScore d2) { return WDLScore(int(d1) + int(d2)); } inline WDLScore operator+(WDLScore d1, WDLScore d2) { return WDLScore(int(d1) + int(d2)); }
inline Square operator^=(Square& s, int i) { return s = Square(int(s) ^ i); }
inline Square operator^(Square s, int i) { return Square(int(s) ^ i); }
struct PairsData { struct PairsData {
char *indextable; char *indextable;
uint16_t *sizetable; uint16_t *sizetable;
@ -172,7 +175,7 @@ const uint8_t Triangle[] = {
6, 0, 1, 2, 2, 1, 0, 6 6, 0, 1, 2, 2, 1, 0, 6
}; };
const uint8_t Flipdiag[] = { const int Flipdiag[] = {
0, 8, 16, 24, 32, 40, 48, 56, 0, 8, 16, 24, 32, 40, 48, 56,
1, 9, 17, 25, 33, 41, 49, 57, 1, 9, 17, 25, 33, 41, 49, 57,
2, 10, 18, 26, 34, 42, 50, 58, 2, 10, 18, 26, 34, 42, 50, 58,
@ -521,8 +524,7 @@ std::string file_name(const Position& pos, bool mirror)
{ {
std::string w, b; std::string w, b;
for (PieceType pt = KING; pt >= PAWN; --pt) for (PieceType pt = KING; pt >= PAWN; --pt) {
{
w += std::string(popcount(pos.pieces(WHITE, pt)), PieceChar[pt]); w += std::string(popcount(pos.pieces(WHITE, pt)), PieceChar[pt]);
b += std::string(popcount(pos.pieces(BLACK, pt)), PieceChar[pt]); b += std::string(popcount(pos.pieces(BLACK, pt)), PieceChar[pt]);
} }
@ -644,7 +646,7 @@ void HashTable::insert(const std::vector<PieceType>& pieces)
insert(key2, entry); insert(key2, entry);
} }
uint64_t encode_piece(TBEntry_piece* ptr, uint8_t* norm, int* pos, int* factor) uint64_t encode_piece(TBEntry_piece* ptr, uint8_t* norm, Square* pos, int* factor)
{ {
uint64_t idx; uint64_t idx;
int i; int i;
@ -664,7 +666,7 @@ uint64_t encode_piece(TBEntry_piece* ptr, uint8_t* norm, int* pos, int* factor)
if (i < (ptr->hasUniquePieces ? 3 : 2) && Offdiag[pos[i]] > 0) if (i < (ptr->hasUniquePieces ? 3 : 2) && Offdiag[pos[i]] > 0)
for (i = 0; i < n; ++i) for (i = 0; i < n; ++i)
pos[i] = Flipdiag[pos[i]]; pos[i] = (Square)Flipdiag[pos[i]];
if (ptr->hasUniquePieces) { if (ptr->hasUniquePieces) {
// There are unique pieces other than W_KING and B_KING // There are unique pieces other than W_KING and B_KING
@ -713,7 +715,7 @@ uint64_t encode_piece(TBEntry_piece* ptr, uint8_t* norm, int* pos, int* factor)
} }
// determine file of leftmost pawn and sort pawns // determine file of leftmost pawn and sort pawns
File pawn_file(TBEntry_pawn *ptr, int *pos) File pawn_file(TBEntry_pawn *ptr, Square *pos)
{ {
static const File file_to_file[] = { static const File file_to_file[] = {
FILE_A, FILE_B, FILE_C, FILE_D, FILE_D, FILE_C, FILE_B, FILE_A FILE_A, FILE_B, FILE_C, FILE_D, FILE_D, FILE_C, FILE_B, FILE_A
@ -726,7 +728,7 @@ File pawn_file(TBEntry_pawn *ptr, int *pos)
return file_to_file[pos[0] & 7]; return file_to_file[pos[0] & 7];
} }
uint64_t encode_pawn(TBEntry_pawn *ptr, uint8_t *norm, int *pos, int *factor) uint64_t encode_pawn(TBEntry_pawn *ptr, uint8_t *norm, Square *pos, int *factor)
{ {
int i; int i;
int n = ptr->num; int n = ptr->num;
@ -1457,7 +1459,7 @@ WDLScore probe_wdl_table(Position& pos, int* success)
} }
} }
int squares[TBPIECES]; Square squares[TBPIECES];
int bside, smirror, cmirror; int bside, smirror, cmirror;
assert(key == ptr->key || !ptr->symmetric); assert(key == ptr->key || !ptr->symmetric);
@ -1522,7 +1524,7 @@ int probe_dtz_table(Position& pos, int wdl, int *success)
{ {
uint64_t idx; uint64_t idx;
int i, res; int i, res;
int p[TBPIECES]; Square squares[TBPIECES];
Key key = pos.material_key(); Key key = pos.material_key();
@ -1597,11 +1599,11 @@ int probe_dtz_table(Position& pos, int wdl, int *success)
(PieceType)(pc[i] & 7)); (PieceType)(pc[i] & 7));
do { do {
p[i++] = pop_lsb(&bb); squares[i++] = pop_lsb(&bb);
} while (bb); } while (bb);
} }
idx = encode_piece((TBEntry_piece *)entry, entry->norm, p, entry->factor); idx = encode_piece((TBEntry_piece *)entry, entry->norm, squares, entry->factor);
res = decompress_pairs(entry->precomp, idx); res = decompress_pairs(entry->precomp, idx);
if (entry->flags & 2) if (entry->flags & 2)
@ -1616,10 +1618,10 @@ int probe_dtz_table(Position& pos, int wdl, int *success)
i = 0; i = 0;
do { do {
p[i++] = pop_lsb(&bb) ^ mirror; squares[i++] = pop_lsb(&bb) ^ mirror;
} while (bb); } while (bb);
File f = pawn_file((TBEntry_pawn *)entry, p); File f = pawn_file((TBEntry_pawn *)entry, squares);
if ((entry->flags[f] & 1) != bside) { if ((entry->flags[f] & 1) != bside) {
*success = -1; *success = -1;
@ -1633,11 +1635,11 @@ int probe_dtz_table(Position& pos, int wdl, int *success)
(PieceType)(pc[i] & 7)); (PieceType)(pc[i] & 7));
do { do {
p[i++] = pop_lsb(&bb) ^ mirror; squares[i++] = pop_lsb(&bb) ^ mirror;
} while (bb); } while (bb);
} }
idx = encode_pawn((TBEntry_pawn *)entry, entry->file[f].norm, p, entry->file[f].factor); idx = encode_pawn((TBEntry_pawn *)entry, entry->file[f].norm, squares, entry->file[f].factor);
res = decompress_pairs(entry->file[f].precomp, idx); res = decompress_pairs(entry->file[f].precomp, idx);
if (entry->flags[f] & 2) if (entry->flags[f] & 2)