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

Add WDLEntry constructor

Browse source
This commit is contained in:
Marco Costalba 2016-04-26 09:45:41 +02:00
parent bb9d42f425
commit 3104915cd1
1 changed files with 42 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
src/syzygy/tbprobe.cpp
View file

@ -96,7 +96,8 @@ struct WDLEntry {
WDLPawn pawn; WDLPawn pawn;
}; };
~WDLEntry(); WDLEntry(const Position& pos, Key keys[]);
~WDLEntry();
}; };
struct DTZPiece { struct DTZPiece {
@ -472,6 +473,39 @@ public:
} }
}; };
WDLEntry::WDLEntry(const Position& pos, Key keys[])
{
key = keys[WHITE];
ready = 0;
num = pos.count<ALL_PIECES>(WHITE) + pos.count<ALL_PIECES>(BLACK);
symmetric = (keys[WHITE] == keys[BLACK]);
has_pawns = pos.count<PAWN>(WHITE) + pos.count<PAWN>(BLACK);
if (has_pawns) {
// FIXME: What it means this one?
bool c = ( !pos.count<PAWN>(BLACK)
|| ( pos.count<PAWN>(WHITE)
&& pos.count<PAWN>(BLACK) >= pos.count<PAWN>(WHITE)));
pawn.pawns[0] = pos.count<PAWN>(c ? WHITE : BLACK);
pawn.pawns[1] = pos.count<PAWN>(c ? BLACK : WHITE);
} else {
int uniquePieces = 0;
for (PieceType pt = PAWN; pt <= KING; ++pt)
uniquePieces += (popcount(pos.pieces(WHITE, pt)) == 1)
+ (popcount(pos.pieces(BLACK, pt)) == 1);
if (uniquePieces >= 3)
piece.hasUniquePieces = 1;
else {
// No unique pieces, other than W_KING and B_KING
assert(uniquePieces == 2);
piece.hasUniquePieces = 0;
}
}
}
WDLEntry::~WDLEntry() WDLEntry::~WDLEntry()
{ {
TBFile::unmap(data, mapping); TBFile::unmap(data, mapping);
@ -530,53 +564,16 @@ void HashTable::insert(const std::vector<PieceType>& pieces)
f.close(); f.close();
pos.set(code, WHITE, &st); if (int(pieces.size()) > Tablebases::MaxCardinality)
Tablebases::MaxCardinality = pieces.size();
int num = pos.count<ALL_PIECES>(WHITE) + pos.count<ALL_PIECES>(BLACK); Key keys[] = { pos.set(code, WHITE, &st).material_key(),
bool hasPawns = pos.count<PAWN>(WHITE) + pos.count<PAWN>(BLACK); pos.set(code, BLACK, &st).material_key() };
if (num > Tablebases::MaxCardinality) WDLTable.push_back(WDLEntry(pos.set(code, WHITE, &st), keys));
Tablebases::MaxCardinality = num;
WDLTable.push_back(WDLEntry()); insert(keys[WHITE], &WDLTable.back());
WDLEntry* entry = &WDLTable.back(); insert(keys[BLACK], &WDLTable.back());
if (hasPawns) {
// FIXME: What it means this one?
bool c = ( !pos.count<PAWN>(BLACK)
|| ( pos.count<PAWN>(WHITE)
&& pos.count<PAWN>(BLACK) >= pos.count<PAWN>(WHITE)));
entry->pawn.pawns[0] = pos.count<PAWN>(c ? WHITE : BLACK);
entry->pawn.pawns[1] = pos.count<PAWN>(c ? BLACK : WHITE);
} else {
int uniquePieces = 0;
for (PieceType pt = PAWN; pt <= KING; ++pt)
uniquePieces += (popcount(pos.pieces(WHITE, pt)) == 1)
+ (popcount(pos.pieces(BLACK, pt)) == 1);
if (uniquePieces >= 3)
entry->piece.hasUniquePieces = 1;
else {
// No unique pieces, other than W_KING and B_KING
assert(uniquePieces == 2);
entry->piece.hasUniquePieces = 0;
}
}
Key key1 = pos.material_key();
Key key2 = pos.set(code, BLACK, &st).material_key();
entry->key = key1;
entry->ready = 0;
entry->num = num;
entry->symmetric = (key1 == key2);
entry->has_pawns = hasPawns;
insert(key1, entry);
insert(key2, entry);
} }
uint64_t encode_piece(uint8_t hasUniquePieces, uint8_t* norm, Square* pos, int* factor, int n) uint64_t encode_piece(uint8_t hasUniquePieces, uint8_t* norm, Square* pos, int* factor, int n)