#include "bitcount.h"
#include "endgame.h"
-#include "pawns.h"
using std::string;
}
else
{
- wksq = flip(pos.king_square(BLACK));
- bksq = flip(pos.king_square(WHITE));
- wpsq = flip(pos.piece_list(BLACK, PAWN)[0]);
- stm = flip(pos.side_to_move());
+ wksq = ~pos.king_square(BLACK);
+ bksq = ~pos.king_square(WHITE);
+ wpsq = ~pos.piece_list(BLACK, PAWN)[0];
+ stm = ~pos.side_to_move();
}
if (file_of(wpsq) >= FILE_E)
if (strongerSide == BLACK)
{
- wksq = flip(wksq);
- wrsq = flip(wrsq);
- bksq = flip(bksq);
- bpsq = flip(bpsq);
+ wksq = ~wksq;
+ wrsq = ~wrsq;
+ bksq = ~bksq;
+ bpsq = ~bpsq;
}
Square queeningSq = make_square(file_of(bpsq), RANK_1);
result += Value(square_distance(bksq, nsq) * 32);
// Bonus for restricting the knight's mobility
- result += Value((8 - count_1s<CNT32_MAX15>(pos.attacks_from<KNIGHT>(nsq))) * 8);
+ result += Value((8 - popcount<Max15>(pos.attacks_from<KNIGHT>(nsq))) * 8);
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)
// pawn is on the left half of the board.
if (strongerSide == BLACK)
{
- wksq = flip(wksq);
- wrsq = flip(wrsq);
- wpsq = flip(wpsq);
- bksq = flip(bksq);
- brsq = flip(brsq);
+ wksq = ~wksq;
+ wrsq = ~wrsq;
+ wpsq = ~wpsq;
+ bksq = ~bksq;
+ brsq = ~brsq;
}
if (file_of(wpsq) > FILE_D)
{
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
if (strongerSide == BLACK)
{
- wksq = flip(wksq);
- bksq = flip(bksq);
- wpsq = flip(wpsq);
- stm = flip(stm);
+ wksq = ~wksq;
+ bksq = ~bksq;
+ wpsq = ~wpsq;
+ stm = ~stm;
}
if (file_of(wpsq) >= FILE_E)