Use a global RootMoveList object instead of a pointer

[stockfish] / src / history.h

diff --git a/src/history.h b/src/history.h
index 9206cdf4bc7d8a45ad34612e12244ec23a55dcc2..bbac390375100e125106d40dbeebee86c0225b73 100644 (file)
--- a/src/history.h
+++ b/src/history.h
@@ -23,8 +23,8 @@
 #include <cstring>
 
 #include "depth.h"
-#include "move.h"
 #include "piece.h"
+#include "square.h"
 #include "value.h"
 
 
@@ -40,10 +40,12 @@ 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 +53,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 +70,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)