X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.h;h=4c041716db854c72d8e3a0d36e54a5e75563b163;hp=5f5411f613a5e5cc6f9644315cb89b9595fbbe5e;hb=7e89a71624e07c735c2230dbbf2c7dbae864916e;hpb=eb07775583c39893bc6eb65a40b5f62a7799deee diff --git a/src/pawns.h b/src/pawns.h index 5f5411f6..4c041716 100644 --- a/src/pawns.h +++ b/src/pawns.h @@ -37,12 +37,7 @@ struct Entry { Bitboard pawn_attacks(Color c) const { return pawnAttacks[c]; } Bitboard passed_pawns(Color c) const { return passedPawns[c]; } Bitboard pawn_attacks_span(Color c) const { return pawnAttacksSpan[c]; } - int weak_unopposed(Color c) const { return weakUnopposed[c]; } - int passed_count() const { return passedCount; } - - int pawns_on_same_color_squares(Color c, Square s) const { - return pawnsOnSquares[c][bool(DarkSquares & s)]; - } + int passed_count() const { return popcount(passedPawns[WHITE] | passedPawns[BLACK]); } template Score king_safety(const Position& pos) { @@ -54,7 +49,7 @@ struct Entry { Score do_king_safety(const Position& pos); template - Value evaluate_shelter(const Position& pos, Square ksq); + Score evaluate_shelter(const Position& pos, Square ksq); Key key; Score scores[COLOR_NB]; @@ -63,13 +58,10 @@ struct Entry { Bitboard pawnAttacksSpan[COLOR_NB]; Square kingSquares[COLOR_NB]; Score kingSafety[COLOR_NB]; - int weakUnopposed[COLOR_NB]; int castlingRights[COLOR_NB]; - int pawnsOnSquares[COLOR_NB][COLOR_NB]; // [color][light/dark squares] - int passedCount; }; -typedef HashTable Table; +typedef HashTable Table; Entry* probe(const Position& pos);