Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
- Copyright (C) 2015-2018 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2019 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
using std::string;
-namespace PSQT {
- extern Score psq[PIECE_NB][SQUARE_NB];
-}
-
namespace Zobrist {
Key psq[PIECE_NB][SQUARE_NB];
Zobrist::noPawns = rng.rand<Key>();
// Prepare the cuckoo tables
+ std::memset(cuckoo, 0, sizeof(cuckoo));
+ std::memset(cuckooMove, 0, sizeof(cuckooMove));
int count = 0;
for (Piece pc : Pieces)
for (Square s1 = SQ_A1; s1 <= SQ_H8; ++s1)
thisThread = th;
set_state(st);
- assert(pos_is_ok());
-
return *this;
}
si->key = si->materialKey = 0;
si->pawnKey = Zobrist::noPawns;
si->nonPawnMaterial[WHITE] = si->nonPawnMaterial[BLACK] = VALUE_ZERO;
- si->psq = SCORE_ZERO;
si->checkersBB = attackers_to(square<KING>(sideToMove)) & pieces(~sideToMove);
set_check_info(si);
Square s = pop_lsb(&b);
Piece pc = piece_on(s);
si->key ^= Zobrist::psq[pc][s];
- si->psq += PSQT::psq[pc][s];
}
if (si->epSquare != SQ_NONE)
Square rfrom, rto;
do_castling<true>(us, from, to, rfrom, rto);
- st->psq += PSQT::psq[captured][rto] - PSQT::psq[captured][rfrom];
k ^= Zobrist::psq[captured][rfrom] ^ Zobrist::psq[captured][rto];
captured = NO_PIECE;
}
st->materialKey ^= Zobrist::psq[captured][pieceCount[captured]];
prefetch(thisThread->materialTable[st->materialKey]);
- // Update incremental scores
- st->psq -= PSQT::psq[captured][capsq];
-
// Reset rule 50 counter
st->rule50 = 0;
}
st->materialKey ^= Zobrist::psq[promotion][pieceCount[promotion]-1]
^ Zobrist::psq[pc][pieceCount[pc]];
- // Update incremental score
- st->psq += PSQT::psq[promotion][to] - PSQT::psq[pc][to];
-
// Update material
st->nonPawnMaterial[us] += PieceValue[MG][promotion];
}
st->rule50 = 0;
}
- // Update incremental scores
- st->psq += PSQT::psq[pc][to] - PSQT::psq[pc][from];
-
// Set capture piece
st->capturedPiece = captured;
if (end < i)
return false;
- StateInfo* stp = st->previous->previous;
+ StateInfo* stp = stc->previous->previous;
do {
stp = stp->previous->previous;
|| (j = H2(moveKey), cuckoo[j] == moveKey))
{
Move move = cuckooMove[j];
- Square from = from_sq(move);
- Square to = to_sq(move);
+ Square s1 = from_sq(move);
+ Square s2 = to_sq(move);
- if (!(between_bb(from, to) & pieces()))
+ if (!(between_bb(s1, s2) & pieces()))
{
- // Take care to reverse the move in the no-progress case (opponent to move)
- if (empty(from))
- move = make_move(to, from);
+ // In the cuckoo table, both moves Rc1c5 and Rc5c1 are stored in the same
+ // location. We select the legal one by reversing the move variable if necessary.
+ if (empty(s1))
+ move = make_move(s2, s1);
if (ply > i)
return true;