Revert "Remove confusing optimization"

[stockfish] / src / pawns.h

diff --git a/src/pawns.h b/src/pawns.h
index 3ec62334c96d28cbf68e0a4184d3c4f5da2df780..307da51c53fb42a4d66ede8c9af0080b1ad03c27 100644 (file)
--- a/src/pawns.h
+++ b/src/pawns.h
@@ -37,10 +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 same_colored_pawn_count(Square s, Color c) const { return (BlackSquares & s) ? pawnsOnBlackSquaresCount[c] : pawnsOnWhiteSquaresCount[c]; } 
+  int pawns_on_same_color_squares(Color c, Square s) const { return pawnsOnSquares[c][!!(BlackSquares & 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<Color Us>
   Score king_safety(const Position& pos, Square ksq)  {
@@ -62,10 +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 pawnsOnWhiteSquaresCount[COLOR_NB];
-  int pawnsOnBlackSquaresCount[COLOR_NB];
+  int pawnsOnSquares[COLOR_NB][COLOR_NB];
 };
 
 typedef HashTable<Entry, 16384> Table;