X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fpawns.h;h=9f2af30e4f5028472e493e1ea42ee5fbd630691b;hb=3e4dcaa06e7fd555628f1c3a65f4b7967d9708cd;hp=2c04e7d2eaa7ecf75fb09cc906446173232a613d;hpb=c5ec94d0f1b128fc2c691c7231663a345409d5cc;p=stockfish
diff --git a/src/pawns.h b/src/pawns.h
index 2c04e7d2..9f2af30e 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,9 +37,12 @@ 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 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) {
@@ -61,8 +64,9 @@ struct Entry {
int minKPdistance[COLOR_NB];
int castleRights[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;
@@ -71,4 +75,4 @@ Entry* probe(const Position& pos, Table& entries);
}
-#endif // !defined(PAWNS_H_INCLUDED)
+#endif // #ifndef PAWNS_H_INCLUDED