X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovepick.h;h=ae2ee3814ea838acf096ef3c73d3135892b16607;hp=72f52459799526c4182de23a6c5b1daca7ab9b16;hb=b1b19343cd1f5ec65084dc11a0a0b4d5ece2a24b;hpb=8307da0de77c9c7bbf7c56a7d9c8a688ff4dfb4e

diff --git a/src/movepick.h b/src/movepick.h
index 72f52459..ae2ee381 100644
--- a/src/movepick.h
+++ b/src/movepick.h
@@ -1,7 +1,8 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2015-2017 Marco Costalba, Joona Kiiski, Gary Linscott, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -17,48 +18,108 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if !defined MOVEPICK_H_INCLUDED
+#ifndef MOVEPICK_H_INCLUDED
 #define MOVEPICK_H_INCLUDED
 
-#include "history.h"
+#include <cstring>   // For std::memset
+
+#include "movegen.h"
 #include "position.h"
-#include "search.h"
 #include "types.h"
 
-/// MovePicker is a class which is used to pick one pseudo legal move at a time
-/// from the current position. It is initialized with a Position object and a few
-/// moves we have reason to believe are good. The most important method is
-/// MovePicker::next_move(), which returns a new pseudo legal move each time
-/// it is called, until there are no moves left, when MOVE_NONE is returned.
-/// In order to improve the efficiency of the alpha beta algorithm, MovePicker
-/// attempts to return the moves which are most likely to get a cut-off first.
 
-class MovePicker {
+/// HistoryStats records how often quiet moves have been successful or unsuccessful
+/// during the current search, and is used for reduction and move ordering decisions.
+struct HistoryStats {
+
+  static const int Max = 1 << 28;
+
+  int get(Color c, Move m) const { return table[c][from_sq(m)][to_sq(m)]; }
+  void clear() { std::memset(table, 0, sizeof(table)); }
+  void update(Color c, Move m, int v) {
+
+    Square from = from_sq(m);
+    Square to = to_sq(m);
+
+    const int D = 324;
+
+    assert(abs(int(v)) <= D); // Consistency check for below formula
+
+    table[c][from][to] -= table[c][from][to] * abs(int(v)) / D;
+    table[c][from][to] += int(v) * 32;
+  }
+
+private:
+  int table[COLOR_NB][SQUARE_NB][SQUARE_NB];
+};
+
 
-  MovePicker& operator=(const MovePicker&); // Silence a warning under MSVC
+/// A template struct, used to generate MoveStats and CounterMoveHistoryStats:
+/// MoveStats store the move that refute a previous one.
+/// CounterMoveHistoryStats is like HistoryStats, but with two consecutive moves.
+/// Entries are stored using only the moving piece and destination square, hence
+/// two moves with different origin but same destination and piece will be
+/// considered identical.
+template<typename T>
+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 update(Piece pc, Square to, Move m) { table[pc][to] = m; }
+  void update(Piece pc, Square to, int v) {
 
+    const int D = 936;
+
+    assert(abs(int(v)) <= D); // Consistency check for below formula
+
+    table[pc][to] -= table[pc][to] * abs(int(v)) / D;
+    table[pc][to] += int(v) * 32;
+  }
+
+private:
+  T table[PIECE_NB][SQUARE_NB];
+};
+
+typedef Stats<Move> MoveStats;
+typedef Stats<int> CounterMoveStats;
+typedef Stats<CounterMoveStats> CounterMoveHistoryStats;
+
+
+/// MovePicker class is used to pick one pseudo legal move at a time from the
+/// current position. The most important method is next_move(), which returns a
+/// new pseudo legal move each time it is called, until there are no moves left,
+/// when MOVE_NONE is returned. In order to improve the efficiency of the alpha
+/// beta algorithm, MovePicker attempts to return the moves which are most likely
+/// to get a cut-off first.
+namespace Search { struct Stack; }
+
+class MovePicker {
 public:
-  MovePicker(const Position&, Move, Depth, const History&, Search::Stack*, Value);
-  MovePicker(const Position&, Move, Depth, const History&, Square recaptureSq);
-  MovePicker(const Position&, Move, const History&, PieceType parentCapture);
-  Move next_move();
+  MovePicker(const MovePicker&) = delete;
+  MovePicker& operator=(const MovePicker&) = delete;
+
+  MovePicker(const Position&, Move, Value);
+  MovePicker(const Position&, Move, Depth, Square);
+  MovePicker(const Position&, Move, Depth, Search::Stack*);
+
+  Move next_move(bool skipQuiets = false);
 
 private:
-  void score_captures();
-  void score_noncaptures();
-  void score_evasions();
-  void go_next_phase();
+  template<GenType> void score();
+  ExtMove* begin() { return cur; }
+  ExtMove* end() { return endMoves; }
 
   const Position& pos;
-  const History& H;
+  const Search::Stack* ss;
+  Move killers[2];
+  Move countermove;
   Depth depth;
   Move ttMove;
-  MoveStack killers[2];
   Square recaptureSquare;
-  int captureThreshold, phase;
-  const uint8_t* phasePtr;
-  MoveStack *curMove, *lastMove, *lastNonCapture, *badCaptures;
-  MoveStack moves[MAX_MOVES];
+  Value threshold;
+  int stage;
+  ExtMove *cur, *endMoves, *endBadCaptures;
+  ExtMove moves[MAX_MOVES];
 };
 
-#endif // !defined(MOVEPICK_H_INCLUDED)
+#endif // #ifndef MOVEPICK_H_INCLUDED