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

Document enc_type

Browse source 
No functional change.
This commit is contained in:
lucasart 2016-04-24 07:46:34 +08:00 • committed by Marco Costalba
parent 63b39c5bff
commit eb484823d7
1 changed files with 30 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
src/syzygy/tbprobe.cpp
View file

@ -84,7 +84,7 @@ struct TBEntry_piece {
uint8_t num; uint8_t num;
uint8_t symmetric; uint8_t symmetric;
uint8_t has_pawns; uint8_t has_pawns;
uint8_t enc_type; uint8_t hasUniquePieces;
PairsData *precomp[2]; PairsData *precomp[2];
int factor[2][TBPIECES]; int factor[2][TBPIECES];
uint8_t pieces[2][TBPIECES]; uint8_t pieces[2][TBPIECES];
@ -116,7 +116,7 @@ struct DTZEntry_piece {
uint8_t num; uint8_t num;
uint8_t symmetric; uint8_t symmetric;
uint8_t has_pawns; uint8_t has_pawns;
uint8_t enc_type; uint8_t hasUniquePieces;
PairsData *precomp; PairsData *precomp;
int factor[TBPIECES]; int factor[TBPIECES];
uint8_t pieces[TBPIECES]; uint8_t pieces[TBPIECES];
@ -627,12 +627,11 @@ void HashTable::insert(const std::vector<PieceType>& pieces)
+ (popcount(pos.pieces(BLACK, pt)) == 1); + (popcount(pos.pieces(BLACK, pt)) == 1);
if (uniquePieces >= 3) if (uniquePieces >= 3)
ptr->enc_type = 0; ptr->hasUniquePieces = 1;
else { else {
// W_KING and B_KING are the only unique pieces // No unique pieces, other than W_KING and B_KING
assert(uniquePieces == 2); assert(uniquePieces == 2);
ptr->hasUniquePieces = 0;
ptr->enc_type = 2;
} }
entry = (TBEntry*)ptr; entry = (TBEntry*)ptr;
@ -669,13 +668,12 @@ uint64_t encode_piece(TBEntry_piece* ptr, uint8_t* norm, int* pos, int* factor)
if (Offdiag[pos[i]]) if (Offdiag[pos[i]])
break; break;
if (i < (ptr->enc_type == 0 ? 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] = Flipdiag[pos[i]];
if (ptr->enc_type == 0) { 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
i = pos[1] > pos[0]; i = pos[1] > pos[0];
int j = (pos[2] > pos[0]) + (pos[2] > pos[1]); int j = (pos[2] > pos[0]) + (pos[2] > pos[1]);
@ -690,9 +688,7 @@ uint64_t encode_piece(TBEntry_piece* ptr, uint8_t* norm, int* pos, int* factor)
i = 3; i = 3;
} else { } else {
// The only unique pieces are W_KING and B_KING assert(!ptr->hasUniquePieces);
assert(ptr->enc_type == 2);
idx = KK_idx[Triangle[pos[0]]][pos[1]]; idx = KK_idx[Triangle[pos[0]]][pos[1]];
i = 2; i = 2;
} }
@ -804,12 +800,12 @@ uint64_t encode_pawn(TBEntry_pawn *ptr, uint8_t *norm, int *pos, int *factor)
// place k like pieces on n squares // place k like pieces on n squares
int subfactor(int k, int n) int subfactor(int k, int n)
{ {
int i, f, l; assert(n > 0 && k > 0 && k <= n);
f = n; int f = n;
l = 1; int l = 1;
for (i = 1; i < k; ++i) { for (int i = 1; i < k; ++i) {
f *= n - i; f *= n - i;
l *= i + 1; l *= i + 1;
} }
@ -817,22 +813,17 @@ int subfactor(int k, int n)
return f / l; return f / l;
} }
uint64_t calc_factors_piece(int *factor, int num, int order, uint8_t *norm, uint8_t enc_type) uint64_t calc_factors_piece(int *factor, int num, int order, uint8_t *norm, uint8_t hasUniquePieces)
{ {
int i, k, n; int n = 64 - norm[0];
uint64_t f; uint64_t f = 1;
static int pivfac[] = { 31332, 0, 462 };
n = 64 - norm[0]; for (int i = norm[0], k = 0; i < num || k == order; ++k) {
f = 1;
for (i = norm[0], k = 0; i < num || k == order; ++k) {
if (k == order) { if (k == order) {
factor[0] = (int)(f); factor[0] = (int)f;
f *= pivfac[enc_type]; f *= hasUniquePieces ? 31332 : 462;
} else { } else {
factor[i] = (int)(f); factor[i] = (int)f;
f *= subfactor(norm[i], n); f *= subfactor(norm[i], n);
n -= norm[i]; n -= norm[i];
i += norm[i]; i += norm[i];
@ -844,18 +835,15 @@ uint64_t calc_factors_piece(int *factor, int num, int order, uint8_t *norm, uint
uint64_t calc_factors_pawn(int *factor, int num, int order, int order2, uint8_t *norm, int file) uint64_t calc_factors_pawn(int *factor, int num, int order, int order2, uint8_t *norm, int file)
{ {
int i, k, n; int i = norm[0];
uint64_t f;
i = norm[0]; if (order2 < 0x0f)
i += norm[i];
if (order2 < 0x0f) i += norm[i]; int n = 64 - i;
uint64_t f = 1;
n = 64 - i; for (int k = 0; i < num || k == order || k == order2; ++k) {
f = 1;
for (k = 0; i < num || k == order || k == order2; ++k) {
if (k == order) { if (k == order) {
factor[0] = (int)(f); factor[0] = (int)(f);
f *= Pfactor[norm[0] - 1][file]; f *= Pfactor[norm[0] - 1][file];
@ -880,7 +868,7 @@ void set_norm_piece(TBEntry_piece *ptr, uint8_t *norm, uint8_t *pieces)
for (i = 0; i < ptr->num; ++i) for (i = 0; i < ptr->num; ++i)
norm[i] = 0; norm[i] = 0;
norm[0] = ptr->enc_type == 0 ? 3 : 2; norm[0] = ptr->hasUniquePieces ? 3 : 2;
for (i = norm[0]; i < ptr->num; i += norm[i]) for (i = norm[0]; i < ptr->num; i += norm[i])
for (j = i; j < ptr->num && pieces[j] == pieces[i]; ++j) for (j = i; j < ptr->num && pieces[j] == pieces[i]; ++j)
@ -913,14 +901,14 @@ void setup_pieces_piece(TBEntry_piece *ptr, unsigned char *data, uint64_t *tb_si
order = data[0] & 0x0f; order = data[0] & 0x0f;
set_norm_piece(ptr, ptr->norm[0], ptr->pieces[0]); set_norm_piece(ptr, ptr->norm[0], ptr->pieces[0]);
tb_size[0] = calc_factors_piece(ptr->factor[0], ptr->num, order, ptr->norm[0], ptr->enc_type); tb_size[0] = calc_factors_piece(ptr->factor[0], ptr->num, order, ptr->norm[0], ptr->hasUniquePieces);
for (i = 0; i < ptr->num; ++i) for (i = 0; i < ptr->num; ++i)
ptr->pieces[1][i] = uint8_t(data[i + 1] >> 4); ptr->pieces[1][i] = uint8_t(data[i + 1] >> 4);
order = data[0] >> 4; order = data[0] >> 4;
set_norm_piece(ptr, ptr->norm[1], ptr->pieces[1]); set_norm_piece(ptr, ptr->norm[1], ptr->pieces[1]);
tb_size[1] = calc_factors_piece(ptr->factor[1], ptr->num, order, ptr->norm[1], ptr->enc_type); tb_size[1] = calc_factors_piece(ptr->factor[1], ptr->num, order, ptr->norm[1], ptr->hasUniquePieces);
} }
void setup_pieces_piece_dtz(DTZEntry_piece *ptr, unsigned char *data, uint64_t *tb_size) void setup_pieces_piece_dtz(DTZEntry_piece *ptr, unsigned char *data, uint64_t *tb_size)
@ -933,7 +921,7 @@ void setup_pieces_piece_dtz(DTZEntry_piece *ptr, unsigned char *data, uint64_t *
order = data[0] & 0x0f; order = data[0] & 0x0f;
set_norm_piece((TBEntry_piece *)ptr, ptr->norm, ptr->pieces); set_norm_piece((TBEntry_piece *)ptr, ptr->norm, ptr->pieces);
tb_size[0] = calc_factors_piece(ptr->factor, ptr->num, order, ptr->norm, ptr->enc_type); tb_size[0] = calc_factors_piece(ptr->factor, ptr->num, order, ptr->norm, ptr->hasUniquePieces);
} }
void setup_pieces_pawn(TBEntry_pawn *ptr, unsigned char *data, uint64_t *tb_size, int f) void setup_pieces_pawn(TBEntry_pawn *ptr, unsigned char *data, uint64_t *tb_size, int f)
@ -1442,7 +1430,7 @@ void load_dtz_table(const std::string& fname, uint64_t key1, uint64_t key2)
entry->pawns[1] = ((TBEntry_pawn *)ptr)->pawns[1]; entry->pawns[1] = ((TBEntry_pawn *)ptr)->pawns[1];
} else { } else {
DTZEntry_piece *entry = (DTZEntry_piece *)ptr3; DTZEntry_piece *entry = (DTZEntry_piece *)ptr3;
entry->enc_type = ((TBEntry_piece *)ptr)->enc_type; entry->hasUniquePieces = ((TBEntry_piece *)ptr)->hasUniquePieces;
} }
if (!init_table_dtz(ptr3)) if (!init_table_dtz(ptr3))