X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.cpp;h=0a88c9f1ba37b07a3738800fea6d11f0c003ec09;hp=7e29f5065803cc7b7d801f6935dd15903db27aef;hb=893a08a8c2eac3c2e7d2216b51811cc7378e2239;hpb=eb07775583c39893bc6eb65a40b5f62a7799deee
diff --git a/src/pawns.cpp b/src/pawns.cpp
index 7e29f506..0a88c9f1 100644
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@ -18,6 +18,7 @@
along with this program. If not, see .
*/
+#include
#include
#include "bitboard.h"
@@ -79,8 +80,6 @@ namespace {
e->passedPawns[Us] = e->pawnAttacksSpan[Us] = e->weakUnopposed[Us] = 0;
e->kingSquares[Us] = SQ_NONE;
e->pawnAttacks[Us] = pawn_attacks_bb(ourPawns);
- e->pawnsOnSquares[Us][BLACK] = popcount(ourPawns & DarkSquares);
- e->pawnsOnSquares[Us][WHITE] = pos.count(Us) - e->pawnsOnSquares[Us][BLACK];
// Loop through all pawns of the current color and score each pawn
while ((s = *pl++) != SQ_NONE)
@@ -164,7 +163,6 @@ Entry* probe(const Position& pos) {
e->key = key;
e->scores[WHITE] = evaluate(pos, e);
e->scores[BLACK] = evaluate(pos, e);
- e->passedCount= popcount(e->passedPawns[WHITE] | e->passedPawns[BLACK]);
return e;
}
@@ -178,14 +176,14 @@ Value Entry::evaluate_shelter(const Position& pos, Square ksq) {
constexpr Color Them = (Us == WHITE ? BLACK : WHITE);
constexpr Direction Down = (Us == WHITE ? SOUTH : NORTH);
- constexpr Bitboard BlockRanks = (Us == WHITE ? Rank1BB | Rank2BB : Rank8BB | Rank7BB);
+ constexpr Bitboard BlockSquares = (Rank1BB | Rank2BB | Rank7BB | Rank8BB)
+ & (FileABB | FileHBB);
Bitboard b = pos.pieces(PAWN) & ~forward_ranks_bb(Them, ksq);
Bitboard ourPawns = b & pos.pieces(Us);
Bitboard theirPawns = b & pos.pieces(Them);
- Value safety = (shift(theirPawns) & (FileABB | FileHBB) & BlockRanks & ksq) ?
- Value(374) : Value(5);
+ Value safety = (shift(theirPawns) & BlockSquares & ksq) ? Value(374) : Value(5);
File center = clamp(file_of(ksq), FILE_B, FILE_G);
for (File f = File(center - 1); f <= File(center + 1); ++f)
@@ -215,11 +213,15 @@ Score Entry::do_king_safety(const Position& pos) {
Square ksq = pos.square(Us);
kingSquares[Us] = ksq;
castlingRights[Us] = pos.castling_rights(Us);
- int minKingPawnDistance = 0;
Bitboard pawns = pos.pieces(Us, PAWN);
- if (pawns)
- while (!(DistanceRingBB[ksq][++minKingPawnDistance] & pawns)) {}
+ int minPawnDist = pawns ? 8 : 0;
+
+ if (pawns & PseudoAttacks[KING][ksq])
+ minPawnDist = 1;
+
+ else while (pawns)
+ minPawnDist = std::min(minPawnDist, distance(ksq, pop_lsb(&pawns)));
Value bonus = evaluate_shelter(pos, ksq);
@@ -230,7 +232,7 @@ Score Entry::do_king_safety(const Position& pos) {
if (pos.can_castle(Us | QUEEN_SIDE))
bonus = std::max(bonus, evaluate_shelter(pos, relative_square(Us, SQ_C1)));
- return make_score(bonus, -16 * minKingPawnDistance);
+ return make_score(bonus, -16 * minPawnDist);
}
// Explicit template instantiation