Fix a compile error with icc

[stockfish] / src / history.h

diff --git a/src/history.h b/src/history.h
index 9206cdf4bc7d8a45ad34612e12244ec23a55dcc2..c265777b42a6c4d0bcf60485aae9d80a64625f43 100644 (file)
--- a/src/history.h
+++ b/src/history.h
@@ -21,12 +21,7 @@
 #define HISTORY_H_INCLUDED
 
 #include <cstring>
-
-#include "depth.h"
-#include "move.h"
-#include "piece.h"
-#include "value.h"
-
+#include "types.h"
 
 /// The History class stores statistics about how often different moves
 /// have been successful or unsuccessful during the current search. These
@@ -38,12 +33,13 @@
 class History {
 
 public:
-  History() { clear(); }
   void clear();
-  int value(Piece p, Square to) const;
-  void update(Piece p, Square to, Value delta);
+  Value value(Piece p, Square to) const;
+  void update(Piece p, Square to, Value bonus);
   Value gain(Piece p, Square to) const;
-  void update_gain(Piece p, Square to, Value delta);
+  void update_gain(Piece p, Square to, Value gain);
+
+  static const Value MaxValue = Value(1 << 29); // To avoid an overflow
 
 private:
   Value history[16][64];  // [piece][to_square]
@@ -51,16 +47,16 @@ private:
 };
 
 inline void History::clear() {
-  memset(history,  0, 16 * 64 * sizeof(int));
-  memset(maxGains, 0, 16 * 64 * sizeof(int));
+  memset(history,  0, 16 * 64 * sizeof(Value));
+  memset(maxGains, 0, 16 * 64 * sizeof(Value));
 }
 
-inline int History::value(Piece p, Square to) const {
+inline Value History::value(Piece p, Square to) const {
   return history[p][to];
 }
 
 inline void History::update(Piece p, Square to, Value bonus) {
-  history[p][to] += bonus;
+  if (abs(history[p][to] + bonus) < MaxValue) history[p][to] += bonus;
 }
 
 inline Value History::gain(Piece p, Square to) const {
@@ -68,11 +64,7 @@ inline Value History::gain(Piece p, Square to) const {
 }
 
 inline void History::update_gain(Piece p, Square to, Value gain) {
-
-  if (gain >= maxGains[p][to])
-      maxGains[p][to] = gain;
-  else
-      maxGains[p][to]--;
+  maxGains[p][to] = Max(gain, maxGains[p][to] - 1);
 }
 
 #endif // !defined(HISTORY_H_INCLUDED)