X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.h;h=664bce2d82dd2cf94a2b13911794642e1f45cc7b;hp=2c04e7d2eaa7ecf75fb09cc906446173232a613d;hb=bcbc9bfd1f5efeaa3f1e0b020e405f11984e72ec;hpb=9a1d5f0f1d8a12a85b198688d4f1d636a146eb7a diff --git a/src/pawns.h b/src/pawns.h index 2c04e7d2..664bce2d 100644 --- a/src/pawns.h +++ b/src/pawns.h @@ -37,9 +37,12 @@ struct Entry { Score pawns_value() const { return value; } Bitboard pawn_attacks(Color c) const { return pawnAttacks[c]; } Bitboard passed_pawns(Color c) const { return passedPawns[c]; } - int file_is_half_open(Color c, File f) const { return halfOpenFiles[c] & (1 << int(f)); } - int has_open_file_to_left(Color c, File f) const { return halfOpenFiles[c] & ((1 << int(f)) - 1); } - int has_open_file_to_right(Color c, File f) const { return halfOpenFiles[c] & ~((1 << int(f+1)) - 1); } + int pawns_on_same_color_squares(Color c, Square s) const { return pawnsOnSquares[c][!!(BlackSquares & s)]; } + int half_open(Color c, File f) const { return halfOpenFiles[c] & (1 << int(f)); } + int half_open_on_side(Color c, File f, bool left) const { + + return halfOpenFiles[c] & (left ? ((1 << int(f)) - 1) : ~((1 << int(f+1)) - 1)); + } template Score king_safety(const Position& pos, Square ksq) { @@ -63,6 +66,7 @@ struct Entry { Score value; int halfOpenFiles[COLOR_NB]; Score kingSafety[COLOR_NB]; + int pawnsOnSquares[COLOR_NB][COLOR_NB]; }; typedef HashTable Table;