kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-07-11 19:49:14 +00:00
Code Issues Releases Wiki Activity

Get rid of get_key()

Browse source 
And also of namespace Zobrist: there is no more need
for TB code to look at Position's internals.
This commit is contained in:
Marco Costalba 2016-04-24 21:35:00 +02:00
parent fe6ba8d805
commit 4119955044
1 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/syzygy/tbprobe.cpp
View file

@ -42,10 +42,6 @@ using namespace Tablebases;
int Tablebases::MaxCardinality = 0; int Tablebases::MaxCardinality = 0;
namespace Zobrist {
extern Key psq[COLOR_NB][PIECE_TYPE_NB][SQUARE_NB];
}
namespace { namespace {
typedef uint64_t base_t; typedef uint64_t base_t;
@ -488,20 +484,6 @@ public:
} }
}; };
// Given a position, produce a 64-bit material signature key. If the engine
// supports such a key, it should equal the engine's key.
Key get_key(const Position& pos, bool mirror)
{
Key key = 0;
for (Color c = WHITE; c <= BLACK; ++c)
for (PieceType pt = PAWN; pt <= KING; ++pt)
for (int j = popcount(pos.pieces(Color(c ^ mirror), pt)); j > 0; --j)
key ^= Zobrist::psq[c][pt][j - 1];
return key;
}
// Given a position with 6 or fewer pieces, produce a text string // Given a position with 6 or fewer pieces, produce a text string
// of the form KQPvKRP, where "KQP" represents the white pieces if // of the form KQPvKRP, where "KQP" represents the white pieces if
// mirror == false and the black pieces if mirror == true. // mirror == false and the black pieces if mirror == true.
@ -1513,7 +1495,15 @@ int probe_dtz_table(const Position& pos, int wdl, int *success)
entry->symmetric = ptr->symmetric; entry->symmetric = ptr->symmetric;
entry->has_pawns = ptr->has_pawns; entry->has_pawns = ptr->has_pawns;
DTZEntry dtz = { get_key(pos, mirror), get_key(pos, !mirror), nullptr }; StateInfo st;
Position p;
std::string code = file_name(pos, mirror);
code.erase(code.find('v'), 1);
Key k1 = p.set(code, WHITE, &st).material_key();
Key k2 = p.set(code, BLACK, &st).material_key();
DTZEntry dtz = { k1, k2, nullptr };
if (!init_table_dtz(entry)) if (!init_table_dtz(entry))
free(entry); free(entry);