Introduce scale factor in pawn evaluation

[stockfish] / src / pawns.h

diff --git a/src/pawns.h b/src/pawns.h
index abf686fc8ad58e56d534cbed9aa95e2a9662f210..5939253b5da7b0c9adc38e4eb89ec39ec16daeb0 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
@@ -26,6 +26,7 @@
 ////
 
 #include "bitboard.h"
+#include "scale.h"
 #include "value.h"
 
 ////
@@ -45,30 +46,32 @@ class PawnInfo {
   friend class PawnInfoTable;
 
 public:
-  Value mg_value() const;
-  Value eg_value() const;
+  PawnInfo() { clear(); }
+
+  Score pawns_value() const;
   Value kingside_storm_value(Color c) const;
   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;
-  int kingShelter(Color c, Square ksq) const;
-  void setKingShelter(Color c, Square ksq, int value);
+  int get_king_shelter(const Position& pos, Color c, Square ksq);
 
 private:
   void clear();
+  int updateShelter(const Position& pos, Color c, Square ksq);
 
   Key key;
   Bitboard passedPawns;
+  Bitboard pawnAttacks[2];
   Square kingSquares[2];
-  int16_t kingShelters[2];
-  int16_t mgValue, egValue;
+  Score value;
   int16_t ksStormValue[2], qsStormValue[2];
-  uint8_t halfOpenFiles[2];
+  uint8_t halfOpenFiles[2], kingShelters[2], factor[2];
 };
 
-
 /// The PawnInfoTable class represents a pawn hash table.  It is basically
 /// just an array of PawnInfo objects and a few methods for accessing these
 /// objects.  The most important method is get_pawn_info, which looks up a
@@ -79,10 +82,12 @@ class PawnInfoTable {
 public:
   PawnInfoTable(unsigned numOfEntries);
   ~PawnInfoTable();
-  void clear();
   PawnInfo* get_pawn_info(const Position& pos);
 
 private:
+  template<Color Us>
+  Score evaluate_pawns(const Position& pos, Bitboard ourPawns, Bitboard theirPawns, PawnInfo* pi);
+
   unsigned size;
   PawnInfo* entries;
 };
@@ -92,18 +97,18 @@ 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 {
   return passedPawns;
 }
 
+inline Bitboard PawnInfo::pawn_attacks(Color c) const {
+  return pawnAttacks[c];
+}
+
 inline Value PawnInfo::kingside_storm_value(Color c) const {
   return Value(ksStormValue[c]);
 }
@@ -112,6 +117,10 @@ 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)));
 }
@@ -124,24 +133,8 @@ inline int PawnInfo::has_open_file_to_right(Color c, File f) const {
   return halfOpenFiles[c] & ~((1 << int(f+1)) - 1);
 }
 
-inline int PawnInfo::kingShelter(Color c, Square ksq) const {
-  return (kingSquares[c] == ksq ?  kingShelters[c] : -1);
-}
-
-inline void PawnInfo::setKingShelter(Color c, Square ksq, int value) {
-  kingSquares[c] = ksq;
-  kingShelters[c] = (int16_t)value;
+inline int PawnInfo::get_king_shelter(const Position& pos, Color c, Square ksq) {
+  return (kingSquares[c] == ksq ? kingShelters[c] : updateShelter(pos, c, ksq));
 }
 
-inline void PawnInfo::clear() {
-
-  passedPawns = EmptyBoardBB;
-  mgValue = egValue = 0;
-  ksStormValue[WHITE] = ksStormValue[BLACK] = 0;
-  qsStormValue[WHITE] = qsStormValue[BLACK] = 0;
-  halfOpenFiles[WHITE] = halfOpenFiles[BLACK] = 0xFF;
-  kingSquares[WHITE] = kingSquares[BLACK] = SQ_NONE;
-}
-
-
 #endif // !defined(PAWNS_H_INCLUDED)