X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.h;h=f9ffba0c5b563ce8504bd99bddd6dfb2f223112b;hp=684697acb1738846226910bafb5a3f79813ece39;hb=be540b6dd73eab00444c068fad707e88b223d608;hpb=4c58db0dab8e80cf8e57beef6ed9d3a8e2c56795 diff --git a/src/pawns.h b/src/pawns.h index 684697ac..f9ffba0c 100644 --- a/src/pawns.h +++ b/src/pawns.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2009 Marco Costalba + Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -64,10 +64,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]; }; @@ -78,14 +78,19 @@ private: class PawnInfoTable { + enum SideType { KingSide, QueenSide }; + public: PawnInfoTable(unsigned numOfEntries); ~PawnInfoTable(); - PawnInfo* get_pawn_info(const Position& pos); + PawnInfo* get_pawn_info(const Position& pos) const; private: template - Score evaluate_pawns(const Position& pos, Bitboard ourPawns, Bitboard theirPawns, PawnInfo* pi); + Score evaluate_pawns(const Position& pos, Bitboard ourPawns, Bitboard theirPawns, PawnInfo* pi) const; + + template + int evaluate_pawn_storm(Square s, Rank r, File f, Bitboard theirPawns) const; unsigned size; PawnInfo* entries;