X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.h;h=04aced772a814bd48d67a332779c27443a960a05;hp=28fe1c075ed9ae344dbfc052058ff7ba80a2ac15;hb=6933f05f4b1b7b1bd2c072029bf5a06cbeac5b0b;hpb=7bce8831d361317e0cf5156a888ca2d3e568a2ff diff --git a/src/pawns.h b/src/pawns.h index 28fe1c07..04aced77 100644 --- a/src/pawns.h +++ b/src/pawns.h @@ -32,10 +32,9 @@ namespace Pawns { struct Entry { - Score pawns_value() const { return value; } + Score pawns_score() const { return score; } Bitboard pawn_attacks(Color c) const { return pawnAttacks[c]; } Bitboard passed_pawns(Color c) const { return passedPawns[c]; } - Bitboard candidate_pawns(Color c) const { return candidatePawns[c]; } int semiopen_file(Color c, File f) const { return semiopenFiles[c] & (1 << f); @@ -45,6 +44,10 @@ struct Entry { return semiopenFiles[c] & (leftSide ? (1 << f) - 1 : ~((1 << (f + 1)) - 1)); } + int pawn_span(Color c) const { + return pawnSpan[c]; + } + int pawns_on_same_color_squares(Color c, Square s) const { return pawnsOnSquares[c][!!(DarkSquares & s)]; } @@ -62,15 +65,15 @@ struct Entry { Value shelter_storm(const Position& pos, Square ksq); Key key; - Score value; + Score score; Bitboard passedPawns[COLOR_NB]; - Bitboard candidatePawns[COLOR_NB]; Bitboard pawnAttacks[COLOR_NB]; Square kingSquares[COLOR_NB]; Score kingSafety[COLOR_NB]; - int minKPdistance[COLOR_NB]; + int minKingPawnDistance[COLOR_NB]; int castlingRights[COLOR_NB]; int semiopenFiles[COLOR_NB]; + int pawnSpan[COLOR_NB]; int pawnsOnSquares[COLOR_NB][COLOR_NB]; // [color][light/dark squares] };