X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fpawns.h;h=124619d66a0c20805fa5d5d3f328f6167d0b6943;hb=7ffae17f85709e49672a0e98e136b66aea067b2c;hp=2c04e7d2eaa7ecf75fb09cc906446173232a613d;hpb=c5ec94d0f1b128fc2c691c7231663a345409d5cc;p=stockfish
diff --git a/src/pawns.h b/src/pawns.h
index 2c04e7d2..124619d6 100644
--- a/src/pawns.h
+++ b/src/pawns.h
@@ -1,7 +1,6 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
- Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2004-2021 The Stockfish developers (see AUTHORS file)
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,58 +16,55 @@
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"
-namespace Pawns {
+namespace Stockfish::Pawns {
-/// 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.
+/// 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.
struct Entry {
- Score pawns_value() const { return value; }
+ 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]; }
- int file_is_half_open(Color c, File f) const { return halfOpenFiles[c] & (1 << int(f)); }
- int has_open_file_to_left(Color c, File f) const { return halfOpenFiles[c] & ((1 << int(f)) - 1); }
- int has_open_file_to_right(Color c, File f) const { return halfOpenFiles[c] & ~((1 << int(f+1)) - 1); }
+ Bitboard pawn_attacks_span(Color c) const { return pawnAttacksSpan[c]; }
+ int passed_count() const { return popcount(passedPawns[WHITE] | passedPawns[BLACK]); }
+ int blocked_count() const { return blockedCount; }
template
- Score king_safety(const Position& pos, Square ksq) {
-
- return kingSquares[Us] == ksq && castleRights[Us] == pos.can_castle(Us)
- ? kingSafety[Us] : update_safety(pos, ksq);
+ Score king_safety(const Position& pos) {
+ return kingSquares[Us] == pos.square(Us) && castlingRights[Us] == pos.castling_rights(Us)
+ ? kingSafety[Us] : (kingSafety[Us] = do_king_safety(pos));
}
template
- Score update_safety(const Position& pos, Square ksq);
+ Score do_king_safety(const Position& pos);
template
- Value shelter_storm(const Position& pos, Square ksq);
+ Score evaluate_shelter(const Position& pos, Square ksq) const;
Key key;
+ Score scores[COLOR_NB];
Bitboard passedPawns[COLOR_NB];
Bitboard pawnAttacks[COLOR_NB];
+ Bitboard pawnAttacksSpan[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 castlingRights[COLOR_NB];
+ int blockedCount;
};
-typedef HashTable Table;
+typedef HashTable Table;
-Entry* probe(const Position& pos, Table& entries);
+Entry* probe(const Position& pos);
-}
+} // namespace Stockfish::Pawns
-#endif // !defined(PAWNS_H_INCLUDED)
+#endif // #ifndef PAWNS_H_INCLUDED