X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.h;h=bd6b54abb3ddfc75f3d2e87c2247aeb9648d74c3;hp=4b61d80ecf4a7929c39145e13bdd830937c58aee;hb=a9e55d43262d11a916bdfa68cd1de0174d884cd3;hpb=6cddf9183cee0fa55944d2b2c171ca9b0f55cc87 diff --git a/src/pawns.h b/src/pawns.h index 4b61d80e..bd6b54ab 100644 --- a/src/pawns.h +++ b/src/pawns.h @@ -25,8 +25,8 @@ //// Includes //// -#include "position.h" - +#include "bitboard.h" +#include "value.h" //// //// Types @@ -38,6 +38,7 @@ /// to add further information in the future. A lookup to the pawn hash table /// (performed by calling the get_pawn_info method in a PawnInfoTable object) /// returns a pointer to a PawnInfo object. +class Position; class PawnInfo { @@ -49,9 +50,9 @@ public: Value kingside_storm_value(Color c) const; Value queenside_storm_value(Color c) const; Bitboard passed_pawns() const; - bool file_is_half_open(Color c, File f) const; - bool has_open_file_to_left(Color c, File f) const; - bool has_open_file_to_right(Color c, File f) 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; private: void clear(); @@ -75,11 +76,11 @@ public: PawnInfoTable(unsigned numOfEntries); ~PawnInfoTable(); void clear(); - PawnInfo *get_pawn_info(const Position &pos); + PawnInfo* get_pawn_info(const Position& pos); private: unsigned size; - PawnInfo *entries; + PawnInfo* entries; }; @@ -107,15 +108,15 @@ inline Value PawnInfo::queenside_storm_value(Color c) const { return Value(qsStormValue[c]); } -inline bool PawnInfo::file_is_half_open(Color c, File f) const { +inline int PawnInfo::file_is_half_open(Color c, File f) const { return (halfOpenFiles[c] & (1 << int(f))); } -inline bool PawnInfo::has_open_file_to_left(Color c, File f) const { +inline int PawnInfo::has_open_file_to_left(Color c, File f) const { return halfOpenFiles[c] & ((1 << int(f)) - 1); } -inline bool PawnInfo::has_open_file_to_right(Color c, File f) const { +inline int PawnInfo::has_open_file_to_right(Color c, File f) const { return halfOpenFiles[c] & ~((1 << int(f+1)) - 1); }