X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpawns.h;h=f36168c9a7db884cea5b170972978feb1fdf8271;hb=759b3c79cf94d101163f646b1eb2a9f9c64293ab;hp=4fee93165f187a4cd400a91cc8c774348c8c6c18;hpb=2aac860db3d04881103a3b0d09e864ac77b80697;p=stockfish
diff --git a/src/pawns.h b/src/pawns.h
index 4fee9316..f36168c9 100644
--- a/src/pawns.h
+++ b/src/pawns.h
@@ -1,7 +1,8 @@
/*
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-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2018 Marco Costalba, Joona Kiiski, Gary Linscott, 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,98 +18,69 @@
along with this program. If not, see .
*/
-#if !defined(PAWNS_H_INCLUDED)
+#ifndef PAWNS_H_INCLUDED
#define PAWNS_H_INCLUDED
#include "misc.h"
#include "position.h"
#include "types.h"
-const int PawnTableSize = 16384;
+namespace Pawns {
-/// 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 probe method in a PawnTable object)
-/// returns a pointer to a PawnEntry object.
+/// Pawns::Entry contains various information about a pawn structure. A lookup
+/// to the pawn hash table (performed by calling the probe function) returns a
+/// pointer to an Entry object.
-class PawnEntry {
+struct Entry {
- friend struct PawnTable;
+ Score pawn_score(Color c) const { return scores[c]; }
+ Bitboard pawn_attacks(Color c) const { return pawnAttacks[c]; }
+ Bitboard passed_pawns(Color c) const { return passedPawns[c]; }
+ Bitboard pawn_attacks_span(Color c) const { return pawnAttacksSpan[c]; }
+ int weak_unopposed(Color c) const { return weakUnopposed[c]; }
+ int pawn_asymmetry() const { return asymmetry; }
+ int open_files() const { return openFiles; }
-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;
+ int semiopen_file(Color c, File f) const {
+ return semiopenFiles[c] & (1 << f);
+ }
+
+ int pawns_on_same_color_squares(Color c, Square s) const {
+ return pawnsOnSquares[c][bool(DarkSquares & s)];
+ }
template
- Score king_safety(const Position& pos, Square ksq);
+ Score king_safety(const Position& pos, Square ksq) {
+ return kingSquares[Us] == ksq && castlingRights[Us] == pos.can_castle(Us)
+ ? kingSafety[Us] : (kingSafety[Us] = do_king_safety(pos, ksq));
+ }
-private:
template
- Score update_safety(const Position& pos, Square ksq);
+ Score do_king_safety(const Position& pos, Square ksq);
template
Value shelter_storm(const Position& pos, Square ksq);
Key key;
- Bitboard passedPawns[2];
- Bitboard pawnAttacks[2];
- Square kingSquares[2];
- int castleRights[2];
- Score value;
- int halfOpenFiles[2];
- Score kingSafety[2];
-};
-
-
-/// The PawnTable class represents a pawn hash table. The most important
-/// method is probe, which returns a pointer to a PawnEntry object.
-
-struct PawnTable {
-
- PawnEntry* probe(const Position& pos);
-
- template
- static Score evaluate_pawns(const Position& pos, Bitboard ourPawns,
- Bitboard theirPawns, PawnEntry* e);
-
- HashTable entries;
+ Score scores[COLOR_NB];
+ Bitboard passedPawns[COLOR_NB];
+ Bitboard pawnAttacks[COLOR_NB];
+ Bitboard pawnAttacksSpan[COLOR_NB];
+ Square kingSquares[COLOR_NB];
+ Score kingSafety[COLOR_NB];
+ int weakUnopposed[COLOR_NB];
+ int castlingRights[COLOR_NB];
+ int semiopenFiles[COLOR_NB];
+ int pawnsOnSquares[COLOR_NB][COLOR_NB]; // [color][light/dark squares]
+ int asymmetry;
+ int openFiles;
};
+typedef HashTable Table;
-inline Score PawnEntry::pawns_value() const {
- return value;
-}
-
-inline Bitboard PawnEntry::pawn_attacks(Color c) const {
- return pawnAttacks[c];
-}
-
-inline Bitboard PawnEntry::passed_pawns(Color c) const {
- return passedPawns[c];
-}
-
-inline int PawnEntry::file_is_half_open(Color c, File f) const {
- return halfOpenFiles[c] & (1 << int(f));
-}
-
-inline int PawnEntry::has_open_file_to_left(Color c, File f) const {
- return halfOpenFiles[c] & ((1 << int(f)) - 1);
-}
-
-inline int PawnEntry::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);
-template
-inline Score PawnEntry::king_safety(const Position& pos, Square ksq) {
- return kingSquares[Us] == ksq && castleRights[Us] == pos.can_castle(Us)
- ? kingSafety[Us] : update_safety(pos, ksq);
-}
+} // namespace Pawns
-#endif // !defined(PAWNS_H_INCLUDED)
+#endif // #ifndef PAWNS_H_INCLUDED