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-2016 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
+ Copyright (C) 2015-2017 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
/// Position::set() is an overload to initialize the position object with
-/// the given endgame code string like "KBPKN". It is manily an helper to
+/// the given endgame code string like "KBPKN". It is mainly a helper to
/// get the material key out of an endgame code. Position is not playable,
/// indeed is even not guaranteed to be legal.
// Update pawn hash key and prefetch access to pawnsTable
st->pawnKey ^= Zobrist::psq[pc][from] ^ Zobrist::psq[pc][to];
- prefetch(thisThread->pawnsTable[st->pawnKey]);
+ prefetch2(thisThread->pawnsTable[st->pawnKey]);
// Reset rule 50 draw counter
st->rule50 = 0;
/// Position::is_draw() tests whether the position is drawn by 50-move rule
/// or by repetition. It does not detect stalemates.
-bool Position::is_draw() const {
+bool Position::is_draw(int ply) const {
if (st->rule50 > 99 && (!checkers() || MoveList<LEGAL>(*this).size()))
return true;
- int e = std::min(st->rule50, st->pliesFromNull);
+ int end = std::min(st->rule50, st->pliesFromNull);
- if (e < 4)
+ if (end < 4)
return false;
StateInfo* stp = st->previous->previous;
+ int cnt = 0;
- do {
+ for (int i = 4; i <= end; i += 2)
+ {
stp = stp->previous->previous;
- if (stp->key == st->key)
- return true; // Draw at first repetition
-
- } while ((e -= 2) >= 4);
+ // At root position ply is 1, so return a draw score if a position
+ // repeats once earlier but after or at the root, or repeats twice
+ // strictly before the root.
+ if ( stp->key == st->key
+ && ++cnt + (ply - i > 0) == 2)
+ return true;
+ }
return false;
}
}
if (step == Lists)
+ {
for (Piece pc : Pieces)
{
if (pieceCount[pc] != popcount(pieces(color_of(pc), type_of(pc))))
if (board[pieceList[pc][i]] != pc || index[pieceList[pc][i]] != i)
return false;
}
+ if (pieceCount[PAWN] > FILE_NB)
+ return false;
+ }
if (step == Castling)
for (Color c = WHITE; c <= BLACK; ++c)