organ
/
Sanmill
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Zobrist: 每次换边时异或 side 而不用 Key 的特定位标记轮到谁走 

自对弈棋谱不变。
This commit is contained in:
Calcitem 2020-10-01 11:04:15 +08:00
parent 67da163100
commit 0e54688853
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/position.cpp
View File

@ -39,6 +39,7 @@ using std::string;
namespace Zobrist namespace Zobrist
{ {
Key psq[PIECE_TYPE_NB][SQUARE_NB]; Key psq[PIECE_TYPE_NB][SQUARE_NB];
Key side;
} }
namespace namespace
@ -153,6 +154,8 @@ void Position::init()
for (Square s = SQ_0; s < SQUARE_NB; ++s) for (Square s = SQ_0; s < SQUARE_NB; ++s)
Zobrist::psq[pt][s] = rng.rand<Key>(); Zobrist::psq[pt][s] = rng.rand<Key>();
Zobrist::side = rng.rand<Key>();
// Prepare the cuckoo tables // Prepare the cuckoo tables
std::memset(cuckoo, 0, sizeof(cuckoo)); std::memset(cuckoo, 0, sizeof(cuckoo));
std::memset(cuckooMove, 0, sizeof(cuckooMove)); std::memset(cuckooMove, 0, sizeof(cuckooMove));
@ -1226,6 +1229,7 @@ inline void Position::set_side_to_move(Color c)
inline void Position::change_side_to_move() inline void Position::change_side_to_move()
{ {
set_side_to_move(~sideToMove); set_side_to_move(~sideToMove);
st->key ^= Zobrist::side;
} }
inline Key Position::update_key(Square s) inline Key Position::update_key(Square s)
@ -1255,9 +1259,11 @@ Key Position::update_key_misc()
st->key = st->key << KEY_MISC_BIT >> KEY_MISC_BIT; st->key = st->key << KEY_MISC_BIT >> KEY_MISC_BIT;
Key hi = 0; Key hi = 0;
#if 0
if (sideToMove == WHITE) { if (sideToMove == WHITE) {
hi |= 1U; hi |= 1U;
} }
#endif
if (action == ACTION_REMOVE) { if (action == ACTION_REMOVE) {
hi |= 1U << 1; hi |= 1U << 1;
@ -1278,23 +1284,25 @@ Key Position::next_primary_key(Move m)
MoveType mt = type_of(m); MoveType mt = type_of(m);
if (mt == MOVETYPE_REMOVE) { if (mt == MOVETYPE_REMOVE) {
int pieceType = ~sideToMove; npKey ^= Zobrist::psq[~sideToMove][s];
npKey ^= Zobrist::psq[pieceType][s];
if (rule.hasBannedLocations && phase == PHASE_PLACING) { if (rule.hasBannedLocations && phase == PHASE_PLACING) {
npKey ^= Zobrist::psq[BAN][s]; npKey ^= Zobrist::psq[BAN][s];
} }
return npKey; goto out;
} }
int pieceType = sideToMove; npKey ^= Zobrist::psq[sideToMove][s];
npKey ^= Zobrist::psq[pieceType][s];
if (mt == MOVETYPE_MOVE) { if (mt == MOVETYPE_MOVE) {
npKey ^= Zobrist::psq[pieceType][from_sq(m)]; npKey ^= Zobrist::psq[sideToMove][from_sq(m)];
} }
out:
// Note: Guess only, maybe side is not changed actually
npKey ^= Zobrist::side;
return npKey; return npKey;
} }