X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.h;h=664bce2d82dd2cf94a2b13911794642e1f45cc7b;hp=86708488cb276f6c13ce40d768d7bda7991d3485;hb=bcbc9bfd1f5efeaa3f1e0b020e405f11984e72ec;hpb=85a7456bd7e8a1a01cdbfa8f4b6fb563d15a37c6 diff --git a/src/pawns.h b/src/pawns.h index 86708488..664bce2d 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-2010 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2013 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 @@ -17,147 +17,62 @@ along with this program. If not, see . */ - #if !defined(PAWNS_H_INCLUDED) #define PAWNS_H_INCLUDED -//// -//// Includes -//// - -#include "bitboard.h" +#include "misc.h" #include "position.h" -#include "value.h" - -//// -//// Types -//// +#include "types.h" -const int PawnTableSize = 16384; +namespace Pawns { -/// PawnInfo is a class which contains various information about a pawn -/// structure. Currently, it only includes a middle game and an end game -/// pawn structure evaluation, and a bitboard of passed pawns. We may want -/// 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 PawnInfo { +/// Pawns::Entry contains various information about a pawn structure. Currently, +/// it only includes a middle game and end game pawn structure evaluation, and a +/// bitboard of passed pawns. We may want to add further information in the future. +/// A lookup to the pawn hash table (performed by calling the probe function) +/// returns a pointer to an Entry object. - friend class PawnInfoTable; +struct Entry { -public: - Score pawns_value() const; - Bitboard pawn_attacks(Color c) const; - Bitboard passed_pawns(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; + 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 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 { - template - Score king_shelter(const Position& pos, Square ksq); + return halfOpenFiles[c] & (left ? ((1 << int(f)) - 1) : ~((1 << int(f+1)) - 1)); + } -private: template - Score updateShelter(const Position& pos, Square ksq); - - Key key; - Bitboard passedPawns[2]; - Bitboard pawnAttacks[2]; - Square kingSquares[2]; - Score value; - int halfOpenFiles[2]; - Score kingShelters[2]; -}; + Score king_safety(const Position& pos, Square ksq) { -/// The PawnInfoTable class represents a pawn hash table. It is basically -/// just an array of PawnInfo objects and a few methods for accessing these -/// objects. The most important method is get_pawn_info, which looks up a -/// position in the table and returns a pointer to a PawnInfo object. - -class PawnInfoTable { - - enum SideType { KingSide, QueenSide }; - - PawnInfoTable(const PawnInfoTable&); - PawnInfoTable& operator=(const PawnInfoTable&); + return kingSquares[Us] == ksq && castleRights[Us] == pos.can_castle(Us) + ? kingSafety[Us] : update_safety(pos, ksq); + } -public: - PawnInfoTable(); - ~PawnInfoTable(); - PawnInfo* get_pawn_info(const Position& pos) const; - void prefetch(Key key) const; + template + Score update_safety(const Position& pos, Square ksq); -private: template - Score evaluate_pawns(const Position& pos, Bitboard ourPawns, Bitboard theirPawns, PawnInfo* pi) const; + Value shelter_storm(const Position& pos, Square ksq); - PawnInfo* entries; + Key key; + Bitboard passedPawns[COLOR_NB]; + Bitboard pawnAttacks[COLOR_NB]; + Square kingSquares[COLOR_NB]; + int minKPdistance[COLOR_NB]; + int castleRights[COLOR_NB]; + Score value; + int halfOpenFiles[COLOR_NB]; + Score kingSafety[COLOR_NB]; + int pawnsOnSquares[COLOR_NB][COLOR_NB]; }; +typedef HashTable Table; -//// -//// Inline functions -//// - -inline void PawnInfoTable::prefetch(Key key) const { - - unsigned index = unsigned(key & (PawnTableSize - 1)); - PawnInfo* pi = entries + index; - ::prefetch((char*) pi); -} - -inline Score PawnInfo::pawns_value() const { - return value; -} - -inline Bitboard PawnInfo::pawn_attacks(Color c) const { - return pawnAttacks[c]; -} - -inline Bitboard PawnInfo::passed_pawns(Color c) const { - return passedPawns[c]; -} - -inline int PawnInfo::file_is_half_open(Color c, File f) const { - return (halfOpenFiles[c] & (1 << int(f))); -} - -inline int PawnInfo::has_open_file_to_left(Color c, File f) const { - return halfOpenFiles[c] & ((1 << int(f)) - 1); -} - -inline int PawnInfo::has_open_file_to_right(Color c, File f) const { - return halfOpenFiles[c] & ~((1 << int(f+1)) - 1); -} - -/// PawnInfo::updateShelter() calculates and caches king shelter. It is called -/// only when king square changes, about 20% of total king_shelter() calls. -template -Score PawnInfo::updateShelter(const Position& pos, Square ksq) { - - const int Shift = (Us == WHITE ? 8 : -8); - - Bitboard pawns; - int r, shelter = 0; - - if (relative_rank(Us, ksq) <= RANK_4) - { - pawns = pos.pieces(PAWN, Us) & this_and_neighboring_files_bb(ksq); - r = square_rank(ksq) * 8; - for (int i = 1; i < 4; i++) - { - r += Shift; - shelter += BitCount8Bit[(pawns >> r) & 0xFF] * (128 >> i); - } - } - kingSquares[Us] = ksq; - kingShelters[Us] = make_score(shelter, 0); - return kingShelters[Us]; -} +Entry* probe(const Position& pos, Table& entries); -template -inline Score PawnInfo::king_shelter(const Position& pos, Square ksq) { - return kingSquares[Us] == ksq ? kingShelters[Us] : updateShelter(pos, ksq); } #endif // !defined(PAWNS_H_INCLUDED)