X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fpawns.h;h=0098a963db224a478d74eed4164d24acb5ffebad;hb=48f38f3092626f0dfef3728568ad5d85ca6c2f92;hp=3ec62334c96d28cbf68e0a4184d3c4f5da2df780;hpb=3e4dfb49a747be902d25ae06783f98ba29fb5030;p=stockfish
diff --git a/src/pawns.h b/src/pawns.h
index 3ec62334..0098a963 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"
@@ -37,10 +37,13 @@ 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 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); }
- int same_colored_pawn_count(Square s, Color c) const { return (BlackSquares & s) ? pawnsOnBlackSquaresCount[c] : pawnsOnWhiteSquaresCount[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 {
+
+ return semiopenFiles[c] & (left ? ((1 << int(f)) - 1) : ~((1 << int(f+1)) - 1));
+ }
template
Score king_safety(const Position& pos, Square ksq) {
@@ -57,15 +60,15 @@ 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];
Score value;
- int halfOpenFiles[COLOR_NB];
+ int semiopenFiles[COLOR_NB];
Score kingSafety[COLOR_NB];
- int pawnsOnWhiteSquaresCount[COLOR_NB];
- int pawnsOnBlackSquaresCount[COLOR_NB];
+ int pawnsOnSquares[COLOR_NB][COLOR_NB];
};
typedef HashTable Table;
@@ -74,4 +77,4 @@ Entry* probe(const Position& pos, Table& entries);
}
-#endif // !defined(PAWNS_H_INCLUDED)
+#endif // #ifndef PAWNS_H_INCLUDED