#include "bitcount.h"
#include "endgame.h"
-#include "pawns.h"
+#include "movegen.h"
using std::string;
string fen = sides[0] + char('0' + int(8 - code.length()))
+ sides[1] + "/8/8/8/8/8/8/8 w - - 0 10";
- return Position(fen, false, 0).material_key();
+ return Position(fen, false, NULL).material_key();
}
template<typename M>
template<EndgameType E>
void Endgames::add(const string& code) {
- typedef typename eg_family<E>::type T;
-
- map((T*)0)[key(code, WHITE)] = new Endgame<E>(WHITE);
- map((T*)0)[key(code, BLACK)] = new Endgame<E>(BLACK);
+ map((Endgame<E>*)0)[key(code, WHITE)] = new Endgame<E>(WHITE);
+ map((Endgame<E>*)0)[key(code, BLACK)] = new Endgame<E>(BLACK);
}
assert(pos.non_pawn_material(weakerSide) == VALUE_ZERO);
assert(pos.piece_count(weakerSide, PAWN) == VALUE_ZERO);
+ // Stalemate detection with lone king
+ if ( pos.side_to_move() == weakerSide
+ && !pos.in_check()
+ && !MoveList<MV_LEGAL>(pos).size()) {
+ return VALUE_DRAW;
+ }
+
Square winnerKSq = pos.king_square(strongerSide);
Square loserKSq = pos.king_square(weakerSide);
if ( pos.piece_count(strongerSide, QUEEN)
|| pos.piece_count(strongerSide, ROOK)
- || pos.piece_count(strongerSide, BISHOP) > 1)
- // TODO: check for two equal-colored bishops!
- result += VALUE_KNOWN_WIN;
+ || pos.bishop_pair(strongerSide)) {
+ result += VALUE_KNOWN_WIN;
+ }
return strongerSide == pos.side_to_move() ? result : -result;
}
&& abs(file_of(kingSq) - pawnFile) <= 1)
{
// The bishop has the wrong color, and the defending king is on the
- // file of the pawn(s) or the neighboring file. Find the rank of the
+ // file of the pawn(s) or the adjacent file. Find the rank of the
// frontmost pawn.
Rank rank;
if (strongerSide == WHITE)
return SCALE_FACTOR_DRAW;
else
{
- Bitboard path = squares_in_front_of(strongerSide, pawnSq);
+ Bitboard path = forward_bb(strongerSide, pawnSq);
if (path & pos.pieces(KING, weakerSide))
return SCALE_FACTOR_DRAW;
return SCALE_FACTOR_NONE;
case 1:
- // Pawns on neighboring files. Draw if defender firmly controls the square
+ // Pawns on adjacent files. Draw if defender firmly controls the square
// in front of the frontmost pawn's path, and the square diagonally behind
// this square on the file of the other pawn.
if ( ksq == blockSq1