X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=5010ee627f41ef8b94464dd07c15a24c2ee79325;hp=44be9636e45974a67b3d6cf47817b87295d6dad0;hb=61a6e4666400b1855394e342f3a5c5fe125f4f1f;hpb=40548c9153ea89c0b27b198efb443c5bb9b9c490

diff --git a/src/movepick.h b/src/movepick.h
index 44be9636..5010ee62 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -43,6 +43,7 @@ struct Stats {
   static const Value Max = Value(250);
 
   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 update(Piece pc, Square to, Move m) {
@@ -70,6 +71,7 @@ private:
 typedef Stats< true, Value> GainsStats;
 typedef Stats<false, Value> HistoryStats;
 typedef Stats<false, std::pair<Move, Move> > MovesStats;
+typedef Stats<false, HistoryStats> CounterMovesHistoryStats;
 
 
 /// MovePicker class is used to pick one pseudo legal move at a time from the
@@ -84,9 +86,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 +100,12 @@ private:
 
   const Position& pos;
   const HistoryStats& history;
+  const CounterMovesHistoryStats& counterMovesHistory;
   Search::Stack* ss;
   Move* countermoves;
-  Move* followupmoves;
   Depth depth;
   Move ttMove;
-  ExtMove killers[6];
+  ExtMove killers[4];
   Square recaptureSquare;
   Value captureThreshold;
   int stage;