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

position: refactor: 移动 key_after 函数位置

This commit is contained in:
Calcitem 2020-10-01 19:33:29 +08:00
parent 4294bbf32b
commit bb72c31a15
1 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/position.cpp
View File

@ -572,6 +572,38 @@ void Position::undo_null_move()
change_side_to_move(); change_side_to_move();
} }
/// Position::key_after() computes the new hash key after the given move. Needed
/// for speculative prefetch. It doesn't recognize special moves like (need remove)
Key Position::key_after(Move m) const
{
Key k = st->key;
Square s = static_cast<Square>(to_sq(m));;
MoveType mt = type_of(m);
if (mt == MOVETYPE_REMOVE) {
k ^= Zobrist::psq[~side_to_move()][s];
if (rule.hasBannedLocations && phase == PHASE_PLACING) {
k ^= Zobrist::psq[BAN][s];
}
goto out;
}
k ^= Zobrist::psq[side_to_move()][s];
if (mt == MOVETYPE_MOVE) {
k ^= Zobrist::psq[side_to_move()][from_sq(m)];
}
out:
k ^= Zobrist::side;
return k;
}
/// Position::flip() flips position with the white and black sides reversed. This /// Position::flip() flips position with the white and black sides reversed. This
/// is only useful for debugging e.g. for finding evaluation symmetry bugs. /// is only useful for debugging e.g. for finding evaluation symmetry bugs.
@ -938,7 +970,7 @@ bool Position::remove_piece(Square s, bool updateCmdlist)
return false; return false;
// if piece is not their // if piece is not their
if (!(make_piece(them) & board[s])) if (!(make_piece(~side_to_move()) & board[s]))
return false; return false;
if (!rule.allowRemovePieceInMill && if (!rule.allowRemovePieceInMill &&
@ -1215,9 +1247,9 @@ void Position::remove_ban_stones()
for (int r = 0; r < RANK_NB; r++) { for (int r = 0; r < RANK_NB; r++) {
s = static_cast<Square>(f * RANK_NB + r); s = static_cast<Square>(f * RANK_NB + r);
if (board[s]== BAN_STONE) { if (board[s] == BAN_STONE) {
revert_key(s); revert_key(s);
board[s]= NO_PIECE; board[s] = NO_PIECE;
byTypeBB[ALL_PIECES] ^= s; // Need to remove? byTypeBB[ALL_PIECES] ^= s; // Need to remove?
} }
} }
@ -1265,36 +1297,6 @@ Key Position::update_key_misc()
return st->key; return st->key;
} }
/// Position::key_after() computes the new hash key after the given move. Needed
/// for speculative prefetch. It doesn't recognize special moves like (need remove)
Key Position::key_after(Move m) const
{
Key k = st->key;
Square s = static_cast<Square>(to_sq(m));;
MoveType mt = type_of(m);
if (mt == MOVETYPE_REMOVE) {
k ^= Zobrist::psq[~side_to_move()][s];
if (rule.hasBannedLocations && phase == PHASE_PLACING) {
k ^= Zobrist::psq[BAN][s];
}
goto out;
}
k ^= Zobrist::psq[side_to_move()][s];
if (mt == MOVETYPE_MOVE) {
k ^= Zobrist::psq[side_to_move()][from_sq(m)];
}
out:
k ^= Zobrist::side;
return k;
}
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/* /*