Never clear stats

[stockfish] / src / movepick.h

diff --git a/src/movepick.h b/src/movepick.h
index 44be9636e45974a67b3d6cf47817b87295d6dad0..423a6a1805e34a233844024940bd8d66839fb74b 100644 (file)
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -21,7 +21,6 @@
 #define MOVEPICK_H_INCLUDED
 
 #include <algorithm> // For std::max
-#include <cstring>   // For std::memset
 
 #include "movegen.h"
 #include "position.h"
@@ -43,15 +42,12 @@ struct Stats {
   static const Value Max = Value(250);
 
   const T* operator[](Piece pc) const { return table[pc]; }
-  void clear() { std::memset(table, 0, sizeof(table)); }
+  T* operator[](Piece pc) { return table[pc]; }
 
   void update(Piece pc, Square to, Move m) {
 
-    if (m == table[pc][to].first)
-        return;
-
-    table[pc][to].second = table[pc][to].first;
-    table[pc][to].first = m;
+    if (m != table[pc][to])
+        table[pc][to] = m;
   }
 
   void update(Piece pc, Square to, Value v) {
@@ -69,7 +65,8 @@ private:
 
 typedef Stats< true, Value> GainsStats;
 typedef Stats<false, Value> HistoryStats;
-typedef Stats<false, std::pair<Move, Move> > MovesStats;
+typedef Stats<false, Move> MovesStats;
+typedef Stats<false, HistoryStats> CounterMovesHistoryStats;
 
 
 /// MovePicker class is used to pick one pseudo legal move at a time from the
@@ -84,9 +81,9 @@ public:
   MovePicker(const MovePicker&) = delete;
   MovePicker& operator=(const MovePicker&) = delete;
 
-  MovePicker(const Position&, Move, Depth, const HistoryStats&, Square);
-  MovePicker(const Position&, Move, const HistoryStats&, PieceType);
-  MovePicker(const Position&, Move, Depth, const HistoryStats&, Move*, Move*, Search::Stack*);
+  MovePicker(const Position&, Move, Depth, const HistoryStats&, const CounterMovesHistoryStats&, Square);
+  MovePicker(const Position&, Move, const HistoryStats&, const CounterMovesHistoryStats&, PieceType);
+  MovePicker(const Position&, Move, Depth, const HistoryStats&, const CounterMovesHistoryStats&, Move, Search::Stack*);
 
   template<bool SpNode> Move next_move();
 
@@ -98,12 +95,12 @@ private:
 
   const Position& pos;
   const HistoryStats& history;
+  const CounterMovesHistoryStats& counterMovesHistory;
   Search::Stack* ss;
-  Move* countermoves;
-  Move* followupmoves;
+  Move countermove;
   Depth depth;
   Move ttMove;
-  ExtMove killers[6];
+  ExtMove killers[3];
   Square recaptureSquare;
   Value captureThreshold;
   int stage;