Another push to perft speed

[stockfish] / src / pawns.h

diff --git a/src/pawns.h b/src/pawns.h
index 5d3d85fecca9f23f4bd50cd4b377f0cd83933f86..f9ffba0c5b563ce8504bd99bddd6dfb2f223112b 100644 (file)
--- a/src/pawns.h
+++ b/src/pawns.h
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2009 Marco Costalba
+  Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -45,10 +45,9 @@ class PawnInfo {
   friend class PawnInfoTable;
 
 public:
-  PawnInfo() : key(0) { clear(); }
+  PawnInfo() { clear(); }
 
-  Value mg_value() const;
-  Value eg_value() const;
+  Score pawns_value() const;
   Value kingside_storm_value(Color c) const;
   Value queenside_storm_value(Color c) const;
   Bitboard pawn_attacks(Color c) const;
@@ -65,10 +64,10 @@ private:
   Key key;
   Bitboard passedPawns;
   Bitboard pawnAttacks[2];
-  int16_t mgValue, egValue;
+  Square kingSquares[2];
+  Score value;
   int16_t ksStormValue[2], qsStormValue[2];
   uint8_t halfOpenFiles[2];
-  Square kingSquares[2];
   uint8_t kingShelters[2];
 };
 
@@ -79,12 +78,20 @@ 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) const;
+
+  template<Color Us, SideType Side>
+  int evaluate_pawn_storm(Square s, Rank r, File f, Bitboard theirPawns) const;
+
   unsigned size;
   PawnInfo* entries;
 };
@@ -94,12 +101,8 @@ private:
 //// Inline functions
 ////
 
-inline Value PawnInfo::mg_value() const {
-  return Value(mgValue);
-}
-
-inline Value PawnInfo::eg_value() const {
-  return Value(egValue);
+inline Score PawnInfo::pawns_value() const {
+  return value;
 }
 
 inline Bitboard PawnInfo::passed_pawns() const {