X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fpawns.h;h=fed90b703bd2901fd56acf476ff9907627c342a0;hb=86347100a5c1113e9306d63a16cde2866839373b;hp=664bce2d82dd2cf94a2b13911794642e1f45cc7b;hpb=bcbc9bfd1f5efeaa3f1e0b020e405f11984e72ec;p=stockfish
diff --git a/src/pawns.h b/src/pawns.h
index 664bce2d..fed90b70 100644
--- a/src/pawns.h
+++ b/src/pawns.h
@@ -17,7 +17,7 @@
along with this program. If not, see .
*/
-#if !defined(PAWNS_H_INCLUDED)
+#ifndef PAWNS_H_INCLUDED
#define PAWNS_H_INCLUDED
#include "misc.h"
@@ -27,7 +27,7 @@
namespace 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
+/// 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.
@@ -37,17 +37,18 @@ struct Entry {
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 {
+ 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 {
- return halfOpenFiles[c] & (left ? ((1 << int(f)) - 1) : ~((1 << int(f+1)) - 1));
+ return semiopenFiles[c] & (left ? ((1 << int(f)) - 1) : ~((1 << int(f+1)) - 1));
}
template
Score king_safety(const Position& pos, Square ksq) {
- return kingSquares[Us] == ksq && castleRights[Us] == pos.can_castle(Us)
+ return kingSquares[Us] == ksq && castlingFlags[Us] == pos.can_castle(Us)
? kingSafety[Us] : update_safety(pos, ksq);
}
@@ -59,20 +60,22 @@ struct Entry {
Key key;
Bitboard passedPawns[COLOR_NB];
+ Bitboard candidatePawns[COLOR_NB];
Bitboard pawnAttacks[COLOR_NB];
Square kingSquares[COLOR_NB];
int minKPdistance[COLOR_NB];
- int castleRights[COLOR_NB];
+ int castlingFlags[COLOR_NB];
Score value;
- int halfOpenFiles[COLOR_NB];
+ int semiopenFiles[COLOR_NB];
Score kingSafety[COLOR_NB];
int pawnsOnSquares[COLOR_NB][COLOR_NB];
};
typedef HashTable Table;
+void init();
Entry* probe(const Position& pos, Table& entries);
}
-#endif // !defined(PAWNS_H_INCLUDED)
+#endif // #ifndef PAWNS_H_INCLUDED