Copy killers in the movepicker

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index 3614439fca05cdb6df7a3bad6833dfdad3d33024..ae2ee3814ea838acf096ef3c73d3135892b16607 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -21,7 +21,6 @@
 #ifndef MOVEPICK_H_INCLUDED
 #define MOVEPICK_H_INCLUDED
 
-#include <algorithm> // For std::max
 #include <cstring>   // For std::memset
 
 #include "movegen.h"
@@ -42,11 +41,11 @@ struct HistoryStats {
     Square from = from_sq(m);
     Square to = to_sq(m);
 
-    const int denom = 324;
+    const int D = 324;
 
-    assert(abs(int(v)) <= denom); // Needed for stability.
+    assert(abs(int(v)) <= D); // Consistency check for below formula
 
-    table[c][from][to] -= table[c][from][to] * abs(int(v)) / denom;
+    table[c][from][to] -= table[c][from][to] * abs(int(v)) / D;
     table[c][from][to] += int(v) * 32;
   }
 
@@ -66,15 +65,14 @@ struct Stats {
   const T* operator[](Piece pc) const { return table[pc]; }
   T* operator[](Piece pc) { return table[pc]; }
   void clear() { std::memset(table, 0, sizeof(table)); }
-  void fill(const int& v) { std::fill(&table[0][0], &table[PIECE_NB-1][SQUARE_NB-1]+1, v); };
   void update(Piece pc, Square to, Move m) { table[pc][to] = m; }
   void update(Piece pc, Square to, int v) {
 
-    const int denom = 936;
+    const int D = 936;
 
-    assert(abs(int(v)) <= denom); // Needed for stability.
+    assert(abs(int(v)) <= D); // Consistency check for below formula
 
-    table[pc][to] -= table[pc][to] * abs(int(v)) / denom;
+    table[pc][to] -= table[pc][to] * abs(int(v)) / D;
     table[pc][to] += int(v) * 32;
   }
 
@@ -113,6 +111,7 @@ private:
 
   const Position& pos;
   const Search::Stack* ss;
+  Move killers[2];
   Move countermove;
   Depth depth;
   Move ttMove;