X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fpawns.cpp;h=e2b26344986ad51d129aafbf9fba91ba8d2857fc;hb=ca6ce6398b1bd21ff2ac29b2dc27d7c25abbb509;hp=b0fcfad331d732ed8786b9de747824495006d0ee;hpb=7133598a98301cf84857d39194026b876da48b96;p=stockfish
diff --git a/src/pawns.cpp b/src/pawns.cpp
index b0fcfad3..e2b26344 100644
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@ -18,7 +18,6 @@
along with this program. If not, see .
*/
-#include
#include
#include "bitboard.h"
@@ -36,8 +35,8 @@ namespace {
constexpr Score Doubled = S(11, 56);
constexpr Score Isolated = S( 5, 15);
- // Connected pawn bonus by opposed, phalanx, #support and rank
- Score Connected[2][2][3][RANK_NB];
+ // Connected pawn bonus
+ constexpr int Connected[RANK_NB] = { 0, 13, 17, 24, 59, 96, 171 };
// Strength of pawn shelter for our king by [distance from edge][rank].
// RANK_1 = 0 is used for files where we have no pawn, or pawn is behind our king.
@@ -78,11 +77,8 @@ namespace {
Bitboard theirPawns = pos.pieces(Them, PAWN);
e->passedPawns[Us] = e->pawnAttacksSpan[Us] = e->weakUnopposed[Us] = 0;
- e->semiopenFiles[Us] = 0xFF;
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)
@@ -90,8 +86,8 @@ namespace {
assert(pos.piece_on(s) == make_piece(Us, PAWN));
File f = file_of(s);
+ Rank r = relative_rank(Us, s);
- e->semiopenFiles[Us] &= ~(1 << f);
e->pawnAttacksSpan[Us] |= pawn_attack_span(Us, s);
// Flag the pawn
@@ -118,8 +114,7 @@ namespace {
&& popcount(phalanx) >= popcount(leverPush))
e->passedPawns[Us] |= s;
- else if ( stoppers == SquareBB[s + Up]
- && relative_rank(Us, s) >= RANK_5)
+ else if (stoppers == square_bb(s + Up) && r >= RANK_5)
{
b = shift(support) & ~theirPawns;
while (b)
@@ -129,8 +124,11 @@ namespace {
// Score this pawn
if (support | phalanx)
- score += Connected[opposed][bool(phalanx)][popcount(support)][relative_rank(Us, s)];
-
+ {
+ int v = (phalanx ? 3 : 2) * Connected[r];
+ v = 17 * popcount(support) + (v >> (opposed + 1));
+ score += make_score(v, v * (r - 2) / 4);
+ }
else if (!neighbours)
score -= Isolated, e->weakUnopposed[Us] += !opposed;
@@ -148,27 +146,6 @@ namespace {
namespace Pawns {
-/// Pawns::init() initializes some tables needed by evaluation. Instead of using
-/// hard-coded tables, when makes sense, we prefer to calculate them with a formula
-/// to reduce independent parameters and to allow easier tuning and better insight.
-
-void init() {
-
- static constexpr int Seed[RANK_NB] = { 0, 13, 24, 18, 65, 100, 175, 330 };
-
- for (int opposed = 0; opposed <= 1; ++opposed)
- for (int phalanx = 0; phalanx <= 1; ++phalanx)
- for (int support = 0; support <= 2; ++support)
- for (Rank r = RANK_2; r < RANK_8; ++r)
- {
- int v = 17 * support;
- v += (Seed[r] + (phalanx ? (Seed[r + 1] - Seed[r]) / 2 : 0)) >> opposed;
-
- Connected[opposed][phalanx][support][r] = make_score(v, v * (r - 2) / 4);
- }
-}
-
-
/// Pawns::probe() looks up the current position's pawns configuration in
/// the pawns hash table. It returns a pointer to the Entry if the position
/// is found. Otherwise a new Entry is computed and stored there, so we don't
@@ -185,7 +162,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;
}
@@ -208,7 +184,7 @@ Value Entry::evaluate_shelter(const Position& pos, Square ksq) {
Value safety = (shift(theirPawns) & (FileABB | FileHBB) & BlockRanks & ksq) ?
Value(374) : Value(5);
- File center = std::max(FILE_B, std::min(FILE_G, file_of(ksq)));
+ File center = clamp(file_of(ksq), FILE_B, FILE_G);
for (File f = File(center - 1); f <= File(center + 1); ++f)
{
b = ourPawns & file_bb(f);