/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2014 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
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined(PAWNS_H_INCLUDED)
+#ifndef PAWNS_H_INCLUDED
#define PAWNS_H_INCLUDED
+#include "misc.h"
#include "position.h"
-#include "tt.h"
#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 pawn_info method in a PawnInfoTable
-/// object) returns a pointer to a PawnInfo object.
+/// Pawns::Entry contains various information about a pawn structure. Currently,
+/// it only includes a middlegame and endgame 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.
-class PawnInfo {
+struct Entry {
- friend class PawnInfoTable;
+ Score pawns_value() const { return value; }
+ Bitboard pawn_attacks(Color c) const { return pawnAttacks[c]; }
+ Bitboard passed_pawns(Color c) const { return passedPawns[c]; }
+ Bitboard candidate_pawns(Color c) const { return candidatePawns[c]; }
+ int pawns_on_same_color_squares(Color c, Square s) const { return pawnsOnSquares[c][!!(DarkSquares & s)]; }
+ int semiopen(Color c, File f) const { return semiopenFiles[c] & (1 << int(f)); }
+ int semiopen_on_side(Color c, File f, bool left) const {
-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;
+ return semiopenFiles[c] & (left ? ((1 << int(f)) - 1) : ~((1 << int(f+1)) - 1));
+ }
template<Color Us>
- Score king_shelter(const Position& pos, Square ksq);
+ Score king_safety(const Position& pos, Square ksq) {
+
+ return kingSquares[Us] == ksq && castlingFlags[Us] == pos.can_castle(Us)
+ ? kingSafety[Us] : update_safety<Us>(pos, ksq);
+ }
+
+ template<Color Us>
+ Score update_safety(const Position& pos, Square ksq);
-private:
template<Color Us>
- Score updateShelter(const Position& pos, Square ksq);
+ Value shelter_storm(const Position& pos, Square ksq);
Key key;
- Bitboard passedPawns[2];
- Bitboard pawnAttacks[2];
- Square kingSquares[2];
+ Bitboard passedPawns[COLOR_NB];
+ Bitboard candidatePawns[COLOR_NB];
+ Bitboard pawnAttacks[COLOR_NB];
+ Square kingSquares[COLOR_NB];
+ int minKPdistance[COLOR_NB];
+ int castlingFlags[COLOR_NB];
Score value;
- int halfOpenFiles[2];
- Score kingShelters[2];
-};
-
-
-/// The PawnInfoTable class represents a pawn hash table. The most important
-/// method is pawn_info, which returns a pointer to a PawnInfo object.
-
-class PawnInfoTable : public SimpleHash<PawnInfo, PawnTableSize> {
-public:
- PawnInfo* pawn_info(const Position& pos) const;
-
-private:
- template<Color Us>
- static Score evaluate_pawns(const Position& pos, Bitboard ourPawns, Bitboard theirPawns, PawnInfo* pi);
+ int semiopenFiles[COLOR_NB];
+ Score kingSafety[COLOR_NB];
+ int pawnsOnSquares[COLOR_NB][COLOR_NB];
};
+typedef HashTable<Entry, 16384> Table;
-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);
-}
+void init();
+Entry* probe(const Position& pos, Table& entries);
-template<Color Us>
-inline Score PawnInfo::king_shelter(const Position& pos, Square ksq) {
- return kingSquares[Us] == ksq ? kingShelters[Us] : updateShelter<Us>(pos, ksq);
}
-#endif // !defined(PAWNS_H_INCLUDED)
+#endif // #ifndef PAWNS_H_INCLUDED