Another push to perft speed

[stockfish] / src / pawns.h

diff --git a/src/pawns.h b/src/pawns.h
index 5939253b5da7b0c9adc38e4eb89ec39ec16daeb0..f9ffba0c5b563ce8504bd99bddd6dfb2f223112b 100644 (file)
--- a/src/pawns.h
+++ b/src/pawns.h
@@ -26,7 +26,6 @@
 ////
 
 #include "bitboard.h"
-#include "scale.h"
 #include "value.h"
 
 ////
@@ -53,7 +52,6 @@ public:
   Value queenside_storm_value(Color c) const;
   Bitboard pawn_attacks(Color c) const;
   Bitboard passed_pawns() const;
-  ScaleFactor scale_factor(Color c) const;
   int file_is_half_open(Color c, File f) const;
   int has_open_file_to_left(Color c, File f) const;
   int has_open_file_to_right(Color c, File f) const;
@@ -69,7 +67,8 @@ private:
   Square kingSquares[2];
   Score value;
   int16_t ksStormValue[2], qsStormValue[2];
-  uint8_t halfOpenFiles[2], kingShelters[2], factor[2];
+  uint8_t halfOpenFiles[2];
+  uint8_t kingShelters[2];
 };
 
 /// The PawnInfoTable class represents a pawn hash table.  It is basically
@@ -79,14 +78,19 @@ private:
 
 class PawnInfoTable {
 
+  enum SideType { KingSide, QueenSide };
+
 public:
   PawnInfoTable(unsigned numOfEntries);
   ~PawnInfoTable();
-  PawnInfo* get_pawn_info(const Position& pos);
+  PawnInfo* get_pawn_info(const Position& pos) const;
 
 private:
   template<Color Us>
-  Score evaluate_pawns(const Position& pos, Bitboard ourPawns, Bitboard theirPawns, PawnInfo* pi);
+  Score evaluate_pawns(const Position& pos, Bitboard ourPawns, Bitboard theirPawns, PawnInfo* pi) const;
+
+  template<Color Us, SideType Side>
+  int evaluate_pawn_storm(Square s, Rank r, File f, Bitboard theirPawns) const;
 
   unsigned size;
   PawnInfo* entries;
@@ -117,10 +121,6 @@ inline Value PawnInfo::queenside_storm_value(Color c) const {
   return Value(qsStormValue[c]);
 }
 
-inline ScaleFactor PawnInfo::scale_factor(Color c) const {
-  return ScaleFactor(factor[c]);
-}
-
 inline int PawnInfo::file_is_half_open(Color c, File f) const {
   return (halfOpenFiles[c] & (1 << int(f)));
 }