X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.h;h=212b14488f116babcd5bd6226000426f9bdce784;hp=1e49a307f64d3748ea742a618869585b0cc46fdb;hb=158014b39d69eaaf791d4913b98ffde5c4d7a874;hpb=10e64e05094e75d89baa4495fa867a8a64195bb7

diff --git a/src/pawns.h b/src/pawns.h
index 1e49a307..212b1448 100644
--- a/src/pawns.h
+++ b/src/pawns.h
@@ -20,91 +20,55 @@
 #if !defined(PAWNS_H_INCLUDED)
 #define PAWNS_H_INCLUDED
 
+#include "misc.h"
 #include "position.h"
-#include "tt.h"
 #include "types.h"
 
-const int PawnTableSize = 16384;
+namespace Pawns {
 
-/// PawnInfo is a class which contains various information about a pawn
-/// structure. Currently, it only includes a middle game and an end game
-/// pawn structure evaluation, and a bitboard of passed pawns. We may want
-/// to add further information in the future. A lookup to the pawn hash
-/// table (performed by calling the pawn_info method in a PawnInfoTable
-/// object) returns a pointer to a PawnInfo object.
+/// Pawns::Entry contains various information about a pawn structure. Currently,
+/// it only includes a middle game and end game pawn structure evaluation, and a
+/// bitboard of passed pawns. We may want to add further information in the future.
+/// A lookup to the pawn hash table (performed by calling the probe function)
+/// returns a pointer to an Entry object.
 
-class PawnInfo {
+struct Entry {
 
-  friend class PawnInfoTable;
-
-public:
-  Score pawns_value() const;
-  Bitboard pawn_attacks(Color c) const;
-  Bitboard passed_pawns(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;
+  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); }
 
   template<Color Us>
-  Score king_safety(const Position& pos, Square ksq);
+  Score king_safety(const Position& pos, Square ksq)  {
+
+    return kingSquares[Us] == ksq && castleRights[Us] == pos.can_castle(Us)
+         ? kingSafety[Us] : update_safety<Us>(pos, ksq);
+  }
 
-private:
   template<Color Us>
   Score update_safety(const Position& pos, Square ksq);
 
   template<Color Us>
-  int shelter_storm(const Position& pos, Square ksq);
+  Value shelter_storm(const Position& pos, Square ksq);
 
   Key key;
-  Bitboard passedPawns[2];
-  Bitboard pawnAttacks[2];
-  Square kingSquares[2];
+  Bitboard passedPawns[COLOR_NB];
+  Bitboard pawnAttacks[COLOR_NB];
+  Square kingSquares[COLOR_NB];
+  int minKPdistance[COLOR_NB];
+  int castleRights[COLOR_NB];
   Score value;
-  int halfOpenFiles[2];
-  Score kingShelters[2];
-};
-
-
-/// The PawnInfoTable class represents a pawn hash table. The most important
-/// method is pawn_info, which returns a pointer to a PawnInfo object.
-
-class PawnInfoTable : public SimpleHash<PawnInfo, PawnTableSize> {
-public:
-  PawnInfo* pawn_info(const Position& pos) const;
-
-private:
-  template<Color Us>
-  static Score evaluate_pawns(const Position& pos, Bitboard ourPawns, Bitboard theirPawns, PawnInfo* pi);
+  int halfOpenFiles[COLOR_NB];
+  Score kingSafety[COLOR_NB];
 };
 
+typedef HashTable<Entry, 16384> Table;
 
-inline Score PawnInfo::pawns_value() const {
-  return value;
-}
-
-inline Bitboard PawnInfo::pawn_attacks(Color c) const {
-  return pawnAttacks[c];
-}
-
-inline Bitboard PawnInfo::passed_pawns(Color c) const {
-  return passedPawns[c];
-}
-
-inline int PawnInfo::file_is_half_open(Color c, File f) const {
-  return halfOpenFiles[c] & (1 << int(f));
-}
-
-inline int PawnInfo::has_open_file_to_left(Color c, File f) const {
-  return halfOpenFiles[c] & ((1 << int(f)) - 1);
-}
-
-inline int PawnInfo::has_open_file_to_right(Color c, File f) const {
-  return halfOpenFiles[c] & ~((1 << int(f+1)) - 1);
-}
+Entry* probe(const Position& pos, Table& entries);
 
-template<Color Us>
-inline Score PawnInfo::king_safety(const Position& pos, Square ksq) {
-  return kingSquares[Us] == ksq ? kingShelters[Us] : update_safety<Us>(pos, ksq);
 }
 
 #endif // !defined(PAWNS_H_INCLUDED)