/*
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-2012 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)
#define PAWNS_H_INCLUDED
-////
-//// Includes
-////
-
-#include "bitboard.h"
-#include "value.h"
+#include "misc.h"
+#include "position.h"
+#include "types.h"
-////
-//// Types
-////
+const int PawnTableSize = 16384;
-/// PawnInfo is a class which contains various information about a pawn
+/// PawnEntry 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 Position;
+/// to add further information in the future. A lookup to the pawn hash
+/// table (performed by calling the probe method in a PawnTable object)
+/// returns a pointer to a PawnEntry object.
-class PawnInfo {
+class PawnEntry {
- friend class PawnInfoTable;
+ friend struct PawnTable;
public:
- PawnInfo() : key(0) { clear(); }
-
- Value mg_value() const;
- Value eg_value() const;
- Value kingside_storm_value(Color c) const;
- Value queenside_storm_value(Color c) const;
+ Score pawns_value() const;
Bitboard pawn_attacks(Color c) const;
- Bitboard passed_pawns() 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;
- int get_king_shelter(const Position& pos, Color c, Square ksq);
+
+ template<Color Us>
+ Score king_safety(const Position& pos, Square ksq);
private:
- void clear();
- int updateShelter(const Position& pos, Color c, Square ksq);
+ template<Color Us>
+ Score update_safety(const Position& pos, Square ksq);
+
+ template<Color Us>
+ Value shelter_storm(const Position& pos, Square ksq);
Key key;
- Bitboard passedPawns;
- Bitboard pawnAttacks[2];
- int16_t mgValue, egValue;
- int16_t ksStormValue[2], qsStormValue[2];
- uint8_t halfOpenFiles[2];
- Square kingSquares[2];
- uint8_t kingShelters[2];
+ 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];
};
-/// 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 {
-public:
- PawnInfoTable(unsigned numOfEntries);
- ~PawnInfoTable();
- PawnInfo* get_pawn_info(const Position& pos);
+/// The PawnTable class represents a pawn hash table. The most important
+/// method is probe, which returns a pointer to a PawnEntry object.
-private:
- unsigned size;
- PawnInfo* entries;
-};
+struct PawnTable {
+ PawnEntry* probe(const Position& pos);
-////
-//// Inline functions
-////
+ template<Color Us>
+ static Score evaluate_pawns(const Position& pos, Bitboard ourPawns,
+ Bitboard theirPawns, PawnEntry* e);
-inline Value PawnInfo::mg_value() const {
- return Value(mgValue);
-}
+ HashTable<PawnEntry, PawnTableSize> entries;
+};
-inline Value PawnInfo::eg_value() const {
- return Value(egValue);
-}
-inline Bitboard PawnInfo::passed_pawns() const {
- return passedPawns;
+inline Score PawnEntry::pawns_value() const {
+ return value;
}
-inline Bitboard PawnInfo::pawn_attacks(Color c) const {
+inline Bitboard PawnEntry::pawn_attacks(Color c) const {
return pawnAttacks[c];
}
-inline Value PawnInfo::kingside_storm_value(Color c) const {
- return Value(ksStormValue[c]);
-}
-
-inline Value PawnInfo::queenside_storm_value(Color c) const {
- return Value(qsStormValue[c]);
+inline Bitboard PawnEntry::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 PawnEntry::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 {
+inline int PawnEntry::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 {
+inline int PawnEntry::has_open_file_to_right(Color c, File f) const {
return halfOpenFiles[c] & ~((1 << int(f+1)) - 1);
}
-inline int PawnInfo::get_king_shelter(const Position& pos, Color c, Square ksq) {
- return (kingSquares[c] == ksq ? kingShelters[c] : updateShelter(pos, c, ksq));
+template<Color Us>
+inline Score PawnEntry::king_safety(const Position& pos, Square ksq) {
+ return kingSquares[Us] == ksq && castleRights[Us] == pos.can_castle(Us)
+ ? kingSafety[Us] : update_safety<Us>(pos, ksq);
}
#endif // !defined(PAWNS_H_INCLUDED)
projects / stockfish / blobdiff