X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.cpp;h=fece246b1c999a31611a8b8661b4e97d8e9520e2;hp=d05e8af0cd3cf6783410339c3bfff14ca5bf059a;hb=aecdbfc4a000c72fcc2642f54ce83967913a16ba;hpb=5ea984ac3515946d952bd3c9cfe8e8baef7cc85d
diff --git a/src/pawns.cpp b/src/pawns.cpp
index d05e8af0..fece246b 100644
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@ -17,6 +17,7 @@
along with this program. If not, see .
*/
+#include
#include
#include "bitboard.h"
@@ -62,15 +63,16 @@ namespace {
S(34,68), S(83,166), S(0, 0), S( 0, 0)
};
- // Weakness of our pawn shelter in front of the king indexed by [king pawn][rank]
- const Value ShelterWeakness[2][RANK_NB] =
- { { V(141), V(0), V(38), V(102), V(128), V(141), V(141) },
- { V( 61), V(0), V(16), V( 44), V( 56), V( 61), V( 61) } };
+ // Weakness of our pawn shelter in front of the king indexed by [rank]
+ const Value ShelterWeakness[RANK_NB] =
+ { V(100), V(0), V(27), V(73), V(92), V(101), V(101) };
- // Danger of enemy pawns moving toward our king indexed by [pawn blocked][rank]
- const Value StormDanger[2][RANK_NB] =
- { { V(26), V(0), V(128), V(51), V(26) },
- { V(13), V(0), V( 64), V(25), V(13) } };
+ // Danger of enemy pawns moving toward our king indexed by
+ // [no friendly pawn | pawn unblocked | pawn blocked][rank of enemy pawn]
+ const Value StormDanger[3][RANK_NB] = {
+ { V( 0), V(64), V(128), V(51), V(26) },
+ { V(26), V(32), V( 96), V(38), V(20) },
+ { V( 0), V( 0), V( 64), V(25), V(13) }};
// Max bonus for king safety. Corresponds to start position with all the pawns
// in front of the king and no enemy pawn on the horizont.
@@ -90,10 +92,9 @@ namespace {
Bitboard b;
Square s;
File f;
- Rank r;
bool passed, isolated, doubled, opposed, chain, backward, candidate;
Score value = SCORE_ZERO;
- const Square* pl = pos.piece_list(Us, PAWN);
+ const Square* pl = pos.list(Us);
Bitboard ourPawns = pos.pieces(Us, PAWN);
Bitboard theirPawns = pos.pieces(Them, PAWN);
@@ -102,8 +103,8 @@ namespace {
e->kingSquares[Us] = SQ_NONE;
e->semiopenFiles[Us] = 0xFF;
e->pawnAttacks[Us] = shift_bb(ourPawns) | shift_bb(ourPawns);
- e->pawnsOnSquares[Us][BLACK] = popcount(ourPawns & BlackSquares);
- e->pawnsOnSquares[Us][WHITE] = pos.piece_count(Us, PAWN) - e->pawnsOnSquares[Us][BLACK];
+ 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)
@@ -111,13 +112,12 @@ namespace {
assert(pos.piece_on(s) == make_piece(Us, PAWN));
f = file_of(s);
- r = rank_of(s);
// This file cannot be semi-open
e->semiopenFiles[Us] &= ~(1 << f);
// Our rank plus previous one. Used for chain detection
- b = rank_bb(r) | rank_bb(Us == WHITE ? r - Rank(1) : r + Rank(1));
+ b = rank_bb(s) | rank_bb(s - pawn_push(Us));
// Flag the pawn as passed, isolated, doubled or member of a pawn
// chain (but not the backward one).
@@ -127,15 +127,15 @@ namespace {
opposed = theirPawns & forward_bb(Us, s);
passed = !(theirPawns & passed_pawn_mask(Us, s));
- // Test for backward pawn
- backward = false;
-
+ // Test for backward pawn.
// If the pawn is passed, isolated, or member of a pawn chain it cannot
// be backward. If there are friendly pawns behind on adjacent files
// or if can capture an enemy pawn it cannot be backward either.
- if ( !(passed | isolated | chain)
- && !(ourPawns & attack_span_mask(Them, s))
- && !(pos.attacks_from(s, Us) & theirPawns))
+ if ( (passed | isolated | chain)
+ || (ourPawns & pawn_attack_span(Them, s))
+ || (pos.attacks_from(s, Us) & theirPawns))
+ backward = false;
+ else
{
// We now know that there are no friendly pawns beside or behind this
// pawn on adjacent files. We now check whether the pawn is
@@ -153,15 +153,15 @@ namespace {
backward = (b | shift_bb(b)) & theirPawns;
}
- assert(opposed | passed | (attack_span_mask(Us, s) & theirPawns));
+ assert(opposed | passed | (pawn_attack_span(Us, s) & theirPawns));
// A not passed pawn is a candidate to become passed if it is free to
// advance and if the number of friendly pawns beside or behind this
// pawn on adjacent files is higher or equal than the number of
// enemy pawns in the forward direction on the adjacent files.
candidate = !(opposed | passed | backward | isolated)
- && (b = attack_span_mask(Them, s + pawn_push(Us)) & ourPawns) != 0
- && popcount(b) >= popcount(attack_span_mask(Us, s) & theirPawns);
+ && (b = pawn_attack_span(Them, s + pawn_push(Us)) & ourPawns) != 0
+ && popcount(b) >= popcount(pawn_attack_span(Us, s) & theirPawns);
// Passed pawns will be properly scored in evaluation because we need
// full attack info to evaluate passed pawns. Only the frontmost passed
@@ -220,25 +220,21 @@ Value Entry::shelter_storm(const Position& pos, Square ksq) {
const Color Them = (Us == WHITE ? BLACK : WHITE);
Value safety = MaxSafetyBonus;
- Bitboard b = pos.pieces(PAWN) & (in_front_bb(Us, ksq) | rank_bb(ksq));
- Bitboard ourPawns = b & pos.pieces(Us) & ~rank_bb(ksq);
+ Bitboard b = pos.pieces(PAWN) & (in_front_bb(Us, rank_of(ksq)) | rank_bb(ksq));
+ Bitboard ourPawns = b & pos.pieces(Us);
Bitboard theirPawns = b & pos.pieces(Them);
Rank rkUs, rkThem;
- File kf = file_of(ksq);
-
- kf = (kf == FILE_A) ? FILE_B : (kf == FILE_H) ? FILE_G : kf;
+ File kf = std::max(FILE_B, std::min(FILE_G, file_of(ksq)));
for (int f = kf - 1; f <= kf + 1; f++)
{
- // Shelter penalty is higher for the pawn in front of the king
b = ourPawns & FileBB[f];
- rkUs = b ? rank_of(Us == WHITE ? lsb(b) : ~msb(b)) : RANK_1;
- safety -= ShelterWeakness[f != kf][rkUs];
+ rkUs = b ? relative_rank(Us, lsb(Us, b)) : RANK_1;
+ safety -= ShelterWeakness[rkUs];
- // Storm danger is smaller if enemy pawn is blocked
b = theirPawns & FileBB[f];
- rkThem = b ? rank_of(Us == WHITE ? lsb(b) : ~msb(b)) : RANK_1;
- safety -= StormDanger[rkThem == rkUs + 1][rkThem];
+ rkThem = b ? relative_rank(Us, lsb(Us, b)) : RANK_1;
+ safety -= StormDanger[rkUs == RANK_1 ? 0 : rkThem == rkUs + 1 ? 2 : 1][rkThem];
}
return safety;