X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.h;h=5939253b5da7b0c9adc38e4eb89ec39ec16daeb0;hp=528bc873fd98b443f562434955c5600e40d2bd01;hb=6b7efa0cd14b73416c9030462f79a02bbfc7ad2c;hpb=9fc602bae74b8e09bd45ace3b42a8ce84d56b23c diff --git a/src/pawns.h b/src/pawns.h index 528bc873..5939253b 100644 --- a/src/pawns.h +++ b/src/pawns.h @@ -26,6 +26,7 @@ //// #include "bitboard.h" +#include "scale.h" #include "value.h" //// @@ -52,6 +53,7 @@ public: Value queenside_storm_value(Color c) const; Bitboard pawn_attacks(Color c) const; Bitboard passed_pawns() const; + ScaleFactor scale_factor(Color c) const; int file_is_half_open(Color c, File f) const; int has_open_file_to_left(Color c, File f) const; int has_open_file_to_right(Color c, File f) const; @@ -64,11 +66,10 @@ private: Key key; Bitboard passedPawns; Bitboard pawnAttacks[2]; + Square kingSquares[2]; Score value; int16_t ksStormValue[2], qsStormValue[2]; - uint8_t halfOpenFiles[2]; - Square kingSquares[2]; - uint8_t kingShelters[2]; + uint8_t halfOpenFiles[2], kingShelters[2], factor[2]; }; /// The PawnInfoTable class represents a pawn hash table. It is basically @@ -116,6 +117,10 @@ inline Value PawnInfo::queenside_storm_value(Color c) const { return Value(qsStormValue[c]); } +inline ScaleFactor PawnInfo::scale_factor(Color c) const { + return ScaleFactor(factor[c]); +} + inline int PawnInfo::file_is_half_open(Color c, File f) const { return (halfOpenFiles[c] & (1 << int(f))); }